diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisListenerContainer.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
similarity index 97%
rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisListenerContainer.java
rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
index 522e3073d..e0b7e9224 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisListenerContainer.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
@@ -56,14 +56,14 @@ import org.springframework.util.CollectionUtils;
  * 
  * @author Costin Leau
  */
-public class RedisListenerContainer implements InitializingBean, DisposableBean, BeanNameAware, SmartLifecycle {
+public class RedisMessageListenerContainer implements InitializingBean, DisposableBean, BeanNameAware, SmartLifecycle {
 
-	private static final Log log = LogFactory.getLog(RedisListenerContainer.class);
+	private static final Log log = LogFactory.getLog(RedisMessageListenerContainer.class);
 
 	/**
 	 * Default thread name prefix: "RedisListeningContainer-".
 	 */
-	public static final String DEFAULT_THREAD_NAME_PREFIX = ClassUtils.getShortName(RedisListenerContainer.class) + "-";
+	public static final String DEFAULT_THREAD_NAME_PREFIX = ClassUtils.getShortName(RedisMessageListenerContainer.class) + "-";
 
 
 	private Executor subscriptionExecutor;
@@ -172,7 +172,7 @@ public class RedisListenerContainer implements InitializingBean, DisposableBean,
 			running = true;
 			lazyListen();
 			if (log.isDebugEnabled()) {
-				log.debug("Started RedisListenerContainer");
+				log.debug("Started RedisMessageListenerContainer");
 			}
 		}
 	}
@@ -183,7 +183,7 @@ public class RedisListenerContainer implements InitializingBean, DisposableBean,
 		subscriptionTask.cancel();
 
 		if (log.isDebugEnabled()) {
-			log.debug("Stopped RedisListenerContainer");
+			log.debug("Stopped RedisMessageListenerContainer");
 		}
 	}
 
@@ -370,9 +370,6 @@ public class RedisListenerContainer implements InitializingBean, DisposableBean,
 			subscriptionTask.subscribeChannel(channels.toArray(new byte[channels.size()][]));
 			subscriptionTask.subscribePattern(patterns.toArray(new byte[patterns.size()][]));
 		}
-		else {
-			lazyListen();
-		}
 	}
 
 	/**
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerAdapter.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerAdapter.java
index 366961451..f77db0ee1 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerAdapter.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerAdapter.java
@@ -60,8 +60,8 @@ import org.springframework.util.ObjectUtils;
  * }</pre>
  *
  * For further examples and discussion please do refer to the Spring Data
- * reference documentation which describes this class (and it's attendant
- * XML configuration) in detail.
+ * reference documentation which describes this class (and its attendant
+ * configuration) in detail.
  *
  * @author Juergen Hoeller
  * @author Costin Leau
diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/listener/PubSubTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/listener/PubSubTests.java
index 5b2768a5e..2b99930c2 100644
--- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/listener/PubSubTests.java
+++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/listener/PubSubTests.java
@@ -48,7 +48,7 @@ public class PubSubTests<T> {
 
 	private static final String CHANNEL = "pubsub::test";
 
-	protected RedisListenerContainer container;
+	protected RedisMessageListenerContainer container;
 	protected ObjectFactory<T> factory;
 	protected RedisTemplate template;
 	private static Set<RedisConnectionFactory> connFactories = new LinkedHashSet<RedisConnectionFactory>();
@@ -68,7 +68,7 @@ public class PubSubTests<T> {
 	public void setUp() throws Exception {
 		adapter.setSerializer(template.getValueSerializer());
 
-		container = new RedisListenerContainer();
+		container = new RedisMessageListenerContainer();
 		container.setConnectionFactory(template.getConnectionFactory());
 		container.setBeanName("container");
 		container.afterPropertiesSet();