diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/Constants.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConstants.java
similarity index 89%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/Constants.java
rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConstants.java
index b0e2d6a5..002a89a2 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/Constants.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConstants.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.netflix;
+package org.springframework.cloud.netflix.hystrix;
 
 /**
  * @author Spencer Gibb
  */
-public interface Constants {
+public interface HystrixConstants {
 
 	String HYSTRIX_STREAM_NAME = "spring.cloud.hystrix.stream";
 
diff --git a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamAmqpProperties.java b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAmqpProperties.java
similarity index 94%
rename from spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamAmqpProperties.java
rename to spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAmqpProperties.java
index f034108e..01735f85 100644
--- a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamAmqpProperties.java
+++ b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAmqpProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.netflix.hystrix.amqp;
+package org.springframework.cloud.netflix.hystrix.amqp;
 
 import lombok.Data;
 
diff --git a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java
similarity index 93%
rename from spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java
rename to spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java
index 72fcf4f9..6fc1c48d 100644
--- a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java
+++ b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.netflix.hystrix.amqp;
+package org.springframework.cloud.netflix.hystrix.amqp;
 
 import javax.annotation.PostConstruct;
 
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.netflix.Constants;
+import org.springframework.cloud.netflix.hystrix.HystrixConstants;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.annotation.IntegrationComponentScan;
@@ -78,7 +78,7 @@ public class HystrixStreamAutoConfiguration {
 
 	@Bean
 	public DirectExchange hystrixStreamExchange() {
-		DirectExchange exchange = new DirectExchange(Constants.HYSTRIX_STREAM_NAME);
+		DirectExchange exchange = new DirectExchange(HystrixConstants.HYSTRIX_STREAM_NAME);
 		return exchange;
 	}
 
@@ -94,7 +94,7 @@ public class HystrixStreamAutoConfiguration {
 				 * spec.header("content-type", "application/json", true); } })
 				 */
 				.handle(Amqp.outboundAdapter(this.amqpTemplate).exchangeName(
-						Constants.HYSTRIX_STREAM_NAME)).get();
+						HystrixConstants.HYSTRIX_STREAM_NAME)).get();
 	}
 
 	private Jackson2JsonMessageConverter messageConverter() {
diff --git a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamChannel.java b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamChannel.java
similarity index 94%
rename from spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamChannel.java
rename to spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamChannel.java
index 30d297d8..9339c93d 100644
--- a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamChannel.java
+++ b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamChannel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.netflix.hystrix.amqp;
+package org.springframework.cloud.netflix.hystrix.amqp;
 
 import org.springframework.integration.annotation.Gateway;
 import org.springframework.integration.annotation.MessagingGateway;
diff --git a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamTask.java
similarity index 99%
rename from spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java
rename to spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamTask.java
index ddec671d..93077942 100644
--- a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java
+++ b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.netflix.hystrix.amqp;
+package org.springframework.cloud.netflix.hystrix.amqp;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java b/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java
index f4cf3bf5..6274c5ba 100644
--- a/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java
+++ b/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.Constants;
+import org.springframework.cloud.netflix.hystrix.HystrixConstants;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.dsl.IntegrationFlow;
@@ -66,7 +66,7 @@ public class TurbineAmqpAutoConfiguration {
 
 	@Bean
 	public DirectExchange hystrixStreamExchange() {
-		DirectExchange exchange = new DirectExchange(Constants.HYSTRIX_STREAM_NAME);
+		DirectExchange exchange = new DirectExchange(HystrixConstants.HYSTRIX_STREAM_NAME);
 		return exchange;
 	}
 
@@ -80,7 +80,7 @@ public class TurbineAmqpAutoConfiguration {
 	public Queue hystrixStreamQueue() {
 		Map<String, Object> args = new HashMap<>();
 		args.put("x-message-ttl", 60000); // TODO: configure TTL
-		Queue queue = new Queue(Constants.HYSTRIX_STREAM_NAME, false, false, false, args);
+		Queue queue = new Queue(HystrixConstants.HYSTRIX_STREAM_NAME, false, false, false, args);
 		return queue;
 	}