diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd
index 70b791a813..85290c7a1b 100644
--- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd
+++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd
@@ -353,7 +353,7 @@
 				<xsd:element ref="xpath-expression" minOccurs="0" maxOccurs="1"/>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="id" type="xsd:ID"/>
 			<xsd:attribute name="input-channel" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -419,7 +419,7 @@
 			<xsd:sequence>
 				<xsd:element ref="xpath-expression" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="id" type="xsd:ID"/>
 			<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -451,7 +451,7 @@
 			<xsd:sequence>
 				<xsd:element ref="beans:map" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="optional"/>
+			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 			<xsd:attribute name="expression" type="xsd:string" use="optional"/>
 			<xsd:attribute name="ns-prefix" type="xsd:string" use="optional"/>
 			<xsd:attribute name="ns-uri" type="xsd:string" use="optional"/>
@@ -505,7 +505,7 @@
 			<xsd:sequence>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="id" type="xsd:ID"/>
 			<xsd:attribute name="input-channel" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -542,7 +542,7 @@
 		<xsd:sequence>
 			<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:string" use="optional"/>
+		<xsd:attribute name="id" type="xsd:ID"/>
 		<xsd:attribute name="input-channel" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>