diff --git a/changelog.md b/changelog.md
index 81f94dffe7..8c358baf6a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -30,6 +30,8 @@ Codion Change Log
 - SwingForeignKeyConditionModel now defaults to Operator.IN when available.
 ### is.codion.tools.generator.domain
 - DomainSource no longer adds KeyGenerator.identity() import unless it is actually used.
+### is.codion.plugin.jasperreports
+- JasperReports automatic module names updated, hopefully the ones they end up using.
 
 ## 0.18.6
 ### is.codion
diff --git a/demos/chinook/src/main/java/module-info.java b/demos/chinook/src/main/java/module-info.java
index 310f97bc29..4c5d30aab5 100644
--- a/demos/chinook/src/main/java/module-info.java
+++ b/demos/chinook/src/main/java/module-info.java
@@ -28,7 +28,7 @@
 	requires is.codion.swing.framework.ui;
 	requires is.codion.plugin.jasperreports;
 	requires is.codion.plugin.imagepanel;
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires com.formdev.flatlaf.intellijthemes;
 	requires org.kordamp.ikonli.foundation;
 
diff --git a/demos/employees/build.gradle b/demos/employees/build.gradle
index 020e6e71e9..d6ced8e49c 100644
--- a/demos/employees/build.gradle
+++ b/demos/employees/build.gradle
@@ -33,7 +33,6 @@ dependencies {
     runtimeOnly(libs.h2)
 }
 
-apply from: "../../framework/servlet/extra-module-info-javalin.gradle"
 apply from: "../../plugins/jasperreports/extra-module-info-jasperreports.gradle"
 
 jasperreports {
diff --git a/demos/employees/src/main/java/module-info.java b/demos/employees/src/main/java/module-info.java
index 6452140cc2..16a2b3e96c 100644
--- a/demos/employees/src/main/java/module-info.java
+++ b/demos/employees/src/main/java/module-info.java
@@ -20,7 +20,7 @@
  * Employees demo.
  */
 module is.codion.framework.demos.employees {
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires is.codion.framework.db.http;
 	requires is.codion.framework.db.local;
 	requires is.codion.framework.db.rmi;
diff --git a/demos/manual/build.gradle b/demos/manual/build.gradle
index 48a628fee1..c1b64a3333 100644
--- a/demos/manual/build.gradle
+++ b/demos/manual/build.gradle
@@ -30,7 +30,6 @@ dependencies {
 }
 
 apply from: "../../plugins/jasperreports/extra-module-info-jasperreports.gradle"
-apply from: "../../framework/servlet/extra-module-info-javalin.gradle"
 
 tasks.register("runNotesDemo", JavaExec) {
     group "application"
diff --git a/demos/manual/src/main/java/module-info.java b/demos/manual/src/main/java/module-info.java
index 01a5f75b24..cad862d911 100644
--- a/demos/manual/src/main/java/module-info.java
+++ b/demos/manual/src/main/java/module-info.java
@@ -21,7 +21,7 @@
  */
 module is.codion.framework.demos.manual {
 	requires java.desktop;
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires is.codion.common.core;
 	requires is.codion.dbms.h2;
 	requires is.codion.framework.db.local;
diff --git a/demos/world/src/main/java/module-info.java b/demos/world/src/main/java/module-info.java
index 495e9eeb0c..b884c12168 100644
--- a/demos/world/src/main/java/module-info.java
+++ b/demos/world/src/main/java/module-info.java
@@ -25,7 +25,7 @@
 	requires is.codion.framework.json.domain;
 	requires com.formdev.flatlaf.intellijthemes;
 	requires org.kordamp.ikonli.foundation;
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires org.jfree.jfreechart;
 	requires org.jxmapviewer.jxmapviewer2;
 	requires org.json;
diff --git a/framework/servlet/build.gradle b/framework/servlet/build.gradle
index 98ebfbd34b..2ba49311a6 100644
--- a/framework/servlet/build.gradle
+++ b/framework/servlet/build.gradle
@@ -24,5 +24,4 @@ dependencies {
     testRuntimeOnly(libs.h2)
 }
 
-apply from: "extra-module-info-javalin.gradle"
 apply from: "../../plugins/jasperreports/extra-module-info-jasperreports.gradle"
\ No newline at end of file
diff --git a/framework/servlet/extra-module-info-javalin.gradle b/framework/servlet/extra-module-info-javalin.gradle
deleted file mode 100644
index ab6ba90bf8..0000000000
--- a/framework/servlet/extra-module-info-javalin.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-extraJavaModuleInfo {
-    automaticModule("org.jetbrains.kotlin:kotlin-stdlib-common", "kotlin.stdlib.common")
-}
\ No newline at end of file
diff --git a/plugins/jasperreports/build.gradle b/plugins/jasperreports/build.gradle
index 1bad0a1faf..b12cba32f1 100644
--- a/plugins/jasperreports/build.gradle
+++ b/plugins/jasperreports/build.gradle
@@ -24,7 +24,6 @@ dependencies {
 }
 
 apply from: "extra-module-info-jasperreports.gradle"
-apply from: "../../framework/servlet/extra-module-info-javalin.gradle"
 
 jasperreports {
     srcDir = file("src/test/reports")
diff --git a/plugins/jasperreports/extra-module-info-jasperreports.gradle b/plugins/jasperreports/extra-module-info-jasperreports.gradle
index 64a5eaa30b..268a16c142 100644
--- a/plugins/jasperreports/extra-module-info-jasperreports.gradle
+++ b/plugins/jasperreports/extra-module-info-jasperreports.gradle
@@ -1,6 +1,6 @@
 extraJavaModuleInfo {
-    automaticModule("net.sf.jasperreports:jasperreports", "jasperreports")
-    automaticModule("net.sf.jasperreports:jasperreports-jdt", "jasperreports.jdt")
+    automaticModule("net.sf.jasperreports:jasperreports", "net.sf.jasperreports.core")
+    automaticModule("net.sf.jasperreports:jasperreports-jdt", "net.sf.jasperreports.jdt")
     automaticModule("org.eclipse.jdt:ecj", "org.eclipse.jdt.ecj")
     automaticModule("commons-collections:commons-collections", "commons.collections")
     automaticModule("commons-digester:commons-digester", "commons.digester")
diff --git a/plugins/jasperreports/src/main/java/module-info.java b/plugins/jasperreports/src/main/java/module-info.java
index 7cc64672d7..79951538f7 100644
--- a/plugins/jasperreports/src/main/java/module-info.java
+++ b/plugins/jasperreports/src/main/java/module-info.java
@@ -24,7 +24,7 @@
  * {@link is.codion.plugin.jasperreports.JRReportType}<br>
  */
 module is.codion.plugin.jasperreports {
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires is.codion.common.db;
 
 	exports is.codion.plugin.jasperreports;