diff --git a/pom.xml b/pom.xml
index b2cddbe..a092b67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,7 +194,7 @@
       </dependency>
       <dependency>
         <groupId>org.geoserver.acl.integration</groupId>
-        <artifactId>spring-boot-simplejndi</artifactId>
+        <artifactId>gs-acl-simplejndi</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
diff --git a/src/artifacts/api/pom.xml b/src/artifacts/api/pom.xml
index f790f7e..407ceb6 100644
--- a/src/artifacts/api/pom.xml
+++ b/src/artifacts/api/pom.xml
@@ -26,7 +26,7 @@
     </dependency>
     <dependency>
       <groupId>org.geoserver.acl.integration</groupId>
-      <artifactId>spring-boot-simplejndi</artifactId>
+      <artifactId>gs-acl-simplejndi</artifactId>
     </dependency>
     <dependency>
       <groupId>org.geoserver.acl.integration</groupId>
diff --git a/src/integration/spring-boot/pom.xml b/src/integration/spring-boot/pom.xml
index 2b02a91..3974c43 100644
--- a/src/integration/spring-boot/pom.xml
+++ b/src/integration/spring-boot/pom.xml
@@ -15,7 +15,7 @@
   <artifactId>spring-boot-integration</artifactId>
   <packaging>pom</packaging>
   <modules>
-    <module>spring-boot-simplejndi</module>
+    <module>simplejndi</module>
     <module>spring-cloud-bus</module>
   </modules>
 </project>
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/pom.xml b/src/integration/spring-boot/simplejndi/pom.xml
similarity index 97%
rename from src/integration/spring-boot/spring-boot-simplejndi/pom.xml
rename to src/integration/spring-boot/simplejndi/pom.xml
index 225f399..24e69d6 100644
--- a/src/integration/spring-boot/spring-boot-simplejndi/pom.xml
+++ b/src/integration/spring-boot/simplejndi/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>spring-boot-integration</artifactId>
     <version>${revision}</version>
   </parent>
-  <artifactId>spring-boot-simplejndi</artifactId>
+  <artifactId>gs-acl-simplejndi</artifactId>
   <packaging>jar</packaging>
   <description>Simple, servlet container agnostic, JNDI implementation for spring-boot</description>
   <dependencies>
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/config/jndi/SimpleJNDIStaticContextInitializer.java b/src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/config/jndi/SimpleJNDIStaticContextInitializer.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/config/jndi/SimpleJNDIStaticContextInitializer.java
rename to src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/config/jndi/SimpleJNDIStaticContextInitializer.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourceAutoConfiguration.java b/src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourceAutoConfiguration.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourceAutoConfiguration.java
rename to src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourceAutoConfiguration.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourcesConfigurationProperties.java b/src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourcesConfigurationProperties.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourcesConfigurationProperties.java
rename to src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourcesConfigurationProperties.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDatasourceConfig.java b/src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDatasourceConfig.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDatasourceConfig.java
rename to src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/config/jndidatasource/JNDIDatasourceConfig.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/jndi/NameClassPair.java b/src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/jndi/NameClassPair.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/jndi/NameClassPair.java
rename to src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/jndi/NameClassPair.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContext.java b/src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContext.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContext.java
rename to src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContext.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContextBuilder.java b/src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContextBuilder.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContextBuilder.java
rename to src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContextBuilder.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContextFactory.java b/src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContextFactory.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContextFactory.java
rename to src/integration/spring-boot/simplejndi/src/main/java/org/geoserver/cloud/jndi/SimpleNamingContextFactory.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/main/resources/META-INF/spring.factories b/src/integration/spring-boot/simplejndi/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/main/resources/META-INF/spring.factories
rename to src/integration/spring-boot/simplejndi/src/main/resources/META-INF/spring.factories
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/test/java/org/geoserver/cloud/config/jndi/SimpleJNDIStaticContextInitializerTest.java b/src/integration/spring-boot/simplejndi/src/test/java/org/geoserver/cloud/config/jndi/SimpleJNDIStaticContextInitializerTest.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/test/java/org/geoserver/cloud/config/jndi/SimpleJNDIStaticContextInitializerTest.java
rename to src/integration/spring-boot/simplejndi/src/test/java/org/geoserver/cloud/config/jndi/SimpleJNDIStaticContextInitializerTest.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/test/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourceAutoConfigurationTest.java b/src/integration/spring-boot/simplejndi/src/test/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourceAutoConfigurationTest.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/test/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourceAutoConfigurationTest.java
rename to src/integration/spring-boot/simplejndi/src/test/java/org/geoserver/cloud/config/jndidatasource/JNDIDataSourceAutoConfigurationTest.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/test/java/org/geoserver/cloud/jndi/SimpleNamingContextBuilderTest.java b/src/integration/spring-boot/simplejndi/src/test/java/org/geoserver/cloud/jndi/SimpleNamingContextBuilderTest.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/test/java/org/geoserver/cloud/jndi/SimpleNamingContextBuilderTest.java
rename to src/integration/spring-boot/simplejndi/src/test/java/org/geoserver/cloud/jndi/SimpleNamingContextBuilderTest.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/test/java/org/geoserver/cloud/jndi/SimpleNamingContextTest.java b/src/integration/spring-boot/simplejndi/src/test/java/org/geoserver/cloud/jndi/SimpleNamingContextTest.java
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/test/java/org/geoserver/cloud/jndi/SimpleNamingContextTest.java
rename to src/integration/spring-boot/simplejndi/src/test/java/org/geoserver/cloud/jndi/SimpleNamingContextTest.java
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/test/resources/application.yml b/src/integration/spring-boot/simplejndi/src/test/resources/application.yml
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/test/resources/application.yml
rename to src/integration/spring-boot/simplejndi/src/test/resources/application.yml
diff --git a/src/integration/spring-boot/spring-boot-simplejndi/src/test/resources/logback-test.xml b/src/integration/spring-boot/simplejndi/src/test/resources/logback-test.xml
similarity index 100%
rename from src/integration/spring-boot/spring-boot-simplejndi/src/test/resources/logback-test.xml
rename to src/integration/spring-boot/simplejndi/src/test/resources/logback-test.xml