src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java

@@ -78,21 +78,17 @@
 
     private final Map<String, ? super Object> params;
 
     public static final BundlerParamInfo<Boolean> REBRAND_EXECUTABLE =
             new WindowsBundlerParam<>(
-            I18N.getString("param.rebrand-executable.name"),
-            I18N.getString("param.rebrand-executable.description"),
             "win.launcher.rebrand",
             Boolean.class,
             params -> Boolean.TRUE,
             (s, p) -> Boolean.valueOf(s));
 
     public static final BundlerParamInfo<File> ICON_ICO =
             new StandardBundlerParam<>(
-            I18N.getString("param.icon-ico.name"),
-            I18N.getString("param.icon-ico.description"),
             "icon.ico",
             File.class,
             params -> {
                 File f = ICON.fetchFrom(params);
                 if (f != null && !f.getName().toLowerCase().endsWith(".ico")) {

@@ -104,12 +100,10 @@
             },
             (s, p) -> new File(s));
 
     public static final StandardBundlerParam<Boolean> CONSOLE_HINT =
             new WindowsBundlerParam<>(
-            I18N.getString("param.console-hint.name"),
-            I18N.getString("param.console-hint.description"),
             Arguments.CLIOptions.WIN_CONSOLE_HINT.getId(),
             Boolean.class,
             params -> false,
             // valueOf(null) is false,
             // and we actually do want null in some cases

@@ -254,13 +248,13 @@
             Files.copy(is_lib, root.resolve(LIBRARY_NAME));
         }
 
         copyMSVCDLLs();
 
-        // create the secondary launchers, if any
+        // create the additional launcher(s), if any
         List<Map<String, ? super Object>> entryPoints =
-                StandardBundlerParam.SECONDARY_LAUNCHERS.fetchFrom(params);
+                StandardBundlerParam.ADD_LAUNCHERS.fetchFrom(params);
         for (Map<String, ? super Object> entryPoint : entryPoints) {
             Map<String, ? super Object> tmp = new HashMap<>(originalParams);
             tmp.putAll(entryPoint);
             createLauncherForEntryPoint(tmp);
         }

@@ -387,11 +381,11 @@
         // Update branding of EXE file
         if (REBRAND_EXECUTABLE.fetchFrom(p)) {
             try {
                 String tempDirectory = WindowsDefender.getUserTempDirectory();
                 if (Arguments.CLIOptions.context().userProvidedBuildRoot) {
-                    tempDirectory = BUILD_ROOT.fetchFrom(p).getAbsolutePath();
+                    tempDirectory = TEMP_ROOT.fetchFrom(p).getAbsolutePath();
                 }
                 if (WindowsDefender.isThereAPotentialWindowsDefenderIssue(
                         tempDirectory)) {
                     Log.error(MessageFormat.format(I18N.getString(
                             "message.potential.windows.defender.issue"),