diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 7d3b1d48ca..f91e5a8776 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1544,7 +1544,7 @@ cmd_dfu         			 = "w\x00\xba\x00\x00"
 
 
 ; MRE_MIATA_NB2_MAP = 11
-cmd_set_engine_type_microRusEFI_Miata_NB2_MAP		= "w\x00\x30\x00\x0B"
+cmd_set_engine_type_microRusEFI_Miata_NB2_MAP		= "w\x00\x30@@ET_MRE_MIATA_NB2_MAP_16_hex@@"
 
 ; MRE_MIATA_NA6 12
 cmd_set_engine_type_microRusEFI_Miata_NA6			= "w\x00\x30@@ET_MRE_MIATA_NA6_16_hex@@"
@@ -1553,11 +1553,11 @@ cmd_set_engine_type_microRusEFI_Miata_NA6			= "w\x00\x30@@ET_MRE_MIATA_NA6_16_he
 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF		= "w\x00\x30@@ET_MRE_MIATA_NB2_MAF_16_hex@@"
 
 ; MIATA_NA6_MAP = 41
-cmd_set_engine_type_Frankenso_Miata_NA6_MAP			= "w\x00\x30\x00\x29"
+cmd_set_engine_type_Frankenso_Miata_NA6_MAP			= "w\x00\x30@@ET_FRANKENSO_MIATA_NA6_16_hex@@"
 ; MIATA_NA6_VAF = 57
-cmd_set_engine_type_Frankenso_Miata_NA6_VAF			= "w\x00\x30\x00\x39"
+cmd_set_engine_type_Frankenso_Miata_NA6_VAF			= "w\x00\x30@@ET_FRANKENSO_MIATA_NA6_VAF_16_hex@@"
 ; MAZDA_MIATA_2003 = 47
-cmd_set_engine_type_Frankenso_Miata_NB2 			= "w\x00\x30\x00\x2F"
+cmd_set_engine_type_Frankenso_Miata_NB2 			= "w\x00\x30@@ET_FRANKENSO_MIATA_NB2_16_hex@@"
 
 cmd_set_engine_type_Proteus_M73   					= "w\x00\x30@@ET_BMW_M73_PROTEUS_16_hex@@"
 
diff --git a/java_console/ui/src/main/java/com/rusefi/PresetsPane.java b/java_console/ui/src/main/java/com/rusefi/PresetsPane.java
index 8b9e141820..767c6d4868 100644
--- a/java_console/ui/src/main/java/com/rusefi/PresetsPane.java
+++ b/java_console/ui/src/main/java/com/rusefi/PresetsPane.java
@@ -13,7 +13,6 @@ import java.awt.event.ActionListener;
  */
 public class PresetsPane {
     // see rusefi_enums.h
-    private static final int MRE_BOARD_TEST = 30;
     private static final int TEST_V_12 = 49;
     private static final int ETB_BENCH = 58;
     private static final int MINIMAL_PINS = 99;
@@ -28,7 +27,8 @@ public class PresetsPane {
         content.add(new SetEngineTypeCommandControl("Frankenso V12", "/engines/v12", TEST_V_12).getContent());
         content.add(new SetEngineTypeCommandControl("ETB bench", "", ETB_BENCH).getContent());
         content.add(new SetEngineTypeCommandControl("Minimal", "", MINIMAL_PINS).getContent());
-        content.add(new SetEngineTypeCommandControl("MRE test", "", MRE_BOARD_TEST).getContent());
+        content.add(new SetEngineTypeCommandControl("MRE old test", "", Fields.ET_MRE_OLD_TEST_BOARD).getContent());
+        content.add(new SetEngineTypeCommandControl("MRE new test", "", Fields.ET_MRE_NEW_TEST_BOARD).getContent());
     }
 
     public JPanel getContent() {