diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java
index 61254862d0..075e1c08ae 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,25 +20,26 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.jms.JmsOutboundGateway;
 import org.springframework.integration.jms.StubMessageConverter;
 import org.springframework.jms.support.converter.MessageConverter;
 
+/**
+ * @author Jonas Partner
+ */
 public class JmsOutboundGatewayParserTests {
 
 	@Test
 	public void testDefault(){
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"jmsOutboundGatewayWithConverter.xml", this.getClass());
-		PollingConsumerEndpoint  endpoint = (PollingConsumerEndpoint) context.getBean("jmsGateway");
-
+		PollingConsumer endpoint = (PollingConsumer) context.getBean("jmsGateway");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(endpoint);
 		JmsOutboundGateway gateway = (JmsOutboundGateway) accessor.getPropertyValue("handler");
 		accessor = new DirectFieldAccessor(gateway);
 		MessageConverter converter = (MessageConverter)accessor.getPropertyValue("messageConverter");
-		assertTrue("Wrong mesage converter", converter instanceof StubMessageConverter);
-		
+		assertTrue("Wrong message converter", converter instanceof StubMessageConverter);
 	}
-	
+
 }
diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java
index fe97ae98a5..62f7977dbb 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.scheduling.SimpleTaskScheduler;
@@ -48,7 +48,7 @@ public class ByteStreamWritingMessageHandlerTests {
 
 	private QueueChannel channel;
 
-	private PollingConsumerEndpoint endpoint;
+	private PollingConsumer endpoint;
 
 	private TestTrigger trigger = new TestTrigger();
 
@@ -60,7 +60,7 @@ public class ByteStreamWritingMessageHandlerTests {
 		stream = new ByteArrayOutputStream();
 		handler = new ByteStreamWritingMessageHandler(stream);
 		this.channel = new QueueChannel(10);
-		this.endpoint = new PollingConsumerEndpoint(channel, handler);
+		this.endpoint = new PollingConsumer(channel, handler);
 		scheduler = new SimpleTaskScheduler(new SimpleAsyncTaskExecutor());
 		this.endpoint.setTaskScheduler(scheduler);
 		scheduler.start();
diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java
index bae7533ab5..7ce1072193 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.scheduling.SimpleTaskScheduler;
@@ -47,7 +47,7 @@ public class CharacterStreamWritingMessageHandlerTests {
 
 	private QueueChannel channel;
 
-	private PollingConsumerEndpoint endpoint;
+	private PollingConsumer endpoint;
 
 	private TestTrigger trigger = new TestTrigger();
 
@@ -60,7 +60,7 @@ public class CharacterStreamWritingMessageHandlerTests {
 		handler = new CharacterStreamWritingMessageHandler(writer);
 		this.channel = new QueueChannel(10);
 		trigger.reset();
-		this.endpoint = new PollingConsumerEndpoint(channel, handler);
+		this.endpoint = new PollingConsumer(channel, handler);
 		scheduler = new SimpleTaskScheduler(new SimpleAsyncTaskExecutor());
 		this.endpoint.setTaskScheduler(scheduler);
 		scheduler.start();
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java
index 2b0a0d55db..c5c7464615 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java
@@ -24,7 +24,7 @@ import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.endpoint.MessageEndpoint;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.scheduling.IntervalTrigger;
 import org.springframework.integration.ws.MarshallingWebServiceOutboundGateway;
@@ -159,7 +159,7 @@ public class WebServiceOutboundGatewayParserTests {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"simpleWebServiceOutboundGatewayParserTests.xml", this.getClass());
 		MessageEndpoint endpoint = (MessageEndpoint) context.getBean("gatewayWithPoller");
-		assertEquals(PollingConsumerEndpoint.class, endpoint.getClass());
+		assertEquals(PollingConsumer.class, endpoint.getClass());
 		Object obj = new DirectFieldAccessor(endpoint).getPropertyValue("trigger");
 		assertEquals(IntervalTrigger.class, obj.getClass());
 		IntervalTrigger trigger = (IntervalTrigger) obj;
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 9da0651e73..b9840b534e 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
@@ -27,7 +27,7 @@ import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.SubscribableChannel;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.endpoint.MessageEndpoint;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.MessageHandler;
 import org.springframework.integration.scheduling.IntervalTrigger;
@@ -152,7 +152,7 @@ public class ConsumerEndpointFactoryBean implements FactoryBean, BeanFactoryAwar
 				if (this.trigger == null) {
 					this.trigger = new IntervalTrigger(0);
 				}
-				PollingConsumerEndpoint pollingEndpoint = new PollingConsumerEndpoint(
+				PollingConsumer pollingEndpoint = new PollingConsumer(
 						(PollableChannel) channel, this.handler);
 				pollingEndpoint.setTrigger(this.trigger);
 				pollingEndpoint.setMaxMessagesPerPoll(this.maxMessagesPerPoll);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index be562841e2..8a3f0fd06c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -31,7 +31,7 @@ import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.SubscribableChannel;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.endpoint.MessageEndpoint;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.MessageHandler;
 import org.springframework.util.Assert;
@@ -89,7 +89,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 			MessageChannel inputChannel = this.channelResolver.resolveChannelName(inputChannelName);
 			Assert.notNull(inputChannel, "failed to resolve inputChannel '" + inputChannelName + "'");
 			if (inputChannel instanceof PollableChannel) {
-				PollingConsumerEndpoint pollingEndpoint = new PollingConsumerEndpoint(
+				PollingConsumer pollingEndpoint = new PollingConsumer(
 						(PollableChannel) inputChannel, handler);
 				if (pollerAnnotation != null) {
 					AnnotationConfigUtils.configurePollingEndpointWithPollerAnnotation(
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java
index 0582be5cb5..d2df316982 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java
@@ -31,7 +31,7 @@ import org.springframework.integration.channel.SubscribableChannel;
 import org.springframework.integration.consumer.MethodInvokingMessageHandler;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.endpoint.MessageEndpoint;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.MethodInvokingSource;
@@ -115,7 +115,7 @@ public class ChannelAdapterAnnotationPostProcessor implements MethodAnnotationPo
 			Trigger trigger = (pollerAnnotation != null)
 					? AnnotationConfigUtils.parseTriggerFromPollerAnnotation(pollerAnnotation)
 					: new IntervalTrigger(0);
-			PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint((PollableChannel) channel, handler);
+			PollingConsumer endpoint = new PollingConsumer((PollableChannel) channel, handler);
 			endpoint.setTrigger(trigger);
 			return endpoint;
 		}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumerEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java
similarity index 86%
rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumerEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java
index d4b6628873..8011daec5d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumerEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java
@@ -22,9 +22,12 @@ import org.springframework.integration.message.MessageHandler;
 import org.springframework.util.Assert;
 
 /**
+ * Message Endpoint that connects any {@link MessageHandler} implementation
+ * to a {@link PollableChannel}.
+ * 
  * @author Mark Fisher
  */
-public class PollingConsumerEndpoint extends AbstractPollingEndpoint {
+public class PollingConsumer extends AbstractPollingEndpoint {
 
 	private final PollableChannel inputChannel;
 
@@ -33,7 +36,7 @@ public class PollingConsumerEndpoint extends AbstractPollingEndpoint {
 	private volatile long receiveTimeout = 1000;
 
 
-	public PollingConsumerEndpoint(PollableChannel inputChannel, MessageHandler handler) {
+	public PollingConsumer(PollableChannel inputChannel, MessageHandler handler) {
 		Assert.notNull(inputChannel, "inputChannel must not be null");
 		Assert.notNull(handler, "handler must not be null");
 		this.inputChannel = inputChannel;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java
index 3c6d23d729..b903e25ce3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java
@@ -27,7 +27,7 @@ import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessagingException;
 import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.integration.endpoint.MessagingGateway;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.message.MessageHandler;
@@ -189,7 +189,7 @@ public abstract class AbstractMessagingGateway implements MessagingGateway, Mess
 						(SubscribableChannel) this.replyChannel, handler);
 			}
 			else if (this.replyChannel instanceof PollableChannel) {
-				PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(
+				PollingConsumer endpoint = new PollingConsumer(
 						(PollableChannel) this.replyChannel, handler);
 				endpoint.setTaskScheduler(this.taskScheduler);
 				endpoint.afterPropertiesSet();
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java
index 9a31590c54..1588e1d6fc 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java
@@ -40,7 +40,7 @@ import org.springframework.integration.config.xml.MessageBusParser;
 import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.ErrorMessage;
@@ -75,7 +75,7 @@ public class ApplicationContextMessageBusTests {
 			}
 		};
 		handler.setBeanFactory(context);
-		PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(sourceChannel, handler);
+		PollingConsumer endpoint = new PollingConsumer(sourceChannel, handler);
 		endpoint.afterPropertiesSet();
 		context.getBeanFactory().registerSingleton("testEndpoint", endpoint);
 		context.refresh();
@@ -148,9 +148,9 @@ public class ApplicationContextMessageBusTests {
 		context.getBeanFactory().registerSingleton("output2", outputChannel2);
 		handler1.setOutputChannel(outputChannel1);
 		handler2.setOutputChannel(outputChannel2);
-		PollingConsumerEndpoint endpoint1 = new PollingConsumerEndpoint(inputChannel, handler1);
+		PollingConsumer endpoint1 = new PollingConsumer(inputChannel, handler1);
 		endpoint1.afterPropertiesSet();
-		PollingConsumerEndpoint endpoint2 = new PollingConsumerEndpoint(inputChannel, handler2);
+		PollingConsumer endpoint2 = new PollingConsumer(inputChannel, handler2);
 		endpoint2.afterPropertiesSet();
 		context.getBeanFactory().registerSingleton("testEndpoint1", endpoint1);
 		context.getBeanFactory().registerSingleton("testEndpoint2", endpoint2);
@@ -266,7 +266,7 @@ public class ApplicationContextMessageBusTests {
 				latch.countDown();
 			}
 		};
-		PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(errorChannel, handler);
+		PollingConsumer endpoint = new PollingConsumer(errorChannel, handler);
 		endpoint.afterPropertiesSet();
 		context.getBeanFactory().registerSingleton("testEndpoint", endpoint);
 		ApplicationContextMessageBus bus = new ApplicationContextMessageBus();
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
index 6f72ce4f6d..6e6cb98622 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
@@ -17,9 +17,9 @@
 
 	<bean id="targetChannel" class="org.springframework.integration.channel.QueueChannel"/>
 
-	<bean id="endpoint" class="org.springframework.integration.endpoint.PollingConsumerEndpoint">
-		<constructor-arg ref="serviceActivator"/>
+	<bean id="endpoint" class="org.springframework.integration.endpoint.PollingConsumer">
 		<constructor-arg ref="sourceChannel"/>
+		<constructor-arg ref="serviceActivator"/>
 	</bean>
 
 	<bean id="serviceActivator" class="org.springframework.integration.consumer.ServiceActivatingHandler">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
index d4b1f1355f..81108fd7d6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
@@ -35,7 +35,7 @@ import org.springframework.integration.consumer.AbstractReplyProducingMessageHan
 import org.springframework.integration.consumer.ReplyMessageHolder;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.util.TestUtils;
@@ -58,7 +58,7 @@ public class MessageChannelTemplateTests {
 				replyHolder.set(message.getPayload().toString().toUpperCase());
 			}
 		};
-		PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(requestChannel, handler);
+		PollingConsumer endpoint = new PollingConsumer(requestChannel, handler);
 		endpoint.afterPropertiesSet();
 		GenericApplicationContext context = new GenericApplicationContext();
 		context.getBeanFactory().registerSingleton("requestChannel", requestChannel);
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java
index 045a3e011a..2205b3c724 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java
@@ -46,7 +46,7 @@ import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.config.xml.MessageBusParser;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageHandler;
 import org.springframework.integration.message.StringMessage;
@@ -374,8 +374,7 @@ public class MessagingAnnotationPostProcessorTests {
 		postProcessor.afterPropertiesSet();
 		AnnotatedEndpointWithPolledAnnotation bean = new AnnotatedEndpointWithPolledAnnotation();
 		postProcessor.postProcessAfterInitialization(bean, "testBean");
-		PollingConsumerEndpoint endpoint =
-				(PollingConsumerEndpoint) context.getBean("testBean.prependFoo.serviceActivator");
+		PollingConsumer endpoint = (PollingConsumer) context.getBean("testBean.prependFoo.serviceActivator");
 		Trigger trigger = (Trigger) new DirectFieldAccessor(endpoint).getPropertyValue("trigger");
 		assertEquals(IntervalTrigger.class, trigger.getClass());
 		DirectFieldAccessor triggerAccessor = new DirectFieldAccessor(trigger);
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java
index 6fea6994e1..b46b7a3446 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java
@@ -51,7 +51,7 @@ import org.springframework.integration.util.ErrorHandler;
 @SuppressWarnings("unchecked")
 public class PollingConsumerEndpointTests {
 
-	private PollingConsumerEndpoint endpoint;
+	private PollingConsumer endpoint;
 
 	private TestTrigger trigger = new TestTrigger();
 
@@ -72,7 +72,7 @@ public class PollingConsumerEndpointTests {
 	public void init() throws InterruptedException {
 		consumer.counter.set(0);
 		trigger.reset();
-		endpoint = new PollingConsumerEndpoint(channelMock, consumer);
+		endpoint = new PollingConsumer(channelMock, consumer);
 		endpoint.setTaskScheduler(taskScheduler);
 		taskScheduler.setErrorHandler(errorHandler);
 		taskScheduler.start();
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java
index 16a490dd95..f729dc59ff 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java
@@ -32,7 +32,7 @@ import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.consumer.MethodInvokingMessageHandler;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.endpoint.PollingConsumerEndpoint;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.util.TestUtils;
 
 /**
@@ -85,7 +85,7 @@ public class MethodInvokingMessageHandlerTests {
 		channel.send(message);
 		assertNull(queue.poll());
 		MethodInvokingMessageHandler handler = new MethodInvokingMessageHandler(testBean, "foo");
-		PollingConsumerEndpoint endpoint = new PollingConsumerEndpoint(channel, handler);
+		PollingConsumer endpoint = new PollingConsumer(channel, handler);
 		context.getBeanFactory().registerSingleton("testEndpoint", endpoint);
 		ApplicationContextMessageBus bus = new ApplicationContextMessageBus();
 		bus.setTaskScheduler(TestUtils.createTaskScheduler(10));