diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs
index bda58ec7eb..edd54dd9b1 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs
@@ -47,7 +47,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 
         #region IJoystick
 
-        public JoystickType JoyType => JoystickType.SinclairPORT1;
+        public JoystickType JoyType => JoystickType.Cursor;
 
         public string[] ButtonCollection { get; set; }
 
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs
index a8773d0625..ba2d3ea467 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs
@@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 
         #region IJoystick
 
-        public JoystickType JoyType => JoystickType.None;
+        public JoystickType JoyType => JoystickType.NULL;
 
         public string[] ButtonCollection { get; set; }
 
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs
index 569f25b80d..a3789b9e5d 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs
@@ -47,7 +47,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 
         #region IJoystick
 
-        public JoystickType JoyType => JoystickType.SinclairPORT1;
+        public JoystickType JoyType => JoystickType.SinclairLEFT;
 
         public string[] ButtonCollection { get; set; }
 
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs
index 160ca0ea39..82d9fd9857 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs
@@ -47,7 +47,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 
         #region IJoystick
 
-        public JoystickType JoyType => JoystickType.SinclairPORT1;
+        public JoystickType JoyType => JoystickType.SinclairRIGHT;
 
         public string[] ButtonCollection { get; set; }
 
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
index 74ea1f645c..8a30b68040 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
@@ -186,11 +186,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
                     return new KempstonJoystick(this, playerNumber);
                 case JoystickType.Cursor:
                     return new CursorJoystick(this, playerNumber);
-                case JoystickType.SinclairPORT1:
+                case JoystickType.SinclairLEFT:
                     return new SinclairJoystick1(this, playerNumber);
-                case JoystickType.SinclairPORT2:
+                case JoystickType.SinclairRIGHT:
                     return new SinclairJoystick2(this, playerNumber);
-                case JoystickType.None:
+                case JoystickType.NULL:
                     return new NullJoystick(this, playerNumber);
             }
 
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs
index de59da486e..a59f03de9e 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs
@@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// <summary>
         /// The one ZX Hawk ControllerDefinition
         /// </summary>
-        public static ControllerDefinition ZXSpectrumControllerDefinition
+        public ControllerDefinition ZXSpectrumControllerDefinition
         {
             get
             {
@@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
                 foreach (var s in joys1)
                 {
                     definition.BoolButtons.Add(s);
-                    definition.CategoryLabels[s] = "Joystick 1";
+                    definition.CategoryLabels[s] = "J1 (" + ((ZXSpectrumSyncSettings)SyncSettings as ZXSpectrumSyncSettings).JoystickType1.ToString() + ")";
                 }
 
                 List<string> joys2 = new List<string>
@@ -42,7 +42,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
                 foreach (var s in joys2)
                 {
                     definition.BoolButtons.Add(s);
-                    definition.CategoryLabels[s] = "Joystick 2";
+                    definition.CategoryLabels[s] = "J2 (" + ((ZXSpectrumSyncSettings)SyncSettings as ZXSpectrumSyncSettings).JoystickType2.ToString() + ")";
                 }
 
                 List<string> joys3 = new List<string>
@@ -54,7 +54,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
                 foreach (var s in joys3)
                 {
                     definition.BoolButtons.Add(s);
-                    definition.CategoryLabels[s] = "Joystick 3";
+                    definition.CategoryLabels[s] = "J3 (" + ((ZXSpectrumSyncSettings)SyncSettings as ZXSpectrumSyncSettings).JoystickType3.ToString() + ")";
                 }
 
                 // keyboard
@@ -137,10 +137,10 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
     /// </summary>
     public enum JoystickType
     {
-        None,
+        NULL,
         Kempston,
-        SinclairPORT1,
-        SinclairPORT2,
+        SinclairLEFT,
+        SinclairRIGHT,
         Cursor
     }
 }
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs
index a55807663e..8ad6ab5b1e 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs
@@ -94,12 +94,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 
             [DisplayName("Joystick 2")]
             [Description("The emulated joystick assigned to P2 (SHOULD BE UNIQUE TYPE!)")]
-            [DefaultValue(JoystickType.SinclairPORT1)]
+            [DefaultValue(JoystickType.SinclairLEFT)]
             public JoystickType JoystickType2 { get; set; }
 
             [DisplayName("Joystick 3")]
             [Description("The emulated joystick assigned to P3 (SHOULD BE UNIQUE TYPE!)")]
-            [DefaultValue(JoystickType.SinclairPORT2)]
+            [DefaultValue(JoystickType.SinclairRIGHT)]
             public JoystickType JoystickType3 { get; set; }