diff --git a/cloud/blockstore/libs/endpoints_grpc/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/endpoints_grpc/CMakeLists.darwin-x86_64.txt
index f045aef3855..03fb8ec5789 100644
--- a/cloud/blockstore/libs/endpoints_grpc/CMakeLists.darwin-x86_64.txt
+++ b/cloud/blockstore/libs/endpoints_grpc/CMakeLists.darwin-x86_64.txt
@@ -19,7 +19,7 @@ target_link_libraries(blockstore-libs-endpoints_grpc PUBLIC
   blockstore-libs-endpoints
   blockstore-libs-server
   blockstore-libs-service
-  storage-core-libs-uds
+  core-libs-uds
 )
 target_sources(blockstore-libs-endpoints_grpc PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints_grpc/socket_endpoint_listener.cpp
diff --git a/cloud/blockstore/libs/endpoints_grpc/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/endpoints_grpc/CMakeLists.linux-aarch64.txt
index cc4949d3f25..55d29b93e1b 100644
--- a/cloud/blockstore/libs/endpoints_grpc/CMakeLists.linux-aarch64.txt
+++ b/cloud/blockstore/libs/endpoints_grpc/CMakeLists.linux-aarch64.txt
@@ -20,7 +20,7 @@ target_link_libraries(blockstore-libs-endpoints_grpc PUBLIC
   blockstore-libs-endpoints
   blockstore-libs-server
   blockstore-libs-service
-  storage-core-libs-uds
+  core-libs-uds
 )
 target_sources(blockstore-libs-endpoints_grpc PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints_grpc/socket_endpoint_listener.cpp
diff --git a/cloud/blockstore/libs/endpoints_grpc/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/endpoints_grpc/CMakeLists.linux-x86_64.txt
index cc4949d3f25..55d29b93e1b 100644
--- a/cloud/blockstore/libs/endpoints_grpc/CMakeLists.linux-x86_64.txt
+++ b/cloud/blockstore/libs/endpoints_grpc/CMakeLists.linux-x86_64.txt
@@ -20,7 +20,7 @@ target_link_libraries(blockstore-libs-endpoints_grpc PUBLIC
   blockstore-libs-endpoints
   blockstore-libs-server
   blockstore-libs-service
-  storage-core-libs-uds
+  core-libs-uds
 )
 target_sources(blockstore-libs-endpoints_grpc PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints_grpc/socket_endpoint_listener.cpp
diff --git a/cloud/blockstore/libs/endpoints_grpc/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/endpoints_grpc/CMakeLists.windows-x86_64.txt
index f045aef3855..03fb8ec5789 100644
--- a/cloud/blockstore/libs/endpoints_grpc/CMakeLists.windows-x86_64.txt
+++ b/cloud/blockstore/libs/endpoints_grpc/CMakeLists.windows-x86_64.txt
@@ -19,7 +19,7 @@ target_link_libraries(blockstore-libs-endpoints_grpc PUBLIC
   blockstore-libs-endpoints
   blockstore-libs-server
   blockstore-libs-service
-  storage-core-libs-uds
+  core-libs-uds
 )
 target_sources(blockstore-libs-endpoints_grpc PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints_grpc/socket_endpoint_listener.cpp
diff --git a/cloud/blockstore/libs/server/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/server/CMakeLists.darwin-x86_64.txt
index e63ef6e40af..2bcdf5eb933 100644
--- a/cloud/blockstore/libs/server/CMakeLists.darwin-x86_64.txt
+++ b/cloud/blockstore/libs/server/CMakeLists.darwin-x86_64.txt
@@ -23,7 +23,7 @@ target_link_libraries(blockstore-libs-server PUBLIC
   cpp-monlib-service
   monlib-service-pages
   contrib-libs-grpc
-  storage-core-libs-uds
+  core-libs-uds
 )
 target_sources(blockstore-libs-server PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/server/client_storage_factory.cpp
diff --git a/cloud/blockstore/libs/server/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/server/CMakeLists.linux-aarch64.txt
index c9cfad89591..3fbbb0959f9 100644
--- a/cloud/blockstore/libs/server/CMakeLists.linux-aarch64.txt
+++ b/cloud/blockstore/libs/server/CMakeLists.linux-aarch64.txt
@@ -24,7 +24,7 @@ target_link_libraries(blockstore-libs-server PUBLIC
   cpp-monlib-service
   monlib-service-pages
   contrib-libs-grpc
-  storage-core-libs-uds
+  core-libs-uds
 )
 target_sources(blockstore-libs-server PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/server/client_storage_factory.cpp
diff --git a/cloud/blockstore/libs/server/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/server/CMakeLists.linux-x86_64.txt
index c9cfad89591..3fbbb0959f9 100644
--- a/cloud/blockstore/libs/server/CMakeLists.linux-x86_64.txt
+++ b/cloud/blockstore/libs/server/CMakeLists.linux-x86_64.txt
@@ -24,7 +24,7 @@ target_link_libraries(blockstore-libs-server PUBLIC
   cpp-monlib-service
   monlib-service-pages
   contrib-libs-grpc
-  storage-core-libs-uds
+  core-libs-uds
 )
 target_sources(blockstore-libs-server PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/server/client_storage_factory.cpp
diff --git a/cloud/blockstore/libs/server/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/server/CMakeLists.windows-x86_64.txt
index e63ef6e40af..2bcdf5eb933 100644
--- a/cloud/blockstore/libs/server/CMakeLists.windows-x86_64.txt
+++ b/cloud/blockstore/libs/server/CMakeLists.windows-x86_64.txt
@@ -23,7 +23,7 @@ target_link_libraries(blockstore-libs-server PUBLIC
   cpp-monlib-service
   monlib-service-pages
   contrib-libs-grpc
-  storage-core-libs-uds
+  core-libs-uds
 )
 target_sources(blockstore-libs-server PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/server/client_storage_factory.cpp