diff --git a/apps/openmw-mp/ProcessorInitializer.cpp b/apps/openmw-mp/ProcessorInitializer.cpp
index 7eb6c84db..1c0be2e2b 100644
--- a/apps/openmw-mp/ProcessorInitializer.cpp
+++ b/apps/openmw-mp/ProcessorInitializer.cpp
@@ -19,7 +19,7 @@
 #include "processors/player/ProcessorPlayerDynamicStats.hpp"
 #include "processors/player/ProcessorPlayerDeath.hpp"
 #include "processors/player/ProcessorPlayerResurrect.hpp"
-#include "processors/player/ProcessorPlayerDrawState.hpp"
+#include "processors/player/ProcessorPlayerAnimFlags.hpp"
 #include "processors/player/ProcessorChatMsg.hpp"
 #include "processors/player/ProcessorPlayerCharGen.hpp"
 #include "processors/player/ProcessorGUIMessageBox.hpp"
@@ -28,10 +28,10 @@
 #include "processors/actor/ProcessorActorList.hpp"
 #include "processors/actor/ProcessorActorAuthority.hpp"
 #include "processors/actor/ProcessorActorTest.hpp"
+#include "processors/actor/ProcessorActorAnimFlags.hpp"
 #include "processors/actor/ProcessorActorAnimPlay.hpp"
 #include "processors/actor/ProcessorActorAttack.hpp"
 #include "processors/actor/ProcessorActorCellChange.hpp"
-#include "processors/actor/ProcessorActorDrawState.hpp"
 #include "processors/actor/ProcessorActorDynamicStats.hpp"
 #include "processors/actor/ProcessorActorHeadRotation.hpp"
 #include "processors/actor/ProcessorActorPosition.hpp"
@@ -73,7 +73,7 @@ void ProcessorInitializer()
     PlayerProcessor::AddProcessor(new ProcessorPlayerDynamicStats());
     PlayerProcessor::AddProcessor(new ProcessorPlayerDeath());
     PlayerProcessor::AddProcessor(new ProcessorPlayerResurrect());
-    PlayerProcessor::AddProcessor(new ProcessorPlayerDrawState());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerAnimFlags());
     PlayerProcessor::AddProcessor(new ProcessorChatMsg());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCharGen());
     PlayerProcessor::AddProcessor(new ProcessorGUIMessageBox());
@@ -81,10 +81,10 @@ void ProcessorInitializer()
 
     ActorProcessor::AddProcessor(new ProcessorActorList());
     ActorProcessor::AddProcessor(new ProcessorActorAuthority());
+    ActorProcessor::AddProcessor(new ProcessorActorAnimFlags());
     ActorProcessor::AddProcessor(new ProcessorActorAnimPlay());
     ActorProcessor::AddProcessor(new ProcessorActorAttack());
     ActorProcessor::AddProcessor(new ProcessorActorCellChange());
-    ActorProcessor::AddProcessor(new ProcessorActorDrawState());
     ActorProcessor::AddProcessor(new ProcessorActorDynamicStats());
     ActorProcessor::AddProcessor(new ProcessorActorHeadRotation());
     ActorProcessor::AddProcessor(new ProcessorActorPosition());
diff --git a/apps/openmw-mp/processors/actor/ProcessorActorDrawState.hpp b/apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp
similarity index 54%
rename from apps/openmw-mp/processors/actor/ProcessorActorDrawState.hpp
rename to apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp
index b870a0261..7381ac311 100644
--- a/apps/openmw-mp/processors/actor/ProcessorActorDrawState.hpp
+++ b/apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp
@@ -1,16 +1,16 @@
-#ifndef OPENMW_PROCESSORACTORDRAWSTATE_HPP
-#define OPENMW_PROCESSORACTORDRAWSTATE_HPP
+#ifndef OPENMW_PROCESSORACTORANIMFLAGS_HPP
+#define OPENMW_PROCESSORACTORANIMFLAGS_HPP
 
 #include "apps/openmw-mp/ActorProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorActorDrawState : public ActorProcessor
+    class ProcessorActorAnimFlags : public ActorProcessor
     {
     public:
-        ProcessorActorDrawState()
+        ProcessorActorAnimFlags()
         {
-            BPP_INIT(ID_ACTOR_DRAW_STATE)
+            BPP_INIT(ID_ACTOR_ANIM_FLAGS)
         }
 
         void Do(ActorPacket &packet, Player &player, BaseActorList &actorList) override
@@ -21,9 +21,9 @@ namespace mwmp
             if (serverCell != nullptr)
                 serverCell->sendToLoaded(&packet, &actorList);
 
-            //Script::Call<Script::CallbackIdentity("OnActorDrawState")>(player.getId(), actorList.cell.getDescription().c_str());
+            //Script::Call<Script::CallbackIdentity("OnActorAnimFlags")>(player.getId(), actorList.cell.getDescription().c_str());
         }
     };
 }
 
-#endif //OPENMW_PROCESSORACTORDRAWSTATE_HPP
+#endif //OPENMW_PROCESSORACTORANIMFLAGS_HPP
diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerDrawState.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp
similarity index 55%
rename from apps/openmw-mp/processors/player/ProcessorPlayerDrawState.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp
index eff03f0d4..676673c56 100644
--- a/apps/openmw-mp/processors/player/ProcessorPlayerDrawState.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp
@@ -2,20 +2,20 @@
 // Created by koncord on 01.04.17.
 //
 
-#ifndef OPENMW_PROCESSORPLAYERDRAWSTATE_HPP
-#define OPENMW_PROCESSORPLAYERDRAWSTATE_HPP
+#ifndef OPENMW_PROCESSORPLAYERANIMFLAGS_HPP
+#define OPENMW_PROCESSORPLAYERANIMFLAGS_HPP
 
 
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorPlayerDrawState : public PlayerProcessor
+    class ProcessorPlayerAnimFlags : public PlayerProcessor
     {
     public:
-        ProcessorPlayerDrawState()
+        ProcessorPlayerAnimFlags()
         {
-            BPP_INIT(ID_PLAYER_DRAWSTATE)
+            BPP_INIT(ID_PLAYER_ANIM_FLAGS)
         }
 
         void Do(PlayerPacket &packet, Player &player) override
@@ -30,4 +30,4 @@ namespace mwmp
 
 
 
-#endif //OPENMW_PROCESSORPLAYERDRAWSTATE_HPP
+#endif //OPENMW_PROCESSORPLAYERANIMFLAGS_HPP
diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
index 7a43ef4ed..d75b7b6ee 100644
--- a/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
@@ -46,26 +46,26 @@ namespace mwmp
                         playerController->GetPacket(ID_PLAYER_POS)->setPlayer(other);
                         playerController->GetPacket(ID_PLAYER_SKILL)->setPlayer(other);
                         playerController->GetPacket(ID_PLAYER_EQUIPMENT)->setPlayer(other);
-                        playerController->GetPacket(ID_PLAYER_DRAWSTATE)->setPlayer(other);
+                        playerController->GetPacket(ID_PLAYER_ANIM_FLAGS)->setPlayer(other);
 
                         playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->Send(pl->guid);
                         playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(pl->guid);
                         playerController->GetPacket(ID_PLAYER_POS)->Send(pl->guid);
                         playerController->GetPacket(ID_PLAYER_SKILL)->Send(pl->guid);
                         playerController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(pl->guid);
-                        playerController->GetPacket(ID_PLAYER_DRAWSTATE)->Send(pl->guid);
+                        playerController->GetPacket(ID_PLAYER_ANIM_FLAGS)->Send(pl->guid);
 
                         playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->setPlayer(pl);
                         playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->setPlayer(pl);
                         playerController->GetPacket(ID_PLAYER_SKILL)->setPlayer(pl);
                         playerController->GetPacket(ID_PLAYER_EQUIPMENT)->setPlayer(pl);
-                        playerController->GetPacket(ID_PLAYER_DRAWSTATE)->setPlayer(pl);
+                        playerController->GetPacket(ID_PLAYER_ANIM_FLAGS)->setPlayer(pl);
 
                         playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->Send(other->guid);
                         playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(other->guid);
                         playerController->GetPacket(ID_PLAYER_SKILL)->Send(other->guid);
                         playerController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(other->guid);
-                        playerController->GetPacket(ID_PLAYER_DRAWSTATE)->Send(other->guid);
+                        playerController->GetPacket(ID_PLAYER_ANIM_FLAGS)->Send(other->guid);
 
                         LOG_APPEND(Log::LOG_INFO, "- Finished information exchange with %s", other->npc.mName.c_str());
                     }
diff --git a/apps/openmw/mwmp/ActorList.cpp b/apps/openmw/mwmp/ActorList.cpp
index 6424ebea1..f97685c53 100644
--- a/apps/openmw/mwmp/ActorList.cpp
+++ b/apps/openmw/mwmp/ActorList.cpp
@@ -67,8 +67,8 @@ void ActorList::sendDrawStateActors()
     if (drawStateActors.size() > 0)
     {
         baseActors = drawStateActors;
-        Main::get().getNetworking()->getActorPacket(ID_ACTOR_DRAW_STATE)->setActorList(this);
-        Main::get().getNetworking()->getActorPacket(ID_ACTOR_DRAW_STATE)->Send();
+        Main::get().getNetworking()->getActorPacket(ID_ACTOR_ANIM_FLAGS)->setActorList(this);
+        Main::get().getNetworking()->getActorPacket(ID_ACTOR_ANIM_FLAGS)->Send();
     }
 }
 
diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp
index d367e1076..edf825217 100644
--- a/apps/openmw/mwmp/DedicatedPlayer.cpp
+++ b/apps/openmw/mwmp/DedicatedPlayer.cpp
@@ -281,7 +281,7 @@ void Players::update(float dt)
 
         ptrNpcStats->setBaseDisposition(255);
         pl->move(dt);
-        pl->updateDrawState();
+        pl->updateAnimFlags();
     }
 }
 
@@ -429,7 +429,7 @@ DedicatedPlayer *Players::getPlayer(const MWWorld::Ptr &ptr)
     return 0;
 }
 
-void DedicatedPlayer::updateDrawState()
+void DedicatedPlayer::updateAnimFlags()
 {
     using namespace MWMechanics;
 
diff --git a/apps/openmw/mwmp/DedicatedPlayer.hpp b/apps/openmw/mwmp/DedicatedPlayer.hpp
index f9606f279..b3bf6e0c0 100644
--- a/apps/openmw/mwmp/DedicatedPlayer.hpp
+++ b/apps/openmw/mwmp/DedicatedPlayer.hpp
@@ -46,7 +46,7 @@ namespace mwmp
         MWWorld::Ptr getLiveCellPtr();
         MWWorld::ManualRef* getRef();
         void move(float dt);
-        void updateDrawState();
+        void updateAnimFlags();
         void updateEquipment();
 
         void updateCell();
diff --git a/apps/openmw/mwmp/LocalActor.cpp b/apps/openmw/mwmp/LocalActor.cpp
index ee9e37855..2d2b98092 100644
--- a/apps/openmw/mwmp/LocalActor.cpp
+++ b/apps/openmw/mwmp/LocalActor.cpp
@@ -35,7 +35,7 @@ LocalActor::~LocalActor()
 void LocalActor::update(bool forceUpdate)
 {
     updatePosition(forceUpdate);
-    updateDrawStateAndFlags(forceUpdate);
+    updateAnimFlags(forceUpdate);
 }
 
 void LocalActor::updatePosition(bool forceUpdate)
@@ -53,7 +53,7 @@ void LocalActor::updatePosition(bool forceUpdate)
     }
 }
 
-void LocalActor::updateDrawStateAndFlags(bool forceUpdate)
+void LocalActor::updateAnimFlags(bool forceUpdate)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
     MWMechanics::NpcStats ptrNpcStats = ptr.getClass().getNpcStats(ptr);
diff --git a/apps/openmw/mwmp/LocalActor.hpp b/apps/openmw/mwmp/LocalActor.hpp
index b2fb73a38..e93499afc 100644
--- a/apps/openmw/mwmp/LocalActor.hpp
+++ b/apps/openmw/mwmp/LocalActor.hpp
@@ -17,7 +17,7 @@ namespace mwmp
         void update(bool forceUpdate);
 
         void updatePosition(bool forceUpdate);
-        void updateDrawStateAndFlags(bool forceUpdate);
+        void updateAnimFlags(bool forceUpdate);
 
         MWWorld::Ptr getPtr();
         void setPtr(const MWWorld::Ptr& newPtr);
diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index de27dccb6..32c99d880 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -70,7 +70,7 @@ void LocalPlayer::update()
 {
     updateCell();
     updatePosition();
-    updateDrawStateAndFlags();
+    updateAnimFlags();
     updateAttackState();
     updateDeadState();
     updateEquipment();
@@ -574,7 +574,7 @@ void LocalPlayer::updateDeadState(bool forceUpdate)
         isDead = false;
 }
 
-void LocalPlayer::updateDrawStateAndFlags(bool forceUpdate)
+void LocalPlayer::updateAnimFlags(bool forceUpdate)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
     MWWorld::Ptr player = world->getPlayerPtr();
@@ -641,8 +641,8 @@ void LocalPlayer::updateDrawStateAndFlags(bool forceUpdate)
         if (isJumping)
             updatePosition(true); // fix position after jump;
 
-        getNetworking()->getPlayerPacket(ID_PLAYER_DRAWSTATE)->setPlayer(this);
-        getNetworking()->getPlayerPacket(ID_PLAYER_DRAWSTATE)->Send();
+        getNetworking()->getPlayerPacket(ID_PLAYER_ANIM_FLAGS)->setPlayer(this);
+        getNetworking()->getPlayerPacket(ID_PLAYER_ANIM_FLAGS)->Send();
     }
 }
 
@@ -810,7 +810,7 @@ void LocalPlayer::setPosition()
     updatePosition(true);
 
     // Make sure we update our draw state, or we'll end up with the wrong one
-    updateDrawStateAndFlags(true);
+    updateAnimFlags(true);
 }
 
 void LocalPlayer::setCell()
diff --git a/apps/openmw/mwmp/LocalPlayer.hpp b/apps/openmw/mwmp/LocalPlayer.hpp
index 54830df43..b4dbe4ee9 100644
--- a/apps/openmw/mwmp/LocalPlayer.hpp
+++ b/apps/openmw/mwmp/LocalPlayer.hpp
@@ -35,7 +35,7 @@ namespace mwmp
         void updateInventory(bool forceUpdate = false);
         void updateAttackState(bool forceUpdate = false);
         void updateDeadState(bool forceUpdate = false);
-        void updateDrawStateAndFlags(bool forceUpdate = false);
+        void updateAnimFlags(bool forceUpdate = false);
 
         void addItems();
         void addSpells();
diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp
index 96f2088ba..c523391fa 100644
--- a/apps/openmw/mwmp/Networking.cpp
+++ b/apps/openmw/mwmp/Networking.cpp
@@ -628,15 +628,15 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
 
         break;
     }
-    case ID_PLAYER_DRAWSTATE:
+    case ID_PLAYER_ANIM_FLAGS:
     {
         if (guid == myGuid)
-            getLocalPlayer()->updateDrawStateAndFlags(true);
+            getLocalPlayer()->updateAnimFlags(true);
         else if (pl != 0)
         {
             myPacket->setPlayer(pl);
             myPacket->Packet(&bsIn, false);
-            pl->updateDrawState();
+            pl->updateAnimFlags();
         }
         break;
     }
@@ -871,7 +871,7 @@ void Networking::processActorPacket(RakNet::Packet *packet)
 
         break;
     }
-    case ID_ACTOR_DRAW_STATE:
+    case ID_ACTOR_ANIM_FLAGS:
     {
         //Main::get().getCellController()->readDrawStates(actorList);
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index c339fb353..2c5f8609d 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -157,7 +157,7 @@ add_component_dir (openmw-mp
         Packets/Player/PacketHandshake Packets/Player/PacketChatMessage
 
         Packets/Player/PacketPlayerBaseInfo Packets/Player/PacketPlayerPosition Packets/Player/PacketPlayerEquipment
-        Packets/Player/PacketPlayerAttack Packets/Player/PacketPlayerDynamicStats Packets/Player/PacketPlayerDrawState
+        Packets/Player/PacketPlayerAttack Packets/Player/PacketPlayerDynamicStats Packets/Player/PacketPlayerAnimFlags
         Packets/Player/PacketPlayerCharGen Packets/Player/PacketPlayerAttribute Packets/Player/PacketPlayerSkill
         Packets/Player/PacketPlayerLevel Packets/Player/PacketPlayerClass Packets/Player/PacketPlayerInventory
         Packets/Player/PacketPlayerSpellbook Packets/Player/PacketPlayerJournal Packets/Player/PacketPlayerActiveSkills
@@ -169,7 +169,7 @@ add_component_dir (openmw-mp
 
         Packets/Actor/PacketActorList Packets/Actor/PacketActorAuthority Packets/Actor/PacketActorTest
         Packets/Actor/PacketActorAnimPlay Packets/Actor/PacketActorAttack Packets/Actor/PacketActorCellChange
-        Packets/Actor/PacketActorDrawState Packets/Actor/PacketActorDynamicStats Packets/Actor/PacketActorHeadRotation
+        Packets/Actor/PacketActorAnimFlags Packets/Actor/PacketActorDynamicStats Packets/Actor/PacketActorHeadRotation
         Packets/Actor/PacketActorPosition Packets/Actor/PacketActorSpeech
 
         Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectScale
diff --git a/components/openmw-mp/Controllers/ActorPacketController.cpp b/components/openmw-mp/Controllers/ActorPacketController.cpp
index 49d3ed05b..57a186236 100644
--- a/components/openmw-mp/Controllers/ActorPacketController.cpp
+++ b/components/openmw-mp/Controllers/ActorPacketController.cpp
@@ -5,10 +5,10 @@
 #include "../Packets/Actor/PacketActorList.hpp"
 #include "../Packets/Actor/PacketActorAuthority.hpp"
 #include "../Packets/Actor/PacketActorTest.hpp"
+#include "../Packets/Actor/PacketActorAnimFlags.hpp"
 #include "../Packets/Actor/PacketActorAnimPlay.hpp"
 #include "../Packets/Actor/PacketActorAttack.hpp"
 #include "../Packets/Actor/PacketActorCellChange.hpp"
-#include "../Packets/Actor/PacketActorDrawState.hpp"
 #include "../Packets/Actor/PacketActorDynamicStats.hpp"
 #include "../Packets/Actor/PacketActorHeadRotation.hpp"
 #include "../Packets/Actor/PacketActorPosition.hpp"
@@ -30,10 +30,10 @@ mwmp::ActorPacketController::ActorPacketController(RakNet::RakPeerInterface *pee
     AddPacket<PacketActorList>(&packets, peer);
     AddPacket<PacketActorAuthority>(&packets, peer);
     AddPacket<PacketActorTest>(&packets, peer);
+    AddPacket<PacketActorAnimFlags>(&packets, peer);
     AddPacket<PacketActorAnimPlay>(&packets, peer);
     AddPacket<PacketActorAttack>(&packets, peer);
     AddPacket<PacketActorCellChange>(&packets, peer);
-    AddPacket<PacketActorDrawState>(&packets, peer);
     AddPacket<PacketActorDynamicStats>(&packets, peer);
     AddPacket<PacketActorHeadRotation>(&packets, peer);
     AddPacket<PacketActorPosition>(&packets, peer);
diff --git a/components/openmw-mp/Controllers/PlayerPacketController.cpp b/components/openmw-mp/Controllers/PlayerPacketController.cpp
index 4fc80207b..258559441 100644
--- a/components/openmw-mp/Controllers/PlayerPacketController.cpp
+++ b/components/openmw-mp/Controllers/PlayerPacketController.cpp
@@ -14,7 +14,7 @@
 #include "../Packets/Player/PacketPlayerDeath.hpp"
 #include "../Packets/Player/PacketSendMyID.hpp"
 #include "../Packets/Player/PacketDisconnect.hpp"
-#include "../Packets/Player/PacketPlayerDrawState.hpp"
+#include "../Packets/Player/PacketPlayerAnimFlags.hpp"
 #include "../Packets/Player/PacketChatMessage.hpp"
 #include "../Packets/Player/PacketPlayerCharGen.hpp"
 #include "../Packets/Player/PacketPlayerAttribute.hpp"
@@ -54,7 +54,7 @@ mwmp::PlayerPacketController::PlayerPacketController(RakNet::RakPeerInterface *p
     AddPacket<PacketPlayerResurrect>(&packets, peer);
 
     AddPacket<PacketPlayerDeath>(&packets, peer);
-    AddPacket<PacketPlayerDrawState>(&packets, peer);
+    AddPacket<PacketPlayerAnimFlags>(&packets, peer);
     AddPacket<PacketSendMyID>(&packets, peer);
     AddPacket<PacketDisconnect>(&packets, peer);
 
diff --git a/components/openmw-mp/NetworkMessages.hpp b/components/openmw-mp/NetworkMessages.hpp
index 3db1c25d7..2bec1ef8e 100644
--- a/components/openmw-mp/NetworkMessages.hpp
+++ b/components/openmw-mp/NetworkMessages.hpp
@@ -21,7 +21,7 @@ enum GameMessages
     ID_PLAYER_DEATH,
     ID_PLAYER_RESURRECT,
     ID_CHAT_MESSAGE,
-    ID_PLAYER_DRAWSTATE,
+    ID_PLAYER_ANIM_FLAGS,
 
     ID_PLAYER_ATTRIBUTE,
     ID_PLAYER_SKILL,
@@ -45,7 +45,7 @@ enum GameMessages
     ID_ACTOR_ANIM_PLAY,
     ID_ACTOR_ATTACK,
     ID_ACTOR_CELL_CHANGE,
-    ID_ACTOR_DRAW_STATE,
+    ID_ACTOR_ANIM_FLAGS,
     ID_ACTOR_DYNAMICSTATS,
     ID_ACTOR_HEAD_ROTATION,
     ID_ACTOR_POSITION,
diff --git a/components/openmw-mp/Packets/Actor/PacketActorDrawState.cpp b/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp
similarity index 83%
rename from components/openmw-mp/Packets/Actor/PacketActorDrawState.cpp
rename to components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp
index 620d39b57..9b8bdba8e 100644
--- a/components/openmw-mp/Packets/Actor/PacketActorDrawState.cpp
+++ b/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp
@@ -1,15 +1,15 @@
 #include <components/openmw-mp/NetworkMessages.hpp>
 #include <components/openmw-mp/Log.hpp>
-#include "PacketActorDrawState.hpp"
+#include "PacketActorAnimFlags.hpp"
 
 using namespace mwmp;
 
-PacketActorDrawState::PacketActorDrawState(RakNet::RakPeerInterface *peer) : ActorPacket(peer)
+PacketActorAnimFlags::PacketActorAnimFlags(RakNet::RakPeerInterface *peer) : ActorPacket(peer)
 {
-    packetID = ID_ACTOR_DRAW_STATE;
+    packetID = ID_ACTOR_ANIM_FLAGS;
 }
 
-void PacketActorDrawState::Packet(RakNet::BitStream *bs, bool send)
+void PacketActorAnimFlags::Packet(RakNet::BitStream *bs, bool send)
 {
     ActorPacket::Packet(bs, send);
 
diff --git a/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.hpp b/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.hpp
new file mode 100644
index 000000000..6be12e9a9
--- /dev/null
+++ b/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETACTORANIMFLAGS_HPP
+#define OPENMW_PACKETACTORANIMFLAGS_HPP
+
+#include <components/openmw-mp/Packets/Actor/ActorPacket.hpp>
+
+namespace mwmp
+{
+    class PacketActorAnimFlags : public ActorPacket
+    {
+    public:
+        PacketActorAnimFlags(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETACTORANIMFLAGS_HPP
diff --git a/components/openmw-mp/Packets/Actor/PacketActorDrawState.hpp b/components/openmw-mp/Packets/Actor/PacketActorDrawState.hpp
deleted file mode 100644
index 9322f2846..000000000
--- a/components/openmw-mp/Packets/Actor/PacketActorDrawState.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef OPENMW_PACKETACTORDRAWSTATE_HPP
-#define OPENMW_PACKETACTORDRAWSTATE_HPP
-
-#include <components/openmw-mp/Packets/Actor/ActorPacket.hpp>
-
-namespace mwmp
-{
-    class PacketActorDrawState : public ActorPacket
-    {
-    public:
-        PacketActorDrawState(RakNet::RakPeerInterface *peer);
-
-        virtual void Packet(RakNet::BitStream *bs, bool send);
-    };
-}
-
-#endif //OPENMW_PACKETACTORDRAWSTATE_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDrawState.cpp b/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.cpp
similarity index 59%
rename from components/openmw-mp/Packets/Player/PacketPlayerDrawState.cpp
rename to components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.cpp
index 2d9ddb04f..0173dd8df 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerDrawState.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.cpp
@@ -3,14 +3,14 @@
 //
 
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include "PacketPlayerDrawState.hpp"
+#include "PacketPlayerAnimFlags.hpp"
 
-mwmp::PacketPlayerDrawState::PacketPlayerDrawState(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+mwmp::PacketPlayerAnimFlags::PacketPlayerAnimFlags(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
 {
-    packetID = ID_PLAYER_DRAWSTATE;
+    packetID = ID_PLAYER_ANIM_FLAGS;
 }
 
-void mwmp::PacketPlayerDrawState::Packet(RakNet::BitStream *bs, bool send)
+void mwmp::PacketPlayerAnimFlags::Packet(RakNet::BitStream *bs, bool send)
 {
     PlayerPacket::Packet(bs, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.hpp b/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.hpp
new file mode 100644
index 000000000..d90594dd7
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.hpp
@@ -0,0 +1,23 @@
+//
+// Created by koncord on 15.01.16.
+//
+
+#ifndef OPENMW_PACKETPLAYERANIMFLAGS_HPP
+#define OPENMW_PACKETPLAYERANIMFLAGS_HPP
+
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerAnimFlags : public PlayerPacket
+    {
+    public:
+        PacketPlayerAnimFlags(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, bool send);
+    };
+}
+
+
+#endif //OPENMW_PACKETPLAYERANIMFLAGS_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDrawState.hpp b/components/openmw-mp/Packets/Player/PacketPlayerDrawState.hpp
deleted file mode 100644
index e7180ad75..000000000
--- a/components/openmw-mp/Packets/Player/PacketPlayerDrawState.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Created by koncord on 15.01.16.
-//
-
-#ifndef OPENMW_PACKETPLAYERDRAWSTATE_HPP
-#define OPENMW_PACKETPLAYERDRAWSTATE_HPP
-
-
-#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
-
-namespace mwmp
-{
-    class PacketPlayerDrawState : public PlayerPacket
-    {
-    public:
-        PacketPlayerDrawState(RakNet::RakPeerInterface *peer);
-
-        virtual void Packet(RakNet::BitStream *bs, bool send);
-    };
-}
-
-
-#endif //OPENMW_PACKETPLAYERDRAWSTATE_HPP