diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini
index 6ff6c94c70..3b0035171c 100644
--- a/firmware/tunerstudio/tunerstudio.template.ini
+++ b/firmware/tunerstudio/tunerstudio.template.ini
@@ -977,7 +977,7 @@ curve = 32Curve, "3-2 Shift Solenoid Percent by Speed"
 		gridOrient  = 250,	0, 340 ; Space 123 rotation of grid in degrees.
 		upDownLabel = "(RICHER)", "(LEANER)"
 
-	table = veTableTbl,  veTableMap,  "VE Table (Speed Density)",	1
+	table = veTableTbl,  veTableMap,  "Speed Density VE Table",	1
 		xyLabels = "RPM", "load"
 		xBins		= veRpmBins,  RPMValue
 		yBins		= veLoadBins, veTableYAxis
@@ -986,7 +986,7 @@ curve = 32Curve, "3-2 Shift Solenoid Percent by Speed"
 		gridOrient  = 250,	0, 340 ; Space 123 rotation of grid in degrees.
 		upDownLabel = "(RICHER)", "(LEANER)"
 
-	table = mafVeTableTbl,  mafVeTableMap,  "VE Table (MAF)",	1
+	table = mafVeTableTbl,  mafVeTableMap,  "MAF Trim Table",	1
 		xyLabels = "RPM", "load"
 		xBins		= mafVeRpmBins,  RPMValue
 		yBins		= mafVeLoadBins, veTableYAxis
@@ -995,7 +995,7 @@ curve = 32Curve, "3-2 Shift Solenoid Percent by Speed"
 		gridOrient  = 250,	0, 340 ; Space 123 rotation of grid in degrees.
 		upDownLabel = "(RICHER)", "(LEANER)"
 
-	table = alphanVeTableTbl,  alphanVeTableMap,  "VE Table (Alpha-N)",	1
+	table = alphanVeTableTbl,  alphanVeTableMap,  "Alpha-N VE Table",	1
 		xyLabels = "RPM", "load"
 		xBins		= alphanVeRpmBins,  RPMValue
 		yBins		= alphanVeLoadBins, veTableYAxis
@@ -1750,9 +1750,9 @@ menuDialog = main
 		subMenu = std_separator
 
 		# Air mass model
-		subMenu = veTableDialog,			"VE (SD)", 0, {isInjectionEnabled}
-		subMenu = mafVeTableTbl				"VE (MAF)", 0, {isInjectionEnabled}
-		subMenu = alphanVeTableTbl			"VE (AN)", 0, {isInjectionEnabled}
+		subMenu = veTableDialog,			"VE (Speed Density)", 0, {isInjectionEnabled && fuelAlgorithm == 0}
+		subMenu = mafVeTableTbl				"MAF Trim Table", 0, {isInjectionEnabled && fuelAlgorithm == 1}
+		subMenu = alphanVeTableTbl			"VE (Alpha-N)", 0, {isInjectionEnabled && fuelAlgorithm == 2}
 
 		groupMenu = "VE blend tables"
 		groupChildMenu = veBlend1Cfg,		"VE blend 1 bias", 0, {isInjectionEnabled}