Rename searchlib library to vespa_searchlib.

199 files changed, 258 insertions, 258 deletions

diff --git a/lowercasing_test/CMakeLists.txt b/lowercasing_test/CMakeLists.txt
index 2517c0811cd..664dd6e3605 100644
--- a/lowercasing_test/CMakeLists.txt
+++ b/lowercasing_test/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_define_module(
     DEPENDS
     vespalog
     vespalib
-    searchlib
+    vespa_searchlib
 
     APPS
     src/binref
diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt
index bd9df601119..fa0c4129dcc 100644
--- a/searchcore/CMakeLists.txt
+++ b/searchcore/CMakeLists.txt
@@ -8,7 +8,7 @@ vespa_define_module(
     vespa_config
     vespa_configdefinitions
     vespa_document
-    searchlib
+    vespa_searchlib
     vespa_messagebus
     vespa_persistence
     searchsummary
diff --git a/searchlib/src/apps/docstore/CMakeLists.txt b/searchlib/src/apps/docstore/CMakeLists.txt
index f03010f2825..628c1527d0b 100644
--- a/searchlib/src/apps/docstore/CMakeLists.txt
+++ b/searchlib/src/apps/docstore/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_add_executable(searchlib_vespa-verify-logdatastore_app
     OUTPUT_NAME vespa-verify-logdatastore
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_executable(searchlib_vespa-documentstore-inspect_app
     SOURCES
@@ -13,7 +13,7 @@ vespa_add_executable(searchlib_vespa-documentstore-inspect_app
     OUTPUT_NAME vespa-documentstore-inspect
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_executable(searchlib_vespa-documentstore-benchmark_app
     SOURCES
@@ -21,7 +21,7 @@ vespa_add_executable(searchlib_vespa-documentstore-benchmark_app
     OUTPUT_NAME vespa-documentstore-benchmark
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_executable(searchlib_vespa-create-idx-from-dat_app
     SOURCES
@@ -29,5 +29,5 @@ vespa_add_executable(searchlib_vespa-create-idx-from-dat_app
     OUTPUT_NAME vespa-create-idx-from-dat
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/apps/tests/CMakeLists.txt b/searchlib/src/apps/tests/CMakeLists.txt
index 883f343cc30..2fb8c666cdf 100644
--- a/searchlib/src/apps/tests/CMakeLists.txt
+++ b/searchlib/src/apps/tests/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_biglog_test_app
     SOURCES
     biglogtest.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_biglog_test_app COMMAND searchlib_biglog_test_app BENCHMARK)
@@ -11,14 +11,14 @@ vespa_add_executable(searchlib_memoryindexstress_test_app
     SOURCES
     memoryindexstress_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_memoryindexstress_test_app COMMAND searchlib_memoryindexstress_test_app BENCHMARK)
 vespa_add_executable(searchlib_document_weight_attribute_lookup_stress_test_app
     SOURCES
     document_weight_attribute_lookup_stress_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_document_weight_attribute_lookup_stress_test_app COMMAND searchlib_document_weight_attribute_lookup_stress_test_app BENCHMARK)
diff --git a/searchlib/src/apps/uniform/CMakeLists.txt b/searchlib/src/apps/uniform/CMakeLists.txt
index 8cdb17c4265..4fc3115ae3f 100644
--- a/searchlib/src/apps/uniform/CMakeLists.txt
+++ b/searchlib/src/apps/uniform/CMakeLists.txt
@@ -3,5 +3,5 @@ vespa_add_executable(searchlib_uniform_app
     SOURCES
     uniform.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/apps/vespa-attribute-inspect/CMakeLists.txt b/searchlib/src/apps/vespa-attribute-inspect/CMakeLists.txt
index dcc8350acfc..110babec765 100644
--- a/searchlib/src/apps/vespa-attribute-inspect/CMakeLists.txt
+++ b/searchlib/src/apps/vespa-attribute-inspect/CMakeLists.txt
@@ -5,5 +5,5 @@ vespa_add_executable(searchlib_vespa-attribute-inspect_app
     OUTPUT_NAME vespa-attribute-inspect
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/apps/vespa-fileheader-inspect/CMakeLists.txt b/searchlib/src/apps/vespa-fileheader-inspect/CMakeLists.txt
index 629f20e6d5b..f105bdba31b 100644
--- a/searchlib/src/apps/vespa-fileheader-inspect/CMakeLists.txt
+++ b/searchlib/src/apps/vespa-fileheader-inspect/CMakeLists.txt
@@ -5,5 +5,5 @@ vespa_add_executable(searchlib_vespa-fileheader-inspect_app
     OUTPUT_NAME vespa-fileheader-inspect
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/apps/vespa-index-inspect/CMakeLists.txt b/searchlib/src/apps/vespa-index-inspect/CMakeLists.txt
index 91a277e8489..4dbe08df902 100644
--- a/searchlib/src/apps/vespa-index-inspect/CMakeLists.txt
+++ b/searchlib/src/apps/vespa-index-inspect/CMakeLists.txt
@@ -5,5 +5,5 @@ vespa_add_executable(searchlib_vespa-index-inspect_app
     OUTPUT_NAME vespa-index-inspect
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/apps/vespa-query-analyzer/CMakeLists.txt b/searchlib/src/apps/vespa-query-analyzer/CMakeLists.txt
index f84a413ee70..cf6b6f3e56f 100644
--- a/searchlib/src/apps/vespa-query-analyzer/CMakeLists.txt
+++ b/searchlib/src/apps/vespa-query-analyzer/CMakeLists.txt
@@ -5,5 +5,5 @@ vespa_add_executable(searchlib_vespa-query-analyzer_app
     OUTPUT_NAME vespa-query-analyzer
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/apps/vespa-ranking-expression-analyzer/CMakeLists.txt b/searchlib/src/apps/vespa-ranking-expression-analyzer/CMakeLists.txt
index a8ffd8af277..39e0b3a447a 100644
--- a/searchlib/src/apps/vespa-ranking-expression-analyzer/CMakeLists.txt
+++ b/searchlib/src/apps/vespa-ranking-expression-analyzer/CMakeLists.txt
@@ -5,5 +5,5 @@ vespa_add_executable(searchlib_vespa-ranking-expression-analyzer_app
     OUTPUT_NAME vespa-ranking-expression-analyzer
     INSTALL bin
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/tests/aggregator/CMakeLists.txt b/searchlib/src/tests/aggregator/CMakeLists.txt
index 9e65c82fe43..c21b072f27e 100644
--- a/searchlib/src/tests/aggregator/CMakeLists.txt
+++ b/searchlib/src/tests/aggregator/CMakeLists.txt
@@ -3,13 +3,13 @@ vespa_add_executable(searchlib_perdocexpr_test_app TEST
     SOURCES
     perdocexpr_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_perdocexpr_test_app COMMAND searchlib_perdocexpr_test_app)
 vespa_add_executable(searchlib_attr_test_app TEST
     SOURCES
     attr_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_attr_test_app COMMAND searchlib_attr_test_app)
diff --git a/searchlib/src/tests/alignment/CMakeLists.txt b/searchlib/src/tests/alignment/CMakeLists.txt
index 49b1eb1adc5..6bc48a7398d 100644
--- a/searchlib/src/tests/alignment/CMakeLists.txt
+++ b/searchlib/src/tests/alignment/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_alignment_test_app TEST
     SOURCES
     alignment_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_alignment_test_app COMMAND searchlib_alignment_test_app)
diff --git a/searchlib/src/tests/attribute/CMakeLists.txt b/searchlib/src/tests/attribute/CMakeLists.txt
index cdda9fea8d0..cff19430e6b 100644
--- a/searchlib/src/tests/attribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attribute_test_app TEST
     SOURCES
     attribute_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_test_app COMMAND searchlib_attribute_test_app COST 250)
diff --git a/searchlib/src/tests/attribute/attribute_header/CMakeLists.txt b/searchlib/src/tests/attribute/attribute_header/CMakeLists.txt
index bde76137b1f..c5c14efa994 100644
--- a/searchlib/src/tests/attribute/attribute_header/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/attribute_header/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attribute_header_test_app TEST
     SOURCES
     attribute_header_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_header_test_app COMMAND searchlib_attribute_header_test_app)
diff --git a/searchlib/src/tests/attribute/attribute_operation/CMakeLists.txt b/searchlib/src/tests/attribute/attribute_operation/CMakeLists.txt
index fcf7f420092..48216b20460 100644
--- a/searchlib/src/tests/attribute/attribute_operation/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/attribute_operation/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_attribute_operation_test_app TEST
     SOURCES
     attribute_operation_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_attribute_operation_test_app COMMAND searchlib_attribute_operation_test_app)
diff --git a/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt b/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt
index 419d62de213..6b5c69cb612 100644
--- a/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_attributefilewriter_test_app TEST
     SOURCES
     attributefilewriter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_attributefilewriter_test_app COMMAND searchlib_attributefilewriter_test_app)
diff --git a/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt b/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt
index 904706e0eb0..d3f9b010c93 100644
--- a/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_attributemanager_test_app TEST
     SOURCES
     attributemanager_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_attributemanager_test_app COMMAND searchlib_attributemanager_test_app)
diff --git a/searchlib/src/tests/attribute/benchmark/CMakeLists.txt b/searchlib/src/tests/attribute/benchmark/CMakeLists.txt
index 90be19ba963..f3cad958edd 100644
--- a/searchlib/src/tests/attribute/benchmark/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/benchmark/CMakeLists.txt
@@ -3,5 +3,5 @@ vespa_add_executable(searchlib_attributebenchmark_app
     SOURCES
     attributebenchmark.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/tests/attribute/bitvector/CMakeLists.txt b/searchlib/src/tests/attribute/bitvector/CMakeLists.txt
index 887f18d6c6c..7efbf9ab45b 100644
--- a/searchlib/src/tests/attribute/bitvector/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/bitvector/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_bitvector_test_app TEST
     SOURCES
     bitvector_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_bitvector_test_app COMMAND searchlib_bitvector_test_app COST 200)
diff --git a/searchlib/src/tests/attribute/bitvector_search_cache/CMakeLists.txt b/searchlib/src/tests/attribute/bitvector_search_cache/CMakeLists.txt
index 14be6913495..03afd39e759 100644
--- a/searchlib/src/tests/attribute/bitvector_search_cache/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/bitvector_search_cache/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_bitvector_search_cache_test_app TEST
     SOURCES
     bitvector_search_cache_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_bitvector_search_cache_test_app COMMAND searchlib_bitvector_search_cache_test_app)
diff --git a/searchlib/src/tests/attribute/changevector/CMakeLists.txt b/searchlib/src/tests/attribute/changevector/CMakeLists.txt
index 6e65f8d8ae9..abb58a29409 100644
--- a/searchlib/src/tests/attribute/changevector/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/changevector/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_changevector_test_app TEST
     SOURCES
     changevector_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_changevector_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/changevector_test.sh
                DEPENDS searchlib_changevector_test_app)
diff --git a/searchlib/src/tests/attribute/compaction/CMakeLists.txt b/searchlib/src/tests/attribute/compaction/CMakeLists.txt
index 56611e0a5d5..5cb5a9193bf 100644
--- a/searchlib/src/tests/attribute/compaction/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/compaction/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_attribute_compaction_test_app TEST
     SOURCES
     attribute_compaction_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_attribute_compaction_test_app COMMAND searchlib_attribute_compaction_test_app)
diff --git a/searchlib/src/tests/attribute/dfa_fuzzy_matcher/CMakeLists.txt b/searchlib/src/tests/attribute/dfa_fuzzy_matcher/CMakeLists.txt
index 6ef463e066e..8dece596e12 100644
--- a/searchlib/src/tests/attribute/dfa_fuzzy_matcher/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/dfa_fuzzy_matcher/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attribute_dfa_fuzzy_matcher_test_app TEST
     SOURCES
     dfa_fuzzy_matcher_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_dfa_fuzzy_matcher_test_app COMMAND searchlib_attribute_dfa_fuzzy_matcher_test_app)
diff --git a/searchlib/src/tests/attribute/direct_multi_term_blueprint/CMakeLists.txt b/searchlib/src/tests/attribute/direct_multi_term_blueprint/CMakeLists.txt
index 473d977ac7a..20a82b4af6e 100644
--- a/searchlib/src/tests/attribute/direct_multi_term_blueprint/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/direct_multi_term_blueprint/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_direct_multi_term_blueprint_test_app TEST
     SOURCES
     direct_multi_term_blueprint_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/attribute/direct_posting_store/CMakeLists.txt b/searchlib/src/tests/attribute/direct_posting_store/CMakeLists.txt
index 3c8e76bc9b2..f0f1ca3b3e3 100644
--- a/searchlib/src/tests/attribute/direct_posting_store/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/direct_posting_store/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_direct_posting_store_test_app TEST
     SOURCES
     direct_posting_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/attribute/enum_attribute_compaction/CMakeLists.txt b/searchlib/src/tests/attribute/enum_attribute_compaction/CMakeLists.txt
index 4938f203dd8..a8a26394335 100644
--- a/searchlib/src/tests/attribute/enum_attribute_compaction/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/enum_attribute_compaction/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_enum_attribute_compaction_test_app TEST
     SOURCES
     enum_attribute_compaction_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_enum_attribute_compaction_test_app COMMAND searchlib_enum_attribute_compaction_test_app COST 100)
diff --git a/searchlib/src/tests/attribute/enum_comparator/CMakeLists.txt b/searchlib/src/tests/attribute/enum_comparator/CMakeLists.txt
index fde35ce4fc0..0a619a46602 100644
--- a/searchlib/src/tests/attribute/enum_comparator/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/enum_comparator/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_enum_comparator_test_app TEST
     SOURCES
     enum_comparator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_enum_comparator_test_app COMMAND searchlib_enum_comparator_test_app)
diff --git a/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt b/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt
index dbb7f640914..9cd0fa291f5 100644
--- a/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_enumeratedsave_test_app TEST
     SOURCES
     enumeratedsave_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_enumeratedsave_test_app COMMAND searchlib_enumeratedsave_test_app COST 100)
diff --git a/searchlib/src/tests/attribute/enumstore/CMakeLists.txt b/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
index 1d2b0e2c8da..477cea927b5 100644
--- a/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_enumstore_test_app TEST
     SOURCES
     enumstore_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_enumstore_test_app COMMAND searchlib_enumstore_test_app)
diff --git a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt
index c83baf5b74c..782a53f3ffc 100644
--- a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_extendattribute_test_app TEST
     SOURCES
     extendattribute_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_extendattribute_test_app COMMAND searchlib_extendattribute_test_app)
diff --git a/searchlib/src/tests/attribute/guard/CMakeLists.txt b/searchlib/src/tests/attribute/guard/CMakeLists.txt
index f5570377814..6549af11c0f 100644
--- a/searchlib/src/tests/attribute/guard/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/guard/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attributeguard_test_app TEST
     SOURCES
     attributeguard_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attributeguard_test.sh
diff --git a/searchlib/src/tests/attribute/imported_attribute_vector/CMakeLists.txt b/searchlib/src/tests/attribute/imported_attribute_vector/CMakeLists.txt
index db19b94b3ab..17b0e36530a 100644
--- a/searchlib/src/tests/attribute/imported_attribute_vector/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/imported_attribute_vector/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_imported_attribute_vector_test_app TEST
     SOURCES
     imported_attribute_vector_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_imported_attribute_vector_test_app COMMAND searchlib_imported_attribute_vector_test_app)
diff --git a/searchlib/src/tests/attribute/imported_search_context/CMakeLists.txt b/searchlib/src/tests/attribute/imported_search_context/CMakeLists.txt
index 1102c75995d..2289c335bb2 100644
--- a/searchlib/src/tests/attribute/imported_search_context/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/imported_search_context/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_imported_search_context_test_app TEST
     SOURCES
     imported_search_context_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_imported_search_context_test_app COMMAND searchlib_imported_search_context_test_app)
diff --git a/searchlib/src/tests/attribute/multi_term_or_filter_search/CMakeLists.txt b/searchlib/src/tests/attribute/multi_term_or_filter_search/CMakeLists.txt
index 4ec5d849ad3..10e8725105c 100644
--- a/searchlib/src/tests/attribute/multi_term_or_filter_search/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/multi_term_or_filter_search/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_multi_term_or_filter_search_test_app TEST
     SOURCES
     multi_term_or_filter_search_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt b/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt
index c537886626c..a172c21ca4e 100644
--- a/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_multi_value_mapping_test_app TEST
     SOURCES
     multi_value_mapping_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_multi_value_mapping_test_app COMMAND searchlib_multi_value_mapping_test_app)
diff --git a/searchlib/src/tests/attribute/multi_value_read_view/CMakeLists.txt b/searchlib/src/tests/attribute/multi_value_read_view/CMakeLists.txt
index fbe0e71fc4b..e4209fe34b8 100644
--- a/searchlib/src/tests/attribute/multi_value_read_view/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/multi_value_read_view/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attribute_multi_value_read_view_test_app TEST
     SOURCES
     multi_value_read_view_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_multi_value_read_view_test_app COMMAND searchlib_attribute_multi_value_read_view_test_app)
diff --git a/searchlib/src/tests/attribute/posting_list_merger/CMakeLists.txt b/searchlib/src/tests/attribute/posting_list_merger/CMakeLists.txt
index 2d6b328b84b..636fe01f1c2 100644
--- a/searchlib/src/tests/attribute/posting_list_merger/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/posting_list_merger/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_posting_list_merger_test_app TEST
     SOURCES
     posting_list_merger_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_posting_list_merger_test_app COMMAND searchlib_posting_list_merger_test_app)
diff --git a/searchlib/src/tests/attribute/posting_store/CMakeLists.txt b/searchlib/src/tests/attribute/posting_store/CMakeLists.txt
index 75a6f2fcded..7f0e116fd86 100644
--- a/searchlib/src/tests/attribute/posting_store/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/posting_store/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_posting_store_test_app TEST
     SOURCES
     posting_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_posting_store_test_app COMMAND searchlib_posting_store_test_app COST 30)
diff --git a/searchlib/src/tests/attribute/postinglist/CMakeLists.txt b/searchlib/src/tests/attribute/postinglist/CMakeLists.txt
index e88b37696fc..f907abbfe53 100644
--- a/searchlib/src/tests/attribute/postinglist/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/postinglist/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_postinglist_test_app TEST
     SOURCES
     postinglist_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_postinglist_test_app COMMAND searchlib_postinglist_test_app)
diff --git a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt
index a6741899066..c0394a1aac4 100644
--- a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_postinglistattribute_test_app TEST
     SOURCES
     postinglistattribute_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_postinglistattribute_test_app COMMAND searchlib_postinglistattribute_test_app)
diff --git a/searchlib/src/tests/attribute/predicate_attribute/CMakeLists.txt b/searchlib/src/tests/attribute/predicate_attribute/CMakeLists.txt
index eb2c99a5d81..122bdab2714 100644
--- a/searchlib/src/tests/attribute/predicate_attribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/predicate_attribute/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_predicate_attribute_test_app TEST
     SOURCES
     predicate_attribute_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_predicate_attribute_test_app COMMAND searchlib_predicate_attribute_test_app)
diff --git a/searchlib/src/tests/attribute/raw_attribute/CMakeLists.txt b/searchlib/src/tests/attribute/raw_attribute/CMakeLists.txt
index 3bfe5a8e91c..17264adc59b 100644
--- a/searchlib/src/tests/attribute/raw_attribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/raw_attribute/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_raw_attribute_test_app TEST
     SOURCES
     raw_attribute_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_raw_attribute_test_app COMMAND searchlib_raw_attribute_test_app)
diff --git a/searchlib/src/tests/attribute/reference_attribute/CMakeLists.txt b/searchlib/src/tests/attribute/reference_attribute/CMakeLists.txt
index 7b18cffcb8e..165a27d2576 100644
--- a/searchlib/src/tests/attribute/reference_attribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/reference_attribute/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_reference_attribute_test_app TEST
     SOURCES
     reference_attribute_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_reference_attribute_test_app COMMAND searchlib_reference_attribute_test_app)
diff --git a/searchlib/src/tests/attribute/save_target/CMakeLists.txt b/searchlib/src/tests/attribute/save_target/CMakeLists.txt
index 1227b545c8d..4d9b5f0816e 100644
--- a/searchlib/src/tests/attribute/save_target/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/save_target/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attribute_save_target_test_app TEST
     SOURCES
     attribute_save_target_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_save_target_test_app COMMAND searchlib_attribute_save_target_test_app)
diff --git a/searchlib/src/tests/attribute/searchable/CMakeLists.txt b/searchlib/src/tests/attribute/searchable/CMakeLists.txt
index 7932450e2db..6fbf0f72c0b 100644
--- a/searchlib/src/tests/attribute/searchable/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/searchable/CMakeLists.txt
@@ -3,14 +3,14 @@ vespa_add_executable(searchlib_attribute_searchable_adapter_test_app TEST
     SOURCES
     attribute_searchable_adapter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_attribute_searchable_adapter_test_app COMMAND searchlib_attribute_searchable_adapter_test_app)
 vespa_add_executable(searchlib_attribute_weighted_set_blueprint_test_app TEST
     SOURCES
     attribute_weighted_set_blueprint_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_attribute_weighted_set_blueprint_test_app COMMAND searchlib_attribute_weighted_set_blueprint_test_app)
@@ -18,7 +18,7 @@ vespa_add_executable(searchlib_attribute_blueprint_test_app TEST
     SOURCES
     attributeblueprint_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt
index d9043aaceba..daa729c90f5 100644
--- a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_searchcontext_test_app TEST
     SOURCES
     searchcontext_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_searchcontext_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/searchcontext_test.sh
diff --git a/searchlib/src/tests/attribute/searchcontextelementiterator/CMakeLists.txt b/searchlib/src/tests/attribute/searchcontextelementiterator/CMakeLists.txt
index f80b28358f4..63121352e1a 100644
--- a/searchlib/src/tests/attribute/searchcontextelementiterator/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/searchcontextelementiterator/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attribute_searchcontextelementiterator_test_app T
     SOURCES
     searchcontextelementiterator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_searchcontextelementiterator_test_app COMMAND searchlib_attribute_searchcontextelementiterator_test_app)
diff --git a/searchlib/src/tests/attribute/sort_blob_writers/CMakeLists.txt b/searchlib/src/tests/attribute/sort_blob_writers/CMakeLists.txt
index 1055dbb1271..880b81ef518 100644
--- a/searchlib/src/tests/attribute/sort_blob_writers/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/sort_blob_writers/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_sort_blob_writers_test_app TEST
     SOURCES
     sort_blob_writers_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_sort_blob_writers_test_app COMMAND searchlib_sort_blob_writers_test_app)
diff --git a/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt b/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt
index c70470852ba..50cd465371a 100644
--- a/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_sourceselector_test_app TEST
     SOURCES
     sourceselector_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_sourceselector_test_app COMMAND searchlib_sourceselector_test_app)
diff --git a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt
index 1f5805ee19e..9aeb8daf236 100644
--- a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_stringattribute_test_app TEST
     SOURCES
     stringattribute_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_stringattribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/stringattribute_test.sh
                DEPENDS searchlib_stringattribute_test_app)
diff --git a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt
index 0eb667b4d6d..10f9f5bcc0d 100644
--- a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_tensorattribute_test_app TEST
     SOURCES
     tensorattribute_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_tensorattribute_test_app COMMAND searchlib_tensorattribute_test_app)
diff --git a/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt b/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt
index 5bddda57946..671e14d3ba5 100644
--- a/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt
+++ b/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_expgolomb_test_app TEST
     SOURCES
     expgolomb_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_expgolomb_test_app NO_VALGRIND COMMAND searchlib_expgolomb_test_app)
diff --git a/searchlib/src/tests/bitvector/CMakeLists.txt b/searchlib/src/tests/bitvector/CMakeLists.txt
index f748e82c328..1d715834cf0 100644
--- a/searchlib/src/tests/bitvector/CMakeLists.txt
+++ b/searchlib/src/tests/bitvector/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_bitvectorbenchmark_test_app
     SOURCES
     bitvectorbenchmark.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_bitvectorbenchmark_test_app COMMAND searchlib_bitvectorbenchmark_test_app BENCHMARK)
diff --git a/searchlib/src/tests/common/bitvector/CMakeLists.txt b/searchlib/src/tests/common/bitvector/CMakeLists.txt
index 42cbfced278..09b4fdea8b8 100644
--- a/searchlib/src/tests/common/bitvector/CMakeLists.txt
+++ b/searchlib/src/tests/common/bitvector/CMakeLists.txt
@@ -3,20 +3,20 @@ vespa_add_executable(searchlib_bitvector_test-common_app TEST
     SOURCES
     bitvector_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_bitvector_test-common_app COMMAND searchlib_bitvector_test-common_app)
 vespa_add_executable(searchlib_bitvector_benchmark_app
     SOURCES
     bitvector_benchmark.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_bitvector_benchmark_app COMMAND searchlib_bitvector_benchmark_app BENCHMARK)
 vespa_add_executable(searchlib_condensedbitvector_test_app TEST
     SOURCES
     condensedbitvector_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_condensedbitvector_test_app COMMAND searchlib_condensedbitvector_test_app)
diff --git a/searchlib/src/tests/common/geogcd/CMakeLists.txt b/searchlib/src/tests/common/geogcd/CMakeLists.txt
index ae0c1fa0dc4..d39a7f05ca2 100644
--- a/searchlib/src/tests/common/geogcd/CMakeLists.txt
+++ b/searchlib/src/tests/common/geogcd/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_geo_gcd_test_app TEST
     SOURCES
     geo_gcd_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_geo_gcd_test_app COMMAND searchlib_geo_gcd_test_app)
diff --git a/searchlib/src/tests/common/location/CMakeLists.txt b/searchlib/src/tests/common/location/CMakeLists.txt
index 3167ab485df..201b4074e8c 100644
--- a/searchlib/src/tests/common/location/CMakeLists.txt
+++ b/searchlib/src/tests/common/location/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_geo_location_test_app TEST
     SOURCES
     geo_location_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_geo_location_test_app COMMAND searchlib_geo_location_test_app)
diff --git a/searchlib/src/tests/common/location_iterator/CMakeLists.txt b/searchlib/src/tests/common/location_iterator/CMakeLists.txt
index 55639bdc283..1eb0ec5c8ba 100644
--- a/searchlib/src/tests/common/location_iterator/CMakeLists.txt
+++ b/searchlib/src/tests/common/location_iterator/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_location_iterator_test_app TEST
     SOURCES
     location_iterator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/common/matching_elements/CMakeLists.txt b/searchlib/src/tests/common/matching_elements/CMakeLists.txt
index f8c21b311a3..56b69ab1b05 100644
--- a/searchlib/src/tests/common/matching_elements/CMakeLists.txt
+++ b/searchlib/src/tests/common/matching_elements/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_common_matching_elements_test_app TEST
     SOURCES
     matching_elements_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_common_matching_elements_test_app COMMAND searchlib_common_matching_elements_test_app)
diff --git a/searchlib/src/tests/common/matching_elements_fields/CMakeLists.txt b/searchlib/src/tests/common/matching_elements_fields/CMakeLists.txt
index 0efd434e508..2d3c8fec060 100644
--- a/searchlib/src/tests/common/matching_elements_fields/CMakeLists.txt
+++ b/searchlib/src/tests/common/matching_elements_fields/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_common_matching_elements_fields_test_app TEST
     SOURCES
     matching_elements_fields_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_common_matching_elements_fields_test_app COMMAND searchlib_common_matching_elements_fields_test_app)
diff --git a/searchlib/src/tests/common/resultset/CMakeLists.txt b/searchlib/src/tests/common/resultset/CMakeLists.txt
index 9dd3feff349..699f43113dc 100644
--- a/searchlib/src/tests/common/resultset/CMakeLists.txt
+++ b/searchlib/src/tests/common/resultset/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_resultset_test_app TEST
     SOURCES
     resultset_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_resultset_test_app COMMAND searchlib_resultset_test_app)
diff --git a/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt b/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt
index 0149d440fc6..655c2186bae 100644
--- a/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt
+++ b/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_summaryfeatures_test_app TEST
     SOURCES
     summaryfeatures_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_summaryfeatures_test_app COMMAND searchlib_summaryfeatures_test_app)
diff --git a/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt b/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt
index f70a1efd23c..0f2606387cc 100644
--- a/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_bitvector_test-diskindex_app TEST
     SOURCES
     bitvector_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_bitvector_test-diskindex_app COMMAND searchlib_bitvector_test-diskindex_app)
diff --git a/searchlib/src/tests/diskindex/field_length_scanner/CMakeLists.txt b/searchlib/src/tests/diskindex/field_length_scanner/CMakeLists.txt
index cdcabce20cb..a6753d331b3 100644
--- a/searchlib/src/tests/diskindex/field_length_scanner/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/field_length_scanner/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_field_length_scanner_test_app TEST
     SOURCES
     field_length_scanner_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt
index 75ab7423d2f..76a250587a5 100644
--- a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt
@@ -4,6 +4,6 @@ vespa_add_executable(searchlib_fieldwriter_test_app TEST
     fieldwriter_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_fieldwriter_test_app COMMAND searchlib_fieldwriter_test_app COST 200)
diff --git a/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt b/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt
index 34114e195bc..c3c777cc463 100644
--- a/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_pagedict4_test_app TEST
     pagedict4_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_pagedict4_test_app COMMAND searchlib_pagedict4_test_app)
 
@@ -13,7 +13,7 @@ vespa_add_executable(searchlib_pagedict4_hugeword_cornercase_test_app TEST
     pagedict4_hugeword_cornercase_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_pagedict4_hugeword_cornercase_test_app COMMAND searchlib_pagedict4_hugeword_cornercase_test_app)
 
@@ -22,5 +22,5 @@ vespa_add_executable(searchlib_pagedict4_long_words_test_app TEST
     pagedict4_long_words_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/tests/docstore/chunk/CMakeLists.txt b/searchlib/src/tests/docstore/chunk/CMakeLists.txt
index 1068863e846..329221d80e1 100644
--- a/searchlib/src/tests/docstore/chunk/CMakeLists.txt
+++ b/searchlib/src/tests/docstore/chunk/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_chunk_test_app TEST
     SOURCES
     chunk_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_chunk_test_app COMMAND searchlib_chunk_test_app)
diff --git a/searchlib/src/tests/docstore/document_store/CMakeLists.txt b/searchlib/src/tests/docstore/document_store/CMakeLists.txt
index 9386ab8fa33..fe14320597f 100644
--- a/searchlib/src/tests/docstore/document_store/CMakeLists.txt
+++ b/searchlib/src/tests/docstore/document_store/CMakeLists.txt
@@ -3,13 +3,13 @@ vespa_add_executable(searchlib_document_store_test_app TEST
     SOURCES
     document_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_document_store_test_app COMMAND searchlib_document_store_test_app)
 vespa_add_executable(searchlib_visitcache_test_app TEST
     SOURCES
     visitcache_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_visitcache_test_app COMMAND searchlib_visitcache_test_app)
diff --git a/searchlib/src/tests/docstore/document_store_visitor/CMakeLists.txt b/searchlib/src/tests/docstore/document_store_visitor/CMakeLists.txt
index 3f51a6b1fd0..afca02e342b 100644
--- a/searchlib/src/tests/docstore/document_store_visitor/CMakeLists.txt
+++ b/searchlib/src/tests/docstore/document_store_visitor/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_document_store_visitor_test_app TEST
     SOURCES
     document_store_visitor_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_document_store_visitor_test_app COMMAND searchlib_document_store_visitor_test_app)
diff --git a/searchlib/src/tests/docstore/file_chunk/CMakeLists.txt b/searchlib/src/tests/docstore/file_chunk/CMakeLists.txt
index 4c3e5f2358e..cae93c15060 100644
--- a/searchlib/src/tests/docstore/file_chunk/CMakeLists.txt
+++ b/searchlib/src/tests/docstore/file_chunk/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_file_chunk_test_app TEST
     SOURCES
     file_chunk_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_file_chunk_test_app COMMAND searchlib_file_chunk_test_app)
diff --git a/searchlib/src/tests/docstore/lid_info/CMakeLists.txt b/searchlib/src/tests/docstore/lid_info/CMakeLists.txt
index 419a79b4714..167ed1ace80 100644
--- a/searchlib/src/tests/docstore/lid_info/CMakeLists.txt
+++ b/searchlib/src/tests/docstore/lid_info/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_lid_info_test_app TEST
     SOURCES
     lid_info_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_lid_info_test_app COMMAND searchlib_lid_info_test_app)
diff --git a/searchlib/src/tests/docstore/logdatastore/CMakeLists.txt b/searchlib/src/tests/docstore/logdatastore/CMakeLists.txt
index 479d34bad9d..e5c66c2b91b 100644
--- a/searchlib/src/tests/docstore/logdatastore/CMakeLists.txt
+++ b/searchlib/src/tests/docstore/logdatastore/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_logdatastore_test_app TEST
     SOURCES
     logdatastore_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_logdatastore_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logdatastore_test.sh
                DEPENDS searchlib_logdatastore_test_app)
diff --git a/searchlib/src/tests/docstore/store_by_bucket/CMakeLists.txt b/searchlib/src/tests/docstore/store_by_bucket/CMakeLists.txt
index 71abe3c6564..cb30a6dd0a8 100644
--- a/searchlib/src/tests/docstore/store_by_bucket/CMakeLists.txt
+++ b/searchlib/src/tests/docstore/store_by_bucket/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_store_by_bucket_test_app TEST
     SOURCES
     store_by_bucket_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_store_by_bucket_test_app COMMAND searchlib_store_by_bucket_test_app)
diff --git a/searchlib/src/tests/engine/proto_converter/CMakeLists.txt b/searchlib/src/tests/engine/proto_converter/CMakeLists.txt
index ee5f2c2a64c..97b987ec0b8 100644
--- a/searchlib/src/tests/engine/proto_converter/CMakeLists.txt
+++ b/searchlib/src/tests/engine/proto_converter/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_engine_proto_converter_test_app TEST
     SOURCES
     proto_converter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_engine_proto_converter_test_app COMMAND searchlib_engine_proto_converter_test_app)
diff --git a/searchlib/src/tests/engine/proto_rpc_adapter/CMakeLists.txt b/searchlib/src/tests/engine/proto_rpc_adapter/CMakeLists.txt
index 52757f870bc..a30bb91ac64 100644
--- a/searchlib/src/tests/engine/proto_rpc_adapter/CMakeLists.txt
+++ b/searchlib/src/tests/engine/proto_rpc_adapter/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_engine_proto_rpc_adapter_test_app TEST
     SOURCES
     proto_rpc_adapter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_engine_proto_rpc_adapter_test_app COMMAND searchlib_engine_proto_rpc_adapter_test_app)
diff --git a/searchlib/src/tests/expression/attributenode/CMakeLists.txt b/searchlib/src/tests/expression/attributenode/CMakeLists.txt
index 841deb0cb45..dd388572cfa 100644
--- a/searchlib/src/tests/expression/attributenode/CMakeLists.txt
+++ b/searchlib/src/tests/expression/attributenode/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attribute_node_test_app TEST
     SOURCES
     attribute_node_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_attribute_node_test_app COMMAND searchlib_attribute_node_test_app)
diff --git a/searchlib/src/tests/expression/current_index_setup/CMakeLists.txt b/searchlib/src/tests/expression/current_index_setup/CMakeLists.txt
index 80d59cab617..125e9aa74f1 100644
--- a/searchlib/src/tests/expression/current_index_setup/CMakeLists.txt
+++ b/searchlib/src/tests/expression/current_index_setup/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_current_index_setup_test_app TEST
     SOURCES
     current_index_setup_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_current_index_setup_test_app COMMAND searchlib_current_index_setup_test_app)
diff --git a/searchlib/src/tests/features/CMakeLists.txt b/searchlib/src/tests/features/CMakeLists.txt
index ea2410734b5..3a2b596a529 100644
--- a/searchlib/src/tests/features/CMakeLists.txt
+++ b/searchlib/src/tests/features/CMakeLists.txt
@@ -7,7 +7,7 @@ vespa_add_executable(searchlib_prod_features_test_app TEST
     prod_features_fieldmatch.cpp
     prod_features_fieldtermmatch.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_prod_features_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/prod_features_test.sh
@@ -16,7 +16,7 @@ vespa_add_executable(searchlib_featurebenchmark_app
     SOURCES
     featurebenchmark.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_featurebenchmark_app COMMAND searchlib_featurebenchmark_app BENCHMARK)
diff --git a/searchlib/src/tests/features/beta/CMakeLists.txt b/searchlib/src/tests/features/beta/CMakeLists.txt
index db45f02d898..9f2aa16f086 100644
--- a/searchlib/src/tests/features/beta/CMakeLists.txt
+++ b/searchlib/src/tests/features/beta/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_beta_features_test_app TEST
     SOURCES
     beta_features_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(
diff --git a/searchlib/src/tests/features/bm25/CMakeLists.txt b/searchlib/src/tests/features/bm25/CMakeLists.txt
index 5d5c7f63578..7d735c13a06 100644
--- a/searchlib/src/tests/features/bm25/CMakeLists.txt
+++ b/searchlib/src/tests/features/bm25/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_features_bm25_test_app TEST
     SOURCES
     bm25_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/features/closest/CMakeLists.txt b/searchlib/src/tests/features/closest/CMakeLists.txt
index b124066afee..7777d526b40 100644
--- a/searchlib/src/tests/features/closest/CMakeLists.txt
+++ b/searchlib/src/tests/features/closest/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_closest_test_app TEST
     SOURCES
     closest_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_closest_test_app COMMAND searchlib_closest_test_app)
diff --git a/searchlib/src/tests/features/constant/CMakeLists.txt b/searchlib/src/tests/features/constant/CMakeLists.txt
index bd76bf654bf..c873e647b7d 100644
--- a/searchlib/src/tests/features/constant/CMakeLists.txt
+++ b/searchlib/src/tests/features/constant/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_constant_test_app TEST
     SOURCES
     constant_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_constant_test_app COMMAND searchlib_constant_test_app)
diff --git a/searchlib/src/tests/features/element_completeness/CMakeLists.txt b/searchlib/src/tests/features/element_completeness/CMakeLists.txt
index 046b061b884..8486ce0efcf 100644
--- a/searchlib/src/tests/features/element_completeness/CMakeLists.txt
+++ b/searchlib/src/tests/features/element_completeness/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_element_completeness_test_app TEST
     SOURCES
     element_completeness_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_element_completeness_test_app COMMAND searchlib_element_completeness_test_app)
diff --git a/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt b/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt
index 7703d9be0c6..62bf8d7162f 100644
--- a/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt
+++ b/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_element_similarity_feature_test_app TEST
     SOURCES
     element_similarity_feature_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_element_similarity_feature_test_app COMMAND searchlib_element_similarity_feature_test_app COST 50)
diff --git a/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt b/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt
index df55b8f834c..03e9456e4a9 100644
--- a/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt
+++ b/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_euclidean_distance_test_app TEST
     SOURCES
     euclidean_distance_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_euclidean_distance_test_app COMMAND searchlib_euclidean_distance_test_app)
diff --git a/searchlib/src/tests/features/first_phase_rank/CMakeLists.txt b/searchlib/src/tests/features/first_phase_rank/CMakeLists.txt
index 5aa83399d3d..dfb69077b64 100644
--- a/searchlib/src/tests/features/first_phase_rank/CMakeLists.txt
+++ b/searchlib/src/tests/features/first_phase_rank/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_features_first_phase_rank_test_app TEST
     SOURCES
     first_phase_rank_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/features/imported_dot_product/CMakeLists.txt b/searchlib/src/tests/features/imported_dot_product/CMakeLists.txt
index 25828f14bf1..8fcc3faa094 100644
--- a/searchlib/src/tests/features/imported_dot_product/CMakeLists.txt
+++ b/searchlib/src/tests/features/imported_dot_product/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_imported_dot_product_test_app TEST
     SOURCES
     imported_dot_product_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_imported_dot_product_test_app COMMAND searchlib_imported_dot_product_test_app)
diff --git a/searchlib/src/tests/features/internal_max_reduce_prod_join_feature/CMakeLists.txt b/searchlib/src/tests/features/internal_max_reduce_prod_join_feature/CMakeLists.txt
index e7fc3126e2f..cfdd52bc393 100644
--- a/searchlib/src/tests/features/internal_max_reduce_prod_join_feature/CMakeLists.txt
+++ b/searchlib/src/tests/features/internal_max_reduce_prod_join_feature/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_internal_max_reduce_prod_join_feature_test_app TE
     SOURCES
 	internal_max_reduce_prod_join_feature_test.cpp
     DEPENDS
-        searchlib
+        vespa_searchlib
         searchlib_test
 )
 vespa_add_test(NAME searchlib_internal_max_reduce_prod_join_feature_test_app COMMAND searchlib_internal_max_reduce_prod_join_feature_test_app)
diff --git a/searchlib/src/tests/features/item_raw_score/CMakeLists.txt b/searchlib/src/tests/features/item_raw_score/CMakeLists.txt
index 27329de4c67..47e4aa4a3dd 100644
--- a/searchlib/src/tests/features/item_raw_score/CMakeLists.txt
+++ b/searchlib/src/tests/features/item_raw_score/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_item_raw_score_test_app TEST
     SOURCES
     item_raw_score_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_item_raw_score_test_app COMMAND searchlib_item_raw_score_test_app)
diff --git a/searchlib/src/tests/features/max_reduce_prod_join_replacer/CMakeLists.txt b/searchlib/src/tests/features/max_reduce_prod_join_replacer/CMakeLists.txt
index d24b6ae65d0..41f6828d19d 100644
--- a/searchlib/src/tests/features/max_reduce_prod_join_replacer/CMakeLists.txt
+++ b/searchlib/src/tests/features/max_reduce_prod_join_replacer/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_max_reduce_prod_join_replacer_test_app TEST
     SOURCES
     max_reduce_prod_join_replacer_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_max_reduce_prod_join_replacer_test_app COMMAND searchlib_max_reduce_prod_join_replacer_test_app)
diff --git a/searchlib/src/tests/features/native_dot_product/CMakeLists.txt b/searchlib/src/tests/features/native_dot_product/CMakeLists.txt
index dbdd5803c2b..0f301d81619 100644
--- a/searchlib/src/tests/features/native_dot_product/CMakeLists.txt
+++ b/searchlib/src/tests/features/native_dot_product/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_native_dot_product_test_app TEST
     SOURCES
     native_dot_product_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_native_dot_product_test_app COMMAND searchlib_native_dot_product_test_app)
diff --git a/searchlib/src/tests/features/nns_closeness/CMakeLists.txt b/searchlib/src/tests/features/nns_closeness/CMakeLists.txt
index 1b31d773199..373274d25f0 100644
--- a/searchlib/src/tests/features/nns_closeness/CMakeLists.txt
+++ b/searchlib/src/tests/features/nns_closeness/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_nns_closeness_test_app TEST
     SOURCES
     nns_closeness_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_nns_closeness_test_app COMMAND searchlib_nns_closeness_test_app)
diff --git a/searchlib/src/tests/features/nns_distance/CMakeLists.txt b/searchlib/src/tests/features/nns_distance/CMakeLists.txt
index 4b85bdbd682..753be89a849 100644
--- a/searchlib/src/tests/features/nns_distance/CMakeLists.txt
+++ b/searchlib/src/tests/features/nns_distance/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_nns_distance_test_app TEST
     SOURCES
     nns_distance_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_nns_distance_test_app COMMAND searchlib_nns_distance_test_app)
diff --git a/searchlib/src/tests/features/onnx_feature/CMakeLists.txt b/searchlib/src/tests/features/onnx_feature/CMakeLists.txt
index 9291e833035..630990d40ab 100644
--- a/searchlib/src/tests/features/onnx_feature/CMakeLists.txt
+++ b/searchlib/src/tests/features/onnx_feature/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_onnx_feature_test_app TEST
     SOURCES
     onnx_feature_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_onnx_feature_test_app COMMAND searchlib_onnx_feature_test_app)
diff --git a/searchlib/src/tests/features/ranking_expression/CMakeLists.txt b/searchlib/src/tests/features/ranking_expression/CMakeLists.txt
index 849811ac802..526860320e7 100644
--- a/searchlib/src/tests/features/ranking_expression/CMakeLists.txt
+++ b/searchlib/src/tests/features/ranking_expression/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_ranking_expression_test_app TEST
     SOURCES
     ranking_expression_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_ranking_expression_test_app COMMAND searchlib_ranking_expression_test_app)
diff --git a/searchlib/src/tests/features/raw_score/CMakeLists.txt b/searchlib/src/tests/features/raw_score/CMakeLists.txt
index 10f07b20e23..824690b8d12 100644
--- a/searchlib/src/tests/features/raw_score/CMakeLists.txt
+++ b/searchlib/src/tests/features/raw_score/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_raw_score_test_app TEST
     SOURCES
     raw_score_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_raw_score_test_app COMMAND searchlib_raw_score_test_app)
diff --git a/searchlib/src/tests/features/subqueries/CMakeLists.txt b/searchlib/src/tests/features/subqueries/CMakeLists.txt
index cbf0ce2a467..e7c1b396d2f 100644
--- a/searchlib/src/tests/features/subqueries/CMakeLists.txt
+++ b/searchlib/src/tests/features/subqueries/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_subqueries_test_app TEST
     SOURCES
     subqueries_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_subqueries_test_app COMMAND searchlib_subqueries_test_app)
diff --git a/searchlib/src/tests/features/tensor/CMakeLists.txt b/searchlib/src/tests/features/tensor/CMakeLists.txt
index 7666c613bb3..537080aa168 100644
--- a/searchlib/src/tests/features/tensor/CMakeLists.txt
+++ b/searchlib/src/tests/features/tensor/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_tensor_test_app TEST
     SOURCES
     tensor_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_tensor_test_app COMMAND searchlib_tensor_test_app)
diff --git a/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt b/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt
index 3ecceffd422..a02c96aa1b3 100644
--- a/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt
+++ b/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_tensor_from_labels_test_app TEST
     SOURCES
     tensor_from_labels_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_tensor_from_labels_test_app COMMAND searchlib_tensor_from_labels_test_app)
diff --git a/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt b/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt
index b5322c1a64c..130ac165e8a 100644
--- a/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt
+++ b/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_tensor_from_weighted_set_test_app TEST
     SOURCES
     tensor_from_weighted_set_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_tensor_from_weighted_set_test_app COMMAND searchlib_tensor_from_weighted_set_test_app)
diff --git a/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt b/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt
index cfa715af516..29fa11ccb61 100644
--- a/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt
+++ b/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_text_similarity_feature_test_app TEST
     SOURCES
     text_similarity_feature_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_text_similarity_feature_test_app COMMAND searchlib_text_similarity_feature_test_app)
diff --git a/searchlib/src/tests/features/util/CMakeLists.txt b/searchlib/src/tests/features/util/CMakeLists.txt
index 33054cddf36..0eee4d3b7ac 100644
--- a/searchlib/src/tests/features/util/CMakeLists.txt
+++ b/searchlib/src/tests/features/util/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_util_test_app TEST
     SOURCES
     util_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_util_test_app COMMAND searchlib_util_test_app)
diff --git a/searchlib/src/tests/fef/CMakeLists.txt b/searchlib/src/tests/fef/CMakeLists.txt
index a01cb15a492..de32f1718da 100644
--- a/searchlib/src/tests/fef/CMakeLists.txt
+++ b/searchlib/src/tests/fef/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_fef_test_app TEST
     SOURCES
     fef_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_fef_test_app COMMAND searchlib_fef_test_app)
diff --git a/searchlib/src/tests/fef/attributecontent/CMakeLists.txt b/searchlib/src/tests/fef/attributecontent/CMakeLists.txt
index d9c88fb9eaf..966f84700a5 100644
--- a/searchlib/src/tests/fef/attributecontent/CMakeLists.txt
+++ b/searchlib/src/tests/fef/attributecontent/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_attributecontent_test_app TEST
     SOURCES
     attributecontent_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_attributecontent_test_app COMMAND searchlib_attributecontent_test_app)
diff --git a/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt b/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt
index 5f8dc64c564..8675e36e7b9 100644
--- a/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt
+++ b/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_featurenamebuilder_test_app TEST
     SOURCES
     featurenamebuilder_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_featurenamebuilder_test_app COMMAND searchlib_featurenamebuilder_test_app)
diff --git a/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt b/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt
index cb040472a6f..ff224d9ab5f 100644
--- a/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt
+++ b/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_featurenameparser_test_app TEST
     SOURCES
     featurenameparser_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_featurenameparser_test_app COMMAND searchlib_featurenameparser_test_app)
diff --git a/searchlib/src/tests/fef/featureoverride/CMakeLists.txt b/searchlib/src/tests/fef/featureoverride/CMakeLists.txt
index 789903633a3..7f3c5bf3e32 100644
--- a/searchlib/src/tests/fef/featureoverride/CMakeLists.txt
+++ b/searchlib/src/tests/fef/featureoverride/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_featureoverride_test_app TEST
     SOURCES
     featureoverride_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_featureoverride_test_app COMMAND searchlib_featureoverride_test_app)
diff --git a/searchlib/src/tests/fef/object_passing/CMakeLists.txt b/searchlib/src/tests/fef/object_passing/CMakeLists.txt
index 2c8e0400b92..db9b95b22a6 100644
--- a/searchlib/src/tests/fef/object_passing/CMakeLists.txt
+++ b/searchlib/src/tests/fef/object_passing/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_object_passing_test_app TEST
     SOURCES
     object_passing_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_object_passing_test_app COMMAND searchlib_object_passing_test_app)
diff --git a/searchlib/src/tests/fef/parameter/CMakeLists.txt b/searchlib/src/tests/fef/parameter/CMakeLists.txt
index b238e09c98b..58ae4c412a4 100644
--- a/searchlib/src/tests/fef/parameter/CMakeLists.txt
+++ b/searchlib/src/tests/fef/parameter/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_parameter_test_app TEST
     SOURCES
     parameter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_parameter_test_app NO_VALGRIND COMMAND searchlib_parameter_test_app)
diff --git a/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt b/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt
index 8f3946d110c..6c4c7ae124a 100644
--- a/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt
+++ b/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_phrasesplitter_test_app TEST
     SOURCES
     phrasesplitter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_phrasesplitter_test_app COMMAND searchlib_phrasesplitter_test_app)
@@ -11,6 +11,6 @@ vespa_add_executable(searchlib_benchmark_app
     SOURCES
     benchmark.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_benchmark_app COMMAND searchlib_benchmark_app BENCHMARK)
diff --git a/searchlib/src/tests/fef/properties/CMakeLists.txt b/searchlib/src/tests/fef/properties/CMakeLists.txt
index d0abf5bd377..4eae94344c4 100644
--- a/searchlib/src/tests/fef/properties/CMakeLists.txt
+++ b/searchlib/src/tests/fef/properties/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_properties_test_app TEST
     SOURCES
     properties_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_properties_test_app COMMAND searchlib_properties_test_app)
diff --git a/searchlib/src/tests/fef/rank_program/CMakeLists.txt b/searchlib/src/tests/fef/rank_program/CMakeLists.txt
index 2956e9ccfd8..23e5ff007fc 100644
--- a/searchlib/src/tests/fef/rank_program/CMakeLists.txt
+++ b/searchlib/src/tests/fef/rank_program/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_rank_program_test_app TEST
     SOURCES
     rank_program_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_rank_program_test_app COMMAND searchlib_rank_program_test_app)
diff --git a/searchlib/src/tests/fef/resolver/CMakeLists.txt b/searchlib/src/tests/fef/resolver/CMakeLists.txt
index 107b2daf46a..8c7f806a1a6 100644
--- a/searchlib/src/tests/fef/resolver/CMakeLists.txt
+++ b/searchlib/src/tests/fef/resolver/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_resolver_test_app TEST
     SOURCES
     resolver_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_resolver_test_app COMMAND searchlib_resolver_test_app)
diff --git a/searchlib/src/tests/fef/table/CMakeLists.txt b/searchlib/src/tests/fef/table/CMakeLists.txt
index 2353fd50c95..c7408da325d 100644
--- a/searchlib/src/tests/fef/table/CMakeLists.txt
+++ b/searchlib/src/tests/fef/table/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_table_test_app TEST
     SOURCES
     table_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_table_test_app COMMAND searchlib_table_test_app)
diff --git a/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt b/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt
index 70c3b952e49..3dc46b06b19 100644
--- a/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt
+++ b/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_termfieldmodel_test_app TEST
     SOURCES
     termfieldmodel_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_termfieldmodel_test_app COMMAND searchlib_termfieldmodel_test_app)
diff --git a/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt b/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt
index fc4de86cc24..d757999def0 100644
--- a/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt
+++ b/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_termmatchdatamerger_test_app TEST
     SOURCES
     termmatchdatamerger_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_termmatchdatamerger_test_app COMMAND searchlib_termmatchdatamerger_test_app)
diff --git a/searchlib/src/tests/fileheadertk/CMakeLists.txt b/searchlib/src/tests/fileheadertk/CMakeLists.txt
index 78e642271f1..3dc90ca6250 100644
--- a/searchlib/src/tests/fileheadertk/CMakeLists.txt
+++ b/searchlib/src/tests/fileheadertk/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_fileheadertk_test_app TEST
     SOURCES
     fileheadertk_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_fileheadertk_test_app COMMAND searchlib_fileheadertk_test_app)
diff --git a/searchlib/src/tests/forcelink/CMakeLists.txt b/searchlib/src/tests/forcelink/CMakeLists.txt
index 9f98737c158..e5c14129a98 100644
--- a/searchlib/src/tests/forcelink/CMakeLists.txt
+++ b/searchlib/src/tests/forcelink/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_forcelink_test_app TEST
     SOURCES
     forcelink_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_forcelink_test_app COMMAND searchlib_forcelink_test_app)
diff --git a/searchlib/src/tests/grouping/CMakeLists.txt b/searchlib/src/tests/grouping/CMakeLists.txt
index 3bfedc17c36..b9273cefaa8 100644
--- a/searchlib/src/tests/grouping/CMakeLists.txt
+++ b/searchlib/src/tests/grouping/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_grouping_test_app TEST
     SOURCES
     grouping_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_grouping_test_app COMMAND searchlib_grouping_test_app)
@@ -11,20 +11,20 @@ vespa_add_executable(searchlib_hyperloglog_test_app TEST
     SOURCES
     hyperloglog_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_hyperloglog_test_app COMMAND searchlib_hyperloglog_test_app)
 vespa_add_executable(searchlib_sketch_test_app TEST
     SOURCES
     sketch_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_sketch_test_app COMMAND searchlib_sketch_test_app)
 vespa_add_executable(searchlib_grouping_serialization_test_app TEST
     SOURCES
     grouping_serialization_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_grouping_serialization_test_app COMMAND searchlib_grouping_serialization_test_app)
diff --git a/searchlib/src/tests/groupingengine/CMakeLists.txt b/searchlib/src/tests/groupingengine/CMakeLists.txt
index bfbcaa1535b..1ee6231a82b 100644
--- a/searchlib/src/tests/groupingengine/CMakeLists.txt
+++ b/searchlib/src/tests/groupingengine/CMakeLists.txt
@@ -3,13 +3,13 @@ vespa_add_executable(searchlib_groupingengine_test_app
     SOURCES
     groupingengine_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 #vespa_add_test(NAME searchlib_groupingengine_test_app COMMAND searchlib_groupingengine_test_app) 
 vespa_add_executable(searchlib_groupingengine_benchmark_app
     SOURCES
     groupingengine_benchmark.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_groupingengine_benchmark_app COMMAND searchlib_groupingengine_benchmark_app BENCHMARK)
diff --git a/searchlib/src/tests/hitcollector/CMakeLists.txt b/searchlib/src/tests/hitcollector/CMakeLists.txt
index cc62dd82af4..ec5ae78a658 100644
--- a/searchlib/src/tests/hitcollector/CMakeLists.txt
+++ b/searchlib/src/tests/hitcollector/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_hitcollector_test_app TEST
     SOURCES
     hitcollector_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_hitcollector_test_app COMMAND searchlib_hitcollector_test_app)
@@ -11,7 +11,7 @@ vespa_add_executable(searchlib_sorted_hit_sequence_test_app TEST
     SOURCES
     sorted_hit_sequence_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_sorted_hit_sequence_test_app COMMAND searchlib_sorted_hit_sequence_test_app)
diff --git a/searchlib/src/tests/index/field_length_calculator/CMakeLists.txt b/searchlib/src/tests/index/field_length_calculator/CMakeLists.txt
index 4df31e04d28..a321a192e1c 100644
--- a/searchlib/src/tests/index/field_length_calculator/CMakeLists.txt
+++ b/searchlib/src/tests/index/field_length_calculator/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_field_length_calculator_test_app TEST
     SOURCES
     field_length_calculator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_field_length_calculator_test_app COMMAND searchlib_field_length_calculator_test_app)
diff --git a/searchlib/src/tests/indexmetainfo/CMakeLists.txt b/searchlib/src/tests/indexmetainfo/CMakeLists.txt
index 46d50106cfc..980f9dc8ae9 100644
--- a/searchlib/src/tests/indexmetainfo/CMakeLists.txt
+++ b/searchlib/src/tests/indexmetainfo/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_indexmetainfo_test_app TEST
     SOURCES
     indexmetainfo_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_indexmetainfo_test_app COMMAND searchlib_indexmetainfo_test_app)
diff --git a/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt b/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt
index e5ff2409cb4..2c5acb7dde3 100644
--- a/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_compact_words_store_test_app TEST
     SOURCES
     compact_words_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_compact_words_store_test_app COMMAND searchlib_compact_words_store_test_app)
diff --git a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
index 8e3764bbe6c..52d50278ad3 100644
--- a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_feature_store_test_app TEST
     SOURCES
     feature_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_feature_store_test_app COMMAND searchlib_feature_store_test_app)
@@ -11,7 +11,7 @@ vespa_add_executable(searchlib_word_store_test_app TEST
     SOURCES
     word_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_word_store_test_app COMMAND searchlib_word_store_test_app)
diff --git a/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt
index 54ce308c53f..23fb77537cb 100644
--- a/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_document_inverter_test_app TEST
     document_inverter_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_document_inverter_test_app COMMAND searchlib_document_inverter_test_app)
diff --git a/searchlib/src/tests/memoryindex/document_inverter_collection/CMakeLists.txt b/searchlib/src/tests/memoryindex/document_inverter_collection/CMakeLists.txt
index 79d62553e3f..2b3c6396a55 100644
--- a/searchlib/src/tests/memoryindex/document_inverter_collection/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/document_inverter_collection/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_document_inverter_collection_test_app TEST
     document_inverter_collection_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_document_inverter_collection_test_app COMMAND searchlib_document_inverter_collection_test_app)
diff --git a/searchlib/src/tests/memoryindex/field_index/CMakeLists.txt b/searchlib/src/tests/memoryindex/field_index/CMakeLists.txt
index 41a9a770370..bc541c0a46f 100644
--- a/searchlib/src/tests/memoryindex/field_index/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/field_index/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_field_index_test_app TEST
     SOURCES
     field_index_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
@@ -13,7 +13,7 @@ vespa_add_executable(searchlib_field_index_iterator_test_app TEST
     SOURCES
     field_index_iterator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_field_index_iterator_test_app COMMAND searchlib_field_index_iterator_test_app)
diff --git a/searchlib/src/tests/memoryindex/field_index_remover/CMakeLists.txt b/searchlib/src/tests/memoryindex/field_index_remover/CMakeLists.txt
index 34f5aba4805..b7528944077 100644
--- a/searchlib/src/tests/memoryindex/field_index_remover/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/field_index_remover/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_field_index_remover_test_app TEST
     SOURCES
     field_index_remover_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_field_index_remover_test_app COMMAND searchlib_field_index_remover_test_app)
diff --git a/searchlib/src/tests/memoryindex/field_inverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/field_inverter/CMakeLists.txt
index d5604566025..6f659109020 100644
--- a/searchlib/src/tests/memoryindex/field_inverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/field_inverter/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_field_inverter_test_app TEST
     field_inverter_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_field_inverter_test_app COMMAND searchlib_field_inverter_test_app)
diff --git a/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt
index 9f49ae95bf2..0c60ba1b23f 100644
--- a/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_url_field_inverter_test_app TEST
     url_field_inverter_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_url_field_inverter_test_app COMMAND searchlib_url_field_inverter_test_app)
diff --git a/searchlib/src/tests/nativerank/CMakeLists.txt b/searchlib/src/tests/nativerank/CMakeLists.txt
index 2a46dd54904..6ef55f5fdc9 100644
--- a/searchlib/src/tests/nativerank/CMakeLists.txt
+++ b/searchlib/src/tests/nativerank/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_nativerank_test_app TEST
     SOURCES
     nativerank_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(
diff --git a/searchlib/src/tests/nearsearch/CMakeLists.txt b/searchlib/src/tests/nearsearch/CMakeLists.txt
index 8d23b54963e..95be9f628bf 100644
--- a/searchlib/src/tests/nearsearch/CMakeLists.txt
+++ b/searchlib/src/tests/nearsearch/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_nearsearch_test_app TEST
     SOURCES
     nearsearch_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_nearsearch_test_app COMMAND searchlib_nearsearch_test_app)
diff --git a/searchlib/src/tests/postinglistbm/CMakeLists.txt b/searchlib/src/tests/postinglistbm/CMakeLists.txt
index 27fe52386ed..92ea96b73b6 100644
--- a/searchlib/src/tests/postinglistbm/CMakeLists.txt
+++ b/searchlib/src/tests/postinglistbm/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_posting_list_test_app TEST
     posting_list_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_posting_list_test_app NO_VALGRIND COMMAND searchlib_posting_list_test_app)
@@ -15,5 +15,5 @@ vespa_add_executable(searchlib_postinglistbm_app TEST
     stress_runner.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/tests/predicate/CMakeLists.txt b/searchlib/src/tests/predicate/CMakeLists.txt
index b4d385a32f6..d33e5617908 100644
--- a/searchlib/src/tests/predicate/CMakeLists.txt
+++ b/searchlib/src/tests/predicate/CMakeLists.txt
@@ -3,90 +3,90 @@ vespa_add_executable(searchlib_predicate_index_test_app TEST
     SOURCES
     predicate_index_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_index_test_app COMMAND searchlib_predicate_index_test_app)
 vespa_add_executable(searchlib_simple_index_test_app TEST
     SOURCES
     simple_index_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_simple_index_test_app COMMAND searchlib_simple_index_test_app)
 vespa_add_executable(searchlib_tree_crumbs_test_app TEST
     SOURCES
     tree_crumbs_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_tree_crumbs_test_app COMMAND searchlib_tree_crumbs_test_app)
 vespa_add_executable(searchlib_predicate_tree_analyzer_test_app TEST
     SOURCES
     predicate_tree_analyzer_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_tree_analyzer_test_app COMMAND searchlib_predicate_tree_analyzer_test_app)
 vespa_add_executable(searchlib_predicate_tree_annotator_test_app TEST
     SOURCES
     predicate_tree_annotator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_tree_annotator_test_app COMMAND searchlib_predicate_tree_annotator_test_app)
 vespa_add_executable(searchlib_predicate_interval_store_test_app TEST
     SOURCES
     predicate_interval_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_interval_store_test_app COMMAND searchlib_predicate_interval_store_test_app)
 vespa_add_executable(searchlib_document_features_store_test_app TEST
     SOURCES
     document_features_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_document_features_store_test_app COMMAND searchlib_document_features_store_test_app)
 vespa_add_executable(searchlib_predicate_ref_cache_test_app TEST
     SOURCES
     predicate_ref_cache_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_ref_cache_test_app COMMAND searchlib_predicate_ref_cache_test_app)
 vespa_add_executable(searchlib_predicate_interval_posting_list_test_app TEST
     SOURCES
     predicate_interval_posting_list_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_interval_posting_list_test_app COMMAND searchlib_predicate_interval_posting_list_test_app)
 vespa_add_executable(searchlib_predicate_bounds_posting_list_test_app TEST
     SOURCES
     predicate_bounds_posting_list_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_bounds_posting_list_test_app COMMAND searchlib_predicate_bounds_posting_list_test_app)
 vespa_add_executable(searchlib_predicate_zero_constraint_posting_list_test_app TEST
     SOURCES
     predicate_zero_constraint_posting_list_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_zero_constraint_posting_list_test_app COMMAND searchlib_predicate_zero_constraint_posting_list_test_app)
 vespa_add_executable(searchlib_predicate_zstar_compressed_posting_list_test_app TEST
     SOURCES
     predicate_zstar_compressed_posting_list_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_zstar_compressed_posting_list_test_app COMMAND searchlib_predicate_zstar_compressed_posting_list_test_app)
 vespa_add_executable(searchlib_predicate_range_term_expander_test_app TEST
     SOURCES
     predicate_range_term_expander_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_range_term_expander_test_app COMMAND searchlib_predicate_range_term_expander_test_app)
diff --git a/searchlib/src/tests/query/CMakeLists.txt b/searchlib/src/tests/query/CMakeLists.txt
index 39ef50b1d8c..c1bfc5a8da2 100644
--- a/searchlib/src/tests/query/CMakeLists.txt
+++ b/searchlib/src/tests/query/CMakeLists.txt
@@ -3,21 +3,21 @@ vespa_add_executable(searchlib_query_visitor_test_app TEST
     SOURCES
     query_visitor_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_query_visitor_test_app COMMAND searchlib_query_visitor_test_app)
 vespa_add_executable(searchlib_customtypevisitor_test_app TEST
     SOURCES
     customtypevisitor_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_customtypevisitor_test_app COMMAND searchlib_customtypevisitor_test_app)
 vespa_add_executable(searchlib_templatetermvisitor_test_app TEST
     SOURCES
     templatetermvisitor_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_templatetermvisitor_test_app COMMAND searchlib_templatetermvisitor_test_app)
@@ -25,21 +25,21 @@ vespa_add_executable(searchlib_querybuilder_test_app TEST
     SOURCES
     querybuilder_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_querybuilder_test_app COMMAND searchlib_querybuilder_test_app)
 vespa_add_executable(searchlib_stackdumpquerycreator_test_app TEST
     SOURCES
     stackdumpquerycreator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_stackdumpquerycreator_test_app COMMAND searchlib_stackdumpquerycreator_test_app)
 vespa_add_executable(searchlib_streaming_query_test_app TEST
     SOURCES
     streaming_query_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_streaming_query_test_app COMMAND searchlib_streaming_query_test_app)
@@ -47,6 +47,6 @@ vespa_add_executable(searchlib_streaming_query_large_test_app TEST
     SOURCES
     streaming_query_large_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_streaming_query_large_test_app COMMAND searchlib_streaming_query_large_test_app)
diff --git a/searchlib/src/tests/query/streaming/CMakeLists.txt b/searchlib/src/tests/query/streaming/CMakeLists.txt
index 5ed450ecbc8..c0c89a5cc17 100644
--- a/searchlib/src/tests/query/streaming/CMakeLists.txt
+++ b/searchlib/src/tests/query/streaming/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_query_streaming_equiv_query_node_test_app TEST
     SOURCES
     equiv_query_node_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_query_streaming_equiv_query_node_test_app COMMAND searchlib_query_streaming_equiv_query_node_test_app)
@@ -13,7 +13,7 @@ vespa_add_executable(searchlib_query_streaming_hit_iterator_test_app TEST
     SOURCES
     hit_iterator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_query_streaming_hit_iterator_test_app COMMAND searchlib_query_streaming_hit_iterator_test_app)
@@ -22,7 +22,7 @@ vespa_add_executable(searchlib_query_streaming_hit_iterator_pack_test_app TEST
     SOURCES
     hit_iterator_pack_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_query_streaming_hit_iterator_pack_test_app COMMAND searchlib_query_streaming_hit_iterator_pack_test_app)
@@ -31,7 +31,7 @@ vespa_add_executable(searchlib_query_streaming_near_test_app TEST
     SOURCES
     near_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_query_streaming_near_test_app COMMAND searchlib_query_streaming_near_test_app)
@@ -40,7 +40,7 @@ vespa_add_executable(searchlib_query_streaming_same_element_query_node_test_app
     SOURCES
     same_element_query_node_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_query_streaming_same_element_query_node_test_app COMMAND searchlib_query_streaming_same_element_query_node_test_app)
@@ -49,7 +49,7 @@ vespa_add_executable(searchlib_query_streaming_phrase_query_node_test_app TEST
     SOURCES
     phrase_query_node_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_query_streaming_phrase_query_node_test_app COMMAND searchlib_query_streaming_phrase_query_node_test_app)
diff --git a/searchlib/src/tests/queryeval/CMakeLists.txt b/searchlib/src/tests/queryeval/CMakeLists.txt
index 55207e5705d..807c665d0e3 100644
--- a/searchlib/src/tests/queryeval/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_queryeval_test_app TEST
     SOURCES
     queryeval_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_queryeval_test_app COMMAND searchlib_queryeval_test_app)
diff --git a/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt b/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt
index ef8d974151a..4bb0bf29754 100644
--- a/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt
@@ -3,14 +3,14 @@ vespa_add_executable(searchlib_blueprint_test_app TEST
     SOURCES
     blueprint_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_blueprint_test_app COMMAND searchlib_blueprint_test_app || diff -u lhs.out rhs.out)
 vespa_add_executable(searchlib_leaf_blueprints_test_app TEST
     SOURCES
     leaf_blueprints_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_leaf_blueprints_test_app COMMAND searchlib_leaf_blueprints_test_app || diff -u lhs.out rhs.out)
@@ -18,7 +18,7 @@ vespa_add_executable(searchlib_intermediate_blueprints_test_app TEST
     SOURCES
     intermediate_blueprints_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_intermediate_blueprints_test_app COMMAND searchlib_intermediate_blueprints_test_app || diff -u lhs.out rhs.out)
diff --git a/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt b/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt
index e8b4e6d387c..0eedae38ab9 100644
--- a/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_dot_product_test_app TEST
     SOURCES
     dot_product_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_dot_product_test_app COMMAND searchlib_dot_product_test_app)
diff --git a/searchlib/src/tests/queryeval/equiv/CMakeLists.txt b/searchlib/src/tests/queryeval/equiv/CMakeLists.txt
index a60ff8b7549..e2e350c2d18 100644
--- a/searchlib/src/tests/queryeval/equiv/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/equiv/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_equiv_test_app TEST
     SOURCES
     equiv_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_equiv_test_app COMMAND searchlib_equiv_test_app)
diff --git a/searchlib/src/tests/queryeval/exact_nearest_neighbor/CMakeLists.txt b/searchlib/src/tests/queryeval/exact_nearest_neighbor/CMakeLists.txt
index 538fc936056..ca47743f1f9 100644
--- a/searchlib/src/tests/queryeval/exact_nearest_neighbor/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/exact_nearest_neighbor/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_exact_nearest_neighbor_test_app TEST
     SOURCES
     exact_nearest_neighbor_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_exact_nearest_neighbor_test_app COMMAND searchlib_exact_nearest_neighbor_test_app)
diff --git a/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt b/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
index fa51c91262d..8e0cee04877 100644
--- a/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_fake_searchable_test_app TEST
     SOURCES
     fake_searchable_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_fake_searchable_test_app COMMAND searchlib_fake_searchable_test_app)
diff --git a/searchlib/src/tests/queryeval/filter_search/CMakeLists.txt b/searchlib/src/tests/queryeval/filter_search/CMakeLists.txt
index 1d42766b5b4..ff0c6aa515c 100644
--- a/searchlib/src/tests/queryeval/filter_search/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/filter_search/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_filter_search_test_app TEST
     SOURCES
     filter_search_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/queryeval/flow/CMakeLists.txt b/searchlib/src/tests/queryeval/flow/CMakeLists.txt
index 70658d36f21..4739494ee59 100644
--- a/searchlib/src/tests/queryeval/flow/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/flow/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_queryeval_flow_test_app TEST
     SOURCES
     queryeval_flow_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_queryeval_flow_test_app COMMAND searchlib_queryeval_flow_test_app)
diff --git a/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt b/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt
index 7720e0637cf..d581eae858b 100644
--- a/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_getnodeweight_test_app TEST
     SOURCES
     getnodeweight_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_getnodeweight_test_app COMMAND searchlib_getnodeweight_test_app)
diff --git a/searchlib/src/tests/queryeval/global_filter/CMakeLists.txt b/searchlib/src/tests/queryeval/global_filter/CMakeLists.txt
index 3763fb81afa..67725cf0513 100644
--- a/searchlib/src/tests/queryeval/global_filter/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/global_filter/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_queryeval_global_filter_test_app TEST
     SOURCES
     global_filter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_queryeval_global_filter_test_app COMMAND searchlib_queryeval_global_filter_test_app)
diff --git a/searchlib/src/tests/queryeval/iterator_benchmark/CMakeLists.txt b/searchlib/src/tests/queryeval/iterator_benchmark/CMakeLists.txt
index dadd06ee7cd..b8587d93fe7 100644
--- a/searchlib/src/tests/queryeval/iterator_benchmark/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/iterator_benchmark/CMakeLists.txt
@@ -8,7 +8,7 @@ vespa_add_executable(searchlib_iterator_benchmark_test_app TEST
     disk_index_builder.cpp
     iterator_benchmark_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/queryeval/matching_elements_search/CMakeLists.txt b/searchlib/src/tests/queryeval/matching_elements_search/CMakeLists.txt
index d4ec1b83887..26963c4443f 100644
--- a/searchlib/src/tests/queryeval/matching_elements_search/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/matching_elements_search/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_matching_elements_search_test_app TEST
     SOURCES
     matching_elements_search_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt b/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt
index bf2af32abc6..3a68707537f 100644
--- a/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_monitoring_search_iterator_test_app TEST
     SOURCES
     monitoring_search_iterator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_monitoring_search_iterator_test_app COMMAND searchlib_monitoring_search_iterator_test_app)
diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt b/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt
index dff8ea2ef0c..784277447c3 100644
--- a/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_multibitvectoriterator_test_app TEST
     SOURCES
     multibitvectoriterator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_multibitvectoriterator_test_app COMMAND searchlib_multibitvectoriterator_test_app)
@@ -11,6 +11,6 @@ vespa_add_executable(searchlib_multibitvectoriterator_bench_app
     SOURCES
     multibitvectoriterator_bench.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_multibitvectoriterator_bench_app COMMAND searchlib_multibitvectoriterator_bench_app and no no 10 100000000 50 50 50 BENCHMARK)
diff --git a/searchlib/src/tests/queryeval/or_speed/CMakeLists.txt b/searchlib/src/tests/queryeval/or_speed/CMakeLists.txt
index 950a3a965be..f8b784b6a91 100644
--- a/searchlib/src/tests/queryeval/or_speed/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/or_speed/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_or_speed_test_app TEST
     SOURCES
     or_speed_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_or_speed_test_app COMMAND searchlib_or_speed_test_app)
diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt b/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt
index 533e610b32a..0f16aadd8d6 100644
--- a/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_parallel_weak_and_test_app TEST
     SOURCES
     parallel_weak_and_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_parallel_weak_and_test_app COMMAND searchlib_parallel_weak_and_test_app)
diff --git a/searchlib/src/tests/queryeval/predicate/CMakeLists.txt b/searchlib/src/tests/queryeval/predicate/CMakeLists.txt
index 17aac2a9391..5aed1e9a4c2 100644
--- a/searchlib/src/tests/queryeval/predicate/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/predicate/CMakeLists.txt
@@ -3,13 +3,13 @@ vespa_add_executable(searchlib_predicate_blueprint_test_app TEST
     SOURCES
     predicate_blueprint_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_blueprint_test_app COMMAND searchlib_predicate_blueprint_test_app)
 vespa_add_executable(searchlib_predicate_search_test_app TEST
     SOURCES
     predicate_search_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_predicate_search_test_app COMMAND searchlib_predicate_search_test_app)
diff --git a/searchlib/src/tests/queryeval/profiled_iterator/CMakeLists.txt b/searchlib/src/tests/queryeval/profiled_iterator/CMakeLists.txt
index 77fd0a1898b..0f291465f9c 100644
--- a/searchlib/src/tests/queryeval/profiled_iterator/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/profiled_iterator/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_queryeval_profiled_iterator_test_app TEST
     SOURCES
     profiled_iterator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_queryeval_profiled_iterator_test_app COMMAND searchlib_queryeval_profiled_iterator_test_app)
diff --git a/searchlib/src/tests/queryeval/same_element/CMakeLists.txt b/searchlib/src/tests/queryeval/same_element/CMakeLists.txt
index 615a7fcac9f..268402ceaaa 100644
--- a/searchlib/src/tests/queryeval/same_element/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/same_element/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_same_element_test_app TEST
     SOURCES
     same_element_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_same_element_test_app COMMAND searchlib_same_element_test_app)
diff --git a/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt b/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt
index e01af073639..f3b4aed6ccf 100644
--- a/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_simple_phrase_test_app TEST
     SOURCES
     simple_phrase_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_simple_phrase_test_app COMMAND searchlib_simple_phrase_test_app)
diff --git a/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt b/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt
index fb574a4ed4b..a571030630b 100644
--- a/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_sourceblender_test_app TEST
     SOURCES
     sourceblender_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_sourceblender_test_app COMMAND searchlib_sourceblender_test_app)
diff --git a/searchlib/src/tests/queryeval/sparse_vector_benchmark/CMakeLists.txt b/searchlib/src/tests/queryeval/sparse_vector_benchmark/CMakeLists.txt
index 8150cbfcc36..0f0f1709a69 100644
--- a/searchlib/src/tests/queryeval/sparse_vector_benchmark/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/sparse_vector_benchmark/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_sparse_vector_benchmark_test_app
     SOURCES
     sparse_vector_benchmark_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_sparse_vector_benchmark_test_app COMMAND searchlib_sparse_vector_benchmark_test_app BENCHMARK) 
diff --git a/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt b/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt
index 7e30265dc19..e112397ec73 100644
--- a/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_termwise_eval_test_app TEST
     SOURCES
     termwise_eval_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_termwise_eval_test_app COMMAND searchlib_termwise_eval_test_app)
diff --git a/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
index dfedbbdabb6..7b80729c95e 100644
--- a/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_weak_and_test_app TEST
     SOURCES
     weak_and_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_weak_and_test_app COMMAND searchlib_weak_and_test_app)
@@ -11,20 +11,20 @@ vespa_add_executable(searchlib_weak_and_test_expensive_app TEST
     SOURCES
     weak_and_test_expensive.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_weak_and_test_expensive_app NO_VALGRIND COMMAND searchlib_weak_and_test_expensive_app)
 vespa_add_executable(searchlib_weak_and_bench_app
     SOURCES
     weak_and_bench.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_weak_and_bench_app COMMAND searchlib_weak_and_bench_app BENCHMARK)
 vespa_add_executable(searchlib_parallel_weak_and_bench_app
     SOURCES
     parallel_weak_and_bench.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_parallel_weak_and_bench_app COMMAND searchlib_parallel_weak_and_bench_app BENCHMARK)
diff --git a/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt
index 1dc51921788..fc3c27a4a84 100644
--- a/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_weak_and_heap_test_app TEST
     SOURCES
     weak_and_heap_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_weak_and_heap_test_app COMMAND searchlib_weak_and_heap_test_app)
diff --git a/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt
index 0a21b2c0148..59c0ff66161 100644
--- a/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_weak_and_scorers_test_app TEST
     SOURCES
     weak_and_scorers_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_weak_and_scorers_test_app COMMAND searchlib_weak_and_scorers_test_app)
diff --git a/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt b/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt
index 6f7d18df9c4..c7d643225c4 100644
--- a/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_weighted_set_term_test_app TEST
     SOURCES
     weighted_set_term_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
 )
 vespa_add_test(NAME searchlib_weighted_set_term_test_app COMMAND searchlib_weighted_set_term_test_app)
diff --git a/searchlib/src/tests/queryeval/wrappers/CMakeLists.txt b/searchlib/src/tests/queryeval/wrappers/CMakeLists.txt
index 58c50098371..cef37110898 100644
--- a/searchlib/src/tests/queryeval/wrappers/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/wrappers/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_wrappers_test_app TEST
     SOURCES
     wrappers_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/rankingexpression/intrinsic_blueprint_adapter/CMakeLists.txt b/searchlib/src/tests/rankingexpression/intrinsic_blueprint_adapter/CMakeLists.txt
index 3af65cb45af..2172163c0a4 100644
--- a/searchlib/src/tests/rankingexpression/intrinsic_blueprint_adapter/CMakeLists.txt
+++ b/searchlib/src/tests/rankingexpression/intrinsic_blueprint_adapter/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_intrinsic_blueprint_adapter_test_app TEST
     SOURCES
     intrinsic_blueprint_adapter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_intrinsic_blueprint_adapter_test_app COMMAND searchlib_intrinsic_blueprint_adapter_test_app)
diff --git a/searchlib/src/tests/ranksetup/CMakeLists.txt b/searchlib/src/tests/ranksetup/CMakeLists.txt
index 8dc0ea98835..31b5e323699 100644
--- a/searchlib/src/tests/ranksetup/CMakeLists.txt
+++ b/searchlib/src/tests/ranksetup/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_ranksetup_test_app TEST
     SOURCES
     ranksetup_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_ranksetup_test_app COMMAND searchlib_ranksetup_test_app)
diff --git a/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt b/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt
index 6215658c44c..306bbf8a714 100644
--- a/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt
+++ b/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_verify_feature_test_app TEST
     SOURCES
     verify_feature_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_verify_feature_test_app COMMAND searchlib_verify_feature_test_app)
diff --git a/searchlib/src/tests/searchcommon/attribute/config/CMakeLists.txt b/searchlib/src/tests/searchcommon/attribute/config/CMakeLists.txt
index d749bff4340..2405075c659 100644
--- a/searchlib/src/tests/searchcommon/attribute/config/CMakeLists.txt
+++ b/searchlib/src/tests/searchcommon/attribute/config/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchcommon_attribute_config_test_app TEST
     SOURCES
     attribute_config_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchcommon_attribute_config_test_app NO_VALGRIND COMMAND searchcommon_attribute_config_test_app)
diff --git a/searchlib/src/tests/searchcommon/schema/CMakeLists.txt b/searchlib/src/tests/searchcommon/schema/CMakeLists.txt
index 51144c547d4..03e354c5acb 100644
--- a/searchlib/src/tests/searchcommon/schema/CMakeLists.txt
+++ b/searchlib/src/tests/searchcommon/schema/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchcommon_schema_test_app TEST
     SOURCES
     schema_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchcommon_schema_test_app NO_VALGRIND COMMAND searchcommon_schema_test_app)
diff --git a/searchlib/src/tests/sort/CMakeLists.txt b/searchlib/src/tests/sort/CMakeLists.txt
index 9c7b781c232..e2f2182df42 100644
--- a/searchlib/src/tests/sort/CMakeLists.txt
+++ b/searchlib/src/tests/sort/CMakeLists.txt
@@ -3,14 +3,14 @@ vespa_add_executable(searchlib_sortbenchmark_app
     SOURCES
     sortbenchmark.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_sortbenchmark_app COMMAND searchlib_sortbenchmark_app BENCHMARK)
 vespa_add_executable(searchlib_sort_test_app
     SOURCES
     sort_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND VESPA_USE_LTO)
   target_link_options(searchlib_sort_test_app PRIVATE "-Wno-aggressive-loop-optimizations")
@@ -20,7 +20,7 @@ vespa_add_executable(searchlib_uca_stress_app
     SOURCES
     uca.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::gtest
 )
 vespa_add_test(NAME searchlib_uca_stress_app COMMAND searchlib_uca_stress_app BENCHMARK)
diff --git a/searchlib/src/tests/sortresults/CMakeLists.txt b/searchlib/src/tests/sortresults/CMakeLists.txt
index f4aa4fd65f1..c9515226e97 100644
--- a/searchlib/src/tests/sortresults/CMakeLists.txt
+++ b/searchlib/src/tests/sortresults/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_sortresults_test_app TEST
     SOURCES
     sortresults_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_sortresults_test_app COMMAND searchlib_sortresults_test_app)
diff --git a/searchlib/src/tests/sortspec/CMakeLists.txt b/searchlib/src/tests/sortspec/CMakeLists.txt
index 3fcd0a1bb7b..d89ed1e5557 100644
--- a/searchlib/src/tests/sortspec/CMakeLists.txt
+++ b/searchlib/src/tests/sortspec/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_multilevelsort_test_app TEST
     SOURCES
     multilevelsort_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_multilevelsort_test_app COMMAND searchlib_multilevelsort_test_app)
diff --git a/searchlib/src/tests/tensor/dense_tensor_store/CMakeLists.txt b/searchlib/src/tests/tensor/dense_tensor_store/CMakeLists.txt
index 04a803b12ae..ac85b73f643 100644
--- a/searchlib/src/tests/tensor/dense_tensor_store/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/dense_tensor_store/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_dense_tensor_store_test_app TEST
     SOURCES
     dense_tensor_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_dense_tensor_store_test_app COMMAND searchlib_dense_tensor_store_test_app)
diff --git a/searchlib/src/tests/tensor/direct_tensor_store/CMakeLists.txt b/searchlib/src/tests/tensor/direct_tensor_store/CMakeLists.txt
index 4d26eec133d..045e6fde7b1 100644
--- a/searchlib/src/tests/tensor/direct_tensor_store/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/direct_tensor_store/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_direct_tensor_store_test_app TEST
     SOURCES
     direct_tensor_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_direct_tensor_store_test_app COMMAND searchlib_direct_tensor_store_test_app)
diff --git a/searchlib/src/tests/tensor/distance_calculator/CMakeLists.txt b/searchlib/src/tests/tensor/distance_calculator/CMakeLists.txt
index 029679e2f24..d72642abe1f 100644
--- a/searchlib/src/tests/tensor/distance_calculator/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/distance_calculator/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_distance_calculator_test_app TEST
     SOURCES
     distance_calculator_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     GTest::GTest
 )
diff --git a/searchlib/src/tests/tensor/distance_functions/CMakeLists.txt b/searchlib/src/tests/tensor/distance_functions/CMakeLists.txt
index 92ad9ae2648..17e3475a77c 100644
--- a/searchlib/src/tests/tensor/distance_functions/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/distance_functions/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_distance_functions_test_app TEST
     SOURCES
     distance_functions_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_distance_functions_test_app COMMAND searchlib_distance_functions_test_app)
@@ -12,5 +12,5 @@ vespa_add_executable(searchlib_distance_functions_benchmark_app TEST
     SOURCES
     distance_functions_benchmark.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
diff --git a/searchlib/src/tests/tensor/hnsw_best_neighbors/CMakeLists.txt b/searchlib/src/tests/tensor/hnsw_best_neighbors/CMakeLists.txt
index 9f2f89c78fe..e1530496612 100644
--- a/searchlib/src/tests/tensor/hnsw_best_neighbors/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/hnsw_best_neighbors/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_hnsw_best_neighbors_test_app TEST
     SOURCES
     hnsw_best_neighbors_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_hnsw_best_neighbors_test_app COMMAND searchlib_hnsw_best_neighbors_test_app)
diff --git a/searchlib/src/tests/tensor/hnsw_index/CMakeLists.txt b/searchlib/src/tests/tensor/hnsw_index/CMakeLists.txt
index b02f93ca0af..35333dadaf4 100644
--- a/searchlib/src/tests/tensor/hnsw_index/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/hnsw_index/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_hnsw_index_test_app TEST
     hnsw_index_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_hnsw_index_test_app COMMAND searchlib_hnsw_index_test_app)
@@ -13,6 +13,6 @@ vespa_add_executable(mt_stress_hnsw_app TEST
     SOURCES
     stress_hnsw_mt.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
diff --git a/searchlib/src/tests/tensor/hnsw_nodeid_mapping/CMakeLists.txt b/searchlib/src/tests/tensor/hnsw_nodeid_mapping/CMakeLists.txt
index c53902e3632..f789093acd5 100644
--- a/searchlib/src/tests/tensor/hnsw_nodeid_mapping/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/hnsw_nodeid_mapping/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_hnsw_nodeid_mapping_test_app TEST
     SOURCES
     hnsw_nodeid_mapping_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_hnsw_nodeid_mapping_test_app COMMAND searchlib_hnsw_nodeid_mapping_test_app)
diff --git a/searchlib/src/tests/tensor/hnsw_saver/CMakeLists.txt b/searchlib/src/tests/tensor/hnsw_saver/CMakeLists.txt
index 206e827cce2..8c51c5f4670 100644
--- a/searchlib/src/tests/tensor/hnsw_saver/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/hnsw_saver/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(searchlib_hnsw_save_load_test_app TEST
     hnsw_save_load_test.cpp
     DEPENDS
     searchlib_test
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_hnsw_save_load_test_app COMMAND searchlib_hnsw_save_load_test_app)
diff --git a/searchlib/src/tests/tensor/tensor_buffer_operations/CMakeLists.txt b/searchlib/src/tests/tensor/tensor_buffer_operations/CMakeLists.txt
index fd1893d0c56..8794c100b70 100644
--- a/searchlib/src/tests/tensor/tensor_buffer_operations/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/tensor_buffer_operations/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_tensor_buffer_operations_test_app TEST
     SOURCES
     tensor_buffer_operations_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_tensor_buffer_operations_test_app COMMAND searchlib_tensor_buffer_operations_test_app)
diff --git a/searchlib/src/tests/tensor/tensor_buffer_store/CMakeLists.txt b/searchlib/src/tests/tensor/tensor_buffer_store/CMakeLists.txt
index 17e90b7c1e3..941180139ad 100644
--- a/searchlib/src/tests/tensor/tensor_buffer_store/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/tensor_buffer_store/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_tensor_buffer_store_test_app TEST
     SOURCES
     tensor_buffer_store_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_tensor_buffer_store_test_app COMMAND searchlib_tensor_buffer_store_test_app)
diff --git a/searchlib/src/tests/tensor/tensor_buffer_type_mapper/CMakeLists.txt b/searchlib/src/tests/tensor/tensor_buffer_type_mapper/CMakeLists.txt
index d1affc6eb12..76de0888beb 100644
--- a/searchlib/src/tests/tensor/tensor_buffer_type_mapper/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/tensor_buffer_type_mapper/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_tensor_buffer_type_mapper_test_app TEST
     SOURCES
     tensor_buffer_type_mapper_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_tensor_buffer_type_mapper_test_app COMMAND searchlib_tensor_buffer_type_mapper_test_app)
diff --git a/searchlib/src/tests/transactionlog/CMakeLists.txt b/searchlib/src/tests/transactionlog/CMakeLists.txt
index af644498ec8..45a10fd18d7 100644
--- a/searchlib/src/tests/transactionlog/CMakeLists.txt
+++ b/searchlib/src/tests/transactionlog/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_translogclient_test_app TEST
     SOURCES
     translogclient_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_translogclient_test_app COMMAND searchlib_translogclient_test_app)
 
@@ -11,6 +11,6 @@ vespa_add_executable(searchlib_translog_chunks_test_app TEST
     SOURCES
     chunks_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_translog_chunks_test_app COMMAND searchlib_translog_chunks_test_app)
diff --git a/searchlib/src/tests/transactionlogstress/CMakeLists.txt b/searchlib/src/tests/transactionlogstress/CMakeLists.txt
index 2ed3d133174..160f26cb795 100644
--- a/searchlib/src/tests/transactionlogstress/CMakeLists.txt
+++ b/searchlib/src/tests/transactionlogstress/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_translogstress_app
     SOURCES
     translogstress.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_translogstress_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/translogstress_test.sh BENCHMARK)
diff --git a/searchlib/src/tests/url/CMakeLists.txt b/searchlib/src/tests/url/CMakeLists.txt
index 13b45d5e4bc..6b4203b260f 100644
--- a/searchlib/src/tests/url/CMakeLists.txt
+++ b/searchlib/src/tests/url/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_url_test_app TEST
     SOURCES
     url_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_url_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dotest.sh
                DEPENDS searchlib_url_test_app)
diff --git a/searchlib/src/tests/util/CMakeLists.txt b/searchlib/src/tests/util/CMakeLists.txt
index 69b1b918dbc..6cdb4817cce 100644
--- a/searchlib/src/tests/util/CMakeLists.txt
+++ b/searchlib/src/tests/util/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_rawbuf_test_app TEST
     SOURCES
     rawbuf_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_rawbuf_test_app COMMAND searchlib_rawbuf_test_app)
diff --git a/searchlib/src/tests/util/bufferwriter/CMakeLists.txt b/searchlib/src/tests/util/bufferwriter/CMakeLists.txt
index 1e2c166813f..e250d659e98 100644
--- a/searchlib/src/tests/util/bufferwriter/CMakeLists.txt
+++ b/searchlib/src/tests/util/bufferwriter/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_bufferwriter_test_app TEST
     SOURCES
     bufferwriter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_bufferwriter_test_app COMMAND searchlib_bufferwriter_test_app)
diff --git a/searchlib/src/tests/util/folded_string_compare/CMakeLists.txt b/searchlib/src/tests/util/folded_string_compare/CMakeLists.txt
index 6cf9ed8bf4d..c7422f0fe0a 100644
--- a/searchlib/src/tests/util/folded_string_compare/CMakeLists.txt
+++ b/searchlib/src/tests/util/folded_string_compare/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_folded_string_compare_test_app TEST
     SOURCES
     folded_string_compare_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_folded_string_compare_test_app COMMAND searchlib_folded_string_compare_test_app)
diff --git a/searchlib/src/tests/util/searchable_stats/CMakeLists.txt b/searchlib/src/tests/util/searchable_stats/CMakeLists.txt
index f8a4182a7fc..a091f32ef0f 100644
--- a/searchlib/src/tests/util/searchable_stats/CMakeLists.txt
+++ b/searchlib/src/tests/util/searchable_stats/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_searchable_stats_test_app TEST
     SOURCES
     searchable_stats_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchlib_searchable_stats_test_app COMMAND searchlib_searchable_stats_test_app)
diff --git a/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt b/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt
index 041053a2e27..ab370e34dac 100644
--- a/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt
+++ b/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchlib_slime_output_raw_buf_adapter_test_app TEST
     SOURCES
     slime_output_raw_buf_adapter_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
 )
 vespa_add_test(NAME searchlib_slime_output_raw_buf_adapter_test_app COMMAND searchlib_slime_output_raw_buf_adapter_test_app)
diff --git a/searchlib/src/tests/vespa-fileheader-inspect/CMakeLists.txt b/searchlib/src/tests/vespa-fileheader-inspect/CMakeLists.txt
index 9f2d04b7918..5fb3682013b 100644
--- a/searchlib/src/tests/vespa-fileheader-inspect/CMakeLists.txt
+++ b/searchlib/src/tests/vespa-fileheader-inspect/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_vespa-fileheader-inspect_test_app TEST
     SOURCES
     vespa-fileheader-inspect_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     AFTER
     searchlib_vespa-fileheader-inspect_app
 )
diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt
index 849d22455d0..89aee5d26ff 100644
--- a/searchlib/src/vespa/searchlib/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 find_package(ICU 60.0 REQUIRED COMPONENTS uc i18n)
-vespa_add_library(searchlib
+vespa_add_library(vespa_searchlib
     SOURCES
     $<TARGET_OBJECTS:searchlib_aggregation>
     $<TARGET_OBJECTS:searchlib_attribute>
@@ -43,4 +43,4 @@ vespa_add_library(searchlib
     ${VESPA_ATOMIC_LIB}
 )
 
-vespa_add_target_package_dependency(searchlib Protobuf)
+vespa_add_target_package_dependency(vespa_searchlib Protobuf)
diff --git a/searchlib/src/vespa/searchlib/test/CMakeLists.txt b/searchlib/src/vespa/searchlib/test/CMakeLists.txt
index 4685ad07808..05188e7b4f9 100644
--- a/searchlib/src/vespa/searchlib/test/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/test/CMakeLists.txt
@@ -19,7 +19,7 @@ vespa_add_library(searchlib_test
     $<TARGET_OBJECTS:searchlib_searchlib_test_diskindex>
     $<TARGET_OBJECTS:searchlib_test_gtest_migration>
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_searchlib_test_features
     searchlib_searchlib_test_memoryindex
     GTest::GTest
diff --git a/searchlib/src/vespa/searchlib/test/features/CMakeLists.txt b/searchlib/src/vespa/searchlib/test/features/CMakeLists.txt
index e13ec5fca43..9976f8c7d9b 100644
--- a/searchlib/src/vespa/searchlib/test/features/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/test/features/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_library(searchlib_searchlib_test_features
     SOURCES
     distance_closeness_fixture.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     GTest::GTest
 )
diff --git a/searchsummary/CMakeLists.txt b/searchsummary/CMakeLists.txt
index fe27372b858..07f9c3213bb 100644
--- a/searchsummary/CMakeLists.txt
+++ b/searchsummary/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_define_module(
     vespalib
     vespa_configdefinitions
     vespa_document
-    searchlib
+    vespa_searchlib
 
     LIBS
     src/vespa/juniper
diff --git a/streamingvisitors/CMakeLists.txt b/streamingvisitors/CMakeLists.txt
index 1d197aba422..81e7ac61691 100644
--- a/streamingvisitors/CMakeLists.txt
+++ b/streamingvisitors/CMakeLists.txt
@@ -7,7 +7,7 @@ vespa_define_module(
     vespalib
     vespa_document
     vdslib
-    searchlib
+    vespa_searchlib
     searchsummary
 
     LIBS
diff --git a/streamingvisitors/src/tests/nearest_neighbor_field_searcher/CMakeLists.txt b/streamingvisitors/src/tests/nearest_neighbor_field_searcher/CMakeLists.txt
index 3ded5a1dafb..f2b880ffcaa 100644
--- a/streamingvisitors/src/tests/nearest_neighbor_field_searcher/CMakeLists.txt
+++ b/streamingvisitors/src/tests/nearest_neighbor_field_searcher/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(vsm_nearest_neighbor_field_searcher_test_app TEST
     SOURCES
     nearest_neighbor_field_searcher_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     streamingvisitors
     GTest::GTest
diff --git a/streamingvisitors/src/tests/searcher/CMakeLists.txt b/streamingvisitors/src/tests/searcher/CMakeLists.txt
index 2daf963a338..106314d0b0a 100644
--- a/streamingvisitors/src/tests/searcher/CMakeLists.txt
+++ b/streamingvisitors/src/tests/searcher/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(vsm_searcher_test_app TEST
     SOURCES
     searcher_test.cpp
     DEPENDS
-    searchlib
+    vespa_searchlib
     searchlib_test
     streamingvisitors
 )