diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
index cc69a47850..295accb613 100644
--- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
@@ -391,11 +391,11 @@
 #define GAUGE_NAME_AFR "Air/Fuel Ratio"
 #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2"
 #define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate"
-#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor"
-#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF sensor 2"
+#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF"
+#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF #2"
 #define GAUGE_NAME_AIR_MASS "air mass"
-#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear 1"
-#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear 2"
+#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear #1"
+#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear #2"
 #define GAUGE_NAME_AUX_TEMP1 "Aux temp 1"
 #define GAUGE_NAME_AUX_TEMP2 "Aux temp 2"
 #define GAUGE_NAME_BARO_PRESSURE "Barometric pressure"
@@ -1026,7 +1026,7 @@
 #define SENT_INPUT_COUNT 1
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH snap_41091
+#define SIGNATURE_HASH snap_8981
 #define specs_s_size 12
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@@ -1298,7 +1298,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI 2022.11.10.cypress.snap_41091"
+#define TS_SIGNATURE "rusEFI 2022.11.10.cypress.snap_8981"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
index 2d3df1cd6b..c6b77eec62 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -391,11 +391,11 @@
 #define GAUGE_NAME_AFR "Air/Fuel Ratio"
 #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2"
 #define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate"
-#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor"
-#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF sensor 2"
+#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF"
+#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF #2"
 #define GAUGE_NAME_AIR_MASS "air mass"
-#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear 1"
-#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear 2"
+#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear #1"
+#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear #2"
 #define GAUGE_NAME_AUX_TEMP1 "Aux temp 1"
 #define GAUGE_NAME_AUX_TEMP2 "Aux temp 2"
 #define GAUGE_NAME_BARO_PRESSURE "Barometric pressure"
@@ -1026,7 +1026,7 @@
 #define SENT_INPUT_COUNT 1
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH snap_591
+#define SIGNATURE_HASH snap_33241
 #define specs_s_size 12
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@@ -1298,7 +1298,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI 2022.11.10.kin.snap_591"
+#define TS_SIGNATURE "rusEFI 2022.11.10.kin.snap_33241"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
index 4a188a5878..5054b1b059 100644
--- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
@@ -401,11 +401,11 @@
 #define GAUGE_NAME_AFR "Air/Fuel Ratio"
 #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2"
 #define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate"
-#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor"
-#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF sensor 2"
+#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF"
+#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF #2"
 #define GAUGE_NAME_AIR_MASS "air mass"
-#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear 1"
-#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear 2"
+#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear #1"
+#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear #2"
 #define GAUGE_NAME_AUX_TEMP1 "Aux temp 1"
 #define GAUGE_NAME_AUX_TEMP2 "Aux temp 2"
 #define GAUGE_NAME_BARO_PRESSURE "Barometric pressure"
@@ -992,7 +992,7 @@
 #define show_Frankenso_presets false
 #define show_Proteus_presets false
 #define show_test_presets false
-#define SIGNATURE_HASH snap_31065
+#define SIGNATURE_HASH snap_64207
 #define specs_s_size 12
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@@ -1265,7 +1265,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI 2022.11.10.subaru_eg33_f7.snap_31065"
+#define TS_SIGNATURE "rusEFI 2022.11.10.subaru_eg33_f7.snap_64207"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini
index 6f9c695380..2a920bf755 100644
--- a/firmware/console/binary/generated/data_logs.ini
+++ b/firmware/console/binary/generated/data_logs.ini
@@ -32,7 +32,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -189,8 +189,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -295,7 +295,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini
index 13c21faf08..4e5b688585 100644
--- a/firmware/console/binary/generated/gauges.ini
+++ b/firmware/console/binary/generated/gauges.ini
@@ -43,7 +43,7 @@ TPSValueGauge = TPSValue,"TPS", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2
 throttlePedalPositionGauge = throttlePedalPosition,"Throttle pedal position", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2
 tpsADCGauge = tpsADC,"tpsADC", "ADC", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
 rawMafGauge = rawMaf,"rawMaf", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3
-mafMeasuredGauge = mafMeasured,"MAF sensor", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1
+mafMeasuredGauge = mafMeasured,"MAF", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1
 MAPValueGauge = MAPValue,"MAP", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1
 baroPressureGauge = baroPressure,"baroPressure", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1
 lambdaValueGauge = lambdaValue,"Lambda", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3
@@ -230,8 +230,8 @@ tcRatioGauge = tcRatio,"Torque Converter Ratio", "value", 0.0,0.0, 0.0,0.0, 0.0,
 lastShiftTimeGauge = lastShiftTime,"lastShiftTime", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0
 vssEdgeCounterGauge = vssEdgeCounter,"vssEdgeCounter", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0
 issEdgeCounterGauge = issEdgeCounter,"issEdgeCounter", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0
-auxLinear1Gauge = auxLinear1,"Aux Linear 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2
-auxLinear2Gauge = auxLinear2,"Aux Linear 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2
+auxLinear1Gauge = auxLinear1,"Aux Linear #1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2
+auxLinear2Gauge = auxLinear2,"Aux Linear #2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2
 dfcoActiveGauge = dfcoActive,"dfcoActive", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0
 tpsAccelActiveGauge = tpsAccelActive,"tpsAccelActive", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0
 unusedBit_207_2Gauge = unusedBit_207_2,"unusedBit_207_2", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0
@@ -374,7 +374,7 @@ mapFastGauge = mapFast,"mapFast", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0
 luaGauges1Gauge = luaGauges1,"luaGauges 1", "value", 0.0,50000.0, 0.0,50000.0, 0.0,50000.0, 3,3
 luaGauges2Gauge = luaGauges2,"luaGauges 2", "value", 0.0,50000.0, 0.0,50000.0, 0.0,50000.0, 3,3
 rawMaf2Gauge = rawMaf2,"rawMaf2", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3
-mafMeasured2Gauge = mafMeasured2,"MAF sensor 2", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1
+mafMeasured2Gauge = mafMeasured2,"MAF #2", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1
 unusedAtTheEnd1Gauge = unusedAtTheEnd1,"unusedAtTheEnd 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
 unusedAtTheEnd2Gauge = unusedAtTheEnd2,"unusedAtTheEnd 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
 unusedAtTheEnd3Gauge = unusedAtTheEnd3,"unusedAtTheEnd 3", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java
index 9fa7bf46a4..d1870cb754 100644
--- a/firmware/console/binary/generated/sensors.java
+++ b/firmware/console/binary/generated/sensors.java
@@ -11,7 +11,7 @@ TPSValue("TPS", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 20, 0.01, 0.0, 0.
 throttlePedalPosition("Throttle pedal position", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 22, 0.01, 0.0, 0.0, "%"),
 tpsADC("tpsADC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 24, 1.0, 0.0, 0.0, "ADC"),
 rawMaf("rawMaf", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 26, 0.001, 0.0, 5.0, "V"),
-mafMeasured("MAF sensor", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 28, 0.1, 0.0, 0.0, "kg/h"),
+mafMeasured("MAF", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 28, 0.1, 0.0, 0.0, "kg/h"),
 MAPValue("MAP", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 30, 0.03333333333333333, 0.0, 0.0, "kPa"),
 baroPressure("baroPressure", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 32, 0.03333333333333333, 0.0, 0.0, "kPa"),
 lambdaValue("Lambda", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 34, 1.0E-4, 0.0, 0.0, ""),
@@ -166,8 +166,8 @@ tcRatio("Torque Converter Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT16,
 lastShiftTime("lastShiftTime", SensorCategory.SENSOR_INPUTS, FieldType.INT, 344, 1.0, -1.0, -1.0, ""),
 vssEdgeCounter("vssEdgeCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 348, 1.0, -1.0, -1.0, ""),
 issEdgeCounter("issEdgeCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 352, 1.0, -1.0, -1.0, ""),
-auxLinear1("Aux Linear 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 356, 0.01, 0.0, 0.0, ""),
-auxLinear2("Aux Linear 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 358, 0.01, 0.0, 0.0, ""),
+auxLinear1("Aux Linear #1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 356, 0.01, 0.0, 0.0, ""),
+auxLinear2("Aux Linear #2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 358, 0.01, 0.0, 0.0, ""),
 boostControllerOutput("Boost Output", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 364, 0.5, 0.0, 100.0, "%"),
 boostControllerOpenLoopPart("Boost Open Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 365, 0.5, 0.0, 100.0, "%"),
 fallbackMap("fallbackMap", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 366, 0.1, 0.0, 1000.0, "kPa"),
@@ -230,7 +230,7 @@ mapFast("mapFast", SensorCategory.SENSOR_INPUTS, FieldType.INT, 592, 1.0, -1.0,
 luaGauges1("luaGauges 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 596, 1.0, 0.0, 50000.0, "value"),
 luaGauges2("luaGauges 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 600, 1.0, 0.0, 50000.0, "value"),
 rawMaf2("rawMaf2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 604, 0.001, 0.0, 5.0, "V"),
-mafMeasured2("MAF sensor 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 606, 0.1, 0.0, 0.0, "kg/h"),
+mafMeasured2("MAF #2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 606, 0.1, 0.0, 0.0, "kg/h"),
 unusedAtTheEnd1("unusedAtTheEnd 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 608, 1.0, 0.0, 0.0, ""),
 unusedAtTheEnd2("unusedAtTheEnd 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 609, 1.0, 0.0, 0.0, ""),
 unusedAtTheEnd3("unusedAtTheEnd 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 610, 1.0, 0.0, 0.0, ""),
diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h
index a3ae7abb3f..1d0659020c 100644
--- a/firmware/console/binary_log/log_fields_generated.h
+++ b/firmware/console/binary_log/log_fields_generated.h
@@ -13,7 +13,7 @@ static constexpr LogField fields[] = {
 	{engine->outputChannels.throttlePedalPosition, "Throttle pedal position", "%", 2},
 	{engine->outputChannels.tpsADC, "tpsADC", "ADC", 0},
 	{engine->outputChannels.rawMaf, "rawMaf", "V", 3},
-	{engine->outputChannels.mafMeasured, "MAF sensor", "kg/h", 1},
+	{engine->outputChannels.mafMeasured, "MAF", "kg/h", 1},
 	{engine->outputChannels.MAPValue, "MAP", "kPa", 1},
 	{engine->outputChannels.baroPressure, "baroPressure", "kPa", 1},
 	{engine->outputChannels.lambdaValue, "Lambda", "", 3},
@@ -168,8 +168,8 @@ static constexpr LogField fields[] = {
 	{engine->outputChannels.lastShiftTime, "lastShiftTime", "", 0},
 	{engine->outputChannels.vssEdgeCounter, "vssEdgeCounter", "", 0},
 	{engine->outputChannels.issEdgeCounter, "issEdgeCounter", "", 0},
-	{engine->outputChannels.auxLinear1, "Aux Linear 1", "", 2},
-	{engine->outputChannels.auxLinear2, "Aux Linear 2", "", 2},
+	{engine->outputChannels.auxLinear1, "Aux Linear #1", "", 2},
+	{engine->outputChannels.auxLinear2, "Aux Linear #2", "", 2},
 	{engine->outputChannels.boostControllerOutput, "Boost Output", "%", 1},
 	{engine->outputChannels.boostControllerOpenLoopPart, "Boost Open Loop", "%", 1},
 	{engine->outputChannels.fallbackMap, "fallbackMap", "kPa", 1},
@@ -248,7 +248,7 @@ static constexpr LogField fields[] = {
 	{engine->outputChannels.luaGauges[0], "luaGauges 1", "value", 3},
 	{engine->outputChannels.luaGauges[1], "luaGauges 2", "value", 3},
 	{engine->outputChannels.rawMaf2, "rawMaf2", "V", 3},
-	{engine->outputChannels.mafMeasured2, "MAF sensor 2", "kg/h", 1},
+	{engine->outputChannels.mafMeasured2, "MAF #2", "kg/h", 1},
 	{engine->engineState.lua.fuelAdd, "lua.fuelAdd", "", 0},
 	{engine->engineState.lua.fuelMult, "lua.fuelMult", "", 0},
 	{engine->engineState.sd.tCharge, "speed density", "", 0},
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index 7b8dc4b418..26d8bfd5bd 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -391,11 +391,11 @@
 #define GAUGE_NAME_AFR "Air/Fuel Ratio"
 #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2"
 #define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate"
-#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor"
-#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF sensor 2"
+#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF"
+#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF #2"
 #define GAUGE_NAME_AIR_MASS "air mass"
-#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear 1"
-#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear 2"
+#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear #1"
+#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear #2"
 #define GAUGE_NAME_AUX_TEMP1 "Aux temp 1"
 #define GAUGE_NAME_AUX_TEMP2 "Aux temp 2"
 #define GAUGE_NAME_BARO_PRESSURE "Barometric pressure"
@@ -1026,7 +1026,7 @@
 #define SENT_INPUT_COUNT 1
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH snap_41091
+#define SIGNATURE_HASH snap_8981
 #define specs_s_size 12
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@@ -1298,7 +1298,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI 2022.11.10.all.snap_41091"
+#define TS_SIGNATURE "rusEFI 2022.11.10.all.snap_8981"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h
index 683d853f97..51059182db 100644
--- a/firmware/controllers/generated/signature_48way.h
+++ b/firmware/controllers/generated/signature_48way.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_43212
-#define TS_SIGNATURE "rusEFI 2022.11.10.48way.snap_43212"
+#define SIGNATURE_HASH snap_11098
+#define TS_SIGNATURE "rusEFI 2022.11.10.48way.snap_11098"
diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h
index 610f15d420..875f8668e3 100644
--- a/firmware/controllers/generated/signature_all.h
+++ b/firmware/controllers/generated/signature_all.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_41091
-#define TS_SIGNATURE "rusEFI 2022.11.10.all.snap_41091"
+#define SIGNATURE_HASH snap_8981
+#define TS_SIGNATURE "rusEFI 2022.11.10.all.snap_8981"
diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h
index 44afdb24a9..0389f6071d 100644
--- a/firmware/controllers/generated/signature_alphax-2chan.h
+++ b/firmware/controllers/generated/signature_alphax-2chan.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_15855
-#define TS_SIGNATURE "rusEFI 2022.11.10.alphax-2chan.snap_15855"
+#define SIGNATURE_HASH snap_48761
+#define TS_SIGNATURE "rusEFI 2022.11.10.alphax-2chan.snap_48761"
diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h
index 0da219e173..1ca72003d1 100644
--- a/firmware/controllers/generated/signature_alphax-4chan.h
+++ b/firmware/controllers/generated/signature_alphax-4chan.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_25356
-#define TS_SIGNATURE "rusEFI 2022.11.10.alphax-4chan.snap_25356"
+#define SIGNATURE_HASH snap_57498
+#define TS_SIGNATURE "rusEFI 2022.11.10.alphax-4chan.snap_57498"
diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h
index edfe867af1..a2dc32b502 100644
--- a/firmware/controllers/generated/signature_atlas.h
+++ b/firmware/controllers/generated/signature_atlas.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_21924
-#define TS_SIGNATURE "rusEFI 2022.11.10.atlas.snap_21924"
+#define SIGNATURE_HASH snap_54834
+#define TS_SIGNATURE "rusEFI 2022.11.10.atlas.snap_54834"
diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h
index 50d7e312f8..2f77766820 100644
--- a/firmware/controllers/generated/signature_core8.h
+++ b/firmware/controllers/generated/signature_core8.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_61818
-#define TS_SIGNATURE "rusEFI 2022.11.10.core8.snap_61818"
+#define SIGNATURE_HASH snap_29420
+#define TS_SIGNATURE "rusEFI 2022.11.10.core8.snap_29420"
diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h
index be5e4311b6..a435e5c8c9 100644
--- a/firmware/controllers/generated/signature_cypress.h
+++ b/firmware/controllers/generated/signature_cypress.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_41091
-#define TS_SIGNATURE "rusEFI 2022.11.10.cypress.snap_41091"
+#define SIGNATURE_HASH snap_8981
+#define TS_SIGNATURE "rusEFI 2022.11.10.cypress.snap_8981"
diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h
index 9a7b196b36..ac629a48b4 100644
--- a/firmware/controllers/generated/signature_f407-discovery.h
+++ b/firmware/controllers/generated/signature_f407-discovery.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_41091
-#define TS_SIGNATURE "rusEFI 2022.11.10.f407-discovery.snap_41091"
+#define SIGNATURE_HASH snap_8981
+#define TS_SIGNATURE "rusEFI 2022.11.10.f407-discovery.snap_8981"
diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h
index a448eab6f1..7f26221fe1 100644
--- a/firmware/controllers/generated/signature_f429-discovery.h
+++ b/firmware/controllers/generated/signature_f429-discovery.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_41091
-#define TS_SIGNATURE "rusEFI 2022.11.10.f429-discovery.snap_41091"
+#define SIGNATURE_HASH snap_8981
+#define TS_SIGNATURE "rusEFI 2022.11.10.f429-discovery.snap_8981"
diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h
index 5a4e39dbed..88a0f799cd 100644
--- a/firmware/controllers/generated/signature_frankenso_na6.h
+++ b/firmware/controllers/generated/signature_frankenso_na6.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_23623
-#define TS_SIGNATURE "rusEFI 2022.11.10.frankenso_na6.snap_23623"
+#define SIGNATURE_HASH snap_57297
+#define TS_SIGNATURE "rusEFI 2022.11.10.frankenso_na6.snap_57297"
diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h
index 1dc7ef131b..370face486 100644
--- a/firmware/controllers/generated/signature_harley81.h
+++ b/firmware/controllers/generated/signature_harley81.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_42412
-#define TS_SIGNATURE "rusEFI 2022.11.10.harley81.snap_42412"
+#define SIGNATURE_HASH snap_9786
+#define TS_SIGNATURE "rusEFI 2022.11.10.harley81.snap_9786"
diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h
index 645f100f1a..5baa3d573d 100644
--- a/firmware/controllers/generated/signature_hellen-gm-e67.h
+++ b/firmware/controllers/generated/signature_hellen-gm-e67.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_50055
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen-gm-e67.snap_50055"
+#define SIGNATURE_HASH snap_16401
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen-gm-e67.snap_16401"
diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h
index 9c59b0dd85..1a5d385ecb 100644
--- a/firmware/controllers/generated/signature_hellen-nb1.h
+++ b/firmware/controllers/generated/signature_hellen-nb1.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_37199
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen-nb1.snap_37199"
+#define SIGNATURE_HASH snap_4825
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen-nb1.snap_4825"
diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h
index 4fa160ccdd..7f7e132068 100644
--- a/firmware/controllers/generated/signature_hellen121nissan.h
+++ b/firmware/controllers/generated/signature_hellen121nissan.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_44543
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen121nissan.snap_44543"
+#define SIGNATURE_HASH snap_11881
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen121nissan.snap_11881"
diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h
index 1c43697ac2..271f5fcee7 100644
--- a/firmware/controllers/generated/signature_hellen121vag.h
+++ b/firmware/controllers/generated/signature_hellen121vag.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_25593
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen121vag.snap_25593"
+#define SIGNATURE_HASH snap_57455
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen121vag.snap_57455"
diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h
index f25563c774..a75580a795 100644
--- a/firmware/controllers/generated/signature_hellen128.h
+++ b/firmware/controllers/generated/signature_hellen128.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_56760
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen128.snap_56760"
+#define SIGNATURE_HASH snap_24110
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen128.snap_24110"
diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h
index 460e13d30b..d32e8c39be 100644
--- a/firmware/controllers/generated/signature_hellen154hyundai.h
+++ b/firmware/controllers/generated/signature_hellen154hyundai.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_39520
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen154hyundai.snap_39520"
+#define SIGNATURE_HASH snap_6646
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen154hyundai.snap_6646"
diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h
index 044c3d76f4..fb8c96a00b 100644
--- a/firmware/controllers/generated/signature_hellen72.h
+++ b/firmware/controllers/generated/signature_hellen72.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_44552
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen72.snap_44552"
+#define SIGNATURE_HASH snap_11678
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen72.snap_11678"
diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h
index 99c16ea47d..32564f6042 100644
--- a/firmware/controllers/generated/signature_hellen81.h
+++ b/firmware/controllers/generated/signature_hellen81.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_30857
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen81.snap_30857"
+#define SIGNATURE_HASH snap_64287
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen81.snap_64287"
diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h
index a3e06f899a..b09cc0b390 100644
--- a/firmware/controllers/generated/signature_hellen88bmw.h
+++ b/firmware/controllers/generated/signature_hellen88bmw.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_45903
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellen88bmw.snap_45903"
+#define SIGNATURE_HASH snap_12505
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellen88bmw.snap_12505"
diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h
index bf40408108..3ddb68ed91 100644
--- a/firmware/controllers/generated/signature_hellenNA6.h
+++ b/firmware/controllers/generated/signature_hellenNA6.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_4532
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellenNA6.snap_4532"
+#define SIGNATURE_HASH snap_37410
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellenNA6.snap_37410"
diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h
index f5e9739f32..493e4e8159 100644
--- a/firmware/controllers/generated/signature_hellenNA8_96.h
+++ b/firmware/controllers/generated/signature_hellenNA8_96.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_4459
-#define TS_SIGNATURE "rusEFI 2022.11.10.hellenNA8_96.snap_4459"
+#define SIGNATURE_HASH snap_37629
+#define TS_SIGNATURE "rusEFI 2022.11.10.hellenNA8_96.snap_37629"
diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h
index d0dcf5f91b..15fcb1de23 100644
--- a/firmware/controllers/generated/signature_kin.h
+++ b/firmware/controllers/generated/signature_kin.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_591
-#define TS_SIGNATURE "rusEFI 2022.11.10.kin.snap_591"
+#define SIGNATURE_HASH snap_33241
+#define TS_SIGNATURE "rusEFI 2022.11.10.kin.snap_33241"
diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h
index 11f0829350..b3baf62d29 100644
--- a/firmware/controllers/generated/signature_mre_f4.h
+++ b/firmware/controllers/generated/signature_mre_f4.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_51075
-#define TS_SIGNATURE "rusEFI 2022.11.10.mre_f4.snap_51075"
+#define SIGNATURE_HASH snap_17429
+#define TS_SIGNATURE "rusEFI 2022.11.10.mre_f4.snap_17429"
diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h
index 83b7bb7423..4f76294263 100644
--- a/firmware/controllers/generated/signature_mre_f7.h
+++ b/firmware/controllers/generated/signature_mre_f7.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_51075
-#define TS_SIGNATURE "rusEFI 2022.11.10.mre_f7.snap_51075"
+#define SIGNATURE_HASH snap_17429
+#define TS_SIGNATURE "rusEFI 2022.11.10.mre_f7.snap_17429"
diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h
index 60be80fe0a..ae26cc0b98 100644
--- a/firmware/controllers/generated/signature_prometheus_405.h
+++ b/firmware/controllers/generated/signature_prometheus_405.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_31077
-#define TS_SIGNATURE "rusEFI 2022.11.10.prometheus_405.snap_31077"
+#define SIGNATURE_HASH snap_64243
+#define TS_SIGNATURE "rusEFI 2022.11.10.prometheus_405.snap_64243"
diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h
index be93e9effc..4f8b8e066b 100644
--- a/firmware/controllers/generated/signature_prometheus_469.h
+++ b/firmware/controllers/generated/signature_prometheus_469.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_31077
-#define TS_SIGNATURE "rusEFI 2022.11.10.prometheus_469.snap_31077"
+#define SIGNATURE_HASH snap_64243
+#define TS_SIGNATURE "rusEFI 2022.11.10.prometheus_469.snap_64243"
diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h
index a98f3407a2..cbe2cc8694 100644
--- a/firmware/controllers/generated/signature_proteus_f4.h
+++ b/firmware/controllers/generated/signature_proteus_f4.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_26613
-#define TS_SIGNATURE "rusEFI 2022.11.10.proteus_f4.snap_26613"
+#define SIGNATURE_HASH snap_58467
+#define TS_SIGNATURE "rusEFI 2022.11.10.proteus_f4.snap_58467"
diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h
index 79f6a16ac8..99342b6526 100644
--- a/firmware/controllers/generated/signature_proteus_f7.h
+++ b/firmware/controllers/generated/signature_proteus_f7.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_26613
-#define TS_SIGNATURE "rusEFI 2022.11.10.proteus_f7.snap_26613"
+#define SIGNATURE_HASH snap_58467
+#define TS_SIGNATURE "rusEFI 2022.11.10.proteus_f7.snap_58467"
diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h
index cca836873b..ec035f76ee 100644
--- a/firmware/controllers/generated/signature_proteus_h7.h
+++ b/firmware/controllers/generated/signature_proteus_h7.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_26613
-#define TS_SIGNATURE "rusEFI 2022.11.10.proteus_h7.snap_26613"
+#define SIGNATURE_HASH snap_58467
+#define TS_SIGNATURE "rusEFI 2022.11.10.proteus_h7.snap_58467"
diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h
index 933c374bcc..a263cb42ee 100644
--- a/firmware/controllers/generated/signature_subaru_eg33_f7.h
+++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_31065
-#define TS_SIGNATURE "rusEFI 2022.11.10.subaru_eg33_f7.snap_31065"
+#define SIGNATURE_HASH snap_64207
+#define TS_SIGNATURE "rusEFI 2022.11.10.subaru_eg33_f7.snap_64207"
diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h
index 24e624fabb..793d66c4c5 100644
--- a/firmware/controllers/generated/signature_tdg-pdm8.h
+++ b/firmware/controllers/generated/signature_tdg-pdm8.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_28375
-#define TS_SIGNATURE "rusEFI 2022.11.10.tdg-pdm8.snap_28375"
+#define SIGNATURE_HASH snap_60737
+#define TS_SIGNATURE "rusEFI 2022.11.10.tdg-pdm8.snap_60737"
diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini
index 95cd71e41e..087dbcf104 100644
--- a/firmware/tunerstudio/generated/rusefi.ini
+++ b/firmware/tunerstudio/generated/rusefi.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.all.snap_41091"
+	signature	= "rusEFI 2022.11.10.all.snap_8981"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.all.snap_41091" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.all.snap_8981" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:23 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:45 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini
index 68e54a9134..2420e2fe18 100644
--- a/firmware/tunerstudio/generated/rusefi_48way.ini
+++ b/firmware/tunerstudio/generated/rusefi_48way.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.48way.snap_43212"
+	signature	= "rusEFI 2022.11.10.48way.snap_11098"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.48way.snap_43212" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.48way.snap_11098" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:02 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:23 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",41="Boost Controller Output (C7)",68=
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini
index b40223ad73..e2f4fede71 100644
--- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini
+++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.alphax-2chan.snap_15855"
+	signature	= "rusEFI 2022.11.10.alphax-2chan.snap_48761"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.alphax-2chan.snap_15855" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.alphax-2chan.snap_48761" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:30 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:15:47 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",40="A3 - Fuel Pump",41="A4 - Tachomet
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini
index ae905f9d53..704be2a3ec 100644
--- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini
+++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.alphax-4chan.snap_25356"
+	signature	= "rusEFI 2022.11.10.alphax-4chan.snap_57498"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.alphax-4chan.snap_25356" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.alphax-4chan.snap_57498" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:31 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:15:50 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",10="A3 - Fuel Pump",104="A4 - Tachome
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini
index 6bd6a1f5ee..0441e0d4f5 100644
--- a/firmware/tunerstudio/generated/rusefi_atlas.ini
+++ b/firmware/tunerstudio/generated/rusefi_atlas.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.atlas.snap_21924"
+	signature	= "rusEFI 2022.11.10.atlas.snap_54834"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.atlas.snap_21924" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.atlas.snap_54834" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:19 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:41 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini
index 8ff2072e92..b6575d70bd 100644
--- a/firmware/tunerstudio/generated/rusefi_core8.ini
+++ b/firmware/tunerstudio/generated/rusefi_core8.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.core8.snap_61818"
+	signature	= "rusEFI 2022.11.10.core8.snap_29420"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.core8.snap_61818" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.core8.snap_29420" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:00 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:21 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",26="DBW Control (B8)",27="DBW Directi
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini
index a50b5a758b..c31d0b2213 100644
--- a/firmware/tunerstudio/generated/rusefi_cypress.ini
+++ b/firmware/tunerstudio/generated/rusefi_cypress.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.cypress.snap_41091"
+	signature	= "rusEFI 2022.11.10.cypress.snap_8981"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.cypress.snap_41091" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.cypress.snap_8981" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 10 01:44:26 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Nov 10 20:15:43 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini
index adddfd2296..a28aeb025a 100644
--- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini
+++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.f407-discovery.snap_41091"
+	signature	= "rusEFI 2022.11.10.f407-discovery.snap_8981"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.f407-discovery.snap_41091" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.f407-discovery.snap_8981" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:16 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:37 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
index a33e359203..e2d9389240 100644
--- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
+++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.f429-discovery.snap_41091"
+	signature	= "rusEFI 2022.11.10.f429-discovery.snap_8981"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.f429-discovery.snap_41091" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.f429-discovery.snap_8981" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:18 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:39 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
index d39c6971f1..734530172d 100644
--- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
+++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.frankenso_na6.snap_23623"
+	signature	= "rusEFI 2022.11.10.frankenso_na6.snap_57297"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.frankenso_na6.snap_23623" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.frankenso_na6.snap_57297" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:04 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:25 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",43="Coil 1F",80="Coil 1G",41="Coil 1H
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini
index 61e74cc68f..9943a897d6 100644
--- a/firmware/tunerstudio/generated/rusefi_harley81.ini
+++ b/firmware/tunerstudio/generated/rusefi_harley81.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.harley81.snap_42412"
+	signature	= "rusEFI 2022.11.10.harley81.snap_9786"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.harley81.snap_42412" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.harley81.snap_9786" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:33 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:15:52 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",65="1 Right Oil Cooling",47="24 Front
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini
index 78ab8ac4e1..d7b71564ed 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen-gm-e67.snap_50055"
+	signature	= "rusEFI 2022.11.10.hellen-gm-e67.snap_16401"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen-gm-e67.snap_50055" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen-gm-e67.snap_16401" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:51 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:11 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",100="C1-12 Check Engine",52="C1-13 -
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
index 19d2d0072c..cfbf84dbba 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen-nb1.snap_37199"
+	signature	= "rusEFI 2022.11.10.hellen-nb1.snap_4825"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen-nb1.snap_37199" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen-nb1.snap_4825" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:49 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:09 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",102="1E - Check Engine Light",11="1I
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
index 3aef30beaa..683eed35d7 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen121nissan.snap_44543"
+	signature	= "rusEFI 2022.11.10.hellen121nissan.snap_11881"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen121nissan.snap_44543" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen121nissan.snap_11881" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 02:45:46 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:15:58 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",95="10 - VTC Left",103="104 ETB Relay
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
index 9affc10cf4..61286b5acc 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen121vag.snap_25593"
+	signature	= "rusEFI 2022.11.10.hellen121vag.snap_57455"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen121vag.snap_25593" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen121vag.snap_57455" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:37 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:15:56 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",35="101 - MAP2",138="102 - IGN_1",68=
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
index a81127ddb5..48487d453d 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen128.snap_56760"
+	signature	= "rusEFI 2022.11.10.hellen128.snap_24110"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen128.snap_56760" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen128.snap_24110" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:35 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:15:54 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",62="A6 - Fan Control",128="C21 - Evap
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
index be6f66c24e..6b57e382bf 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen154hyundai.snap_39520"
+	signature	= "rusEFI 2022.11.10.hellen154hyundai.snap_6646"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen154hyundai.snap_39520" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen154hyundai.snap_6646" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:41 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:00 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",53="Aux P66",11="Aux P67",103="Aux P6
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini
index a5b21fc3d6..3368720b22 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen72.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen72.snap_44552"
+	signature	= "rusEFI 2022.11.10.hellen72.snap_11678"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen72.snap_44552" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen72.snap_11678" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:45 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:04 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",105="2A - INJ_1",62="2B - ECF (PWM8)"
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini
index ad82c3a3db..c9dd43bad7 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen81.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen81.snap_30857"
+	signature	= "rusEFI 2022.11.10.hellen81.snap_64287"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen81.snap_30857" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen81.snap_64287" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:47 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:07 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",71="1 - IGN_2",65="10 - OUT_FUEL",127
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
index e52ef0a83d..e0795e2f7f 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellen88bmw.snap_45903"
+	signature	= "rusEFI 2022.11.10.hellen88bmw.snap_12505"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellen88bmw.snap_45903" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellen88bmw.snap_12505" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:43 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:02 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",112="1 - OUT_PUMP",62="2 - IdleC",69=
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
index ad7c9238c2..a3f4fbff48 100644
--- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellenNA6.snap_4532"
+	signature	= "rusEFI 2022.11.10.hellenNA6.snap_37410"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellenNA6.snap_4532" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellenNA6.snap_37410" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:53 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:13 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",107="1E - Check Engine Light",138="1G
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini
index 0b81882040..c9dab569da 100644
--- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.hellenNA8_96.snap_4459"
+	signature	= "rusEFI 2022.11.10.hellenNA8_96.snap_37629"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.hellenNA8_96.snap_4459" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.hellenNA8_96.snap_37629" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:55 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:15 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",62="1A - ECF",11="1B - AC Fan Relay",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini
index 6308b2a7c1..321096577b 100644
--- a/firmware/tunerstudio/generated/rusefi_kin.ini
+++ b/firmware/tunerstudio/generated/rusefi_kin.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.kin.snap_591"
+	signature	= "rusEFI 2022.11.10.kin.snap_33241"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.kin.snap_591" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.kin.snap_33241" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 10 01:44:24 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 10 20:15:42 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
index 235b85e590..39d70a5046 100644
--- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.mre_f4.snap_51075"
+	signature	= "rusEFI 2022.11.10.mre_f4.snap_17429"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.mre_f4.snap_51075" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.mre_f4.snap_17429" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:59 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:19 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",53="10 - Ignition 2",52="11 - Ignitio
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
index 96daedb227..49c68dd280 100644
--- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.mre_f7.snap_51075"
+	signature	= "rusEFI 2022.11.10.mre_f7.snap_17429"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.mre_f7.snap_51075" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.mre_f7.snap_17429" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:57 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:17 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",53="10 - Ignition 2",52="11 - Ignitio
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
index fef33375c8..e5065b82e5 100644
--- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.prometheus_405.snap_31077"
+	signature	= "rusEFI 2022.11.10.prometheus_405.snap_64243"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.prometheus_405.snap_31077" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.prometheus_405.snap_64243" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:08 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:29 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
index e93c797cc0..8cedde77b1 100644
--- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.prometheus_469.snap_31077"
+	signature	= "rusEFI 2022.11.10.prometheus_469.snap_64243"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.prometheus_469.snap_31077" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.prometheus_469.snap_64243" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:06 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:27 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3",
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
index 324a7aeee2..f1fbdaab4e 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.proteus_f4.snap_26613"
+	signature	= "rusEFI 2022.11.10.proteus_f4.snap_58467"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.proteus_f4.snap_26613" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.proteus_f4.snap_58467" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:12 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:33 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="H
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
index fc737df7d4..eb95008463 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.proteus_f7.snap_26613"
+	signature	= "rusEFI 2022.11.10.proteus_f7.snap_58467"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.proteus_f7.snap_26613" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.proteus_f7.snap_58467" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:10 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:31 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="H
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini
index 7220f87825..ae74cfb7b9 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.proteus_h7.snap_26613"
+	signature	= "rusEFI 2022.11.10.proteus_h7.snap_58467"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.proteus_h7.snap_26613" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.proteus_h7.snap_58467" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:14 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:35 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="H
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
index f09ffdfc01..29477c3cb0 100644
--- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.subaru_eg33_f7.snap_31065"
+	signature	= "rusEFI 2022.11.10.subaru_eg33_f7.snap_64207"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.subaru_eg33_f7.snap_31065" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.subaru_eg33_f7.snap_64207" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Nov 10 01:44:28 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Nov 10 20:15:45 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",186="A01 - Injector 5",194="A12 - Inj
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini
index c8684a8af2..9b4c9aa83c 100644
--- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini
+++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.10.tdg-pdm8.snap_28375"
+	signature	= "rusEFI 2022.11.10.tdg-pdm8.snap_60737"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.10.tdg-pdm8.snap_28375" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.10.tdg-pdm8.snap_60737" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -86,7 +86,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:21 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:43 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -388,7 +388,7 @@ acFanPin = bits, U16, 790, [0:7], 0="NONE",257="Out 1",258="Out 2",259="Out 3",2
 acFanPinMode = bits, U08, 792, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 l9779spiDevice = bits, U08, 793, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
 dwellVoltageCorrVoltBins = array, U08, 794, [8], "volts", 0.1, 0, 0, 20, 1
-imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
+imuType = bits, U08, 802, [0:4], "None", "VAG", "MM5.10", "type 3", "type 4"
 dwellVoltageCorrValues = array, U08, 803, [8], "multiplier", 0.02, 0, 0, 5, 2
 vehicleWeight = scalar, U16, 812, "kg", 1, 0, 0, 10000, 0
 idlePidRpmUpperLimit = scalar, S16, 814, "RPM", 1, 0, 0, 500, 0
@@ -3910,7 +3910,7 @@ gaugeCategory = Sensors - Basic
 	lambda2Gauge		= lambdaValue2, "Lambda 2",  "",		0.65,	1.2,		0.7,	0.75,		1.1,	1.15,	3,	2
 	VBattGauge		= VBatt,		"Battery",			"V",		8,	21,		9,	10,		17,	19,	1,	1
 	MAPGauge		= MAPValue,					"MAP",		"kPa",		0,	300,		10,	10,	200,	200,	0,	0
-	massAirFlowValueGa = mafMeasured, "MAF sensor",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
+	massAirFlowValueGa = mafMeasured, "MAF",		"kg/h",		0,	50,	-999,	-999,	999,	999,	1,	1
 
 gaugeCategory = Sensors - Extra 1
 	VSSGauge			= vehicleSpeedKph,		"Vehicle Speed",			"kmh",		0,	200,		0,		1,		3,	4,	1,	1
@@ -3927,8 +3927,8 @@ gaugeCategory = Sensors - Extra 1
 	AuxT2Gauge		= auxTemp2,	"Aux temp 2",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	lowFuelPressureGauge = lowFuelPressure, "Fuel pressure (low)", "kPa", 0, 700, 0, 0, 700, 700, 1, 0
 	flexPercentGauge = flexPercent, "Flex Ethanol %", "%", 0, 100, 0, 0, 100, 100, 0, 0
-	AuxL1Gauge		= auxLinear1,	"Aux Linear 1", "", -100, 100, -100, -100, 100, 100, 2, 2
-	AuxL2Gauge		= auxLinear2,	"Aux Linear 2", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL1Gauge		= auxLinear1,	"Aux Linear #1", "", -100, 100, -100, -100, 100, 100, 2, 2
+	AuxL2Gauge		= auxLinear2,	"Aux Linear #2", "", -100, 100, -100, -100, 100, 100, 2, 2
 
 gaugeCategory = VVT
 	vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1
@@ -4201,7 +4201,7 @@ entry = TPSValue, "TPS", float,  "%.3f"
 entry = throttlePedalPosition, "Throttle pedal position", float,  "%.3f"
 entry = tpsADC, "tpsADC", int,    "%d"
 entry = rawMaf, "rawMaf", float,  "%.3f"
-entry = mafMeasured, "MAF sensor", float,  "%.3f"
+entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
@@ -4358,8 +4358,8 @@ entry = tcRatio, "Torque Converter Ratio", float,  "%.3f"
 entry = lastShiftTime, "lastShiftTime", float,  "%.3f"
 entry = vssEdgeCounter, "vssEdgeCounter", int,    "%d"
 entry = issEdgeCounter, "issEdgeCounter", int,    "%d"
-entry = auxLinear1, "Aux Linear 1", float,  "%.3f"
-entry = auxLinear2, "Aux Linear 2", float,  "%.3f"
+entry = auxLinear1, "Aux Linear #1", float,  "%.3f"
+entry = auxLinear2, "Aux Linear #2", float,  "%.3f"
 entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
@@ -4464,7 +4464,7 @@ entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "luaGauges 1", float,  "%.3f"
 entry = luaGauges2, "luaGauges 2", float,  "%.3f"
 entry = rawMaf2, "rawMaf2", float,  "%.3f"
-entry = mafMeasured2, "MAF sensor 2", float,  "%.3f"
+entry = mafMeasured2, "MAF #2", float,  "%.3f"
 entry = m_knockRetard, "Knock Degrees retarded", float,  "%.3f"
 entry = m_knockThreshold, "m_knockThreshold", float,  "%.3f"
 entry = m_knockCount, "m_knockCount", int,    "%d"
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java
index 6fe8e00999..407b09eca7 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Tue Nov 01 20:59:53 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Thu Nov 10 20:15:40 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -114,11 +114,11 @@ public class AcControl {
 	public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
 	public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2";
 	public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF #2";
 	public static final String GAUGE_NAME_AIR_MASS = "air mass";
-	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1";
-	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2";
+	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear #1";
+	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear #2";
 	public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1";
 	public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2";
 	public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure";
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java
index fdf05b037b..128eb68976 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Tue Nov 01 20:59:53 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Thu Nov 10 20:15:40 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -114,11 +114,11 @@ public class BoostControl {
 	public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
 	public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2";
 	public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF #2";
 	public static final String GAUGE_NAME_AIR_MASS = "air mass";
-	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1";
-	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2";
+	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear #1";
+	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear #2";
 	public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1";
 	public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2";
 	public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure";
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java
index b5cdbdc37a..d263bb07fa 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sun Nov 06 00:27:04 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Nov 10 20:15:40 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -114,11 +114,11 @@ public class EngineState {
 	public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
 	public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2";
 	public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF #2";
 	public static final String GAUGE_NAME_AIR_MASS = "air mass";
-	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1";
-	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2";
+	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear #1";
+	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear #2";
 	public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1";
 	public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2";
 	public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure";
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
index 1eb896122e..8f242a5631 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 01:45:26 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 10 20:16:48 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -374,11 +374,11 @@ public class Fields {
 	public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
 	public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2";
 	public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF #2";
 	public static final String GAUGE_NAME_AIR_MASS = "air mass";
-	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1";
-	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2";
+	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear #1";
+	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear #2";
 	public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1";
 	public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2";
 	public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure";
@@ -1180,7 +1180,7 @@ public class Fields {
 	public static final int TS_RESPONSE_UNDERRUN = 0x80;
 	public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83;
 	public static final char TS_SET_LOGGER_SWITCH = 'l';
-	public static final String TS_SIGNATURE = "rusEFI 2022.11.10.all.snap_41091";
+	public static final String TS_SIGNATURE = "rusEFI 2022.11.10.all.snap_8981";
 	public static final char TS_SINGLE_WRITE_COMMAND = 'W';
 	public static final char TS_TEST_COMMAND = 't';
 	public static final int TS_TOTAL_OUTPUT_SIZE = 1256;
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java
index b46ca02dbf..fe27af1820 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sun Nov 06 00:27:04 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Thu Nov 10 20:15:40 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -114,11 +114,11 @@ public class FuelComputer {
 	public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
 	public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2";
 	public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF #2";
 	public static final String GAUGE_NAME_AIR_MASS = "air mass";
-	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1";
-	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2";
+	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear #1";
+	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear #2";
 	public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1";
 	public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2";
 	public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure";
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java
index 3d369729ec..08342b22ed 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Tue Nov 01 20:59:53 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Thu Nov 10 20:15:40 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -114,11 +114,11 @@ public class TriggerState {
 	public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
 	public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2";
 	public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF #2";
 	public static final String GAUGE_NAME_AIR_MASS = "air mass";
-	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1";
-	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2";
+	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear #1";
+	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear #2";
 	public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1";
 	public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2";
 	public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure";
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java
index 22b4439d19..29d9c6d7d4 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Tue Nov 01 20:59:53 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Thu Nov 10 20:15:40 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -114,11 +114,11 @@ public class TriggerStatePrimary {
 	public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
 	public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2";
 	public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF #2";
 	public static final String GAUGE_NAME_AIR_MASS = "air mass";
-	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1";
-	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2";
+	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear #1";
+	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear #2";
 	public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1";
 	public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2";
 	public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure";
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java
index 9196858e81..f3a629cb1e 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 06 00:27:04 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Nov 10 20:15:39 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -114,11 +114,11 @@ public class TsOutputs {
 	public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
 	public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2";
 	public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor";
-	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF";
+	public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF #2";
 	public static final String GAUGE_NAME_AIR_MASS = "air mass";
-	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1";
-	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2";
+	public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear #1";
+	public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear #2";
 	public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1";
 	public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2";
 	public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure";