diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt
index bb0b840f6c..0762f636bd 100644
--- a/firmware/console/binary/output_channels.txt
+++ b/firmware/console/binary/output_channels.txt
@@ -158,7 +158,7 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0
 	uint16_t autoscale warningCounter;;"count",1, 0, 0, 0, 0
 	uint16_t autoscale lastErrorCode;;"error",1, 0, 0, 0, 0
 
-	uint16_t[8 iterate] recentErrorCodes;;"error", 1, 0, 0, 0, 0
+	uint16_t[8 iterate] recentErrorCode;;"error", 1, 0, 0, 0, 0
 
 	float autoscale debugFloatField1;;"val", 1, 0, 0, 0, 0
 	float autoscale debugFloatField2;;"val", 1, 0, 0, 0, 0
@@ -214,7 +214,7 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0
 	uint16_t autoscale AFRValue;;"AFR",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0
 
 	uint16_t autoscale VssAcceleration;;"m/s2",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0
-	uint16_t autoscale lambda2;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0
+	uint16_t autoscale lambdaValue2;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0
 
 	uint16_t autoscale AFRValue2;;"AFR",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0
 	uint16_t autoscale vvtPositionB1E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h
index 9ae0266e8e..0ec4fc10c1 100644
--- a/firmware/console/binary/ts_outputs_generated.h
+++ b/firmware/console/binary/ts_outputs_generated.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 14:08:44 EST 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 18:34:07 EST 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -451,7 +451,7 @@ struct ts_outputs_s {
 	error
 	 * offset 152
 	 */
-	uint16_t recentErrorCodes[8];
+	uint16_t recentErrorCode[8];
 	/**
 	val
 	 * offset 168
@@ -647,7 +647,7 @@ struct ts_outputs_s {
 	/**
 	 * offset 286
 	 */
-	scaled_channel<uint16_t, 10000, 1> lambda2 = (uint16_t)0;
+	scaled_channel<uint16_t, 10000, 1> lambdaValue2 = (uint16_t)0;
 	/**
 	AFR
 	 * offset 288
@@ -729,4 +729,4 @@ struct ts_outputs_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 14:08:44 EST 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Nov 27 18:34:07 EST 2021
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index d49053b6d8..e5145f96d9 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -233,15 +233,15 @@ massAirFlowValue = scalar, U16, 28, "Kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "", 0.1, 0
+knockRetard = scalar, U08, 36, "deg", 0.1, 0
 unused37 = scalar, U08, 37, "", 1, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, U16, 42, "deg", 0.02, 0
 chargeAirMass = scalar, U16, 44, "g", 0.001, 0
-crankingFuelMass = scalar, U16, 46, "ms", 0.01, 0
+crankingFuelMs = scalar, U16, 46, "ms", 0.01, 0
 currentTargetAfr = scalar, U16, 48, "ratio", 0.001, 0
-fuelBase = scalar, U16, 50, "mg", 0.01, 0
+baseFuel = scalar, U16, 50, "mg", 0.01, 0
 fuelRunning = scalar, U16, 52, "mg", 0.01, 0
 actualLastInjection = scalar, U16, 54, "ms", 0.0033333333333333335, 0
 injectorDutyCycle = scalar, U08, 56, "%", 0.5, 0
@@ -253,7 +253,6 @@ iatCorrection = scalar, U16, 64, "%", 0.01, 0
 cltCorrection = scalar, U16, 66, "%", 0.01, 0
 baroCorrection = scalar, U16, 68, "%", 0.01, 0
 currentEnginePhase = scalar, U16, 70, "deg", 1, 0
-currentEnginePhase = scalar, U16, 70, "deg", 1, 0
 wallFuelAmount = scalar, U16, 72, "mg", 0.01, 0
 wallFuelCorrection = scalar, U16, 74, "mg", 0.01, 0
 unused76 = scalar, U16, 76, "", 1, 0
@@ -273,9 +272,6 @@ fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0
 veTableYAxis = scalar, U16, 104, "%", 0.01, 0
 afrTableYAxis = scalar, U16, 106, "%", 0.01, 0
 knockLevel = scalar, F32, 108, "Volts", 1, 0
-timeSeconds = scalar, U32, 112, "sec", 1, 0
-engineMode = scalar, U32, 116, "em", 1, 0
-firmwareVersion = scalar, U32, 120, "version_f", 1, 0
 seconds = scalar, U32, 112, "sec", 1, 0
 engineMode = scalar, U32, 116, "em", 1, 0
 firmwareVersion = scalar, U32, 120, "version_f", 1, 0
@@ -290,14 +286,14 @@ totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0
 orderingErrorCounter = scalar, U32, 144, "", 1, 0
 warningCounter = scalar, U16, 148, "count", 1, 0
 lastErrorCode = scalar, U16, 150, "error", 1, 0
-recentErrorCodes1 = scalar, U16, 152, "error", 1, 0
-recentErrorCodes2 = scalar, U16, 154, "error", 1, 0
-recentErrorCodes3 = scalar, U16, 156, "error", 1, 0
-recentErrorCodes4 = scalar, U16, 158, "error", 1, 0
-recentErrorCodes5 = scalar, U16, 160, "error", 1, 0
-recentErrorCodes6 = scalar, U16, 162, "error", 1, 0
-recentErrorCodes7 = scalar, U16, 164, "error", 1, 0
-recentErrorCodes8 = scalar, U16, 166, "error", 1, 0
+recentErrorCode1 = scalar, U16, 152, "error", 1, 0
+recentErrorCode2 = scalar, U16, 154, "error", 1, 0
+recentErrorCode3 = scalar, U16, 156, "error", 1, 0
+recentErrorCode4 = scalar, U16, 158, "error", 1, 0
+recentErrorCode5 = scalar, U16, 160, "error", 1, 0
+recentErrorCode6 = scalar, U16, 162, "error", 1, 0
+recentErrorCode7 = scalar, U16, 164, "error", 1, 0
+recentErrorCode8 = scalar, U16, 166, "error", 1, 0
 debugFloatField1 = scalar, F32, 168, "val", 1, 0
 debugFloatField2 = scalar, F32, 172, "val", 1, 0
 debugFloatField3 = scalar, F32, 176, "val", 1, 0
@@ -345,18 +341,17 @@ knock12 = scalar, U08, 261, "", 1, 0
 tcuDesiredGear = scalar, U08, 262, "gear", 1, 0
 flexPercent = scalar, U08, 263, "%", 0.5, 0
 rawIdlePositionSensor = scalar, U16, 264, "V", 0.001, 0
-rawWastegatePositionSensor = scalar, U16, 266, "V", 0.001, 0
-wastegatePosition = scalar, U16, 268, "%", 0.01, 0
+rawWastegatePosition = scalar, U16, 266, "V", 0.001, 0
+wastegatePositionSensor = scalar, U16, 268, "%", 0.01, 0
 idlePositionSensor = scalar, U16, 270, "%", 0.01, 0
 rawLowFuelPressure = scalar, U16, 272, "V", 0.001, 0
 rawHighFuelPressure = scalar, U16, 274, "V", 0.001, 0
 lowFuelPressure = scalar, U16, 276, "kpa", 0.03333333333333333, 0
 highFuelPressure = scalar, U16, 278, "bar", 0.1, 0
 targetLambda = scalar, U16, 280, "", 1.0E-4, 0
-airFuelRatio = scalar, U16, 282, "AFR", 0.001, 0
 AFRValue = scalar, U16, 282, "AFR", 0.001, 0
 VssAcceleration = scalar, U16, 284, "m/s2", 0.0033333333333333335, 0
-lambda2 = scalar, U16, 286, "", 1.0E-4, 0
+lambdaValue2 = scalar, U16, 286, "", 1.0E-4, 0
 AFRValue2 = scalar, U16, 288, "AFR", 0.001, 0
 vvtPositionB1E = scalar, U16, 290, "deg", 0.02, 0
 vvtPositionB2I = scalar, U16, 292, "deg", 0.02, 0
@@ -375,6 +370,8 @@ vvtTargets2 = scalar, U08, 315, "deg", 1, 0
 vvtTargets3 = scalar, U08, 316, "deg", 1, 0
 vvtTargets4 = scalar, U08, 317, "deg", 1, 0
 turboSpeed = scalar, U16, 318, "hz", 1, 0
+unusedAtTheEnd = array, U08, 320, [18], "", 1, 0
+alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0
 
 ;
 ; see TunerStudioOutputChannels struct