diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh
index 32ae0195bf..8ff6e179f1 100644
--- a/firmware/gen_config_board.sh
+++ b/firmware/gen_config_board.sh
@@ -23,9 +23,9 @@ java -DSystemOut.name=gen_config_board \
 	-Drusefi.generator.lazyfile.enabled=true \
 	-cp ../java_tools/ConfigDefinition.jar \
 	com.rusefi.board_generator.BoardReader \
-	-board ${BOARDNAME} \
+	-yaml config/boards/${BOARDNAME}/mapping.yaml \
 	-firmware_path . \
-	-out tunerstudio \
+  -output_file tunerstudio/${BOARDNAME}_prefix.txt \
 	-enumInputFile controllers/algo/rusefi_enums.h \
 	-enumInputFile controllers/algo/rusefi_hw_enums.h
 
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index 0c346c936f..6eb7c04e45 100644
Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ
diff --git a/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java b/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java
index f26cc15085..9aa126ea7c 100644
--- a/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java
+++ b/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java
@@ -22,6 +22,8 @@ public class BoardReader {
     private static final String INVALID = "INVALID";
 
     private static final String KEY_BOARD_NAME = "-board";
+    private static final String YAML_INPUT_NAME = "-yaml";
+    private static final String OUTPUT_FILE_NAME = "-output_file";
     private static final String KEY_OUTFOLDER = "-out";
     private static final String KEY_FIRMWARE_PATH = "-firmware_path";
     private final static String KEY_ENUM_INPUT_FILE = "-enumInputFile";
@@ -40,10 +42,17 @@ public class BoardReader {
         String boardName = null;
         String firmwarePath = "firmware";
         String outputPath = ".";
+        String yamlInputFile = null;
+        String outputFileName = null;
         for (int i = 0; i < args.length - 1; i += 2) {
             String key = args[i];
             if (key.equals(KEY_BOARD_NAME)) {
                 boardName = args[i + 1];
+                yamlInputFile = firmwarePath + "/config/boards/" + boardName + "/" + MAPPING_YAML;
+            } else if (key.equals(OUTPUT_FILE_NAME)) {
+                outputFileName = args[i + 1];
+            } else if (key.equals(YAML_INPUT_NAME)) {
+                yamlInputFile = args[i + 1];
             } else if (key.equals(KEY_FIRMWARE_PATH)) {
                 firmwarePath = args[i + 1];
             } else if (key.equals(KEY_ENUM_INPUT_FILE)) {
@@ -55,14 +64,15 @@ public class BoardReader {
         }
 
         Yaml yaml = new Yaml();
-        String fileName = firmwarePath + "/config/boards/" + boardName + "/" + MAPPING_YAML;
-        Map<String, Object> data = yaml.load(new FileReader(fileName));
+        Map<String, Object> data = yaml.load(new FileReader(yamlInputFile));
         if (data == null) {
-            SystemOut.println("Null yaml for " + fileName);
+            SystemOut.println("Null yaml for " + yamlInputFile);
         } else {
             SystemOut.println(data);
 
-            Output bw = new LazyFile(outputPath + File.separator + boardName + OUTPUT_FILE_PREFIX);
+            if (outputFileName == null)
+                outputFileName = outputPath + File.separator + boardName + OUTPUT_FILE_PREFIX;
+            Output bw = new LazyFile(outputFileName);
 
             bw.write(processSection(data, "brain_pin_e", "output_pin_e", "outputs", "GPIO_UNASSIGNED"));
             bw.write(processSection(data, "adc_channel_e", "adc_channel_e", "analog_inputs", "EFI_ADC_NONE"));
diff --git a/misc/jenkins/compile_other_versions/run.bat b/misc/jenkins/compile_other_versions/run.bat
index d6113b4bc4..a77733d793 100644
--- a/misc/jenkins/compile_other_versions/run.bat
+++ b/misc/jenkins/compile_other_versions/run.bat
@@ -10,6 +10,10 @@ if not exist java_console_binary/rusefi_console.jar exit -1
 call misc\jenkins\build_simulator.bat
 if not exist simulator/build/rusefi_simulator.exe exit -1
 
+rem #
+rem # see gen_config.sh where short<>long name dictionary is hard-coded
+rem #
+
 call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f4 rusefi_microrusefi.ini
 IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
 IF %ERRORLEVEL% NEQ 0 EXIT /B 1