diff --git a/.gitmodules b/.gitmodules
index 725cac4d598a0f1576305e98364f0bdee361736b..955c3aa4bb51d8b4a1ee24bdd5703bf5bb0d97f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "lib/pybind11"]
 	path = lib/pybind11
 	url = https://github.com/pybind/pybind11
-[submodule "lib/s2client-api"]
-	path = lib/s2client-api
+[submodule "lib/cpp-sc2"]
+	path = lib/cpp-sc2
 	url = https://github.com/Jackyline/cpp-sc2.git
 [submodule "lib/sc2-gamedata"]
 	path = lib/sc2-gamedata
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f92edcefc95300fa7136682acc7fea669f1044cd..6a79da24e0e71bc955c0d424ecbfa47ca4db98a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(BUILD_API_EXAMPLES OFF CACHE INTERNAL "" FORCE)
 set(BUILD_API_TESTS OFF CACHE INTERNAL "" FORCE)
 
 add_subdirectory(lib/pybind11)
-add_subdirectory(lib/s2client-api)
+add_subdirectory(lib/cpp-sc2)
 add_subdirectory(src)
 add_subdirectory(python-api-src)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3c540390a0c1d6d73f9486fb28f6c7480e6c4b57..31e2f6846a2291f4013d8d13ce062b35ab13e6a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,13 +2,13 @@
 file(GLOB BOT_SOURCES "*.cpp" "*.h" "*.hpp")
 
 include_directories(SYSTEM
-    ${PROJECT_SOURCE_DIR}/lib/s2client-api/include
-    ${PROJECT_SOURCE_DIR}/lib/s2client-api/contrib/protobuf/src
-    ${PROJECT_BINARY_DIR}/lib/s2client-api/generated
+    ${PROJECT_SOURCE_DIR}/lib/cpp-sc2/include
+    ${PROJECT_SOURCE_DIR}/lib/cpp-sc2/contrib/protobuf/src
+    ${PROJECT_BINARY_DIR}/lib/cpp-sc2/generated
     ${PROJECT_SOURCE_DIR}/lib/json/include
 )
 
-link_directories(${PROJECT_BINARY_DIR}/s2client-api/bin)
+link_directories(${PROJECT_BINARY_DIR}/cpp-sc2/bin)
 
 # Enable compilation of the SC2 version of the bot.
 add_definitions(-DSC2API)