diff --git a/spring-integration-samples/README.txt b/spring-integration-samples/README.txt
index 8d0eaee32d..279b723a87 100644
--- a/spring-integration-samples/README.txt
+++ b/spring-integration-samples/README.txt
@@ -16,15 +16,15 @@ You should see output similar to the following:
 [INFO] Reactor Summary:
 [INFO] ------------------------------------------------------------------------
 [INFO] Spring Integration Samples ............................ SUCCESS [2.910s]
-[INFO] Unnamed - cafe:cafe:jar:1.0.3 ......................... SUCCESS [2.750s]
-[INFO] Unnamed - errorhandling:errorhandling:jar:1.0.3 ....... SUCCESS [1.427s]
-[INFO] Unnamed - filecopy:filecopy:jar:1.0.3 ................. SUCCESS [1.257s]
-[INFO] Unnamed - helloworld:helloworld:jar:1.0.3 ............. SUCCESS [0.943s]
-[INFO] Unnamed - jms:jms:jar:1.0.3 ........................... SUCCESS [0.801s]
-[INFO] Unnamed - oddeven:oddeven:jar:1.0.3 ................... SUCCESS [1.009s]
-[INFO] Unnamed - quote:quote:jar:1.0.3 ....................... SUCCESS [0.697s]
-[INFO] Unnamed - ws:ws:jar:1.0.3 ............................. SUCCESS [0.714s]
-[INFO] Unnamed - xml:xml:jar:1.0.3 ........................... SUCCESS [0.690s]
+[INFO] Unnamed - cafe:cafe:jar:2.0.0 ......................... SUCCESS [2.750s]
+[INFO] Unnamed - errorhandling:errorhandling:jar:2.0.0 ....... SUCCESS [1.427s]
+[INFO] Unnamed - filecopy:filecopy:jar:2.0.0 ................. SUCCESS [1.257s]
+[INFO] Unnamed - helloworld:helloworld:jar:2.0.0 ............. SUCCESS [0.943s]
+[INFO] Unnamed - jms:jms:jar:2.0.0 ........................... SUCCESS [0.801s]
+[INFO] Unnamed - oddeven:oddeven:jar:2.0.0 ................... SUCCESS [1.009s]
+[INFO] Unnamed - quote:quote:jar:2.0.0 ....................... SUCCESS [0.697s]
+[INFO] Unnamed - ws:ws:jar:2.0.0 ............................. SUCCESS [0.714s]
+[INFO] Unnamed - xml:xml:jar:2.0.0 ........................... SUCCESS [0.690s]
 [INFO] ------------------------------------------------------------------------
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESSFUL
diff --git a/spring-integration-samples/cafe/README.txt b/spring-integration-samples/cafe/README.txt
index 396f238eba..8087dfe7ed 100644
--- a/spring-integration-samples/cafe/README.txt
+++ b/spring-integration-samples/cafe/README.txt
@@ -8,7 +8,7 @@ Instructions for running CafeDemo sample
 3. This sample is also configured to be a valid OSGi bundle. This means you can deploy generated JAR
    into OSGi environment providing that Spring Integration bundles as well as other prerequisites 
    (e.g., Spring Framework were installed).
-   For example: To deploy it on SpringSource dmServer simply drop cafe-1.0.3.jar file, located 
+   For example: To deploy it on SpringSource dmServer simply drop cafe-[version].jar file, located 
    in the 'target' directory, to the 'pickup' directory of the dmServer. 
    You should see the following output in the trace file:
    
diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
index 942e34edb9..ead59e5ad0 100644
--- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
+++ b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
@@ -5,13 +5,13 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/context/spring-context.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<annotation-config/>
 
diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
index 32cd822190..fa2e904413 100644
--- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
+++ b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
@@ -4,11 +4,11 @@
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
diff --git a/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF b/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
index d0bb28f51f..c346211d51 100644
--- a/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Bundle-Version: 1.0.3
+Bundle-Version: 2.0.0
 Bundle-Name: org.springframework.integration.samples.cafe
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.integration.samples.cafe
 Bundle-Activator: org.springframework.integration.samples.osgi.cafe.CafeBundleActivator
-Import-Package: org.osgi.framework;version="[1.4.0,1.4.0]"
-Import-Library: org.aspectj;version="[1.6.2.RELEASE,1.6.2.RELEASE]",
- org.springframework.spring;version="[2.5.6.A,2.5.6.A]"
-Import-Bundle: org.springframework.integration;version="(1.0.2,1.0.4)",
- org.springframework.integration.stream;version="(1.0.2,1.0.4)"
+Import-Package: org.osgi.framework;version="[1.4.0, 1.4.0]"
+Import-Library: org.aspectj;version="[1.6.2.RELEASE, 1.7.0)",
+ org.springframework.spring;version="[3.0.0, 3.1.0)"
+Import-Bundle: org.springframework.integration;version="[2.0.0, 2.1.0)",
+ org.springframework.integration.stream;version="[2.0.0, 2.1.0)"
diff --git a/spring-integration-samples/cafe/src/main/resources/META-INF/spring/cafe-osgi.xml b/spring-integration-samples/cafe/src/main/resources/META-INF/spring/cafe-osgi.xml
index 32cd822190..fa2e904413 100644
--- a/spring-integration-samples/cafe/src/main/resources/META-INF/spring/cafe-osgi.xml
+++ b/spring-integration-samples/cafe/src/main/resources/META-INF/spring/cafe-osgi.xml
@@ -4,11 +4,11 @@
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
diff --git a/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
index d5737bf37a..98b4e40402 100644
--- a/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
+++ b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
@@ -4,13 +4,13 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/context/spring-context.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<context:component-scan
 		base-package="org.springframework.integration.samples.errorhandling" />
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
index 4de2a4e559..4417e6d2e1 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
@@ -4,11 +4,11 @@
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/file
-			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
+			http://www.springframework.org/schema/integration/file/spring-integration-file.xsd">
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
index cf6ef78845..17c3a5c6ac 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
@@ -4,11 +4,11 @@
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/file
-			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
+			http://www.springframework.org/schema/integration/file/spring-integration-file.xsd">
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
index 7bc4ea221b..1cc3f6638c 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
@@ -4,11 +4,11 @@
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/file
-			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
+			http://www.springframework.org/schema/integration/file/spring-integration-file.xsd">
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
diff --git a/spring-integration-samples/helloworld/README.txt b/spring-integration-samples/helloworld/README.txt
index e82256a13e..23b7ccd34f 100644
--- a/spring-integration-samples/helloworld/README.txt
+++ b/spring-integration-samples/helloworld/README.txt
@@ -8,7 +8,7 @@ Instructions for running HelloWorldDemo sample
 3. This sample is also configured to be a valid OSGi bundle. This means you can deploy generated JAR
    into OSGi environment providing that Spring Integration bundles as well as other prerequisites 
    (e.g., Spring Framework were installed).
-   For example: To deploy it on SpringSource dmServer simply drop helloworld-1.0.3.jar file, located 
+   For example: To deploy it on SpringSource dmServer simply drop helloworld-[version].jar file, located 
    in the 'target' directory, to the 'pickup' directory of the dmServer. 
    You should see the following output in the trace file:
    
diff --git a/spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml b/spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
index 75e622853e..0c355f2607 100644
--- a/spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
+++ b/spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="inputChannel"/>
 
diff --git a/spring-integration-samples/helloworld/src/main/resources/META-INF/MANIFEST.MF b/spring-integration-samples/helloworld/src/main/resources/META-INF/MANIFEST.MF
index 6029fa3492..32e17157d9 100644
--- a/spring-integration-samples/helloworld/src/main/resources/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/helloworld/src/main/resources/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Bundle-Version: 1.0.3
+Bundle-Version: 2.0.0
 Bundle-Name: org.springframework.integration.samples.helloworld
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.integration.samples.helloworld
 Bundle-Activator: org.springframework.integration.samples.osgi.helloworld.HelloWorldBundleActivator
-Import-Package: org.osgi.framework;version="[1.4.0,1.4.0]"
-Import-Library: org.aspectj;version="[1.6.2.RELEASE,1.6.2.RELEASE]",
- org.springframework.spring;version="[2.5.6.A,2.5.6.A]"
-Import-Bundle: org.springframework.integration;version="(1.0.2,1.0.4)"
+Import-Package: org.osgi.framework;version="[1.4.0, 1.4.0]"
+Import-Library: org.aspectj;version="[1.6.2.RELEASE, 1.7.0)",
+ org.springframework.spring;version="[3.0.0, 3.1.0)"
+Import-Bundle: org.springframework.integration;version="[2.0.0, 2.1.0)"
diff --git a/spring-integration-samples/helloworld/src/main/resources/META-INF/spring/helloWorldDemo-osgi.xml b/spring-integration-samples/helloworld/src/main/resources/META-INF/spring/helloWorldDemo-osgi.xml
index 800804b4c1..7400ed2617 100644
--- a/spring-integration-samples/helloworld/src/main/resources/META-INF/spring/helloWorldDemo-osgi.xml
+++ b/spring-integration-samples/helloworld/src/main/resources/META-INF/spring/helloWorldDemo-osgi.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="inputChannel"/>
 
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml
index 772e109fed..72bd27de88 100644
--- a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml
+++ b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<bean id="connectionFactory" class="org.springframework.jms.connection.CachingConnectionFactory">
 		<property name="targetConnectionFactory">
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
index f7cff51de7..898441c00c 100644
--- a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
+++ b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
@@ -5,13 +5,13 @@
 	xmlns:jms="http://www.springframework.org/schema/integration/jms"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jms
-			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd
+			http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<jms:message-driven-channel-adapter id="jmsin"
 			destination="requestQueue"
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
index 63f96ec6d8..5fa49455b4 100644
--- a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
+++ b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
@@ -5,15 +5,15 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:jms="http://www.springframework.org/schema/integration/jms"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/context/spring-context.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jms
-			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd
+			http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<context:component-scan base-package="org.springframework.integration.samples.jms"/>
 
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
index 48511e7af0..33d5b920c9 100644
--- a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
+++ b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
@@ -5,13 +5,13 @@
 	xmlns:jms="http://www.springframework.org/schema/integration/jms"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jms
-			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd
+			http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<stream:stdin-channel-adapter id="stdin" channel="stdinToJmsoutChannel"/>
 
diff --git a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
index f5b1351cc2..3f282ad62d 100644
--- a/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
+++ b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
@@ -5,15 +5,15 @@
 	xmlns:jms="http://www.springframework.org/schema/integration/jms"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/context/spring-context.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jms
-			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd
+			http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<stream:stdin-channel-adapter id="stdin" channel="stdinToJmsoutChannel"/>
 
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
index b313b52528..3d65379288 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
index 29b81e373e..f285ffacc8 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 
diff --git a/spring-integration-samples/osgi-inbound/build.xml b/spring-integration-samples/osgi-inbound/build.xml
index b05809cbc1..cc855777f5 100644
--- a/spring-integration-samples/osgi-inbound/build.xml
+++ b/spring-integration-samples/osgi-inbound/build.xml
@@ -2,7 +2,7 @@
 <project name="osgi-inbound" default="jar">
 
 	<target name="jar">
-		<jar manifest="src/META-INF/MANIFEST.MF" destfile="osgi-inbound-2.0.M1.jar" basedir="bin"/>
+		<jar manifest="src/META-INF/MANIFEST.MF" destfile="osgi-inbound-2.0.0.M1.jar" basedir="bin"/>
 	</target>
 
 </project>
diff --git a/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF b/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
index 12e75b4ed8..21b3dd5cdd 100644
--- a/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Import-Package: org.eclipse.osgi.framework.console;version="1.0.0",
  org.osgi.service.packageadmin;version="1.2.0",
  org.eclipse.osgi.util
 Import-Library: org.springframework.spring;version="[3.0.0, 3.1.0)"
-Import-Bundle: org.springframework.integration;version="[2.0.0,2.1.0)",
- org.springframework.integration.file;version="[2.0.0,2.1.0)"
+Import-Bundle: org.springframework.integration;version="[2.0.0, 2.1.0)",
+ org.springframework.integration.file;version="[2.0.0, 2.1.0)"
diff --git a/spring-integration-samples/osgi-outbound/build.xml b/spring-integration-samples/osgi-outbound/build.xml
index 11eb026bbf..2461f6bc74 100644
--- a/spring-integration-samples/osgi-outbound/build.xml
+++ b/spring-integration-samples/osgi-outbound/build.xml
@@ -2,7 +2,7 @@
 <project name="osgi-outbound" default="jar">
 
 	<target name="jar">
-		<jar manifest="src/META-INF/MANIFEST.MF" destfile="osgi-outbound-2.0.M1.jar" basedir="bin"/>
+		<jar manifest="src/META-INF/MANIFEST.MF" destfile="osgi-outbound-2.0.0.M1.jar" basedir="bin"/>
 	</target>
 
 </project>
diff --git a/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF b/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
index e583e44814..d1e2664d14 100644
--- a/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-Version: 2.0.0
 Bundle-Name: org.springframework.integration.samples.osgi.outbound
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.integration.samples.osgi.outbound
-Import-Bundle: org.springframework.integration;version="[2.0.0,2.1.0)",
- org.springframework.integration.file;version="[2.0.0,2.1.0)"
-Import-Library: org.springframework.spring;version="[3.0.0,3.1.0]"
\ No newline at end of file
+Import-Bundle: org.springframework.integration;version="[2.0.0, 2.1.0)",
+ org.springframework.integration.file;version="[2.0.0, 2.1.0)"
+Import-Library: org.springframework.spring;version="[3.0.0, 3.1.0)"
\ No newline at end of file
diff --git a/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml b/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
index edccdf0537..a90dc5b466 100644
--- a/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
+++ b/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
-
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
+
 	<annotation-config/>
 
 	<inbound-channel-adapter ref="tickerStream" method="nextTicker" channel="tickers">
diff --git a/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
index 85a9c4e2f1..2ca7022e84 100644
--- a/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
+++ b/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
@@ -5,13 +5,13 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
 			http://www.springframework.org/schema/integration/ws
-			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd">
 
 	<!-- This chain receives from the 'fahrenheitChannel' and enriches the request Message by adding
 	     the "soap-action" header value. Then, the Web Service outbound Messaging Gateway invokes the
diff --git a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
index 2d4d058c68..dc9867d3c1 100644
--- a/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
+++ b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
@@ -6,9 +6,9 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.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/xml/spring-integration-xml.xsd
 			http://www.springframework.org/schema/util
 			http://www.springframework.org/schema/util/spring-util.xsd">