--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Mon Jun 17 15:38:04 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties	Thu Jun 20 14:13:50 2019 -0400
@@ -24,44 +24,42 @@
 #
 #
 
-MSG_Help=Usage: jpackage <mode> <options>\n\
+MSG_Help=Usage: jpackage <options>\n\
 \n\
-where mode is one of: \n\
-\  create-app-image\n\
-\          Generates a platform-specific application image.\n\
-\  create-installer\n\
-\          Generates a platform-specific installer for the application.\n\
-\          \n\
 Sample usages:\n\
 --------------\n\
 \    Generate a non-modular application image:\n\
-\        jpackage create-app-image -o outputdir -i inputdir -n name \\\n\
+\        jpackage -o outputdir -i inputdir -n name \\\n\
 \            --main-class className --main-jar MyJar.jar\n\
 \    Generate a modular application image:\n\
-\        jpackage create-app-image -o outputdir -n name \\\n\
-\            -p modulePath -m moduleName/className\n\
+\        jpackage -o outputdir -n name -p modulePath -m moduleName/className\n\
 \        To provide your own options to jlink, run jlink separately:\n\
 \            jlink --output appRuntimeImage -p ModulePath -m moduleName \\\n\
 \                --no-header-files [<additional jlink options>...]\n\
-\            jpackage create-app-image -o outputdir -n name \\\n\
+\            jpackage -o outputdir -n name \\\n\
 \                -m moduleName/className --runtime-image appRuntimeImage\n\
-\    Generate an application installer:\n\
-\        jpackage create-installer -o outputdir -n name \\\n\
+\    Generate an application package:\n\
+\        jpackage --package-type <type> -o outputdir -n name \\\n\
 \            -p modulePath -m moduleName/className\n\
-\        jpackage create-installer -i inputdir -o outputdir -n name \\\n\
+\        jpackage --package-type <type> -i inputdir -o outputdir -n name \\\n\
 \            --main-class package.ClassName --main-jar MyJar.jar\n\
-\        jpackage create-installer -o outputdir -n <installer-name> \\\n\
-\            --app-image <app image dir> [--installer-type <type>]\n\
-\    Generate a Java runtime installer:\n\
-\        jpackage create-installer -o outputdir -n name \\\n\
+\        jpackage --package-type <type> -o outputdir -n name \\\n\
+\            --app-image <app image dir>\n\
+\    Generate a Java runtime package:\n\
+\        jpackage --package-type <type> -o outputdir -n name \\\n\
 \            --runtime-image <runtime-image>\n\
 \n\
 Generic Options:\n\
 \  @<filename> \n\
 \          Read options and/or mode from a file \n\
 \          This option can be used multiple times.\n\
+\  --package-type <type> \n\
+\          The type of package to create\n\
+\          Valid values are: {1} \n\
+\          If this option is not specified an application image will be\n\
+\          created.\n\
 \  --app-version <version>\n\
-\          Version of the application and/or installer\n\
+\          Version of the application and/or package\n\
 \  --copyright <copyright string>\n\
 \          Copyright for the application\n\
 \  --description <description string>\n\
@@ -70,7 +68,7 @@
 \          Print the usage text with a list and description of each valid\n\
 \          option for the current platform to the output stream, and exit\n\
 \  --name -n <name>\n\
-\          Name of the application and/or installer\n\
+\          Name of the application and/or package\n\
 \  --output -o <output path>\n\
 \          Path where generated output file is placed\n\
 \          (absolute path or relative to the current directory)\n\
@@ -159,12 +157,11 @@
 \          in the Java runtime image.  Either --module or --main-jar\n\
 \          option can be specified but not both.\n\
 {2}\n\
-\Options for creating the application installer(s):\n\
+\Options for creating the application package:\n\
 \  --app-image <file path>\n\
 \          Location of the predefined application image that is used\n\
 \          to build an installable package\n\
 \          (absolute path or relative to the current directory)\n\
-\          See create-app-image mode options to create the application image.\n\
 \  --file-associations <file path>\n\
 \          Path to a Properties file that contains list of key, value pairs\n\
 \          (absolute path or relative to the current directory)\n\
@@ -177,12 +174,6 @@
 \          The value should be a valid DNS name.\n\
 \  --install-dir <file path>\n\
 \          {4}\
-\  --installer-type <type> \n\
-\          The type of the installer to create\n\
-\          Valid values are: {1} \n\
-\          If this option is not specified (in create-installer mode) all\n\
-\          supported types of installable packages for the current\n\
-\          platform will be created.\n\
 \  --license-file <file path>\n\
 \          Path to the license file\n\
 \          (absolute path or relative to the current directory)\n\
@@ -194,9 +185,9 @@
 \  --runtime-image <file-path>\n\
 \          Path of the predefined runtime image to install\n\
 \          (absolute path or relative to the current directory)\n\
-\          Option is required when creating a runtime installer.\n\
+\          Option is required when creating a runtime package.\n\
 \n\
-\Platform dependent options for creating the application installer(s):\n\
+\Platform dependent options for creating the application package:\n\
 {3}
 
 MSG_Help_win_launcher=\