diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
index 5862a7624c..c049a37d58 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
@@ -42,7 +42,7 @@ public class IntegrationNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("outbound-channel-adapter", new MethodInvokingOutboundChannelAdapterParser());
 		registerBeanDefinitionParser("gateway", new GatewayParser());
 		registerBeanDefinitionParser("selector-chain", new SelectorChainParser());
-		registerBeanDefinitionParser("pool-executor", new PoolExecutorParser());
+		registerBeanDefinitionParser("thread-pool-task-executor", new PoolExecutorParser());
 	}
 
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
index 5684f0b21d..608edfb60e 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
@@ -324,7 +324,7 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="pool-executor">
+	<xsd:element name="thread-pool-task-executor">
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
index 2c9ac5d629..e65de1ba51 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
@@ -13,6 +13,6 @@
 
 	<publish-subscribe-channel id="channelWithTaskExecutor" task-executor="pool"/>
 
-	<pool-executor id="pool"/>
+	<thread-pool-task-executor id="pool"/>
 
 </beans:beans>