diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index e23a0b49b3..991ac34b1e 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -258,21 +258,21 @@ enable2ndByteCanID = false
 	maintainConstantValue = tpsMin, { (calibrationMode == @@TsCalMode_Tps1Min@@ ) ? calibrationValue : tpsMin }
 
 	; TPS 1 Secondary
-	maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
-	maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
+	maintainConstantValue = tps1SecondaryMax, { (calibrationMode == @@TsCalMode_Tps1SecondaryMax@@ ) ? calibrationValue : tps1SecondaryMax }
+	maintainConstantValue = tps1SecondaryMin, { (calibrationMode == @@TsCalMode_Tps1SecondaryMin@@ ) ? calibrationValue : tps1SecondaryMin }
 
 	; TPS 2 Primary
-	maintainConstantValue = tps2Max, { (calibrationMode == 8 ) ? calibrationValue : tps2Max }
-	maintainConstantValue = tps2Min, { (calibrationMode == 9 ) ? calibrationValue : tps2Min }
+	maintainConstantValue = tps2Max, { (calibrationMode == @@TsCalMode_Tps2Max@@ ) ? calibrationValue : tps2Max }
+	maintainConstantValue = tps2Min, { (calibrationMode == @@TsCalMode_Tps2Min@@ ) ? calibrationValue : tps2Min }
 
 	; TPS 2 Secondary
 	maintainConstantValue = tps2SecondaryMax, { (calibrationMode == @@TsCalMode_Tps2SecondaryMax@@ ) ? calibrationValue : tps2SecondaryMax }
 	maintainConstantValue = tps2SecondaryMin, { (calibrationMode == @@TsCalMode_Tps2SecondaryMin@@ ) ? calibrationValue : tps2SecondaryMin }
 
 	; ETB Auto Gain Calibration
-	maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
-	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
-	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
+	maintainConstantValue = etb_pFactor, { (calibrationMode == @@TsCalMode_EtbKp@@ ) ? calibrationValue : etb_pFactor }
+	maintainConstantValue = etb_iFactor, { (calibrationMode == @@TsCalMode_EtbKi@@ ) ? calibrationValue : etb_iFactor }
+	maintainConstantValue = etb_dFactor, { (calibrationMode == @@TsCalMode_EtbKd@@ ) ? calibrationValue : etb_dFactor }
 
 	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == @@TsCalMode_PedalMin@@ ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == @@TsCalMode_PedalMin@@ ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }