diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2062811cf..a404e9315 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -189,13 +189,13 @@ add_component_dir (openmw-mp/Packets/Player
 
         PacketChatMessage PacketGUIBoxes PacketGameSettings
 
-        PacketPlayerBaseInfo PacketPlayerCharGen PacketPlayerActiveSkills PacketPlayerAlly PacketPlayerAnimFlags
-        PacketPlayerAnimPlay PacketPlayerAttack PacketPlayerAttribute PacketPlayerBehavior PacketPlayerBook
-        PacketPlayerBounty PacketPlayerCast PacketPlayerCellChange PacketPlayerCellState PacketPlayerClass
-        PacketPlayerDeath PacketPlayerEquipment PacketPlayerFaction PacketPlayerInput PacketPlayerInventory
-        PacketPlayerItemUse PacketPlayerJail PacketPlayerJournal PacketPlayerLevel PacketPlayerMiscellaneous
-        PacketPlayerMomentum PacketPlayerPosition PacketPlayerQuickKeys PacketPlayerReputation PacketPlayerRest
-        PacketPlayerResurrect PacketPlayerShapeshift PacketPlayerSkill PacketPlayerSpeech PacketPlayerSpellbook
+        PacketPlayerBaseInfo PacketPlayerCharGen PacketPlayerAlly PacketPlayerAnimFlags PacketPlayerAnimPlay
+        PacketPlayerAttack PacketPlayerAttribute PacketPlayerBehavior PacketPlayerBook PacketPlayerBounty
+        PacketPlayerCast PacketPlayerCellChange PacketPlayerCellState PacketPlayerClass PacketPlayerDeath
+        PacketPlayerEquipment PacketPlayerFaction PacketPlayerInput PacketPlayerInventory PacketPlayerItemUse
+        PacketPlayerJail PacketPlayerJournal PacketPlayerLevel PacketPlayerMiscellaneous PacketPlayerMomentum
+        PacketPlayerPosition PacketPlayerQuickKeys PacketPlayerReputation PacketPlayerRest PacketPlayerResurrect
+        PacketPlayerShapeshift PacketPlayerSkill PacketPlayerSpeech PacketPlayerSpellbook PacketPlayerSpellsActive
         PacketPlayerStatsDynamic PacketPlayerTopic
         )
 
diff --git a/components/openmw-mp/Controllers/PlayerPacketController.cpp b/components/openmw-mp/Controllers/PlayerPacketController.cpp
index b95cbdaef..8263acd31 100644
--- a/components/openmw-mp/Controllers/PlayerPacketController.cpp
+++ b/components/openmw-mp/Controllers/PlayerPacketController.cpp
@@ -4,7 +4,7 @@
 #include "../Packets/Player/PacketGUIBoxes.hpp"
 #include "../Packets/Player/PacketLoaded.hpp"
 #include "../Packets/Player/PacketGameSettings.hpp"
-#include "../Packets/Player/PacketPlayerActiveSkills.hpp"
+#include "../Packets/Player/PacketPlayerSpellsActive.hpp"
 #include "../Packets/Player/PacketPlayerAlly.hpp"
 #include "../Packets/Player/PacketPlayerAnimFlags.hpp"
 #include "../Packets/Player/PacketPlayerAnimPlay.hpp"
@@ -58,7 +58,7 @@ mwmp::PlayerPacketController::PlayerPacketController(RakNet::RakPeerInterface *p
     AddPacket<PacketGUIBoxes>(&packets, peer);
     AddPacket<PacketLoaded>(&packets, peer);
     AddPacket<PacketGameSettings>(&packets, peer);
-    AddPacket<PacketPlayerActiveSkills>(&packets, peer);
+    AddPacket<PacketPlayerSpellsActive>(&packets, peer);
 
     AddPacket<PacketPlayerAlly>(&packets, peer);
     AddPacket<PacketPlayerAnimFlags>(&packets, peer);
diff --git a/components/openmw-mp/NetworkMessages.hpp b/components/openmw-mp/NetworkMessages.hpp
index ea272ba2e..efa3199bc 100644
--- a/components/openmw-mp/NetworkMessages.hpp
+++ b/components/openmw-mp/NetworkMessages.hpp
@@ -17,7 +17,7 @@ enum GameMessages
     ID_PLAYER_BASEINFO,
     ID_PLAYER_BEHAVIOR,
     ID_PLAYER_CHARGEN,
-    ID_PLAYER_ACTIVESKILLS,
+    ID_PLAYER_SPELLS_ACTIVE,
     ID_PLAYER_ANIM_FLAGS,
     ID_PLAYER_ANIM_PLAY,
     ID_PLAYER_ATTACK,
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp b/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp
deleted file mode 100644
index d6d7ebb84..000000000
--- a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef OPENMW_PACKETPLAYERACTIVESKILLS_HPP
-#define OPENMW_PACKETPLAYERACTIVESKILLS_HPP
-
-#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
-
-namespace mwmp
-{
-    class PacketPlayerActiveSkills : public PlayerPacket
-    {
-    public:
-        PacketPlayerActiveSkills(RakNet::RakPeerInterface *peer);
-
-        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
-    };
-}
-
-#endif //OPENMW_PACKETPLAYERACTIVESKILLS_HPP
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp b/components/openmw-mp/Packets/Player/PacketPlayerSpellsActive.cpp
similarity index 87%
rename from components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp
rename to components/openmw-mp/Packets/Player/PacketPlayerSpellsActive.cpp
index c7071c6da..974cf3776 100644
--- a/components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSpellsActive.cpp
@@ -1,14 +1,14 @@
-#include "PacketPlayerActiveSkills.hpp"
+#include "PacketPlayerSpellsActive.hpp"
 #include <components/openmw-mp/NetworkMessages.hpp>
 
 using namespace mwmp;
 
-PacketPlayerActiveSkills::PacketPlayerActiveSkills(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+PacketPlayerSpellsActive::PacketPlayerSpellsActive(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
 {
-    packetID = ID_PLAYER_ACTIVESKILLS;
+    packetID = ID_PLAYER_SPELLS_ACTIVE;
 }
 
-void PacketPlayerActiveSkills::Packet(RakNet::BitStream *newBitstream, bool send)
+void PacketPlayerSpellsActive::Packet(RakNet::BitStream *newBitstream, bool send)
 {
     PlayerPacket::Packet(newBitstream, send);
 
diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSpellsActive.hpp b/components/openmw-mp/Packets/Player/PacketPlayerSpellsActive.hpp
new file mode 100644
index 000000000..437658f8b
--- /dev/null
+++ b/components/openmw-mp/Packets/Player/PacketPlayerSpellsActive.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETPLAYERSPELLSACTIVE_HPP
+#define OPENMW_PACKETPLAYERSPELLSACTIVE_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketPlayerSpellsActive : public PlayerPacket
+    {
+    public:
+        PacketPlayerSpellsActive(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *newBitstream, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETPLAYERSPELLSACTIVE_HPP