diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp
index 029a092f25..d5c30eeaee 100644
--- a/firmware/controllers/algo/advance_map.cpp
+++ b/firmware/controllers/algo/advance_map.cpp
@@ -135,7 +135,7 @@ angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	bool isCranking = ENGINE(rpmCalculator).isCranking();
 	if (isCranking) {
 		angle = getCrankingAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX);
-		assertAngleRange(angle, "crAngle", CUSTOM_ERR_6680);
+		assertAngleRange(angle, "crAngle", CUSTOM_ERR_ANGLE_CR);
 		efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "cr_AngleN", 0);
 	} else {
 		angle = getRunningAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX);
diff --git a/firmware/controllers/algo/auto_generated_codes.cpp b/firmware/controllers/algo/auto_generated_codes.cpp
index 53e83010f8..3682f7f097 100644
--- a/firmware/controllers/algo/auto_generated_codes.cpp
+++ b/firmware/controllers/algo/auto_generated_codes.cpp
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "obd_error_codes.h"
-// was generated automatically by rusEFI tool  from obd_error_codes.h // by enum2string.jar tool on Thu Sep 09 00:35:46 UTC 2021
+// was generated automatically by rusEFI tool  from obd_error_codes.h // by enum2string.jar tool on Sun Oct 03 01:28:41 EDT 2021
 // see also gen_config_and_enums.bat
 
 
@@ -15,6 +15,8 @@ case CUSTOM_6051:
   return "CUSTOM_6051";
 case CUSTOM_ADD_BASE:
   return "CUSTOM_ADD_BASE";
+case CUSTOM_ADVANCE_SPARK:
+  return "CUSTOM_ADVANCE_SPARK";
 case CUSTOM_ANGLE_NAN:
   return "CUSTOM_ANGLE_NAN";
 case CUSTOM_APPEND_NULL:
@@ -57,6 +59,8 @@ case CUSTOM_EMPTY_FSIO_STACK:
   return "CUSTOM_EMPTY_FSIO_STACK";
 case CUSTOM_ENGINE_REF:
   return "CUSTOM_ENGINE_REF";
+case CUSTOM_ERROR_ICU:
+  return "CUSTOM_ERROR_ICU";
 case CUSTOM_ERR_2ND_WATCHDOG:
   return "CUSTOM_ERR_2ND_WATCHDOG";
 case CUSTOM_ERR_6030:
@@ -267,26 +271,12 @@ case CUSTOM_ERR_6670:
   return "CUSTOM_ERR_6670";
 case CUSTOM_ERR_6675:
   return "CUSTOM_ERR_6675";
-case CUSTOM_ERR_6676:
-  return "CUSTOM_ERR_6676";
-case CUSTOM_ERR_6679:
-  return "CUSTOM_ERR_6679";
-case CUSTOM_ERR_6680:
-  return "CUSTOM_ERR_6680";
-case CUSTOM_ERR_6682:
-  return "CUSTOM_ERR_6682";
 case CUSTOM_ERR_6684:
   return "CUSTOM_ERR_6684";
 case CUSTOM_ERR_6685:
   return "CUSTOM_ERR_6685";
 case CUSTOM_ERR_6686:
   return "CUSTOM_ERR_6686";
-case CUSTOM_ERR_6687:
-  return "CUSTOM_ERR_6687";
-case CUSTOM_ERR_6688:
-  return "CUSTOM_ERR_6688";
-case CUSTOM_ERR_6703:
-  return "CUSTOM_ERR_6703";
 case CUSTOM_ERR_6709:
   return "CUSTOM_ERR_6709";
 case CUSTOM_ERR_6728:
@@ -305,6 +295,8 @@ case CUSTOM_ERR_ADC_USED:
   return "CUSTOM_ERR_ADC_USED";
 case CUSTOM_ERR_ANGLE:
   return "CUSTOM_ERR_ANGLE";
+case CUSTOM_ERR_ANGLE_CR:
+  return "CUSTOM_ERR_ANGLE_CR";
 case CUSTOM_ERR_ARRAY_IS_FULL:
   return "CUSTOM_ERR_ARRAY_IS_FULL";
 case CUSTOM_ERR_ARRAY_REMOVE:
@@ -317,6 +309,8 @@ case CUSTOM_ERR_ASSERT_VOID:
   return "CUSTOM_ERR_ASSERT_VOID";
 case CUSTOM_ERR_AXIS_ORDER:
   return "CUSTOM_ERR_AXIS_ORDER";
+case CUSTOM_ERR_BENCH_PARAM:
+  return "CUSTOM_ERR_BENCH_PARAM";
 case CUSTOM_ERR_BOTH_FRONTS_REQUIRED:
   return "CUSTOM_ERR_BOTH_FRONTS_REQUIRED";
 case CUSTOM_ERR_BUFF_INIT_ERROR:
@@ -473,6 +467,8 @@ case CUSTOM_ERR_ZERO_CRANKING_FUEL:
   return "CUSTOM_ERR_ZERO_CRANKING_FUEL";
 case CUSTOM_EVENT_6626:
   return "CUSTOM_EVENT_6626";
+case CUSTOM_FIRING_LENGTH:
+  return "CUSTOM_FIRING_LENGTH";
 case CUSTOM_FLSTACK:
   return "CUSTOM_FLSTACK";
 case CUSTOM_FSIO_INVALID_EXPRESSION:
@@ -705,6 +701,8 @@ case CUSTOM_STACK_6627:
   return "CUSTOM_STACK_6627";
 case CUSTOM_STACK_6629:
   return "CUSTOM_STACK_6629";
+case CUSTOM_STACK_ADC:
+  return "CUSTOM_STACK_ADC";
 case CUSTOM_STACK_ADC_6671:
   return "CUSTOM_STACK_ADC_6671";
 case CUSTOM_STACK_SPI:
@@ -713,6 +711,8 @@ case CUSTOM_SYNC_COUNT_MISMATCH:
   return "CUSTOM_SYNC_COUNT_MISMATCH";
 case CUSTOM_SYNC_ERROR:
   return "CUSTOM_SYNC_ERROR";
+case CUSTOM_TIMER_WATCHDOG:
+  return "CUSTOM_TIMER_WATCHDOG";
 case CUSTOM_TLE8888:
   return "CUSTOM_TLE8888";
 case CUSTOM_TOO_LONG_CRANKING_FUEL_INJECTION:
diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h
index d89f08ca51..beca68c378 100644
--- a/firmware/controllers/algo/obd_error_codes.h
+++ b/firmware/controllers/algo/obd_error_codes.h
@@ -2033,20 +2033,20 @@ typedef enum {
 	CUSTOM_ICU_DRIVER_STATE = 6673,
 	CUSTOM_STACK_SPI = 6674,
 	CUSTOM_ERR_6675 = 6675,
-	CUSTOM_ERR_6676 = 6676,
+	CUSTOM_STACK_ADC = 6676,
 	CUSTOM_IH_STACK = 6677,
 	CUSTOM_EC_NULL = 6678,
-	CUSTOM_ERR_6679 = 6679,
+	CUSTOM_ERROR_ICU = 6679,
 
-	CUSTOM_ERR_6680 = 6680,
+	CUSTOM_ERR_ANGLE_CR = 6680,
 	CUSTOM_DELTA_NOT_POSITIVE = 6681,
-	CUSTOM_ERR_6682 = 6682,
+	CUSTOM_TIMER_WATCHDOG = 6682,
 	CUSTOM_SAME_TWICE = 6683,
 	CUSTOM_ERR_6684 = 6684,
 	CUSTOM_ERR_6685 = 6685,
 	CUSTOM_ERR_6686 = 6686,
-	CUSTOM_ERR_6687 = 6687,
-	CUSTOM_ERR_6688 = 6688,
+	CUSTOM_FIRING_LENGTH = 6687,
+	CUSTOM_ADVANCE_SPARK = 6688,
 	CUSTOM_SPARK_ANGLE_9 = 6689,
 
 	CUSTOM_ERR_MAP_START_ASSERT = 6690,
@@ -2064,7 +2064,7 @@ typedef enum {
 	CUSTOM_CJ125_0 = 6700,
 	CUSTOM_CJ125_1 = 6701,
 	CUSTOM_CJ125_2 = 6702,
-	CUSTOM_ERR_6703 = 6703,
+	CUSTOM_ERR_BENCH_PARAM = 6703,
 	CUSTOM_ERR_BOTH_FRONTS_REQUIRED = 6704,
 	CUSTOM_TLE8888 = 6705,
 	CUSTOM_KNOCK_WINDOW = 6706,
diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp
index 37e2df2066..fc5e0cf988 100644
--- a/firmware/controllers/bench_test.cpp
+++ b/firmware/controllers/bench_test.cpp
@@ -75,7 +75,7 @@ static void runBench(brain_pin_e brainPin, OutputPin *output, float delayMs, flo
 	int offTimeUs = MS2US(maxF(0.1, offTimeMs));
 
 	if (onTimeUs > TOO_FAR_INTO_FUTURE_US) {
-		firmwareError(CUSTOM_ERR_6703, "onTime above limit %dus", TOO_FAR_INTO_FUTURE_US);
+		firmwareError(CUSTOM_ERR_BENCH_PARAM, "onTime above limit %dus", TOO_FAR_INTO_FUTURE_US);
 		return;
 	}
 
diff --git a/firmware/controllers/engine_cycle/spark_logic.cpp b/firmware/controllers/engine_cycle/spark_logic.cpp
index 6fd2b3b2b4..e566b7fa1c 100644
--- a/firmware/controllers/engine_cycle/spark_logic.cpp
+++ b/firmware/controllers/engine_cycle/spark_logic.cpp
@@ -372,7 +372,7 @@ static void handleSparkEvent(bool limitedSpark, uint32_t trgEventIndex, Ignition
 		return;
 	}
 	if (cisnan(sparkAngle)) {
-		warning(CUSTOM_ERR_6688, "NaN advance");
+		warning(CUSTOM_ADVANCE_SPARK, "NaN advance");
 		return;
 	}
 
diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp
index 102f085041..1cc3a2e29e 100644
--- a/firmware/controllers/math/engine_math.cpp
+++ b/firmware/controllers/math/engine_math.cpp
@@ -328,7 +328,7 @@ int getCylinderId(int index DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	const int firingOrderLength = getFiringOrderLength(PASS_ENGINE_PARAMETER_SIGNATURE);
 
 	if (firingOrderLength < 1 || firingOrderLength > MAX_CYLINDER_COUNT) {
-		firmwareError(CUSTOM_ERR_6687, "fol %d", firingOrderLength);
+		firmwareError(CUSTOM_FIRING_LENGTH, "fol %d", firingOrderLength);
 		return 1;
 	}
 	if (engineConfiguration->specs.cylindersCount != firingOrderLength) {
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 296713302c..e4c6459ef6 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -202,7 +202,7 @@ void onFastAdcComplete(adcsample_t* buffer) {
 	/**
 	 * this callback is executed 10 000 times a second, it needs to be as fast as possible
 	 */
-	efiAssertVoid(CUSTOM_ERR_6676, getCurrentRemainingStack() > 128, "lowstck#9b");
+	efiAssertVoid(CUSTOM_STACK_ADC, getCurrentRemainingStack() > 128, "lowstck#9b");
 
 #if EFI_SENSOR_CHART && EFI_SHAFT_POSITION_INPUT
 	if (ENGINE(sensorChartMode) == SC_AUX_FAST1) {
diff --git a/firmware/hw_layer/io_pins.cpp b/firmware/hw_layer/io_pins.cpp
index e35667ad9b..8c7bc9d9fa 100644
--- a/firmware/hw_layer/io_pins.cpp
+++ b/firmware/hw_layer/io_pins.cpp
@@ -118,7 +118,7 @@ static char icuError[30];
 void efiIcuStart(const char *msg, ICUDriver *icup, const ICUConfig *config) {
 	if (icup->state != ICU_STOP && icup->state != ICU_READY) {
 		chsnprintf(icuError, sizeof(icuError), "ICU already used %s", msg);
-		firmwareError(CUSTOM_ERR_6679, icuError);
+		firmwareError(CUSTOM_ERROR_ICU, icuError);
 		return;
 	}
 	icuStart(icup, config);
diff --git a/firmware/hw_layer/microsecond_timer/microsecond_timer.cpp b/firmware/hw_layer/microsecond_timer/microsecond_timer.cpp
index c2c2a9125e..6907aa65a2 100644
--- a/firmware/hw_layer/microsecond_timer/microsecond_timer.cpp
+++ b/firmware/hw_layer/microsecond_timer/microsecond_timer.cpp
@@ -114,7 +114,7 @@ class MicrosecondTimerWatchdogController : public PeriodicTimerController {
 
 		msg = isTimerPending ? "No_cb too long" : "Timer not awhile";
 		// 2 seconds of inactivity would not look right
-		efiAssertVoid(CUSTOM_ERR_6682, nowNt < lastSetTimerTimeNt + 2 * CORE_CLOCK, msg);
+		efiAssertVoid(CUSTOM_TIMER_WATCHDOG, nowNt < lastSetTimerTimeNt + 2 * CORE_CLOCK, msg);
 	}
 
 	int getPeriodMs() override {