diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index ba5d2c38f..e275a785e 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -1642,7 +1642,7 @@ void LocalPlayer::sendSelectedSpell(const std::string& newSelectedSpellId)
     getNetworking()->getPlayerPacket(ID_PLAYER_MISCELLANEOUS)->Send();
 }
 
-void LocalPlayer::sendItemUse(const MWWorld::Ptr& itemPtr, bool itemMagicState, char drawState)
+void LocalPlayer::sendItemUse(const MWWorld::Ptr& itemPtr, bool itemMagicState, char currentDrawState)
 {
     usedItem.refId = itemPtr.getCellRef().getRefId();
     usedItem.count = itemPtr.getRefData().getCount();
@@ -1651,7 +1651,7 @@ void LocalPlayer::sendItemUse(const MWWorld::Ptr& itemPtr, bool itemMagicState,
     usedItem.soul = itemPtr.getCellRef().getSoul();
 
     usingItemMagic = itemMagicState;
-    itemUseDrawState = drawState;
+    itemUseDrawState = currentDrawState;
 
     getNetworking()->getPlayerPacket(ID_PLAYER_ITEM_USE)->setPlayer(this);
     getNetworking()->getPlayerPacket(ID_PLAYER_ITEM_USE)->Send();
diff --git a/apps/openmw/mwmp/LocalPlayer.hpp b/apps/openmw/mwmp/LocalPlayer.hpp
index 92dff83a4..41a3e4114 100644
--- a/apps/openmw/mwmp/LocalPlayer.hpp
+++ b/apps/openmw/mwmp/LocalPlayer.hpp
@@ -95,7 +95,7 @@ namespace mwmp
         void sendWerewolfState(bool isWerewolf);
         void sendMarkLocation(const ESM::Cell& newMarkCell, const ESM::Position& newMarkPosition);
         void sendSelectedSpell(const std::string& newSelectedSpellId);
-        void sendItemUse(const MWWorld::Ptr& itemPtr, bool usingItemMagic = false, char itemUseDrawState = 0);
+        void sendItemUse(const MWWorld::Ptr& itemPtr, bool usingItemMagic = false, char currentDrawState = 0);
         void sendCellStates();
 
         void clearCellStates();
diff --git a/components/openmw-mp/Master/MasterData.hpp b/components/openmw-mp/Master/MasterData.hpp
index 43cc36aac..60feb2e76 100644
--- a/components/openmw-mp/Master/MasterData.hpp
+++ b/components/openmw-mp/Master/MasterData.hpp
@@ -58,10 +58,10 @@ struct QueryData
     void SetVersion(const char *version) { rules["version"].str = version; }
 
     int GetPlayers() const { return rules.at("players").val; }
-    void SetPlayers(int players) { rules["players"].val = players; }
+    void SetPlayers(int value) { rules["players"].val = value; }
 
     int GetMaxPlayers() const { return rules.at("maxPlayers").val; }
-    void SetMaxPlayers(int players) { rules["maxPlayers"].val = players; }
+    void SetMaxPlayers(int value) { rules["maxPlayers"].val = value; }
 
     const char *GetGameMode() const { return rules.at("gamemode").str.c_str(); }
     void SetGameMode(const char *str) { rules["gamemode"].str = str; }
diff --git a/components/openmw-mp/Master/PacketMasterAnnounce.cpp b/components/openmw-mp/Master/PacketMasterAnnounce.cpp
index b3bb1aeec..629d55756 100644
--- a/components/openmw-mp/Master/PacketMasterAnnounce.cpp
+++ b/components/openmw-mp/Master/PacketMasterAnnounce.cpp
@@ -14,9 +14,9 @@ PacketMasterAnnounce::PacketMasterAnnounce(RakNet::RakPeerInterface *peer) : Bas
     reliability = RELIABLE_ORDERED_WITH_ACK_RECEIPT;
 }
 
-void PacketMasterAnnounce::Packet(BitStream *bs, bool send)
+void PacketMasterAnnounce::Packet(BitStream *newBitstream, bool send)
 {
-    this->bs = bs;
+    bs = newBitstream;
     if (send)
         bs->Write(packetID);
 
diff --git a/components/openmw-mp/Master/PacketMasterAnnounce.hpp b/components/openmw-mp/Master/PacketMasterAnnounce.hpp
index 6394b7453..6c67ad822 100644
--- a/components/openmw-mp/Master/PacketMasterAnnounce.hpp
+++ b/components/openmw-mp/Master/PacketMasterAnnounce.hpp
@@ -13,7 +13,7 @@ namespace mwmp
     public:
         explicit PacketMasterAnnounce(RakNet::RakPeerInterface *peer);
 
-        void Packet(RakNet::BitStream *bs, bool send) override;
+        void Packet(RakNet::BitStream *newBitstream, bool send) override;
 
         void SetServer(QueryData *server);
         void SetFunc(uint32_t keep);
diff --git a/components/openmw-mp/Master/PacketMasterQuery.cpp b/components/openmw-mp/Master/PacketMasterQuery.cpp
index 6f1aee997..d882e6ef5 100644
--- a/components/openmw-mp/Master/PacketMasterQuery.cpp
+++ b/components/openmw-mp/Master/PacketMasterQuery.cpp
@@ -16,9 +16,9 @@ PacketMasterQuery::PacketMasterQuery(RakNet::RakPeerInterface *peer) : BasePacke
     reliability = RELIABLE_ORDERED_WITH_ACK_RECEIPT;
 }
 
-void PacketMasterQuery::Packet(RakNet::BitStream *bs, bool send)
+void PacketMasterQuery::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    this->bs = bs;
+    bs = newBitstream;
     if (send)
         bs->Write(packetID);
 
diff --git a/components/openmw-mp/Master/PacketMasterQuery.hpp b/components/openmw-mp/Master/PacketMasterQuery.hpp
index ef2efdb70..def7e0bfa 100644
--- a/components/openmw-mp/Master/PacketMasterQuery.hpp
+++ b/components/openmw-mp/Master/PacketMasterQuery.hpp
@@ -13,7 +13,7 @@ namespace mwmp
     public:
         explicit PacketMasterQuery(RakNet::RakPeerInterface *peer);
 
-        void Packet(RakNet::BitStream *bs, bool send) override;
+        void Packet(RakNet::BitStream *newBitstream, bool send) override;
 
         void SetServers(std::map<RakNet::SystemAddress, QueryData> *serverMap);
     private:
diff --git a/components/openmw-mp/Master/PacketMasterUpdate.cpp b/components/openmw-mp/Master/PacketMasterUpdate.cpp
index 90290ab70..ba3eaf5df 100644
--- a/components/openmw-mp/Master/PacketMasterUpdate.cpp
+++ b/components/openmw-mp/Master/PacketMasterUpdate.cpp
@@ -13,9 +13,9 @@ PacketMasterUpdate::PacketMasterUpdate(RakNet::RakPeerInterface *peer) : BasePac
     reliability = RELIABLE_ORDERED_WITH_ACK_RECEIPT;
 }
 
-void PacketMasterUpdate::Packet(RakNet::BitStream *bs, bool send)
+void PacketMasterUpdate::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    this->bs = bs;
+    bs = newBitstream;
     if (send)
         bs->Write(packetID);
 
diff --git a/components/openmw-mp/Master/PacketMasterUpdate.hpp b/components/openmw-mp/Master/PacketMasterUpdate.hpp
index 79e9857f1..9e0ef42b0 100644
--- a/components/openmw-mp/Master/PacketMasterUpdate.hpp
+++ b/components/openmw-mp/Master/PacketMasterUpdate.hpp
@@ -13,7 +13,7 @@ namespace mwmp
     public:
         explicit PacketMasterUpdate(RakNet::RakPeerInterface *peer);
 
-        void Packet(RakNet::BitStream *bs, bool send) override;
+        void Packet(RakNet::BitStream *newBitstream, bool send) override;
 
         void SetServer(std::pair<RakNet::SystemAddress, QueryData> *serverPair);
     private:
diff --git a/components/openmw-mp/Packets/Actor/ActorPacket.cpp b/components/openmw-mp/Packets/Actor/ActorPacket.cpp
index 2e767c3d9..cc4ce0273 100644
--- a/components/openmw-mp/Packets/Actor/ActorPacket.cpp
+++ b/components/openmw-mp/Packets/Actor/ActorPacket.cpp
@@ -19,15 +19,15 @@ ActorPacket::~ActorPacket()
 
 }
 
-void ActorPacket::setActorList(BaseActorList *actorList)
+void ActorPacket::setActorList(BaseActorList *newActorList)
 {
-    this->actorList = actorList;
+    actorList = newActorList;
     guid = actorList->guid;
 }
 
-void ActorPacket::Packet(RakNet::BitStream *bs, bool send)
+void ActorPacket::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    if (!PacketHeader(bs, send))
+    if (!PacketHeader(newBitstream, send))
         return;
 
     BaseActor actor;
@@ -47,9 +47,9 @@ void ActorPacket::Packet(RakNet::BitStream *bs, bool send)
     }
 }
 
-bool ActorPacket::PacketHeader(RakNet::BitStream *bs, bool send)
+bool ActorPacket::PacketHeader(RakNet::BitStream *newBitstream, bool send)
 {
-    BasePacket::Packet(bs, send);
+    BasePacket::Packet(newBitstream, send);
 
     RW(actorList->cell.mData, send, true);
     RW(actorList->cell.mName, send, true);
diff --git a/components/openmw-mp/Packets/Actor/ActorPacket.hpp b/components/openmw-mp/Packets/Actor/ActorPacket.hpp
index 89ebeaec9..e8582853a 100644
--- a/components/openmw-mp/Packets/Actor/ActorPacket.hpp
+++ b/components/openmw-mp/Packets/Actor/ActorPacket.hpp
@@ -19,11 +19,11 @@ namespace mwmp
 
         ~ActorPacket();
 
-        void setActorList(BaseActorList *actorList);
+        void setActorList(BaseActorList *newActorList);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     protected:
-        bool PacketHeader(RakNet::BitStream *bs, bool send);
+        bool PacketHeader(RakNet::BitStream *newBitstream, bool send);
         virtual void Actor(BaseActor &actor, bool send);
         BaseActorList *actorList;
         static const int maxActors = 3000;
diff --git a/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp b/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp
index 11157cba1..03a76b3cb 100644
--- a/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp
+++ b/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp
@@ -8,9 +8,9 @@ PacketActorAuthority::PacketActorAuthority(RakNet::RakPeerInterface *peer) : Act
     packetID = ID_ACTOR_AUTHORITY;
 }
 
-void PacketActorAuthority::Packet(RakNet::BitStream *bs, bool send)
+void PacketActorAuthority::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    BasePacket::Packet(bs, send);
+    BasePacket::Packet(newBitstream, send);
 
     RW(actorList->cell.mData, send, true);
     RW(actorList->cell.mName, send, true);
diff --git a/components/openmw-mp/Packets/Actor/PacketActorAuthority.hpp b/components/openmw-mp/Packets/Actor/PacketActorAuthority.hpp
index 3ddf52210..42372f88b 100644
--- a/components/openmw-mp/Packets/Actor/PacketActorAuthority.hpp
+++ b/components/openmw-mp/Packets/Actor/PacketActorAuthority.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketActorAuthority(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Actor/PacketActorList.cpp b/components/openmw-mp/Packets/Actor/PacketActorList.cpp
index 382d8e82c..8abddfa9b 100644
--- a/components/openmw-mp/Packets/Actor/PacketActorList.cpp
+++ b/components/openmw-mp/Packets/Actor/PacketActorList.cpp
@@ -8,9 +8,9 @@ PacketActorList::PacketActorList(RakNet::RakPeerInterface *peer) : ActorPacket(p
     packetID = ID_ACTOR_LIST;
 }
 
-void PacketActorList::Packet(RakNet::BitStream *bs, bool send)
+void PacketActorList::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    if (!ActorPacket::PacketHeader(bs, send))
+    if (!ActorPacket::PacketHeader(newBitstream, send))
         return;
 
     RW(actorList->action, send);
diff --git a/components/openmw-mp/Packets/Actor/PacketActorList.hpp b/components/openmw-mp/Packets/Actor/PacketActorList.hpp
index bea5abbdb..ccd8a3e89 100644
--- a/components/openmw-mp/Packets/Actor/PacketActorList.hpp
+++ b/components/openmw-mp/Packets/Actor/PacketActorList.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketActorList(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/BasePacket.cpp b/components/openmw-mp/Packets/BasePacket.cpp
index 31513c5ac..53cfe4b47 100644
--- a/components/openmw-mp/Packets/BasePacket.cpp
+++ b/components/openmw-mp/Packets/BasePacket.cpp
@@ -14,9 +14,9 @@ BasePacket::BasePacket(RakNet::RakPeerInterface *peer)
     this->peer = peer;
 }
 
-void BasePacket::Packet(RakNet::BitStream *bs, bool send)
+void BasePacket::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    this->bs = bs;
+    bs = newBitstream;
     packetValid = true;
 
     if (send)
@@ -44,12 +44,12 @@ void BasePacket::SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outS
         bsSend = outStream;
 }
 
-uint32_t BasePacket::RequestData(RakNet::RakNetGUID guid)
+uint32_t BasePacket::RequestData(RakNet::RakNetGUID targetGuid)
 {
     bsSend->ResetWritePointer();
     bsSend->Write(packetID);
-    bsSend->Write(guid);
-    return peer->Send(bsSend, HIGH_PRIORITY, RELIABLE_ORDERED, orderChannel, guid, false);
+    bsSend->Write(targetGuid);
+    return peer->Send(bsSend, HIGH_PRIORITY, RELIABLE_ORDERED, orderChannel, targetGuid, false);
 }
 
 uint32_t BasePacket::Send(RakNet::AddressOrGUID destination)
@@ -71,9 +71,9 @@ void BasePacket::Read()
     Packet(bsRead, false);
 }
 
-void BasePacket::setGUID(RakNet::RakNetGUID guid)
+void BasePacket::setGUID(RakNet::RakNetGUID newGuid)
 {
-    this->guid = guid;
+    guid = newGuid;
 }
 
 RakNet::RakNetGUID BasePacket::getGUID()
diff --git a/components/openmw-mp/Packets/BasePacket.hpp b/components/openmw-mp/Packets/BasePacket.hpp
index 1d1ed0eeb..43dc6a8ca 100644
--- a/components/openmw-mp/Packets/BasePacket.hpp
+++ b/components/openmw-mp/Packets/BasePacket.hpp
@@ -16,18 +16,18 @@ namespace mwmp
 
         virtual ~BasePacket() = default;
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
         virtual uint32_t Send(bool toOtherPlayers = true);
         virtual uint32_t Send(RakNet::AddressOrGUID destination);
         virtual void Read();
 
-        void setGUID(RakNet::RakNetGUID guid);
+        void setGUID(RakNet::RakNetGUID newGuid);
         RakNet::RakNetGUID getGUID();
 
         void SetReadStream(RakNet::BitStream *bitStream);
         void SetSendStream(RakNet::BitStream *bitStream);
         void SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream);
-        virtual uint32_t RequestData(RakNet::RakNetGUID guid);
+        virtual uint32_t RequestData(RakNet::RakNetGUID targetGuid);
 
         static inline uint32_t headerSize()
         {
diff --git a/components/openmw-mp/Packets/Object/ObjectPacket.cpp b/components/openmw-mp/Packets/Object/ObjectPacket.cpp
index 3ed21fe44..ede70571b 100644
--- a/components/openmw-mp/Packets/Object/ObjectPacket.cpp
+++ b/components/openmw-mp/Packets/Object/ObjectPacket.cpp
@@ -20,15 +20,15 @@ ObjectPacket::~ObjectPacket()
 
 }
 
-void ObjectPacket::setObjectList(BaseObjectList *objectList)
+void ObjectPacket::setObjectList(BaseObjectList *newObjectList)
 {
-    this->objectList = objectList;
+    objectList = newObjectList;
     guid = objectList->guid;
 }
 
-void ObjectPacket::Packet(RakNet::BitStream *bs, bool send)
+void ObjectPacket::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    if (!PacketHeader(bs, send))
+    if (!PacketHeader(newBitstream, send))
         return;
 
     BaseObject baseObject;
@@ -44,9 +44,9 @@ void ObjectPacket::Packet(RakNet::BitStream *bs, bool send)
     }
 }
 
-bool ObjectPacket::PacketHeader(RakNet::BitStream *bs, bool send)
+bool ObjectPacket::PacketHeader(RakNet::BitStream *newBitstream, bool send)
 {
-    BasePacket::Packet(bs, send);
+    BasePacket::Packet(newBitstream, send);
 
     RW(objectList->packetOrigin, send);
 
diff --git a/components/openmw-mp/Packets/Object/ObjectPacket.hpp b/components/openmw-mp/Packets/Object/ObjectPacket.hpp
index 898ef39d5..6b80ccd63 100644
--- a/components/openmw-mp/Packets/Object/ObjectPacket.hpp
+++ b/components/openmw-mp/Packets/Object/ObjectPacket.hpp
@@ -19,13 +19,13 @@ namespace mwmp
 
         ~ObjectPacket();
 
-        void setObjectList(BaseObjectList *objectList);
+        void setObjectList(BaseObjectList *newObjectList);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
 
     protected:
         virtual void Object(BaseObject &baseObject, bool send);
-        bool PacketHeader(RakNet::BitStream *bs, bool send);
+        bool PacketHeader(RakNet::BitStream *newBitstream, bool send);
         BaseObjectList *objectList;
         static const int maxObjects = 3000;
         bool hasCellData;
diff --git a/components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp b/components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp
index 1888d4552..bb13f4c6f 100644
--- a/components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp
+++ b/components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp
@@ -9,9 +9,9 @@ PacketConsoleCommand::PacketConsoleCommand(RakNet::RakPeerInterface *peer) : Obj
     hasCellData = true;
 }
 
-void PacketConsoleCommand::Packet(RakNet::BitStream *bs, bool send)
+void PacketConsoleCommand::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    if (!PacketHeader(bs, send))
+    if (!PacketHeader(newBitstream, send))
         return;
 
     RW(objectList->consoleCommand, send);
diff --git a/components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp b/components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
index 33cb0e7a6..b38896fe8 100644
--- a/components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
+++ b/components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketConsoleCommand(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Object/PacketContainer.cpp b/components/openmw-mp/Packets/Object/PacketContainer.cpp
index 9b41e2c98..4a5834c17 100644
--- a/components/openmw-mp/Packets/Object/PacketContainer.cpp
+++ b/components/openmw-mp/Packets/Object/PacketContainer.cpp
@@ -10,9 +10,9 @@ PacketContainer::PacketContainer(RakNet::RakPeerInterface *peer) : ObjectPacket(
     hasCellData = true;
 }
 
-void PacketContainer::Packet(RakNet::BitStream *bs, bool send)
+void PacketContainer::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    if (!PacketHeader(bs, send))
+    if (!PacketHeader(newBitstream, send))
         return;
 
     RW(objectList->action, send);
diff --git a/components/openmw-mp/Packets/Object/PacketContainer.hpp b/components/openmw-mp/Packets/Object/PacketContainer.hpp
index 54813bc88..fe5d09c1b 100644
--- a/components/openmw-mp/Packets/Object/PacketContainer.hpp
+++ b/components/openmw-mp/Packets/Object/PacketContainer.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketContainer(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Object/PacketObjectActivate.cpp b/components/openmw-mp/Packets/Object/PacketObjectActivate.cpp
index e9e42d324..1ca07184d 100644
--- a/components/openmw-mp/Packets/Object/PacketObjectActivate.cpp
+++ b/components/openmw-mp/Packets/Object/PacketObjectActivate.cpp
@@ -9,9 +9,9 @@ PacketObjectActivate::PacketObjectActivate(RakNet::RakPeerInterface *peer) : Obj
     hasCellData = true;
 }
 
-void PacketObjectActivate::Packet(RakNet::BitStream *bs, bool send)
+void PacketObjectActivate::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    if (!PacketHeader(bs, send))
+    if (!PacketHeader(newBitstream, send))
         return;
 
     BaseObject baseObject;
diff --git a/components/openmw-mp/Packets/Object/PacketObjectActivate.hpp b/components/openmw-mp/Packets/Object/PacketObjectActivate.hpp
index 771f2042c..61756d2b6 100644
--- a/components/openmw-mp/Packets/Object/PacketObjectActivate.hpp
+++ b/components/openmw-mp/Packets/Object/PacketObjectActivate.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketObjectActivate(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/PacketPreInit.cpp b/components/openmw-mp/Packets/PacketPreInit.cpp
index f6aed6b4a..cb3c9c7f8 100644
--- a/components/openmw-mp/Packets/PacketPreInit.cpp
+++ b/components/openmw-mp/Packets/PacketPreInit.cpp
@@ -7,9 +7,9 @@ mwmp::PacketPreInit::PacketPreInit(RakNet::RakPeerInterface *peer) : BasePacket(
     packetID = ID_GAME_PREINIT;
 }
 
-void mwmp::PacketPreInit::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPreInit::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    BasePacket::Packet(bs, send);
+    BasePacket::Packet(newBitstream, send);
 
     const RakNet::BitSize_t packetSize = bs->GetNumberOfBytesUsed();
     uint32_t expectedPacketSize = BasePacket::headerSize() + sizeof(uint32_t);
@@ -88,7 +88,7 @@ void mwmp::PacketPreInit::Packet(RakNet::BitStream *bs, bool send)
     }
 }
 
-void mwmp::PacketPreInit::setChecksums(mwmp::PacketPreInit::PluginContainer *checksums)
+void mwmp::PacketPreInit::setChecksums(mwmp::PacketPreInit::PluginContainer *newChecksums)
 {
-    this->checksums = checksums;
+    checksums = newChecksums;
 }
diff --git a/components/openmw-mp/Packets/PacketPreInit.hpp b/components/openmw-mp/Packets/PacketPreInit.hpp
index ebc59c225..2f627b9cf 100644
--- a/components/openmw-mp/Packets/PacketPreInit.hpp
+++ b/components/openmw-mp/Packets/PacketPreInit.hpp
@@ -16,7 +16,7 @@ namespace mwmp
 
         PacketPreInit(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
         void setChecksums(PluginContainer *checksums);
     private:
         PluginContainer *checksums;
diff --git a/components/openmw-mp/Packets/Player/PacketChatMessage.cpp b/components/openmw-mp/Packets/Player/PacketChatMessage.cpp
index 9ec3b4362..21908979c 100644
--- a/components/openmw-mp/Packets/Player/PacketChatMessage.cpp
+++ b/components/openmw-mp/Packets/Player/PacketChatMessage.cpp
@@ -7,9 +7,9 @@ mwmp::PacketChatMessage::PacketChatMessage(RakNet::RakPeerInterface *peer) : Pla
     orderChannel = CHANNEL_SYSTEM;
 }
 
-void mwmp::PacketChatMessage::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketChatMessage::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->chatMessage, send);
 }
diff --git a/components/openmw-mp/Packets/Player/PacketChatMessage.hpp b/components/openmw-mp/Packets/Player/PacketChatMessage.hpp
index 2537c2680..0c3857713 100644
--- a/components/openmw-mp/Packets/Player/PacketChatMessage.hpp
+++ b/components/openmw-mp/Packets/Player/PacketChatMessage.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketChatMessage(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp b/components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
index 7ca4ace5c..a42dbb16c 100644
--- a/components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
+++ b/components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
@@ -9,9 +9,9 @@ PacketGUIBoxes::PacketGUIBoxes(RakNet::RakPeerInterface *peer) : PlayerPacket(pe
     orderChannel = CHANNEL_SYSTEM;
 }
 
-void PacketGUIBoxes::Packet(RakNet::BitStream *bs, bool send)
+void PacketGUIBoxes::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->guiMessageBox.id, send);
     RW(player->guiMessageBox.type, send);
diff --git a/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp b/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
index 5eac5b644..b74e7ca12 100644
--- a/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
+++ b/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketGUIBoxes(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketGameSettings.cpp b/components/openmw-mp/Packets/Player/PacketGameSettings.cpp
index e83031322..8999557f2 100644
--- a/components/openmw-mp/Packets/Player/PacketGameSettings.cpp
+++ b/components/openmw-mp/Packets/Player/PacketGameSettings.cpp
@@ -9,9 +9,9 @@ PacketGameSettings::PacketGameSettings(RakNet::RakPeerInterface *peer) : PlayerP
     orderChannel = CHANNEL_SYSTEM;
 }
 
-void PacketGameSettings::Packet(RakNet::BitStream *bs, bool send)
+void PacketGameSettings::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->difficulty, send);
     RW(player->consoleAllowed, send);
diff --git a/components/openmw-mp/Packets/Player/PacketGameSettings.hpp b/components/openmw-mp/Packets/Player/PacketGameSettings.hpp
index 1ee0db4be..0a90dff21 100644
--- a/components/openmw-mp/Packets/Player/PacketGameSettings.hpp
+++ b/components/openmw-mp/Packets/Player/PacketGameSettings.hpp
@@ -11,7 +11,7 @@ namespace mwmp
     public:
         PacketGameSettings(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp
index 0e936a8b6..c7071c6da 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp
@@ -8,9 +8,9 @@ PacketPlayerActiveSkills::PacketPlayerActiveSkills(RakNet::RakPeerInterface *pee
     packetID = ID_PLAYER_ACTIVESKILLS;
 }
 
-void PacketPlayerActiveSkills::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerActiveSkills::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     uint32_t spells = 0;
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp
index 5d9d0f7db..d6d7ebb84 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerActiveSkills(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.cpp b/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.cpp
index 849b274b0..c02cdd3ae 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.cpp
@@ -6,9 +6,9 @@ mwmp::PacketPlayerAnimFlags::PacketPlayerAnimFlags(RakNet::RakPeerInterface *pee
     packetID = ID_PLAYER_ANIM_FLAGS;
 }
 
-void mwmp::PacketPlayerAnimFlags::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerAnimFlags::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->movementFlags, send);
     RW(player->drawState, send);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.hpp b/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.hpp
index 536ddeaf0..f3d1ef91d 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerAnimFlags(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.cpp b/components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.cpp
index bcc7562e8..164b84217 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.cpp
@@ -6,9 +6,9 @@ mwmp::PacketPlayerAnimPlay::PacketPlayerAnimPlay(RakNet::RakPeerInterface *peer)
     packetID = ID_PLAYER_ANIM_PLAY;
 }
 
-void mwmp::PacketPlayerAnimPlay::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerAnimPlay::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->animation.groupname, send);
     RW(player->animation.mode, send);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.hpp b/components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.hpp
index 112a81d02..b84b983f4 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerAnimPlay(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp b/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
index dd5a21674..9e11bcdbe 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
@@ -8,9 +8,9 @@ PacketPlayerAttack::PacketPlayerAttack(RakNet::RakPeerInterface *peer) : PlayerP
     packetID = ID_PLAYER_ATTACK;
 }
 
-void PacketPlayerAttack::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerAttack::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->attack.target.isPlayer, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttack.hpp b/components/openmw-mp/Packets/Player/PacketPlayerAttack.hpp
index 6375138da..0841e578d 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerAttack.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAttack.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerAttack(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp b/components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
index b0cbad075..857181aa0 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
@@ -9,9 +9,9 @@ PacketPlayerAttribute::PacketPlayerAttribute(RakNet::RakPeerInterface *peer) : P
     packetID = ID_PLAYER_ATTRIBUTE;
 }
 
-void PacketPlayerAttribute::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerAttribute::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->exchangeFullInfo, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAttribute.hpp b/components/openmw-mp/Packets/Player/PacketPlayerAttribute.hpp
index ad4b4335f..bb26d8c78 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerAttribute.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAttribute.hpp
@@ -11,7 +11,7 @@ namespace mwmp
         const static int AttributeCount = 8;
         PacketPlayerAttribute(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.cpp b/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.cpp
index 179164549..f6cb852d5 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.cpp
@@ -8,9 +8,9 @@ PacketPlayerBaseInfo::PacketPlayerBaseInfo(RakNet::RakPeerInterface *peer) : Pla
     packetID = ID_PLAYER_BASEINFO;
 }
 
-void PacketPlayerBaseInfo::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerBaseInfo::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->npc.mName, send, true);
     RW(player->npc.mModel, send, true);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.hpp b/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.hpp
index b213b5455..7589d510f 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerBaseInfo(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBehavior.cpp b/components/openmw-mp/Packets/Player/PacketPlayerBehavior.cpp
index 72cf5f8ef..4411909de 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerBehavior.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBehavior.cpp
@@ -8,9 +8,9 @@ PacketPlayerBehavior::PacketPlayerBehavior(RakNet::RakPeerInterface *peer) : Pla
     packetID = ID_PLAYER_BEHAVIOR;
 }
 
-void PacketPlayerBehavior::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerBehavior::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     // Placeholder
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBehavior.hpp b/components/openmw-mp/Packets/Player/PacketPlayerBehavior.hpp
index 2e17f315e..aa592d8e7 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerBehavior.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBehavior.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerBehavior(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBook.cpp b/components/openmw-mp/Packets/Player/PacketPlayerBook.cpp
index ca7fb5790..58146af92 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerBook.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBook.cpp
@@ -9,9 +9,9 @@ PacketPlayerBook::PacketPlayerBook(RakNet::RakPeerInterface *peer) : PlayerPacke
     packetID = ID_PLAYER_BOOK;
 }
 
-void PacketPlayerBook::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerBook::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     uint32_t count;
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBook.hpp b/components/openmw-mp/Packets/Player/PacketPlayerBook.hpp
index b25d45d36..6790bccd0 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerBook.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBook.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerBook(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBounty.cpp b/components/openmw-mp/Packets/Player/PacketPlayerBounty.cpp
index a4fceb4bb..f7432e09f 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerBounty.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBounty.cpp
@@ -8,9 +8,9 @@ PacketPlayerBounty::PacketPlayerBounty(RakNet::RakPeerInterface *peer) : PlayerP
     packetID = ID_PLAYER_BOUNTY;
 }
 
-void PacketPlayerBounty::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerBounty::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->npcStats.mBounty, send);
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerBounty.hpp b/components/openmw-mp/Packets/Player/PacketPlayerBounty.hpp
index 5dd7b1a77..331d729ef 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerBounty.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerBounty.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerBounty(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCast.cpp b/components/openmw-mp/Packets/Player/PacketPlayerCast.cpp
index a217ace0b..89b03f9ce 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerCast.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCast.cpp
@@ -10,9 +10,9 @@ PacketPlayerCast::PacketPlayerCast(RakNet::RakPeerInterface *peer) : PlayerPacke
     packetID = ID_PLAYER_CAST;
 }
 
-void PacketPlayerCast::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerCast::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->cast.target.isPlayer, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCast.hpp b/components/openmw-mp/Packets/Player/PacketPlayerCast.hpp
index 02866e067..126ee4908 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerCast.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCast.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerCast(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellChange.cpp b/components/openmw-mp/Packets/Player/PacketPlayerCellChange.cpp
index 6c39c47cf..fdf85ba4b 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerCellChange.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCellChange.cpp
@@ -9,9 +9,9 @@ mwmp::PacketPlayerCellChange::PacketPlayerCellChange(RakNet::RakPeerInterface *p
     reliability = RELIABLE_ORDERED;
 }
 
-void mwmp::PacketPlayerCellChange::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerCellChange::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->cell.mData, send, true);
     RW(player->cell.mName, send, true);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellChange.hpp b/components/openmw-mp/Packets/Player/PacketPlayerCellChange.hpp
index f191394c4..a6c3607d9 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerCellChange.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCellChange.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerCellChange(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp b/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp
index b54ce8fa3..081d2ba37 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp
@@ -9,9 +9,9 @@ mwmp::PacketPlayerCellState::PacketPlayerCellState(RakNet::RakPeerInterface *pee
     reliability = RELIABLE_ORDERED;
 }
 
-void mwmp::PacketPlayerCellState::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerCellState::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     uint32_t count;
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellState.hpp b/components/openmw-mp/Packets/Player/PacketPlayerCellState.hpp
index bfad68ed0..38dbd8fb5 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerCellState.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCellState.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerCellState(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCharGen.cpp b/components/openmw-mp/Packets/Player/PacketPlayerCharGen.cpp
index de0ecf5eb..b502033b6 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerCharGen.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCharGen.cpp
@@ -6,9 +6,9 @@ mwmp::PacketPlayerCharGen::PacketPlayerCharGen(RakNet::RakPeerInterface *peer) :
     packetID = ID_PLAYER_CHARGEN;
 }
 
-void mwmp::PacketPlayerCharGen::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerCharGen::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->charGenState, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCharGen.hpp b/components/openmw-mp/Packets/Player/PacketPlayerCharGen.hpp
index e3c72f4bd..8ed0b51cf 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerCharGen.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerCharGen.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerCharGen(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerClass.cpp b/components/openmw-mp/Packets/Player/PacketPlayerClass.cpp
index 3fd415bae..d58e636b2 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerClass.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerClass.cpp
@@ -6,9 +6,9 @@ mwmp::PacketPlayerClass::PacketPlayerClass(RakNet::RakPeerInterface *peer) : Pla
     packetID = ID_PLAYER_CHARCLASS;
 }
 
-void mwmp::PacketPlayerClass::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerClass::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs,  send);
+    PlayerPacket::Packet(newBitstream,  send);
 
     RW(player->charClass.mId, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerClass.hpp b/components/openmw-mp/Packets/Player/PacketPlayerClass.hpp
index f8f6c1f3b..8046d93f2 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerClass.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerClass.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerClass(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDeath.cpp b/components/openmw-mp/Packets/Player/PacketPlayerDeath.cpp
index 94d8d6b0b..574d20a1f 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerDeath.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerDeath.cpp
@@ -8,9 +8,9 @@ PacketPlayerDeath::PacketPlayerDeath(RakNet::RakPeerInterface *peer) : PlayerPac
     packetID = ID_PLAYER_DEATH;
 }
 
-void PacketPlayerDeath::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerDeath::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->deathState, send);
     RW(player->killer.isPlayer, send);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp b/components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp
index fd2d903e1..82eca4eb4 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerDeath(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp b/components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
index cd5aaaf97..445b272cf 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
@@ -9,9 +9,9 @@ PacketPlayerEquipment::PacketPlayerEquipment(RakNet::RakPeerInterface *peer) : P
     packetID = ID_PLAYER_EQUIPMENT;
 }
 
-void PacketPlayerEquipment::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerEquipment::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->exchangeFullInfo, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp b/components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
index 6a38d8862..eae6c807b 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerEquipment(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
         void ExchangeItemInformation(Item &item, bool send);
     };
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerFaction.cpp b/components/openmw-mp/Packets/Player/PacketPlayerFaction.cpp
index 6fb68cdf5..79a8b0b80 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerFaction.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerFaction.cpp
@@ -9,9 +9,9 @@ PacketPlayerFaction::PacketPlayerFaction(RakNet::RakPeerInterface *peer) : Playe
     packetID = ID_PLAYER_FACTION;
 }
 
-void PacketPlayerFaction::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerFaction::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->factionChanges.action, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerFaction.hpp b/components/openmw-mp/Packets/Player/PacketPlayerFaction.hpp
index 73efd2c6b..f3baa7930 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerFaction.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerFaction.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerFaction(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerInput.cpp b/components/openmw-mp/Packets/Player/PacketPlayerInput.cpp
index e088e531f..b71b1e06e 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerInput.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerInput.cpp
@@ -8,9 +8,9 @@ PacketPlayerInput::PacketPlayerInput(RakNet::RakPeerInterface *peer) : PlayerPac
     packetID = ID_PLAYER_INPUT;
 }
 
-void PacketPlayerInput::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerInput::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     // Placeholder
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerInput.hpp b/components/openmw-mp/Packets/Player/PacketPlayerInput.hpp
index fd2266fdc..0161635ec 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerInput.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerInput.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerInput(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp b/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp
index 2bf6389e3..4eb568456 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp
@@ -9,9 +9,9 @@ PacketPlayerInventory::PacketPlayerInventory(RakNet::RakPeerInterface *peer) : P
     packetID = ID_PLAYER_INVENTORY;
 }
 
-void PacketPlayerInventory::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerInventory::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->inventoryChanges.action, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerInventory.hpp b/components/openmw-mp/Packets/Player/PacketPlayerInventory.hpp
index c41538004..ce3b0fbb9 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerInventory.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerInventory.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerInventory(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerItemUse.cpp b/components/openmw-mp/Packets/Player/PacketPlayerItemUse.cpp
index 155488d32..2b63aecdc 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerItemUse.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerItemUse.cpp
@@ -8,9 +8,9 @@ PacketPlayerItemUse::PacketPlayerItemUse(RakNet::RakPeerInterface *peer) : Playe
     packetID = ID_PLAYER_ITEM_USE;
 }
 
-void PacketPlayerItemUse::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerItemUse::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->usedItem.refId, send, true);
     RW(player->usedItem.count, send);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerItemUse.hpp b/components/openmw-mp/Packets/Player/PacketPlayerItemUse.hpp
index ef726d1ce..2c10d4651 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerItemUse.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerItemUse.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerItemUse(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerJail.cpp b/components/openmw-mp/Packets/Player/PacketPlayerJail.cpp
index b0be8e11c..900bea1d6 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerJail.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerJail.cpp
@@ -9,9 +9,9 @@ PacketPlayerJail::PacketPlayerJail(RakNet::RakPeerInterface *peer) : PlayerPacke
     packetID = ID_PLAYER_JAIL;
 }
 
-void PacketPlayerJail::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerJail::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->jailDays, send);
     RW(player->ignoreJailTeleportation, send);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerJail.hpp b/components/openmw-mp/Packets/Player/PacketPlayerJail.hpp
index 836bd1100..c09865254 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerJail.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerJail.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerJail(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp b/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp
index a4e9f8221..0f60736df 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp
@@ -9,9 +9,9 @@ PacketPlayerJournal::PacketPlayerJournal(RakNet::RakPeerInterface *peer) : Playe
     packetID = ID_PLAYER_JOURNAL;
 }
 
-void PacketPlayerJournal::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerJournal::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     uint32_t count;
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerJournal.hpp b/components/openmw-mp/Packets/Player/PacketPlayerJournal.hpp
index 189af506f..01ddfd2bb 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerJournal.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerJournal.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerJournal(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerLevel.cpp b/components/openmw-mp/Packets/Player/PacketPlayerLevel.cpp
index 22256489f..a8da24bf6 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerLevel.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerLevel.cpp
@@ -8,9 +8,9 @@ PacketPlayerLevel::PacketPlayerLevel(RakNet::RakPeerInterface *peer) : PlayerPac
     packetID = ID_PLAYER_LEVEL;
 }
 
-void PacketPlayerLevel::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerLevel::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->creatureStats.mLevel, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerLevel.hpp b/components/openmw-mp/Packets/Player/PacketPlayerLevel.hpp
index dac2aebec..e3a96a31c 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerLevel.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerLevel.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerLevel(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.cpp b/components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.cpp
index a80f1de05..ac9931e69 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.cpp
@@ -8,9 +8,9 @@ PacketPlayerMiscellaneous::PacketPlayerMiscellaneous(RakNet::RakPeerInterface *p
     packetID = ID_PLAYER_MISCELLANEOUS;
 }
 
-void PacketPlayerMiscellaneous::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerMiscellaneous::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->miscellaneousChangeType, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.hpp b/components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.hpp
index b3c178cba..c6c18f553 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerMiscellaneous(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerMomentum.cpp b/components/openmw-mp/Packets/Player/PacketPlayerMomentum.cpp
index 5451aa96e..52b186f18 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerMomentum.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerMomentum.cpp
@@ -9,9 +9,9 @@ PacketPlayerMomentum::PacketPlayerMomentum(RakNet::RakPeerInterface *peer) : Pla
     priority = MEDIUM_PRIORITY;
 }
 
-void PacketPlayerMomentum::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerMomentum::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
     
     RW(player->momentum.pos, send, true);
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerMomentum.hpp b/components/openmw-mp/Packets/Player/PacketPlayerMomentum.hpp
index 36062b744..f86707d5d 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerMomentum.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerMomentum.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerMomentum(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp b/components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp
index 4f95b3ac1..093124cb0 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp
@@ -11,9 +11,9 @@ PacketPlayerPosition::PacketPlayerPosition(RakNet::RakPeerInterface *peer) : Pla
     //reliability = UNRELIABLE_SEQUENCED;
 }
 
-void PacketPlayerPosition::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerPosition::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->position, send, 1);
     RW(player->direction, send, 1);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerPosition.hpp b/components/openmw-mp/Packets/Player/PacketPlayerPosition.hpp
index 266136a79..25261521a 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerPosition.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerPosition.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerPosition(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.cpp b/components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.cpp
index 7756fb3c3..3818d7e23 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.cpp
@@ -9,9 +9,9 @@ PacketPlayerQuickKeys::PacketPlayerQuickKeys(RakNet::RakPeerInterface *peer) : P
     packetID = ID_PLAYER_QUICKKEYS;
 }
 
-void PacketPlayerQuickKeys::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerQuickKeys::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     uint32_t count;
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.hpp b/components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.hpp
index 26a6f64b0..2e538ccef 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerQuickKeys(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerRegionAuthority.cpp b/components/openmw-mp/Packets/Player/PacketPlayerRegionAuthority.cpp
index 1f7bd0ce4..61745fc18 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerRegionAuthority.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerRegionAuthority.cpp
@@ -8,9 +8,9 @@ mwmp::PacketWorldRegionAuthority::PacketWorldRegionAuthority(RakNet::RakPeerInte
     reliability = RELIABLE_ORDERED;
 }
 
-void mwmp::PacketWorldRegionAuthority::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketWorldRegionAuthority::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->authorityRegion, send, true);
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerReputation.cpp b/components/openmw-mp/Packets/Player/PacketPlayerReputation.cpp
index 25f058a98..5f13c2a75 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerReputation.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerReputation.cpp
@@ -8,9 +8,9 @@ PacketPlayerReputation::PacketPlayerReputation(RakNet::RakPeerInterface *peer) :
     packetID = ID_PLAYER_REPUTATION;
 }
 
-void PacketPlayerReputation::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerReputation::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->npcStats.mReputation, send);
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerReputation.hpp b/components/openmw-mp/Packets/Player/PacketPlayerReputation.hpp
index d4b8128e4..dfc989b3f 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerReputation.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerReputation.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerReputation(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerRest.cpp b/components/openmw-mp/Packets/Player/PacketPlayerRest.cpp
index 7d20d9d5a..78f7215a6 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerRest.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerRest.cpp
@@ -8,9 +8,9 @@ PacketPlayerRest::PacketPlayerRest(RakNet::RakPeerInterface *peer) : PlayerPacke
     packetID = ID_PLAYER_REST;
 }
 
-void PacketPlayerRest::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerRest::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     // Placeholder to be filled in later
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerRest.hpp b/components/openmw-mp/Packets/Player/PacketPlayerRest.hpp
index a7637f678..64a545ee5 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerRest.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerRest.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerRest(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp b/components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp
index eb0b3cc0c..321b9b331 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp
@@ -9,9 +9,9 @@ PacketPlayerResurrect::PacketPlayerResurrect(RakNet::RakPeerInterface *peer) : P
     packetID = ID_PLAYER_RESURRECT;
 }
 
-void PacketPlayerResurrect::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerResurrect::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->resurrectType, send);
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerResurrect.hpp b/components/openmw-mp/Packets/Player/PacketPlayerResurrect.hpp
index 3eda3b0e6..2b6e2b24a 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerResurrect.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerResurrect.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerResurrect(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerShapeshift.cpp b/components/openmw-mp/Packets/Player/PacketPlayerShapeshift.cpp
index 26455a1e7..9d5eb07ec 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerShapeshift.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerShapeshift.cpp
@@ -8,9 +8,9 @@ PacketPlayerShapeshift::PacketPlayerShapeshift(RakNet::RakPeerInterface *peer) :
     packetID = ID_PLAYER_SHAPESHIFT;
 }
 
-void PacketPlayerShapeshift::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerShapeshift::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->scale, send);
     RW(player->isWerewolf, send);
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerShapeshift.hpp b/components/openmw-mp/Packets/Player/PacketPlayerShapeshift.hpp
index fb6c41045..8070ba815 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerShapeshift.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerShapeshift.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerShapeshift(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp b/components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
index b44eb9a59..feb020789 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
@@ -10,9 +10,9 @@ PacketPlayerSkill::PacketPlayerSkill(RakNet::RakPeerInterface *peer) : PlayerPac
     packetID = ID_PLAYER_SKILL;
 }
 
-void PacketPlayerSkill::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerSkill::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->exchangeFullInfo, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSkill.hpp b/components/openmw-mp/Packets/Player/PacketPlayerSkill.hpp
index 9825aea41..53896af45 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerSkill.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSkill.hpp
@@ -12,7 +12,7 @@ namespace mwmp
         const static int AttributeCount = 8;
         PacketPlayerSkill(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSpeech.cpp b/components/openmw-mp/Packets/Player/PacketPlayerSpeech.cpp
index 7f4a24cfc..41100e547 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerSpeech.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSpeech.cpp
@@ -6,9 +6,9 @@ mwmp::PacketPlayerSpeech::PacketPlayerSpeech(RakNet::RakPeerInterface *peer) : P
     packetID = ID_PLAYER_SPEECH;
 }
 
-void mwmp::PacketPlayerSpeech::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerSpeech::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->sound, send);
 }
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSpeech.hpp b/components/openmw-mp/Packets/Player/PacketPlayerSpeech.hpp
index 98f38319c..aade8bae3 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerSpeech.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSpeech.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerSpeech(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp
index 67c30fda5..f8ca8c6d8 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp
@@ -9,9 +9,9 @@ PacketPlayerSpellbook::PacketPlayerSpellbook(RakNet::RakPeerInterface *peer) : P
     packetID = ID_PLAYER_SPELLBOOK;
 }
 
-void PacketPlayerSpellbook::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerSpellbook::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->spellbookChanges.action, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.hpp b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.hpp
index eeaa4c13c..7990d8997 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerSpellbook(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.cpp b/components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.cpp
index 826011d28..d3016bcd0 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.cpp
@@ -9,9 +9,9 @@ PacketPlayerStatsDynamic::PacketPlayerStatsDynamic(RakNet::RakPeerInterface *pee
     packetID = ID_PLAYER_STATS_DYNAMIC;
 }
 
-void PacketPlayerStatsDynamic::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerStatsDynamic::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     RW(player->exchangeFullInfo, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.hpp b/components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.hpp
index f0ae8f774..509afce88 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerStatsDynamic(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerTeam.cpp b/components/openmw-mp/Packets/Player/PacketPlayerTeam.cpp
index bd53797eb..b2d130440 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerTeam.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerTeam.cpp
@@ -6,9 +6,9 @@ mwmp::PacketPlayerTeam::PacketPlayerTeam(RakNet::RakPeerInterface *peer) : Playe
     packetID = ID_PLAYER_TEAM;
 }
 
-void mwmp::PacketPlayerTeam::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerTeam::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     uint32_t count;
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerTeam.hpp b/components/openmw-mp/Packets/Player/PacketPlayerTeam.hpp
index e7e72fcff..f1622012b 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerTeam.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerTeam.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerTeam(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerTopic.cpp b/components/openmw-mp/Packets/Player/PacketPlayerTopic.cpp
index 3179c62a7..a00706bbc 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerTopic.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerTopic.cpp
@@ -9,9 +9,9 @@ PacketPlayerTopic::PacketPlayerTopic(RakNet::RakPeerInterface *peer) : PlayerPac
     packetID = ID_PLAYER_TOPIC;
 }
 
-void PacketPlayerTopic::Packet(RakNet::BitStream *bs, bool send)
+void PacketPlayerTopic::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    PlayerPacket::Packet(bs, send);
+    PlayerPacket::Packet(newBitstream, send);
 
     uint32_t count;
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerTopic.hpp b/components/openmw-mp/Packets/Player/PacketPlayerTopic.hpp
index d111b1e74..9394dde08 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerTopic.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerTopic.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketPlayerTopic(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Player/PlayerPacket.cpp b/components/openmw-mp/Packets/Player/PlayerPacket.cpp
index a0544809d..7065a72f1 100644
--- a/components/openmw-mp/Packets/Player/PlayerPacket.cpp
+++ b/components/openmw-mp/Packets/Player/PlayerPacket.cpp
@@ -19,9 +19,9 @@ PlayerPacket::~PlayerPacket()
 
 }
 
-void PlayerPacket::setPlayer(BasePlayer *player)
+void PlayerPacket::setPlayer(BasePlayer *newPlayer)
 {
-    this->player = player;
+    player = newPlayer;
     guid = player->guid;
 }
 
diff --git a/components/openmw-mp/Packets/Player/PlayerPacket.hpp b/components/openmw-mp/Packets/Player/PlayerPacket.hpp
index 1f6e0fa05..0a4d59542 100644
--- a/components/openmw-mp/Packets/Player/PlayerPacket.hpp
+++ b/components/openmw-mp/Packets/Player/PlayerPacket.hpp
@@ -18,7 +18,7 @@ namespace mwmp
 
         ~PlayerPacket();
 
-        void setPlayer(BasePlayer *player);
+        void setPlayer(BasePlayer *newPlayer);
         BasePlayer *getPlayer();
 
     protected:
diff --git a/components/openmw-mp/Packets/System/PacketSystemHandshake.cpp b/components/openmw-mp/Packets/System/PacketSystemHandshake.cpp
index 207956095..ceeca049c 100644
--- a/components/openmw-mp/Packets/System/PacketSystemHandshake.cpp
+++ b/components/openmw-mp/Packets/System/PacketSystemHandshake.cpp
@@ -9,9 +9,9 @@ PacketSystemHandshake::PacketSystemHandshake(RakNet::RakPeerInterface *peer) : S
     orderChannel = CHANNEL_SYSTEM;
 }
 
-void PacketSystemHandshake::Packet(RakNet::BitStream *bs, bool send)
+void PacketSystemHandshake::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    SystemPacket::Packet(bs, send);
+    SystemPacket::Packet(newBitstream, send);
 
     if (!RW(system->playerName, send, true, maxNameLength) ||
         !RW(system->serverPassword, send, true, maxPasswordLength))
diff --git a/components/openmw-mp/Packets/System/PacketSystemHandshake.hpp b/components/openmw-mp/Packets/System/PacketSystemHandshake.hpp
index a23a833cd..eec8974aa 100644
--- a/components/openmw-mp/Packets/System/PacketSystemHandshake.hpp
+++ b/components/openmw-mp/Packets/System/PacketSystemHandshake.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketSystemHandshake(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
 
         const static uint32_t maxNameLength = 256;
         const static uint32_t maxPasswordLength = 256;
diff --git a/components/openmw-mp/Packets/System/SystemPacket.cpp b/components/openmw-mp/Packets/System/SystemPacket.cpp
index c7ec697b3..e2db74728 100644
--- a/components/openmw-mp/Packets/System/SystemPacket.cpp
+++ b/components/openmw-mp/Packets/System/SystemPacket.cpp
@@ -19,9 +19,9 @@ SystemPacket::~SystemPacket()
 
 }
 
-void SystemPacket::setSystem(BaseSystem *system)
+void SystemPacket::setSystem(BaseSystem *newSystem)
 {
-    this->system = system;
+    system = newSystem;
     guid = system->guid;
 }
 
diff --git a/components/openmw-mp/Packets/System/SystemPacket.hpp b/components/openmw-mp/Packets/System/SystemPacket.hpp
index 1d92c50c6..19e26ff33 100644
--- a/components/openmw-mp/Packets/System/SystemPacket.hpp
+++ b/components/openmw-mp/Packets/System/SystemPacket.hpp
@@ -18,7 +18,7 @@ namespace mwmp
 
         ~SystemPacket();
 
-        void setSystem(BaseSystem *system);
+        void setSystem(BaseSystem *newSystem);
         BaseSystem *getSystem();
 
     protected:
diff --git a/components/openmw-mp/Packets/Worldstate/PacketCellReset.cpp b/components/openmw-mp/Packets/Worldstate/PacketCellReset.cpp
index d89f789f6..6a10a894a 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketCellReset.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketCellReset.cpp
@@ -9,9 +9,9 @@ PacketCellReset::PacketCellReset(RakNet::RakPeerInterface *peer) : WorldstatePac
     orderChannel = CHANNEL_SYSTEM;
 }
 
-void PacketCellReset::Packet(RakNet::BitStream *bs, bool send)
+void PacketCellReset::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     // Placeholder
 }
diff --git a/components/openmw-mp/Packets/Worldstate/PacketCellReset.hpp b/components/openmw-mp/Packets/Worldstate/PacketCellReset.hpp
index 11ab1cd99..51fd26820 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketCellReset.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketCellReset.hpp
@@ -11,7 +11,7 @@ namespace mwmp
     public:
         PacketCellReset(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketClientScriptSettings.cpp b/components/openmw-mp/Packets/Worldstate/PacketClientScriptSettings.cpp
index 673023d86..1e7991757 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketClientScriptSettings.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketClientScriptSettings.cpp
@@ -9,9 +9,9 @@ PacketClientScriptSettings::PacketClientScriptSettings(RakNet::RakPeerInterface
     orderChannel = CHANNEL_WORLDSTATE;
 }
 
-void PacketClientScriptSettings::Packet(RakNet::BitStream *bs, bool send)
+void PacketClientScriptSettings::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     uint32_t clientScriptsCount;
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketClientScriptSettings.hpp b/components/openmw-mp/Packets/Worldstate/PacketClientScriptSettings.hpp
index 378200bad..e772079e8 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketClientScriptSettings.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketClientScriptSettings.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketClientScriptSettings(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.cpp b/components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.cpp
index d2c420672..d4766dc39 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.cpp
@@ -12,9 +12,9 @@ PacketRecordDynamic::PacketRecordDynamic(RakNet::RakPeerInterface *peer) : World
     orderChannel = CHANNEL_WORLDSTATE;
 }
 
-void PacketRecordDynamic::Packet(RakNet::BitStream *bs, bool send)
+void PacketRecordDynamic::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     RW(worldstate->recordsType, send);
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.hpp b/components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.hpp
index 66debd004..203312b21 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.hpp
@@ -11,7 +11,7 @@ namespace mwmp
     public:
         PacketRecordDynamic(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
 
         void ProcessEffects(ESM::EffectList &effectList, bool send);
         void ProcessBodyParts(ESM::PartReferenceList &bodyPartList, bool send);
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldCollisionOverride.cpp b/components/openmw-mp/Packets/Worldstate/PacketWorldCollisionOverride.cpp
index 5570d37ec..37b980aed 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldCollisionOverride.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldCollisionOverride.cpp
@@ -9,9 +9,9 @@ PacketWorldCollisionOverride::PacketWorldCollisionOverride(RakNet::RakPeerInterf
     orderChannel = CHANNEL_WORLDSTATE;
 }
 
-void PacketWorldCollisionOverride::Packet(RakNet::BitStream *bs, bool send)
+void PacketWorldCollisionOverride::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     RW(worldstate->hasPlayerCollision, send);
     RW(worldstate->hasActorCollision, send);
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldCollisionOverride.hpp b/components/openmw-mp/Packets/Worldstate/PacketWorldCollisionOverride.hpp
index 2698ae0f7..ba772ce94 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldCollisionOverride.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldCollisionOverride.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketWorldCollisionOverride(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldKillCount.cpp b/components/openmw-mp/Packets/Worldstate/PacketWorldKillCount.cpp
index 0c158ecba..9ba870b5e 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldKillCount.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldKillCount.cpp
@@ -9,9 +9,9 @@ PacketWorldKillCount::PacketWorldKillCount(RakNet::RakPeerInterface *peer) : Wor
     orderChannel = CHANNEL_SYSTEM;
 }
 
-void PacketWorldKillCount::Packet(RakNet::BitStream *bs, bool send)
+void PacketWorldKillCount::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     uint32_t killChangesCount;
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldKillCount.hpp b/components/openmw-mp/Packets/Worldstate/PacketWorldKillCount.hpp
index 921470238..44cdb23d9 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldKillCount.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldKillCount.hpp
@@ -11,7 +11,7 @@ namespace mwmp
     public:
         PacketWorldKillCount(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp b/components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
index 5d399aa69..885829ecb 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
@@ -10,9 +10,9 @@ PacketWorldMap::PacketWorldMap(RakNet::RakPeerInterface *peer) : WorldstatePacke
     packetID = ID_WORLD_MAP;
 }
 
-void PacketWorldMap::Packet(RakNet::BitStream *bs, bool send)
+void PacketWorldMap::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     uint32_t changesCount;
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldMap.hpp b/components/openmw-mp/Packets/Worldstate/PacketWorldMap.hpp
index b5496f58d..f468a0980 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldMap.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldMap.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketWorldMap(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldRegionAuthority.cpp b/components/openmw-mp/Packets/Worldstate/PacketWorldRegionAuthority.cpp
index 82e7adfd7..30d4e5834 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldRegionAuthority.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldRegionAuthority.cpp
@@ -8,9 +8,9 @@ mwmp::PacketWorldRegionAuthority::PacketWorldRegionAuthority(RakNet::RakPeerInte
     reliability = RELIABLE_ORDERED;
 }
 
-void mwmp::PacketWorldRegionAuthority::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketWorldRegionAuthority::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     RW(worldstate->authorityRegion, send, true);
 }
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldRegionAuthority.hpp b/components/openmw-mp/Packets/Worldstate/PacketWorldRegionAuthority.hpp
index 0069aa324..ef8927c0c 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldRegionAuthority.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldRegionAuthority.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketWorldRegionAuthority(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldTime.cpp b/components/openmw-mp/Packets/Worldstate/PacketWorldTime.cpp
index 6bf43da12..a6e42a805 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldTime.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldTime.cpp
@@ -9,9 +9,9 @@ PacketWorldTime::PacketWorldTime(RakNet::RakPeerInterface *peer) : WorldstatePac
     orderChannel = CHANNEL_WORLDSTATE;
 }
 
-void PacketWorldTime::Packet(RakNet::BitStream *bs, bool send)
+void PacketWorldTime::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     RW(worldstate->time.hour, send);
     RW(worldstate->time.day, send);
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldTime.hpp b/components/openmw-mp/Packets/Worldstate/PacketWorldTime.hpp
index 5a9e93723..00859a982 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldTime.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldTime.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketWorldTime(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldWeather.cpp b/components/openmw-mp/Packets/Worldstate/PacketWorldWeather.cpp
index 75887d4ee..144dbcec6 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldWeather.cpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldWeather.cpp
@@ -9,9 +9,9 @@ PacketWorldWeather::PacketWorldWeather(RakNet::RakPeerInterface *peer) : Worldst
     orderChannel = CHANNEL_WORLDSTATE;
 }
 
-void PacketWorldWeather::Packet(RakNet::BitStream *bs, bool send)
+void PacketWorldWeather::Packet(RakNet::BitStream *newBitstream, bool send)
 {
-    WorldstatePacket::Packet(bs, send);
+    WorldstatePacket::Packet(newBitstream, send);
 
     RW(worldstate->forceWeather, send);
     RW(worldstate->weather.region, send, true);
diff --git a/components/openmw-mp/Packets/Worldstate/PacketWorldWeather.hpp b/components/openmw-mp/Packets/Worldstate/PacketWorldWeather.hpp
index 17a4a6e7e..6f39f47a3 100644
--- a/components/openmw-mp/Packets/Worldstate/PacketWorldWeather.hpp
+++ b/components/openmw-mp/Packets/Worldstate/PacketWorldWeather.hpp
@@ -10,7 +10,7 @@ namespace mwmp
     public:
         PacketWorldWeather(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
     };
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/WorldstatePacket.cpp b/components/openmw-mp/Packets/Worldstate/WorldstatePacket.cpp
index 328eae26d..9d766f7c9 100644
--- a/components/openmw-mp/Packets/Worldstate/WorldstatePacket.cpp
+++ b/components/openmw-mp/Packets/Worldstate/WorldstatePacket.cpp
@@ -19,9 +19,9 @@ WorldstatePacket::~WorldstatePacket()
 
 }
 
-void WorldstatePacket::setWorldstate(BaseWorldstate *worldstate)
+void WorldstatePacket::setWorldstate(BaseWorldstate *newWorldstate)
 {
-    this->worldstate = worldstate;
+    worldstate = newWorldstate;
     guid = worldstate->guid;
 }
 
diff --git a/components/openmw-mp/Packets/Worldstate/WorldstatePacket.hpp b/components/openmw-mp/Packets/Worldstate/WorldstatePacket.hpp
index f961dd82e..3c6c4a725 100644
--- a/components/openmw-mp/Packets/Worldstate/WorldstatePacket.hpp
+++ b/components/openmw-mp/Packets/Worldstate/WorldstatePacket.hpp
@@ -18,7 +18,7 @@ namespace mwmp
 
         ~WorldstatePacket();
 
-        void setWorldstate(BaseWorldstate *worldstate);
+        void setWorldstate(BaseWorldstate *newWorldstate);
         BaseWorldstate *getWorldstate();
 
     protected: