--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties	Mon Jun 17 15:38:04 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties	Thu Jun 20 14:13:50 2019 -0400
@@ -64,11 +64,9 @@
 
 ERR_NoMainClass=Error: Main application class is missing.
 ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform.
-ERR_NotImageOption=Error: Option [{0}] is not valid in create-app-image mode.
-ERR_NotInstallerOption=Error: Option [{0}] is not valid with --app-image option.
+ERR_InvalidTypeOption=Error: Option [{0}] is not valid with package-type [{1}].
 ERR_NoInstallerEntryPoint=Error: Option [{0}] is not valid without --module or --main-jar entry point option.
 
-ERR_MissingMode=Error: Mode is not specified.
 ERR_MissingArgument=Error: Missing argument: {0}.
 ERR_MissingAppResources=Error: No application jars found.
 ERR_AppImageNotExist=Error: App image directory "{0}" does not exist.
@@ -81,8 +79,8 @@
 ERR_BuildRootInvalid=Error: temp-root ({0}) must be non-existant directory.
 ERR_InvalidOption=Error: Invalid Option: [{0}].
 ERR_VersionComparison=Error: Failed to compare version {0} with {1}.
-ERR_InvalidInstallerType=Error: Invalid or Unsupported Installer type: [{0}].
+ERR_InvalidInstallerType=Error: Invalid or unsupported package type: [{0}].
 ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options.
-ERR_NoEntryPoint=Error: create-app-image requires --main-jar or --module Option.
+ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option.
 ERR_InputNotDirectory=Error: Input directory specified is not a directory: {0}.
 ERR_CannotReadInputDir=Error: No permission to read from input directory: {0}.