diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index d85da0def5..4a82f0864e 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -473,9 +473,6 @@ end_struct
 #define ET_DEFAULT_FRANKENSO 0
 #define ET_MIATA_TCU_PROTEUS 1
 #define ET_DODGE_NEON_1995 2
-#define ET_FORD_ASPIRE 3
-#define ET_NISSAN_PRIMERA 5
-#define ET_FORD_INLINE_6 7
 
 #define ET_MRE_MIATA_NB2_MAP 11
 #define ET_MRE_MIATA_NA6_VAF 12
@@ -487,9 +484,7 @@ end_struct
 
 #define ET_MRE_OLD_TEST_BOARD 30
 #define ET_MRE_NEW_TEST_BOARD 31
-#define ET_VW_ABA 32
 #define ET_HELLEN_NA6 34
-#define ET_CAMARO 35
 #define ET_HELLEN_128_MERCEDES_4_CYL 36
 #define ET_MRE_SUBARU_EJ18 37
 
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 3fdeca60ca..837259979d 100644
--- a/java_console/ui/src/main/java/com/rusefi/PresetsPane.java
+++ b/java_console/ui/src/main/java/com/rusefi/PresetsPane.java
@@ -1,6 +1,7 @@
 package com.rusefi;
 
 import com.rusefi.config.generated.Fields;
+import com.rusefi.enums.engine_type_e;
 import com.rusefi.ui.UIContext;
 import org.jetbrains.annotations.NotNull;
 
@@ -12,30 +13,26 @@ import java.awt.event.ActionListener;
  * Andrey Belomutskiy, (c) 2013-2020
  */
 public class PresetsPane {
-    // see rusefi_enums.h
-    private static final int TEST_V_12 = 49;
-    private static final int ETB_BENCH = 58;
-    private static final int MINIMAL_PINS = 99;
     private final UIContext uiContext;
 
     private final JPanel content = new JPanel(new GridLayout(4, 5));
 
     public PresetsPane(UIContext uiContext) {
         this.uiContext = uiContext;
-        content.add(new SetEngineTypeCommandControl(uiContext,"Frankenso Miata NA6 Stage 0", "/engines/miata_na.png", Fields.ET_FRANKENSO_MIATA_NA6_VAF).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext,"Frankenso Miata NA6 Stage 0", "/engines/miata_na.png", engine_type_e.MIATA_NA6_VAF.ordinal()).getContent());
         content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NA6 Stage 1", "/engines/miata_na.png", Fields.ET_FRANKENSO_MIATA_NA6).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NB2", "/engines/miata_nb.png", Fields.ET_FRANKENSO_MIATA_NB2).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 MAP", "engines/miata_na.png", Fields.ET_MRE_MIATA_NA6_MAP).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 VAF", "engines/miata_na.png", Fields.ET_MRE_MIATA_NA6_VAF).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata 94 MAP", "engines/miata_na.png", Fields.ET_MRE_MIATA_94_MAP).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAP", "engines/miata_nb.png", Fields.ET_MRE_MIATA_NB2_MAP).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAF", "engines/miata_nb.png", Fields.ET_MRE_MIATA_NB2_MAF).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "Proteus NB2 MAP", "engines/miata_nb.png", Fields.ET_PROTEUS_MIATA_NB2).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "Hellen72 NB2 MAP", "engines/miata_nb.png", Fields.ET_HELLEN_NB2).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata Defaults", "", Fields.ET_MRE_DEFAULTS).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso V12", "/engines/v12", TEST_V_12).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "ETB bench", "", ETB_BENCH).getContent());
-        content.add(new SetEngineTypeCommandControl(uiContext, "Minimal", "", MINIMAL_PINS).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NB2", "/engines/miata_nb.png", engine_type_e.MAZDA_MIATA_2003.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 MAP", "engines/miata_na.png", engine_type_e.MRE_MIATA_NA6_MAP.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 VAF", "engines/miata_na.png", engine_type_e.MRE_MIATA_NA6_VAF.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata 94 MAP", "engines/miata_na.png", engine_type_e.MRE_MIATA_94_MAP.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAP", "engines/miata_nb.png", engine_type_e.MRE_MIATA_NB2_MAP.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAF", "engines/miata_nb.png", engine_type_e.MRE_MIATA_NB2_MAF.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "Proteus NB2 MAP", "engines/miata_nb.png", engine_type_e.PROTEUS_MIATA_NB2.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "Hellen72 NB2 MAP", "engines/miata_nb.png", engine_type_e.HELLEN_NB2.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata Defaults", "", engine_type_e.MICRO_RUS_EFI.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso V12", "/engines/v12", engine_type_e.BMW_M73_PROTEUS.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "ETB bench", "", engine_type_e.ETB_BENCH_ENGINE.ordinal()).getContent());
+        content.add(new SetEngineTypeCommandControl(uiContext, "Minimal", "", engine_type_e.MINIMAL_PINS.ordinal()).getContent());
         content.add(new SetEngineTypeCommandControl(uiContext, "MRE old test", "", Fields.ET_MRE_OLD_TEST_BOARD).getContent());
         content.add(new SetEngineTypeCommandControl(uiContext, "MRE new test", "", Fields.ET_MRE_NEW_TEST_BOARD).getContent());
     }