diff --git a/firmware/integration/rusefi_template.xml b/firmware/integration/rusefi_template.xml
index 8af4d37b4d..e25a59125d 100644
--- a/firmware/integration/rusefi_template.xml
+++ b/firmware/integration/rusefi_template.xml
@@ -64,69 +64,69 @@
             </table>
         </table>
 
-        <table type="3D" name="FSIO Table #1" 
-        category="FSIO"
-        storageaddress="@@fsioTable1_offset_hex@@" sizex="@@FSIO_TABLE_8@@"
-               sizey="@@FSIO_TABLE_8@@" storagetype="float" endian="big">
+        <table type="3D" name="SCRIPT Table #1" 
+        category="SCRIPT"
+        storageaddress="@@scriptTable1_offset_hex@@" sizex="@@SCRIPT_TABLE_8@@"
+               sizey="@@SCRIPT_TABLE_8@@" storagetype="float" endian="big">
             <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                      coarseincrement="1"/>
-            <table type="X Axis" storageaddress="@@fsioTable1RpmBins_offset_hex@@" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="@@scriptTable1RpmBins_offset_hex@@" storagetype="float" endian="big"
                    logparam="">
                 <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                          coarseincrement="1"/>
             </table>
-            <table type="Y Axis" storageaddress="@@fsioTable1LoadBins_offset_hex@@" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="@@scriptTable1LoadBins_offset_hex@@" storagetype="float" endian="big"
                    logparam="rpm">
                 <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
             </table>
         </table>
 
-        <table type="3D" name="FSIO Table #2" 
-        category="FSIO"
-        storageaddress="@@fsioTable2_offset_hex@@" sizex="@@FSIO_TABLE_8@@"
-               sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
+        <table type="3D" name="SCRIPT Table #2" 
+        category="SCRIPT"
+        storageaddress="@@scriptTable2_offset_hex@@" sizex="@@SCRIPT_TABLE_8@@"
+               sizey="@@SCRIPT_TABLE_8@@" storagetype="uint8" endian="big">
             <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                      coarseincrement="1"/>
-            <table type="X Axis" storageaddress="@@fsioTable2RpmBins_offset_hex@@" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="@@scriptTable2RpmBins_offset_hex@@" storagetype="float" endian="big"
                    logparam="engine_load">
                 <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                          coarseincrement="1"/>
             </table>
-            <table type="Y Axis" storageaddress="@@fsioTable2LoadBins_offset_hex@@" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="@@scriptTable2LoadBins_offset_hex@@" storagetype="float" endian="big"
                    logparam="rpm">
                 <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
             </table>
         </table>
 
-        <table type="3D" name="FSIO Table #3" 
-        category="FSIO"
-        storageaddress="@@fsioTable3_offset_hex@@" sizex="@@FSIO_TABLE_8@@"
-               sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
+        <table type="3D" name="SCRIPT Table #3" 
+        category="SCRIPT"
+        storageaddress="@@scriptTable3_offset_hex@@" sizex="@@SCRIPT_TABLE_8@@"
+               sizey="@@SCRIPT_TABLE_8@@" storagetype="uint8" endian="big">
             <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                      coarseincrement="1"/>
-            <table type="X Axis" storageaddress="@@fsioTable3RpmBins_offset_hex@@" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="@@scriptTable3RpmBins_offset_hex@@" storagetype="float" endian="big"
                    logparam="">
                 <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                          coarseincrement="1"/>
             </table>
-            <table type="Y Axis" storageaddress="@@fsioTable3LoadBins_offset_hex@@" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="@@scriptTable3LoadBins_offset_hex@@" storagetype="float" endian="big"
                    logparam="rpm">
                 <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
             </table>
         </table>
 
-        <table type="3D" name="FSIO Table #4" 
-        category="FSIO"
-        storageaddress="@@fsioTable4_offset_hex@@" sizex="@@FSIO_TABLE_8@@"
-               sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
+        <table type="3D" name="SCRIPT Table #4" 
+        category="SCRIPT"
+        storageaddress="@@scriptTable4_offset_hex@@" sizex="@@SCRIPT_TABLE_8@@"
+               sizey="@@SCRIPT_TABLE_8@@" storagetype="uint8" endian="big">
             <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                      coarseincrement="1"/>
-            <table type="X Axis" storageaddress="@@fsioTable4RpmBins_offset_hex@@" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="@@scriptTable4RpmBins_offset_hex@@" storagetype="float" endian="big"
                    logparam="engine_load">
                 <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                          coarseincrement="1"/>
             </table>
-            <table type="Y Axis" storageaddress="@@fsioTable4LoadBins_offset_hex@@" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="@@scriptTable4LoadBins_offset_hex@@" storagetype="float" endian="big"
                    logparam="engine_load">
                 <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
             </table>
@@ -171,9 +171,9 @@
             </table>
         </table>
 
-        <table type="2D" name="FSIO Curve #1" storageaddress="@@scriptCurve1_offset_hex@@"
-        category="FSIO"
-               sizex="@@FSIO_CURVE_16@@" storagetype="float" endian="big">
+        <table type="2D" name="SCRIPT Curve #1" storageaddress="@@scriptCurve1_offset_hex@@"
+        category="SCRIPT"
+               sizex="@@SCRIPT_CURVE_16@@" storagetype="float" endian="big">
             <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
                      fineincrement=".01" coarseincrement="0.1"/>
             <table type="X Axis" storageaddress="@@scriptCurve1Bins_offset_hex@@" storagetype="float" endian="big">
@@ -181,9 +181,9 @@
             </table>
         </table>
 
-        <table type="2D" name="FSIO Curve #2" storageaddress="@@scriptCurve2_offset_hex@@"
-        category="FSIO"
-               sizex="@@FSIO_CURVE_16@@" storagetype="float" endian="big">
+        <table type="2D" name="SCRIPT Curve #2" storageaddress="@@scriptCurve2_offset_hex@@"
+        category="SCRIPT"
+               sizex="@@SCRIPT_CURVE_16@@" storagetype="float" endian="big">
             <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
                      fineincrement=".01" coarseincrement="0.1"/>
             <table type="X Axis" storageaddress="@@scriptCurve2Bins_offset_hex@@" storagetype="float" endian="big">
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 8122c681cb..b31d1deb60 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -886,25 +886,25 @@ enable2ndByteCanID = false
       zBins       = vvtTable2
 
       
-   table = fsioTable1Tbl,  fsioTable1Map,  "FSIO Table #1",   1
-      xBins       = fsioTable1RpmBins,  RPMValue
-      yBins       = fsioTable1LoadBins,  fuelingLoad
-      zBins       = fsioTable1
+   table = scriptTable1Tbl,  scriptTable1Map,  "FSIO Table #1",   1
+      xBins       = scriptTable1RpmBins,  RPMValue
+      yBins       = scriptTable1LoadBins,  fuelingLoad
+      zBins       = scriptTable1
 
-   table = fsioTable2Tbl,  fsioTable2Map,  "FSIO Table #2",   1
-      xBins       = fsioTable2RpmBins,  RPMValue
-      yBins       = fsioTable2LoadBins,  fuelingLoad
-      zBins       = fsioTable2
+   table = scriptTable2Tbl,  scriptTable2Map,  "FSIO Table #2",   1
+      xBins       = scriptTable2RpmBins,  RPMValue
+      yBins       = scriptTable2LoadBins,  fuelingLoad
+      zBins       = scriptTable2
 
-   table = fsioTable3Tbl,  fsioTable3Map,  "FSIO Table #3",   1
-      xBins       = fsioTable3RpmBins,  RPMValue
-      yBins       = fsioTable3LoadBins,  fuelingLoad
-      zBins       = fsioTable3
+   table = scriptTable3Tbl,  scriptTable3Map,  "FSIO Table #3",   1
+      xBins       = scriptTable3RpmBins,  RPMValue
+      yBins       = scriptTable3LoadBins,  fuelingLoad
+      zBins       = scriptTable3
 
-   table = fsioTable4Tbl,  fsioTable4Map,  "FSIO Table #4",   1
-      xBins       = fsioTable4RpmBins,  RPMValue
-      yBins       = fsioTable4LoadBins,  fuelingLoad
-      zBins       = fsioTable4
+   table = scriptTable4Tbl,  scriptTable4Map,  "FSIO Table #4",   1
+      xBins       = scriptTable4RpmBins,  RPMValue
+      yBins       = scriptTable4LoadBins,  fuelingLoad
+      zBins       = scriptTable4
 
    table = baroCorrTbl,  baroCorrMap,  "Baro Correction",   1
       ;       constant, variable
@@ -1599,10 +1599,10 @@ menuDialog = main
 		subMenu = scriptSetting,        "Lua Script Settings"
 
 		subMenu = std_separator
-		subMenu = fsioTable1TblSettings,			"Script Table #1"
-		subMenu = fsioTable2TblSettings,			"Script Table #2"
-		subMenu = fsioTable3TblSettings,			"Script Table #3"
-		subMenu = fsioTable4TblSettings,			"Script Table #4"
+		subMenu = scriptTable1TblSettings,			"Script Table #1"
+		subMenu = scriptTable2TblSettings,			"Script Table #2"
+		subMenu = scriptTable3TblSettings,			"Script Table #3"
+		subMenu = scriptTable4TblSettings,			"Script Table #4"
 		subMenu = scriptCurve1Settings,	            "Script Curve #1"
 		subMenu = scriptCurve2Settings,			    "Script Curve #2"
 		subMenu = scriptCurve3Settings,			    "Script Curve #3"
@@ -1895,21 +1895,21 @@ cmd_set_engine_type_8888_test				= "@@TS_IO_TEST_COMMAND_char@@\x00\x30\x00\x3B"
 cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		
 [UserDefined]
-	dialog = fsioTable1TblSettings, "", yAxis
+	dialog = scriptTable1TblSettings, "", yAxis
 	    field = "Name", scriptTableName1
-		panel = fsioTable1Tbl
+		panel = scriptTable1Tbl
 
-	dialog = fsioTable2TblSettings, "", yAxis
+	dialog = scriptTable2TblSettings, "", yAxis
 	    field = "Name", scriptTableName2
-		panel = fsioTable2Tbl
+		panel = scriptTable2Tbl
 
-	dialog = fsioTable3TblSettings, "", yAxis
+	dialog = scriptTable3TblSettings, "", yAxis
 	    field = "Name", scriptTableName3
-		panel = fsioTable3Tbl
+		panel = scriptTable3Tbl
 
-	dialog = fsioTable4TblSettings, "", yAxis
+	dialog = scriptTable4TblSettings, "", yAxis
 	    field = "Name", scriptTableName4
-		panel = fsioTable4Tbl
+		panel = scriptTable4Tbl
 
 	dialog = scriptCurve1Settings, "", yAxis
 	    field = "Name", scriptCurveName1
@@ -3804,7 +3804,7 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		field = "Warning Message",                      warning_message
 		field = "Ford redundant TPS mode",				useFordRedundantTps
 		field = "consumeObdSensors",                    consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1}
-		field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering
+		field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering
 		field = "turbo speed sensor",                   turboSpeedSensorInputPin
 		field = "turbo speed multiplier",               turboSpeedSensorMultiplier
 		field = "Artificial Misfire",                   artificialTestMisfire