diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/BeanFactoryChannelResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java
similarity index 91%
rename from org.springframework.integration/src/main/java/org/springframework/integration/router/BeanFactoryChannelResolver.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java
index 73e1f62b4f..66e58c23ef 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/BeanFactoryChannelResolver.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/BeanFactoryChannelResolver.java
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.router;
+package org.springframework.integration.channel;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.integration.channel.ChannelResolutionException;
-import org.springframework.integration.channel.MessageChannel;
 import org.springframework.util.Assert;
 
 /**
@@ -41,7 +39,7 @@ public class BeanFactoryChannelResolver implements ChannelResolver, BeanFactoryA
 	 * Create a new instance of the {@link BeanFactoryChannelResolver} class.
 	 * <p>The BeanFactory to access must be set via <code>setBeanFactory</code>.
 	 * This will happen automatically if this resolver is defined within an
-	 * ApplicationContext thereby receiving the callback.
+	 * ApplicationContext thereby receiving the callback upon initialization.
 	 * @see #setBeanFactory
 	 */
 	public BeanFactoryChannelResolver() {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/ChannelResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolver.java
similarity index 83%
rename from org.springframework.integration/src/main/java/org/springframework/integration/router/ChannelResolver.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolver.java
index f3a34ca772..68c193515a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/ChannelResolver.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolver.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.router;
+package org.springframework.integration.channel;
 
-import org.springframework.integration.channel.MessageChannel;
 
 /**
  * Strategy for resolving a name to a {@link MessageChannel}.
@@ -28,6 +27,6 @@ public interface ChannelResolver {
 	/**
 	 * Return the MessageChannel for the given name.
 	 */
-	MessageChannel resolveChannelName(String name);
+	MessageChannel resolveChannelName(String channelName);
 
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
index 5413ea21cd..cf13d0c763 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
@@ -20,9 +20,9 @@ import java.lang.reflect.Method;
 
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.integration.annotation.Router;
+import org.springframework.integration.channel.BeanFactoryChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.MessageConsumer;
-import org.springframework.integration.router.BeanFactoryChannelResolver;
 import org.springframework.integration.router.MethodInvokingRouter;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java
index e066d5c298..dda917d424 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java
@@ -21,7 +21,7 @@ import org.w3c.dom.Element;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.router.BeanFactoryChannelResolver;
+import org.springframework.integration.channel.BeanFactoryChannelResolver;
 import org.springframework.integration.router.MethodInvokingRouter;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java
index 5c35ba54f6..a2fa4faf68 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java
@@ -22,6 +22,8 @@ import java.util.Collection;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.integration.channel.BeanFactoryChannelResolver;
+import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessagingException;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
index 713984b08b..e78ad31d7f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageMappingMethodInvoker;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/TestChannelResolver.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/TestChannelResolver.java
index 1981740fad..45dbe2362e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/TestChannelResolver.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/TestChannelResolver.java
@@ -19,7 +19,6 @@ package org.springframework.integration.channel;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.springframework.integration.router.ChannelResolver;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java
index a6fe7e7775..7f3282b60e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java
@@ -29,6 +29,7 @@ import org.junit.Test;
 import org.springframework.integration.annotation.Header;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
+import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.channel.TestChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;