diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java
index 7afed2ca..ca6b5357 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Import;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Import(EurekaClientConfiguration.class)
+@Import(EurekaDiscoveryClientConfiguration.class)
 @Deprecated
 public @interface EnableEurekaClient {
 
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
similarity index 94%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
index 8506ad64..816138b5 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
@@ -54,10 +54,10 @@ import java.util.concurrent.atomic.AtomicInteger;
 @EnableConfigurationProperties
 @ConditionalOnClass(EurekaClientConfig.class)
 @ConditionalOnExpression("${eureka.client.enabled:true}")
-public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
+public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Ordered {
 
 	private static final Logger logger = LoggerFactory
-			.getLogger(EurekaClientConfiguration.class);
+			.getLogger(EurekaDiscoveryClientConfiguration.class);
 
 	private AtomicBoolean running = new AtomicBoolean(false);
 
@@ -162,9 +162,9 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
 			@Override
 			public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) {
 				// TODO: take SSL into account when Spring Boot 1.2 is available
-				EurekaClientConfiguration.this.port.compareAndSet(0, event.getEmbeddedServletContainer()
-						.getPort());
-				EurekaClientConfiguration.this.start();
+				EurekaDiscoveryClientConfiguration.this.port.compareAndSet(0, event.getEmbeddedServletContainer()
+                        .getPort());
+				EurekaDiscoveryClientConfiguration.this.start();
 			}
 		};
 	}
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/EnableHystrix.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/EnableHystrix.java
index 144e3d7b..0c90645a 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/EnableHystrix.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/EnableHystrix.java
@@ -25,7 +25,7 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Import(HystrixConfiguration.class)
+@Import(HystrixCircuitBreakerConfiguration.class)
 @Deprecated
 public @interface EnableHystrix {
 }
\ No newline at end of file
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java
similarity index 99%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java
rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java
index 6a2daa52..b2e0ae6d 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java
@@ -46,7 +46,7 @@ import java.util.Set;
  * @author Christian Dupuis
  */
 @Configuration
-public class HystrixConfiguration {
+public class HystrixCircuitBreakerConfiguration {
 
 	@Bean
 	public HystrixCommandAspect hystrixCommandAspect() {
diff --git a/spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories b/spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories
index 9a8405f3..87bc62f8 100644
--- a/spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories
@@ -12,7 +12,7 @@ org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.netflix.config.DiscoveryClientConfigServiceBootstrapConfiguration
 
 org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
-org.springframework.cloud.netflix.eureka.EurekaClientConfiguration
+org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration
 
 org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker=\
-org.springframework.cloud.netflix.hystrix.HystrixConfiguration
\ No newline at end of file
+org.springframework.cloud.netflix.hystrix.HystrixCircuitBreakerConfiguration
\ No newline at end of file
diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationTests.java
index 00afcaeb..e7ab601b 100644
--- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationTests.java
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationTests.java
@@ -26,7 +26,7 @@ public class HystrixConfigurationTests {
 
 	@Test
 	public void nonWebAppStartsUp() {
-		new SpringApplicationBuilder(HystrixConfiguration.class).web(false).run().close();
+		new SpringApplicationBuilder(HystrixCircuitBreakerConfiguration.class).web(false).run().close();
 	}
 
 }
diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineConfiguration.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineConfiguration.java
index 0431ddd8..4cfcc742 100644
--- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineConfiguration.java
+++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineConfiguration.java
@@ -6,7 +6,7 @@ import com.netflix.turbine.plugins.PluginsFactory;
 import com.netflix.turbine.streaming.servlet.TurbineStreamServlet;
 import org.springframework.boot.context.embedded.ServletRegistrationBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,7 +17,7 @@ import org.springframework.core.Ordered;
  */
 @Configuration
 @EnableConfigurationProperties
-@EnableEurekaClient
+@EnableDiscoveryClient
 public class TurbineConfiguration implements SmartLifecycle, Ordered {
 
     @Bean
@@ -49,7 +49,7 @@ public class TurbineConfiguration implements SmartLifecycle, Ordered {
 
     @Override
     public void start() {
-        //TODO: figure out ordering, so this is already run by EurekaClientConfiguration
+        //TODO: figure out ordering, so this is already run by EurekaDiscoveryClientConfiguration
         //DiscoveryManager.getInstance().initComponent(instanceConfig, clientConfig);
         PluginsFactory.setClusterMonitorFactory(new SpringAggregatorFactory());
         PluginsFactory.setInstanceDiscovery(instanceDiscovery());