diff --git a/Messenger/Include/MessageUtil/get-message.inl b/MDP/Include/MessageUtil/get-message.inl
similarity index 100%
rename from Messenger/Include/MessageUtil/get-message.inl
rename to MDP/Include/MessageUtil/get-message.inl
diff --git a/Messenger/Include/MessageUtil/set-message.inl b/MDP/Include/MessageUtil/set-message.inl
similarity index 100%
rename from Messenger/Include/MessageUtil/set-message.inl
rename to MDP/Include/MessageUtil/set-message.inl
diff --git a/Messenger/Include/ModuleUtil/Message/multiplexer.inl b/MDP/Include/ModuleUtil/Message/multiplexer.inl
similarity index 100%
rename from Messenger/Include/ModuleUtil/Message/multiplexer.inl
rename to MDP/Include/ModuleUtil/Message/multiplexer.inl
diff --git a/Messenger/Include/ModuleUtil/multiplexer.inl b/MDP/Include/ModuleUtil/multiplexer.inl
similarity index 100%
rename from Messenger/Include/ModuleUtil/multiplexer.inl
rename to MDP/Include/ModuleUtil/multiplexer.inl
diff --git a/Messenger/Include/messenger.inl b/MDP/Include/messenger.inl
similarity index 100%
rename from Messenger/Include/messenger.inl
rename to MDP/Include/messenger.inl
diff --git a/Projects/CMake/MDP/CMakeLists.txt b/Projects/CMake/MDP/CMakeLists.txt
index 7d6070f..6e3adf4 100644
--- a/Projects/CMake/MDP/CMakeLists.txt
+++ b/Projects/CMake/MDP/CMakeLists.txt
@@ -2,15 +2,15 @@ project(MDP)
 
 add_custom_target(${PROJECT_NAME}_HEADERS ALL
 	${CMAKE_COMMAND} -E make_directory ${LOCAL_INCLUDE_DIR}/${PROJECT_NAME}
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${REPO_ROOT}/Messenger/Include/ ${LOCAL_INCLUDE_DIR}/${PROJECT_NAME})
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${REPO_ROOT}/${PROJECT_NAME}/Include/ ${LOCAL_INCLUDE_DIR}/${PROJECT_NAME})
 
 add_library(${PROJECT_NAME} INTERFACE)
 target_include_directories(${PROJECT_NAME} INTERFACE ${LOCAL_INCLUDE_DIR})
 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_HEADERS)
 
 if(WIN32)
-	install(DIRECTORY ${REPO_ROOT}/Messenger/Include/ DESTINATION Include/${PROJECT_NAME})
+	install(DIRECTORY ${REPO_ROOT}/${PROJECT_NAME}/Include/ DESTINATION Include/${PROJECT_NAME})
 else()
-	install(DIRECTORY ${REPO_ROOT}/Messenger/Include/ DESTINATION include/${PROJECT_NAME})
+	install(DIRECTORY ${REPO_ROOT}/${PROJECT_NAME}/Include/ DESTINATION include/${PROJECT_NAME})
 endif()
 
diff --git a/Projects/MSVC/2015/MDP/Scripts/install.sh b/Projects/MSVC/2015/MDP/Scripts/install.sh
index 940ad60..2c159cf 100644
--- a/Projects/MSVC/2015/MDP/Scripts/install.sh
+++ b/Projects/MSVC/2015/MDP/Scripts/install.sh
@@ -8,4 +8,4 @@ fi
 InstallPath="$Prefix/Include/MDP/"
 
 mkdir "$InstallPath" -p
-cp "$Basedir/../../../../../Messenger/Include/." "$InstallPath" -r
+cp "$Basedir/../../../../../MDP/Include/." "$InstallPath" -r