diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 03ebbfa..fe7cc13 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-bootstrap</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-bootstrap</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-bootstrap</name>
+	<name>spring-cloud-test-bootstrap</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/bus/pom.xml b/bus/pom.xml
index c793a56..a0611a0 100644
--- a/bus/pom.xml
+++ b/bus/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-bus</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-bus</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-bus</name>
+	<name>spring-cloud-test-bus</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml
index 5cdf42d..5f151ab 100644
--- a/config-client-decrypt/pom.xml
+++ b/config-client-decrypt/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-config-client-decrypt</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-config-client-decrypt</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-config-client-decrypt</name>
+	<name>spring-cloud-test-config-client-decrypt</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/config-client/pom.xml b/config-client/pom.xml
index 4313a03..02a2c5e 100644
--- a/config-client/pom.xml
+++ b/config-client/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-config-client</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-config-client</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-config-client</name>
+	<name>spring-cloud-test-config-client</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/config-retry/pom.xml b/config-retry/pom.xml
index 516bff4..f8b4641 100644
--- a/config-retry/pom.xml
+++ b/config-retry/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-config-retry</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-config-retry</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-config-retry</name>
+	<name>spring-cloud-test-config-retry</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml
index a836ea8..3045273 100644
--- a/configserver-bootstrap/pom.xml
+++ b/configserver-bootstrap/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-configserver-bootstrap</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-configserver-bootstrap</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-configserver-bootstrap</name>
+	<name>spring-cloud-test-configserver-bootstrap</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml
index b5e9da2..b1a22e7 100644
--- a/configserver-eureka/pom.xml
+++ b/configserver-eureka/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-configserver-eureka</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-configserver-eureka</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-configserver-eureka</name>
+	<name>spring-cloud-test-configserver-eureka</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/configserver/pom.xml b/configserver/pom.xml
index 6a5a424..bb7b857 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -3,11 +3,11 @@
 	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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-configserver</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-configserver</artifactId>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-configserver</name>
+	<name>spring-cloud-test-configserver</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/eureka-client/pom.xml b/eureka-client/pom.xml
index 93479cc..5dbef18 100644
--- a/eureka-client/pom.xml
+++ b/eureka-client/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-eureka-client</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-eureka-client</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-eureka-client</name>
+	<name>spring-cloud-test-eureka-client</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml
index 9feea89..5651298 100644
--- a/eureka-first/pom.xml
+++ b/eureka-first/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-eureka-first</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-eureka-first</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-eureka-first</name>
+	<name>spring-cloud-test-eureka-first</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml
index 4f090f8..518b1e1 100644
--- a/eureka-noweb/pom.xml
+++ b/eureka-noweb/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-eureka-noweb</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-eureka-noweb</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-eureka-noweb</name>
+	<name>spring-cloud-test-eureka-noweb</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml
index 2abcdd1..93e53bf 100644
--- a/eureka-server/pom.xml
+++ b/eureka-server/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-eureka-server</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-eureka-server</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-eureka-server</name>
+	<name>spring-cloud-test-eureka-server</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/feign-eager-instantiation/pom.xml b/feign-eager-instantiation/pom.xml
index 49926c7..f254470 100644
--- a/feign-eager-instantiation/pom.xml
+++ b/feign-eager-instantiation/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.cloud.sample</groupId>
-    <artifactId>spring-cloud-sample-feign-eager-instantiation</artifactId>
+    <groupId>org.springframework.cloud.test</groupId>
+    <artifactId>spring-cloud-test-feign-eager-instantiation</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>spring-cloud-sample-feign-eager-instantiation</name>
+    <name>spring-cloud-test-feign-eager-instantiation</name>
     <description>Demo project for Spring Cloud</description>
 
     <parent>
diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml
index 4265542..1bccf97 100644
--- a/feign-eureka/pom.xml
+++ b/feign-eureka/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-feign-eureka</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-feign-eureka</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-feign-eureka</name>
+	<name>spring-cloud-test-feign-eureka</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/feign-hystrix/pom.xml b/feign-hystrix/pom.xml
index dc70c90..11b2fee 100644
--- a/feign-hystrix/pom.xml
+++ b/feign-hystrix/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-feign-hystrix</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-feign-hystrix</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-feign-hystrix</name>
+	<name>spring-cloud-test-feign-hystrix</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/feign/pom.xml b/feign/pom.xml
index 11dd47a..9a74170 100644
--- a/feign/pom.xml
+++ b/feign/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-feign</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-feign</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-feign</name>
+	<name>spring-cloud-test-feign</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/hystrix-amqp/pom.xml b/hystrix-amqp/pom.xml
index ef529b5..c75e256 100644
--- a/hystrix-amqp/pom.xml
+++ b/hystrix-amqp/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-hystrix-amqp</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-hystrix-amqp</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-hystrix-amqp</name>
+	<name>spring-cloud-test-hystrix-amqp</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index bb0375c..75490af 100644
--- a/hystrix/pom.xml
+++ b/hystrix/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-hystrix</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-hystrix</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-hystrix</name>
+	<name>spring-cloud-test-hystrix</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml
index 3627fea..4dff89b 100644
--- a/netflix-sidecar/pom.xml
+++ b/netflix-sidecar/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-netflix-sidecar</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-netflix-sidecar</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-netflix-sidecar</name>
+	<name>spring-cloud-test-netflix-sidecar</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/noweb/pom.xml b/noweb/pom.xml
index 53c5648..cc79a94 100644
--- a/noweb/pom.xml
+++ b/noweb/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-noweb</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-noweb</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-noweb</name>
+	<name>spring-cloud-test-noweb</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml
index d50f241..cab92f7 100644
--- a/oauth2-ribbon/pom.xml
+++ b/oauth2-ribbon/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-oauth2-ribbon</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-oauth2-ribbon</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-oauth2-ribbon</name>
+	<name>spring-cloud-test-oauth2-ribbon</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/oauth2-zuul/pom.xml b/oauth2-zuul/pom.xml
index 9e0905e..a9b33f4 100644
--- a/oauth2-zuul/pom.xml
+++ b/oauth2-zuul/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-oauth2-zuul</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-oauth2-zuul</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-oauth2-zuul</name>
+	<name>spring-cloud-test-oauth2-zuul</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/pom.xml b/pom.xml
index 78a3238..aef7406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,11 +7,11 @@
 		<version>2.1.0.RELEASE</version>
 		<relativePath/>
 	</parent>
-	<artifactId>spring-cloud-samples-tests</artifactId>
+	<artifactId>spring-cloud-tests</artifactId>
 	<version>Greenwich.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Spring Cloud Samples Tests</name>
-	<description>Spring Cloud Samples Tests</description>
+	<name>Spring Cloud Core Tests</name>
+	<description>Spring Cloud Core Tests</description>
 	<url>https://projects.spring.io/spring-cloud/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/ribbon-default-config/pom.xml b/ribbon-default-config/pom.xml
index a343d51..deb18bb 100644
--- a/ribbon-default-config/pom.xml
+++ b/ribbon-default-config/pom.xml
@@ -21,7 +21,7 @@
 	</dependencyManagement>
 
 	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-sample-ribbon-default-config</artifactId>
+	<artifactId>spring-cloud-test-ribbon-default-config</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml
index e8295b9..758b00e 100644
--- a/ribbon-eureka/pom.xml
+++ b/ribbon-eureka/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-ribbon-eureka</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-ribbon-eureka</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-ribbon-eureka</name>
+	<name>spring-cloud-test-ribbon-eureka</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/sleuth/pom.xml b/sleuth/pom.xml
index f5723da..bdc1938 100644
--- a/sleuth/pom.xml
+++ b/sleuth/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-sleuth</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-sleuth</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-sleuth</name>
+	<name>spring-cloud-test-sleuth</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/stream-bus/pom.xml b/stream-bus/pom.xml
index a5f2cf2..2a64fe6 100644
--- a/stream-bus/pom.xml
+++ b/stream-bus/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-stream-bus</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-stream-bus</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-stream-bus</name>
+	<name>spring-cloud-test-stream-bus</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/turbine-amqp/pom.xml b/turbine-amqp/pom.xml
index 7888d6e..4191536 100644
--- a/turbine-amqp/pom.xml
+++ b/turbine-amqp/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-turbine-amqp</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-turbine-amqp</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-turbine-amqp</name>
+	<name>spring-cloud-test-turbine-amqp</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/turbine/pom.xml b/turbine/pom.xml
index 1420e54..e6b2337 100644
--- a/turbine/pom.xml
+++ b/turbine/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-turbine</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-turbine</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-turbine</name>
+	<name>spring-cloud-test-turbine</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/vanilla/pom.xml b/vanilla/pom.xml
index 6113a8a..12fc122 100644
--- a/vanilla/pom.xml
+++ b/vanilla/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-vanilla</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-vanilla</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-vanilla</name>
+	<name>spring-cloud-test-vanilla</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/zipkin/pom.xml b/zipkin/pom.xml
index 0f1fff8..70384d4 100644
--- a/zipkin/pom.xml
+++ b/zipkin/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-zipkin</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-zipkin</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-zipkin</name>
+	<name>spring-cloud-test-zipkin</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/zuul-config-discovery/pom.xml b/zuul-config-discovery/pom.xml
index a5966e1..a3f557e 100755
--- a/zuul-config-discovery/pom.xml
+++ b/zuul-config-discovery/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.cloud.sample</groupId>
-    <artifactId>spring-cloud-sample-zuul-config-discovery</artifactId>
+    <groupId>org.springframework.cloud.test</groupId>
+    <artifactId>spring-cloud-test-zuul-config-discovery</artifactId>
     <version>${spring-cloud.version}</version>
     <packaging>jar</packaging>
 
-    <name>spring-cloud-sample-zuul-config-discovery</name>
+    <name>spring-cloud-test-zuul-config-discovery</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/zuul-proxy-eureka/pom.xml b/zuul-proxy-eureka/pom.xml
index 7efd3e6..b2e9ba3 100644
--- a/zuul-proxy-eureka/pom.xml
+++ b/zuul-proxy-eureka/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-zuul-proxy-eureka</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-zuul-proxy-eureka</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-zuul-proxy-eureka</name>
+	<name>spring-cloud-test-zuul-proxy-eureka</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/zuul-proxy/pom.xml b/zuul-proxy/pom.xml
index 30efd15..6c81b38 100644
--- a/zuul-proxy/pom.xml
+++ b/zuul-proxy/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-zuul-proxy</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-zuul-proxy</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-zuul-proxy</name>
+	<name>spring-cloud-test-zuul-proxy</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>
diff --git a/zuul/pom.xml b/zuul/pom.xml
index f3d0aa6..a0cddf6 100644
--- a/zuul/pom.xml
+++ b/zuul/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.cloud.sample</groupId>
-	<artifactId>spring-cloud-sample-zuul</artifactId>
+	<groupId>org.springframework.cloud.test</groupId>
+	<artifactId>spring-cloud-test-zuul</artifactId>
 	<version>${spring-cloud.version}</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-sample-zuul</name>
+	<name>spring-cloud-test-zuul</name>
 	<description>Demo project for Spring Cloud</description>
 
 	<parent>