src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java

@@ -130,11 +130,11 @@
                     if (params.containsKey(VENDOR.getID())) {
                         vendor = VENDOR.fetchFrom(params);
                     } else {
                         vendor = "jpackage";
                     }
-                    String appName = APP_FS_NAME.fetchFrom(params);
+                    String appName = APP_NAME.fetchFrom(params);
 
                     return (vendor + "-" + appName).replaceAll("\\s", "");
                 } catch (Exception e) {
                     if (Log.isDebug()) {
                         e.printStackTrace();

@@ -296,11 +296,11 @@
             Files.copy(licenseFile.toPath(), target.toPath());
 
             sb.append("%license ");
             sb.append(LINUX_INSTALL_DIR.fetchFrom(params));
             sb.append("/");
-            sb.append(APP_FS_NAME.fetchFrom(params));
+            sb.append(APP_NAME.fetchFrom(params));
             sb.append("/app/");
             sb.append(licenseFile.getName());
         }
 
         return sb.toString();

@@ -488,11 +488,11 @@
                 if (faIcon != null && faIcon.exists()) {
                     int size = getSquareSizeOfImage(faIcon);
 
                     if (size > 0) {
                         File target = new File(rootDir,
-                                APP_FS_NAME.fetchFrom(params)
+                                APP_NAME.fetchFrom(params)
                                         + "_fa_" + faIcon.getName());
                         IOUtils.copyFile(faIcon, target);
 
                         // xdg-icon-resource install --context mimetypes
                         // --size 64 awesomeapp_fa_1.png

@@ -575,16 +575,15 @@
     private Map<String, String> createReplacementData(
             Map<String, ? super Object> params) throws IOException {
         Map<String, String> data = new HashMap<>();
 
         data.put("APPLICATION_NAME", APP_NAME.fetchFrom(params));
-        data.put("APPLICATION_FS_NAME", APP_FS_NAME.fetchFrom(params));
+        data.put("APPLICATION_FS_NAME", APP_NAME.fetchFrom(params));
         data.put("APPLICATION_PACKAGE", BUNDLE_NAME.fetchFrom(params));
         data.put("APPLICATION_VENDOR", VENDOR.fetchFrom(params));
         data.put("APPLICATION_VERSION", VERSION.fetchFrom(params));
-        data.put("APPLICATION_LAUNCHER_FILENAME",
-                APP_FS_NAME.fetchFrom(params));
+        data.put("APPLICATION_LAUNCHER_FILENAME", APP_NAME.fetchFrom(params));
         data.put("INSTALLATION_DIRECTORY", LINUX_INSTALL_DIR.fetchFrom(params));
         data.put("XDG_PREFIX", XDG_FILE_PREFIX.fetchFrom(params));
         data.put("DEPLOY_BUNDLE_CATEGORY", CATEGORY.fetchFrom(params));
         // TODO rpm categories
         data.put("APPLICATION_DESCRIPTION", DESCRIPTION.fetchFrom(params));

@@ -599,23 +598,21 @@
         return data;
     }
 
     private File getConfig_DesktopShortcutFile(File rootDir,
             Map<String, ? super Object> params) {
-        return new File(rootDir,
-                APP_FS_NAME.fetchFrom(params) + ".desktop");
+        return new File(rootDir, APP_NAME.fetchFrom(params) + ".desktop");
     }
 
     private File getConfig_IconFile(File rootDir,
             Map<String, ? super Object> params) {
-        return new File(rootDir,
-                APP_FS_NAME.fetchFrom(params) + ".png");
+        return new File(rootDir, APP_NAME.fetchFrom(params) + ".png");
     }
 
     private File getConfig_SpecFile(Map<String, ? super Object> params) {
         return new File(RPM_IMAGE_DIR.fetchFrom(params),
-                APP_FS_NAME.fetchFrom(params) + ".spec");
+                APP_NAME.fetchFrom(params) + ".spec");
     }
 
     private File buildRPM(Map<String, ? super Object> params,
             File outdir) throws IOException {
         Log.verbose(MessageFormat.format(I18N.getString(