--- old/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	2019-03-04 20:57:57.059582300 -0500
+++ new/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	2019-03-04 20:57:55.965568100 -0500
@@ -49,8 +49,6 @@
 
     public static final BundlerParamInfo<LinuxAppBundler> APP_BUNDLER =
             new StandardBundlerParam<>(
-            I18N.getString("param.rpm-app-bundler.name"),
-            I18N.getString("param.rpm-app-bundler.description"),
             "linux.app.bundler",
             LinuxAppBundler.class,
             params -> new LinuxAppBundler(),
@@ -58,8 +56,6 @@
 
     public static final BundlerParamInfo<File> RPM_IMAGE_DIR =
             new StandardBundlerParam<>(
-            I18N.getString("param.image-dir.name"),
-            I18N.getString("param.image-dir.description"),
             "linux.rpm.imageDir",
             File.class,
             params -> {
@@ -82,8 +78,6 @@
 
     public static final BundlerParamInfo<String> BUNDLE_NAME =
             new StandardBundlerParam<> (
-            I18N.getString("param.bundle-name.name"),
-            I18N.getString("param.bundle-name.description"),
             Arguments.CLIOptions.LINUX_BUNDLE_NAME.getId(),
             String.class,
             params -> {
@@ -110,8 +104,6 @@
 
     public static final BundlerParamInfo<String> LICENSE_TYPE =
         new StandardBundlerParam<>(
-                I18N.getString("param.license-type.name"),
-                I18N.getString("param.license-type.description"),
                 Arguments.CLIOptions.LINUX_RPM_LICENSE_TYPE.getId(),
                 String.class,
                 params -> I18N.getString("param.license-type.default"),
@@ -120,8 +112,6 @@
 
     public static final BundlerParamInfo<String> XDG_FILE_PREFIX =
             new StandardBundlerParam<> (
-            I18N.getString("param.xdg-prefix.name"),
-            I18N.getString("param.xdg-prefix.description"),
             "linux.xdg-prefix",
             String.class,
             params -> {
@@ -316,7 +306,7 @@
         // prepare installer icon
         File iconTarget = getConfig_IconFile(rootDir, params);
         File icon = LinuxAppBundler.ICON_PNG.fetchFrom(params);
-        if (!RUNTIME_INSTALLER.fetchFrom(params)) {
+        if (!StandardBundlerParam.isRuntimeInstaller(params)) {
             if (icon == null || !icon.exists()) {
                 fetchResource(iconTarget.getName(),
                         I18N.getString("resource.menu-icon"),
@@ -336,30 +326,30 @@
 
         StringBuilder installScripts = new StringBuilder();
         StringBuilder removeScripts = new StringBuilder();
-        for (Map<String, ? super Object> secondaryLauncher :
-                SECONDARY_LAUNCHERS.fetchFrom(params)) {
-            Map<String, String> secondaryLauncherData =
-                    createReplacementData(secondaryLauncher);
-            secondaryLauncherData.put("APPLICATION_FS_NAME",
+        for (Map<String, ? super Object> addLauncher :
+                ADD_LAUNCHERS.fetchFrom(params)) {
+            Map<String, String> addLauncherData =
+                    createReplacementData(addLauncher);
+            addLauncherData.put("APPLICATION_FS_NAME",
                     data.get("APPLICATION_FS_NAME"));
-            secondaryLauncherData.put("DESKTOP_MIMES", "");
+            addLauncherData.put("DESKTOP_MIMES", "");
 
             // prepare desktop shortcut
             Writer w = new BufferedWriter(new FileWriter(
-                    getConfig_DesktopShortcutFile(rootDir, secondaryLauncher)));
+                    getConfig_DesktopShortcutFile(rootDir, addLauncher)));
             String content = preprocessTextResource(
                     getConfig_DesktopShortcutFile(rootDir,
-                    secondaryLauncher).getName(),
+                    addLauncher).getName(),
                     I18N.getString("resource.menu-shortcut-descriptor"),
-                    DEFAULT_DESKTOP_FILE_TEMPLATE, secondaryLauncherData,
+                    DEFAULT_DESKTOP_FILE_TEMPLATE, addLauncherData,
                     VERBOSE.fetchFrom(params),
                     RESOURCE_DIR.fetchFrom(params));
             w.write(content);
             w.close();
 
             // prepare installer icon
-            iconTarget = getConfig_IconFile(rootDir, secondaryLauncher);
-            icon = LinuxAppBundler.ICON_PNG.fetchFrom(secondaryLauncher);
+            iconTarget = getConfig_IconFile(rootDir, addLauncher);
+            icon = LinuxAppBundler.ICON_PNG.fetchFrom(addLauncher);
             if (icon == null || !icon.exists()) {
                 fetchResource(iconTarget.getName(),
                         I18N.getString("resource.menu-icon"),
@@ -382,7 +372,7 @@
             installScripts.append("/");
             installScripts.append(data.get("APPLICATION_FS_NAME"));
             installScripts.append("/");
-            installScripts.append(secondaryLauncherData.get(
+            installScripts.append(addLauncherData.get(
                     "APPLICATION_LAUNCHER_FILENAME"));
             installScripts.append(".desktop\n");
 
@@ -392,13 +382,13 @@
             removeScripts.append("/");
             removeScripts.append(data.get("APPLICATION_FS_NAME"));
             removeScripts.append("/");
-            removeScripts.append(secondaryLauncherData.get(
+            removeScripts.append(addLauncherData.get(
                     "APPLICATION_LAUNCHER_FILENAME"));
             removeScripts.append(".desktop\n");
 
         }
-        data.put("SECONDARY_LAUNCHERS_INSTALL", installScripts.toString());
-        data.put("SECONDARY_LAUNCHERS_REMOVE", removeScripts.toString());
+        data.put("ADD_LAUNCHERS_INSTALL", installScripts.toString());
+        data.put("ADD_LAUNCHERS_REMOVE", removeScripts.toString());
 
         StringBuilder cdsScript = new StringBuilder();
 
@@ -544,7 +534,7 @@
             }
         }
 
-        if (!RUNTIME_INSTALLER.fetchFrom(params)) {
+        if (!StandardBundlerParam.isRuntimeInstaller(params)) {
             //prepare desktop shortcut
             Writer w = new BufferedWriter(new FileWriter(
                     getConfig_DesktopShortcutFile(rootDir, params)));
@@ -595,7 +585,7 @@
         data.put("PACKAGE_DEPENDENCIES",
                 deps.isEmpty() ? "" : "Requires: " + deps);
         data.put("RUNTIME_INSTALLER",
-                RUNTIME_INSTALLER.fetchFrom(params).toString());
+                StandardBundlerParam.isRuntimeInstaller(params).toString());
         return data;
     }
 
@@ -620,7 +610,7 @@
                 "message.outputting-bundle-location"),
                 outdir.getAbsolutePath()));
 
-        File broot = new File(BUILD_ROOT.fetchFrom(params), "rmpbuildroot");
+        File broot = new File(TEMP_ROOT.fetchFrom(params), "rmpbuildroot");
 
         outdir.mkdirs();