diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt
index 6e9a5f4a6..304034cda 100644
--- a/apps/openmw-mp/CMakeLists.txt
+++ b/apps/openmw-mp/CMakeLists.txt
@@ -144,7 +144,7 @@ set(PROCESSORS_PLAYER
 
 source_group(tes3mp-server\\processors\\player FILES ${PROCESSORS_PLAYER})
 
-set(PROCESSORS_WORLD
+set(PROCESSORS_OBJECT
         processors/object/ProcessorContainer.hpp processors/object/ProcessorDoorState.hpp
         processors/object/ProcessorMusicPlay.hpp processors/object/ProcessorObjectAnimPlay.hpp
         processors/object/ProcessorObjectDelete.hpp processors/object/ProcessorObjectLock.hpp
@@ -157,7 +157,7 @@ set(PROCESSORS_WORLD
         processors/object/ProcessorScriptGlobalFloat.hpp processors/object/ProcessorVideoPlay.hpp
         )
 
-source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_WORLD})
+source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_OBJECT})
 
 set(PROCESSORS
         processors/ProcessorInitializer.cpp
@@ -174,7 +174,7 @@ include_directories("./")
 
 add_executable(tes3mp-server
         ${SERVER} ${SERVER_HEADER}
-        ${PROCESSORS_ACTOR} ${PROCESSORS_PLAYER} ${PROCESSORS_WORLD} ${PROCESSORS}
+        ${PROCESSORS_ACTOR} ${PROCESSORS_PLAYER} ${PROCESSORS_OBJECT} ${PROCESSORS}
         ${APPLE_BUNDLE_RESOURCES}
         )
 add_definitions(-std=gnu++14 -Wno-ignored-qualifiers)
diff --git a/apps/openmw/mwmp/ObjectList.hpp b/apps/openmw/mwmp/ObjectList.hpp
index 29fcc65b7..abbdbac96 100644
--- a/apps/openmw/mwmp/ObjectList.hpp
+++ b/apps/openmw/mwmp/ObjectList.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_WORLDEVENT_HPP
-#define OPENMW_WORLDEVENT_HPP
+#ifndef OPENMW_OBJECTLIST_HPP
+#define OPENMW_OBJECTLIST_HPP
 
 #include <components/openmw-mp/Base/BaseObject.hpp>
 #include "../mwworld/cellstore.hpp"
@@ -90,4 +90,4 @@ namespace mwmp
     };
 }
 
-#endif //OPENMW_WORLDEVENT_HPP
+#endif //OPENMW_OBJECTLIST_HPP
diff --git a/apps/openmw/mwmp/processors/ObjectProcessor.hpp b/apps/openmw/mwmp/processors/ObjectProcessor.hpp
index 8179a9271..56dbf46c3 100644
--- a/apps/openmw/mwmp/processors/ObjectProcessor.hpp
+++ b/apps/openmw/mwmp/processors/ObjectProcessor.hpp
@@ -1,9 +1,5 @@
-//
-// Created by koncord on 16.04.17.
-//
-
-#ifndef OPENMW_WORLDPROCESSSOR_HPP
-#define OPENMW_WORLDPROCESSSOR_HPP
+#ifndef OPENMW_OBJECTPROCESSSOR_HPP
+#define OPENMW_OBJECTPROCESSSOR_HPP
 
 #include <components/openmw-mp/Log.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
@@ -25,4 +21,4 @@ namespace mwmp
 }
 
 
-#endif //OPENMW_WORLDPROCESSSOR_HPP
+#endif //OPENMW_OBJECTPROCESSSOR_HPP
diff --git a/components/openmw-mp/Controllers/ObjectPacketController.hpp b/components/openmw-mp/Controllers/ObjectPacketController.hpp
index 230f270ea..3492e0f43 100644
--- a/components/openmw-mp/Controllers/ObjectPacketController.hpp
+++ b/components/openmw-mp/Controllers/ObjectPacketController.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_WORLDPACKETCONTROLLER_HPP
-#define OPENMW_WORLDPACKETCONTROLLER_HPP
+#ifndef OPENMW_OBJECTPACKETCONTROLLER_HPP
+#define OPENMW_OBJECTPACKETCONTROLLER_HPP
 
 
 #include <RakPeerInterface.h>
@@ -24,4 +24,4 @@ namespace mwmp
     };
 }
 
-#endif //OPENMW_WORLDPACKETCONTROLLER_HPP
+#endif //OPENMW_OBJECTPACKETCONTROLLER_HPP
diff --git a/components/openmw-mp/NetworkMessages.hpp b/components/openmw-mp/NetworkMessages.hpp
index 925b245db..0f4de487f 100644
--- a/components/openmw-mp/NetworkMessages.hpp
+++ b/components/openmw-mp/NetworkMessages.hpp
@@ -115,7 +115,7 @@ enum OrderingChannel
     CHANNEL_SYSTEM = 0,
     CHANNEL_ACTOR,
     CHANNEL_PLAYER,
-    CHANNEL_WORLDEVENT,
+    CHANNEL_OBJECT,
     CHANNEL_MASTER
 };
 
diff --git a/components/openmw-mp/Packets/Object/ObjectPacket.cpp b/components/openmw-mp/Packets/Object/ObjectPacket.cpp
index 87cc30bf7..c979d0d25 100644
--- a/components/openmw-mp/Packets/Object/ObjectPacket.cpp
+++ b/components/openmw-mp/Packets/Object/ObjectPacket.cpp
@@ -11,7 +11,7 @@ ObjectPacket::ObjectPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
     packetID = 0;
     priority = HIGH_PRIORITY;
     reliability = RELIABLE_ORDERED;
-    orderChannel = CHANNEL_WORLDEVENT;
+    orderChannel = CHANNEL_OBJECT;
     this->peer = peer;
 }
 
diff --git a/components/openmw-mp/Packets/Object/ObjectPacket.hpp b/components/openmw-mp/Packets/Object/ObjectPacket.hpp
index 226b961ea..898ef39d5 100644
--- a/components/openmw-mp/Packets/Object/ObjectPacket.hpp
+++ b/components/openmw-mp/Packets/Object/ObjectPacket.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_WORLDPACKET_HPP
-#define OPENMW_WORLDPACKET_HPP
+#ifndef OPENMW_OBJECTPACKET_HPP
+#define OPENMW_OBJECTPACKET_HPP
 
 #include <string>
 #include <RakNetTypes.h>
@@ -32,4 +32,4 @@ namespace mwmp
     };
 }
 
-#endif //OPENMW_WORLDPACKET_HPP
+#endif //OPENMW_OBJECTPACKET_HPP