diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h
index 701bc0d0fd..dd7a406cda 100644
--- a/firmware/controllers/algo/engine_types.h
+++ b/firmware/controllers/algo/engine_types.h
@@ -86,7 +86,7 @@ UNUSED25 = 25,
 
 	MAZDA_626 = 28,
 
-	SACHS = ET_SACHS,
+	SACHS = 29,
 
 	// LED physical order set for older test fixtures
 	MRE_BOARD_OLD_TEST = 30,
@@ -109,7 +109,7 @@ UNUSED25 = 25,
 
 	LADA_KALINA = 39,
 
-	FRANKENSO_BMW_M73_F = ET_BMW_M73_F,
+	FRANKENSO_BMW_M73_F = 40,
 
 	PROTEUS_QC_TEST_BOARD = 42,
 
@@ -124,7 +124,7 @@ UNUSED25 = 25,
 	/**
 	 * proper NB2 setup, 2003 red test mule car
 	 */
-	FRANKENSO_MAZDA_MIATA_2003 = ET_FRANKENSO_MIATA_NB2,
+	FRANKENSO_MAZDA_MIATA_2003 = 47,
 
 	UNUSED_48 = 48,
 
@@ -148,7 +148,7 @@ UNUSED25 = 25,
 
 	FRANKENSO_MAZDA_MIATA_NA8 = 56,
 
-	FRANKENSO_MIATA_NA6_VAF = ET_FRANKENSO_MIATA_NA6_VAF,
+	FRANKENSO_MIATA_NA6_VAF = 57,
 
 	ETB_BENCH_ENGINE = 58,
 
@@ -158,14 +158,14 @@ UNUSED25 = 25,
 
 	PROTEUS_DEFAULTS = 61,
 
-	PROTEUS_ANALOG_PWM_TEST = ET_PROTEUS_ANALOG_PWM_TEST,
+	PROTEUS_ANALOG_PWM_TEST = 106,
 
 	VW_B6 = 62,
 
 	PROTEUS_BMW_M73 = 63,
 
 	DODGE_RAM = 64,
-	CITROEN_TU3JP = ET_CITROEN_TU3JP,
+	CITROEN_TU3JP = 65,
 
 	PROTEUS_MIATA_NB2 = 67,
 	MRE_M111 = 68,
@@ -189,8 +189,8 @@ UNUSED25 = 25,
 	HELLEN_NA94 = 80,
 
     // 82
-	HELLEN_154_HYUNDAI_COUPE_BK1 = ET_HELLEN_154_HYUNDAI_COUPE_BK1,
-	HELLEN_NB1 = ET_HELLEN_NB1,
+	HELLEN_154_HYUNDAI_COUPE_BK1 = 82,
+	HELLEN_NB1 = 83,
 	// 84
 	HELLEN_121_NISSAN_4_CYL = 84,
 
@@ -200,21 +200,21 @@ UNUSED25 = 25,
 
 	HELLEN_121_NISSAN_ALMERA_N16  = 87,
 
-	HELLEN_128_MERCEDES_6_CYL = ET_HELLEN_128_MERCEDES_6_CYL,
+	HELLEN_128_MERCEDES_6_CYL = 88,
 
-	HELLEN_128_MERCEDES_8_CYL = ET_HELLEN_128_MERCEDES_8_CYL,
+	HELLEN_128_MERCEDES_8_CYL = 89,
 
 	PROTEUS_HONDA_ELEMENT_2003 = 90,
 
 	PROTEUS_HONDA_OBD2A = 91,
 
-	PROTEUS_VAG_80_18T = ET_PROTEUS_VAG_80_18T,
+	PROTEUS_VAG_80_18T = 92,
 
-	PROTEUS_N73 = ET_PROTEUS_N73,
+	PROTEUS_N73 = 93,
 
     HELLEN_NB1_36 = 94,
 
-	HELLEN_154_HYUNDAI_COUPE_BK2 = ET_HELLEN_154_HYUNDAI_COUPE_BK2,
+	HELLEN_154_HYUNDAI_COUPE_BK2 = 95,
 
     ET_UNUSED96 = 96,
     ET_UNUSED97 = 97,
@@ -233,7 +233,7 @@ UNUSED25 = 25,
 	BMW_M73_MRE = 104,
 	BMW_M73_MRE_SLAVE = 105,
 
-	TEST_ROTARY = ET_TEST_ROTARY,
+	TEST_ROTARY = 107,
 
 	TEST_108 = 108,
 	TEST_109 = 109,
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index a7279a0f75..463f60e175 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1793,19 +1793,19 @@ cmd_set_engine_type_hellen_121_vag_v6				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@
 cmd_set_engine_type_hellen_121_vag_vr6				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_121_VAG_VR6_CYL_16_hex@@"
 cmd_set_engine_type_hellen_121_vag_8				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_121_VAG_8_CYL_16_hex@@"
 
-cmd_set_engine_type_hellen_128_merc_4				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_128_MERCEDES_4_CYL_16_hex@@"
-cmd_set_engine_type_hellen_128_merc_6				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_128_MERCEDES_6_CYL_16_hex@@"
-cmd_set_engine_type_hellen_128_merc_8				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_128_MERCEDES_8_CYL_16_hex@@"
+cmd_set_engine_type_hellen_128_merc_4				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_HELLEN_128_MERCEDES_4_CYL_16_hex@@"
+cmd_set_engine_type_hellen_128_merc_6				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_HELLEN_128_MERCEDES_6_CYL_16_hex@@"
+cmd_set_engine_type_hellen_128_merc_8				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_HELLEN_128_MERCEDES_8_CYL_16_hex@@"
 
-cmd_set_engine_type_hellen_couple_bk1               = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_154_HYUNDAI_COUPE_BK1_16_hex@@"
-cmd_set_engine_type_hellen_couple_bk2               = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_154_HYUNDAI_COUPE_BK2_16_hex@@"
+cmd_set_engine_type_hellen_couple_bk1               = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_HELLEN_154_HYUNDAI_COUPE_BK1_16_hex@@"
+cmd_set_engine_type_hellen_couple_bk2               = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_HELLEN_154_HYUNDAI_COUPE_BK2_16_hex@@"
 
 ; MIATA_NA6_MAP = 41
 cmd_set_engine_type_Frankenso_Miata_NA6_MAP			= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_FRANKENSO_MIATA_NA6_MAP_16_hex@@"
 ; MIATA_NA6_VAF = 57
-cmd_set_engine_type_Frankenso_Miata_NA6_VAF			= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_FRANKENSO_MIATA_NA6_VAF_16_hex@@"
+cmd_set_engine_type_Frankenso_Miata_NA6_VAF			= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_FRANKENSO_MIATA_NA6_VAF_16_hex@@"
 ; MAZDA_MIATA_2003 = 47
-cmd_set_engine_type_Frankenso_Miata_NB2 			= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_FRANKENSO_MIATA_NB2_16_hex@@"
+cmd_set_engine_type_Frankenso_Miata_NB2 			= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_FRANKENSO_MIATA_NB2_16_hex@@"
 
 cmd_set_engine_type_Proteus_M73   					= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_PROTEUS_BMW_M73_16_hex@@"
 cmd_set_engine_type_PROTEUS_HONDA_ELEMENT_2003      = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_PROTEUS_HONDA_ELEMENT_2003_16_hex@@"