diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java
index 0a7c173dcd..e332a97e54 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java
@@ -33,7 +33,7 @@ import org.springframework.remoting.RemoteAccessException;
  */
 public abstract class AbstractRemotingOutboundGateway extends AbstractReplyProducingMessageHandler {
 
-	private final MessageHandler handlerProxy;
+	private final RemoteMessageHandler handlerProxy;
 
 
 	public AbstractRemotingOutboundGateway(String url) {
@@ -48,7 +48,7 @@ public abstract class AbstractRemotingOutboundGateway extends AbstractReplyProdu
 	/**
 	 * Subclasses must implement this method. It will be invoked from the constructor.
 	 */
-	protected abstract MessageHandler createHandlerProxy(String url);
+	protected abstract RemoteMessageHandler createHandlerProxy(String url);
 
 
 	@Override
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandler.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemoteMessageHandler.java
similarity index 96%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandler.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemoteMessageHandler.java
index 57a9a6464f..8f8681e8ac 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandler.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemoteMessageHandler.java
@@ -24,7 +24,7 @@ import org.springframework.integration.core.Message;
  * 
  * @author Mark Fisher
  */
-public interface MessageHandler {
+public interface RemoteMessageHandler {
 
 	Message<?> handle(Message<?> message);
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java
index 1e8e0b6621..c58ebefe22 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java
@@ -24,7 +24,7 @@ import org.springframework.integration.gateway.SimpleMessagingGateway;
  * 
  * @author Mark Fisher
  */
-public abstract class RemotingInboundGatewaySupport extends SimpleMessagingGateway implements MessageHandler {
+public abstract class RemotingInboundGatewaySupport extends SimpleMessagingGateway implements RemoteMessageHandler {
 
 	private volatile boolean expectReply = true;
 
diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java
index fe2fe9e155..6b9328a48b 100644
--- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java
+++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.integration.adapter.MessageHandler;
+import org.springframework.integration.adapter.RemoteMessageHandler;
 import org.springframework.integration.adapter.RemotingInboundGatewaySupport;
 import org.springframework.integration.core.MessagingException;
 import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter;
@@ -67,7 +67,7 @@ public class HttpInvokerInboundGateway extends RemotingInboundGatewaySupport imp
 	public void afterPropertiesSet() {
 		HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter();
 		exporter.setService(this);
-		exporter.setServiceInterface(MessageHandler.class);
+		exporter.setServiceInterface(RemoteMessageHandler.class);
 		exporter.afterPropertiesSet();
 		this.exporter = exporter;
 	}
diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java
index d77d2e6989..a937df1e21 100644
--- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java
+++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java
@@ -17,7 +17,7 @@
 package org.springframework.integration.httpinvoker;
 
 import org.springframework.integration.adapter.AbstractRemotingOutboundGateway;
-import org.springframework.integration.adapter.MessageHandler;
+import org.springframework.integration.adapter.RemoteMessageHandler;
 import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;
 
 /**
@@ -33,12 +33,12 @@ public class HttpInvokerOutboundGateway extends AbstractRemotingOutboundGateway
 
 
 	@Override
-	protected MessageHandler createHandlerProxy(String url) {
+	protected RemoteMessageHandler createHandlerProxy(String url) {
 		HttpInvokerProxyFactoryBean proxyFactory = new HttpInvokerProxyFactoryBean();
-		proxyFactory.setServiceInterface(MessageHandler.class);
+		proxyFactory.setServiceInterface(RemoteMessageHandler.class);
 		proxyFactory.setServiceUrl(url);
 		proxyFactory.afterPropertiesSet();
-		return (MessageHandler) proxyFactory.getObject();
+		return (RemoteMessageHandler) proxyFactory.getObject();
 	}
 
 }
diff --git a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java
index 2f37579af2..16f1c3de1f 100644
--- a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java
+++ b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java
@@ -20,7 +20,7 @@ import java.rmi.RemoteException;
 import java.rmi.registry.Registry;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.integration.adapter.MessageHandler;
+import org.springframework.integration.adapter.RemoteMessageHandler;
 import org.springframework.integration.adapter.RemotingInboundGatewaySupport;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.remoting.rmi.RmiServiceExporter;
@@ -82,7 +82,7 @@ public class RmiInboundGateway extends RemotingInboundGatewaySupport implements
 			exporter.setRemoteInvocationExecutor(this.remoteInvocationExecutor);
 		}
 		exporter.setService(this);
-		exporter.setServiceInterface(MessageHandler.class);
+		exporter.setServiceInterface(RemoteMessageHandler.class);
 		exporter.setServiceName(SERVICE_NAME_PREFIX + this.requestChannelName);
 		exporter.afterPropertiesSet();
 	}
diff --git a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java
index c135f36be0..d8a4e08d26 100644
--- a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java
+++ b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java
@@ -17,7 +17,7 @@
 package org.springframework.integration.rmi;
 
 import org.springframework.integration.adapter.AbstractRemotingOutboundGateway;
-import org.springframework.integration.adapter.MessageHandler;
+import org.springframework.integration.adapter.RemoteMessageHandler;
 import org.springframework.remoting.rmi.RmiProxyFactoryBean;
 
 /**
@@ -33,14 +33,14 @@ public class RmiOutboundGateway extends AbstractRemotingOutboundGateway {
 
 
 	@Override
-	public MessageHandler createHandlerProxy(String url) {
+	public RemoteMessageHandler createHandlerProxy(String url) {
 		RmiProxyFactoryBean proxyFactory = new RmiProxyFactoryBean();
-		proxyFactory.setServiceInterface(MessageHandler.class);
+		proxyFactory.setServiceInterface(RemoteMessageHandler.class);
 		proxyFactory.setServiceUrl(url);
 		proxyFactory.setLookupStubOnStartup(false);
 		proxyFactory.setRefreshStubOnConnectFailure(true);
 		proxyFactory.afterPropertiesSet();
-		return (MessageHandler) proxyFactory.getObject();
+		return (RemoteMessageHandler) proxyFactory.getObject();
 	}
 
 }
diff --git a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java
index 6b1c06f6b8..0ac19c563a 100644
--- a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java
+++ b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java
@@ -25,7 +25,7 @@ import java.rmi.RemoteException;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.integration.adapter.MessageHandler;
+import org.springframework.integration.adapter.RemoteMessageHandler;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.GenericMessage;
@@ -55,7 +55,7 @@ public class RmiOutboundGatewayTests {
 	public void createExporter() throws RemoteException {
 		RmiServiceExporter exporter = new RmiServiceExporter();
 		exporter.setService(new TestHandler());
-		exporter.setServiceInterface(MessageHandler.class);
+		exporter.setServiceInterface(RemoteMessageHandler.class);
 		exporter.setServiceName("testRemoteHandler");
 		exporter.afterPropertiesSet();
 	}
@@ -139,7 +139,7 @@ public class RmiOutboundGatewayTests {
 	}
 
 
-	private static class TestHandler implements MessageHandler {
+	private static class TestHandler implements RemoteMessageHandler {
 
 		public Message<?> handle(Message<?> message) {
 			return new GenericMessage<String>(message.getPayload().toString().toUpperCase(), message.getHeaders());