diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java
index 4be2bcce01..fc02077e1c 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java
@@ -28,7 +28,7 @@ import org.springframework.integration.jms.JmsHeaders;
 public class JmsNamespaceHandler extends NamespaceHandlerSupport {
 
 	public void init() {
-		this.registerBeanDefinitionParser("jms-gateway", new JmsGatewayParser());
+		this.registerBeanDefinitionParser("inbound-gateway", new JmsGatewayParser());
 		this.registerBeanDefinitionParser("inbound-channel-adapter", new JmsInboundChannelAdapterParser());
 		this.registerBeanDefinitionParser("outbound-channel-adapter", new JmsOutboundChannelAdapterParser());
 		this.registerBeanDefinitionParser("header-enricher", new SimpleHeaderEnricherParser(
diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
index ddd2f0ca94..897bc47769 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
@@ -37,7 +37,7 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="jms-gateway">
+	<xsd:element name="inbound-gateway">
 		<xsd:annotation>
 			<xsd:documentation>
 	Defines a JMS-based gateway adapter.
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
index 43c6990098..09295856eb 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
@@ -12,16 +12,16 @@
 
 	<si:channel id="requestChannel"/>
 
-	<jms:jms-gateway id="gatewayWithoutTransactionManager"
-	                 connection-factory="testConnectionFactory"
-	                 destination="testDestination"
-	                 request-channel="requestChannel"/>
+	<jms:inbound-gateway id="gatewayWithoutTransactionManager"
+	                     connection-factory="testConnectionFactory"
+	                     destination="testDestination"
+	                     request-channel="requestChannel"/>
 
-	<jms:jms-gateway id="gatewayWithTransactionManager"
-	                 connection-factory="testConnectionFactory"
-	                 destination="testDestination"
-	                 request-channel="requestChannel"
-	                 transaction-manager="txManager"/>
+	<jms:inbound-gateway id="gatewayWithTransactionManager"
+	                     connection-factory="testConnectionFactory"
+	                     destination="testDestination"
+	                     request-channel="requestChannel"
+	                     transaction-manager="txManager"/>
 
 	<bean id="txManager" class="org.springframework.jms.connection.JmsTransactionManager">
 		<property name="connectionFactory" ref="testConnectionFactory"/>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
index 8cd68141dd..bf808e66b7 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
@@ -12,10 +12,10 @@
 
 	<si:channel id="requestChannel"/>
 
-	<jms:jms-gateway id="jmsGateway"
-	                 connection-factory="testConnectionFactory"
-	                 destination="testDestination"
-	                 request-channel="requestChannel"/>
+	<jms:inbound-gateway id="jmsGateway"
+	                 	 connection-factory="testConnectionFactory"
+	                 	 destination="testDestination"
+	                 	 request-channel="requestChannel"/>
 
 	<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
index ac8c8f21ef..fffe481bd3 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
@@ -14,10 +14,10 @@
 
 	<si:channel id="requestChannel"/>
 
-	<jms:jms-gateway id="jmsGateway"
-	                 connection-factory="testConnectionFactory"
-	                 destination-name="testDestinationName"
-	                 request-channel="requestChannel"/>
+	<jms:inbound-gateway id="jmsGateway"
+	                     connection-factory="testConnectionFactory"
+	                     destination-name="testDestinationName"
+	                     request-channel="requestChannel"/>
 
 	<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
index 94eae4c2e8..fcf515784b 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
@@ -14,9 +14,9 @@
 
 	<si:channel id="requestChannel"/>
 
-	<jms:jms-gateway id="jmsGateway"
-					 connection-factory="testConnectionFactory"
-		 			 request-channel="requestChannel"/>
+	<jms:inbound-gateway id="jmsGateway"
+					 	 connection-factory="testConnectionFactory"
+		 			 	 request-channel="requestChannel"/>
 
 	<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
index 8fd6fa5888..a5895c10ce 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
@@ -16,29 +16,29 @@
 		<si:queue capacity="10"/>
 	</si:channel>
 
-	<jms:jms-gateway id="gatewayWithConcurrentConsumers"
-		 			 connection-factory="testConnectionFactory"
-		 			 request-channel="requestChannel"
-		 			 destination-name="test"
-		 			 concurrent-consumers="3"/>
+	<jms:inbound-gateway id="gatewayWithConcurrentConsumers"
+		 			 	 connection-factory="testConnectionFactory"
+		 			 	 request-channel="requestChannel"
+		 			 	 destination-name="test"
+		 			 	 concurrent-consumers="3"/>
 
-	<jms:jms-gateway id="gatewayWithMaxConcurrentConsumers"
-				 	 connection-factory="testConnectionFactory"
-		 			 request-channel="requestChannel"
-		 			 destination-name="test"
-		 			 max-concurrent-consumers="22"/>
+	<jms:inbound-gateway id="gatewayWithMaxConcurrentConsumers"
+				 	 	 connection-factory="testConnectionFactory"
+		 			 	 request-channel="requestChannel"
+		 			 	 destination-name="test"
+		 				 max-concurrent-consumers="22"/>
 
-	<jms:jms-gateway id="gatewayWithMaxMessagesPerTask"
-					 connection-factory="testConnectionFactory"
-		 			 request-channel="requestChannel"
-		 			 destination-name="test"
-		 			 max-messages-per-task="99"/>
+	<jms:inbound-gateway id="gatewayWithMaxMessagesPerTask"
+					 	 connection-factory="testConnectionFactory"
+		 			 	 request-channel="requestChannel"
+		 			 	 destination-name="test"
+		 			 	 max-messages-per-task="99"/>
 
-	<jms:jms-gateway id="gatewayWithIdleTaskExecutionLimit"
-					 connection-factory="testConnectionFactory"
-		 			 request-channel="requestChannel"
-		 			 destination-name="test"
-		 			 idle-task-execution-limit="7"/>
+	<jms:inbound-gateway id="gatewayWithIdleTaskExecutionLimit"
+					 	 connection-factory="testConnectionFactory"
+		 		   	 	 request-channel="requestChannel"
+		 			 	 destination-name="test"
+		 				 idle-task-execution-limit="7"/>
 
 	<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
index c6b14d9aff..66d3a4c612 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
@@ -14,9 +14,9 @@
 
 	<si:channel id="requestChannel"/>
 
-	<jms:jms-gateway id="jmsGateway"
-					 destination-name="testDestinationName"
-					 request-channel="requestChannel"/>
+	<jms:inbound-gateway id="jmsGateway"
+					 	 destination-name="testDestinationName"
+					 	 request-channel="requestChannel"/>
 
 	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
index 7b98dc7966..d65d92253d 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
@@ -12,9 +12,9 @@
 
 	<si:channel id="requestChannel"/>
 
-	<jms:jms-gateway id="jmsGateway"
-					 connection-factory=""
-					 destination-name="testDestinationName"
-					 request-channel="requestChannel"/>
+	<jms:inbound-gateway id="jmsGateway"
+					 	 connection-factory=""
+						 destination-name="testDestinationName"
+					 	 request-channel="requestChannel"/>
 
 </beans>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
index cd4080b27c..a0252048f2 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
@@ -14,11 +14,11 @@
 
 	<si:channel id="requestChannel"/>
 
-	<jms:jms-gateway id="jmsGateway"
-	                 connection-factory="testConnectionFactory"
-	                 destination="testDestination"
-	                 message-converter="converter"
-	                 request-channel="requestChannel"/>
+	<jms:inbound-gateway id="jmsGateway"
+	                 	 connection-factory="testConnectionFactory"
+	                 	 destination="testDestination"
+	                 	 message-converter="converter"
+	                 	 request-channel="requestChannel"/>
 
 	<bean id="converter" class="org.springframework.integration.jms.config.TestMessageConverter"/>
 
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExpectReplyAttributes.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExpectReplyAttributes.xml
index 5b8ae9a80d..1c182049dd 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExpectReplyAttributes.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExpectReplyAttributes.xml
@@ -16,19 +16,19 @@
 		<si:queue capacity="10"/>	
 	</si:channel>
 
-	<jms:jms-gateway id="defaultGateway"
-	                 destination="testDestination"
-	                 request-channel="requestChannel"/>
+	<jms:inbound-gateway id="defaultGateway"
+	                     destination="testDestination"
+	                     request-channel="requestChannel"/>
 
-	<jms:jms-gateway id="gatewayNotExpectingReply"
-	                 destination="testDestination"
-	                 request-channel="requestChannel"
-	                 expect-reply="false"/>
+	<jms:inbound-gateway id="gatewayNotExpectingReply"
+	                     destination="testDestination"
+	                     request-channel="requestChannel"
+	                     expect-reply="false"/>
 
-	<jms:jms-gateway id="gatewayExpectingReply"
-	                 destination="testDestination"
-	                 request-channel="requestChannel"
-	                 expect-reply="true"/>
+	<jms:inbound-gateway id="gatewayExpectingReply"
+	                     destination="testDestination"
+	                     request-channel="requestChannel"
+	                     expect-reply="true"/>
 
 	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>