diff --git a/P3D/Input/KeyBindings.vb b/P3D/Input/KeyBindings.vb
index a8b3541eb..96d7f7d8c 100644
--- a/P3D/Input/KeyBindings.vb
+++ b/P3D/Input/KeyBindings.vb
@@ -49,31 +49,31 @@ Public Class KeyBindings
                     key = key.Remove(key.Length - 1, 1)
 
                     Select Case key.ToLower()
-                        Case "forwardmove"
+                        Case "moveforward", "forwardmove"
                             ForwardMoveKey = binding
-                        Case "leftmove"
+                        Case "moveleft", "leftmove"
                             LeftMoveKey = binding
-                        Case "backwardmove"
+                        Case "movebackward", "backwardmove"
                             BackwardMoveKey = binding
-                        Case "rightmove"
+                        Case "moveright", "rightmove"
                             RightMoveKey = binding
                         Case "run"
                             RunKey = binding
-                        Case "inventory", "openmenu"
+                        Case "openmenu", "inventory"
                             OpenInventoryKey = binding
                         Case "chat"
                             ChatKey = binding
-                        Case "special", "pokegear"
+                        Case "special", "phone", "pokegear"
                             SpecialKey = binding
                         Case "muteaudio", "mutemusic"
                             MuteAudioKey = binding
-                        Case "cameraleft"
+                        Case "cameraleft", "left"
                             LeftKey = binding
-                        Case "cameraright"
+                        Case "cameraright", "right"
                             RightKey = binding
-                        Case "cameraup"
+                        Case "cameraup", "up"
                             UpKey = binding
-                        Case "cameradown"
+                        Case "cameradown", "down"
                             DownKey = binding
                         Case "cameralock"
                             CameraLockKey = binding
@@ -238,10 +238,10 @@ Public Class KeyBindings
     Public Shared Sub CreateKeySave(ByVal force As Boolean)
         If IO.Directory.Exists(GameController.GamePath & "\Save") = True Then
             If IO.File.Exists(GameController.GamePath & "\Save\Keyboard.dat") = False Or force = True Then
-                Dim s As String = "[ForwardMove]=W" & Environment.NewLine &
-                "[LeftMove]=" & GetKeyName(Keys.A) & Environment.NewLine &
-                "[BackwardMove]=" & GetKeyName(Keys.S) & Environment.NewLine &
-                "[RightMove]=" & GetKeyName(Keys.D) & Environment.NewLine &
+                Dim s As String = "[MoveForward]=" & GetKeyName(Keys.W) & Environment.NewLine &
+                "[MoveLeft]=" & GetKeyName(Keys.A) & Environment.NewLine &
+                "[MoveBackward]=" & GetKeyName(Keys.S) & Environment.NewLine &
+                "[MoveRight]=" & GetKeyName(Keys.D) & Environment.NewLine &
                 "[Run]=" & GetKeyName(Keys.LeftShift) & Environment.NewLine &
                 "[OpenMenu]=" & GetKeyName(Keys.E) & Environment.NewLine &
                 "[Chat]=" & GetKeyName(Keys.T) & Environment.NewLine &
@@ -276,10 +276,10 @@ Public Class KeyBindings
     ''' </summary>
     Public Shared Sub SaveKeys()
         If IO.Directory.Exists(GameController.GamePath & "\Save") = True Then
-            Dim s As String = "[ForwardMove]=" & GetKeyName(ForwardMoveKey) & Environment.NewLine &
-                "[LeftMove]=" & GetKeyName(LeftMoveKey) & Environment.NewLine &
-                "[BackwardMove]=" & GetKeyName(BackwardMoveKey) & Environment.NewLine &
-                "[RightMove]=" & GetKeyName(RightMoveKey) & Environment.NewLine &
+            Dim s As String = "[MoveForward]=" & GetKeyName(ForwardMoveKey) & Environment.NewLine &
+                "[MoveLeft]=" & GetKeyName(LeftMoveKey) & Environment.NewLine &
+                "[MoveBackward]=" & GetKeyName(BackwardMoveKey) & Environment.NewLine &
+                "[MoveRight]=" & GetKeyName(RightMoveKey) & Environment.NewLine &
                 "[Run]=" & GetKeyName(RunKey) & Environment.NewLine &
                 "[Inventory]=" & GetKeyName(OpenInventoryKey) & Environment.NewLine &
                 "[Chat]=" & GetKeyName(ChatKey) & Environment.NewLine &
diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoSystem.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoSystem.vb
index 558f6ae33..f2154a3f6 100644
--- a/P3D/World/ActionScript/V2/ScriptConstructs/DoSystem.vb
+++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoSystem.vb
@@ -26,25 +26,27 @@
                             key = KeyBindings.BackwardMoveKey
                         Case "moveright"
                             key = KeyBindings.RightMoveKey
+                        Case "run"
+                            key = KeyBindings.RunKey
                         Case "openmenu"
                             key = KeyBindings.OpenInventoryKey
                         Case "chat"
                             key = KeyBindings.ChatKey
-                        Case "special", "phone"
+                        Case "special", "phone", "pokegear"
                             key = KeyBindings.SpecialKey
-                        Case "muteaudio"
+                        Case "muteaudio", "mutemusic"
                             key = KeyBindings.MuteAudioKey
-                        Case "cameraleft"
+                        Case "cameraleft", "left"
                             key = KeyBindings.LeftKey
-                        Case "cameraright"
+                        Case "cameraright", "right"
                             key = KeyBindings.RightKey
-                        Case "cameraup"
+                        Case "cameraup", "up"
                             key = KeyBindings.UpKey
-                        Case "cameradown"
+                        Case "cameradown", "down"
                             key = KeyBindings.DownKey
                         Case "cameralock"
                             key = KeyBindings.CameraLockKey
-                        Case "guicontrol"
+                        Case "guicontrol", "hidegui"
                             key = KeyBindings.GUIControlKey
                         Case "screenshot"
                             key = KeyBindings.ScreenshotKey
@@ -68,10 +70,6 @@
                             key = KeyBindings.OnlineStatusKey
                         Case "lighting"
                             key = KeyBindings.LightKey
-                        Case "hidegui"
-                            key = KeyBindings.GUIControlKey
-                        Case "run"
-                            key = KeyBindings.RunKey
                     End Select
                     If key <> Nothing Then
                         buttonName = Localization.GetString("keyboard_key_" & KeyBindings.GetKeyName(key), KeyBindings.GetKeyName(key))