diff --git a/pom.xml b/pom.xml
index d02673c..a749bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,12 @@
 		<version>1.1.5.RELEASE</version>
 		<relativePath/>
 	</parent>
-	<groupId>org.springframework.platform</groupId>
-	<artifactId>spring-platform-starters</artifactId>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>spring-cloud-starters</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Spring Platform Starters</name>
-	<description>Spring Platform Starters</description>
+	<name>Spring Cloud Starters</name>
+	<description>Spring Cloud Starters</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -22,62 +22,62 @@
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
-		<module>spring-platform-starter</module>
-        <module>spring-platform-starter-bus-amqp</module>
-		<module>spring-platform-starter-cloudfoundry</module>
-		<module>spring-platform-starter-eureka</module>
-		<module>spring-platform-starter-hystrix</module>
-        <module>spring-platform-starter-zuul</module>
+		<module>spring-cloud-starter</module>
+        <module>spring-cloud-starter-bus-amqp</module>
+		<module>spring-cloud-starter-cloudfoundry</module>
+		<module>spring-cloud-starter-eureka</module>
+		<module>spring-cloud-starter-hystrix</module>
+        <module>spring-cloud-starter-zuul</module>
 	</modules>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.platform</groupId>
-				<artifactId>spring-platform-config</artifactId>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-config</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.platform</groupId>
-				<artifactId>spring-platform-netflix</artifactId>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.platform</groupId>
-				<artifactId>spring-platform-cloudfoundry</artifactId>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-cloudfoundry</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 		    <dependency>
-		      <groupId>org.springframework.platform</groupId>
-			  <artifactId>spring-platform-starter</artifactId>
+		      <groupId>org.springframework.cloud</groupId>
+			  <artifactId>spring-cloud-starter</artifactId>
 			  <version>1.0.0.BUILD-SNAPSHOT</version>
 		    </dependency>
 		    <dependency>
-		      <groupId>org.springframework.platform</groupId>
-			  <artifactId>spring-platform-starter-cloudfoundry</artifactId>
+		      <groupId>org.springframework.cloud</groupId>
+			  <artifactId>spring-cloud-starter-cloudfoundry</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 		    </dependency>
             <dependency>
-                <groupId>org.springframework.platform</groupId>
-                <artifactId>spring-platform-starter-bus-amqp</artifactId>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-bus-amqp</artifactId>
                 <version>1.0.0.BUILD-SNAPSHOT</version>
             </dependency>
 		    <dependency>
-		      <groupId>org.springframework.platform</groupId>
-			  <artifactId>spring-platform-starter-eureka</artifactId>
+		      <groupId>org.springframework.cloud</groupId>
+			  <artifactId>spring-cloud-starter-eureka</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 		    </dependency>
 		    <dependency>
-		      <groupId>org.springframework.platform</groupId>
-			  <artifactId>spring-platform-starter-hystrix</artifactId>
+		      <groupId>org.springframework.cloud</groupId>
+			  <artifactId>spring-cloud-starter-hystrix</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 		    </dependency>
             <dependency>
-                <groupId>org.springframework.platform</groupId>
-                <artifactId>spring-platform-starter-zuul</artifactId>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-zuul</artifactId>
                 <version>1.0.0.BUILD-SNAPSHOT</version>
             </dependency>
 		</dependencies>
diff --git a/spring-platform-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml
similarity index 72%
rename from spring-platform-starter-bus-amqp/pom.xml
rename to spring-cloud-starter-bus-amqp/pom.xml
index 4598394..36ce9f5 100644
--- a/spring-platform-starter-bus-amqp/pom.xml
+++ b/spring-cloud-starter-bus-amqp/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.platform</groupId>
-		<artifactId>spring-platform-starters</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starters</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-platform-starter-bus-amqp</artifactId>
-	<name>spring-platform-starter-bus-amqp</name>
-	<description>Spring Platform Starter</description>
+	<artifactId>spring-cloud-starter-bus-amqp</artifactId>
+	<name>spring-cloud-starter-bus-amqp</name>
+	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -19,8 +19,8 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-starter</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
 		</dependency>
         <dependency>
             <groupId>org.springframework.integration</groupId>
@@ -36,8 +36,8 @@
             <artifactId>spring-integration-event</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.platform</groupId>
-            <artifactId>spring-platform-bus</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-bus</artifactId>
             <version>1.0.0.BUILD-SNAPSHOT</version>
         </dependency>
 	</dependencies>
diff --git a/spring-platform-starter-bus-amqp/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-bus-amqp/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-platform-starter-bus-amqp/src/main/resources/META-INF/spring.provides
rename to spring-cloud-starter-bus-amqp/src/main/resources/META-INF/spring.provides
diff --git a/spring-platform-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml
similarity index 64%
rename from spring-platform-starter-cloudfoundry/pom.xml
rename to spring-cloud-starter-cloudfoundry/pom.xml
index 9284962..afd3bb4 100644
--- a/spring-platform-starter-cloudfoundry/pom.xml
+++ b/spring-cloud-starter-cloudfoundry/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.platform</groupId>
-		<artifactId>spring-platform-starters</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starters</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-platform-starter-cloudfoundry</artifactId>
-	<name>spring-platform-starter-cloudfoundry</name>
-	<description>Spring Platform Starter</description>
+	<artifactId>spring-cloud-starter-cloudfoundry</artifactId>
+	<name>spring-cloud-starter-cloudfoundry</name>
+	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -19,12 +19,12 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-starter</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-cloudfoundry</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-cloudfoundry</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/spring-platform-starter-cloudfoundry/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-cloudfoundry/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-platform-starter-cloudfoundry/src/main/resources/META-INF/spring.provides
rename to spring-cloud-starter-cloudfoundry/src/main/resources/META-INF/spring.provides
diff --git a/spring-platform-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml
similarity index 63%
rename from spring-platform-starter-eureka/pom.xml
rename to spring-cloud-starter-eureka/pom.xml
index 744c3fd..bbbdc87 100644
--- a/spring-platform-starter-eureka/pom.xml
+++ b/spring-cloud-starter-eureka/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.platform</groupId>
-		<artifactId>spring-platform-starters</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starters</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-platform-starter-eureka</artifactId>
-	<name>spring-platform-starter-eureka</name>
-	<description>Spring Platform Starter</description>
+	<artifactId>spring-cloud-starter-eureka</artifactId>
+	<name>spring-cloud-starter-eureka</name>
+	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -19,12 +19,12 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-starter</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-netflix-core</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.eureka</groupId>
diff --git a/spring-platform-starter-eureka/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-eureka/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-platform-starter-eureka/src/main/resources/META-INF/spring.provides
rename to spring-cloud-starter-eureka/src/main/resources/META-INF/spring.provides
diff --git a/spring-platform-starter-hystrix/pom.xml b/spring-cloud-starter-hystrix/pom.xml
similarity index 73%
rename from spring-platform-starter-hystrix/pom.xml
rename to spring-cloud-starter-hystrix/pom.xml
index 105c00d..11f4d49 100644
--- a/spring-platform-starter-hystrix/pom.xml
+++ b/spring-cloud-starter-hystrix/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.platform</groupId>
-		<artifactId>spring-platform-starters</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starters</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-platform-starter-hystrix</artifactId>
-	<name>spring-platform-starter-hystrix</name>
-	<description>Spring Platform Starter</description>
+	<artifactId>spring-cloud-starter-hystrix</artifactId>
+	<name>spring-cloud-starter-hystrix</name>
+	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -19,12 +19,12 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-starter</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-netflix-core</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.netflix.hystrix</groupId>
diff --git a/spring-platform-starter-hystrix/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-hystrix/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-platform-starter-hystrix/src/main/resources/META-INF/spring.provides
rename to spring-cloud-starter-hystrix/src/main/resources/META-INF/spring.provides
diff --git a/spring-platform-starter-zuul/pom.xml b/spring-cloud-starter-zuul/pom.xml
similarity index 74%
rename from spring-platform-starter-zuul/pom.xml
rename to spring-cloud-starter-zuul/pom.xml
index 0b3548e..ec7505b 100644
--- a/spring-platform-starter-zuul/pom.xml
+++ b/spring-cloud-starter-zuul/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.platform</groupId>
-		<artifactId>spring-platform-starters</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starters</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-platform-starter-zuul</artifactId>
-	<name>spring-platform-starter-zuul</name>
-	<description>Spring Platform Starter</description>
+	<artifactId>spring-cloud-starter-zuul</artifactId>
+	<name>spring-cloud-starter-zuul</name>
+	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -19,16 +19,16 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-starter</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
 		</dependency>
         <dependency>
-            <groupId>org.springframework.platform</groupId>
-            <artifactId>spring-platform-starter-hystrix</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-hystrix</artifactId>
         </dependency>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-netflix-core</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-core</artifactId>
 		</dependency>
         <dependency>
             <groupId>com.netflix.ribbon</groupId>
diff --git a/spring-platform-starter-zuul/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-zuul/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-platform-starter-zuul/src/main/resources/META-INF/spring.provides
rename to spring-cloud-starter-zuul/src/main/resources/META-INF/spring.provides
diff --git a/spring-platform-starter/pom.xml b/spring-cloud-starter/pom.xml
similarity index 70%
rename from spring-platform-starter/pom.xml
rename to spring-cloud-starter/pom.xml
index 9d4307b..0204a7b 100644
--- a/spring-platform-starter/pom.xml
+++ b/spring-cloud-starter/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.platform</groupId>
-		<artifactId>spring-platform-starters</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-starters</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-platform-starter</artifactId>
-	<name>spring-platform-starter</name>
-	<description>Spring Platform Starter</description>
+	<artifactId>spring-cloud-starter</artifactId>
+	<name>spring-cloud-starter</name>
+	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -19,8 +19,8 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-config-client</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/spring-platform-starter/src/main/resources/META-INF/spring.provides b/spring-cloud-starter/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-platform-starter/src/main/resources/META-INF/spring.provides
rename to spring-cloud-starter/src/main/resources/META-INF/spring.provides