diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
index ae54a331c1..a3755d4871 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
@@ -126,9 +126,8 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new TargetedPairSchema(14, 17)
+					new TargetedPairSchema(14, 17, $"P{controller} VPos")
 					{
-						Name = $"P{controller} VPos",
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]
 						{
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
index b13ed52988..ec3820e6e3 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
@@ -29,7 +29,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 		}
 
-		public string Name { get; set; }
+		public string Name { get; protected set; }
 		public string DisplayName { get; set; }
 		public PadInputType Type { get; protected set; } = PadInputType.Boolean;
 		public Point Location { get; protected set; }
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
index 23493c5fed..1717e2eb94 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
@@ -157,9 +157,8 @@ namespace BizHawk.Client.EmuHawk
 					{
 						DisplayName = "Z"
 					},
-					new AnalogSchema(6, 74)
+					new AnalogSchema(6, 74, $"P{controller} Stick Horizontal")
 					{
-						Name = $"P{controller} Stick Horizontal",
 						SecondaryNames = new[] { $"P{controller} Stick Vertical" },
 						AxisRange = axisRanges[0],
 						SecondaryAxisRange = axisRanges[1],
@@ -308,9 +307,8 @@ namespace BizHawk.Client.EmuHawk
 					{
 						DisplayName = "C"
 					},
-					new AnalogSchema(185, 13)
+					new AnalogSchema(185, 13, $"P{controller} Stick Horizontal")
 					{
-						Name = $"P{controller} Stick Horizontal",
 						SecondaryNames = new[] { $"P{controller} Stick Vertical" },
 						AxisRange = axisRanges[0],
 						SecondaryAxisRange = axisRanges[1]
@@ -336,9 +334,8 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(680, 230),
 				Buttons = new ButtonSchema[]
 				{
-					new AnalogSchema(58, 13)
+					new AnalogSchema(58, 13, $"P{controller} Left Stick Horizontal")
 					{
-						Name = $"P{controller} Left Stick Horizontal",
 						SecondaryNames = new[] { $"P{controller} Left Stick Vertical" },
 						AxisRange = axisRanges[3],
 						SecondaryAxisRange = axisRanges[4]
@@ -351,9 +348,8 @@ namespace BizHawk.Client.EmuHawk
 						MaxValue = 255,
 						Orientation = Orientation.Vertical
 					},
-					new AnalogSchema(400, 13)
+					new AnalogSchema(400, 13, $"P{controller} Right Stick Horizontal")
 					{
-						Name = $"P{controller} Right Stick Horizontal",
 						SecondaryNames = new[] { $"P{controller} Right Stick Vertical" },
 						AxisRange = axisRanges[0],
 						SecondaryAxisRange = axisRanges[1]