diff --git a/cpp/tests/core/CMakeLists.txt b/cpp/tests/core/CMakeLists.txt
index 724bc42a0..4a17a4a14 100644
--- a/cpp/tests/core/CMakeLists.txt
+++ b/cpp/tests/core/CMakeLists.txt
@@ -11,16 +11,16 @@ add_executable(test_platform test_platform.cpp)
 target_link_libraries(test_platform GTest::gtest GTest::gtest_main)
 
 add_executable(test_enum test_enum.cpp)
-target_link_libraries(test_enum csp_core csp_engine GTest::gtest GTest::gtest_main)
+target_link_libraries(test_enum cspimpl GTest::gtest GTest::gtest_main)
 
 add_executable(test_srmwlockfreequeue test_srmwlockfreequeue.cpp )
-target_link_libraries(test_srmwlockfreequeue csp_core GTest::gtest GTest::gtest_main)
+target_link_libraries(test_srmwlockfreequeue cspimpl GTest::gtest GTest::gtest_main)
 
 add_executable(test_tagged_pointer_union test_tagged_pointer_union.cpp )
-target_link_libraries(test_tagged_pointer_union csp_core GTest::gtest GTest::gtest_main)
+target_link_libraries(test_tagged_pointer_union cspimpl GTest::gtest GTest::gtest_main)
 
 add_executable(test_time test_time.cpp )
-target_link_libraries(test_time csp_core GTest::gtest GTest::gtest_main)
+target_link_libraries(test_time cspimpl GTest::gtest GTest::gtest_main)
 
 install(TARGETS test_basic_allocator
                 test_dynamicbitset
diff --git a/cpp/tests/engine/CMakeLists.txt b/cpp/tests/engine/CMakeLists.txt
index f6d01e63d..db146fb49 100644
--- a/cpp/tests/engine/CMakeLists.txt
+++ b/cpp/tests/engine/CMakeLists.txt
@@ -1,22 +1,22 @@
 find_package(GTest CONFIG REQUIRED)
 
 add_executable(test_dictionary test_dictionary.cpp )
-target_link_libraries(test_dictionary csp_engine GTest::gtest GTest::gtest_main)
+target_link_libraries(test_dictionary cspimpl GTest::gtest GTest::gtest_main)
 # For DialectGeneric impl registration ( needed on windows to get it exported )
 target_compile_definitions(test_dictionary PRIVATE CSPTYPESIMPL_EXPORTS=1)
 
 add_executable(test_tick_buffer test_tick_buffer.cpp)
-target_link_libraries(test_tick_buffer csp_engine GTest::gtest GTest::gtest_main)
+target_link_libraries(test_tick_buffer cspimpl GTest::gtest GTest::gtest_main)
 
 add_executable(test_time_series test_time_series.cpp)
 
-target_link_libraries(test_time_series csp_engine GTest::gtest GTest::gtest_main )
+target_link_libraries(test_time_series cspimpl GTest::gtest GTest::gtest_main )
 
 add_executable(test_partial_switch_csp_type test_partial_switch_csp_type.cpp)
-target_link_libraries(test_partial_switch_csp_type csp_engine GTest::gtest GTest::gtest_main)
+target_link_libraries(test_partial_switch_csp_type cspimpl GTest::gtest GTest::gtest_main)
 
 add_executable(test_window_buffer test_window_buffer.cpp)
-target_link_libraries(test_window_buffer csp_engine GTest::gtest GTest::gtest_main)
+target_link_libraries(test_window_buffer cspimpl GTest::gtest GTest::gtest_main)
 
 install(TARGETS test_tick_buffer test_time_series test_partial_switch_csp_type test_dictionary test_window_buffer
         RUNTIME DESTINATION tests/bin/