diff --git a/BizHawk.MultiClient/output/defctrl.json b/BizHawk.MultiClient/output/defctrl.json
index d2d1f2c416..2ae8a39806 100644
--- a/BizHawk.MultiClient/output/defctrl.json
+++ b/BizHawk.MultiClient/output/defctrl.json
@@ -7,8 +7,8 @@
       "P1 Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight",    
       "P1 Start": "Return, J1 B10, X1 Start",
 	  "P1 Select": "Space, J1 B9, X1 Back",
-      "P1 B": "X, X1 B",
-      "P1 A": "Z, X1 A",
+      "P1 B": "X, X1 A",
+      "P1 A": "Z, X1 B",
       "P2 Up": "",
       "P2 Down": "",
       "P2 Left": "",
@@ -31,8 +31,8 @@
       "P1 Start": "Return, J10, X1 Start",
       "P1 Y": "A, J1 B1, X1 X",
       "P1 X": "S, J1 B4, X1 Y",
-      "P1 B": "X, J1 B2, X1 B",
-      "P1 A": "Z, J1 B3, X1 A",
+      "P1 B": "X, J1 B2, X1 A",
+      "P1 A": "Z, J1 B3, X1 B",
       "P1 L": "W, J1 B5, X1 Left Trigger",
       "P1 R": "E, J1 B6, X1 Right Trigger",
       "P2 Up": "",
@@ -161,8 +161,8 @@
       "Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight",
       "Start": "Return, J1 B10, X1 Start",
       "Select": "Space, J1 B9, X1 Back",
-      "B": "Z, J1 B1, X1 B",
-      "A": "X, J1 B2, X1 A",
+      "B": "Z, J1 B1, X1 A",
+      "A": "X, J1 B2, X1 B",
       "Power": ""
     },
     "GBAController": {
@@ -172,8 +172,8 @@
       "Right": "RightArrow, J1 POV1R, X1 DpadRight, X1 LStickRight",
       "Start": "Return, J1 B10, X1 Start",
       "Select": "Space, J1 B9, X1 Back",
-      "B": "Z, X1 B",
-      "A": "X, X1 A",
+      "B": "Z, X1 A",
+      "A": "X, X1 B",
       "L": "W, J1 B5, X1 LeftTrigger",
       "R": "E, J1 B6, X1 RightTrigger",
       "Power": ""