diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdateEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMessageSourceParser.java
similarity index 88%
rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdateEndpointParser.java
rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMessageSourceParser.java
index 9cdc63b5c7..f0ff1a4bca 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdateEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMessageSourceParser.java
@@ -32,20 +32,20 @@ import org.w3c.dom.Element;
  * @author Oleg Zhurakousky
  * @since 2.0
  */
-public class UpdateEndpointParser extends AbstractPollingInboundChannelAdapterParser {
+public class InboundMessageSourceParser extends AbstractPollingInboundChannelAdapterParser {
 
 	@Override
 	protected BeanMetadataElement parseSource(Element element, ParserContext parserContext) {  
 		String elementName = element.getLocalName().trim();
 		String className = null;
     	if ("inbound-update-channel-adapter".equals(elementName)){
-    		className = BASE_PACKAGE +".inbound.InboundTimelineUpdateEndpoint" ;
+    		className = BASE_PACKAGE +".inbound.TimelineUpdateMessageSource" ;
     	}
     	else if ("inbound-dm-channel-adapter".equals(elementName)){
-    		className =  BASE_PACKAGE +  ".inbound.InboundDirectMessageEndpoint"; 
+    		className =  BASE_PACKAGE +  ".inbound.DirectMessageMessageSource"; 
     	}
     	else if ("inbound-mention-channel-adapter".equals(elementName)){
-    		className = BASE_PACKAGE + ".inbound.InboundMentionEndpoint";
+    		className = BASE_PACKAGE + ".inbound.MentionMessageSource";
     	}
     	else {
     		throw new IllegalArgumentException("Element '" + elementName + "' is not supported by this parser");
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java
index 1c44a26e54..83472f272f 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java
@@ -36,9 +36,9 @@ public class TwitterNamespaceHandler extends org.springframework.beans.factory.x
 		registerBeanDefinitionParser("twitter-connection", new ConnectionParser());
 
 		// inbound
-		registerBeanDefinitionParser("inbound-update-channel-adapter", new UpdateEndpointParser());
-		registerBeanDefinitionParser("inbound-dm-channel-adapter", new UpdateEndpointParser());
-		registerBeanDefinitionParser("inbound-mention-channel-adapter", new UpdateEndpointParser());
+		registerBeanDefinitionParser("inbound-update-channel-adapter", new InboundMessageSourceParser());
+		registerBeanDefinitionParser("inbound-dm-channel-adapter", new InboundMessageSourceParser());
+		registerBeanDefinitionParser("inbound-mention-channel-adapter", new InboundMessageSourceParser());
 
 		// outbound
 		registerBeanDefinitionParser("outbound-update-channel-adapter", new OutboundTimelineUpdateMessageHandlerParser());
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java
similarity index 98%
rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java
rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java
index 26cd530b88..7343c429a8 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java
@@ -55,7 +55,7 @@ import twitter4j.Twitter;
  * @since 2.0
  */
 @SuppressWarnings("rawtypes")
-public abstract class AbstractInboundTwitterEndpointSupport<T> extends AbstractEndpoint 
+public abstract class AbstractTwitterMessageSource<T> extends AbstractEndpoint 
 						implements MessageSource, TrackableComponent {
 	
 	private volatile MetadataStore metadataStore;
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundDirectMessageEndpoint.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageMessageSource.java
similarity index 93%
rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundDirectMessageEndpoint.java
rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageMessageSource.java
index fcf2ee10dc..2c385d1bb2 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundDirectMessageEndpoint.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageMessageSource.java
@@ -30,7 +30,7 @@ import twitter4j.Paging;
  * @author Oleg Zhurakousky
  * @since 2.0
  */
-public class InboundDirectMessageEndpoint extends AbstractInboundTwitterEndpointSupport<DirectMessage> {
+public class DirectMessageMessageSource extends AbstractTwitterMessageSource<DirectMessage> {
 	
 	@Override
 	public String getComponentType() {
@@ -44,7 +44,6 @@ public class InboundDirectMessageEndpoint extends AbstractInboundTwitterEndpoint
 				try {
 					long sinceId = getMarkerId();
 					if (tweets.size() <= prefetchThreshold){
-						System.out.println("Polling");
 						List<twitter4j.DirectMessage> dms = !hasMarkedStatus() 
 							? twitter.getDirectMessages() 
 							: twitter.getDirectMessages(new Paging(sinceId));
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundMentionEndpoint.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionMessageSource.java
similarity index 94%
rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundMentionEndpoint.java
rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionMessageSource.java
index 627c145baa..7743569ff9 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundMentionEndpoint.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionMessageSource.java
@@ -28,7 +28,7 @@ import twitter4j.Status;
  * @author Josh Long
  * @author Oleg Zhurakousky
  */
-public class InboundMentionEndpoint extends AbstractInboundTwitterEndpointSupport<Status> {
+public class MentionMessageSource extends AbstractTwitterMessageSource<Status> {
 
 	@Override
 	public String getComponentType() {
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundTimelineUpdateEndpoint.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateMessageSource.java
similarity index 94%
rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundTimelineUpdateEndpoint.java
rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateMessageSource.java
index 7f3c52b6e9..141efde423 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundTimelineUpdateEndpoint.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateMessageSource.java
@@ -29,7 +29,7 @@ import twitter4j.Status;
  * @author Oleg Zhurakousky
  * @since 2.0
  */
-public class InboundTimelineUpdateEndpoint extends AbstractInboundTwitterEndpointSupport<Status> {
+public class TimelineUpdateMessageSource extends AbstractTwitterMessageSource<Status> {
 
 	@Override
 	 public String getComponentType() {