diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp
index 109bbaaba..2326de37a 100644
--- a/Minecraft.Client/AbstractContainerScreen.cpp
+++ b/Minecraft.Client/AbstractContainerScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "AbstractContainerScreen.h"
 #include "ItemRenderer.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "Lighting.h"
 #include "GameMode.h"
 #include "KeyMapping.h"
diff --git a/Minecraft.Client/ChatScreen.cpp b/Minecraft.Client/ChatScreen.cpp
index 8c65cd5dc..eda94fb95 100644
--- a/Minecraft.Client/ChatScreen.cpp
+++ b/Minecraft.Client/ChatScreen.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ChatScreen.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "../Minecraft.World/SharedConstants.h"
 #include "../Minecraft.World/StringHelpers.h"
 
diff --git a/Minecraft.Client/ClockTexture.cpp b/Minecraft.Client/ClockTexture.cpp
index 66d4b7a1a..f77d089b3 100644
--- a/Minecraft.Client/ClockTexture.cpp
+++ b/Minecraft.Client/ClockTexture.cpp
@@ -2,7 +2,7 @@
 #include "Minecraft.h"
 #include "../Minecraft.World/net.minecraft.world.level.h"
 #include "../Minecraft.World/net.minecraft.world.level.dimension.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "../Minecraft.World/JavaMath.h"
 #include "Texture.h"
 #include "ClockTexture.h"
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp
index 226c7c741..7de72474d 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@@ -2,7 +2,7 @@
 
 #include "SoundEngine.h"
 #include "../Consoles_App.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/net.minecraft.world.level.h"
 #include "../../Minecraft.World/leveldata.h"
 #include "../../Minecraft.World/mth.h"
diff --git a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
index e21d3353e..e852a0f06 100644
--- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
@@ -3,7 +3,7 @@
 #include "UIComponent_TutorialPopup.h"
 #include "../../Common/Tutorial/Tutorial.h"
 #include "../../../Minecraft.World/StringHelpers.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../Minecraft.h"
 #include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
index 3725f5adc..0de2f0098 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
@@ -3,7 +3,7 @@
 #include "UIControl_EnchantmentButton.h"
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/StringHelpers.h"
 
 UIControl_EnchantmentButton::UIControl_EnchantmentButton()
diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
index e8f36d54a..fe2397b32 100644
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
@@ -8,7 +8,7 @@
 #include "../../ModelPart.h"
 #include "../../Options.h"
 #include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "UI.h"
 #include "UIControl_MinecraftPlayer.h"
 
diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
index bada2e058..9fb6322b2 100644
--- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
@@ -4,7 +4,7 @@
 
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "../../../Minecraft.World/net.minecraft.world.item.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 
 UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
index c9e8156d6..a0970228e 100644
--- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
@@ -2,7 +2,7 @@
 #include "UI.h"
 #include "UIScene_ControlsMenu.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 
 UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
index 21da9dd42..dfe945150 100644
--- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "UIScene_CraftingMenu.h"
 
diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
index 07f76dc36..213fa7157 100644
--- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
@@ -3,7 +3,7 @@
 #include "UIScene_DeathMenu.h"
 #include "IUIScene_PauseMenu.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 
 UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
index 37b458b41..27ecc2b21 100644
--- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
@@ -3,7 +3,7 @@
 #include "UIScene_EndPoem.h"
 #include "UIBitmapFont.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/StringHelpers.h"
 
 UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
index 2ae5eed14..09cdf8ab4 100644
--- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
@@ -2,7 +2,7 @@
 #include "UI.h"
 #include "UIScene_HUD.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
 #include "../../EnderDragonRenderer.h"
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
index 05a8291ab..2b88a837f 100644
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
@@ -6,7 +6,7 @@
 #include "../../../Minecraft.World/net.minecraft.world.item.h"
 #include "../../../Minecraft.World/net.minecraft.stats.h"
 #include "../../../Minecraft.World/net.minecraft.world.effect.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../Minecraft.h"
 #include "../../Options.h"
 #include "../../EntityRenderDispatcher.h"
diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
index 3fb53baf6..7d99ffa98 100644
--- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
@@ -2,7 +2,7 @@
 #include "UI.h"
 #include "UIScene_PauseMenu.h"
 #include "../../MinecraftServer.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../TexturePackRepository.h"
 #include "../../TexturePack.h"
 #include "../../DLCTexturePack.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
index a82d43f88..c9337fb54 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
@@ -3,7 +3,7 @@
 #include "../../ScreenSizeCalculator.h"
 #include "../../EntityRenderDispatcher.h"
 #include "../../Lighting.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "XUI_Ctrl_MinecraftPlayer.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_Scene_Inventory.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Common/XUI/XUI_Death.cpp
index a3696742a..b60a9bb2e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Death.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp
@@ -9,7 +9,7 @@
 #include "../../../Minecraft.World/net.minecraft.stats.h"
 #include "../../../Minecraft.Client/StatsCounter.h"
 #include "../../../Minecraft.World/Entity.h"
-#include "../../../Minecraft.Client/MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/Level.h"
 #include "../../../Minecraft.World/ChunkSource.h"
 #include "../../../Minecraft.Client/ProgressRenderer.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
index 2d2bb6e7d..16f585866 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../MultiplayerLevel.h"
 #include "../../GameMode.h"
 #include "../../SurvivalMode.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
index ca689158c..47fcb9ae2 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
@@ -6,7 +6,7 @@
 // #include "../../Xbox/4JLibs/inc/4J_Input.h"
 
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 
 #ifndef _CONTENT_PACKAGE
 HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.cpp b/Minecraft.Client/Common/XUI/XUI_HUD.cpp
index 0b639566e..4f309f91b 100644
--- a/Minecraft.Client/Common/XUI/XUI_HUD.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HUD.cpp
@@ -2,7 +2,7 @@
 #include "XUI_HUD.h"
 #include "../../Minecraft.h"
 #include "../../Gui.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "../../../Minecraft.World/Random.h"
 #include "../../../Minecraft.World/net.minecraft.world.effect.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
index c089aacc1..b367f6250 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
@@ -6,7 +6,7 @@
 
 #include "../../../Minecraft.World/net.minecraft.world.level.h"
 #include "../../../Minecraft.World/LevelData.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 
 #define ALIGN_START		0
 #define ALIGN_END		1
diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
index 2b83c7884..578c1fca4 100644
--- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
@@ -10,7 +10,7 @@
 #include "../../../Minecraft.Client/StatsCounter.h"
 #include "../../../Minecraft.World/Entity.h"
 #include "../../../Minecraft.World/Level.h"
-#include "../../../Minecraft.Client/MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h"
 #include "../../MinecraftServer.h"
 #include "../../MultiPlayerLevel.h"
 #include "../../ProgressRenderer.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
index d37a37fd1..3b103b655 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
@@ -2,7 +2,7 @@
 
 #include <assert.h>
 #include "../../MultiplayerLevel.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../StatsCounter.h"
 #include "../../../Minecraft.World/StringHelpers.h"
 #include "../../../Minecraft.World/net.minecraft.stats.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
index c11281df4..9f4ff48e3 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
@@ -2,7 +2,7 @@
 
 #include "../../../Minecraft.World/Container.h"
 #include "../../../Minecraft.World/ContainerMenu.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Container.h"
 #include "XUI_Ctrl_SlotItemListItem.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
index f2e9dde9f..4b46b0c8f 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
@@ -4,7 +4,7 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/net.minecraft.world.item.h"
 #include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
index ef27f16a4..d9fb6c490 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
@@ -6,7 +6,7 @@
 #include "../../../Minecraft.World/net.minecraft.world.level.dimension.h"
 
 //#include "../../../Minecraft.World/net.minecraft.stats.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../Common/Tutorial/Tutorial.h"
 #include "../../Common/Tutorial/TutorialMode.h"
 #include "../../Common/Tutorial/TutorialEnum.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
index 709ce9057..559e42aed 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "../../../Minecraft.World/FurnaceMenu.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../Common/Tutorial/Tutorial.h"
 #include "../../Common/Tutorial/TutorialMode.h"
 #include "../../Common/Tutorial/TutorialEnum.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
index 111ba95a6..e519000d2 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
@@ -3,7 +3,7 @@
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "../../../Minecraft.World/net.minecraft.stats.h"
 #include "../../../Minecraft.World/net.minecraft.world.effect.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../Common/Tutorial/Tutorial.h"
 #include "../../Common/Tutorial/TutorialMode.h"
 #include "../../Common/Tutorial/TutorialEnum.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
index 21e3a6e95..6fd2dbd28 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
@@ -10,7 +10,7 @@
 #include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
 
 #include "../../../Minecraft.World/net.minecraft.stats.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../Common/Tutorial/Tutorial.h"
 #include "../../Common/Tutorial/TutorialMode.h"
 #include "../../Minecraft.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
index 69a60a399..6ceb0bc63 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
@@ -2,7 +2,7 @@
 
 #include "../../../Minecraft.World/DispenserTileEntity.h"
 #include "../../../Minecraft.World/TrapMenu.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Trap.h"
 #include "../../Common/Tutorial/Tutorial.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
index 6f523bac1..bc8281619 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
@@ -8,7 +8,7 @@
 #include "../../../Minecraft.World/Random.h"
 #include "../../../Minecraft.World/SharedConstants.h"
 #include "../../../Minecraft.World/StringHelpers.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "XUI_Scene_Win.h"
 
 BYTE CScene_Win::s_winUserIndex = 0;
diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
index 6c5c2fef9..42bec4a96 100644
--- a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XUI_TextEntry.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 
 
 CScene_TextEntry::CommandParams CScene_TextEntry::CommandA[CScene_TextEntry::eCommand_MAX]=
diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
index 59bf3486b..573094ec0 100644
--- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "../../Common/Tutorial/Tutorial.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/StringHelpers.h"
 #include "../../../Minecraft.World/Tile.h"
 #include "../../../Minecraft.World/Item.h"
diff --git a/Minecraft.Client/CompassTexture.cpp b/Minecraft.Client/CompassTexture.cpp
index 95a8e5085..2673df0d9 100644
--- a/Minecraft.Client/CompassTexture.cpp
+++ b/Minecraft.Client/CompassTexture.cpp
@@ -2,7 +2,7 @@
 #include "Minecraft.h"
 #include "../Minecraft.World/net.minecraft.world.level.h"
 #include "../Minecraft.World/net.minecraft.world.level.dimension.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "../Minecraft.World/JavaMath.h"
 #include "Texture.h"
 #include "CompassTexture.h"
diff --git a/Minecraft.Client/CraftingScreen.cpp b/Minecraft.Client/CraftingScreen.cpp
index cc947c0cd..76aa8db75 100644
--- a/Minecraft.Client/CraftingScreen.cpp
+++ b/Minecraft.Client/CraftingScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "CraftingScreen.h"
 #include "Textures.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "../Minecraft.World/net.minecraft.world.inventory.h"
 
 CraftingScreen::CraftingScreen(shared_ptr<Inventory> inventory, Level *level, int x, int y, int z) : AbstractContainerScreen(new CraftingMenu(inventory, level, x, y, z))
diff --git a/Minecraft.Client/DeathScreen.cpp b/Minecraft.Client/DeathScreen.cpp
index 36fa468dd..d737bf939 100644
--- a/Minecraft.Client/DeathScreen.cpp
+++ b/Minecraft.Client/DeathScreen.cpp
@@ -2,7 +2,7 @@
 #include "../Minecraft.World/StringHelpers.h"
 #include "DeathScreen.h"
 #include "Button.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "TitleScreen.h"
 
 void DeathScreen::init()
diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp
index 2de50f16f..f76f7dd85 100644
--- a/Minecraft.Client/GameRenderer.cpp
+++ b/Minecraft.Client/GameRenderer.cpp
@@ -13,7 +13,7 @@
 #include "CreativeMode.h"
 #include "Lighting.h"
 #include "Options.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "GuiParticles.h"
 #include "MultiPlayerLevel.h"
 #include "Chunk.h"
diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp
index 176ad4c71..82abf8ace 100644
--- a/Minecraft.Client/Gui.cpp
+++ b/Minecraft.Client/Gui.cpp
@@ -3,7 +3,7 @@
 #include "ItemRenderer.h"
 #include "GameRenderer.h"
 #include "Options.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "Textures.h"
 #include "GameMode.h"
 #include "Lighting.h"
diff --git a/Minecraft.Client/InBedChatScreen.cpp b/Minecraft.Client/InBedChatScreen.cpp
index 5c3c068fc..6194afc71 100644
--- a/Minecraft.Client/InBedChatScreen.cpp
+++ b/Minecraft.Client/InBedChatScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "InBedChatScreen.h"
 #include "Button.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "../Minecraft.World/net.minecraft.locale.h"
 #include "../Minecraft.World/StringHelpers.h"
 
diff --git a/Minecraft.Client/InventoryScreen.cpp b/Minecraft.Client/InventoryScreen.cpp
index 977ffe1c3..0d7dc2b3d 100644
--- a/Minecraft.Client/InventoryScreen.cpp
+++ b/Minecraft.Client/InventoryScreen.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "InventoryScreen.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "Font.h"
 #include "EntityRenderDispatcher.h"
 #include "Lighting.h"
diff --git a/Minecraft.Client/ItemInHandRenderer.cpp b/Minecraft.Client/ItemInHandRenderer.cpp
index a31246238..53e2bc07e 100644
--- a/Minecraft.Client/ItemInHandRenderer.cpp
+++ b/Minecraft.Client/ItemInHandRenderer.cpp
@@ -7,7 +7,7 @@
 #include "PlayerRenderer.h"
 #include "EntityRenderDispatcher.h"
 #include "Lighting.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "Minimap.h"
 #include "MultiPlayerLevel.h"
 #include "../Minecraft.World/net.minecraft.world.item.h"
diff --git a/Minecraft.Client/LevelRenderer.cpp b/Minecraft.Client/LevelRenderer.cpp
index 2757daebd..49b636a9d 100644
--- a/Minecraft.Client/LevelRenderer.cpp
+++ b/Minecraft.Client/LevelRenderer.cpp
@@ -54,7 +54,7 @@
 #include "../Minecraft.World/net.minecraft.world.level.chunk.h"
 #include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
 #include "../Minecraft.World/net.minecraft.world.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "MultiPlayerLevel.h"
 #include "../Minecraft.World/SoundTypes.h"
 #include "FrustumCuller.h"
diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.cpp b/Minecraft.Client/MultiPlayerLocalPlayer.cpp
index 6e5658a9a..4e7875577 100644
--- a/Minecraft.Client/MultiPlayerLocalPlayer.cpp
+++ b/Minecraft.Client/MultiPlayerLocalPlayer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 //#include "../Minecraft.World/JavaMath.h"
-#include "MultiplayerLocalPlayer.h"
+#include "MultiPlayerLocalPlayer.h"
 #include "ClientConnection.h"
 #include "../Minecraft.World/net.minecraft.world.level.h"
 #include "../Minecraft.World/net.minecraft.network.h"
diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
index 9d431fb55..0577a6e06 100644
--- a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
@@ -4,7 +4,7 @@
 #include "../../../Minecraft.World/Random.h"
 #include "../../../Minecraft.World/LevelData.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "SoundEngine.h"
 #include "../../TexturePackRepository.h"
 #include "../../TexturePack.h"
diff --git a/Minecraft.Client/Xbox/Sentient/SentientManager.cpp b/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
index 88a2f42c6..ed8c6e52f 100644
--- a/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
+++ b/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
@@ -5,7 +5,7 @@
 
 #include "../GameConfig/Minecraft.spa.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/Dimension.h"
 #include "../../../Minecraft.World/net.minecraft.world.level.h"
 #include "../../../Minecraft.World/net.minecraft.world.level.storage.h"