diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp
index 3d00ae4e17..1c83b99fae 100644
--- a/firmware/controllers/algo/auto_generated_enginetypes.cpp
+++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp
@@ -182,7 +182,7 @@ case HELLEN_121_NISSAN_8_CYL:
   return "HELLEN_121_NISSAN_8_CYL";
 case HELLEN_121_NISSAN_ALMERA_N16:
   return "HELLEN_121_NISSAN_ALMERA_N16";
-case HELLEN_121_VAG:
+case HELLEN_121_VAG_4_CYL:
   return "HELLEN_121_VAG";
 case HELLEN_121_VAG_5_CYL:
   return "HELLEN_121_VAG_5_CYL";
diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h
index 455934d56d..d7ca3763c9 100644
--- a/firmware/controllers/algo/engine_types.h
+++ b/firmware/controllers/algo/engine_types.h
@@ -14,7 +14,7 @@
  * http://rusefi.com/wiki/index.php?title=Manual:Engine_Type
  */
 typedef enum {
-	DEFAULT_FRANKENSO = ET_DEFAULT_FRANKENSO,
+	DEFAULT_FRANKENSO = 0,
 
 	MIATA_PROTEUS_TCU = 1,
 
@@ -52,10 +52,10 @@ typedef enum {
 	MIATA_1990 = 19,
 	// Frankenso board
 	FRANKENSO_MIATA_NA6_MAP = 41,
-	MRE_MIATA_94_MAP = ET_MRE_MIATA_94_MAP,
+	MRE_MIATA_94_MAP = 20,
 	MIATA_1996 = 21,
 
-	FORD_ESCORT_GT = ET_FORD_ESCORT_GT,
+	FORD_ESCORT_GT = 14,
 
 
 	MITSU_4G93 = 16,
@@ -73,7 +73,7 @@ typedef enum {
 	/**
 	 * microRusEFI used as Body Control Module BCM BCU
 	 */
-	MRE_BODY_CONTROL = ET_MRE_BODY_CONTROL,
+	MRE_BODY_CONTROL = 23,
 	BMW_M73_M = 24,
 
 UNUSED25 = 25,
@@ -101,9 +101,9 @@ UNUSED25 = 25,
 
 	CAMARO_4 = 35,
 
-	HELLEN_128_MERCEDES_4_CYL = ET_HELLEN_128_MERCEDES_4_CYL,
+	HELLEN_128_MERCEDES_4_CYL = 36,
 
-	MRE_SUBARU_EJ18 = ET_MRE_SUBARU_EJ18,
+	MRE_SUBARU_EJ18 = 37,
 
 	TOYOTA_JZS147 = 38, // 2JZ-GTE NON VVTi
 
@@ -111,7 +111,7 @@ UNUSED25 = 25,
 
 	FRANKENSO_BMW_M73_F = ET_BMW_M73_F,
 
-	PROTEUS_QC_TEST_BOARD = ET_PROTEUS_QC_TEST_BOARD,
+	PROTEUS_QC_TEST_BOARD = 42,
 
 	HONDA_600 = 43,
 
@@ -160,7 +160,7 @@ UNUSED25 = 25,
 
 	PROTEUS_ANALOG_PWM_TEST = ET_PROTEUS_ANALOG_PWM_TEST,
 
-	VW_B6 = ET_VW_B6,
+	VW_B6 = 62,
 
 	PROTEUS_BMW_M73 = 63,
 
@@ -174,19 +174,19 @@ UNUSED25 = 25,
 
 	SUBARUEG33_DEFAULTS = 70,
 
-	HELLEN_121_VAG = ET_HELLEN_121_VAG,
-	HELLEN_121_NISSAN_6_CYL = ET_HELLEN_121_NISSAN_6_CYL,
-	HELLEN_55_BMW = ET_HELLEN_55_BMW,
-	HELLEN_88_BMW = ET_HELLEN_88_BMW,
-	HELLEN_134_BMW = ET_HELLEN_134_BMW,
-	HELLEN_154_VAG = ET_HELLEN_154_VAG,
+	HELLEN_121_VAG_4_CYL = 71,
+	HELLEN_121_NISSAN_6_CYL = 72,
+	HELLEN_55_BMW = 73,
+	HELLEN_88_BMW = 74,
+	HELLEN_134_BMW = 75,
+	HELLEN_154_VAG = 76,
 
-	HELLEN_121_VAG_5_CYL = ET_HELLEN_121_VAG_5_CYL,
-	HELLEN_121_VAG_V6_CYL = ET_HELLEN_121_VAG_V6_CYL,
-	HELLEN_121_VAG_VR6_CYL = ET_HELLEN_121_VAG_VR6_CYL,
-	HELLEN_121_VAG_8_CYL = ET_HELLEN_121_VAG_8_CYL,
+	HELLEN_121_VAG_5_CYL = 77,
+	HELLEN_121_VAG_V6_CYL = 78,
+	HELLEN_121_VAG_VR6_CYL = 79,
+	HELLEN_121_VAG_8_CYL = 81,
 
-	HELLEN_NA94 = ET_HELLEN_NA94,
+	HELLEN_NA94 = 80,
 
     // 82
 	HELLEN_154_HYUNDAI_COUPE_BK1 = ET_HELLEN_154_HYUNDAI_COUPE_BK1,