diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/Consumer.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/Consumer.java
index 9aafd26..212f2bf 100644
--- a/helloworld/src/main/java/org/springframework/amqp/helloworld/Consumer.java
+++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/Consumer.java
@@ -1,14 +1,13 @@
 package org.springframework.amqp.helloworld;
 
 import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class Consumer {
 	
 	public static void main(String[] args) {
-		ApplicationContext context = new AnnotationConfigApplicationContext(RabbitConfiguration.class);
+		ApplicationContext context = new AnnotationConfigApplicationContext(HelloWorldConfiguration.class);
 		AmqpTemplate amqpTemplate = context.getBean(AmqpTemplate.class);
 		System.out.println("Received: " + amqpTemplate.receiveAndConvert());
 	}
diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java
similarity index 97%
rename from helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java
rename to helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java
index 54fd10b..439a375 100644
--- a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java
+++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class RabbitConfiguration extends AbstractRabbitConfiguration {
+public class HelloWorldConfiguration extends AbstractRabbitConfiguration {
 
 	protected final String helloWorldQueueName = "hello.world.queue";
 
diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/Producer.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/Producer.java
index 06a642a..42e18d2 100644
--- a/helloworld/src/main/java/org/springframework/amqp/helloworld/Producer.java
+++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/Producer.java
@@ -1,14 +1,13 @@
 package org.springframework.amqp.helloworld;
 
 import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class Producer {
 
 	public static void main(String[] args) {
-		ApplicationContext context = new AnnotationConfigApplicationContext(RabbitConfiguration.class);
+		ApplicationContext context = new AnnotationConfigApplicationContext(HelloWorldConfiguration.class);
 		AmqpTemplate amqpTemplate = context.getBean(AmqpTemplate.class);
 		amqpTemplate.convertAndSend("Hello World");
 		System.out.println("Sent: Hello World");
diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/async/ConsumerConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/async/ConsumerConfiguration.java
index 9d95a25..681440f 100644
--- a/helloworld/src/main/java/org/springframework/amqp/helloworld/async/ConsumerConfiguration.java
+++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/async/ConsumerConfiguration.java
@@ -1,13 +1,13 @@
 package org.springframework.amqp.helloworld.async;
 
-import org.springframework.amqp.helloworld.RabbitConfiguration;
+import org.springframework.amqp.helloworld.HelloWorldConfiguration;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class ConsumerConfiguration extends RabbitConfiguration {
+public class ConsumerConfiguration extends HelloWorldConfiguration {
 
 	@Bean
 	public SimpleMessageListenerContainer listenerContainer() {