diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index ec917a633e..93920de9f0 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -795,10 +795,10 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin
 
 void startTunerStudioConnectivity(void) {
 	if (sizeof(persistent_config_s) != getTunerStudioPageSize(0))
-		firmwareError(OBD_PCM_Processor_Fault, "TS page size mismatch: %d/%d", sizeof(persistent_config_s), getTunerStudioPageSize(0));
+		firmwareError(CUSTOM_OBD_52, "TS page size mismatch: %d/%d", sizeof(persistent_config_s), getTunerStudioPageSize(0));
 
 	if (sizeof(TunerStudioOutputChannels) != TS_OUTPUT_SIZE)
-		firmwareError(OBD_PCM_Processor_Fault, "TS outputs size mismatch: %d/%d", sizeof(TunerStudioOutputChannels), TS_OUTPUT_SIZE);
+		firmwareError(CUSTOM_OBD_53, "TS outputs size mismatch: %d/%d", sizeof(TunerStudioOutputChannels), TS_OUTPUT_SIZE);
 
 	memset(&tsState, 0, sizeof(tsState));
 	syncTunerStudioCopy();
diff --git a/firmware/console/eficonsole.cpp b/firmware/console/eficonsole.cpp
index e3ed5dd411..7a47211038 100644
--- a/firmware/console/eficonsole.cpp
+++ b/firmware/console/eficonsole.cpp
@@ -36,7 +36,7 @@ static void myfatal(void) {
 }
 
 static void myerror(void) {
-	firmwareError(OBD_PCM_Processor_Fault, "firmwareError: %d", getRusEfiVersion());
+	firmwareError(CUSTOM_ERR_6107, "firmwareError: %d", getRusEfiVersion());
 }
 
 static void sayNothing(void) {
diff --git a/firmware/controllers/algo/error_handling.h b/firmware/controllers/algo/error_handling.h
index 1d7afdabf0..7509445352 100644
--- a/firmware/controllers/algo/error_handling.h
+++ b/firmware/controllers/algo/error_handling.h
@@ -63,8 +63,8 @@ int getRusEfiVersion(void);
  * is stopped. Please use firmwareWarning() instead
  */
 #if EFI_ENABLE_ASSERTS
-  #define efiAssert(condition, message, result) { if (!(condition)) { firmwareError(OBD_PCM_Processor_Fault, message); return result; } }
-  #define efiAssertVoid(condition, message) { if (!(condition)) { firmwareError(OBD_PCM_Processor_Fault, message); return; } }
+  #define efiAssert(condition, message, result) { if (!(condition)) { firmwareError(CUSTOM_ERR_6500, message); return result; } }
+  #define efiAssertVoid(condition, message) { if (!(condition)) { firmwareError(CUSTOM_ERR_6501, message); return; } }
 #else /* EFI_ENABLE_ASSERTS */
   #define efiAssert(condition, message, result) { }
   #define efiAssertVoid(condition, message) { }
diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h
index 6c10169772..07f098c750 100644
--- a/firmware/controllers/algo/obd_error_codes.h
+++ b/firmware/controllers/algo/obd_error_codes.h
@@ -1853,6 +1853,57 @@ typedef enum {
 	CUSTOM_ERR_6148 = 6148,
 	CUSTOM_OUT_OF_ORDER_COIL = 6149,
 
+	CUSTOM_ERR_6500 = 6500,
+	CUSTOM_ERR_6501 = 6501,
+	CUSTOM_ERR_6502 = 6502,
+	CUSTOM_ERR_6503 = 6503,
+	CUSTOM_ERR_6504 = 6504,
+	CUSTOM_ERR_6505 = 6505,
+	CUSTOM_ERR_6506 = 6506,
+	CUSTOM_ERR_6507 = 6507,
+	CUSTOM_ERR_6508 = 6508,
+	CUSTOM_ERR_6509 = 6509,
+	CUSTOM_ERR_6510 = 6510,
+	CUSTOM_ERR_6511 = 6511,
+	CUSTOM_ERR_6512 = 6512,
+	CUSTOM_ERR_6513 = 6513,
+	CUSTOM_ERR_6514 = 6514,
+	CUSTOM_ERR_6515 = 6515,
+	CUSTOM_ERR_6516 = 6516,
+	CUSTOM_ERR_6517 = 6517,
+	CUSTOM_ERR_6518 = 6518,
+	CUSTOM_ERR_6519 = 6519,
+	CUSTOM_ERR_6520 = 6520,
+	CUSTOM_ERR_6521 = 6521,
+	CUSTOM_ERR_6522 = 6522,
+	CUSTOM_ERR_6523 = 6523,
+	CUSTOM_ERR_6524 = 6524,
+	CUSTOM_ERR_6525 = 6525,
+	CUSTOM_ERR_6526 = 6526,
+	CUSTOM_ERR_6527 = 6527,
+	CUSTOM_ERR_6528 = 6528,
+	CUSTOM_ERR_6529 = 6529,
+	CUSTOM_ERR_6530 = 6530,
+	CUSTOM_ERR_6531 = 6531,
+	CUSTOM_ERR_6532 = 6532,
+	CUSTOM_ERR_6533 = 6533,
+	CUSTOM_ERR_6534 = 6534,
+	CUSTOM_ERR_6535 = 6535,
+	CUSTOM_ERR_6536 = 6536,
+	CUSTOM_ERR_6537 = 6537,
+	CUSTOM_ERR_6538 = 6538,
+	CUSTOM_ERR_6539 = 6539,
+
+	CUSTOM_ERR_6540 = 6540,
+	CUSTOM_ERR_6541 = 6541,
+	CUSTOM_ERR_6542 = 6542,
+	CUSTOM_ERR_6543 = 6543,
+	CUSTOM_ERR_6544 = 6544,
+	CUSTOM_ERR_6545 = 6545,
+	CUSTOM_ERR_6546 = 6546,
+	CUSTOM_ERR_6547 = 6547,
+	CUSTOM_ERR_6548 = 6548,
+	CUSTOM_ERR_6549 = 6549,
 
 	// this is needed for proper enum size, this matters for malfunction_central
 	Internal_ForceMyEnumIntSize_cranking_obd_code = ENUM_32_BITS,