diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index 2f4ba86a..651f0099 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -993,15 +993,15 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 		bool kbDown = false, kbPressed = false, kbReleased = false;
 		switch(key)
 		{
-			case ACTION_MENU_UP:        kbDown = KMInput.IsKeyDown(VK_UP);     kbPressed = KMInput.IsKeyPressed(VK_UP);     kbReleased = KMInput.IsKeyReleased(VK_UP);     break;
-			case ACTION_MENU_DOWN:      kbDown = KMInput.IsKeyDown(VK_DOWN);   kbPressed = KMInput.IsKeyPressed(VK_DOWN);   kbReleased = KMInput.IsKeyReleased(VK_DOWN);   break;
-			case ACTION_MENU_LEFT:      kbDown = KMInput.IsKeyDown(VK_LEFT);   kbPressed = KMInput.IsKeyPressed(VK_LEFT);   kbReleased = KMInput.IsKeyReleased(VK_LEFT);   break;
-			case ACTION_MENU_RIGHT:     kbDown = KMInput.IsKeyDown(VK_RIGHT);  kbPressed = KMInput.IsKeyPressed(VK_RIGHT);  kbReleased = KMInput.IsKeyReleased(VK_RIGHT);  break;
-			case ACTION_MENU_OK:        kbDown = KMInput.IsKeyDown(VK_RETURN); kbPressed = KMInput.IsKeyPressed(VK_RETURN); kbReleased = KMInput.IsKeyReleased(VK_RETURN); break;
-			case ACTION_MENU_A:         kbDown = KMInput.IsKeyDown(VK_RETURN); kbPressed = KMInput.IsKeyPressed(VK_RETURN); kbReleased = KMInput.IsKeyReleased(VK_RETURN); break;
-			case ACTION_MENU_CANCEL:    kbDown = KMInput.IsKeyDown(VK_ESCAPE); kbPressed = KMInput.IsKeyPressed(VK_ESCAPE); kbReleased = KMInput.IsKeyReleased(VK_ESCAPE); break;
-			case ACTION_MENU_B:         kbDown = KMInput.IsKeyDown(VK_ESCAPE); kbPressed = KMInput.IsKeyPressed(VK_ESCAPE); kbReleased = KMInput.IsKeyReleased(VK_ESCAPE); break;
-			case ACTION_MENU_PAUSEMENU: kbDown = KMInput.IsKeyDown(VK_ESCAPE); kbPressed = KMInput.IsKeyPressed(VK_ESCAPE); kbReleased = KMInput.IsKeyReleased(VK_ESCAPE); break;
+			case ACTION_MENU_UP:        kbDown = g_KBMInput.IsKeyDown(VK_UP);     kbPressed = g_KBMInput.IsKeyPressed(VK_UP);     kbReleased = g_KBMInput.IsKeyReleased(VK_UP);     break;
+			case ACTION_MENU_DOWN:      kbDown = g_KBMInput.IsKeyDown(VK_DOWN);   kbPressed = g_KBMInput.IsKeyPressed(VK_DOWN);   kbReleased = g_KBMInput.IsKeyReleased(VK_DOWN);   break;
+			case ACTION_MENU_LEFT:      kbDown = g_KBMInput.IsKeyDown(VK_LEFT);   kbPressed = g_KBMInput.IsKeyPressed(VK_LEFT);   kbReleased = g_KBMInput.IsKeyReleased(VK_LEFT);   break;
+			case ACTION_MENU_RIGHT:     kbDown = g_KBMInput.IsKeyDown(VK_RIGHT);  kbPressed = g_KBMInput.IsKeyPressed(VK_RIGHT);  kbReleased = g_KBMInput.IsKeyReleased(VK_RIGHT);  break;
+			case ACTION_MENU_OK:        kbDown = g_KBMInput.IsKeyDown(VK_RETURN); kbPressed = g_KBMInput.IsKeyPressed(VK_RETURN); kbReleased = g_KBMInput.IsKeyReleased(VK_RETURN); break;
+			case ACTION_MENU_A:         kbDown = g_KBMInput.IsKeyDown(VK_RETURN); kbPressed = g_KBMInput.IsKeyPressed(VK_RETURN); kbReleased = g_KBMInput.IsKeyReleased(VK_RETURN); break;
+			case ACTION_MENU_CANCEL:    kbDown = g_KBMInput.IsKeyDown(VK_ESCAPE); kbPressed = g_KBMInput.IsKeyPressed(VK_ESCAPE); kbReleased = g_KBMInput.IsKeyReleased(VK_ESCAPE); break;
+			case ACTION_MENU_B:         kbDown = g_KBMInput.IsKeyDown(VK_ESCAPE); kbPressed = g_KBMInput.IsKeyPressed(VK_ESCAPE); kbReleased = g_KBMInput.IsKeyReleased(VK_ESCAPE); break;
+			case ACTION_MENU_PAUSEMENU: kbDown = g_KBMInput.IsKeyDown(VK_ESCAPE); kbPressed = g_KBMInput.IsKeyPressed(VK_ESCAPE); kbReleased = g_KBMInput.IsKeyReleased(VK_ESCAPE); break;
 		}
 		pressed = pressed || kbPressed;
 		released = released || kbReleased;
diff --git a/Minecraft.Client/Input.cpp b/Minecraft.Client/Input.cpp
index eea0519d..402d98ba 100644
--- a/Minecraft.Client/Input.cpp
+++ b/Minecraft.Client/Input.cpp
@@ -47,10 +47,10 @@ void Input::tick(LocalPlayer *player)
 	if (iPad == 0)
 	{
 		float kbX = 0.0f, kbY = 0.0f;
-		if (KMInput.IsKeyDown('W')) kbY += 1.0f;
-		if (KMInput.IsKeyDown('S')) kbY -= 1.0f;
-		if (KMInput.IsKeyDown('A')) kbX += 1.0f;  // inverted like gamepad
-		if (KMInput.IsKeyDown('D')) kbX -= 1.0f;
+		if (g_KBMInput.IsKeyDown('W')) kbY += 1.0f;
+		if (g_KBMInput.IsKeyDown('S')) kbY -= 1.0f;
+		if (g_KBMInput.IsKeyDown('A')) kbX += 1.0f;  // inverted like gamepad
+		if (g_KBMInput.IsKeyDown('D')) kbX -= 1.0f;
 		// Normalize diagonal
 		if (kbX != 0.0f && kbY != 0.0f) { kbX *= 0.707f; kbY *= 0.707f; }
 		if (pMinecraft->localgameModes[iPad]->isInputAllowed(MINECRAFT_ACTION_LEFT) || pMinecraft->localgameModes[iPad]->isInputAllowed(MINECRAFT_ACTION_RIGHT))
@@ -88,7 +88,7 @@ void Input::tick(LocalPlayer *player)
 
 #ifdef _WINDOWS64
 	// Keyboard hold-to-sneak (overrides gamepad toggle)
-	if (iPad == 0 && KMInput.IsKeyDown(VK_SHIFT) && !player->abilities.flying)
+	if (iPad == 0 && g_KBMInput.IsKeyDown(VK_SHIFT) && !player->abilities.flying)
 		sneaking = true;
 #endif
 
@@ -129,11 +129,11 @@ void Input::tick(LocalPlayer *player)
         
 #ifdef _WINDOWS64
 	// Mouse look (added after stick-based turn)
-	if (iPad == 0 && KMInput.IsCaptured())
+	if (iPad == 0 && g_KBMInput.IsCaptured())
 	{
 		float mouseSensitivity = 1.25f;
-		float mdx = KMInput.GetMouseDeltaX() * mouseSensitivity;
-		float mdy = -KMInput.GetMouseDeltaY() * mouseSensitivity;
+		float mdx = g_KBMInput.GetMouseDeltaX() * mouseSensitivity;
+		float mdy = -g_KBMInput.GetMouseDeltaY() * mouseSensitivity;
 		if (app.GetGameSettings(iPad, eGameSetting_ControlInvertLook))
 			mdy = -mdy;
 		player->interpolateTurn(mdx, mdy);
@@ -151,7 +151,7 @@ void Input::tick(LocalPlayer *player)
 
 #ifdef _WINDOWS64
 	// Keyboard jump (Space)
-	if (iPad == 0 && KMInput.IsKeyDown(VK_SPACE) && pMinecraft->localgameModes[iPad]->isInputAllowed(MINECRAFT_ACTION_JUMP))
+	if (iPad == 0 && g_KBMInput.IsKeyDown(VK_SPACE) && pMinecraft->localgameModes[iPad]->isInputAllowed(MINECRAFT_ACTION_JUMP))
 		jumping = true;
 #endif
 
diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp
index 90299bcd..0e28b5f1 100644
--- a/Minecraft.Client/LocalPlayer.cpp
+++ b/Minecraft.Client/LocalPlayer.cpp
@@ -281,7 +281,7 @@ void LocalPlayer::aiStep()
 
 #ifdef _WINDOWS64
 	// Keyboard sprint: Ctrl held while moving forward
-	if (GetXboxPad() == 0 && KMInput.IsKeyDown(VK_CONTROL) && input->ya > 0.0f &&
+	if (GetXboxPad() == 0 && g_KBMInput.IsKeyDown(VK_CONTROL) && input->ya > 0.0f &&
 		enoughFoodToSprint && !isUsingItem() && !hasEffect(MobEffect::blindness) && onGround)
 	{
 		if (!isSprinting()) setSprinting(true);