diff --git a/.gitmodules b/.gitmodules
index b517017dd62287b2591dfc248ea63ec530087ad3..35a9e29c25b267f7b4127426d9217677490b5d66 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,32 +1,32 @@
 [submodule "libdap"]
 	path = libdap
-	url = https://github.com/kelvinblockchain/libdap
+	url = https://gitlab.demlabs.net/cellframe/libdap
 	branch = master
 [submodule "libdap-server-core"]
 	path = libdap-server-core
-	url = https://github.com/kelvinblockchain/libdap-server-core
+	url = https://gitlab.demlabs.net/cellframe/libdap-server-core
 	branch = master
 [submodule "libdap-server"]
 	path = libdap-server
-	url = https://github.com/kelvinblockchain/libdap-server
+	url = https://gitlab.demlabs.net/cellframe/libdap-server
 	branch = master
 [submodule "libdap-server-udp"]
 	path = libdap-server-udp
-	url = https://github.com/kelvinblockchain/libdap-server-udp
+	url = https://gitlab.demlabs.net/cellframe/libdap-server-udp
 	branch = master
 [submodule "test/libdap-test"]
 	path = test/libdap-test
-	url = https://github.com/kelvinblockchain/libdap-test
+	url = https://gitlab.demlabs.net/cellframe/libdap-test
 	branch = master
 [submodule "test/libdap-stream-ch"]
 	path = libdap-stream-ch
-	url = https://github.com/kelvinblockchain/libdap-stream-ch
+	url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch
 	branch = master
 [submodule "libdap-stream-ch"]
 	path = libdap-stream-ch
-	url = https://github.com/kelvinblockchain/libdap-stream-ch
+	url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch
 	branch = master
 [submodule "libdap-crypto"]
 	path = libdap-crypto
-	url = https://github.com/cellframe/libdap-crypto
+	url = https://gitlab.demlabs.net/cellframe/libdap-crypto
 	branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcb7b586a795d02d18d1905bba9e1867542b10a5..8459966bf0965ff354def05579b48e1ea9455c29 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
         add_subdirectory(libdap-server)
     endif()
 
-    if ( NOT ( TARGET dap_core_server ) )
+    if ( NOT ( TARGET dap_server_core ) )
 	add_subdirectory(libdap-server-core)
     endif()