diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/FilterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/FilterParser.java
index 7ed0aa5efd..8704f5ef0b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/FilterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/FilterParser.java
@@ -20,7 +20,7 @@ import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.filter.FilterEndpoint;
+import org.springframework.integration.filter.MessageFilter;
 import org.springframework.integration.filter.MethodInvokingSelector;
 
 /**
@@ -32,7 +32,7 @@ public class FilterParser extends AbstractEndpointParser {
 
 	@Override
 	protected BeanDefinitionBuilder parseConsumer(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FilterEndpoint.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MessageFilter.class);
 		builder.addConstructorArgReference(this.parseAdapter(element, parserContext, MethodInvokingSelector.class));
 		return builder;
 	}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/filter/FilterEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
similarity index 78%
rename from org.springframework.integration/src/main/java/org/springframework/integration/filter/FilterEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
index c938a45bfa..3b5988b868 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/filter/FilterEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
@@ -22,17 +22,18 @@ import org.springframework.integration.message.selector.MessageSelector;
 import org.springframework.util.Assert;
 
 /**
- * Message Endpoint that decides whether to pass a message along to its
- * output channel. Delegates to a {@link MessageSelector}.
+ * Message Consumer that delegates to a {@link MessageSelector}. If and only if
+ * the selector {@link MessageSelector#accept(Message) accepts} the Message, it
+ * will be passed to this filter's output channel.
  * 
  * @author Mark Fisher
  */
-public class FilterEndpoint extends AbstractReplyProducingMessageConsumer {
+public class MessageFilter extends AbstractReplyProducingMessageConsumer {
 
 	private MessageSelector selector;
 
 
-	public FilterEndpoint(MessageSelector selector) {
+	public MessageFilter(MessageSelector selector) {
 		Assert.notNull(selector, "selector must not be null");
 		this.selector = selector;
 	}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
similarity index 88%
rename from org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterEndpointTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
index 35698d5647..9268430d04 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterEndpointTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
-import org.springframework.integration.filter.FilterEndpoint;
+import org.springframework.integration.filter.MessageFilter;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.message.selector.MessageSelector;
@@ -34,11 +34,11 @@ import org.springframework.integration.message.selector.MessageSelector;
 /**
  * @author Mark Fisher
  */
-public class FilterEndpointTests {
+public class MessageFilterTests {
 
 	@Test
 	public void filterAcceptsMessage() {
-		FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
+		MessageFilter filter = new MessageFilter(new MessageSelector() {
 			public boolean accept(Message<?> message) {
 				return true;
 			}
@@ -49,7 +49,7 @@ public class FilterEndpointTests {
 
 	@Test
 	public void filterRejectsMessage() {
-		FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
+		MessageFilter filter = new MessageFilter(new MessageSelector() {
 			public boolean accept(Message<?> message) {
 				return false;
 			}
@@ -61,7 +61,7 @@ public class FilterEndpointTests {
 	public void filterAcceptsWithChannels() {
 		DirectChannel inputChannel = new DirectChannel();
 		QueueChannel outputChannel = new QueueChannel();
-		FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
+		MessageFilter filter = new MessageFilter(new MessageSelector() {
 			public boolean accept(Message<?> message) {
 				return true;
 			}
@@ -80,7 +80,7 @@ public class FilterEndpointTests {
 	public void filterRejectsWithChannels() {
 		DirectChannel inputChannel = new DirectChannel();
 		QueueChannel outputChannel = new QueueChannel();
-		FilterEndpoint filter = new FilterEndpoint(new MessageSelector() {
+		MessageFilter filter = new MessageFilter(new MessageSelector() {
 			public boolean accept(Message<?> message) {
 				return false;
 			}