diff --git a/Source/Engine/Networking/NetworkInternal.h b/Source/Engine/Networking/NetworkInternal.h
index 250eae128..46030dc86 100644
--- a/Source/Engine/Networking/NetworkInternal.h
+++ b/Source/Engine/Networking/NetworkInternal.h
@@ -9,9 +9,9 @@ enum class NetworkMessageIDs : uint8
     None = 0,
     Handshake,
     HandshakeReply,
-    ReplicatedObject,
-    SpawnObject,
-    DespawnObject,
+    ObjectReplicate,
+    ObjectSpawn,
+    ObjectDespawn,
 
     MAX,
 };
@@ -24,7 +24,7 @@ public:
     static void NetworkReplicatorClear();
     static void NetworkReplicatorPreUpdate();
     static void NetworkReplicatorUpdate();
-    static void OnNetworkMessageReplicatedObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
-    static void OnNetworkMessageSpawnObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
-    static void OnNetworkMessageDespawnObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
+    static void OnNetworkMessageObjectReplicate(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
+    static void OnNetworkMessageObjectSpawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
+    static void OnNetworkMessageObjectDespawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
 };
diff --git a/Source/Engine/Networking/NetworkManager.cpp b/Source/Engine/Networking/NetworkManager.cpp
index e9390b75d..3a1f68061 100644
--- a/Source/Engine/Networking/NetworkManager.cpp
+++ b/Source/Engine/Networking/NetworkManager.cpp
@@ -128,9 +128,9 @@ namespace
         nullptr,
         OnNetworkMessageHandshake,
         OnNetworkMessageHandshakeReply,
-        NetworkInternal::OnNetworkMessageReplicatedObject,
-        NetworkInternal::OnNetworkMessageSpawnObject,
-        NetworkInternal::OnNetworkMessageDespawnObject,
+        NetworkInternal::OnNetworkMessageObjectReplicate,
+        NetworkInternal::OnNetworkMessageObjectSpawn,
+        NetworkInternal::OnNetworkMessageObjectDespawn,
     };
 }
 
diff --git a/Source/Engine/Networking/NetworkReplicator.cpp b/Source/Engine/Networking/NetworkReplicator.cpp
index 64f1df4b0..6369ff1ed 100644
--- a/Source/Engine/Networking/NetworkReplicator.cpp
+++ b/Source/Engine/Networking/NetworkReplicator.cpp
@@ -26,7 +26,7 @@
 
 PACK_STRUCT(struct NetworkMessageReplicatedObject
     {
-    NetworkMessageIDs ID = NetworkMessageIDs::ReplicatedObject;
+    NetworkMessageIDs ID = NetworkMessageIDs::ObjectReplicate;
     uint32 OwnerFrame;
     Guid ObjectId; // TODO: introduce networked-ids to synchronize unique ids as ushort (less data over network)
     Guid ParentId;
@@ -36,7 +36,7 @@ PACK_STRUCT(struct NetworkMessageReplicatedObject
 
 PACK_STRUCT(struct NetworkMessageSpawnObject
     {
-    NetworkMessageIDs ID = NetworkMessageIDs::SpawnObject;
+    NetworkMessageIDs ID = NetworkMessageIDs::ObjectSpawn;
     Guid ObjectId;
     Guid ParentId;
     uint32 OwnerClientId;
@@ -45,7 +45,7 @@ PACK_STRUCT(struct NetworkMessageSpawnObject
 
 PACK_STRUCT(struct NetworkMessageDespawnObject
     {
-    NetworkMessageIDs ID = NetworkMessageIDs::SpawnObject;
+    NetworkMessageIDs ID = NetworkMessageIDs::ObjectSpawn;
     Guid ObjectId;
     });
 
@@ -546,7 +546,7 @@ void NetworkInternal::NetworkReplicatorUpdate()
     Scripting::ObjectsLookupIdMapping.Set(nullptr);
 }
 
-void NetworkInternal::OnNetworkMessageReplicatedObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
+void NetworkInternal::OnNetworkMessageObjectReplicate(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
 {
     NetworkMessageReplicatedObject msgData;
     event.Message.ReadStructure(msgData);
@@ -594,7 +594,7 @@ void NetworkInternal::OnNetworkMessageReplicatedObject(NetworkEvent& event, Netw
     }
 }
 
-void NetworkInternal::OnNetworkMessageSpawnObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
+void NetworkInternal::OnNetworkMessageObjectSpawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
 {
     NetworkMessageSpawnObject msgData;
     event.Message.ReadStructure(msgData);
@@ -656,7 +656,7 @@ void NetworkInternal::OnNetworkMessageSpawnObject(NetworkEvent& event, NetworkCl
     }
 }
 
-void NetworkInternal::OnNetworkMessageDespawnObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
+void NetworkInternal::OnNetworkMessageObjectDespawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
 {
     NetworkMessageDespawnObject msgData;
     event.Message.ReadStructure(msgData);