diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
index c2498d1e29..c8bb83e91f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
@@ -27,10 +27,9 @@ import org.springframework.integration.message.Message;
 
 /**
  * Base class for {@link MessageChannel} implementations providing common
- * properties such as the channel name and {@link DispatcherPolicy}. Also
- * provides the common functionality for sending and receiving
- * {@link Message Messages} including the invocation of any
- * {@link ChannelInterceptor ChannelInterceptors}.
+ * properties such as the channel name. Also provides the common functionality
+ * for sending and receiving {@link Message Messages} including the invocation
+ * of any {@link ChannelInterceptor ChannelInterceptors}.
  * 
  * @author Mark Fisher
  */
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java
index 01a4b5e2f2..6405b98aac 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java
@@ -19,7 +19,6 @@ package org.springframework.integration.channel;
 import org.springframework.integration.dispatcher.MessageDispatcher;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageConsumer;
-import org.springframework.integration.message.SubscribableChannel;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/SubscribableChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/SubscribableChannel.java
similarity index 90%
rename from org.springframework.integration/src/main/java/org/springframework/integration/message/SubscribableChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/SubscribableChannel.java
index dfbac156b4..965aec6881 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/SubscribableChannel.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/SubscribableChannel.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.channel;
 
-import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.message.MessageConsumer;
 
 /**
  * Interface for any MessageChannel implementation that accepts subscribers.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java
index 8e5c431604..867e4e2cb9 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java
@@ -22,11 +22,11 @@ import org.springframework.context.Lifecycle;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.channel.SubscribableChannel;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.SubscribableChannel;
 import org.springframework.integration.scheduling.IntervalTrigger;
 import org.springframework.integration.scheduling.Trigger;
 import org.springframework.util.Assert;