diff --git a/bom/pom.xml b/bom/pom.xml
index 50a4223b49..64a02074db 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -17,7 +17,7 @@
         <!-- dependencies -->
         <jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
-        <jakarta.authentication-api.version>3.0.0</jakarta.authentication-api.version>
+        <jakarta.authentication-api.version>3.1.0</jakarta.authentication-api.version>
         <jakarta.authorization-api.version>3.0.0</jakarta.authorization-api.version>
         <jakarta.enterprise.concurrent-api.version>3.1.1</jakarta.enterprise.concurrent-api.version>
         <jakarta.ejb-api.version>4.0.1</jakarta.ejb-api.version>
diff --git a/extension/eclipse-epicyro/pom.xml b/extension/epicyro/pom.xml
similarity index 92%
rename from extension/eclipse-epicyro/pom.xml
rename to extension/epicyro/pom.xml
index 29b1b61c6b..09909e441e 100644
--- a/extension/eclipse-epicyro/pom.xml
+++ b/extension/epicyro/pom.xml
@@ -7,9 +7,9 @@
         <artifactId>project</artifactId>
         <version>24.12.0-SNAPSHOT</version>
     </parent>
-    <artifactId>piranha-extension-eclipse-epicyro</artifactId>
+    <artifactId>piranha-extension-epicyro</artifactId>
     <packaging>jar</packaging>
-    <name>Piranha - Extension - Eclipse Epicyro</name>
+    <name>Piranha - Extension - Epicyro</name>
     <dependencies>
         <!-- compile -->
         <dependency>
diff --git a/extension/eclipse-epicyro/src/main/java/cloud/piranha/extension/epicyro/AuthenticationFilter.java b/extension/epicyro/src/main/java/cloud/piranha/extension/epicyro/AuthenticationFilter.java
similarity index 100%
rename from extension/eclipse-epicyro/src/main/java/cloud/piranha/extension/epicyro/AuthenticationFilter.java
rename to extension/epicyro/src/main/java/cloud/piranha/extension/epicyro/AuthenticationFilter.java
diff --git a/extension/eclipse-epicyro/src/main/java/cloud/piranha/extension/epicyro/AuthenticationInitializer.java b/extension/epicyro/src/main/java/cloud/piranha/extension/epicyro/AuthenticationInitializer.java
similarity index 100%
rename from extension/eclipse-epicyro/src/main/java/cloud/piranha/extension/epicyro/AuthenticationInitializer.java
rename to extension/epicyro/src/main/java/cloud/piranha/extension/epicyro/AuthenticationInitializer.java
diff --git a/extension/eclipse-epicyro/src/main/java/cloud/piranha/extension/epicyro/DoNothingServerAuthModule.java b/extension/epicyro/src/main/java/cloud/piranha/extension/epicyro/DoNothingServerAuthModule.java
similarity index 100%
rename from extension/eclipse-epicyro/src/main/java/cloud/piranha/extension/epicyro/DoNothingServerAuthModule.java
rename to extension/epicyro/src/main/java/cloud/piranha/extension/epicyro/DoNothingServerAuthModule.java
diff --git a/extension/eclipse-epicyro/src/main/java/module-info.java b/extension/epicyro/src/main/java/module-info.java
similarity index 100%
rename from extension/eclipse-epicyro/src/main/java/module-info.java
rename to extension/epicyro/src/main/java/module-info.java
diff --git a/extension/eclipse-epicyro/src/test/java/cloud/piranha/extension/epicyro/AuthenticationInitializerTest.java b/extension/epicyro/src/test/java/cloud/piranha/extension/epicyro/AuthenticationInitializerTest.java
similarity index 100%
rename from extension/eclipse-epicyro/src/test/java/cloud/piranha/extension/epicyro/AuthenticationInitializerTest.java
rename to extension/epicyro/src/test/java/cloud/piranha/extension/epicyro/AuthenticationInitializerTest.java
diff --git a/extension/pom.xml b/extension/pom.xml
index c1885276fe..90c6538dd7 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -25,8 +25,8 @@
         <module>concurro</module>
         <module>coreprofile</module>
         <module>default-datasource</module>
-        <module>eclipse-epicyro</module>
         <module>eclipselink</module>
+        <module>epicyro</module>
         <module>exousia</module>
         <module>expressly</module>
         <module>fileupload</module>
diff --git a/extension/security-servlet/pom.xml b/extension/security-servlet/pom.xml
index ddd18cc573..bc11675e71 100644
--- a/extension/security-servlet/pom.xml
+++ b/extension/security-servlet/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-epicyro</artifactId>
+            <artifactId>piranha-extension-epicyro</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
             <exclusions>
diff --git a/pom.xml b/pom.xml
index 1e0f2950e7..fe5457704a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
         <concurro.version>3.1.0-M1</concurro.version>
         <crac.version>0.1.3</crac.version>
         <eclipselink.version>5.0.0-B03</eclipselink.version>
-        <epicyro.version>3.0.0</epicyro.version>
+        <epicyro.version>3.1.0</epicyro.version>
         <exousia.version>3.0.0-M2</exousia.version>
         <expressly.version>6.0.0-M2</expressly.version>
         <free-port-finder.version>1.1.1</free-port-finder.version>
diff --git a/test/debug/pom.xml b/test/debug/pom.xml
index 12030bfd42..7c09b412ae 100644
--- a/test/debug/pom.xml
+++ b/test/debug/pom.xml
@@ -71,7 +71,7 @@
 
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-epicyro</artifactId>
+            <artifactId>piranha-extension-epicyro</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>