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 e0b45a1..74bbe20 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
@@ -105,7 +105,7 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 	
 	@Bean
 	public Queue marketDataQueue() {		
-		return randomNameQueueDefinition();
+		return generatedQueue();
 	}
 	
 	/**
@@ -125,7 +125,7 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 	 */	
 	@Bean
 	public Queue traderJoeQueue() {	
-		return randomNameQueueDefinition();		
+		return generatedQueue();		
 	}
 
 }