--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java	Mon Feb 04 15:00:29 2019 -0500
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java	Wed Feb 06 09:00:28 2019 -0500
@@ -65,7 +65,7 @@
         add(CLIOptions.CREATE_IMAGE, CLIOptions.NAME);
         add(CLIOptions.CREATE_IMAGE, CLIOptions.IDENTIFIER);
         add(CLIOptions.CREATE_IMAGE, CLIOptions.VERBOSE);
-        add(CLIOptions.CREATE_IMAGE, CLIOptions.FORCE);
+        add(CLIOptions.CREATE_IMAGE, CLIOptions.OVERWRITE);
         add(CLIOptions.CREATE_IMAGE, CLIOptions.FILES);
         add(CLIOptions.CREATE_IMAGE, CLIOptions.ARGUMENTS);
         add(CLIOptions.CREATE_IMAGE, CLIOptions.STRIP_NATIVE_COMMANDS);
@@ -79,7 +79,6 @@
         add(CLIOptions.CREATE_IMAGE, CLIOptions.MODULE);
         add(CLIOptions.CREATE_IMAGE, CLIOptions.ADD_MODULES);
         add(CLIOptions.CREATE_IMAGE, CLIOptions.MODULE_PATH);
-        add(CLIOptions.CREATE_IMAGE, CLIOptions.LIMIT_MODULES);
         add(CLIOptions.CREATE_IMAGE, CLIOptions.RESOURCE_DIR);
 
         if (Platform.getPlatform() == Platform.MAC) {
@@ -101,15 +100,17 @@
         }
 
         // add options for CREATE_INSTALLER
-
-        // add all CREATE_IMAGE options for CREATE_JRE_INSTALLER
+        // (start with all options for CREATE_IMAGE)
         Set<CLIOptions> imageOptions = options.get(CLIOptions.CREATE_IMAGE);
         imageOptions.forEach(o -> add(CLIOptions.CREATE_INSTALLER, o));
 
+        add(CLIOptions.CREATE_INSTALLER, CLIOptions.RUNTIME_INSTALLER);
+        add(CLIOptions.CREATE_INSTALLER, CLIOptions.INSTALLER_TYPE);
         add(CLIOptions.CREATE_INSTALLER, CLIOptions.LICENSE_FILE);
         add(CLIOptions.CREATE_INSTALLER, CLIOptions.FILE_ASSOCIATIONS);
         add(CLIOptions.CREATE_INSTALLER, CLIOptions.INSTALL_DIR);
         add(CLIOptions.CREATE_INSTALLER, CLIOptions.PREDEFINED_APP_IMAGE);
+        add(CLIOptions.CREATE_INSTALLER, CLIOptions.INSTALLER_TYPE);
 
         if (Platform.getPlatform() == Platform.MAC) {
             add(CLIOptions.CREATE_INSTALLER, CLIOptions.MAC_APP_STORE_CATEGORY);
@@ -142,59 +143,6 @@
             add(CLIOptions.CREATE_INSTALLER, CLIOptions.WIN_CONSOLE_HINT);
         }
 
-        // add options for CREATE_JRE_INSTALLER
-
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.INPUT);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.OUTPUT);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.NAME);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VERBOSE);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.FILES);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.STRIP_NATIVE_COMMANDS);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.LICENSE_FILE);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VERSION);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.BUILD_ROOT);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.INSTALL_DIR);
-        add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.PREDEFINED_RUNTIME_IMAGE);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.ADD_MODULES);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.MODULE_PATH);
-        add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.LIMIT_MODULES);
-
-        if (Platform.getPlatform() == Platform.MAC) {
-            add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.MAC_SIGN);
-            add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.MAC_BUNDLE_NAME);
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.MAC_BUNDLE_IDENTIFIER);
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.MAC_BUNDLE_SIGNING_PREFIX);
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.MAC_SIGNING_KEY_NAME);
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.MAC_SIGNING_KEYCHAIN);
-        }
-
-        if (Platform.getPlatform() == Platform.WINDOWS) {
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.WIN_PER_USER_INSTALLATION);
-            add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.WIN_DIR_CHOOSER);
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.WIN_UPGRADE_UUID);
-            add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.DESCRIPTION);
-            add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VENDOR);
-        }
-
-        if (Platform.getPlatform() == Platform.LINUX) {
-            add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.LINUX_BUNDLE_NAME);
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.LINUX_DEB_MAINTAINER);
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.LINUX_PACKAGE_DEPENDENCIES);
-            add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.DESCRIPTION);
-            add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VENDOR);
-            add(CLIOptions.CREATE_JRE_INSTALLER,
-                    CLIOptions.LINUX_RPM_LICENSE_TYPE);
-        }
-
         argsInitialized = true;
     }