diff --git a/pom.xml b/pom.xml
index 8fcfcc69..766fdc84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-	<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>
 	<packaging>pom</packaging>
-	<name>Spring Platform Config</name>
-	<description>Spring Platform Config</description>
-	<url>http://projects.spring.io/spring-platform/</url>
+	<name>Spring Cloud Config</name>
+	<description>Spring Cloud Config</description>
+	<url>http://projects.spring.io/spring-cloud/</url>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
@@ -15,9 +15,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<modules>
-	  <module>spring-platform-config-client</module>
-	  <module>spring-platform-config-server</module>
-	  <module>spring-platform-config-sample</module>
+	  <module>spring-cloud-config-client</module>
+	  <module>spring-cloud-config-server</module>
+	  <module>spring-cloud-config-sample</module>
 	</modules>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -30,7 +30,7 @@
 		</license>
 	</licenses>
 	<scm>
-		<url>https://github.com/spring-platform/spring-platform-config</url>
+		<url>https://github.com/spring-cloud/spring-cloud-config</url>
 	</scm>
 	<developers>
 		<developer>
@@ -139,13 +139,13 @@
     <dependencyManagement>
       <dependencies>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-config-client</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-client</artifactId>
 	        <version>1.0.0.BUILD-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-config-server</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-server</artifactId>
 	        <version>1.0.0.BUILD-SNAPSHOT</version>
 		</dependency>
       </dependencies>
diff --git a/spring-platform-config-client/README.md b/spring-cloud-config-client/README.md
similarity index 100%
rename from spring-platform-config-client/README.md
rename to spring-cloud-config-client/README.md
diff --git a/spring-platform-config-client/pom.xml b/spring-cloud-config-client/pom.xml
similarity index 88%
rename from spring-platform-config-client/pom.xml
rename to spring-cloud-config-client/pom.xml
index 8971f6ca..5fab82a9 100644
--- a/spring-platform-config-client/pom.xml
+++ b/spring-cloud-config-client/pom.xml
@@ -3,13 +3,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-platform-config-client</artifactId>
+	<artifactId>spring-cloud-config-client</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring Platform Config Client</name>
+	<name>Spring Cloud Config Client</name>
 
 	<parent>
-		<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>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/autoconfigure/RefreshAutoConfiguration.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/autoconfigure/RefreshAutoConfiguration.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/autoconfigure/RefreshAutoConfiguration.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapApplicationListener.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapApplicationListener.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapApplicationListener.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapApplicationListener.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapConfiguration.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapConfiguration.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapConfiguration.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/config/Environment.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/config/Environment.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/config/Environment.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/config/Environment.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/config/PropertySource.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/config/PropertySource.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/config/PropertySource.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/config/PropertySource.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/config/client/ConfigServicePropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/ConfigServicePropertySourceLocator.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/config/client/ConfigServicePropertySourceLocator.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/ConfigServicePropertySourceLocator.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/config/client/PropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/PropertySourceLocator.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/config/client/PropertySourceLocator.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/PropertySourceLocator.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/config/client/RefreshEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/RefreshEndpoint.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/config/client/RefreshEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/RefreshEndpoint.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/config/BeanLifecycleDecorator.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/BeanLifecycleDecorator.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/config/BeanLifecycleDecorator.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/BeanLifecycleDecorator.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/config/StandardBeanLifecycleDecorator.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/StandardBeanLifecycleDecorator.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/config/StandardBeanLifecycleDecorator.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/StandardBeanLifecycleDecorator.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/config/annotation/RefreshScope.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/annotation/RefreshScope.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/config/annotation/RefreshScope.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/annotation/RefreshScope.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentChangeEvent.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentChangeEvent.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentChangeEvent.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentChangeEvent.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManager.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManager.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManager.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManager.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManagerMvcEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManagerMvcEndpoint.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManagerMvcEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManagerMvcEndpoint.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinder.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinder.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinder.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinder.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/restart/RestartEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartEndpoint.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/restart/RestartEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartEndpoint.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/restart/RestartListener.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartListener.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/restart/RestartListener.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartListener.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/restart/RestartMvcEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartMvcEndpoint.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/restart/RestartMvcEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartMvcEndpoint.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/GenericScope.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/GenericScope.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/GenericScope.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/GenericScope.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/ScopeCache.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/ScopeCache.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/ScopeCache.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/ScopeCache.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/StandardScopeCache.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/StandardScopeCache.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/StandardScopeCache.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/StandardScopeCache.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/refresh/RefreshScope.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/refresh/RefreshScope.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/refresh/RefreshScope.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/refresh/RefreshScope.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadLocalScopeCache.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadLocalScopeCache.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadLocalScopeCache.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadLocalScopeCache.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadScope.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadScope.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadScope.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadScope.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/endpoint/GenericPostableMvcEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/endpoint/GenericPostableMvcEndpoint.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/endpoint/GenericPostableMvcEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/endpoint/GenericPostableMvcEndpoint.java
diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/logging/LoggingRebinder.java b/spring-cloud-config-client/src/main/java/org/springframework/platform/logging/LoggingRebinder.java
similarity index 100%
rename from spring-platform-config-client/src/main/java/org/springframework/platform/logging/LoggingRebinder.java
rename to spring-cloud-config-client/src/main/java/org/springframework/platform/logging/LoggingRebinder.java
diff --git a/spring-platform-config-client/src/main/resources/META-INF/spring.factories b/spring-cloud-config-client/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-platform-config-client/src/main/resources/META-INF/spring.factories
rename to spring-cloud-config-client/src/main/resources/META-INF/spring.factories
diff --git a/spring-platform-config-client/src/test/java/org/springframework/platform/bootstrap/BootstrapConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/platform/bootstrap/BootstrapConfigurationTests.java
similarity index 100%
rename from spring-platform-config-client/src/test/java/org/springframework/platform/bootstrap/BootstrapConfigurationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/platform/bootstrap/BootstrapConfigurationTests.java
diff --git a/spring-platform-config-client/src/test/java/org/springframework/platform/context/environment/EnvironmentManagerIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/platform/context/environment/EnvironmentManagerIntegrationTests.java
similarity index 100%
rename from spring-platform-config-client/src/test/java/org/springframework/platform/context/environment/EnvironmentManagerIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/platform/context/environment/EnvironmentManagerIntegrationTests.java
diff --git a/spring-platform-config-client/src/test/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java
similarity index 100%
rename from spring-platform-config-client/src/test/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java
diff --git a/spring-platform-config-client/src/test/java/org/springframework/platform/context/restart/RestartIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/platform/context/restart/RestartIntegrationTests.java
similarity index 100%
rename from spring-platform-config-client/src/test/java/org/springframework/platform/context/restart/RestartIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/platform/context/restart/RestartIntegrationTests.java
diff --git a/spring-platform-config-client/src/test/java/org/springframework/platform/context/scope/refresh/MoreRefreshScopeIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/MoreRefreshScopeIntegrationTests.java
similarity index 100%
rename from spring-platform-config-client/src/test/java/org/springframework/platform/context/scope/refresh/MoreRefreshScopeIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/MoreRefreshScopeIntegrationTests.java
diff --git a/spring-platform-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeConcurrencyTests.java b/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeConcurrencyTests.java
similarity index 100%
rename from spring-platform-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeConcurrencyTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeConcurrencyTests.java
diff --git a/spring-platform-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeIntegrationTests.java
similarity index 100%
rename from spring-platform-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeIntegrationTests.java
diff --git a/spring-platform-config-client/src/test/java/org/springframework/platform/logging/LoggingRebinderTests.java b/spring-cloud-config-client/src/test/java/org/springframework/platform/logging/LoggingRebinderTests.java
similarity index 100%
rename from spring-platform-config-client/src/test/java/org/springframework/platform/logging/LoggingRebinderTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/platform/logging/LoggingRebinderTests.java
diff --git a/spring-platform-config-client/src/test/resources/application.properties b/spring-cloud-config-client/src/test/resources/application.properties
similarity index 100%
rename from spring-platform-config-client/src/test/resources/application.properties
rename to spring-cloud-config-client/src/test/resources/application.properties
diff --git a/spring-platform-config-client/src/test/resources/bootstrap.properties b/spring-cloud-config-client/src/test/resources/bootstrap.properties
similarity index 100%
rename from spring-platform-config-client/src/test/resources/bootstrap.properties
rename to spring-cloud-config-client/src/test/resources/bootstrap.properties
diff --git a/spring-platform-config-client/src/test/resources/logback.xml b/spring-cloud-config-client/src/test/resources/logback.xml
similarity index 100%
rename from spring-platform-config-client/src/test/resources/logback.xml
rename to spring-cloud-config-client/src/test/resources/logback.xml
diff --git a/spring-platform-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml
similarity index 76%
rename from spring-platform-config-sample/pom.xml
rename to spring-cloud-config-sample/pom.xml
index b9b7bd77..6f0fa09b 100644
--- a/spring-platform-config-sample/pom.xml
+++ b/spring-cloud-config-sample/pom.xml
@@ -3,23 +3,23 @@
 	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>
 
-	<artifactId>spring-platform-config-sample</artifactId>
+	<artifactId>spring-cloud-config-sample</artifactId>
     <packaging>jar</packaging>
 
-	<name>spring-platform-config-sample</name>
-	<description>spring-platform-config-server</description>
+	<name>spring-cloud-config-sample</name>
+	<description>spring-cloud-config-server</description>
 
 	<parent>
-		<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>
 		<relativePath>..</relativePath>
 	</parent>
 
 	<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.springframework.boot</groupId>
@@ -30,8 +30,8 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.platform</groupId>
-			<artifactId>spring-platform-config-server</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-server</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-platform-config-sample/src/main/java/sample/Application.java b/spring-cloud-config-sample/src/main/java/sample/Application.java
similarity index 100%
rename from spring-platform-config-sample/src/main/java/sample/Application.java
rename to spring-cloud-config-sample/src/main/java/sample/Application.java
diff --git a/spring-platform-config-sample/src/main/resources/application.yml b/spring-cloud-config-sample/src/main/resources/application.yml
similarity index 100%
rename from spring-platform-config-sample/src/main/resources/application.yml
rename to spring-cloud-config-sample/src/main/resources/application.yml
diff --git a/spring-platform-config-sample/src/main/resources/bootstrap.yml b/spring-cloud-config-sample/src/main/resources/bootstrap.yml
similarity index 100%
rename from spring-platform-config-sample/src/main/resources/bootstrap.yml
rename to spring-cloud-config-sample/src/main/resources/bootstrap.yml
diff --git a/spring-platform-config-sample/src/test/java/sample/ApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java
similarity index 100%
rename from spring-platform-config-sample/src/test/java/sample/ApplicationTests.java
rename to spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java
diff --git a/spring-platform-config-sample/src/test/resources/server.yml b/spring-cloud-config-sample/src/test/resources/server.yml
similarity index 100%
rename from spring-platform-config-sample/src/test/resources/server.yml
rename to spring-cloud-config-sample/src/test/resources/server.yml
diff --git a/spring-platform-config-server/pom.xml b/spring-cloud-config-server/pom.xml
similarity index 73%
rename from spring-platform-config-server/pom.xml
rename to spring-cloud-config-server/pom.xml
index 2c4dc5ec..7795139f 100644
--- a/spring-platform-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -3,15 +3,15 @@
 	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>
 
-	<artifactId>spring-platform-config-server</artifactId>
+	<artifactId>spring-cloud-config-server</artifactId>
 	<packaging>jar</packaging>
 
-	<name>spring-platform-config-server</name>
-	<description>spring-platform-config-server</description>
+	<name>spring-cloud-config-server</name>
+	<description>spring-cloud-config-server</description>
 
 	<parent>
-		<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>
 		<relativePath>..</relativePath>
 	</parent>
@@ -19,9 +19,9 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.springframework.platform</groupId>
-				<artifactId>spring-platform-netflix</artifactId>
-				<version>${spring-platform.version}</version>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix</artifactId>
+				<version>${spring-cloud.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -30,12 +30,12 @@
 
 	<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.springframework.platform</groupId>
-			<artifactId>spring-platform-netflix-core</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -76,8 +76,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-platform.version>${project.version}</spring-platform.version>
-		<start-class>org.springframework.platform.config.server.Application</start-class>
+		<spring-cloud.version>${project.version}</spring-cloud.version>
+		<start-class>org.springframework.cloud.config.server.Application</start-class>
 		<java.version>1.7</java.version>
 	</properties>
 
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/Application.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/Application.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/Application.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/Application.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/ConfigServerConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/ConfigServerConfiguration.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/ConfigServerConfiguration.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/ConfigServerConfiguration.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EnableConfigServer.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnableConfigServer.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EnableConfigServer.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnableConfigServer.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentController.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentController.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentController.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentRepository.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentRepository.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentRepository.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/NativeEnvironmentRepository.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/NativeEnvironmentRepository.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/NativeEnvironmentRepository.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/SerializableMapPropertySource.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SerializableMapPropertySource.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/SerializableMapPropertySource.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SerializableMapPropertySource.java
diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepository.java
similarity index 100%
rename from spring-platform-config-server/src/main/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepository.java
rename to spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepository.java
diff --git a/spring-platform-config-server/src/main/resources/application-test.yml b/spring-cloud-config-server/src/main/resources/application-test.yml
similarity index 100%
rename from spring-platform-config-server/src/main/resources/application-test.yml
rename to spring-cloud-config-server/src/main/resources/application-test.yml
diff --git a/spring-platform-config-server/src/main/resources/application.yml b/spring-cloud-config-server/src/main/resources/application.yml
similarity index 100%
rename from spring-platform-config-server/src/main/resources/application.yml
rename to spring-cloud-config-server/src/main/resources/application.yml
diff --git a/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/ApplicationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/ApplicationTests.java
similarity index 100%
rename from spring-platform-config-server/src/test/java/org/springframework/platform/config/server/ApplicationTests.java
rename to spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/ApplicationTests.java
diff --git a/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/EncryptionControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/EncryptionControllerTests.java
similarity index 100%
rename from spring-platform-config-server/src/test/java/org/springframework/platform/config/server/EncryptionControllerTests.java
rename to spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/EncryptionControllerTests.java
diff --git a/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java
similarity index 100%
rename from spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java
rename to spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java
diff --git a/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepositoryTests.java
similarity index 100%
rename from spring-platform-config-server/src/test/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepositoryTests.java
rename to spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepositoryTests.java
diff --git a/spring-platform-config-server/src/test/resources/config-repo/application.yml b/spring-cloud-config-server/src/test/resources/config-repo/application.yml
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/application.yml
rename to spring-cloud-config-server/src/test/resources/config-repo/application.yml
diff --git a/spring-platform-config-server/src/test/resources/config-repo/bar.properties b/spring-cloud-config-server/src/test/resources/config-repo/bar.properties
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/bar.properties
rename to spring-cloud-config-server/src/test/resources/config-repo/bar.properties
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/FETCH_HEAD b/spring-cloud-config-server/src/test/resources/config-repo/git/FETCH_HEAD
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/FETCH_HEAD
rename to spring-cloud-config-server/src/test/resources/config-repo/git/FETCH_HEAD
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/HEAD b/spring-cloud-config-server/src/test/resources/config-repo/git/HEAD
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/HEAD
rename to spring-cloud-config-server/src/test/resources/config-repo/git/HEAD
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/config b/spring-cloud-config-server/src/test/resources/config-repo/git/config
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/config
rename to spring-cloud-config-server/src/test/resources/config-repo/git/config
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/gitk.cache b/spring-cloud-config-server/src/test/resources/config-repo/git/gitk.cache
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/gitk.cache
rename to spring-cloud-config-server/src/test/resources/config-repo/git/gitk.cache
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/index b/spring-cloud-config-server/src/test/resources/config-repo/git/index
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/index
rename to spring-cloud-config-server/src/test/resources/config-repo/git/index
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD b/spring-cloud-config-server/src/test/resources/config-repo/git/logs/HEAD
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD
rename to spring-cloud-config-server/src/test/resources/config-repo/git/logs/HEAD
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master b/spring-cloud-config-server/src/test/resources/config-repo/git/logs/refs/heads/master
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master
rename to spring-cloud-config-server/src/test/resources/config-repo/git/logs/refs/heads/master
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw b/spring-cloud-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw
rename to spring-cloud-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.idx b/spring-cloud-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.idx
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.idx
rename to spring-cloud-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.idx
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.pack b/spring-cloud-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.pack
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.pack
rename to spring-cloud-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.pack
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/master b/spring-cloud-config-server/src/test/resources/config-repo/git/refs/heads/master
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/master
rename to spring-cloud-config-server/src/test/resources/config-repo/git/refs/heads/master
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/raw b/spring-cloud-config-server/src/test/resources/config-repo/git/refs/heads/raw
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/raw
rename to spring-cloud-config-server/src/test/resources/config-repo/git/refs/heads/raw
diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/refs/tags/foo b/spring-cloud-config-server/src/test/resources/config-repo/git/refs/tags/foo
similarity index 100%
rename from spring-platform-config-server/src/test/resources/config-repo/git/refs/tags/foo
rename to spring-cloud-config-server/src/test/resources/config-repo/git/refs/tags/foo
diff --git a/spring-platform-config-server/src/test/resources/foo-cloud.properties b/spring-cloud-config-server/src/test/resources/foo-cloud.properties
similarity index 100%
rename from spring-platform-config-server/src/test/resources/foo-cloud.properties
rename to spring-cloud-config-server/src/test/resources/foo-cloud.properties
diff --git a/spring-platform-config-server/src/test/resources/foo-development.properties b/spring-cloud-config-server/src/test/resources/foo-development.properties
similarity index 100%
rename from spring-platform-config-server/src/test/resources/foo-development.properties
rename to spring-cloud-config-server/src/test/resources/foo-development.properties
diff --git a/spring-platform-config-server/src/test/resources/foo.properties b/spring-cloud-config-server/src/test/resources/foo.properties
similarity index 100%
rename from spring-platform-config-server/src/test/resources/foo.properties
rename to spring-cloud-config-server/src/test/resources/foo.properties
diff --git a/spring-platform-config-server/src/test/resources/test/foo.properties b/spring-cloud-config-server/src/test/resources/test/foo.properties
similarity index 100%
rename from spring-platform-config-server/src/test/resources/test/foo.properties
rename to spring-cloud-config-server/src/test/resources/test/foo.properties