--- a/make/CompileJavaModules.gmk	Fri Nov 02 11:34:56 2018 -0400
+++ b/make/CompileJavaModules.gmk	Mon Nov 05 17:32:00 2018 -0500
@@ -384,25 +384,25 @@
 
 ################################################################################
 
-jdk.packager_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline
+jdk.jpackager_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline
 
-jdk.packager_COPY += .gif .png .txt .spec .script .prerm .preinst .postrm .postinst .list \
+jdk.jpackager_COPY += .gif .png .txt .spec .script .prerm .preinst .postrm .postinst .list \
     .desktop .copyright .control .plist .template .icns .scpt .entitlements .wxs .iss .ico .bmp
 
-jdk.packager_CLEAN_FILES += $(wildcard \
-    $(TOPDIR)/src/jdk.packager/share/classes/jdk/packager/internal/resources/*.properties \
-    $(TOPDIR)/src/jdk.packager/share/classes/jdk/packager/internal/resources/builders/*.properties \
-    $(TOPDIR)/src/jdk.packager/linux/classes/jdk/packager/internal/resources/builders/linux/*.properties \
-    $(TOPDIR)/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/*.properties \
-    $(TOPDIR)/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/*.properties \
-    $(TOPDIR)/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/*.properties \
-    $(TOPDIR)/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/*.properties \
-    $(TOPDIR)/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/*.properties)
+jdk.jpackager_CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/*.properties \
+    $(TOPDIR)/src/jdk.jpackager/share/classes/jdk/jpackager/internal/resources/builders/*.properties \
+    $(TOPDIR)/src/jdk.jpackager/linux/classes/jdk/jpackager/internal/resources/builders/linux/*.properties \
+    $(TOPDIR)/src/jdk.jpackager/macosx/classes/jdk/jpackager/internal/resources/builders/mac/*.properties \
+    $(TOPDIR)/src/jdk.jpackager/windows/classes/jdk/jpackager/internal/resources/builders/windows/*.properties \
+    $(TOPDIR)/src/jdk.jpackager/linux/classes/jdk/jpackager/internal/resources/linux/*.properties \
+    $(TOPDIR)/src/jdk.jpackager/macosx/classes/jdk/jpackager/internal/resources/mac/*.properties \
+    $(TOPDIR)/src/jdk.jpackager/windows/classes/jdk/jpackager/internal/resources/windows/*.properties)
 
 ################################################################################
 
-jdk.packager.services_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
-jdk.packager.services_COPY += .gif .png .txt
+jdk.jpackager.runtime_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
+jdk.jpackager.runtime_COPY += .gif .png .txt
 
 ################################################################################