diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerGatewayTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerGatewayTests.java
index a68c44f58a..ca058de516 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerGatewayTests.java
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerGatewayTests.java
@@ -32,6 +32,7 @@ import org.junit.Test;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.message.Message;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -64,8 +65,8 @@ public class HttpInvokerGatewayTests {
 		Executors.newSingleThreadExecutor().execute(new Runnable() {
 			public void run() {
 				Message<?> message = channel.receive();
-				MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReturnAddress();
-				replyChannel.send(new StringMessage(message.getPayload().toString().toUpperCase()));
+				MessageTarget replyTarget = (MessageTarget) message.getHeaders().getReturnAddress();
+				replyTarget.send(new StringMessage(message.getPayload().toString().toUpperCase()));
 			}
 		});
 		HttpInvokerGateway gateway = new HttpInvokerGateway(channel);
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java
index 7e01c59c5e..5d75f454ef 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java
@@ -25,7 +25,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.adapter.httpinvoker.HttpInvokerGateway;
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.gateway.RequestReplyTemplate;
+import org.springframework.integration.message.MessageExchangeTemplate;
 
 /**
  * @author Mark Fisher
@@ -40,12 +40,12 @@ public class HttpInvokerGatewayParserTests {
 		HttpInvokerGateway gateway = (HttpInvokerGateway) context.getBean("gatewayWithDefaults");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
 		assertEquals(true, accessor.getPropertyValue("expectReply"));
-		RequestReplyTemplate template = (RequestReplyTemplate)
-				accessor.getPropertyValue("requestReplyTemplate");
+		assertEquals(channel, accessor.getPropertyValue("requestChannel"));
+		MessageExchangeTemplate template = (MessageExchangeTemplate)
+				accessor.getPropertyValue("messageExchangeTemplate");
 		DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
-		assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
-		assertEquals(-1L, templateAccessor.getPropertyValue("requestTimeout"));
-		assertEquals(-1L, templateAccessor.getPropertyValue("replyTimeout"));
+		assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout"));
+		assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout"));
 	}
 
 	@Test
@@ -56,12 +56,12 @@ public class HttpInvokerGatewayParserTests {
 		HttpInvokerGateway gateway = (HttpInvokerGateway) context.getBean("/gateway/with/name");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
 		assertEquals(true, accessor.getPropertyValue("expectReply"));
-		RequestReplyTemplate template = (RequestReplyTemplate)
-				accessor.getPropertyValue("requestReplyTemplate");
+		assertEquals(channel, accessor.getPropertyValue("requestChannel"));
+		MessageExchangeTemplate template = (MessageExchangeTemplate)
+				accessor.getPropertyValue("messageExchangeTemplate");
 		DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
-		assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
-		assertEquals(-1L, templateAccessor.getPropertyValue("requestTimeout"));
-		assertEquals(-1L, templateAccessor.getPropertyValue("replyTimeout"));
+		assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout"));
+		assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout"));
 	}
 
 	@Test
@@ -72,12 +72,12 @@ public class HttpInvokerGatewayParserTests {
 		HttpInvokerGateway gateway = (HttpInvokerGateway) context.getBean("gatewayWithCustomProperties");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
 		assertEquals(false, accessor.getPropertyValue("expectReply"));
-		RequestReplyTemplate template = (RequestReplyTemplate)
-				accessor.getPropertyValue("requestReplyTemplate");
+		assertEquals(channel, accessor.getPropertyValue("requestChannel"));
+		MessageExchangeTemplate template = (MessageExchangeTemplate)
+				accessor.getPropertyValue("messageExchangeTemplate");
 		DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
-		assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
-		assertEquals(123L, templateAccessor.getPropertyValue("requestTimeout"));
-		assertEquals(456L, templateAccessor.getPropertyValue("replyTimeout"));
+		assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout"));
+		assertEquals(456L, templateAccessor.getPropertyValue("receiveTimeout"));
 	}
 
 }
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java
index d54db91e74..4f75aa8982 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java
@@ -26,7 +26,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.adapter.rmi.RmiGateway;
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.gateway.RequestReplyTemplate;
+import org.springframework.integration.message.MessageExchangeTemplate;
 
 /**
  * @author Mark Fisher
@@ -41,12 +41,12 @@ public class RmiGatewayParserTests {
 		RmiGateway gateway = (RmiGateway) context.getBean("gatewayWithDefaults");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
 		assertEquals(true, accessor.getPropertyValue("expectReply"));
-		RequestReplyTemplate template = (RequestReplyTemplate)
-				accessor.getPropertyValue("requestReplyTemplate");
+		assertEquals(channel, accessor.getPropertyValue("requestChannel"));
+		MessageExchangeTemplate template = (MessageExchangeTemplate)
+				accessor.getPropertyValue("messageExchangeTemplate");
 		DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
-		assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
-		assertEquals(-1L, templateAccessor.getPropertyValue("requestTimeout"));
-		assertEquals(-1L, templateAccessor.getPropertyValue("replyTimeout"));
+		assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout"));
+		assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout"));
 	}
 
 	@Test
@@ -57,12 +57,12 @@ public class RmiGatewayParserTests {
 		RmiGateway gateway = (RmiGateway) context.getBean("gatewayWithCustomProperties");
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
 		assertEquals(false, accessor.getPropertyValue("expectReply"));
-		RequestReplyTemplate template = (RequestReplyTemplate)
-				accessor.getPropertyValue("requestReplyTemplate");
+		assertEquals(channel, accessor.getPropertyValue("requestChannel"));
+		MessageExchangeTemplate template = (MessageExchangeTemplate)
+				accessor.getPropertyValue("messageExchangeTemplate");
 		DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
-		assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
-		assertEquals(123L, templateAccessor.getPropertyValue("requestTimeout"));
-		assertEquals(456L, templateAccessor.getPropertyValue("replyTimeout"));
+		assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout"));
+		assertEquals(456L, templateAccessor.getPropertyValue("receiveTimeout"));
 	}
 
 	@Test