diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
index f20f411d68..fa9f309c02 100644
--- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
+++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
@@ -1,92 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/integration-xml"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:tool="http://www.springframework.org/schema/tool"
-	targetNamespace="http://www.springframework.org/schema/integration-xml"
-	elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xsd:import namespace="http://www.springframework.org/schema/beans" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+<xsd:schema xmlns="http://www.springframework.org/schema/integration/xml"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/integration/xml"
+		elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+
 	<xsd:annotation>
-		<xsd:documentation><![CDATA[
-       Defines the configuration elements for Spring Integration's XML support.
-               ]]></xsd:documentation>
+		<xsd:documentation>
+	Defines the configuration elements for Spring Integration's XML support.
+		</xsd:documentation>
 	</xsd:annotation>
+
 	<xsd:element name="marshalling-transformer">
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
-					Defines a XML marshalling transformer.
+	Defines an XML marshalling transformer.
 				</xsd:documentation>
 			</xsd:annotation>
-			<xsd:attribute name="id" type="xsd:string" use="required" />
-			<xsd:attribute name="marshaller" type="xsd:string" use="required" />
+			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="marshaller" type="xsd:string" use="required"/>
 			<xsd:attribute name="result-type" use="optional">
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="DOMResult" />
-						<xsd:enumeration value="StringResult" />
+						<xsd:enumeration value="DOMResult"/>
+						<xsd:enumeration value="StringResult"/>
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
-			<xsd:attribute name="result-factory" use="optional" />
-			<xsd:attribute name="result-transformer" type="xsd:string"
-				use="optional" />
+			<xsd:attribute name="result-factory" use="optional"/>
+			<xsd:attribute name="result-transformer" type="xsd:string" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
+
 	<xsd:element name="unmarshalling-transformer">
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
-					Defines a XML unmarshalling transformer.
+	Defines an XML unmarshalling transformer.
 				</xsd:documentation>
 			</xsd:annotation>
-			<xsd:attribute name="id" type="xsd:string" use="required" />
-			<xsd:attribute name="unmarshaller" type="xsd:string"
-				use="required" />
+			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="unmarshaller" type="xsd:string" use="required"/>
 		</xsd:complexType>
 	</xsd:element>
+
 	<xsd:element name="xslt-transformer">
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
-					Defines a XML XSLT transformer.
+	Defines an XSLT transformer.
 				</xsd:documentation>
 			</xsd:annotation>
-			<xsd:attribute name="id" type="xsd:string" use="required" />
-			<xsd:attribute name="xsl-resource" type="xsd:string"
-				use="optional" />
-			<xsd:attribute name="xsl-templates" type="xsd:string"
-				use="optional" />
-			<xsd:attribute name="source-factory" type="xsd:string"
-				use="optional" />
-			<xsd:attribute name="result-factory" type="xsd:string"
-				use="optional" />
+			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="xsl-resource" type="xsd:string" use="optional"/>
+			<xsd:attribute name="xsl-templates" type="xsd:string" use="optional"/>
+			<xsd:attribute name="source-factory" type="xsd:string" use="optional"/>
+			<xsd:attribute name="result-factory" type="xsd:string" use="optional"/>
 			<xsd:attribute name="result-type" use="optional">
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="DOMResult" />
-						<xsd:enumeration value="StringResult" />
+						<xsd:enumeration value="DOMResult"/>
+						<xsd:enumeration value="StringResult"/>
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
-			<xsd:attribute name="result-transformer" type="xsd:string"
-				use="optional" />
+			<xsd:attribute name="result-transformer" type="xsd:string" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
+
 	<xsd:element name="xpath-router">
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
-					Defines a XPath router.
+	Defines an XPath router.
 				</xsd:documentation>
 			</xsd:annotation>
-			<xsd:attribute name="id" type="xsd:string" use="required" />
-			<xsd:attribute name="xpath-expression-ref" type="xsd:string"
-				use="optional" />
-			<xsd:attribute name="xpath-expression" type="xsd:string"
-				use="optional" />
-			<xsd:attribute name="multi-channel" type="xsd:boolean"
-				default="false" />
+			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional"/>
+			<xsd:attribute name="xpath-expression" type="xsd:string" use="optional"/>
+			<xsd:attribute name="multi-channel" type="xsd:boolean" default="false"/>
 		</xsd:complexType>
 	</xsd:element>
+
 </xsd:schema>
\ No newline at end of file
diff --git a/org.springframework.integration.xml/src/main/resources/META-INF/spring.handlers b/org.springframework.integration.xml/src/main/resources/META-INF/spring.handlers
index 6cbe04a450..9ec3a49520 100644
--- a/org.springframework.integration.xml/src/main/resources/META-INF/spring.handlers
+++ b/org.springframework.integration.xml/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.springframework.org/schema/integration-xml=org.springframework.integration.xml.config.IntegrationXmlNamespaceHandler
\ No newline at end of file
+http\://www.springframework.org/schema/integration/xml=org.springframework.integration.xml.config.IntegrationXmlNamespaceHandler
\ No newline at end of file
diff --git a/org.springframework.integration.xml/src/main/resources/META-INF/spring.schemas b/org.springframework.integration.xml/src/main/resources/META-INF/spring.schemas
index 7e094c23d6..3682f0c9f9 100644
--- a/org.springframework.integration.xml/src/main/resources/META-INF/spring.schemas
+++ b/org.springframework.integration.xml/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.springframework.org/schema/integration/spring-integration-xml-1.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
\ No newline at end of file
+http\://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
\ No newline at end of file
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests-context.xml
index c2d17cf46c..02e46d21e2 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests-context.xml
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests-context.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:si-xml="http://www.springframework.org/schema/integration-xml"
+	xmlns:si-xml="http://www.springframework.org/schema/integration/xml"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration-xml http://www.springframework.org/schema/integration/spring-integration-xml-1.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration/xml
+			http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<bean id="messageChannel"
-		class="org.springframework.integration.channel.QueueChannel" />
+	<bean id="messageChannel" class="org.springframework.integration.channel.QueueChannel" />
 
 	<si:message-bus/>
 
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml
index eb817cf840..3b19d40cd2 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:si-xml="http://www.springframework.org/schema/integration-xml"
+	xmlns:si-xml="http://www.springframework.org/schema/integration/xml"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration-xml http://www.springframework.org/schema/integration/spring-integration-xml-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration/xml
+			http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd">
 
 	<si-xml:marshalling-transformer
 		id="marshallingTransformerNoResultFactory" marshaller="marshaller" />
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml
index 1c657954d1..9b37e65f9a 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:si-xml="http://www.springframework.org/schema/integration-xml"
+	xmlns:si-xml="http://www.springframework.org/schema/integration/xml"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration-xml http://www.springframework.org/schema/integration/spring-integration-xml-1.0.xsd">
-
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration/xml
+			http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd">
 
 	<si-xml:unmarshalling-transformer id="defaultUnmarshaller" unmarshaller="unmarshaller" />
 
-	<bean id="unmarshaller"
-		class="org.springframework.integration.xml.config.StubUnmarshaller" />
-		
+	<bean id="unmarshaller" class="org.springframework.integration.xml.config.StubUnmarshaller" />
+
 </beans>
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml
index dfa34bf3f3..2d027bacdd 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:si-xml="http://www.springframework.org/schema/integration-xml"
+	xmlns:si-xml="http://www.springframework.org/schema/integration/xml"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration-xml http://www.springframework.org/schema/integration/spring-integration-xml-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration/xml
+			http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd">
 
 	<si-xml:xslt-transformer id="xsltTransformerWithResource"
 		xsl-resource="org/springframework/integration/xml/config/test.xsl" />
 
-
 	<si-xml:xslt-transformer id="xsltTransformerWithTemplates"
 		xsl-templates="templates" />
 
 	<si-xml:xslt-transformer id="xsltTransformerWithTemplatesAndResultTransformer"
 		xsl-templates="templates" result-transformer="resultTransformer" />
-		
+
 	<si-xml:xslt-transformer id="xsltTransformerWithTemplatesAndResultFactory"
 		xsl-templates="templates" result-factory="stubResultFactory" />
-		
+
 	<si-xml:xslt-transformer id="xsltTransformerWithTemplatesAndStringResulType"
 		xsl-templates="templates" result-type="StringResult" />	
-	
 
-	<bean id="templates"
-		class="org.springframework.integration.xml.config.TestTemplatesFactory" />
-		
-		
-	<bean id="resultTransformer"
-		class="org.springframework.integration.xml.config.StubResultTransformer">
+
+	<bean id="templates" class="org.springframework.integration.xml.config.TestTemplatesFactory" />
+
+	<bean id="resultTransformer" class="org.springframework.integration.xml.config.StubResultTransformer">
 		<constructor-arg value="testReturn" />
 	</bean>
-		
+
 	<bean id="stubResultFactory" class="org.springframework.integration.xml.config.StubResultFactory"/>
 
 </beans>