diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp
index 18ddc38080..ffb5a89a65 100644
--- a/firmware/config/engines/ford_festiva.cpp
+++ b/firmware/config/engines/ford_festiva.cpp
@@ -230,7 +230,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
 	 * set_fsio_setting 0 5000
 	 */
 	boardConfiguration->fsio_setting[0] = 5000;
-	// set_fsio_expression 1 "rpm 0 fsio_setting >"
+	// set_rpn_expression 1 "rpm 0 fsio_setting >"
 	setFsioExt(0, GPIOE_3, "rpm 0 fsio_setting >", 150 PASS_ENGINE_PARAMETER);
 
 
@@ -241,7 +241,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
 	 * set_fsio_setting 2 95
 	 * set_fsio_setting 3 14
 	 *
-	 * set_fsio_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
+	 * set_rpn_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
 	 * eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
 	 */
 	boardConfiguration->fsio_setting[1] = 6200; // RPM threshold
diff --git a/firmware/config/engines/lada_kalina.cpp b/firmware/config/engines/lada_kalina.cpp
index a10f7b33e2..b6514ae631 100644
--- a/firmware/config/engines/lada_kalina.cpp
+++ b/firmware/config/engines/lada_kalina.cpp
@@ -55,7 +55,7 @@ void setLadaKalina(DECLARE_ENGINE_PARAMETER_F) {
 	 * set_fsio_setting 0 5000
 	 */
 	engineConfiguration->bc.fsio_setting[0] = 500;
-	// set_fsio_expression 1 "rpm 0 fsio_setting <"
+	// set_rpn_expression 1 "rpm 0 fsio_setting <"
 	setFsioExt(0, GPIOE_3, "rpm 0 fsio_setting <", 0 PASS_ENGINE_PARAMETER);
 
 }
diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp
index 6900e45250..5e54e310b4 100644
--- a/firmware/config/engines/mazda_miata_1_6.cpp
+++ b/firmware/config/engines/mazda_miata_1_6.cpp
@@ -171,8 +171,8 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
 	 * set_fsio_setting 1 95
 	 * set_fsio_setting 3 14
 	 *
-	 * set_fsio_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
-	 * eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
+	 * set_rpn_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
+	 * rpn_eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
 	 */
 	boardConfiguration->fsio_setting[0] = 6400; // RPM threshold
 	boardConfiguration->fsio_setting[1] = 100; // CLT threshold
@@ -183,11 +183,11 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
 	// set_fsio_setting 4 0.52
 	boardConfiguration->fsio_setting[4] = 0.52; // oil pressure threshold
 
-//	 * set_fsio_expression 1 "rpm 3 fsio_setting >"
-	// eval "rpm 3 fsio_setting >"
-	// eval "fsio_input"
+//	 * set_rpn_expression 1 "rpm 3 fsio_setting >"
+	// rpn_eval "rpm 3 fsio_setting >"
+	// rpn_eval "fsio_input"
 
-	// set_fsio_expression 0 "rpm 3 fsio_setting > fsio_input 4 fsio_setting < & rpm 0 fsio_setting | > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
+	// set_rpn_expression 0 "rpm 3 fsio_setting > fsio_input 4 fsio_setting < & rpm 0 fsio_setting | > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
 
 	setFsio(0, GPIOC_13, "rpm 3 fsio_setting > fsio_input 4 fsio_setting < & rpm 0 fsio_setting | > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" PASS_ENGINE_PARAMETER);
 
diff --git a/firmware/config/engines/mazda_miata_nb.cpp b/firmware/config/engines/mazda_miata_nb.cpp
index a251f3695c..d7a45bfbd3 100644
--- a/firmware/config/engines/mazda_miata_nb.cpp
+++ b/firmware/config/engines/mazda_miata_nb.cpp
@@ -87,6 +87,6 @@ void setMazdaMiataNb1EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 	 */
 	boardConfiguration->fsio_setting[0] = 5000;
 	// (self and (rpm > 4800)) OR (rpm > 5000)
-	// set_fsio_expression 1 "self rpm 4800 > & rpm 5000 > OR"
+	// set_rpn_expression 1 "self rpm 4800 > & rpm 5000 > OR"
 //	setFsioExt(0, GPIOE_3, "self rpm 4800 > & rpm 5000 > OR", 150 PASS_ENGINE_PARAMETER);
 }
diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp
index 18cd25e4a8..ce7a982ba2 100644
--- a/firmware/controllers/core/fsio_impl.cpp
+++ b/firmware/controllers/core/fsio_impl.cpp
@@ -461,7 +461,7 @@ static void setFsioExpression(const char *indexStr, const char *quotedLine, Engi
 #endif
 }
 
-static void eval(char *line, Engine *engine) {
+static void rpnEval(char *line, Engine *engine) {
 #if EFI_PROD_CODE || EFI_SIMULATOR
 	line = unquote(line);
 	scheduleMsg(logger, "Parsing [%s]", line);
@@ -471,7 +471,7 @@ static void eval(char *line, Engine *engine) {
 		scheduleMsg(logger, "parsing failed");
 	} else {
 		float result = evalCalc.getValue2(0, e, engine);
-		scheduleMsg(logger, "Eval result: %f", result);
+		scheduleMsg(logger, "Evaluate result: %f", result);
 	}
 #endif
 }
@@ -523,10 +523,10 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
 #endif /* EFI_PROD_CODE */
 
 #if EFI_PROD_CODE || EFI_SIMULATOR
-	addConsoleActionSSP("set_fsio_expression", (VoidCharPtrCharPtrVoidPtr) setFsioExpression, engine);
+	addConsoleActionSSP("set_rpn_expression", (VoidCharPtrCharPtrVoidPtr) setFsioExpression, engine);
 	addConsoleActionFF("set_fsio_setting", setFsioSetting);
 	addConsoleAction("fsioinfo", showFsioInfo);
-	addConsoleActionSP("eval", (VoidCharPtrVoidPtr) eval, engine);
+	addConsoleActionSP("rpn_eval", (VoidCharPtrVoidPtr) rpnEval, engine);
 #endif
 
 	fsioTable1.init(config->fsioTable1, config->fsioTable1LoadBins,