diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt
index 287120528a..8455d5aaea 100644
--- a/firmware/console/binary/output_channels.txt
+++ b/firmware/console/binary/output_channels.txt
@@ -27,8 +27,8 @@ bit isCltError;Error: CLT
 bit isMapError;Error: MAP
 bit isIatError;Error: IAT
 bit isTriggerError;Error: Trigger
-bit hasCriticalError;Error, Critical: ECM
-bit isWarnNow;Warning: ECM
+bit hasCriticalError;Error, Error: Active
+bit isWarnNow;Warning: Active
 bit isPedalError;Error: Pedal
 bit isKnockChipOk;
 bit launchTriggered;Launch Control Triggered
diff --git a/firmware/controllers/algo/engine_state.txt b/firmware/controllers/algo/engine_state.txt
index 9ed44ec635..b86010b36a 100644
--- a/firmware/controllers/algo/engine_state.txt
+++ b/firmware/controllers/algo/engine_state.txt
@@ -16,28 +16,15 @@ end_struct
 
 LuaAdjustments lua
 
-
 struct speed_density_s
-	int16_t autoscale tCharge;Charge temperature estimate;"deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 1
-	float tChargeK;Charge temperature estimate K
+	int16_t autoscale tCharge;Air: Charge temperature estimate;"deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 1
+	float tChargeK;Air: Charge temperature estimate K
 end_struct
 
 speed_density_s sd;
 
-float engineCycleDurationMs;
-
-
-float minRpmKcurrentTPS
-
-uint32_t currentTpsAdc
-float tpsVoltageMCU
-float tpsVoltageBoard
-
-	float currentBaroCorrectedVE;
-	float injectorFlowCorrection;
 float baroCorrection;@@GAUGE_NAME_FUEL_BARO_CORR@@
 
-
 struct cranking_fuel_s
 
 floatms_t baseFuel;Fuel: base duration\nDuration of injection, in ms. During cranking we do not account for injector flow, so if you change injectors you would need to change settings.\nDeprecated. Please use '1'.\nTODO: maybe account for injector flow?
diff --git a/firmware/controllers/math/throttle_model.txt b/firmware/controllers/math/throttle_model.txt
index 9efccbe1d3..fc198fe751 100644
--- a/firmware/controllers/math/throttle_model.txt
+++ b/firmware/controllers/math/throttle_model.txt
@@ -1,7 +1,7 @@
 struct_no_prefix throttle_model_s
-	bit throttleUseWotModel
+	bit throttleUseWotModel;Air: Throttle model WOT
 
-	int16_t autoscale throttleModelCrossoverAngle;;"%", 0.01, 0, 0, 100, 1
+	int16_t autoscale throttleModelCrossoverAngle;Air: Throttle crossover pos;"%", 0.01, 0, 0, 100, 1
 
-	float throttleEstimatedFlow;;"g/s", 1, 0, 0, 5, 2
+	float throttleEstimatedFlow;Air: Throttle flow estimate;"g/s", 1, 0, 0, 5, 2
 end_struct
diff --git a/firmware/integration/rusefi_config_shared.txt b/firmware/integration/rusefi_config_shared.txt
index d3ead0aeae..4e8b45e497 100644
--- a/firmware/integration/rusefi_config_shared.txt
+++ b/firmware/integration/rusefi_config_shared.txt
@@ -84,8 +84,7 @@
 #define GAUGE_NAME_WG_POSITION "Wastegate position sensor"
 #define GAUGE_NAME_ETB_ERROR "ETB: position error"
 #define GAUGE_NAME_ETB_DUTY "ETB: Duty"
-#define GAUGE_NAME_IDLE_POSITION "Idle position sensor"
-#define GAUGE_NAME_WARNING_COUNT "Warning count"
+#define GAUGE_NAME_IDLE_POSITION "Idle: Position sensor"
 #define GAUGE_NAME_LAST_ERROR "Last error"
 #define GAUGE_NAME_TUNE_CRC16 "Tune CRC16"
 #define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16"
@@ -128,11 +127,11 @@
 
 #define GAUGE_NAME_AIR_FLOW_MEASURED "MAF"
 #define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF #2"
-#define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate"
-#define GAUGE_NAME_AIR_MASS "air mass"
+#define GAUGE_NAME_AIR_FLOW_ESTIMATE "Air: Flow estimate"
+#define GAUGE_NAME_AIR_MASS "Air: Cylinder airmass"
 
-#define GAUGE_NAME_WARNING_LAST "warning: last"
-#define GAUGE_NAME_WARNING_COUNTER "warning: counter"
+#define GAUGE_NAME_WARNING_LAST "Warning: last"
+#define GAUGE_NAME_WARNING_COUNTER "Warning: counter"
 
 #define GAUGE_NAME_FUEL_LEVEL "Fuel level"
 #define GAUGE_NAME_KNOCK_LEVEL "Knock: Current level"
@@ -162,7 +161,7 @@
 #define GAUGE_NAME_FUEL_FLOW "Fuel: Flow rate"
 
 #define GAUGE_NAME_FUEL_INJ_DUTY "Fuel: injector duty cycle"
-#define GAUGE_NAME_TCHARGE "Fuel: SD tCharge"
+#define GAUGE_NAME_TCHARGE "Air: SD tCharge"
 #define GAUGE_NAME_TARGET_AFR "Fuel: target AFR"
 #define GAUGE_NAME_TARGET_LAMBDA "Fuel: target lambda"
 #define GAUGE_NAME_FUEL_INJECTION_TIMING "Fuel: Injection timing SOI"
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 89141986b2..9e278bb03f 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1333,7 +1333,7 @@ gaugeCategory = Sensors - Extra 2
 	auxSpeed1Gauge = auxSpeed1, "Aux Freq Input1", "hz", 0, 30000, 0, 0, 30000, 30000, 0, 0
 
 gaugeCategory = ECU Status
-	warningCounterGauge = warningCounter, @@GAUGE_NAME_WARNING_COUNT@@, "",	0,	100,	0,	0,	100,  100,	0,	0
+	warningCounterGauge = warningCounter, @@GAUGE_NAME_WARNING_COUNTER@@, "",	0,	100,	0,	0,	100,  100,	0,	0
 	lastErrorCodeGauge = lastErrorCode, @@GAUGE_NAME_LAST_ERROR@@, "",	0,  18000,	0,	0,	18000, 18000,	0,	0
 	recentErrorCode1Gauge = recentErrorCode1, "Error#1", "",	0,  18000,	0,	0,	18000, 18000,	0,	0
 	recentErrorCode2Gauge = recentErrorCode2, "Error#2", "",	0,  18000,	0,	0,	18000, 18000,	0,	0