diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index cdd27c1a98e..222f9f1719a 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -57,28 +57,28 @@ set(LIB
 
 if(WITH_OPENCOLLADA)
   list(APPEND LIB
-    bf_collada
+    bf_io_collada
   )
   add_definitions(-DWITH_COLLADA)
 endif()
 
 if(WITH_IO_WAVEFRONT_OBJ)
   list(APPEND LIB
-    bf_wavefront_obj
+    bf_io_wavefront_obj
   )
   add_definitions(-DWITH_IO_WAVEFRONT_OBJ)
 endif()
 
 if(WITH_IO_PLY)
   list(APPEND LIB
-    bf_ply
+    bf_io_ply
   )
   add_definitions(-DWITH_IO_PLY)
 endif()
 
 if(WITH_IO_STL)
   list(APPEND LIB
-    bf_stl
+    bf_io_stl
   )
   add_definitions(-DWITH_IO_STL)
 endif()
@@ -92,14 +92,14 @@ endif()
 
 if(WITH_ALEMBIC)
   list(APPEND LIB
-    bf_alembic
+    bf_io_alembic
   )
   add_definitions(-DWITH_ALEMBIC)
 endif()
 
 if(WITH_USD)
   list(APPEND LIB
-    bf_usd
+    bf_io_usd
   )
   add_definitions(-DWITH_USD)
 endif()
diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt
index 3d8effb7b2f..d9ffa2997f9 100644
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -104,7 +104,7 @@ if(WITH_BOOST)
   )
 endif()
 
-blender_add_lib(bf_alembic "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_io_alembic "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 if(WITH_GTESTS)
   set(TEST_SRC
@@ -114,7 +114,7 @@ if(WITH_GTESTS)
   set(TEST_INC
   )
   set(TEST_LIB
-    bf_alembic
+    bf_io_alembic
   )
   include(GTestTesting)
   blender_add_test_lib(bf_io_alembic_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt
index cd6ab7295a4..6e665af13f5 100644
--- a/source/blender/io/collada/CMakeLists.txt
+++ b/source/blender/io/collada/CMakeLists.txt
@@ -124,4 +124,4 @@ if(WITH_BUILDINFO)
   add_definitions(-DWITH_BUILDINFO)
 endif()
 
-blender_add_lib(bf_collada "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_io_collada "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/io/ply/CMakeLists.txt b/source/blender/io/ply/CMakeLists.txt
index a80be008d46..33a8bbc7722 100644
--- a/source/blender/io/ply/CMakeLists.txt
+++ b/source/blender/io/ply/CMakeLists.txt
@@ -60,7 +60,7 @@ set(LIB
   extern_fmtlib
 )
 
-blender_add_lib(bf_ply "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_io_ply "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 if(WITH_GTESTS)
   set(TEST_SRC
@@ -72,7 +72,7 @@ if(WITH_GTESTS)
     ../../../../tests/gtests
   )
   set(TEST_LIB
-    bf_ply
+    bf_io_ply
   )
   include(GTestTesting)
   blender_add_test_lib(bf_io_ply_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
diff --git a/source/blender/io/stl/CMakeLists.txt b/source/blender/io/stl/CMakeLists.txt
index ad9ce3df02c..60cbe17495e 100644
--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -42,4 +42,4 @@ set(LIB
   bf_io_common
 )
 
-blender_add_lib(bf_stl "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_io_stl "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index 0806cd35510..fa1ad2740ce 100644
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -209,13 +209,13 @@ if(WITH_OPENVDB)
   )
 endif()
 
-blender_add_lib(bf_usd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_io_usd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 # RNA_prototypes.h
-add_dependencies(bf_usd bf_rna)
+add_dependencies(bf_io_usd bf_rna)
 
 if(COMMAND target_precompile_headers)
-  target_precompile_headers(bf_usd PRIVATE intern/usd_precomp.h)
+  target_precompile_headers(bf_io_usd PRIVATE intern/usd_precomp.h)
 endif()
 
 if(WITH_GTESTS)
diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index 90a390c3c73..35ed1899106 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -69,7 +69,7 @@ if(WITH_TBB)
   list(APPEND LIB ${TBB_LIBRARIES})
 endif()
 
-blender_add_lib(bf_wavefront_obj "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_io_wavefront_obj "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 if(WITH_GTESTS)
   set(TEST_SRC
@@ -92,10 +92,10 @@ if(WITH_GTESTS)
     ${LIB}
 
     bf_blenloader_tests
-    bf_wavefront_obj
+    bf_io_wavefront_obj
   )
 
   include(GTestTesting)
-  blender_add_test_lib(bf_wavefront_obj_tests "${TEST_SRC}" "${TEST_INC}" "${INC_SYS}" "${TEST_LIB}")
-  add_dependencies(bf_wavefront_obj_tests bf_wavefront_obj)
+  blender_add_test_lib(bf_io_wavefront_obj_tests "${TEST_SRC}" "${TEST_INC}" "${INC_SYS}" "${TEST_LIB}")
+  add_dependencies(bf_io_wavefront_obj_tests bf_io_wavefront_obj)
 endif()
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 061d5dc56c5..fa1a56f9ff7 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -119,7 +119,7 @@ if(WITH_ALEMBIC)
     ../io/alembic
   )
   list(APPEND LIB
-    bf_alembic
+    bf_io_alembic
   )
 endif()
 
@@ -129,7 +129,7 @@ if(WITH_USD)
     ../io/usd
   )
   list(APPEND LIB
-    bf_usd
+    bf_io_usd
   )
 endif()
 
diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt
index a5576a3d00c..858c9049167 100644
--- a/source/blender/render/hydra/CMakeLists.txt
+++ b/source/blender/render/hydra/CMakeLists.txt
@@ -70,7 +70,7 @@ set(LIB
   ${BOOST_LIBRARIES}
   ${USD_LIBRARIES}
   ${TBB_LIBRARIES}
-  bf_usd
+  bf_io_usd
 )
 
 set(SRC
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index b604b982331..b0325e24a82 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -878,7 +878,7 @@ if(WITH_ALEMBIC)
   get_filename_component(ALEMBIC_ROOT_DIR ${real_include_dir} DIRECTORY)
 
   add_python_test(
-    alembic_export_tests
+    bf_io_alembic_export_tests
     ${CMAKE_CURRENT_LIST_DIR}/alembic_export_tests.py
     --blender "${TEST_BLENDER_EXE}"
     --testdir "${TEST_SRC_DIR}/alembic"
@@ -895,13 +895,13 @@ endif()
 
 if(WITH_USD)
   add_blender_test(
-          usd_export_test
+          bf_io_usd_export_test
           --python ${CMAKE_CURRENT_LIST_DIR}/bl_usd_export_test.py
           --
           --testdir "${TEST_SRC_DIR}/usd"
   )
   add_blender_test(
-    usd_import_test
+    bf_io_usd_import_test
     --python ${CMAKE_CURRENT_LIST_DIR}/bl_usd_import_test.py
     --
     --testdir "${TEST_SRC_DIR}/usd"
diff --git a/tests/python/collada/CMakeLists.txt b/tests/python/collada/CMakeLists.txt
index 7438faf395c..17c85f730d2 100644
--- a/tests/python/collada/CMakeLists.txt
+++ b/tests/python/collada/CMakeLists.txt
@@ -39,7 +39,7 @@ endif()
 # GENERAL PYTHON CORRECTNESS TESTS
 macro(COLLADA_TEST module test_name blend_file)
   add_test(
-    NAME collada_${module}_${test_name}
+    NAME bf_io_collada_${module}_${test_name}
     COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} ${TEST_SRC_DIR}/collada/${module}/${blend_file}
     --python ${CMAKE_CURRENT_LIST_DIR}/${module}/test_${module}_${test_name}.py --
     --testdir ${TEST_SRC_DIR}/collada/${module}