diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index f4c5f695b26..2d378966aff 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -11,4 +11,4 @@
 add_subdirectory(map_extractor)
 add_subdirectory(vmap4_assembler)
 add_subdirectory(vmap4_extractor)
-add_subdirectory(mmaps_extractor)
+add_subdirectory(mmaps_generator)
diff --git a/src/tools/mmap_extractor/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
similarity index 90%
rename from src/tools/mmap_extractor/CMakeLists.txt
rename to src/tools/mmaps_generator/CMakeLists.txt
index c7c1a954371..46bf9d00d43 100644
--- a/src/tools/mmap_extractor/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -47,9 +47,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
 )
 
-add_executable(movements_extractor ${sources})
+add_executable(mmaps_generator ${sources})
 
-target_link_libraries(movements_extractor
+target_link_libraries(mmaps_generator
   ${MYSQL_LIBRARY}
   ${ACE_LIBRARY}
   ${BZIP2_LIBRARIES}
@@ -62,7 +62,7 @@ target_link_libraries(movements_extractor
 )
 
 if( UNIX )
-  install(TARGETS movements_extractor DESTINATION bin)
+  install(TARGETS mmaps_generator DESTINATION bin)
 elseif( WIN32 )
-  install(TARGETS movements_extractor DESTINATION "${CMAKE_INSTALL_PREFIX}")
+  install(TARGETS mmaps_generator DESTINATION "${CMAKE_INSTALL_PREFIX}")
 endif()
diff --git a/src/tools/mmap_extractor/Info/readme.txt b/src/tools/mmaps_generator/Info/readme.txt
similarity index 100%
rename from src/tools/mmap_extractor/Info/readme.txt
rename to src/tools/mmaps_generator/Info/readme.txt
diff --git a/src/tools/mmap_extractor/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp
similarity index 100%
rename from src/tools/mmap_extractor/IntermediateValues.cpp
rename to src/tools/mmaps_generator/IntermediateValues.cpp
diff --git a/src/tools/mmap_extractor/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h
similarity index 100%
rename from src/tools/mmap_extractor/IntermediateValues.h
rename to src/tools/mmaps_generator/IntermediateValues.h
diff --git a/src/tools/mmap_extractor/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
similarity index 100%
rename from src/tools/mmap_extractor/MapBuilder.cpp
rename to src/tools/mmaps_generator/MapBuilder.cpp
diff --git a/src/tools/mmap_extractor/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
similarity index 100%
rename from src/tools/mmap_extractor/MapBuilder.h
rename to src/tools/mmaps_generator/MapBuilder.h
diff --git a/src/tools/mmap_extractor/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
similarity index 100%
rename from src/tools/mmap_extractor/PathCommon.h
rename to src/tools/mmaps_generator/PathCommon.h
diff --git a/src/tools/mmap_extractor/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp
similarity index 100%
rename from src/tools/mmap_extractor/PathGenerator.cpp
rename to src/tools/mmaps_generator/PathGenerator.cpp
diff --git a/src/tools/mmap_extractor/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
similarity index 100%
rename from src/tools/mmap_extractor/TerrainBuilder.cpp
rename to src/tools/mmaps_generator/TerrainBuilder.cpp
diff --git a/src/tools/mmap_extractor/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
similarity index 100%
rename from src/tools/mmap_extractor/TerrainBuilder.h
rename to src/tools/mmaps_generator/TerrainBuilder.h
diff --git a/src/tools/mmap_extractor/VMapExtensions.cpp b/src/tools/mmaps_generator/VMapExtensions.cpp
similarity index 100%
rename from src/tools/mmap_extractor/VMapExtensions.cpp
rename to src/tools/mmaps_generator/VMapExtensions.cpp