diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java
index 1db595f..38e5b52 100644
--- a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java
+++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java
@@ -3,7 +3,7 @@ package org.springframework.amqp.helloworld;
 import javax.annotation.PostConstruct;
 
 import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.rabbit.admin.config.AbstractRabbitConfiguration;
+import org.springframework.amqp.rabbit.config.AbstractRabbitConfiguration;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java
index ab6fcd6..e49b077 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java
@@ -17,7 +17,7 @@
 package org.springframework.amqp.rabbit.stocks.config;
 
 import org.springframework.amqp.core.TopicExchange;
-import org.springframework.amqp.rabbit.admin.config.AbstractRabbitConfiguration;
+import org.springframework.amqp.rabbit.config.AbstractRabbitConfiguration;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
index d281f98..66ef941 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
@@ -109,7 +109,7 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 	
 	@Bean
 	public Queue marketDataQueue() {		
-		return declareQueue();
+		return randomNameQueueDefinition();
 	}
 	
 	/**
@@ -129,7 +129,7 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 	 */	
 	@Bean
 	public Queue traderJoeQueue() {	
-		return declareQueue();		
+		return randomNameQueueDefinition();		
 	}