diff --git a/jdk/src/java.base/share/classes/module-info.java b/jdk/src/java.base/share/classes/module-info.java
index 3ad3f4a096c..d6ad8cf67ef 100644
--- a/jdk/src/java.base/share/classes/module-info.java
+++ b/jdk/src/java.base/share/classes/module-info.java
@@ -136,7 +136,7 @@ module java.base {
         jdk.jartool,
         jdk.jlink,
         jdk.scripting.nashorn,
-        jdk.vm.ci;
+        jdk.internal.vm.ci;
     exports jdk.internal.org.objectweb.asm.tree to
         jdk.jlink;
     exports jdk.internal.org.objectweb.asm.util to
@@ -175,7 +175,7 @@ module java.base {
         jdk.scripting.nashorn,
         jdk.scripting.nashorn.shell,
         jdk.unsupported,
-        jdk.vm.ci;
+        jdk.internal.vm.ci;
     exports jdk.internal.perf to
         java.desktop,
         java.management,
@@ -193,7 +193,7 @@ module java.base {
         jdk.unsupported;
     exports jdk.internal.vm.annotation to
         jdk.unsupported,
-        jdk.vm.ci;
+        jdk.internal.vm.ci;
     exports jdk.internal.util.jar to
         jdk.jartool,
         jdk.jdeps,
diff --git a/jdk/src/java.base/share/lib/security/default.policy b/jdk/src/java.base/share/lib/security/default.policy
index 36521f38e1d..d3b7112f0d5 100644
--- a/jdk/src/java.base/share/lib/security/default.policy
+++ b/jdk/src/java.base/share/lib/security/default.policy
@@ -216,6 +216,6 @@ grant {
     permission java.lang.RuntimePermission "accessClassInPackage.com.apple.*";
 };
 
-grant codeBase "jrt:/jdk.vm.compiler" {
+grant codeBase "jrt:/jdk.internal.vm.compiler" {
     permission java.security.AllPermission;
 };
diff --git a/jdk/src/java.base/unix/classes/module-info.java.extra b/jdk/src/java.base/unix/classes/module-info.java.extra
index 43f85b0309a..833b0964309 100644
--- a/jdk/src/java.base/unix/classes/module-info.java.extra
+++ b/jdk/src/java.base/unix/classes/module-info.java.extra
@@ -23,14 +23,14 @@
  * questions.
  */
 
-// jdk.vm.compiler uses Unsafe and VM classes from jdk.internal.misc
-exports jdk.internal.misc to jdk.vm.compiler;
-opens   jdk.internal.misc to jdk.vm.compiler;
+// jdk.internal.vm.compiler uses Unsafe and VM classes from jdk.internal.misc
+exports jdk.internal.misc to jdk.internal.vm.compiler;
+opens   jdk.internal.misc to jdk.internal.vm.compiler;
 
-// jdk.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics
-opens com.sun.crypto.provider to jdk.vm.compiler;
+// jdk.internal.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics
+opens com.sun.crypto.provider to jdk.internal.vm.compiler;
 
-exports jdk.internal.module to jdk.vm.compiler;
+exports jdk.internal.module to jdk.internal.vm.compiler;
 
 // AOT uses jdk.internal.misc.Unsafe
 exports jdk.internal.misc to jdk.aot;