diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundDirectMessageEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundDirectMessageEndpointParser.java
index e339bc4683..a6efef2447 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundDirectMessageEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundDirectMessageEndpointParser.java
@@ -23,6 +23,12 @@ import org.w3c.dom.Element;
 
 import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
 
+/**
+ * A parser for a {@link org.springframework.integration.twitter.inbound.InboundDirectMessageEndpoint} instance.
+ * 
+ * @author Josh Long
+ * @since 2.0
+ */
 public class InboundDirectMessageEndpointParser extends AbstractSingleBeanDefinitionParser {
     @Override
     protected String getBeanClassName(Element element) {
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMentionEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMentionEndpointParser.java
index 4c78b027c7..9adf8840ac 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMentionEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMentionEndpointParser.java
@@ -23,6 +23,14 @@ import org.w3c.dom.Element;
 
 import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
 
+/**
+ * a parser for the {@link org.springframework.integration.twitter.inbound.InboundMentionEndpoint} endpoint.
+ * The parser exepcts an outbound channel and a reference to a connection, as typically factoried by a
+ * {@link org.springframework.integration.twitter.config.ConnectionParser}
+ *
+ * @author Josh Long
+ * @since 2.0
+ */
 public class InboundMentionEndpointParser extends AbstractSingleBeanDefinitionParser {
     @Override
     protected String getBeanClassName(Element element) {
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundTimelineUpdateEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundTimelineUpdateEndpointParser.java
index 6ec7b91f92..3085c4ada8 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundTimelineUpdateEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundTimelineUpdateEndpointParser.java
@@ -23,6 +23,13 @@ import org.w3c.dom.Element;
 
 import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
 
+/**
+ * A parser for the {@link org.springframework.integration.twitter.inbound.InboundTimelineUpdateEndpoint} endpoint. The endpoint takes a channel and a reference to
+ * the appropriate connection, typically factoried by {@link org.springframework.integration.twitter.config.ConnectionParser}
+ *
+ * @author Josh Long
+ * @since 2.0
+ */
 public class InboundTimelineUpdateEndpointParser extends AbstractSingleBeanDefinitionParser {
     @Override
     protected String getBeanClassName(Element element) {
@@ -36,9 +43,7 @@ public class InboundTimelineUpdateEndpointParser extends AbstractSingleBeanDefin
 
     @Override
     protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element,
-                "channel", "outputChannel");
-        IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element,
-                "twitter-connection", "configuration");
+        IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "channel", "outputChannel");
+        IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "twitter-connection", "configuration");
     }
 }
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageMessageHandlerParser.java
similarity index 79%
rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageEndpointParser.java
rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageMessageHandlerParser.java
index fdc211b4fb..2863f892fb 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageMessageHandlerParser.java
@@ -23,7 +23,16 @@ import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.w3c.dom.Element;
 
 import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
-public class OutboundDirectMessageEndpointParser extends AbstractOutboundChannelAdapterParser {
+
+/**
+ * a parser for a {@link org.springframework.integration.twitter.outbound.OutboundDirectMessageMessageHandler} instance.
+ * The parser expects a reference to a Twitter connection, as typically factoried by a {@link org.springframework.integration.twitter.config.ConnectionParser}.
+ *
+ * @author Josh Long
+ * @since 2.0
+ *  
+ */
+public class OutboundDirectMessageMessageHandlerParser extends AbstractOutboundChannelAdapterParser {
     @Override
     protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
         BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundUpdatedStatusEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundTimelineUpdateMessageHandlerParser.java
similarity index 94%
rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundUpdatedStatusEndpointParser.java
rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundTimelineUpdateMessageHandlerParser.java
index 84a2e5486c..f91e477bf4 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundUpdatedStatusEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundTimelineUpdateMessageHandlerParser.java
@@ -31,7 +31,7 @@ import static org.springframework.integration.twitter.config.TwitterNamespaceHan
  * @author Josh Long
  * @since 2.0
  */
-public class OutboundUpdatedStatusEndpointParser extends AbstractOutboundChannelAdapterParser {
+public class OutboundTimelineUpdateMessageHandlerParser extends AbstractOutboundChannelAdapterParser {
     @Override
     protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
 
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 578a92f1c9..a7cebabaf0 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
@@ -41,8 +41,8 @@ public class TwitterNamespaceHandler extends org.springframework.beans.factory.x
 		registerBeanDefinitionParser("inbound-mention-channel-adapter", new InboundMentionEndpointParser());
 
 		// outbound
-		registerBeanDefinitionParser("outbound-update-channel-adapter", new OutboundUpdatedStatusEndpointParser());
-		registerBeanDefinitionParser("outbound-dm-channel-adapter", new OutboundDirectMessageEndpointParser());
+		registerBeanDefinitionParser("outbound-update-channel-adapter", new OutboundTimelineUpdateMessageHandlerParser());
+		registerBeanDefinitionParser("outbound-dm-channel-adapter", new OutboundDirectMessageMessageHandlerParser());
 	}
 
 	public static void configureTwitterConnection(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
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/InboundDirectMessageEndpoint.java
index a8207796a1..9a7e2eb81c 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/InboundDirectMessageEndpoint.java
@@ -58,7 +58,7 @@ public class InboundDirectMessageEndpoint extends AbstractInboundTwitterEndpoint
 
 	@Override
 	public String getComponentType() {
-		return null;  
+		return "twitter:inbound-dm-channel-adapter";  
 	}
 
 	@Override
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/InboundMentionEndpoint.java
index 848985493f..e269dc097b 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/InboundMentionEndpoint.java
@@ -30,7 +30,7 @@ public class InboundMentionEndpoint extends AbstractInboundTwitterStatusEndpoint
 
 	@Override
 	public String getComponentType() {
-		return null; 
+		return  "twitter:inbound-mention-channel-adapter";
 	}
 
 	@Override
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/InboundTimelineUpdateEndpoint.java
index 6c48baf289..65d3ce2a64 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/InboundTimelineUpdateEndpoint.java
@@ -30,7 +30,7 @@ public class InboundTimelineUpdateEndpoint extends AbstractInboundTwitterStatusE
 
 	@Override
 	 public String getComponentType() {
-		return null;  
+		return "twitter:inbound-update-channel-adapter";  
 	}
 
 	@Override
@@ -42,5 +42,6 @@ public class InboundTimelineUpdateEndpoint extends AbstractInboundTwitterStatusE
 						? twitter.getFriendsTimeline() :
 						twitter.getFriendsTimeline(new Paging(t.getMarkerId()))));
 			}
-		}); }
+		});
+	}
 }