diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index f106ee4fe30..ba06c074727 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -780,7 +780,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.gcloud</groupId>
-      <artifactId>gcloud-session-manager</artifactId>
+      <artifactId>jetty-gcloud-session-manager</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-gcloud/gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
similarity index 97%
rename from jetty-gcloud/gcloud-session-manager/pom.xml
rename to jetty-gcloud/jetty-gcloud-session-manager/pom.xml
index c25002b078b..e83e97eb6e7 100644
--- a/jetty-gcloud/gcloud-session-manager/pom.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>gcloud-session-manager</artifactId>
+  <artifactId>jetty-gcloud-session-manager</artifactId>
   <name>Jetty :: GCloud :: Session Manager</name>
 
   <dependencies>
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
similarity index 100%
rename from jetty-gcloud/gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
similarity index 98%
rename from jetty-gcloud/gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
index 0780a60ba91..14671f75b85 100644
--- a/jetty-gcloud/gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
@@ -41,7 +41,7 @@ maven://com.google.api-client/google-api-client/1.15.0-rc|lib/gcloud/google-api-
 maven://com.google.apis/google-api-services-datastore/v1beta2-rev23-1.19.0|lib/gcloud/google-api-services-datastore-v1beta2-rev23-1.19.0.jar
 
 [lib]
-lib/gcloud-session-manager-${jetty.version}.jar
+lib/jetty-gcloud-session-manager-${jetty.version}.jar
 lib/gcloud/*.jar
 
 [xml]
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudConfiguration.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudConfiguration.java
similarity index 100%
rename from jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudConfiguration.java
rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudConfiguration.java
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java
similarity index 100%
rename from jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java
rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionManager.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionManager.java
similarity index 100%
rename from jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionManager.java
rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionManager.java
diff --git a/jetty-gcloud/gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java b/jetty-gcloud/jetty-gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java
similarity index 100%
rename from jetty-gcloud/gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java
rename to jetty-gcloud/jetty-gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java
diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml
index 252416ecec5..9575aeb456b 100644
--- a/jetty-gcloud/pom.xml
+++ b/jetty-gcloud/pom.xml
@@ -17,7 +17,7 @@
   </properties>
 
   <modules>
-    <module>gcloud-session-manager</module>
+    <module>jetty-gcloud-session-manager</module>
   </modules>
 
 </project>
diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml
index dc7bba46a4b..b32d57c5340 100644
--- a/tests/test-sessions/test-gcloud-sessions/pom.xml
+++ b/tests/test-sessions/test-gcloud-sessions/pom.xml
@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.gcloud</groupId>
-            <artifactId>gcloud-session-manager</artifactId>
+            <artifactId>jetty-gcloud-session-manager</artifactId>
             <version>${project.version}</version>
          </dependency>
     <dependency>