diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
index 8298034ec..4d01d6fb4 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
@@ -37,14 +37,14 @@ import org.springframework.util.StringUtils;
  * @author Spencer Gibb
  */
 @Configuration
-@ConditionalOnProperty(value = "spring.cloud.sleuth.trace.web.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.sleuth.trace.web.enabled", matchIfMissing = true)
 @ConditionalOnWebApplication
 public class TraceWebAutoConfiguration {
 
 	/**
 	 * Pattern for URLs that should be skipped in tracing
 	 */
-	@Value("${spring.cloud.sleuth.instrument.web.skipPattern:}")
+	@Value("${spring.sleuth.instrument.web.skipPattern:}")
 	private String skipPattern;
 
 	@Autowired
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
index c96683317..6104511a1 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
@@ -30,7 +30,7 @@ import org.springframework.web.client.RestTemplate;
  * @author Spencer Gibb
  */
 @Configuration
-@ConditionalOnProperty(value = "spring.cloud.sleuth.trace.web.client.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.sleuth.trace.web.client.enabled", matchIfMissing = true)
 @ConditionalOnClass(RestTemplate.class)
 public class TraceWebClientAutoConfiguration {
 
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java
index b4a17a3ba..74c31f1a2 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java
@@ -33,7 +33,7 @@ public class SleuthLogAutoConfiguration {
 	@ConditionalOnClass(MDC.class)
 	protected static class Slf4jConfiguration {
 		@Bean
-		@ConditionalOnProperty(value = "spring.cloud.sleuth.log.slf4j.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(value = "spring.sleuth.log.slf4j.enabled", matchIfMissing = true)
 		public Slf4jSpanListener slf4jSpanStartedListener() {
 			return new Slf4jSpanListener();
 		}
@@ -43,7 +43,7 @@ public class SleuthLogAutoConfiguration {
 	@ConditionalOnClass(Log.class)
 	protected static class JsonConfiguration {
 		@Bean
-		@ConditionalOnProperty("spring.cloud.sleuth.log.json.enabled")
+		@ConditionalOnProperty("spring.sleuth.log.json.enabled")
 		public JsonLogSpanListener jsonSlf4jSpanListener() {
 			return new JsonLogSpanListener();
 		}
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java
index 7e05b81c0..c34f5cf9d 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java
@@ -49,7 +49,7 @@ import com.google.common.base.Optional;
 @Configuration
 @EnableConfigurationProperties
 @ConditionalOnClass(ServerTracerConfig.class)
-@ConditionalOnProperty(value = "spring.cloud.sleuth.zipkin.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.sleuth.zipkin.enabled", matchIfMissing = true)
 @Import({ AnnotationSubmitterConfig.class, ClientTracerConfig.class,
 	EndPointSubmitterConfig.class, ServerSpanThreadBinderConfig.class,
 	ServerTracerConfig.class })
@@ -78,14 +78,8 @@ public class ZipkinAutoConfiguration {
 		return new TraceFilters(traceFilters);
 	}
 
-	//	@Bean
-	//	@ConditionalOnProperty(value = "spring.cloud.sleuth.zipkin.braveTracer.enabled", matchIfMissing = true)
-	//	public ZipkinSpanListener zipkinTrace(ServerTracer serverTracer, ClientTracer clientTracer) {
-	//		return new ZipkinSpanListener(serverTracer, clientTracer);
-	//	}
-
 	@Bean
-	// @ConditionalOnProperty(value = "spring.cloud.sleuth.zipkin.braveTracer.enabled", havingValue = "false")
+	// @ConditionalOnProperty(value = "spring.sleuth.zipkin.braveTracer.enabled", havingValue = "false")
 	public ZipkinSpanListener sleuthTracer(SpanCollector spanCollector) {
 		return new ZipkinSpanListener(spanCollector);
 	}
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java
index 78f5915fb..a744e6edb 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java
@@ -36,7 +36,7 @@ import com.github.kristofa.brave.ServerTracerConfig;
 @Configuration
 @ConditionalOnClass(ServerTracerConfig.class)
 @ConditionalOnWebApplication
-@ConditionalOnProperty(value = "spring.cloud.sleuth.zipkin.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.sleuth.zipkin.enabled", matchIfMissing = true)
 @AutoConfigureAfter(ZipkinAutoConfiguration.class)
 @AutoConfigureBefore(TraceAutoConfiguration.class)
 public class ZipkinWebAutoConfiguration {