diff --git a/jetty-ee10/test-ee10-sessions/test-ee10-infinispan-sessions/pom.xml b/jetty-ee10/test-ee10-sessions/test-ee10-infinispan-sessions/pom.xml
index 5cf67bfa695..10e87916bf1 100644
--- a/jetty-ee10/test-ee10-sessions/test-ee10-infinispan-sessions/pom.xml
+++ b/jetty-ee10/test-ee10-sessions/test-ee10-infinispan-sessions/pom.xml
@@ -97,12 +97,12 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>infinispan-remote-query</artifactId>
+      <artifactId>jetty-infinispan-remote-query</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>infinispan-embedded-query</artifactId>
+      <artifactId>jetty-infinispan-embedded-query</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml
index 8961b4b8017..c8e866ad56e 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml
@@ -97,12 +97,12 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>infinispan-remote-query</artifactId>
+      <artifactId>jetty-infinispan-remote-query</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>infinispan-embedded-query</artifactId>
+      <artifactId>jetty-infinispan-embedded-query</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index d1d22bb4b98..d24cf138af7 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -131,7 +131,7 @@
             <configuration>
               <includeGroupIds>jakarta.transaction,org.eclipse.jetty</includeGroupIds>
               <excludeGroupIds>
-                org.eclipse.jetty.demo,org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.ee9.websocket,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.ee9,org.eclipse.jetty.ee10,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
+                org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.ee9.websocket,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.ee9,org.eclipse.jetty.ee10,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
               </excludeGroupIds>
               <excludeArtifactIds>
                 apache-jsp,glassfish-jstl,jetty-start,jetty-slf4j-impl
@@ -554,7 +554,7 @@
               <includeGroupIds>
                 org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.ee9.demos, org.eclipse.jetty.ee10.demos
               </includeGroupIds>
-              <excludeArtifactIds>infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation</excludeArtifactIds>
+              <excludeArtifactIds>jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation</excludeArtifactIds>
               <classifier>config</classifier>
               <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
               <excludes>META-INF/**,webapps/**,start.d/**,start.ini</excludes>
@@ -571,14 +571,14 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
-                  <artifactId>infinispan-embedded</artifactId>
+                  <artifactId>jetty-infinispan-embedded</artifactId>
                   <version>${project.version}</version>
                   <classifier>config</classifier>
                   <type>jar</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
-                  <artifactId>infinispan-remote</artifactId>
+                  <artifactId>jetty-infinispan-remote</artifactId>
                   <version>${project.version}</version>
                   <classifier>config</classifier>
                   <type>jar</type>
@@ -944,55 +944,55 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-alpn-conscrypt-server</artifactId>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>infinispan-embedded</artifactId>-->
-<!--      <version>${project.version}</version>-->
-<!--      <type>pom</type>-->
-<!--      <optional>true</optional>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>infinispan-embedded-query</artifactId>-->
-<!--      <optional>true</optional>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>infinispan-remote</artifactId>-->
-<!--      <version>${project.version}</version>-->
-<!--      <type>pom</type>-->
-<!--      <optional>true</optional>-->
-<!--      <exclusions>-->
-<!--        <exclusion>-->
-<!--          <groupId>org.wildfly.common</groupId>-->
-<!--          <artifactId>*</artifactId>-->
-<!--        </exclusion>-->
-<!--      </exclusions>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>infinispan-remote-query</artifactId>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-hazelcast</artifactId>-->
-<!--      <optional>true</optional>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty.gcloud</groupId>-->
-<!--      <artifactId>jetty-gcloud-session-manager</artifactId>-->
-<!--      <optional>true</optional>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty.memcached</groupId>-->
-<!--      <artifactId>jetty-memcached-sessions</artifactId>-->
-<!--      <optional>true</optional>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-nosql</artifactId>-->
-<!--      <optional>true</optional>-->
-<!--    </dependency>-->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-infinispan-embedded</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-infinispan-embedded-query</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-infinispan-remote</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>org.wildfly.common</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-infinispan-remote-query</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-hazelcast</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.gcloud</groupId>
+      <artifactId>jetty-gcloud-session-manager</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.memcached</groupId>
+      <artifactId>jetty-memcached-sessions</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-nosql</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-keystore</artifactId>
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml
similarity index 98%
rename from jetty-integrations/jetty-infinispan/infinispan-common/pom.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml
index 36fe5e79fb6..09bdfc92721 100644
--- a/jetty-integrations/jetty-infinispan/infinispan-common/pom.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml
@@ -5,7 +5,7 @@
     <version>12.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>infinispan-common</artifactId>
+  <artifactId>jetty-infinispan-common</artifactId>
   <name>Jetty :: Infinispan Session Manager Common</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.infinispan.common</bundle-symbolic-name>
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
similarity index 87%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
index 861c1ee2f22..439ecb1de07 100644
--- a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
@@ -9,7 +9,7 @@ internal
 sessions
 
 [lib]
-lib/infinispan-common-${jetty.version}.jar
+lib/jetty-infinispan-common-${jetty.version}.jar
 lib/infinispan/*.jar
 
 [ini]
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/BoundDelegatingInputStream.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/BoundDelegatingInputStream.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/BoundDelegatingInputStream.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/BoundDelegatingInputStream.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanKeyBuilder.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanKeyBuilder.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanKeyBuilder.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanKeyBuilder.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSerializationContextInitializer.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSerializationContextInitializer.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSerializationContextInitializer.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSerializationContextInitializer.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionData.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionData.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionData.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionData.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionLegacyConverter.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionLegacyConverter.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionLegacyConverter.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionLegacyConverter.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/NullQueryManagerFactory.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/NullQueryManagerFactory.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/NullQueryManagerFactory.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/NullQueryManagerFactory.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/QueryManager.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/QueryManager.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/QueryManager.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/QueryManager.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/QueryManagerFactory.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/QueryManagerFactory.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/QueryManagerFactory.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/QueryManagerFactory.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/SessionDataMarshaller.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/SessionDataMarshaller.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/SessionDataMarshaller.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/SessionDataMarshaller.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-common/src/main/resources/session.proto b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/resources/session.proto
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-common/src/main/resources/session.proto
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/resources/session.proto
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml
similarity index 96%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded-query/pom.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml
index 9fcf0d9e80e..667c9460fb7 100644
--- a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/pom.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml
@@ -5,7 +5,7 @@
     <version>12.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>infinispan-embedded-query</artifactId>
+  <artifactId>jetty-infinispan-embedded-query</artifactId>
   <name>Jetty :: Infinispan Session Manager Embedded with Querying</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.infinispan.embedded.query</bundle-symbolic-name>
@@ -73,7 +73,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>infinispan-common</artifactId>
+      <artifactId>jetty-infinispan-common</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.infinispan</groupId>
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/assembly/config.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/assembly/config.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/config-template/modules/infinispan-embedded-query.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/modules/infinispan-embedded-query.mod
similarity index 84%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/config-template/modules/infinispan-embedded-query.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/modules/infinispan-embedded-query.mod
index cfe27d68dc5..e33b69503d0 100644
--- a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/config-template/modules/infinispan-embedded-query.mod
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/modules/infinispan-embedded-query.mod
@@ -12,7 +12,7 @@ sessions/infinispan/embedded/infinispan-embedded-query-libs
 
 [lib]
 lib/infinispan/*.jar
-lib/infinispan-embedded-query-${jetty.version}.jar
+lib/jetty-infinispan-embedded-query-${jetty.version}.jar
 
 [xml]
 etc/sessions/infinispan/infinispan-embedded-query.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManager.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManager.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManager.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManager.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManagerFactory.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManagerFactory.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded-query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManagerFactory.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManagerFactory.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml
similarity index 96%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded/pom.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml
index 3c66754ffac..86abaa3781b 100644
--- a/jetty-integrations/jetty-infinispan/infinispan-embedded/pom.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml
@@ -5,7 +5,7 @@
     <version>12.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>infinispan-embedded</artifactId>
+  <artifactId>jetty-infinispan-embedded</artifactId>
   <packaging>pom</packaging>
   <name>Jetty :: Infinispan Session Manager Embedded</name>
   <properties>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>infinispan-common</artifactId>
+      <artifactId>jetty-infinispan-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/assembly/config.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/assembly/config.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml
similarity index 97%
rename from jetty-integrations/jetty-infinispan/infinispan-remote-query/pom.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml
index f17252b7b1f..e676e9004e5 100644
--- a/jetty-integrations/jetty-infinispan/infinispan-remote-query/pom.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml
@@ -5,7 +5,7 @@
     <version>12.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>infinispan-remote-query</artifactId>
+  <artifactId>jetty-infinispan-remote-query</artifactId>
   <name>Jetty :: Infinispan Session Manager Remote with Querying</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.infinispan.remote.query</bundle-symbolic-name>
@@ -83,7 +83,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>infinispan-common</artifactId>
+      <artifactId>jetty-infinispan-common</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.infinispan</groupId>
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/assembly/config.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/assembly/config.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/config-template/modules/infinispan-remote-query.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/modules/infinispan-remote-query.mod
similarity index 83%
rename from jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/config-template/modules/infinispan-remote-query.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/modules/infinispan-remote-query.mod
index fef22344cdb..0fe4890aaa4 100644
--- a/jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/config-template/modules/infinispan-remote-query.mod
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/modules/infinispan-remote-query.mod
@@ -11,7 +11,7 @@ infinispan-remote
 sessions/infinispan/remote/infinispan-remote-query-libs
 
 [lib]
-lib/infinispan-remote-query-${jetty.version}.jar
+lib/jetty-infinispan-remote-query-${jetty.version}.jar
 
 [xml]
 etc/sessions/infinispan/infinispan-remote-query.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManager.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManager.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManager.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManager.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManagerFactory.java b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManagerFactory.java
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManagerFactory.java
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManagerFactory.java
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml
similarity index 97%
rename from jetty-integrations/jetty-infinispan/infinispan-remote/pom.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml
index 26699057889..0abff9dc9b2 100644
--- a/jetty-integrations/jetty-infinispan/infinispan-remote/pom.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml
@@ -5,7 +5,7 @@
     <version>12.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>infinispan-remote</artifactId>
+  <artifactId>jetty-infinispan-remote</artifactId>
   <packaging>pom</packaging>
   <name>Jetty :: Infinispan Session Manager Remote</name>
   <properties>
@@ -75,7 +75,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>infinispan-common</artifactId>
+      <artifactId>jetty-infinispan-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/assembly/config.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/assembly/config.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/infinispan-remote.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/infinispan-remote.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/infinispan-remote.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/infinispan-remote.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-serverclasses.mod b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-serverclasses.mod
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-serverclasses.mod
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-serverclasses.mod
diff --git a/jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/resources/hotrod-client.properties b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/resources/hotrod-client.properties
similarity index 100%
rename from jetty-integrations/jetty-infinispan/infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/resources/hotrod-client.properties
rename to jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/resources/hotrod-client.properties
diff --git a/jetty-integrations/jetty-infinispan/pom.xml b/jetty-integrations/jetty-infinispan/pom.xml
index a119fe81eba..92d17a6f714 100644
--- a/jetty-integrations/jetty-infinispan/pom.xml
+++ b/jetty-integrations/jetty-infinispan/pom.xml
@@ -15,11 +15,11 @@
     <bundle-symbolic-name>${project.groupId}.infinispan</bundle-symbolic-name>
   </properties>
   <modules>
-    <module>infinispan-common</module>
-    <module>infinispan-embedded</module>
-    <module>infinispan-remote</module>
-    <module>infinispan-embedded-query</module>
-    <module>infinispan-remote-query</module>
+    <module>jetty-infinispan-common</module>
+    <module>jetty-infinispan-embedded</module>
+    <module>jetty-infinispan-remote</module>
+    <module>jetty-infinispan-embedded-query</module>
+    <module>jetty-infinispan-remote-query</module>
   </modules>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 0a04e6548e9..79a20cffb1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1232,27 +1232,27 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-common</artifactId>
+        <artifactId>jetty-infinispan-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-embedded</artifactId>
+        <artifactId>jetty-infinispan-embedded</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-embedded-query</artifactId>
+        <artifactId>jetty-infinispan-embedded-query</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-remote</artifactId>
+        <artifactId>jetty-infinispan-remote</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-remote-query</artifactId>
+        <artifactId>jetty-infinispan-remote-query</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>