diff --git a/firmware/config/engines/daihatsu.cpp b/firmware/config/engines/daihatsu.cpp
deleted file mode 100644
index 5bb8890031..0000000000
--- a/firmware/config/engines/daihatsu.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file daihatsu.cpp
- *
- * Daihatsu 3-Cylinder KF-VE
- * set engine_type 34
- *
- * @date Sep 10, 2015
- * @author Andrey Belomutskiy, (c) 2012-2020
- */
-
-#include "global.h"
-#include "daihatsu.h"
-
-EXTERN_CONFIG;
-
-void setDaihatsu(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-	engineConfiguration->trigger.type = TT_36_2_2_2;
-
-	engineConfiguration->specs.cylindersCount = 3;
-	engineConfiguration->specs.firingOrder = FO_1_2_3;
-
-}
diff --git a/firmware/config/engines/daihatsu.h b/firmware/config/engines/daihatsu.h
deleted file mode 100644
index d1aea0c9d0..0000000000
--- a/firmware/config/engines/daihatsu.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @file daihatsu.h
- *
- * @date Sep 10, 2015
- * @author Andrey Belomutskiy, (c) 2012-2020
- */
-
-#pragma once
-
-#include "engine_configuration.h"
-
-void setDaihatsu(DECLARE_CONFIG_PARAMETER_SIGNATURE);
diff --git a/firmware/config/engines/dodge_stratus.cpp b/firmware/config/engines/dodge_stratus.cpp
deleted file mode 100644
index 9785bf94ae..0000000000
--- a/firmware/config/engines/dodge_stratus.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file dodge_stratus.cpp
- *
- * set engine_type 33
- *
- * @date Sep 5, 2015
- * @author Andrey Belomutskiy, (c) 2012-2020
- */
-
-#include "global.h"
-#include "dodge_stratus.h"
-#include "engine_math.h"
-
-EXTERN_CONFIG;
-
-void setDodgeStratus(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-	engineConfiguration->trigger.type = TT_DODGE_STRATUS;
-	engineConfiguration->specs.cylindersCount = 6;
-	engineConfiguration->specs.firingOrder = FO_1_2_3_4_5_6;
-
-	engineConfiguration->map.sensor.type = MT_DODGE_NEON_2003;
-	setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
-	engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS;
-
-}
-
-
diff --git a/firmware/config/engines/dodge_stratus.h b/firmware/config/engines/dodge_stratus.h
deleted file mode 100644
index 77b6d16655..0000000000
--- a/firmware/config/engines/dodge_stratus.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @file dodge_stratus.h
- *
- * @date Sep 5, 2015
- * @author Andrey Belomutskiy, (c) 2012-2020
- */
-
-#pragma once
-#include "engine_configuration.h"
-
-void setDodgeStratus(DECLARE_CONFIG_PARAMETER_SIGNATURE);
diff --git a/firmware/config/engines/suzuki_vitara.cpp b/firmware/config/engines/suzuki_vitara.cpp
deleted file mode 100644
index 360ca44633..0000000000
--- a/firmware/config/engines/suzuki_vitara.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * @file suzuki_vitara.cpp
- *
- * set engine_type 36
- *
- * @author Andrey Belomutskiy, (c) 2012-2020
- * @date Oct 17, 2015
- */
-
-#include "suzuki_vitara.h"
-
-EXTERN_CONFIG;
-
-void setSuzukiVitara(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-	engineConfiguration->trigger.type = TT_MAZDA_SOHC_4;
-	engineConfiguration->specs.cylindersCount = 4;
-	engineConfiguration->specs.displacement = 1.590;
-
-	engineConfiguration->ignitionMode = IM_ONE_COIL;
-	engineConfiguration->injectionMode = IM_SIMULTANEOUS;
-
-	engineConfiguration->mainRelayPin = GPIOE_6;
-}
-
-
diff --git a/firmware/config/engines/suzuki_vitara.h b/firmware/config/engines/suzuki_vitara.h
deleted file mode 100644
index ae8dff16fd..0000000000
--- a/firmware/config/engines/suzuki_vitara.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * @file suzuki_vitara.cpp
- *
- * @author Andrey Belomutskiy, (c) 2012-2020
- * @date Oct 17, 2015
- */
-
-#pragma once
-
-#include "engine_configuration.h"
-
-void setSuzukiVitara(DECLARE_CONFIG_PARAMETER_SIGNATURE);
-
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index c928ef5977..32a0d97cc3 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -35,17 +35,17 @@ typedef enum {
 	 * 1995 Dodge Neon
 	 * http://rusefi.com/forum/viewtopic.php?t=360
 	 */
-	DODGE_NEON_1995 = 2,
+	DODGE_NEON_1995 = ET_DODGE_NEON_1995,
 	/**
 	 * 1996 1.3 Ford Aspire
 	 * http://rusefi.com/forum/viewtopic.php?t=375
 	 */
-	FORD_ASPIRE_1996 = 3,
+	FORD_ASPIRE_1996 = ET_FORD_ASPIRE,
 	/**
 	 * 36-1 toothed wheel engine
 	 * http://rusefi.com/forum/viewtopic.php?t=282
 	 */
-	FORD_FIESTA = 4,
+	FORD_FIESTA = ET_FORD_FIESTA,
 	NISSAN_PRIMERA = 5,
 	HONDA_ACCORD_CD = 6,
 	FORD_INLINE_6_1995 = 7,
@@ -58,7 +58,7 @@ typedef enum {
 
 	MAZDA_MIATA_NB1 = 9,
 
-	ROVER_V8 = 10,
+	ROVER_V8 = ET_ROVER_V8,
 
 	MRE_MIATA_NB2_MAP = 11,
 
@@ -89,7 +89,7 @@ typedef enum {
 	DODGE_NEON_2003_CAM = 23,
 	BMW_M73_M = 24,
 
-	BMW_E34 = 25,
+	BMW_E34 = ET_BMW_E34,
 
 	TEST_ENGINE = 26,
 
@@ -113,7 +113,7 @@ typedef enum {
 
 	DAIHATSU = 34,
 
-	CAMARO_4 = 35,
+	CAMARO_4 = ET_CAMARO,
 
 	SUZUKI_VITARA = 36,
 
diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp
index e93f901112..19f9bb5ef8 100644
--- a/unit_tests/tests/trigger/test_trigger_decoder.cpp
+++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp
@@ -558,9 +558,6 @@ TEST(misc, testTriggerDecoder) {
 
 	testTriggerDecoder2("sachs", SACHS, 0, 0.4800, 0.000);
 
-	testTriggerDecoder3("36+2+2+2", DAIHATSU,  28, 0.5000, 0.0, 0.5);
-	testTriggerDecoder3("stratus NGC6", DODGE_STRATUS, 0, 0.8833, 0.0, CHRYSLER_NGC6_GAP);
-
 	testTriggerDecoder2("vw ABA", VW_ABA, 114, 0.5000, 0.0);
 }