diff --git a/.gitmodules b/.gitmodules
index 759d999..e52838d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "lib/cvmmap-client-cpp"]
-	path = lib/cvmmap-client-cpp
-	url = https://github.com/crosstyan/cvmmap-cpp-client
 [submodule "lib/CLI11"]
 	path = lib/CLI11
 	url = https://github.com/CLIUtils/CLI11
diff --git a/lib/cvmmap-client-cpp b/lib/cvmmap-client-cpp
deleted file mode 160000
index f792552..0000000
--- a/lib/cvmmap-client-cpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f7925528983f42fce870b01491ab5e772546f485
diff --git a/src/core/frame_source.cpp b/src/core/frame_source.cpp
index 29e0fd5..699a19a 100644
--- a/src/core/frame_source.cpp
+++ b/src/core/frame_source.cpp
@@ -93,11 +93,11 @@ public:
 			client_ = std::move(client);
 		} catch (const std::exception &e) {
 			prepared_.store(false, std::memory_order_release);
-			return std::unexpected(std::string("cvmmap-client-cpp init failed: ") + e.what());
+			return std::unexpected(std::string("cvmmap-core client init failed: ") + e.what());
 		}
 
 		spdlog::info(
-			"real source backend initialized via cvmmap-client-cpp: target='{}'",
+			"real source backend initialized via cvmmap-core client: target='{}'",
 			client_target_);
 		return {};
 	}