diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 571b972652..3efc0bbb08 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -174,7 +174,7 @@ typedef enum {
 
 	PROMETHEUS_DEFAULTS = 100,
 
-	Force_4b_engine_type = ENUM_32_BITS,
+	Force_4_bytes_size_engine_type = ENUM_32_BITS,
 } engine_type_e;
 
 
@@ -279,7 +279,7 @@ typedef enum {
 
 	TT_UNUSED = 40, // this is used if we want to iterate over all trigger types
 
-	Force_4b_trigger_type = ENUM_32_BITS,
+	Force_4_bytes_size_trigger_type = ENUM_32_BITS,
 } trigger_type_e;
 
 typedef enum {
@@ -287,7 +287,7 @@ typedef enum {
 	ADC_SLOW = 1,
 	ADC_FAST = 2,
 
-	Force_4b_adc_channel_mode = ENUM_32_BITS,
+	Force_4_bytes_size_adc_channel_mode = ENUM_32_BITS,
 } adc_channel_mode_e;
 
 typedef enum {
@@ -318,7 +318,7 @@ typedef enum {
 	VVT_SECOND_HALF = 1,
 	VVT_2GZ = 2,
 	MIATA_NB2 = 3,
-	Force_4b_vvt_mode = ENUM_32_BITS,
+	Force_4_bytes_size_vvt_mode = ENUM_32_BITS,
 } vvt_mode_e;
 
 /**
@@ -348,7 +348,7 @@ typedef enum {
 	 */
 	LM_REAL_MAF = 4,
 
-	Force_4b_engine_load_mode = ENUM_32_BITS,
+	Force_4_bytes_size_engine_load_mode = ENUM_32_BITS,
 } engine_load_mode_e;
 
 typedef enum {
@@ -356,7 +356,7 @@ typedef enum {
 	DM_HD44780 = 1,
 	DM_HD44780_OVER_PCF8574 = 2,
 
-	Force_4b_display_mode = ENUM_32_BITS,
+	Force_4_bytes_size_display_mode = ENUM_32_BITS,
 
 } display_mode_e;
 
@@ -368,7 +368,7 @@ typedef enum {
 	 */
 	LM_MLV = 1,
 
-	Force_4b_log_format = ENUM_32_BITS,
+	Force_4_bytes_size_log_format = ENUM_32_BITS,
 } log_format_e;
 
 typedef enum {
@@ -383,7 +383,7 @@ typedef enum {
 	 * which could be adjusted according to current CLT
 	 */
 	IM_MANUAL = 1,
-	Force_4b_idle_mode = ENUM_32_BITS,
+	Force_4_bytes_size_idle_mode = ENUM_32_BITS,
 } idle_mode_e;
 
 typedef enum {
@@ -401,12 +401,12 @@ typedef enum {
 	OM_OPENDRAIN = 2,
 	OM_OPENDRAIN_INVERTED = 3,
 
-	Force_4b_pin_output_mode = ENUM_32_BITS,
+	Force_4_bytes_size_pin_output_mode = ENUM_32_BITS,
 } pin_output_mode_e;
 
 typedef enum {
 	// todo: drop this unused enum?
-	Force_4b_gpio_mode = ENUM_32_BITS,
+	Force_4_bytes_size_gpio_mode = ENUM_32_BITS,
 } gpio_mode_e;
 
 typedef enum {
@@ -414,7 +414,7 @@ typedef enum {
 	PI_PULLUP = 1,
 	PI_PULLDOWN = 2,
 
-	Force_4b_pin_input_mode = ENUM_32_BITS,
+	Force_4_bytes_size_pin_input_mode = ENUM_32_BITS,
 } pin_input_mode_e;
 
 #define CRANK_MODE_MULTIPLIER 2.0f
@@ -442,7 +442,7 @@ typedef enum {
 	 */
 	FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR = 4,
 
-	Force_4b_operation_mode_e = ENUM_32_BITS,
+	Force_4_bytes_size_operation_mode_e = ENUM_32_BITS,
 } operation_mode_e;
 
 /**
@@ -459,7 +459,7 @@ typedef enum {
 	IM_INDIVIDUAL_COILS = 1,
 	IM_WASTED_SPARK = 2,
 
-	Force_4b_ignition_mode = ENUM_32_BITS,
+	Force_4_bytes_size_ignition_mode = ENUM_32_BITS,
 } ignition_mode_e;
 
 /**
@@ -484,7 +484,7 @@ typedef enum {
 	IM_SINGLE_POINT = 3,
 
 
-	Force_4b_injection_mode = ENUM_32_BITS,
+	Force_4_bytes_size_injection_mode = ENUM_32_BITS,
 } injection_mode_e;
 
 /**
@@ -494,7 +494,7 @@ typedef enum {
 	CIM_DEFAULT = 0,
 	CIM_FIXED_ANGLE = 1,
 
-	Force_4b_cranking_ignition_mode = ENUM_32_BITS,
+	Force_4_bytes_size_cranking_ignition_mode = ENUM_32_BITS,
 } cranking_ignition_mode_e;
 
 typedef enum {
@@ -504,7 +504,7 @@ typedef enum {
 	UART_DEVICE_3 = 3,
 	UART_DEVICE_4 = 4,
 
-	Force_4b_uart_device = ENUM_32_BITS,
+	Force_4_bytes_size_uart_device = ENUM_32_BITS,
 } uart_device_e;
 
 
@@ -515,12 +515,12 @@ typedef enum {
 	SPI_DEVICE_3 = 3,
 	SPI_DEVICE_4 = 4,
 
-	Force_4b_spi_device = ENUM_32_BITS,
+	Force_4bytes_size_spi_device = ENUM_32_BITS,
 } spi_device_e;
 
 typedef enum {
 	TC_ZERO = 0,
-	Force_4b_tChargeMode_e = ENUM_32_BITS,
+	Force_4bytes_size_tChargeMode_e = ENUM_32_BITS, // we need to force persistent value size
 } tChargeMode_e;
 
 /**
@@ -560,14 +560,14 @@ typedef enum {
 	EFI_ADC_NONE = 16,
 	EFI_ADC_ERROR = 999,
 
-	Force_4b_cranking_adc_channel = ENUM_32_BITS,
+	Force_4_bytes_size_cranking_adc_channel = ENUM_32_BITS,
 } adc_channel_e;
 
 typedef enum {
 	MS_AUTO = 0,
 	MS_ALWAYS = 1,
 	MS_NEVER = 2,
-	Force_4b_mass_storage = ENUM_32_BITS,
+	Force_4_bytes_size_mass_storage = ENUM_32_BITS,
 } mass_storage_e;
 
 typedef enum {
@@ -590,7 +590,7 @@ typedef enum {
 
 	ES_Custom = 5,
 
-	Force_4b_ego_sensor = ENUM_32_BITS,
+	Force_4_bytes_size_ego_sensor = ENUM_32_BITS,
 } ego_sensor_e;
 
 /**
@@ -736,7 +736,7 @@ typedef enum {
 	GPIO_UNASSIGNED = 80,
 	GPIO_INVALID = 81,
 
-	Force_4b_brain_pin_e = ENUM_32_BITS,
+	Force_4_bytes_size_brain_pin_e = ENUM_32_BITS,
 } brain_pin_e;
 
 /**
@@ -786,7 +786,7 @@ typedef enum {
 	DBG_33 = 33,
 	DBG_34 = 34,
 
-	Force_4b_debug_mode_e = ENUM_32_BITS,
+	Force_4_bytes_size_debug_mode_e = ENUM_32_BITS,
 } debug_mode_e;
 
 typedef enum {
@@ -826,7 +826,7 @@ typedef enum {
 	 */
 	MT_MPX4250A = 9, 
 	
-	Force_4b_cranking_map_type = ENUM_32_BITS,
+	Force_4_bytes_size_cranking_map_type = ENUM_32_BITS,
 } air_pressure_sensor_type_e;
 
 typedef enum {