diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3cea6f..a2882c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,38 +32,37 @@ else()
   set(WITH_COVERAGE NO)
 endif()
 
-FetchContent_Declare(sfl
+FetchContent_Declare(sfl_fc
   GIT_REPOSITORY "https://github.com/slavenf/sfl-library.git"
   GIT_TAG        "master"
   GIT_SHALLOW    ON
-  FIND_PACKAGE_ARGS)
-FetchContent_MakeAvailable(sfl)
+  FIND_PACKAGE_ARGS NAMES sfl)
 
-FetchContent_Declare(stx
+FetchContent_Declare(stx_fc
   GIT_REPOSITORY "https://github.com/Klebert-Engineering/stx.git"
   GIT_TAG        "main"
   GIT_SHALLOW    ON
-  FIND_PACKAGE_ARGS)
+  FIND_PACKAGE_ARGS NAMES stx)
 
-FetchContent_Declare(Bitsery
+FetchContent_Declare(Bitsery_fc
   GIT_REPOSITORY "https://github.com/fraillt/bitsery.git"
   GIT_TAG        "v5.2.3"
   GIT_SHALLOW    ON
-  FIND_PACKAGE_ARGS)
+  FIND_PACKAGE_ARGS NAMES Bitsery)
 
-FetchContent_Declare(nlohmann_json
+FetchContent_Declare(nlohmann_json_fc
   GIT_REPOSITORY "https://github.com/nlohmann/json.git"
   GIT_TAG        "v3.11.2"
   GIT_SHALLOW    ON
-  FIND_PACKAGE_ARGS)
+  FIND_PACKAGE_ARGS NAMES nlohmann_json)
 
-FetchContent_Declare(Catch2
+FetchContent_Declare(Catch2_fc
   GIT_REPOSITORY "https://github.com/catchorg/Catch2.git"
   GIT_TAG        "v3.5.2"
   GIT_SHALLOW    ON
-  FIND_PACKAGE_ARGS)
+  FIND_PACKAGE_ARGS NAMES Catch2)
 
-FetchContent_MakeAvailable(sfl stx Bitsery)
+FetchContent_MakeAvailable(sfl_fc stx_fc Bitsery_fc)
 
 if (NOT DEFINED SIMFIL_WITH_MODEL_JSON)
   set(SIMFIL_WITH_MODEL_JSON YES)
@@ -132,7 +131,7 @@ if (MSVC)
 endif()
 
 if (SIMFIL_WITH_MODEL_JSON)
-  FetchContent_MakeAvailable(nlohmann_json)
+  FetchContent_MakeAvailable(nlohmann_json_fc)
 
   target_compile_definitions(simfil
     PUBLIC
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2088103..c79536a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,7 +2,7 @@ project(test.simfil)
 
 set(CMAKE_CXX_STANDARD 17) # Required for catch2
 
-FetchContent_MakeAvailable(Catch2)
+FetchContent_MakeAvailable(Catch2_fc)
 
 add_executable(test.simfil
   token.cpp