diff --git a/pom.xml b/pom.xml
index 3e5b6f4a..660a0f75 100644
--- a/pom.xml
+++ b/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.amqp</groupId>
-	<artifactId>spring-amqp</artifactId>
+	<artifactId>spring-amqp-dist</artifactId>
 	<name>Spring AMQP Project</name>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
diff --git a/spring-amqp-core/pom.xml b/spring-amqp-core/pom.xml
index 022d6488..0df89254 100644
--- a/spring-amqp-core/pom.xml
+++ b/spring-amqp-core/pom.xml
@@ -7,7 +7,7 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-amqp-parent/pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-amqp-core</artifactId>
+	<artifactId>spring-amqp</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring AMQP Core</name>
 	<dependencies>
diff --git a/spring-amqp-parent/pom.xml b/spring-amqp-parent/pom.xml
index fd7ed61b..d18d2a9a 100644
--- a/spring-amqp-parent/pom.xml
+++ b/spring-amqp-parent/pom.xml
@@ -86,7 +86,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.amqp</groupId>
-				<artifactId>spring-amqp-core</artifactId>
+				<artifactId>spring-amqp</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
diff --git a/spring-rabbit-admin/pom.xml b/spring-rabbit-admin/pom.xml
index a57973fb..c0d9efba 100644
--- a/spring-rabbit-admin/pom.xml
+++ b/spring-rabbit-admin/pom.xml
@@ -15,6 +15,10 @@
 			<groupId>com.rabbitmq</groupId>
 			<artifactId>amqp-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.amqp</groupId>
+			<artifactId>spring-amqp</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-rabbit</artifactId>
@@ -23,10 +27,6 @@
 			<groupId>org.springframework.amqp</groupId>
 			<artifactId>spring-erlang</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-amqp-core</artifactId>
-		</dependency>
 
 		<!--  Spring -->
 		<dependency>
diff --git a/spring-rabbit/pom.xml b/spring-rabbit/pom.xml
index 79037b6e..4f131f01 100644
--- a/spring-rabbit/pom.xml
+++ b/spring-rabbit/pom.xml
@@ -18,7 +18,7 @@
 
 		<dependency>
 			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-amqp-core</artifactId>
+			<artifactId>spring-amqp</artifactId>
 		</dependency>
 
 		<!--  Spring -->