# HG changeset patch
# User herrick
# Date 1554840381 14400
# Node ID 2891b3ae222d42e46dc656302131e6af64854d50
# Parent  4f1efc26b577a6feabad1f62e2ded252ae5c82d6
8221641: Follow up code clean up for JDK-8221582
Reviewed-by: almatvee

diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java	Tue Apr 09 16:06:21 2019 -0400
@@ -184,7 +184,7 @@
                 APP_RESOURCES,
                 ARGUMENTS,
                 CLASSPATH,
-                JVM_OPTIONS,
+                JAVA_OPTIONS,
                 MAIN_CLASS,
                 MAIN_JAR,
                 PREFERENCES_ID,
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp
--- a/src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -160,7 +160,7 @@
     return result;
 }
 
-TString LinuxPlatform::GetBundledJVMLibraryFileName(TString RuntimePath) {
+TString LinuxPlatform::GetBundledJavaLibraryFileName(TString RuntimePath) {
     TString result = FilePath::IncludeTrailingSeparator(RuntimePath) +
             "lib/libjli.so";
 
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.h
--- a/src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.h	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/linux/native/libapplauncher/LinuxPlatform.h	Tue Apr 09 16:06:21 2019 -0400
@@ -63,7 +63,7 @@
 
     virtual TString GetModuleFileName();
 
-    virtual TString GetBundledJVMLibraryFileName(TString RuntimePath);
+    virtual TString GetBundledJavaLibraryFileName(TString RuntimePath);
 
     virtual ISectionalPropertyContainer* GetConfigFile(TString FileName);
 
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java	Tue Apr 09 16:06:21 2019 -0400
@@ -354,7 +354,7 @@
                 CLASSPATH,
                 DEVELOPER_ID_APP_SIGNING_KEY,
                 ICON_ICNS,
-                JVM_OPTIONS,
+                JAVA_OPTIONS,
                 MAC_CATEGORY,
                 MAC_CF_BUNDLE_IDENTIFIER,
                 MAC_CF_BUNDLE_NAME,
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Tue Apr 09 16:06:21 2019 -0400
@@ -528,7 +528,7 @@
                 PREFERENCES_ID.fetchFrom(params).toLowerCase());
 
         StringBuilder sb = new StringBuilder();
-        List<String> jvmOptions = JVM_OPTIONS.fetchFrom(params);
+        List<String> jvmOptions = JAVA_OPTIONS.fetchFrom(params);
 
         String newline = ""; //So we don't add extra line after last append
         for (String o : jvmOptions) {
@@ -537,7 +537,7 @@
             newline = "\n";
         }
 
-        data.put("DEPLOY_JVM_OPTIONS", sb.toString());
+        data.put("DEPLOY_JAVA_OPTIONS", sb.toString());
 
         sb = new StringBuilder();
         List<String> args = ARGUMENTS.fetchFrom(params);
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info.plist.template
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info.plist.template	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info.plist.template	Tue Apr 09 16:06:21 2019 -0400
@@ -32,19 +32,19 @@
   <string>DEPLOY_BUNDLE_CFBUNDLE_VERSION</string>
   <key>NSHumanReadableCopyright</key>
   <string>DEPLOY_BUNDLE_COPYRIGHT</string>
-  <key>JVMRuntime</key>
+  <key>JavaRuntime</key>
   <string>DEPLOY_JAVA_RUNTIME_NAME</string>
-  <key>JVMMainClassName</key>
+  <key>JavaMainClassName</key>
   <string>DEPLOY_LAUNCHER_CLASS</string>
-  <key>JVMAppClasspath</key>
+  <key>JavaAppClasspath</key>
   <string>DEPLOY_APP_CLASSPATH</string>
-  <key>JVMMainJarName</key>
+  <key>JavaMainJarName</key>
   <string>DEPLOY_MAIN_JAR_NAME</string>
-  <key>JVMPreferencesID</key>
+  <key>JavaPreferencesID</key>
   <string>DEPLOY_PREFERENCES_ID</string>
   <key>JavaOptions</key>
   <array>
-DEPLOY_JVM_OPTIONS
+DEPLOY_JAVA_OPTIONS
   </array>
   <key>ArgOptions</key>
   <array>
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/macosx/native/libapplauncher/MacPlatform.h
--- a/src/jdk.jpackage/macosx/native/libapplauncher/MacPlatform.h	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/macosx/native/libapplauncher/MacPlatform.h	Tue Apr 09 16:06:21 2019 -0400
@@ -52,7 +52,7 @@
     virtual void SetCurrentDirectory(TString Value);
     virtual TString GetPackageRootDirectory();
     virtual TString GetAppDataDirectory();
-    virtual TString GetBundledJVMLibraryFileName(TString RuntimePath);
+    virtual TString GetBundledJavaLibraryFileName(TString RuntimePath);
     virtual TString GetAppName();
 
     TString GetPackageAppDirectory();
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/macosx/native/libapplauncher/MacPlatform.mm
--- a/src/jdk.jpackage/macosx/native/libapplauncher/MacPlatform.mm	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/macosx/native/libapplauncher/MacPlatform.mm	Tue Apr 09 16:06:21 2019 -0400
@@ -220,7 +220,7 @@
     return result;
 }
 
-TString MacPlatform::GetBundledJVMLibraryFileName(TString RuntimePath) {
+TString MacPlatform::GetBundledJavaLibraryFileName(TString RuntimePath) {
     TString result;
 
     // first try lib/, then lib/jli
@@ -471,19 +471,19 @@
         keys.insert(std::map<TString, TString>::value_type(CONFIG_VERSION,
                 _T("app.version")));
         keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINJAR_KEY,
-                _T("JVMMainJarName")));
+                _T("JavaMainJarName")));
         keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINMODULE_KEY,
-                _T("JVMMainModuleName")));
+                _T("JavaMainModuleName")));
         keys.insert(std::map<TString, TString>::value_type(
-                CONFIG_MAINCLASSNAME_KEY, _T("JVMMainClassName")));
+                CONFIG_MAINCLASSNAME_KEY, _T("JavaMainClassName")));
         keys.insert(std::map<TString, TString>::value_type(
-                CONFIG_CLASSPATH_KEY, _T("JVMAppClasspath")));
+                CONFIG_CLASSPATH_KEY, _T("JavaAppClasspath")));
         keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY,
                 _T("CFBundleName")));
         keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_ID_KEY,
-                _T("JVMPreferencesID")));
-        keys.insert(std::map<TString, TString>::value_type(JVM_RUNTIME_KEY,
-                _T("JVMRuntime")));
+                _T("JavaPreferencesID")));
+        keys.insert(std::map<TString, TString>::value_type(JAVA_RUNTIME_KEY,
+                _T("JavaRuntime")));
         keys.insert(std::map<TString, TString>::value_type(JPACKAGE_APP_DATA_DIR,
                 _T("CFBundleIdentifier")));
 
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java	Tue Apr 09 16:06:21 2019 -0400
@@ -234,7 +234,7 @@
 
         out.println();
         out.println("[JavaOptions]");
-        List<String> jvmargs = JVM_OPTIONS.fetchFrom(params);
+        List<String> jvmargs = JAVA_OPTIONS.fetchFrom(params);
         for (String arg : jvmargs) {
             out.println(arg);
         }
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java	Tue Apr 09 16:06:21 2019 -0400
@@ -146,7 +146,7 @@
     }
 
     public void setJvmargs(List<String> jvmargs) {
-        putUnlessNullOrEmpty(JVM_OPTIONS.getID(), jvmargs);
+        putUnlessNullOrEmpty(JAVA_OPTIONS.getID(), jvmargs);
     }
 
     public void setArguments(List<String> arguments) {
@@ -240,7 +240,7 @@
     }
 
     public List<String> getJvmargs() {
-        return JVM_OPTIONS.fetchFrom(params);
+        return JAVA_OPTIONS.fetchFrom(params);
     }
 
     public List<String> getArguments() {
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java	Tue Apr 09 16:06:21 2019 -0400
@@ -451,7 +451,7 @@
     }
 
     static final Set<String> multi_args = new TreeSet<>(Arrays.asList(
-            StandardBundlerParam.JVM_OPTIONS.getID(),
+            StandardBundlerParam.JAVA_OPTIONS.getID(),
             StandardBundlerParam.ARGUMENTS.getID(),
             StandardBundlerParam.MODULE_PATH.getID(),
             StandardBundlerParam.ADD_MODULES.getID(),
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java	Tue Apr 09 16:06:21 2019 -0400
@@ -243,7 +243,7 @@
             );
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam<List<String>> JVM_OPTIONS =
+    static final StandardBundlerParam<List<String>> JAVA_OPTIONS =
             new StandardBundlerParam<>(
                     Arguments.CLIOptions.JAVA_OPTIONS.getId(),
                     (Class<List<String>>) (Object) List.class,
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Helpers.cpp
--- a/src/jdk.jpackage/share/native/libapplauncher/Helpers.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Helpers.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -125,7 +125,7 @@
 }
 
 OrderedMap<TString, TString>
-        Helpers::GetJVMArgsFromConfig(IPropertyContainer* config) {
+        Helpers::GetJavaOptionsFromConfig(IPropertyContainer* config) {
     OrderedMap<TString, TString> result;
 
     for (unsigned int index = 0; index < config->GetCount(); index++) {
@@ -192,16 +192,16 @@
         AppendToIni(propertyFile, Container, keys[CONFIG_CLASSPATH_KEY]);
         AppendToIni(propertyFile, Container, keys[APP_NAME_KEY]);
         AppendToIni(propertyFile, Container, keys[CONFIG_APP_ID_KEY]);
-        AppendToIni(propertyFile, Container, keys[JVM_RUNTIME_KEY]);
+        AppendToIni(propertyFile, Container, keys[JAVA_RUNTIME_KEY]);
         AppendToIni(propertyFile, Container, keys[JPACKAGE_APP_DATA_DIR]);
 
         AppendToIni(propertyFile, Container, keys[CONFIG_APP_MEMORY]);
         AppendToIni(propertyFile, Container, keys[CONFIG_SPLASH_KEY]);
 
         // JavaOptions Section
-        OrderedMap<TString, TString> JVMArgs =
-                Helpers::GetJVMArgsFromConfig(&propertyFile);
-        Container->AppendSection(keys[CONFIG_SECTION_JAVAOPTIONS], JVMArgs);
+        OrderedMap<TString, TString> JavaOptions =
+                Helpers::GetJavaOptionsFromConfig(&propertyFile);
+        Container->AppendSection(keys[CONFIG_SECTION_JAVAOPTIONS], JavaOptions);
 
         // ArgOptions Section
         std::list<TString> args = Helpers::GetArgsFromConfig(&propertyFile);
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Helpers.h
--- a/src/jdk.jpackage/share/native/libapplauncher/Helpers.h	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Helpers.h	Tue Apr 09 16:06:21 2019 -0400
@@ -52,7 +52,7 @@
     static TString ConvertJavaPathToId(TString Value);
 
     static OrderedMap<TString, TString>
-            GetJVMArgsFromConfig(IPropertyContainer* config);
+            GetJavaOptionsFromConfig(IPropertyContainer* config);
     static std::list<TString> GetArgsFromConfig(IPropertyContainer* config);
 
     static void LoadOldConfigFile(TString FileName, IniFile* Container);
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/JavaVirtualMachine.cpp
--- a/src/jdk.jpackage/share/native/libapplauncher/JavaVirtualMachine.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/JavaVirtualMachine.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -159,7 +159,7 @@
     options.AppendValue(
             _T("-Djava.launcher.path"), package.GetPackageLauncherDirectory());
     options.AppendValue(_T("-Dapp.preferences.id"), package.GetAppID());
-    options.AppendValues(package.GetJVMArgs());
+    options.AppendValues(package.GetJavaOptions());
 
 #ifdef DEBUG
     if (package.Debugging() == dsJava) {
@@ -234,7 +234,7 @@
 void JavaVirtualMachine::configureLibrary() {
     Platform& platform = Platform::GetInstance();
     Package& package = Package::GetInstance();
-    TString libName = package.GetJVMLibraryFileName();
+    TString libName = package.GetJavaLibraryFileName();
     platform.addPlatformDependencies(&javaLibrary);
     javaLibrary.Load(libName);
 }
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Library.cpp
--- a/src/jdk.jpackage/share/native/libapplauncher/Library.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Library.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -163,7 +163,7 @@
 
 bool JavaLibrary::JavaVMCreate(size_t argc, char *argv[]) {
     if (FCreateProc == NULL) {
-        FCreateProc = (JVM_CREATE) GetProcAddress(LAUNCH_FUNC);
+        FCreateProc = (JAVA_CREATE) GetProcAddress(LAUNCH_FUNC);
     }
 
     if (FCreateProc == NULL) {
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Library.h
--- a/src/jdk.jpackage/share/native/libapplauncher/Library.h	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Library.h	Tue Apr 09 16:06:21 2019 -0400
@@ -45,7 +45,7 @@
 // Private typedef for function pointer casting
 #define LAUNCH_FUNC "JLI_Launch"
 
-typedef int (JNICALL *JVM_CREATE)(int argc, char ** argv,
+typedef int (JNICALL *JAVA_CREATE)(int argc, char ** argv,
         int jargc, const char** jargv,
         int appclassc, const char** appclassv,
         const char* fullversion,
@@ -89,7 +89,7 @@
 };
 
 class JavaLibrary : public Library {
-    JVM_CREATE FCreateProc;
+    JAVA_CREATE FCreateProc;
     JavaLibrary(const TString &FileName);
 public:
     JavaLibrary();
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Macros.cpp
--- a/src/jdk.jpackage/share/native/libapplauncher/Macros.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Macros.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -45,7 +45,7 @@
     macros.AddMacro(_T("$APPDATADIR"), package.GetAppDataDirectory());
 
     TString javaHome =
-            FilePath::ExtractFilePath(package.GetJVMLibraryFileName());
+            FilePath::ExtractFilePath(package.GetJavaLibraryFileName());
     macros.AddMacro(_T("$JREHOME"), javaHome);
 
     // App CDS Macros
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Package.cpp
--- a/src/jdk.jpackage/share/native/libapplauncher/Package.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Package.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -130,11 +130,11 @@
 
     // Runtime.
     config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-            keys[JVM_RUNTIME_KEY], FBootFields->FJVMRuntimeDirectory);
+            keys[JAVA_RUNTIME_KEY], FBootFields->FJavaRuntimeDirectory);
 
     // Read jvmargs.
     PromoteAppCDSState(config);
-    ReadJVMArgs(config);
+    ReadJavaOptions(config);
 
     // Read args if none were passed in.
     if (FBootFields->FArgs.size() == 0) {
@@ -237,7 +237,7 @@
     }
 }
 
-void Package::ReadJVMArgs(ISectionalPropertyContainer* Config) {
+void Package::ReadJavaOptions(ISectionalPropertyContainer* Config) {
     Platform& platform = Platform::GetInstance();
     std::map<TString, TString> keys = platform.GetKeys();
 
@@ -249,14 +249,14 @@
 
         case cdsDisabled: {
             Config->GetSection(keys[CONFIG_SECTION_JAVAOPTIONS],
-                    FBootFields->FJVMArgs);
+                    FBootFields->FJavaOptions);
             break;
         }
 
         case cdsGenCache: {
             Config->GetSection(keys[
                     CONFIG_SECTION_APPCDSGENERATECACHEJAVAOPTIONS],
-                    FBootFields->FJVMArgs);
+                    FBootFields->FJavaOptions);
             break;
         }
 
@@ -282,7 +282,7 @@
                 }
 
                 Config->GetSection(keys[CONFIG_SECTION_APPCDSJAVAOPTIONS],
-                        FBootFields->FJVMArgs);
+                        FBootFields->FJavaOptions);
             }
 
             break;
@@ -357,8 +357,8 @@
     }
 }
 
-OrderedMap<TString, TString> Package::GetJVMArgs() {
-    return FBootFields->FJVMArgs;
+OrderedMap<TString, TString> Package::GetJavaOptions() {
+    return FBootFields->FJavaOptions;
 }
 
 std::vector<TString> GetKeysThatAreNotDuplicates(OrderedMap<TString,
@@ -514,23 +514,23 @@
     return FBootFields->FMainClassName;
 }
 
-TString Package::GetJVMLibraryFileName() {
+TString Package::GetJavaLibraryFileName() {
     assert(FBootFields != NULL);
 
-    if (FBootFields->FJVMLibraryFileName.empty() == true) {
+    if (FBootFields->FJavaLibraryFileName.empty() == true) {
         Platform& platform = Platform::GetInstance();
         Macros& macros = Macros::GetInstance();
-        TString jvmRuntimePath = macros.ExpandMacros(GetJVMRuntimeDirectory());
-        FBootFields->FJVMLibraryFileName =
-                platform.GetBundledJVMLibraryFileName(jvmRuntimePath);
+        TString jvmRuntimePath = macros.ExpandMacros(GetJavaRuntimeDirectory());
+        FBootFields->FJavaLibraryFileName =
+                platform.GetBundledJavaLibraryFileName(jvmRuntimePath);
     }
 
-    return FBootFields->FJVMLibraryFileName;
+    return FBootFields->FJavaLibraryFileName;
 }
 
-TString Package::GetJVMRuntimeDirectory() {
+TString Package::GetJavaRuntimeDirectory() {
     assert(FBootFields != NULL);
-    return FBootFields->FJVMRuntimeDirectory;
+    return FBootFields->FJavaRuntimeDirectory;
 }
 
 TString Package::GetSplashScreenFileName() {
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Package.h
--- a/src/jdk.jpackage/share/native/libapplauncher/Package.h	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Package.h	Tue Apr 09 16:06:21 2019 -0400
@@ -40,7 +40,7 @@
     enum MemoryState {msManual, msAuto};
 
 public:
-    OrderedMap<TString, TString> FJVMArgs;
+    OrderedMap<TString, TString> FJavaOptions;
     std::list<TString> FArgs;
 
     TString FPackageRootDirectory;
@@ -54,8 +54,8 @@
     TString FMainJar;
     TString FMainModule;
     TString FMainClassName;
-    TString FJVMRuntimeDirectory;
-    TString FJVMLibraryFileName;
+    TString FJavaRuntimeDirectory;
+    TString FJavaLibraryFileName;
     TString FSplashScreenFileName;
     bool FUseJavaPreferences;
     TString FCommandName;
@@ -82,7 +82,7 @@
     Package(void);
 
     TString GetMainJar();
-    void ReadJVMArgs(ISectionalPropertyContainer* Config);
+    void ReadJavaOptions(ISectionalPropertyContainer* Config);
     void PromoteAppCDSState(ISectionalPropertyContainer* Config);
 
 public:
@@ -95,7 +95,7 @@
 
     void SetCommandLineArguments(int argc, TCHAR* argv[]);
 
-    OrderedMap<TString, TString> GetJVMArgs();
+    OrderedMap<TString, TString> GetJavaOptions();
     TString GetMainModule();
 
     std::list<TString> GetArgs();
@@ -113,8 +113,8 @@
     TString GetClassPath();
     TString GetModulePath();
     TString GetMainClassName();
-    TString GetJVMLibraryFileName();
-    TString GetJVMRuntimeDirectory();
+    TString GetJavaLibraryFileName();
+    TString GetJavaRuntimeDirectory();
     TString GetSplashScreenFileName();
     bool HasSplashScreen();
     TString GetCommandName();
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Platform.cpp
--- a/src/jdk.jpackage/share/native/libapplauncher/Platform.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Platform.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -142,7 +142,7 @@
             _T("app.name")));
     keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_ID_KEY,
             _T("app.preferences.id")));
-    keys.insert(std::map<TString, TString>::value_type(JVM_RUNTIME_KEY,
+    keys.insert(std::map<TString, TString>::value_type(JAVA_RUNTIME_KEY,
             _T("app.runtime")));
     keys.insert(std::map<TString, TString>::value_type(JPACKAGE_APP_DATA_DIR,
             _T("app.identifier")));
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Platform.h
--- a/src/jdk.jpackage/share/native/libapplauncher/Platform.h	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Platform.h	Tue Apr 09 16:06:21 2019 -0400
@@ -64,7 +64,7 @@
 #define CONFIG_APP_DEBUG          _T("CONFIG_APP_DEBUG")
 #define CONFIG_APPLICATION_INSTANCE _T("CONFIG_APPLICATION_INSTANCE")
 
-#define JVM_RUNTIME_KEY           _T("JVM_RUNTIME_KEY")
+#define JAVA_RUNTIME_KEY           _T("JAVA_RUNTIME_KEY")
 #define JPACKAGE_APP_DATA_DIR     _T("CONFIG_APP_IDENTIFIER")
 
 struct WideString {
@@ -200,7 +200,7 @@
 
     virtual TString GetConfigFileName();
 
-    virtual TString GetBundledJVMLibraryFileName(TString RuntimePath) = 0;
+    virtual TString GetBundledJavaLibraryFileName(TString RuntimePath) = 0;
 
     // Caller must free result.
     virtual ISectionalPropertyContainer* GetConfigFile(TString FileName) = 0;
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/main.cpp
--- a/src/jdk.jpackage/share/native/libapplauncher/main.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/main.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -46,16 +46,16 @@
     and calls start_launcher below.
   - Reads app/package.cfg or Info.plist or app/<appname>.cfg for application
     launch configuration (package.cfg is property file).
-  - Load JVM with requested JVM settings (bundled client JVM if availble,
-    server or installed JVM otherwise).
-  - Wait for JVM to exit and then exit from Main
+  - Load Java with requested Java settings (bundled client Java if availble,
+    server or installed Java otherwise).
+  - Wait for Java to exit and then exit from Main
   - To debug application by passing command line argument.
   - Application folder is added to the library path (so LoadLibrary()) works.
 
 Limitations and future work:
   - Running Java code in primordial thread may cause problems
     (example: can not use custom stack size).
-    Solution used by java launcher is to create a new thread to invoke JVM.
+    Solution used by java launcher is to create a new thread to invoke Java.
     See CR 6316197 for more information.
 */
 
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java	Tue Apr 09 16:06:21 2019 -0400
@@ -231,7 +231,7 @@
                 ARGUMENTS,
                 CLASSPATH,
                 ICON_ICO,
-                JVM_OPTIONS,
+                JAVA_OPTIONS,
                 MAIN_CLASS,
                 MAIN_JAR,
                 PREFERENCES_ID,
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp
--- a/src/jdk.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp	Tue Apr 09 16:06:21 2019 -0400
@@ -221,7 +221,7 @@
     return result;
 }
 
-TString WindowsPlatform::GetBundledJVMLibraryFileName(TString RuntimePath) {
+TString WindowsPlatform::GetBundledJavaLibraryFileName(TString RuntimePath) {
     TString result = FilePath::IncludeTrailingSeparator(RuntimePath) +
             _T("jre\\bin\\jli.dll");
 
diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/windows/native/libapplauncher/WindowsPlatform.h
--- a/src/jdk.jpackage/windows/native/libapplauncher/WindowsPlatform.h	Tue Apr 09 11:30:09 2019 -0400
+++ b/src/jdk.jpackage/windows/native/libapplauncher/WindowsPlatform.h	Tue Apr 09 16:06:21 2019 -0400
@@ -51,7 +51,7 @@
     virtual TString GetPackageRootDirectory();
     virtual TString GetAppDataDirectory();
     virtual TString GetAppName();
-    virtual TString GetBundledJVMLibraryFileName(TString RuntimePath);
+    virtual TString GetBundledJavaLibraryFileName(TString RuntimePath);
     TString GetPackageAppDirectory();
     TString GetPackageLauncherDirectory();
     TString GetPackageRuntimeBinDirectory();