diff --git a/lab/00-rewards-common/pom.xml b/lab/00-rewards-common/pom.xml
index a88db3e5..103b18b9 100644
--- a/lab/00-rewards-common/pom.xml
+++ b/lab/00-rewards-common/pom.xml
@@ -8,7 +8,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
diff --git a/lab/01-rewards-db/pom.xml b/lab/01-rewards-db/pom.xml
index a75c941a..2b9e90e8 100644
--- a/lab/01-rewards-db/pom.xml
+++ b/lab/01-rewards-db/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
diff --git a/lab/10-spring-intro-solution/pom.xml b/lab/10-spring-intro-solution/pom.xml
index d07b7c49..d8e1302d 100644
--- a/lab/10-spring-intro-solution/pom.xml
+++ b/lab/10-spring-intro-solution/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/10-spring-intro/pom.xml b/lab/10-spring-intro/pom.xml
index 72794e7e..b67b00af 100644
--- a/lab/10-spring-intro/pom.xml
+++ b/lab/10-spring-intro/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/12-javaconfig-dependency-injection-solution/pom.xml b/lab/12-javaconfig-dependency-injection-solution/pom.xml
index 8afb17ab..18324472 100644
--- a/lab/12-javaconfig-dependency-injection-solution/pom.xml
+++ b/lab/12-javaconfig-dependency-injection-solution/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/12-javaconfig-dependency-injection/pom.xml b/lab/12-javaconfig-dependency-injection/pom.xml
index 834d2ac6..0a8b3674 100644
--- a/lab/12-javaconfig-dependency-injection/pom.xml
+++ b/lab/12-javaconfig-dependency-injection/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/16-annotations-solution/pom.xml b/lab/16-annotations-solution/pom.xml
index c438abbc..fb0d71bc 100644
--- a/lab/16-annotations-solution/pom.xml
+++ b/lab/16-annotations-solution/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/16-annotations/pom.xml b/lab/16-annotations/pom.xml
index 708e39bd..7710e2d2 100644
--- a/lab/16-annotations/pom.xml
+++ b/lab/16-annotations/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/22-aop-solution/pom.xml b/lab/22-aop-solution/pom.xml
index 3791f299..22f1eea3 100644
--- a/lab/22-aop-solution/pom.xml
+++ b/lab/22-aop-solution/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
diff --git a/lab/22-aop/pom.xml b/lab/22-aop/pom.xml
index e7de50df..a8e01f17 100644
--- a/lab/22-aop/pom.xml
+++ b/lab/22-aop/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
diff --git a/lab/24-test-solution/pom.xml b/lab/24-test-solution/pom.xml
index 32233d91..c827f488 100644
--- a/lab/24-test-solution/pom.xml
+++ b/lab/24-test-solution/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
diff --git a/lab/24-test/pom.xml b/lab/24-test/pom.xml
index 92faabb1..997b462a 100644
--- a/lab/24-test/pom.xml
+++ b/lab/24-test/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
diff --git a/lab/26-jdbc-solution/pom.xml b/lab/26-jdbc-solution/pom.xml
index 66f83663..344b22de 100644
--- a/lab/26-jdbc-solution/pom.xml
+++ b/lab/26-jdbc-solution/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/26-jdbc/pom.xml b/lab/26-jdbc/pom.xml
index 75ba0f5b..dc0f0ec4 100644
--- a/lab/26-jdbc/pom.xml
+++ b/lab/26-jdbc/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/28-transactions-solution/pom.xml b/lab/28-transactions-solution/pom.xml
index 1d8c8416..e8b0ecc3 100644
--- a/lab/28-transactions-solution/pom.xml
+++ b/lab/28-transactions-solution/pom.xml
@@ -10,13 +10,13 @@
 	</organization>
 	<packaging>jar</packaging>
 	<parent>
-		<groupId>io.pivotal.education.core-spring</groupId>
+		<groupId>io.spring.training.core-spring</groupId>
 		<artifactId>parentProject</artifactId>
 		<version>5.3.16</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>io.pivotal.education.core-spring</groupId>
+			<groupId>io.spring.training.core-spring</groupId>
 			<artifactId>00-rewards-common</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/lab/28-transactions/pom.xml b/lab/28-transactions/pom.xml
index aee7b984..7fe9e960 100644
--- a/lab/28-transactions/pom.xml
+++ b/lab/28-transactions/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/30-jdbc-boot-solution/pom.xml b/lab/30-jdbc-boot-solution/pom.xml
index 321e9fc4..ba8356e3 100644
--- a/lab/30-jdbc-boot-solution/pom.xml
+++ b/lab/30-jdbc-boot-solution/pom.xml
@@ -3,7 +3,7 @@
 	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>io.pivotal.education.boot</groupId>
+	<groupId>io.spring.training.boot</groupId>
 	<artifactId>30-jdbc-boot-solution</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/lab/32-jdbc-autoconfig-solution/pom.xml b/lab/32-jdbc-autoconfig-solution/pom.xml
index e5b0b14e..f65ec3ec 100644
--- a/lab/32-jdbc-autoconfig-solution/pom.xml
+++ b/lab/32-jdbc-autoconfig-solution/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
 
diff --git a/lab/32-jdbc-autoconfig/pom.xml b/lab/32-jdbc-autoconfig/pom.xml
index 276d79fc..32c04343 100644
--- a/lab/32-jdbc-autoconfig/pom.xml
+++ b/lab/32-jdbc-autoconfig/pom.xml
@@ -10,7 +10,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -62,7 +62,7 @@
 
         <!--  Common convenience classes - DO NOT MODIFY -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/lab/33-autoconfig-helloworld-solution/hello-app/pom.xml b/lab/33-autoconfig-helloworld-solution/hello-app/pom.xml
index b43a6b1a..c8da4eb0 100644
--- a/lab/33-autoconfig-helloworld-solution/hello-app/pom.xml
+++ b/lab/33-autoconfig-helloworld-solution/hello-app/pom.xml
@@ -7,7 +7,7 @@
     <packaging>jar</packaging>
     <version>1.0</version>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentHelloServiceProject</artifactId>
         <version>1.0</version>
     </parent>
@@ -17,7 +17,7 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>hello-starter</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/33-autoconfig-helloworld-solution/hello-lib/pom.xml b/lab/33-autoconfig-helloworld-solution/hello-lib/pom.xml
index c2c3e3bd..dc700c4d 100644
--- a/lab/33-autoconfig-helloworld-solution/hello-lib/pom.xml
+++ b/lab/33-autoconfig-helloworld-solution/hello-lib/pom.xml
@@ -7,7 +7,7 @@
     <packaging>jar</packaging>
     <version>1.0</version>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentHelloServiceProject</artifactId>
         <version>1.0</version>
     </parent>
diff --git a/lab/33-autoconfig-helloworld-solution/hello-starter/pom.xml b/lab/33-autoconfig-helloworld-solution/hello-starter/pom.xml
index 9eecf522..2559faf8 100644
--- a/lab/33-autoconfig-helloworld-solution/hello-starter/pom.xml
+++ b/lab/33-autoconfig-helloworld-solution/hello-starter/pom.xml
@@ -6,13 +6,13 @@
     <artifactId>hello-starter</artifactId>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentHelloServiceProject</artifactId>
         <version>1.0</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>hello-lib</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/33-autoconfig-helloworld-solution/pom.xml b/lab/33-autoconfig-helloworld-solution/pom.xml
index 82abb1bc..10a0bdc1 100644
--- a/lab/33-autoconfig-helloworld-solution/pom.xml
+++ b/lab/33-autoconfig-helloworld-solution/pom.xml
@@ -1,6 +1,6 @@
 <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>io.pivotal.education.core-spring</groupId>
+    <groupId>io.spring.training.core-spring</groupId>
     <artifactId>parentHelloServiceProject</artifactId>
     <version>1.0</version>
     <packaging>pom</packaging>
@@ -32,12 +32,12 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.pivotal.education.core-spring</groupId>
+                <groupId>io.spring.training.core-spring</groupId>
                 <artifactId>hello-lib</artifactId>
                 <version>1.0</version>
             </dependency>
             <dependency>
-                <groupId>io.pivotal.education.core-spring</groupId>
+                <groupId>io.spring.training.core-spring</groupId>
                 <artifactId>hello-starter</artifactId>
                 <version>1.0</version>
             </dependency>
diff --git a/lab/33-autoconfig-helloworld/hello-app/pom.xml b/lab/33-autoconfig-helloworld/hello-app/pom.xml
index 18be8292..45933a34 100644
--- a/lab/33-autoconfig-helloworld/hello-app/pom.xml
+++ b/lab/33-autoconfig-helloworld/hello-app/pom.xml
@@ -7,7 +7,7 @@
     <packaging>jar</packaging>
     <version>1.0</version>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentHelloServiceProject</artifactId>
         <version>1.0</version>
     </parent>
@@ -19,7 +19,7 @@
         <!-- TO-DO-13: Study "hello-app" project.
                   Note that it has dependency on "hello-lib" project -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>hello-lib</artifactId>
         </dependency>
         <!-- TO-DO-22: Replace hello-lib above with hello-starter -->
diff --git a/lab/33-autoconfig-helloworld/hello-lib/pom.xml b/lab/33-autoconfig-helloworld/hello-lib/pom.xml
index c2c3e3bd..dc700c4d 100644
--- a/lab/33-autoconfig-helloworld/hello-lib/pom.xml
+++ b/lab/33-autoconfig-helloworld/hello-lib/pom.xml
@@ -7,7 +7,7 @@
     <packaging>jar</packaging>
     <version>1.0</version>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentHelloServiceProject</artifactId>
         <version>1.0</version>
     </parent>
diff --git a/lab/33-autoconfig-helloworld/hello-starter/pom.xml b/lab/33-autoconfig-helloworld/hello-starter/pom.xml
index 9eecf522..2559faf8 100644
--- a/lab/33-autoconfig-helloworld/hello-starter/pom.xml
+++ b/lab/33-autoconfig-helloworld/hello-starter/pom.xml
@@ -6,13 +6,13 @@
     <artifactId>hello-starter</artifactId>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentHelloServiceProject</artifactId>
         <version>1.0</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>hello-lib</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/33-autoconfig-helloworld/pom.xml b/lab/33-autoconfig-helloworld/pom.xml
index 82abb1bc..10a0bdc1 100644
--- a/lab/33-autoconfig-helloworld/pom.xml
+++ b/lab/33-autoconfig-helloworld/pom.xml
@@ -1,6 +1,6 @@
 <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>io.pivotal.education.core-spring</groupId>
+    <groupId>io.spring.training.core-spring</groupId>
     <artifactId>parentHelloServiceProject</artifactId>
     <version>1.0</version>
     <packaging>pom</packaging>
@@ -32,12 +32,12 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.pivotal.education.core-spring</groupId>
+                <groupId>io.spring.training.core-spring</groupId>
                 <artifactId>hello-lib</artifactId>
                 <version>1.0</version>
             </dependency>
             <dependency>
-                <groupId>io.pivotal.education.core-spring</groupId>
+                <groupId>io.spring.training.core-spring</groupId>
                 <artifactId>hello-starter</artifactId>
                 <version>1.0</version>
             </dependency>
diff --git a/lab/34-spring-data-jpa-solution/pom.xml b/lab/34-spring-data-jpa-solution/pom.xml
index 06ee13c0..cf73e52b 100644
--- a/lab/34-spring-data-jpa-solution/pom.xml
+++ b/lab/34-spring-data-jpa-solution/pom.xml
@@ -8,13 +8,13 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
     <dependencies>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
diff --git a/lab/34-spring-data-jpa/pom.xml b/lab/34-spring-data-jpa/pom.xml
index e454d3ad..00b2e776 100644
--- a/lab/34-spring-data-jpa/pom.xml
+++ b/lab/34-spring-data-jpa/pom.xml
@@ -10,13 +10,13 @@
 	</organization>
 	<packaging>jar</packaging>
 	<parent>
-		<groupId>io.pivotal.education.core-spring</groupId>
+		<groupId>io.spring.training.core-spring</groupId>
 		<artifactId>parentProject</artifactId>
 		<version>5.3.16</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>io.pivotal.education.core-spring</groupId>
+			<groupId>io.spring.training.core-spring</groupId>
 			<artifactId>00-rewards-common</artifactId>
 		</dependency>
 		<dependency>
diff --git a/lab/36-mvc-solution/pom.xml b/lab/36-mvc-solution/pom.xml
index db5ed706..61b0ecfb 100644
--- a/lab/36-mvc-solution/pom.xml
+++ b/lab/36-mvc-solution/pom.xml
@@ -10,7 +10,7 @@
 	</organization>
 	<packaging>jar</packaging>
 	<parent>
-		<groupId>io.pivotal.education.core-spring</groupId>
+		<groupId>io.spring.training.core-spring</groupId>
 		<artifactId>parentProject</artifactId>
 		<version>5.3.16</version>
 	</parent>
@@ -22,7 +22,7 @@
 		<!-- This dependency bring in the common classes -->
 		<!-- such as Percentage, MonetaryAmount         -->
 		<dependency>
-			<groupId>io.pivotal.education.core-spring</groupId>
+			<groupId>io.spring.training.core-spring</groupId>
 			<artifactId>00-rewards-common</artifactId>
 		</dependency>
 
@@ -32,7 +32,7 @@
 		  // this project - see rewards-db/pom.xml.
 		  -->
 		<dependency>
-			<groupId>io.pivotal.education.core-spring</groupId>
+			<groupId>io.spring.training.core-spring</groupId>
 			<artifactId>01-rewards-db</artifactId>
 		</dependency>
 
diff --git a/lab/36-mvc/pom.xml b/lab/36-mvc/pom.xml
index 30c8fee7..d47dab28 100644
--- a/lab/36-mvc/pom.xml
+++ b/lab/36-mvc/pom.xml
@@ -10,7 +10,7 @@
 	</organization>
 	<packaging>jar</packaging>
 	<parent>
-		<groupId>io.pivotal.education.core-spring</groupId>
+		<groupId>io.spring.training.core-spring</groupId>
 		<artifactId>parentProject</artifactId>
 		<version>5.3.16</version>
 	</parent>
@@ -22,7 +22,7 @@
 		<!-- This dependency bring in the common classes -->
 		<!-- such as Percentage, MonetaryAmount         -->
 		<dependency>
-			<groupId>io.pivotal.education.core-spring</groupId>
+			<groupId>io.spring.training.core-spring</groupId>
 			<artifactId>00-rewards-common</artifactId>
 		</dependency>
 
@@ -32,7 +32,7 @@
 		  // this project - see rewards-db/pom.xml.
 		  -->
 		<dependency>
-			<groupId>io.pivotal.education.core-spring</groupId>
+			<groupId>io.spring.training.core-spring</groupId>
 			<artifactId>01-rewards-db</artifactId>
 		</dependency>
 
diff --git a/lab/38-rest-ws-solution/pom.xml b/lab/38-rest-ws-solution/pom.xml
index 4d27a800..063c01a7 100644
--- a/lab/38-rest-ws-solution/pom.xml
+++ b/lab/38-rest-ws-solution/pom.xml
@@ -8,7 +8,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -38,7 +38,7 @@
         </dependency>
         <!-- Common classes: Percentage, MonetaryAmount -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <!--
@@ -48,7 +48,7 @@
   		  //       by this project - see rewards-db/pom.xml.
   		  -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>01-rewards-db</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/38-rest-ws/pom.xml b/lab/38-rest-ws/pom.xml
index 88d2e98a..8cd6ad53 100644
--- a/lab/38-rest-ws/pom.xml
+++ b/lab/38-rest-ws/pom.xml
@@ -8,7 +8,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -33,11 +33,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>01-rewards-db</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/40-boot-test-solution/pom.xml b/lab/40-boot-test-solution/pom.xml
index deda7b52..c96f08d1 100644
--- a/lab/40-boot-test-solution/pom.xml
+++ b/lab/40-boot-test-solution/pom.xml
@@ -8,7 +8,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -19,7 +19,7 @@
     <dependencies>
         <!-- Common classes: Percentage, MonetaryAmount -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <!--
@@ -29,7 +29,7 @@
   		  //       by this project - see rewards-db/pom.xml.
   		  -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>01-rewards-db</artifactId>
         </dependency>
 
diff --git a/lab/40-boot-test/pom.xml b/lab/40-boot-test/pom.xml
index c5d1d887..9331ee40 100644
--- a/lab/40-boot-test/pom.xml
+++ b/lab/40-boot-test/pom.xml
@@ -8,7 +8,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -19,7 +19,7 @@
     <dependencies>
         <!-- Common classes: Percentage, MonetaryAmount -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
 
@@ -30,7 +30,7 @@
   		  //       by this project - see rewards-db/pom.xml.
   		  -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>01-rewards-db</artifactId>
         </dependency>
 
diff --git a/lab/42-security-rest-solution/pom.xml b/lab/42-security-rest-solution/pom.xml
index b55e3518..2d7be729 100644
--- a/lab/42-security-rest-solution/pom.xml
+++ b/lab/42-security-rest-solution/pom.xml
@@ -8,7 +8,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -43,11 +43,11 @@
         </dependency>
         <!-- Common classes: Percentage, MonetaryAmount -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>01-rewards-db</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/42-security-rest/pom.xml b/lab/42-security-rest/pom.xml
index ef49052e..158242d5 100644
--- a/lab/42-security-rest/pom.xml
+++ b/lab/42-security-rest/pom.xml
@@ -8,7 +8,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -45,11 +45,11 @@
         </dependency>
         <!-- Common classes: Percentage, MonetaryAmount -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>01-rewards-db</artifactId>
         </dependency>
     </dependencies>
diff --git a/lab/44-actuator-solution/pom.xml b/lab/44-actuator-solution/pom.xml
index 70dfa198..10fd8e59 100644
--- a/lab/44-actuator-solution/pom.xml
+++ b/lab/44-actuator-solution/pom.xml
@@ -9,7 +9,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -21,7 +21,7 @@
     <dependencies>
         <!-- Common classes: Percentage, MonetaryAmount -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
 
@@ -32,7 +32,7 @@
   		  //       by this project - see rewards-db/pom.xml.
   		  -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>01-rewards-db</artifactId>
         </dependency>
 
diff --git a/lab/44-actuator/pom.xml b/lab/44-actuator/pom.xml
index 106b08b0..2bdbe2d2 100644
--- a/lab/44-actuator/pom.xml
+++ b/lab/44-actuator/pom.xml
@@ -8,7 +8,7 @@
     </organization>
     <packaging>jar</packaging>
     <parent>
-        <groupId>io.pivotal.education.core-spring</groupId>
+        <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
         <version>5.3.16</version>
     </parent>
@@ -19,7 +19,7 @@
     <dependencies>
         <!-- Common classes: Percentage, MonetaryAmount -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>00-rewards-common</artifactId>
         </dependency>
 
@@ -30,7 +30,7 @@
   		  //       by this project - see rewards-db/pom.xml.
   		  -->
         <dependency>
-            <groupId>io.pivotal.education.core-spring</groupId>
+            <groupId>io.spring.training.core-spring</groupId>
             <artifactId>01-rewards-db</artifactId>
         </dependency>
     
diff --git a/lab/build.gradle b/lab/build.gradle
index 1f3d2c95..c3aff20e 100644
--- a/lab/build.gradle
+++ b/lab/build.gradle
@@ -18,7 +18,7 @@ plugins {
 allprojects {
     apply plugin: 'maven-publish'
 
-    group = 'io.pivotal.education.core-spring'
+    group = 'io.spring.training.core-spring'
     version = '5.3.16'
 }
 
diff --git a/lab/pom.xml b/lab/pom.xml
index ac40d137..b1bbc749 100644
--- a/lab/pom.xml
+++ b/lab/pom.xml
@@ -1,6 +1,6 @@
 <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>io.pivotal.education.core-spring</groupId>
+    <groupId>io.spring.training.core-spring</groupId>
     <artifactId>parentProject</artifactId>
     <version>5.3.16</version>
     <organization>
@@ -64,12 +64,12 @@
         <dependencies>
             <!-- Course specific -->
             <dependency>
-                <groupId>io.pivotal.education.core-spring</groupId>
+                <groupId>io.spring.training.core-spring</groupId>
                 <artifactId>00-rewards-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.pivotal.education.core-spring</groupId>
+                <groupId>io.spring.training.core-spring</groupId>
                 <artifactId>01-rewards-db</artifactId>
                 <version>${project.version}</version>
             </dependency>