diff --git a/pom.xml b/pom.xml
index 5fa3d7c..4848135 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-cli-parent</artifactId>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>spring-cloud-cli-parent</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Spring Platform Cli Parent</name>
-	<description>Spring Platform Cli</description>
+	<name>Spring Cloud Cli Parent</name>
+	<description>Spring Cloud Cli</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -22,21 +22,21 @@
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
-		<module>spring-platform-versions</module>
-		<module>spring-platform-cli</module>
+		<module>spring-cloud-versions</module>
+		<module>spring-cloud-cli</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>
diff --git a/spring-platform-cli/.gitignore b/spring-cloud-cli/.gitignore
similarity index 100%
rename from spring-platform-cli/.gitignore
rename to spring-cloud-cli/.gitignore
diff --git a/spring-platform-cli/README.md b/spring-cloud-cli/README.md
similarity index 100%
rename from spring-platform-cli/README.md
rename to spring-cloud-cli/README.md
diff --git a/spring-platform-cli/pom.xml b/spring-cloud-cli/pom.xml
similarity index 91%
rename from spring-platform-cli/pom.xml
rename to spring-cloud-cli/pom.xml
index b2cc911..5c0240c 100644
--- a/spring-platform-cli/pom.xml
+++ b/spring-cloud-cli/pom.xml
@@ -3,12 +3,12 @@
 	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>
 
-	<groupId>org.springframework.platform</groupId>
-	<artifactId>spring-platform-cli</artifactId>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>spring-cloud-cli</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>spring-platform-cli</name>
+	<name>spring-cloud-cli</name>
 	<description>Spring Patform Cli integration project</description>
 
 	<parent>
@@ -21,15 +21,15 @@
 	<dependencyManagement>
 		<dependencies>
 			<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-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>
@@ -106,7 +106,7 @@
 		</downloadUrl>
 		<site>
 			<id>spring-docs</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-platform-cli/docs/${project.version}
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud-cli/docs/${project.version}
 			</url>
 		</site>
 		<repository>
diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/command/EncryptCommand.java b/spring-cloud-cli/src/main/java/org/springframework/platform/cli/command/EncryptCommand.java
similarity index 100%
rename from spring-platform-cli/src/main/java/org/springframework/platform/cli/command/EncryptCommand.java
rename to spring-cloud-cli/src/main/java/org/springframework/platform/cli/command/EncryptCommand.java
diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
similarity index 100%
rename from spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
similarity index 100%
rename from spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/ConfigServerCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ConfigServerCompilerAutoConfiguration.java
similarity index 100%
rename from spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/ConfigServerCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ConfigServerCompilerAutoConfiguration.java
diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/EurekaClientCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/EurekaClientCompilerAutoConfiguration.java
similarity index 100%
rename from spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/EurekaClientCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/EurekaClientCompilerAutoConfiguration.java
diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/HystrixCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/HystrixCompilerAutoConfiguration.java
similarity index 100%
rename from spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/HystrixCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/HystrixCompilerAutoConfiguration.java
diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/SpringPlatformCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/SpringPlatformCompilerAutoConfiguration.java
similarity index 100%
rename from spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/SpringPlatformCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/SpringPlatformCompilerAutoConfiguration.java
diff --git a/spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/ZuulCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ZuulCompilerAutoConfiguration.java
similarity index 100%
rename from spring-platform-cli/src/main/java/org/springframework/platform/cli/compiler/ZuulCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ZuulCompilerAutoConfiguration.java
diff --git a/spring-platform-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
similarity index 100%
rename from spring-platform-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
rename to spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
diff --git a/spring-platform-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
similarity index 100%
rename from spring-platform-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
rename to spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
diff --git a/spring-platform-cli/src/test/resources/application.yml b/spring-cloud-cli/src/test/resources/application.yml
similarity index 100%
rename from spring-platform-cli/src/test/resources/application.yml
rename to spring-cloud-cli/src/test/resources/application.yml
diff --git a/spring-platform-versions/pom.xml b/spring-cloud-versions/pom.xml
similarity index 74%
rename from spring-platform-versions/pom.xml
rename to spring-cloud-versions/pom.xml
index a2e04dd..7e1c0d6 100644
--- a/spring-platform-versions/pom.xml
+++ b/spring-cloud-versions/pom.xml
@@ -2,14 +2,14 @@
 <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-cli-parent</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-cli-parent</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-platform-components-versions</artifactId>
+	<artifactId>spring-cloud-components-versions</artifactId>
 	<packaging>pom</packaging>
-	<name>Spring Platform Components Versions</name>
-	<description>Spring Platform Components Versions Property File</description>
+	<name>Spring Cloud Components Versions</name>
+	<description>Spring Cloud Components Versions Property File</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -21,28 +21,28 @@
 	<dependencyManagement>
       <dependencies>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-starter</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
             <version>${project.version}</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>${project.version}</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>${project.version}</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>${project.version}</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>${project.version}</version>
           </dependency>
           <dependency>
@@ -69,7 +69,7 @@
 							<goal>effective-pom</goal>
 						</goals>
 						<configuration>
-							<output>${project.build.directory}/effective-pom/spring-platform-components-versions.xml</output>
+							<output>${project.build.directory}/effective-pom/spring-cloud-components-versions.xml</output>
 						</configuration>
 					</execution>
 				</executions>
@@ -113,11 +113,11 @@
 						<configuration>
 							<artifacts>
 								<artifact>
-									<file>${project.build.directory}/generated-resources/spring-platform-components-versions.properties</file>
+									<file>${project.build.directory}/generated-resources/spring-cloud-components-versions.properties</file>
 									<type>properties</type>
 								</artifact>
 								<artifact>
-									<file>${project.build.directory}/effective-pom/spring-platform-components-versions.xml</file>
+									<file>${project.build.directory}/effective-pom/spring-cloud-components-versions.xml</file>
 									<type>effective-pom</type>
 								</artifact>
 							</artifacts>
diff --git a/spring-platform-versions/src/dependency-tree/settings.xml b/spring-cloud-versions/src/dependency-tree/settings.xml
similarity index 100%
rename from spring-platform-versions/src/dependency-tree/settings.xml
rename to spring-cloud-versions/src/dependency-tree/settings.xml
diff --git a/spring-platform-versions/src/main/xslt/dependency-management-to-versions.xsl b/spring-cloud-versions/src/main/xslt/dependency-management-to-versions.xsl
similarity index 100%
rename from spring-platform-versions/src/main/xslt/dependency-management-to-versions.xsl
rename to spring-cloud-versions/src/main/xslt/dependency-management-to-versions.xsl