diff --git a/org.springframework.integration.adapter/pom.xml b/org.springframework.integration.adapter/pom.xml
index 9bc3685929..51f4b59ace 100644
--- a/org.springframework.integration.adapter/pom.xml
+++ b/org.springframework.integration.adapter/pom.xml
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.adapter</artifactId>
+	<artifactId>spring-integration-adapter</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Adapters</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
+             <artifactId>spring-integration-core</artifactId>
              <version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.springframework.integration.event/pom.xml b/org.springframework.integration.event/pom.xml
index d3af39639a..8b68f25a9e 100644
--- a/org.springframework.integration.event/pom.xml
+++ b/org.springframework.integration.event/pom.xml
@@ -3,19 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.event</artifactId>
+	<artifactId>spring-integration-event</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration ApplicationEvent Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
-             <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.adapter</artifactId>
+             <artifactId>spring-integration-adapter</artifactId>
              <version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.springframework.integration.file/pom.xml b/org.springframework.integration.file/pom.xml
index 509b1462e5..4323e16ff2 100644
--- a/org.springframework.integration.file/pom.xml
+++ b/org.springframework.integration.file/pom.xml
@@ -3,19 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.file</artifactId>
+	<artifactId>spring-integration-file</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration File Adapters</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
-             <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.adapter</artifactId>
+             <artifactId>spring-integration-adapter</artifactId>
              <version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.springframework.integration.httpinvoker/pom.xml b/org.springframework.integration.httpinvoker/pom.xml
index af7e74f9a2..4e1c9ddca0 100644
--- a/org.springframework.integration.httpinvoker/pom.xml
+++ b/org.springframework.integration.httpinvoker/pom.xml
@@ -3,19 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.httpinvoker</artifactId>
+	<artifactId>spring-integration-httpinvoker</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration HttpInvoker Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
-             <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.adapter</artifactId>
+             <artifactId>spring-integration-adapter</artifactId>
              <version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/org.springframework.integration.jms/pom.xml b/org.springframework.integration.jms/pom.xml
index d19b43c084..80b35c9663 100644
--- a/org.springframework.integration.jms/pom.xml
+++ b/org.springframework.integration.jms/pom.xml
@@ -3,24 +3,19 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.jms</artifactId>
+	<artifactId>spring-integration-jms</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration JMS Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
-             <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.adapter</artifactId>
+             <artifactId>spring-integration-adapter</artifactId>
              <version>${project.version}</version>
 		</dependency>
 		<dependency>
 			 <groupId>org.springframework</groupId>
-             <artifactId>org.springframework.jms</artifactId>
+             <artifactId>spring-jms</artifactId>
              <version>${spring.version}</version>
 		</dependency>
 		<dependency>
diff --git a/org.springframework.integration.mail/pom.xml b/org.springframework.integration.mail/pom.xml
index 7fcc984999..e4dd50ac60 100644
--- a/org.springframework.integration.mail/pom.xml
+++ b/org.springframework.integration.mail/pom.xml
@@ -3,19 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.mail</artifactId>
+	<artifactId>spring-integration-mail</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Mail Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
-             <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.adapter</artifactId>
+             <artifactId>spring-integration-adapter</artifactId>
              <version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/org.springframework.integration.rmi/pom.xml b/org.springframework.integration.rmi/pom.xml
index 8747de4a35..647eacf162 100644
--- a/org.springframework.integration.rmi/pom.xml
+++ b/org.springframework.integration.rmi/pom.xml
@@ -3,19 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.rmi</artifactId>
+	<artifactId>spring-integration-rmi</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration RMI Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
-             <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.adapter</artifactId>
+             <artifactId>spring-integration-adapter</artifactId>
              <version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.springframework.integration.samples/pom.xml b/org.springframework.integration.samples/pom.xml
index 19d33a5c8d..541b4b0cea 100644
--- a/org.springframework.integration.samples/pom.xml
+++ b/org.springframework.integration.samples/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.samples</artifactId>
+	<artifactId>spring-integration-samples</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Samples</name>
 	<version>1.0.1.RELEASE</version>
@@ -36,22 +36,17 @@
 		</dependency>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
-             <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.ws</artifactId>
+             <artifactId>spring-integration-ws</artifactId>
              <version>${project.version}</version>
 		</dependency>
 			<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.xml</artifactId>
+             <artifactId>spring-integration-xml</artifactId>
              <version>${project.version}</version>
 		</dependency>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.jms</artifactId>
+             <artifactId>spring-integration-jms</artifactId>
              <version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.springframework.integration.security/pom.xml b/org.springframework.integration.security/pom.xml
index 992beae591..86175e7821 100644
--- a/org.springframework.integration.security/pom.xml
+++ b/org.springframework.integration.security/pom.xml
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.security</artifactId>
+	<artifactId>spring-integration-security</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Security Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
+             <artifactId>spring-integration-core</artifactId>
              <version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/org.springframework.integration.stream/pom.xml b/org.springframework.integration.stream/pom.xml
index fac15d4db0..f26c0f173d 100644
--- a/org.springframework.integration.stream/pom.xml
+++ b/org.springframework.integration.stream/pom.xml
@@ -3,19 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.stream</artifactId>
+	<artifactId>spring-integration-stream</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Stream Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration</artifactId>
-             <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework.integration</groupId>
-             <artifactId>org.springframework.integration.adapter</artifactId>
+             <artifactId>spring-integration-adapter</artifactId>
              <version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.springframework.integration.ws/pom.xml b/org.springframework.integration.ws/pom.xml
index 5dfeb6fe42..dad592f1c8 100644
--- a/org.springframework.integration.ws/pom.xml
+++ b/org.springframework.integration.ws/pom.xml
@@ -3,37 +3,28 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.ws</artifactId>
+	<artifactId>spring-integration-ws</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Web Services Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
-			<artifactId>org.springframework.integration</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>org.springframework.integration.adapter</artifactId>
+			<artifactId>spring-integration-adapter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.xml.messaging.saaj</groupId>
 			<artifactId>saaj-impl</artifactId>
 			<version>1.3</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.soap</groupId>
 			<artifactId>saaj-api</artifactId>
 			<version>1.3</version>
+			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.stream</groupId>
-			<artifactId>stax-api</artifactId>
-			<!-- 1.0.1 not in repo1  -->
-			<version>1.0</version>
-		</dependency> 
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-ws-core</artifactId>
diff --git a/org.springframework.integration.xml/pom.xml b/org.springframework.integration.xml/pom.xml
index 20708b57bd..dbf72fc010 100644
--- a/org.springframework.integration.xml/pom.xml
+++ b/org.springframework.integration.xml/pom.xml
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration.xml</artifactId>
+	<artifactId>spring-integration-xml</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration XML Support</name>
 	<version>1.0.1.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
-			<artifactId>org.springframework.integration</artifactId>
+			<artifactId>spring-integration-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -18,12 +18,14 @@
 			<artifactId>activation</artifactId>
 			<!--  spring source repository has 1.1.1 but not in repo1 -->
 			<version>1.1</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<artifactId>jaxb-api</artifactId>
 			<groupId>javax.xml.bind</groupId>
 			<!--  spring source repository has 2.1.7 -->
 			<version>2.1</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
diff --git a/org.springframework.integration/pom.xml b/org.springframework.integration/pom.xml
index 6a87bae5ac..d444aff62d 100644
--- a/org.springframework.integration/pom.xml
+++ b/org.springframework.integration/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
-	<artifactId>org.springframework.integration</artifactId>
+	<artifactId>spring-integration-core</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Core</name>
 	<version>1.0.1.RELEASE</version>
@@ -11,11 +11,6 @@
 		<dependency>
 			 <groupId>org.springframework</groupId>
              <artifactId>spring-aop</artifactId>
-             <version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			 <groupId>org.springframework</groupId>
-             <artifactId>spring-aop</artifactId>
              <version>${spring.version}</version>
 		</dependency>
 		<dependency>