diff --git a/.gitmodules b/.gitmodules
index bccb30d37daa129e3d01aa8d002019948b33c443..3754431094bd7a5c0838b244f4912cadbcecd15e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "lib/pybind11"]
 	path = lib/pybind11
 	url = https://github.com/pybind/pybind11
-[submodule "lib/s2client-api"]
-	path = lib/s2client-api
-	url = https://github.com/Blizzard/s2client-api.git
 [submodule "lib/sc2-gamedata"]
 	path = lib/sc2-gamedata
 	url = https://github.com/noorus/sc2-gamedata.git
 [submodule "lib/json"]
 	path = lib/json
 	url = https://github.com/nlohmann/json.git
+[submodule "lib/cpp-sc2"]
+	path = lib/cpp-sc2
+	url = https://github.com/alkurbatov/cpp-sc2.git
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/lib/cpp-sc2 b/lib/cpp-sc2
new file mode 160000
index 0000000000000000000000000000000000000000..ba30bfaf19d40a40649d2afba4e78e00c5c10971
--- /dev/null
+++ b/lib/cpp-sc2
@@ -0,0 +1 @@
+Subproject commit ba30bfaf19d40a40649d2afba4e78e00c5c10971
diff --git a/lib/s2client-api b/lib/s2client-api
deleted file mode 160000
index d9ba0a33d6ce9d233c2a4ee988360c188fbe9dbf..0000000000000000000000000000000000000000
--- a/lib/s2client-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d9ba0a33d6ce9d233c2a4ee988360c188fbe9dbf
diff --git a/python-api-src/CMakeLists.txt b/python-api-src/CMakeLists.txt
index d2d99321846b3d88be23729a773e9f254cf4b06d..16bb62042b6a08f6a5c4da7d377e818d045415f6 100644
--- a/python-api-src/CMakeLists.txt
+++ b/python-api-src/CMakeLists.txt
@@ -1,7 +1,7 @@
 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
 )
 
@@ -10,7 +10,7 @@ file(GLOB BOT_SOURCES "../src/*.cpp" "../src/*.h" "../src/*.hpp")
 
 file(GLOB LIBRARY_SOURCES "*.cpp" "*.h")
 
-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 code
 # TODO: Remove all remaining BW code