diff --git a/firmware/config/boards/kinetis/config/!gen_config.bat b/firmware/config/boards/kinetis/config/!gen_config.bat
index b4cc00136d..e516105bc3 100644
--- a/firmware/config/boards/kinetis/config/!gen_config.bat
+++ b/firmware/config/boards/kinetis/config/!gen_config.bat
@@ -8,7 +8,7 @@ cd ../../../..
 pwd
 
 java ^
- -DSystemOut.name=gen_config ^
+ -DSystemOut.name=gen_config_kinetis_board ^
  -cp ../java_tools/ConfigDefinition.jar;../java_tools/configuration_definition/lib/snakeyaml.jar ^
  com.rusefi.board_generator.BoardReader ^
  -board kinetis ^
@@ -17,10 +17,8 @@ java ^
  -enumInputFile controllers/algo/rusefi_enums.h ^
  -enumInputFile config/boards/kinetis/rusefi_hw_enums.h
 
-mkdir build_kinetis
-
 java ^
- -DSystemOut.name=gen_config ^
+ -DSystemOut.name=gen_config_kinetis ^
  -Drusefi.generator.lazyfile.enabled=true ^
  -jar ../java_tools/ConfigDefinition.jar ^
  -definition integration/rusefi_config.txt ^
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 6a69b4accf..21ca95ea0a 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -952,6 +952,13 @@ typedef enum __attribute__ ((__packed__)) {
 	GPPWM_Iat = 3,
 } gppwm_channel_e;
 
+typedef enum __attribute__ ((__packed__)) {
+	B100KBPS = 0, // 100kbps
+	B250KBPS = 1, // 250kbps
+	B500KBPS = 2, // 500kbps
+	B1MBPS = 3, // 1Mbps
+} can_baudrate_e;
+
 typedef enum __attribute__ ((__packed__)) {
 	GPPWM_GreaterThan = 0,
 	GPPWM_LessThan = 1,
diff --git a/firmware/controllers/algo/rusefi_hw_enums.h b/firmware/controllers/algo/rusefi_hw_enums.h
index fc67005ae2..12957e227f 100644
--- a/firmware/controllers/algo/rusefi_hw_enums.h
+++ b/firmware/controllers/algo/rusefi_hw_enums.h
@@ -268,12 +268,5 @@ typedef enum __attribute__ ((__packed__)) {
 	EFI_ADC_ERROR = 17,
 } adc_channel_e;
 
-typedef enum __attribute__ ((__packed__)) {
-	B100KBPS = 0, // 100kbps
-	B250KBPS = 1, // 250kbps
-	B500KBPS = 2, // 500kbps
-	B1MBPS = 3, // 1Mbps
-} can_baudrate_e;
-
 #define INCOMPATIBLE_CONFIG_CHANGE EFI_ADC_0
 
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 905b9c496a..6788118417 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -716,6 +716,6 @@ int getRusEfiVersion(void) {
 	if (initBootloader() != 0)
 		return 123;
 #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
-	return 20200613;
+	return 20200614;
 }
 #endif /* EFI_UNIT_TEST */
diff --git a/java_console/.gitignore b/java_console/.gitignore
index 41e6148dbb..a909b99a5a 100644
--- a/java_console/.gitignore
+++ b/java_console/.gitignore
@@ -9,4 +9,5 @@ rusefi.ini
 openocd
 DfuSe
 rusefi_*.*
-triggers
\ No newline at end of file
+triggers
+unit_test*.xml
\ No newline at end of file
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index 0684abf247..d6898a338c 100644
Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ