diff --git a/src/map/CMakeLists.txt b/src/map/CMakeLists.txt
index d42ee7c76dc..ef719af25b6 100644
--- a/src/map/CMakeLists.txt
+++ b/src/map/CMakeLists.txt
@@ -62,6 +62,8 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/instance_loader.h
     ${CMAKE_CURRENT_SOURCE_DIR}/instance.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/instance.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ipc_client.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ipc_client.h
     ${CMAKE_CURRENT_SOURCE_DIR}/item_container.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/item_container.h
     ${CMAKE_CURRENT_SOURCE_DIR}/items.h
@@ -77,8 +79,6 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/map.h
     ${CMAKE_CURRENT_SOURCE_DIR}/merit.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/merit.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/message.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/message.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mob_modifier.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mob_spell_container.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mob_spell_container.h
diff --git a/src/map/message.cpp b/src/map/ipc_client.cpp
similarity index 100%
rename from src/map/message.cpp
rename to src/map/ipc_client.cpp
diff --git a/src/map/message.h b/src/map/ipc_client.h
similarity index 100%
rename from src/map/message.h
rename to src/map/ipc_client.h
diff --git a/src/world/CMakeLists.txt b/src/world/CMakeLists.txt
index 81fa819669d..71225783ecd 100644
--- a/src/world/CMakeLists.txt
+++ b/src/world/CMakeLists.txt
@@ -12,10 +12,10 @@ set(SOURCES
     daily_tally.cpp
     http_server.cpp
     http_server.h
+    ipc_server.cpp
+    ipc_server.h
     main.cpp
     message_handler.h
-    message_server.cpp
-    message_server.h
     time_server.h
     time_server.cpp
     world_server.cpp
diff --git a/src/world/message_server.cpp b/src/world/ipc_server.cpp
similarity index 100%
rename from src/world/message_server.cpp
rename to src/world/ipc_server.cpp
diff --git a/src/world/message_server.h b/src/world/ipc_server.h
similarity index 100%
rename from src/world/message_server.h
rename to src/world/ipc_server.h