diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/ConnectionParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/ConnectionParser.java
index 252c8fdce9..b0ccedc80d 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/ConnectionParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/ConnectionParser.java
@@ -3,13 +3,14 @@ package org.springframework.integration.twitter.config;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.twitter.oauth.OAuthConfigurationFactoryBean;
 import org.w3c.dom.Element;
 
+import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
+
 public class ConnectionParser extends AbstractSingleBeanDefinitionParser {
     @Override
     protected String getBeanClassName(Element element) {
-        return OAuthConfigurationFactoryBean.class.getName();
+        return BASE_PACKAGE + ".oauth.OAuthConfigurationFactoryBean"; 
     }
 
     @Override
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageInboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageInboundEndpointParser.java
index cd48d6218b..5cf79fc256 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageInboundEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageInboundEndpointParser.java
@@ -4,13 +4,14 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
-import org.springframework.integration.twitter.InboundDirectMessageStatusEndpoint;
 import org.w3c.dom.Element;
 
+import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
+
 public class DirectMessageInboundEndpointParser extends AbstractSingleBeanDefinitionParser {
     @Override
     protected String getBeanClassName(Element element) {
-        return InboundDirectMessageStatusEndpoint.class.getName(); 
+        return   BASE_PACKAGE + ".InboundDirectMessageStatusEndpoint";
     }
 
     @Override
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageOutboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageOutboundEndpointParser.java
index 34f1430324..ff26319eef 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageOutboundEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageOutboundEndpointParser.java
@@ -5,13 +5,14 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
-import org.springframework.integration.twitter.OutboundDirectMessageStatusMessageHandler;
 import org.w3c.dom.Element;
 
+import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
 public class DirectMessageOutboundEndpointParser extends AbstractOutboundChannelAdapterParser {
     @Override
     protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(OutboundDirectMessageStatusMessageHandler.class.getName());
+        BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( BASE_PACKAGE + ".OutboundDirectMessageStatusMessageHandler" );
+        
         IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "twitter-connection", "configuration");
         return builder.getBeanDefinition();
     }
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/MentionInboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/MentionInboundEndpointParser.java
index 7644fc42f9..a0f046a09c 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/MentionInboundEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/MentionInboundEndpointParser.java
@@ -4,14 +4,14 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
-import org.springframework.integration.twitter.InboundMentionStatusEndpoint;
-import org.springframework.integration.twitter.config.TwitterNamespaceHandler;
 import org.w3c.dom.Element;
 
+import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
+
 public class MentionInboundEndpointParser extends AbstractSingleBeanDefinitionParser {
     @Override
     protected String getBeanClassName(Element element) {
-        return InboundMentionStatusEndpoint.class.getName();
+        return BASE_PACKAGE + ".InboundMentionStatusEndpoint";
     }
 
     @Override
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 ec49f1e75f..7f17afe1c3 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
@@ -29,6 +29,7 @@ import org.w3c.dom.Element;
 public class TwitterNamespaceHandler extends org.springframework.beans.factory.xml.NamespaceHandlerSupport {
 
 
+    public static String BASE_PACKAGE = "org.springframework.integration.twitter";
 
 	public void init() {
 		// twitter connections
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusInboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusInboundEndpointParser.java
index cd8610721e..8d6d9345db 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusInboundEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusInboundEndpointParser.java
@@ -4,14 +4,14 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
-import org.springframework.integration.twitter.InboundUpdatedStatusEndpoint;
-import org.springframework.integration.twitter.config.TwitterNamespaceHandler;
 import org.w3c.dom.Element;
 
+import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
+
 public class UpdatedStatusInboundEndpointParser extends AbstractSingleBeanDefinitionParser {
     @Override
     protected String getBeanClassName(Element element) {
-        return InboundUpdatedStatusEndpoint.class.getName() ;
+        return BASE_PACKAGE +".InboundUpdatedStatusEndpoint" ;
     }
 
     @Override
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusOutboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusOutboundEndpointParser.java
index 63cb523995..e774aea9df 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusOutboundEndpointParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusOutboundEndpointParser.java
@@ -5,16 +5,17 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
-import org.springframework.integration.twitter.OutboundUpdatedStatusMessageHandler;
-import org.springframework.integration.twitter.config.TwitterNamespaceHandler;
 import org.w3c.dom.Element;
 
+import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE;
+
 public class UpdatedStatusOutboundEndpointParser extends AbstractOutboundChannelAdapterParser {
     @Override
     protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
 
         BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
-                OutboundUpdatedStatusMessageHandler.class.getName()  );
+                BASE_PACKAGE + ".OutboundUpdatedStatusMessageHandler" );
+
 
         IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element,
                 "twitter-connection", "configuration");