--- a/make/common/Modules.gmk	Wed Nov 21 17:50:46 2018 -0500
+++ b/make/common/Modules.gmk	Fri Nov 23 09:02:17 2018 -0500
@@ -128,8 +128,8 @@
 JRE_TOOL_MODULES += \
     jdk.jdwp.agent \
     jdk.pack \
-    jdk.jpackager \
-    jdk.jpackager.runtime \
+    jdk.jpackage \
+    jdk.jpackage.runtime \
     jdk.scripting.nashorn.shell \
     #
 
@@ -170,8 +170,8 @@
     jdk.naming.rmi \
     jdk.net \
     jdk.pack \
-    jdk.jpackager \
-    jdk.jpackager.runtime \
+    jdk.jpackage \
+    jdk.jpackage.runtime \
     jdk.rmic \
     jdk.scripting.nashorn \
     jdk.sctp \
@@ -231,11 +231,11 @@
 endif
 
 ################################################################################
-# jpackager is only on windows, macosx, and linux
+# jpackage is only on windows, macosx, and linux
 
 ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx linux), )
-  MODULES_FILTER += jdk.jpackager
-  MODULES_FILTER += jdk.jpackager.runtime
+  MODULES_FILTER += jdk.jpackage
+  MODULES_FILTER += jdk.jpackage.runtime
 endif
 
 ################################################################################