diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java
index ec9717525a..697701bb39 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.integration.annotation.Transformer;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.transformer.MethodInvokingTransformer;
-import org.springframework.integration.transformer.TransformerEndpoint;
+import org.springframework.integration.transformer.MessageTransformingConsumer;
 
 /**
  * Post-processor for Methods annotated with {@link Transformer @Transformer}.
@@ -39,7 +39,7 @@ public class TransformerAnnotationPostProcessor extends AbstractMethodAnnotation
 	@Override
 	protected MessageConsumer createConsumer(Object bean, Method method, Transformer annotation) {
 		MethodInvokingTransformer transformer = new MethodInvokingTransformer(bean, method);
-		return new TransformerEndpoint(transformer);
+		return new MessageTransformingConsumer(transformer);
 	}
 
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java
index b802abf646..085781c674 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java
@@ -22,7 +22,7 @@ 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.transformer.Transformer;
-import org.springframework.integration.transformer.TransformerEndpoint;
+import org.springframework.integration.transformer.MessageTransformingConsumer;
 
 /**
  * @author Mark Fisher
@@ -31,7 +31,7 @@ public abstract class AbstractTransformerParser extends AbstractConsumerEndpoint
 
 	@Override
 	protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(TransformerEndpoint.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MessageTransformingConsumer.class);
 		BeanDefinitionBuilder transformerBuilder =
 				BeanDefinitionBuilder.genericBeanDefinition(this.getTransformerClass());
 		this.parseTransformer(element, parserContext, transformerBuilder);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java
index acfeb1cafe..7a069cc62d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java
@@ -21,7 +21,7 @@ import org.w3c.dom.Element;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.transformer.MethodInvokingTransformer;
-import org.springframework.integration.transformer.TransformerEndpoint;
+import org.springframework.integration.transformer.MessageTransformingConsumer;
 
 /**
  * Parser for the <transformer/> element.
@@ -32,7 +32,7 @@ public class TransformerParser extends AbstractConsumerEndpointParser {
 
 	@Override
 	protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(TransformerEndpoint.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MessageTransformingConsumer.class);
 		builder.addConstructorArgReference(this.parseAdapter(element, parserContext, MethodInvokingTransformer.class));
 		return builder;
 	}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/TransformerEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java
similarity index 69%
rename from org.springframework.integration/src/main/java/org/springframework/integration/transformer/TransformerEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java
index 789bb5a4b5..355a80b104 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/TransformerEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java
@@ -21,14 +21,22 @@ import org.springframework.integration.message.Message;
 import org.springframework.util.Assert;
 
 /**
+ * A reply-producing {@link org.springframework.integration.message.MessageConsumer}
+ * that delegates to a {@link Transformer} instance to modify the received
+ * {@link Message} and send the result to its output channel.
+ * 
  * @author Mark Fisher
  */
-public class TransformerEndpoint extends AbstractReplyProducingMessageConsumer {
+public class MessageTransformingConsumer extends AbstractReplyProducingMessageConsumer {
 
 	private final Transformer transformer;
 
 
-	public TransformerEndpoint(Transformer transformer) {
+	/**
+	 * Create a {@link MessageTransformingConsumer} instance that delegates to
+	 * the provided {@link Transformer}.
+	 */
+	public MessageTransformingConsumer(Transformer transformer) {
 		Assert.notNull(transformer, "transformer must not be null");
 		this.transformer = transformer;
 	}