--- old/src/jdk.jpackage/share/native/libapplauncher/Package.cpp	2019-04-19 16:02:20.248787964 -0700
+++ new/src/jdk.jpackage/share/native/libapplauncher/Package.cpp	2019-04-19 16:02:19.972787972 -0700
@@ -71,8 +71,6 @@
             platform.GetConfigFile(platform.GetConfigFileName());
 
     config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-            keys[CONFIG_APP_ID_KEY], FBootFields->FAppID);
-    config->GetValue(keys[CONFIG_SECTION_APPLICATION],
             keys[JPACKAGE_APP_DATA_DIR], FBootFields->FPackageAppDataDirectory);
     FBootFields->FPackageAppDataDirectory =
             FilePath::FixPathForPlatform(FBootFields->FPackageAppDataDirectory);
@@ -130,11 +128,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 +235,7 @@
     }
 }
 
-void Package::ReadJVMArgs(ISectionalPropertyContainer* Config) {
+void Package::ReadJavaOptions(ISectionalPropertyContainer* Config) {
     Platform& platform = Platform::GetInstance();
     std::map<TString, TString> keys = platform.GetKeys();
 
@@ -249,14 +247,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 +280,7 @@
                 }
 
                 Config->GetSection(keys[CONFIG_SECTION_APPCDSJAVAOPTIONS],
-                        FBootFields->FJVMArgs);
+                        FBootFields->FJavaOptions);
             }
 
             break;
@@ -357,8 +355,8 @@
     }
 }
 
-OrderedMap<TString, TString> Package::GetJVMArgs() {
-    return FBootFields->FJVMArgs;
+OrderedMap<TString, TString> Package::GetJavaOptions() {
+    return FBootFields->FJavaOptions;
 }
 
 std::vector<TString> GetKeysThatAreNotDuplicates(OrderedMap<TString,
@@ -479,11 +477,6 @@
     return FBootFields->FAppCDSCacheFileName;
 }
 
-TString Package::GetAppID() {
-    assert(FBootFields != NULL);
-    return FBootFields->FAppID;
-}
-
 TString Package::GetPackageAppDataDirectory() {
     assert(FBootFields != NULL);
     return FBootFields->FPackageAppDataDirectory;
@@ -514,23 +507,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() {