diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests-context.xml
index cb3e200708..5764ec49b0 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests-context.xml
@@ -14,7 +14,6 @@
 		http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
 		http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
-
 	<beans:bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<beans:property name="location" value="classpath:test.properties"/>
 	</beans:bean>
@@ -36,10 +35,10 @@
 		<xmpp:message-to value="${user.2.login}"/>
 	</xmpp:header-enricher>
 
-	<xmpp:message-inbound-channel-adapter channel="stdout" xmpp-connection="testConnection"/>
+	<xmpp:inbound-channel-adapter channel="stdout" xmpp-connection="testConnection"/>
 
 	<channel id="messagesToSend"/>
 
-	<xmpp:message-outbound-channel-adapter channel="messagesToSend" xmpp-connection="testConnection"/>
+	<xmpp:outbound-channel-adapter channel="messagesToSend" xmpp-connection="testConnection"/>
 
 </beans:beans>
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppEndpointTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundChatTests-context.xml
similarity index 88%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppEndpointTests-context.xml
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundChatTests-context.xml
index 0c6ffece36..98b6c0ceea 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundChatTests-context.xml
@@ -18,11 +18,8 @@
 						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
 						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
 
-	
 	<context:property-placeholder location="classpath:test.properties"/>
 
-	<channel id="xmppInbound"/>
-
 	<xmpp:xmpp-connection
 			id="testConnection"
 			user="${user.1.login}"
@@ -30,11 +27,12 @@
 			host="${user.1.host}"
 			service-name="${user.1.service}"/>
 
-	<xmpp:message-inbound-channel-adapter channel="xmppInbound" xmpp-connection="testConnection" 
-						extract-payload="false"/>
+	<xmpp:inbound-channel-adapter channel="inboundChatChannel" xmpp-connection="testConnection" extract-payload="false"/>
+
+	<channel id="inboundChatChannel"/>
+
+	<service-activator input-channel="inboundChatChannel" ref="xmppMessageConsumer"/>
 
-	<service-activator input-channel="xmppInbound" ref="xmppMessageConsumer"/>
-	
 	<beans:bean id="xmppMessageConsumer" class="org.springframework.integration.xmpp.ignore.XmppMessageConsumer"/>
 
 </beans:beans>
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundChatTests.java
similarity index 96%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppEndpointTests.java
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundChatTests.java
index cdaa561a1e..abc30b8889 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundChatTests.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class InboundXmppEndpointTests {
+public class InboundChatTests {
 
 	@Test
 	@Ignore
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppRosterEventsEndpointTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundPresenceTests-context.xml
similarity index 88%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppRosterEventsEndpointTests-context.xml
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundPresenceTests-context.xml
index 6d0b25c59b..e62bcce2ec 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppRosterEventsEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundPresenceTests-context.xml
@@ -19,23 +19,18 @@
 		<beans:property name="location" value="classpath:test.properties"/>
 	</beans:bean>
 
-	
-
 	<xmpp:xmpp-connection
 			id="testConnection"
 			user="${user.1.login}"
 			password="${user.1.password}"
 			host="${user.1.host}"
-			service-name="${user.1.service}"
-			/>
+			service-name="${user.1.service}"/>
 
+	<xmpp:presence-inbound-channel-adapter channel="inboundPresenceChannel" xmpp-connection="testConnection"/>
 	
+	<channel id="inboundPresenceChannel"/>
 
-	<xmpp:presence-inbound-channel-adapter channel="inboundRosterEventChannel" xmpp-connection="testConnection"/>
-	
-	<channel id="inboundRosterEventChannel"/>
-
-	<service-activator input-channel="inboundRosterEventChannel" output-channel="stdOutChannel" 
+	<service-activator input-channel="inboundPresenceChannel" output-channel="stdOutChannel" 
 					expression="'Presence event from: ' + payload.getFrom() + ' - ' + payload.getMode()"/>
 	
 	<channel id="stdOutChannel"/>
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppRosterEventsEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundPresenceTests.java
similarity index 96%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppRosterEventsEndpointTests.java
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundPresenceTests.java
index f356b7e17e..ca52eddaad 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppRosterEventsEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundPresenceTests.java
@@ -31,7 +31,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class InboundXmppRosterEventsEndpointTests {
+public class InboundPresenceTests {
 
 	@Test
 	@Ignore
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests-context.xml
similarity index 93%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests-context.xml
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests-context.xml
index 5d329251c3..ee72c74cc1 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests-context.xml
@@ -24,12 +24,12 @@
             host="${user.1.host}"
             service-name="${user.1.service}"/>
 
-	<inbound-channel-adapter ref="xmppProducer" channel="outboundChannel">
+	<inbound-channel-adapter ref="xmppProducer" channel="outboundChatChannel">
 		<poller fixed-rate="1000"/>
 	</inbound-channel-adapter>
 
-	<channel id="outboundChannel"/>
+	<channel id="outboundChatChannel"/>
 
-	<xmpp:message-outbound-channel-adapter channel="outboundChannel" xmpp-connection="testConnection"/>
+	<xmpp:outbound-channel-adapter channel="outboundChatChannel" xmpp-connection="testConnection"/>
 
 </beans:beans>
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests.java
similarity index 96%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests.java
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests.java
index 5569e640f7..80dee4479b 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class OutboundXmppEndpointTests {
+public class OutboundChatTests {
 
 	@Test
 	@Ignore
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundPresenceTests-context.xml
similarity index 88%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests-context.xml
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundPresenceTests-context.xml
index 1022a494f2..4e5fa8066d 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundPresenceTests-context.xml
@@ -27,12 +27,12 @@
 
 	<beans:bean id="eventProducer" class="org.springframework.integration.xmpp.presence.XmppRosterEventProducer"/>
 
-	<inbound-channel-adapter ref="eventProducer" channel="rosterPresenceUpdatingProducerChannel">
+	<inbound-channel-adapter ref="eventProducer" channel="outboundPresenceChannel">
 		<poller fixed-rate="1000">
 	</inbound-channel-adapter>
 
-	<channel id="rosterPresenceUpdatingProducerChannel"/>
+	<channel id="outboundPresenceChannel"/>
 
-	<xmpp:roster-event-outbound-channel-adapter xmpp-connection="testConnection" channel="rosterPresenceUpdatingProducerChannel"/>
+	<xmpp:presence-outbound-channel-adapter xmpp-connection="testConnection" channel="outboundPresenceChannel"/>
 
 </beans:beans>
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundPresenceTests.java
similarity index 96%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests.java
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundPresenceTests.java
index c8b61d4ecb..7409fbf077 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundPresenceTests.java
@@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class OutboundXmppRosterEventsEndpointTests {
+public class OutboundPresenceTests {
 
 	@Test
 	@Ignore