diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
similarity index 68%
rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
index 30584f5f7f..ebf28dfe61 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
@@ -23,13 +23,13 @@ import org.springframework.integration.message.MessageHandler;
 import org.springframework.util.Assert;
 
 /**
- * Base class for FactoryBeans that create MessageConsumer instances.
+ * Base class for FactoryBeans that create MessageHandler instances.
  * 
  * @author Mark Fisher
  */
-public abstract class AbstractConsumerFactoryBean implements FactoryBean {
+public abstract class AbstractMessageHandlerFactoryBean implements FactoryBean {
 
-	private volatile MessageHandler consumer;
+	private volatile MessageHandler handler;
 
 	private volatile Object targetObject;
 
@@ -55,20 +55,20 @@ public abstract class AbstractConsumerFactoryBean implements FactoryBean {
 	}
 
 	public Object getObject() throws Exception {
-		if (this.consumer == null) {
-			this.initializeConsumer();
-			Assert.notNull(this.consumer, "failed to create MessageConsumer");
+		if (this.handler == null) {
+			this.initializeHandler();
+			Assert.notNull(this.handler, "failed to create MessageHandler");
 			if (this.outputChannel != null
-					&& this.consumer instanceof AbstractReplyProducingMessageHandler) {
-				((AbstractReplyProducingMessageHandler) this.consumer).setOutputChannel(this.outputChannel);
+					&& this.handler instanceof AbstractReplyProducingMessageHandler) {
+				((AbstractReplyProducingMessageHandler) this.handler).setOutputChannel(this.outputChannel);
 			}
 		}
-		return this.consumer;
+		return this.handler;
 	}
 
 	public Class<?> getObjectType() {
-		if (this.consumer != null) {
-			return this.consumer.getClass();
+		if (this.handler != null) {
+			return this.handler.getClass();
 		}
 		return MessageHandler.class;
 	}
@@ -77,19 +77,19 @@ public abstract class AbstractConsumerFactoryBean implements FactoryBean {
 		return true;
 	}
 
-	private void initializeConsumer() {
+	private void initializeHandler() {
 		synchronized (this.initializationMonitor) {
 			if (this.initialized) {
 				return;
 			}
-			this.consumer = this.createConsumer(this.targetObject, this.targetMethodName);
+			this.handler = this.createHandler(this.targetObject, this.targetMethodName);
 			this.initialized = true;
 		}
 	}
 
 	/**
-	 * Subclasses must implement this method to create the MessageConsumer.
+	 * Subclasses must implement this method to create the MessageHandler.
 	 */
-	protected abstract MessageHandler createConsumer(Object targetObject, String targetMethodName);
+	protected abstract MessageHandler createHandler(Object targetObject, String targetMethodName);
 
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
index 609bedbd87..3857b0ce96 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
@@ -152,15 +152,15 @@ public class ConsumerEndpointFactoryBean implements FactoryBean, BeanFactoryAwar
 				if (this.trigger == null) {
 					this.trigger = new IntervalTrigger(0);
 				}
-				PollingConsumer pollingEndpoint = new PollingConsumer(
+				PollingConsumer pollingConsumer = new PollingConsumer(
 						(PollableChannel) channel, this.handler);
-				pollingEndpoint.setTrigger(this.trigger);
-				pollingEndpoint.setMaxMessagesPerPoll(this.maxMessagesPerPoll);
-				pollingEndpoint.setReceiveTimeout(this.receiveTimeout);
-				pollingEndpoint.setTaskExecutor(this.taskExecutor);
-				pollingEndpoint.setTransactionManager(this.transactionManager);
-				pollingEndpoint.setTransactionDefinition(this.transactionDefinition);
-				this.endpoint = pollingEndpoint;
+				pollingConsumer.setTrigger(this.trigger);
+				pollingConsumer.setMaxMessagesPerPoll(this.maxMessagesPerPoll);
+				pollingConsumer.setReceiveTimeout(this.receiveTimeout);
+				pollingConsumer.setTaskExecutor(this.taskExecutor);
+				pollingConsumer.setTransactionManager(this.transactionManager);
+				pollingConsumer.setTransactionDefinition(this.transactionDefinition);
+				this.endpoint = pollingConsumer;
 			}
 			else {
 				throw new IllegalArgumentException(
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
index cd856d396e..a47761c4cb 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
  * 
  * @author Mark Fisher
  */
-public class RouterFactoryBean extends AbstractConsumerFactoryBean {
+public class RouterFactoryBean extends AbstractMessageHandlerFactoryBean {
 
 	private volatile ChannelResolver channelResolver;
 
@@ -45,7 +45,7 @@ public class RouterFactoryBean extends AbstractConsumerFactoryBean {
 	}
 
 	@Override
-	protected MessageHandler createConsumer(Object targetObject, String targetMethodName) {
+	protected MessageHandler createHandler(Object targetObject, String targetMethodName) {
 		Assert.notNull(targetObject, "target object must not be null");
 		AbstractMessageRouter router = this.createRouter(targetObject, targetMethodName);
 		if (this.defaultOutputChannel != null) {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java
index 94e25c550a..f4418ea065 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java
@@ -28,10 +28,10 @@ import org.springframework.util.StringUtils;
  * 
  * @author Mark Fisher
  */
-public class SplitterFactoryBean extends AbstractConsumerFactoryBean {
+public class SplitterFactoryBean extends AbstractMessageHandlerFactoryBean {
 
 	@Override
-	protected MessageHandler createConsumer(Object targetObject, String targetMethodName) {
+	protected MessageHandler createHandler(Object targetObject, String targetMethodName) {
 		if (targetObject == null) {
 			Assert.isTrue(!StringUtils.hasText(targetMethodName),
 					"'method' should only be provided when 'ref' is also provided");