diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 832e7719c58be..7be7c47d1891c 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -471,7 +471,7 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-klass-change-agent</artifactId>
+                <artifactId>quarkus-class-change-agent</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
diff --git a/core/class-change-agent/pom.xml b/core/class-change-agent/pom.xml
index c06c2d3d25cb2..2285eb4e58290 100644
--- a/core/class-change-agent/pom.xml
+++ b/core/class-change-agent/pom.xml
@@ -11,8 +11,7 @@
         <relativePath>../../build-parent/pom.xml</relativePath>
     </parent>
 
-    <!-- Using "klass" instead of "class", which is not allowed in automatic module name of the resulting JAR. -->
-    <artifactId>quarkus-klass-change-agent</artifactId>
+    <artifactId>quarkus-class-change-agent</artifactId>
     <name>Quarkus - Core - Class Change Agent</name>
     <description>
         A Java Agent that exposes the instrumentation API. This allows for super fast
@@ -32,6 +31,8 @@
                         <manifestEntries>
                             <Premain-Class>io.quarkus.changeagent.ClassChangeAgent</Premain-Class>
                             <Can-Redefine-Classes>true</Can-Redefine-Classes>
+                            <!-- "class" is not accepted in module name. -->
+                            <Automatic-Module-Name>quarkus.klass.change.agent</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
index 85b957e574dc8..27d1b159ef07c 100644
--- a/core/deployment/pom.xml
+++ b/core/deployment/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-klass-change-agent</artifactId>
+            <artifactId>quarkus-class-change-agent</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 68676bbf45c2f..120b022ae85c2 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -177,7 +177,7 @@
                         <parentFirstArtifact>org.junit.jupiter:junit-jupiter-params</parentFirstArtifact>
                         <parentFirstArtifact>org.junit.platform:junit-platform-commons</parentFirstArtifact>
                         <parentFirstArtifact>org.junit.platform:junit-platform-engine</parentFirstArtifact>
-                        <parentFirstArtifact>io.quarkus:quarkus-klass-change-agent</parentFirstArtifact>
+                        <parentFirstArtifact>io.quarkus:quarkus-class-change-agent</parentFirstArtifact>
                         <parentFirstArtifact>org.jacoco:org.jacoco.agent:runtime</parentFirstArtifact>
                         <parentFirstArtifact>io.quarkus:quarkus-bootstrap-gradle-resolver</parentFirstArtifact>
                         <parentFirstArtifact>io.quarkus:quarkus-junit5-mockito-config</parentFirstArtifact>
diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
index f77b86fb8cec2..9a3ebcf051b5b 100644
--- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
+++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
@@ -538,7 +538,7 @@ private void addQuarkusDevModeDeps(GradleDevModeLauncher.Builder builder, Applic
             if (!(artifactId.getGroup().equals("io.quarkus")
                     && artifactId.getName().equals("quarkus-ide-launcher"))) {
                 if (artifactId.getGroup().equals("io.quarkus")
-                        && artifactId.getName().equals("quarkus-klass-change-agent")) {
+                        && artifactId.getName().equals("quarkus-class-change-agent")) {
                     builder.jvmArgs("-javaagent:" + appDep.getFile().getAbsolutePath());
                 } else {
                     builder.classpathEntry(ArtifactKey.of(appDep.getModuleVersion().getId().getGroup(), appDep.getName(),
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
index 7c2eb6d49707a..c57a75a2c501f 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -1293,7 +1293,7 @@ private void addQuarkusDevModeDeps(MavenDevModeLauncher.Builder builder, Applica
             final org.eclipse.aether.artifact.Artifact a = appDep.getArtifact();
             if (!(a.getArtifactId().equals("quarkus-ide-launcher")
                     && a.getGroupId().equals("io.quarkus"))) {
-                if (a.getArtifactId().equals("quarkus-klass-change-agent")
+                if (a.getArtifactId().equals("quarkus-class-change-agent")
                         && a.getGroupId().equals("io.quarkus")) {
                     builder.jvmArgs("-javaagent:" + a.getFile().getAbsolutePath());
                 } else {