diff --git a/interface/resources/controllers/hydra.json b/interface/resources/controllers/hydra.json
index 20d954932a..0cdeba1b8d 100644
--- a/interface/resources/controllers/hydra.json
+++ b/interface/resources/controllers/hydra.json
@@ -13,17 +13,11 @@
         { "from": "Hydra.RB", "to": "Standard.RB" }, 
         { "from": "Hydra.RS", "to": "Standard.RS" },
 
-        { "from": "Hydra.L0", "to": "Standard.Back" }, 
-        { "from": "Hydra.L1", "to": "Standard.DL" },
-        { "from": "Hydra.L2", "to": "Standard.DD" }, 
-        { "from": "Hydra.L3", "to": "Standard.DR" }, 
-        { "from": "Hydra.L4", "to": "Standard.DU" },
+        { "from": "Hydra.L1", "to": "Standard.LeftPrimaryThumb" },
+        { "from": "Hydra.L2", "to": "Standard.LeftSecondaryThumb" }, 
 
-        { "from": "Hydra.R0", "to": "Standard.Start" }, 
-        { "from": "Hydra.R1", "to": "Standard.X" },
-        { "from": "Hydra.R2", "to": "Standard.A" }, 
-        { "from": "Hydra.R3", "to": "Standard.B" }, 
-        { "from": "Hydra.R4", "to": "Standard.Y" },
+        { "from": "Hydra.R1", "to": "Standard.RightPrimaryThumb" },
+        { "from": "Hydra.R2", "to": "Standard.RightSecondaryThumb" }, 
 
         { "from": "Hydra.LeftHand", "to": "Standard.LeftHand" }, 
         { "from": "Hydra.RightHand", "to": "Standard.RightHand" }
diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index b08abcbaad..d312913a23 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -2,9 +2,8 @@
     "name": "Standard to Action",
     "channels": [
         { "from": "Standard.LY", "to": "Actions.TranslateZ" },
-        { "from": "Standard.LX", "to": "Actions.TranslateX" },
 
-        { "from": "Standard.RX",
+        { "from": "Standard.LX",
           "when": [ "Application.InHMD", "Application.ComfortMode" ],
           "to": "Actions.StepYaw",
           "filters":
@@ -14,8 +13,9 @@
             ]
         },
 
+        { "from": "Standard.LX", "to": "Actions.Yaw" },
 
-        { "from": "Standard.RX", "to": "Actions.Yaw" },
+        { "from": "Standard.RX", "to": "Actions.TranslateX" },
         { "from": "Standard.RY", "filters": "invert", "to": "Actions.TranslateY" },