diff --git a/pom.xml b/pom.xml
index 0824933..5025195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
 	<modules>
 		<module>spring-cloud-starter</module>
         <module>spring-cloud-starter-bus-amqp</module>
-        <module>spring-cloud-starter-bus-turbine</module>
         <module>spring-cloud-starter-cloudfoundry</module>
 		<module>spring-cloud-starter-eureka</module>
 		<module>spring-cloud-starter-eureka-server</module>
@@ -32,6 +31,7 @@
 		<module>spring-cloud-starter-hystrix-dashboard</module>
 	    <module>spring-cloud-starter-security</module>
 	    <module>spring-cloud-starter-turbine</module>
+		<module>spring-cloud-starter-turbine-amqp</module>
         <module>spring-cloud-starter-zuul</module>
         <module>spring-cloud-starter-zuul-server</module>
         <module>docs</module>
@@ -65,6 +65,11 @@
 				<artifactId>spring-cloud-cloudfoundry</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-commons</artifactId>
+				<version>1.0.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-security</artifactId>
@@ -87,18 +92,13 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-bus-turbine</artifactId>
+                <artifactId>spring-cloud-starter-turbine-amqp</artifactId>
                 <version>1.0.0.BUILD-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-bus-hystrix</artifactId>
                 <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-bus-turbine</artifactId>
-                <version>1.0.0.BUILD-SNAPSHOT</version>
             </dependency>
 		    <dependency>
 		      <groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-bus-turbine/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-bus-turbine/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index bc8374a..0000000
--- a/spring-cloud-starter-bus-turbine/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: spring-cloud-bus
\ No newline at end of file
diff --git a/spring-cloud-starter-bus-turbine/.jdk8 b/spring-cloud-starter-turbine-amqp/.jdk8
similarity index 100%
rename from spring-cloud-starter-bus-turbine/.jdk8
rename to spring-cloud-starter-turbine-amqp/.jdk8
diff --git a/spring-cloud-starter-bus-turbine/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml
similarity index 75%
rename from spring-cloud-starter-bus-turbine/pom.xml
rename to spring-cloud-starter-turbine-amqp/pom.xml
index d796bf4..1aa9b79 100644
--- a/spring-cloud-starter-bus-turbine/pom.xml
+++ b/spring-cloud-starter-turbine-amqp/pom.xml
@@ -6,9 +6,9 @@
 		<artifactId>spring-cloud-starter-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-cloud-starter-bus-turbine</artifactId>
-	<name>spring-cloud-starter-bus-turbine</name>
-	<description>Spring Cloud Starter Bus Turbine</description>
+	<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
+	<name>spring-cloud-starter-turbine-amqp</name>
+	<description>Spring Cloud Starter Turbine AMQP</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -22,7 +22,7 @@
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-bus</artifactId>
+				<artifactId>spring-cloud-netflix-turbine-amqp</artifactId>
 				<version>${project.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
@@ -32,7 +32,21 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-bus-turbine</artifactId>
+			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.netflix.rxjava</groupId>
+					<artifactId>rxjava-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-turbine-amqp</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
diff --git a/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..e178258
--- /dev/null
+++ b/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: spring-cloud-netflix-turbine-amqp
\ No newline at end of file