diff --git a/README.adoc b/README.adoc
index ffb3c233..b7f38553 100644
--- a/README.adoc
+++ b/README.adoc
@@ -43,7 +43,7 @@ auto-configuration for a feature set.
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 </dependency>
 ----
 | <<DiscoveryClient for Kubernetes,Discovery Client>> implementation that
@@ -53,7 +53,7 @@ resolves service names to Kubernetes Services.
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 </dependency>
 ----
 | Load application properties from Kubernetes
@@ -65,7 +65,7 @@ Secret changes.
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes-all</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
 </dependency>
 ----
 | All Spring Cloud Kubernetes features.
@@ -87,7 +87,7 @@ This is something that you get for free by adding the following dependency insid
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 </dependency>
 ----
 ====
@@ -806,7 +806,7 @@ To include it to your project add the following dependency.
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes-loadbalancer</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8-loadbalancer</artifactId>
 </dependency>
 ----
 ====
@@ -858,10 +858,10 @@ Depending on the requirements, you'll need `get`, `list` and `watch` permission
 |Dependency | Resources
 
 
-|spring-cloud-starter-kubernetes
+|spring-cloud-starter-kubernetes-fabric8
 |pods, services, endpoints
 
-|spring-cloud-starter-kubernetes-config
+|spring-cloud-starter-kubernetes-fabric8-config
 |configmaps, secrets
 |===
 
diff --git a/docs/pom.xml b/docs/pom.xml
index 80413d89..a355a6cf 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,15 +22,15 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-kubernetes</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-all</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/docs/src/main/asciidoc/discovery-client.adoc b/docs/src/main/asciidoc/discovery-client.adoc
index c830197b..357321ed 100644
--- a/docs/src/main/asciidoc/discovery-client.adoc
+++ b/docs/src/main/asciidoc/discovery-client.adoc
@@ -13,7 +13,7 @@ This is something that you get for free by adding the following dependency insid
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 </dependency>
 ----
 ====
diff --git a/docs/src/main/asciidoc/getting-started.adoc b/docs/src/main/asciidoc/getting-started.adoc
index c842d19d..d15ebf34 100644
--- a/docs/src/main/asciidoc/getting-started.adoc
+++ b/docs/src/main/asciidoc/getting-started.adoc
@@ -12,7 +12,7 @@ auto-configuration for a feature set.
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 </dependency>
 ----
 | <<DiscoveryClient for Kubernetes,Discovery Client>> implementation that
@@ -22,7 +22,7 @@ resolves service names to Kubernetes Services.
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 </dependency>
 ----
 | Load application properties from Kubernetes
@@ -34,7 +34,7 @@ Secret changes.
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes-all</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
 </dependency>
 ----
 | All Spring Cloud Kubernetes features.
diff --git a/docs/src/main/asciidoc/load-balancer.adoc b/docs/src/main/asciidoc/load-balancer.adoc
index bdb4813c..33f5333d 100644
--- a/docs/src/main/asciidoc/load-balancer.adoc
+++ b/docs/src/main/asciidoc/load-balancer.adoc
@@ -6,7 +6,7 @@ To include it to your project add the following dependency.
 ----
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-kubernetes-loadbalancer</artifactId>
+    <artifactId>spring-cloud-starter-kubernetes-fabric8-loadbalancer</artifactId>
 </dependency>
 ----
 ====
diff --git a/docs/src/main/asciidoc/sagan-index.adoc b/docs/src/main/asciidoc/sagan-index.adoc
index 16f5bec6..893e5591 100644
--- a/docs/src/main/asciidoc/sagan-index.adoc
+++ b/docs/src/main/asciidoc/sagan-index.adoc
@@ -9,4 +9,4 @@ The main objective of the projects provided in this repository is to facilitate
 * `PropertySource` objects configured via ConfigMaps
 
 ## Getting Started
-The easiest way to get started is by including the Spring Cloud BOM and then adding `spring-cloud-starter-kubernetes-all` to your application's classpath.  If you don't want to include all of the Spring Cloud Kubernetes features you can add individual starters for the features you would like.  By default Spring Cloud Kubernetes will enable the `kubernetes` profile when it detects it is running inside a Kubernetes cluster.  You can take advantage of this by creating a `kubernetes-application` configuration properties for anything specific to Kubernetes you might want to configure.  Once the starter is on the classpath the application should behave as any other Spring Cloud application.
+The easiest way to get started is by including the Spring Cloud BOM and then adding `spring-cloud-starter-kubernetes-fabric8-all` to your application's classpath.  If you don't want to include all of the Spring Cloud Kubernetes features you can add individual starters for the features you would like.  By default Spring Cloud Kubernetes will enable the `kubernetes` profile when it detects it is running inside a Kubernetes cluster.  You can take advantage of this by creating a `kubernetes-application` configuration properties for anything specific to Kubernetes you might want to configure.  Once the starter is on the classpath the application should behave as any other Spring Cloud application.
diff --git a/docs/src/main/asciidoc/security-service-accounts.adoc b/docs/src/main/asciidoc/security-service-accounts.adoc
index f4d08a78..d45b53ba 100644
--- a/docs/src/main/asciidoc/security-service-accounts.adoc
+++ b/docs/src/main/asciidoc/security-service-accounts.adoc
@@ -29,10 +29,10 @@ Depending on the requirements, you'll need `get`, `list` and `watch` permission
 |Dependency | Resources
 
 
-|spring-cloud-starter-kubernetes
+|spring-cloud-starter-kubernetes-fabric8
 |pods, services, endpoints
 
-|spring-cloud-starter-kubernetes-config
+|spring-cloud-starter-kubernetes-fabric8-config
 |configmaps, secrets
 |===
 
diff --git a/pom.xml b/pom.xml
index dd674fe8..c1099d89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,9 +95,9 @@
 		<module>spring-cloud-kubernetes-fabric8-config</module>
 		<module>spring-cloud-kubernetes-fabric8-discovery</module>
 		<module>spring-cloud-kubernetes-client-discovery</module>
-		<module>spring-cloud-starter-kubernetes</module>
-		<module>spring-cloud-starter-kubernetes-config</module>
-		<module>spring-cloud-starter-kubernetes-all</module>
+		<module>spring-cloud-starter-kubernetes-fabric8</module>
+		<module>spring-cloud-starter-kubernetes-fabric8-config</module>
+		<module>spring-cloud-starter-kubernetes-fabric8-all</module>
 		<module>spring-cloud-starter-kubernetes-client-all</module>
 		<module>spring-cloud-kubernetes-examples</module>
 		<module>spring-cloud-kubernetes-fabric8-leader</module>
@@ -106,7 +106,7 @@
 		<module>spring-cloud-kubernetes-integration-tests</module>
 		<module>docs</module>
 		<module>spring-cloud-kubernetes-fabric8-loadbalancer</module>
-		<module>spring-cloud-starter-kubernetes-loadbalancer</module>
+		<module>spring-cloud-starter-kubernetes-fabric8-loadbalancer</module>
 	</modules>
 
 	<dependencyManagement>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
index 624310d1..d36f6d86 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -21,15 +21,15 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-all</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 252444ec..e8715601 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -142,25 +142,25 @@
 			<!-- Own dependencies - Starters -->
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-kubernetes</artifactId>
+				<artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+				<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-kubernetes-loadbalancer</artifactId>
+				<artifactId>spring-cloud-starter-kubernetes-fabric8-loadbalancer</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-kubernetes-all</artifactId>
+				<artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml
index 648e4dc2..86c64f1c 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml
@@ -75,12 +75,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-loadbalancer</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-loadbalancer</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
index ac4398f9..53837227 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
@@ -67,7 +67,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml b/spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml
index a89caea8..90781cef 100644
--- a/spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-loadbalancer</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-loadbalancer</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
index c84d252d..8cf8ee93 100644
--- a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
@@ -21,7 +21,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-starter-kubernetes-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
similarity index 96%
rename from spring-cloud-starter-kubernetes-all/pom.xml
rename to spring-cloud-starter-kubernetes-fabric8-all/pom.xml
index d7003873..c83dd5fe 100644
--- a/spring-cloud-starter-kubernetes-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
@@ -27,7 +27,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-starter-kubernetes-all</artifactId>
+	<artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
 	<name>Spring Cloud Kubernetes :: Starter :: All</name>
 
 	<dependencies>
diff --git a/spring-cloud-starter-kubernetes-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
similarity index 95%
rename from spring-cloud-starter-kubernetes-config/pom.xml
rename to spring-cloud-starter-kubernetes-fabric8-config/pom.xml
index d4332ece..370d20e7 100644
--- a/spring-cloud-starter-kubernetes-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
@@ -27,7 +27,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-starter-kubernetes-config</artifactId>
+	<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 	<name>Spring Cloud Kubernetes :: Starter :: Config</name>
 
 	<dependencies>
diff --git a/spring-cloud-starter-kubernetes-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
similarity index 92%
rename from spring-cloud-starter-kubernetes-loadbalancer/pom.xml
rename to spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
index b89d82ce..836e8938 100644
--- a/spring-cloud-starter-kubernetes-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-starter-kubernetes-loadbalancer</artifactId>
+	<artifactId>spring-cloud-starter-kubernetes-fabric8-loadbalancer</artifactId>
 	<name>Spring Cloud Kubernetes :: Starter :: LoadBalancer</name>
 
 	<dependencies>
diff --git a/spring-cloud-starter-kubernetes/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml
similarity index 96%
rename from spring-cloud-starter-kubernetes/pom.xml
rename to spring-cloud-starter-kubernetes-fabric8/pom.xml
index 18961677..459e7e52 100644
--- a/spring-cloud-starter-kubernetes/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml
@@ -27,7 +27,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-starter-kubernetes</artifactId>
+	<artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
 	<name>Spring Cloud Kubernetes :: Starter</name>
 
 	<dependencies>