diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e5badc0fd38f5192d78e091455140ad1c0ad959..b7ae62b8bfaaf8928ef294ad46b80d58cc6ee31c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -604,9 +604,6 @@ endif ( )
 #############################################################################################################################
 
 if ( WALBERLA_BUILD_WITH_CODEGEN OR WALBERLA_BUILD_WITH_PYTHON )
-   if ( DEFINED PYTHON_ROOT_DIR OR DEFINED PYTHON_EXECUTABLE )
-      message( WARNING "Setting PYTHON_ROOT_DIR or PYTHON_EXECUTABLE will likely not work. Use Python_ROOT_DIR instead." )
-   endif ()
    cmake_policy( SET CMP0094 NEW )
    set( Python_FIND_FRAMEWORK LAST )
    find_package( Python COMPONENTS Interpreter Development )
diff --git a/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt
index 0bb7b6c3b8fd2274f0a8744e5b4344f64ea62238..fd370b7ce6152f2ca0a9bff404bbae2efe672ef2 100644
--- a/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt
+++ b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt
@@ -1,5 +1,5 @@
-waLBerla_add_executable( NAME WorkloadEvaluation FILES WorkloadEvaluation.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk )
+waLBerla_add_executable( NAME WorkloadEvaluation FILES WorkloadEvaluation.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk )
 
-waLBerla_add_executable( NAME AMRSedimentSettling FILES AMRSedimentSettling.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk )
+waLBerla_add_executable( NAME AMRSedimentSettling FILES AMRSedimentSettling.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk )
 
-waLBerla_add_executable( NAME AMRSettlingSphere FILES AMRSettlingSphere.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk )
+waLBerla_add_executable( NAME AMRSettlingSphere FILES AMRSettlingSphere.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk )
diff --git a/apps/benchmarks/CNT/CMakeLists.txt b/apps/benchmarks/CNT/CMakeLists.txt
index 41c52ccc8eb335732ecd0159128b017811da6975..dc9c7166ef31b9bea9961db7cf682e1be8e3bb0d 100644
--- a/apps/benchmarks/CNT/CMakeLists.txt
+++ b/apps/benchmarks/CNT/CMakeLists.txt
@@ -7,4 +7,4 @@ waLBerla_add_executable( NAME 01_cnt_film
         InitializeCNTs.cpp
         SQLProperties.cpp
         Statistics.cpp
-   DEPENDS blockforest core mesa_pd sqlite vtk )
+      DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::sqlite walberla::vtk )
diff --git a/apps/benchmarks/ComplexGeometry/CMakeLists.txt b/apps/benchmarks/ComplexGeometry/CMakeLists.txt
index 68f4d989f5397c01df90e10eae0055b1d66edfcb..76a434fbb21c0a6f29bb42f0ebd92140890c5fe4 100644
--- a/apps/benchmarks/ComplexGeometry/CMakeLists.txt
+++ b/apps/benchmarks/ComplexGeometry/CMakeLists.txt
@@ -2,8 +2,8 @@ if ( WALBERLA_BUILD_WITH_OPENMESH )
    
 	waLBerla_link_geometry_to_builddir( "*.obj" )             
 	waLBerla_link_files_to_builddir( "*.conf" )  
-                                  
-	waLBerla_add_executable( NAME ComplexGeometry FILES ComplexGeometry.cpp DEPENDS boundary core lbm mesh vtk )
+
+   waLBerla_add_executable( NAME ComplexGeometry FILES ComplexGeometry.cpp DEPENDS walberla::boundary walberla::core walberla::lbm mesh walberla::vtk )
 
 	##############
 	# Some tests #
diff --git a/apps/benchmarks/CouetteFlow/CMakeLists.txt b/apps/benchmarks/CouetteFlow/CMakeLists.txt
index caf4e4173acc72e51abf31584d54dff6a6a31cf2..3743fbe612774e927d9a9f3c5d20d79416c5ae10 100644
--- a/apps/benchmarks/CouetteFlow/CMakeLists.txt
+++ b/apps/benchmarks/CouetteFlow/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 waLBerla_link_files_to_builddir( "*.dat" )                 
-                                  
-waLBerla_add_executable( NAME CouetteFlow DEPENDS blockforest boundary core field lbm postprocessing stencil timeloop vtk sqlite )
+
+waLBerla_add_executable( NAME CouetteFlow DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk walberla::sqlite )
 
 ##############
 # Some tests #
diff --git a/apps/benchmarks/DEM/CMakeLists.txt b/apps/benchmarks/DEM/CMakeLists.txt
index 138e92026d74c900b1f25cd172cef82de1b2bff2..a364f014066a8fb4e420ab3ad813fa60d9f13b14 100644
--- a/apps/benchmarks/DEM/CMakeLists.txt
+++ b/apps/benchmarks/DEM/CMakeLists.txt
@@ -1 +1 @@
-waLBerla_add_executable( NAME DEM FILES DEM.cpp DEPENDS blockforest core pe )
+waLBerla_add_executable( NAME DEM FILES DEM.cpp DEPENDS walberla::blockforest walberla::core walberla::pe )
diff --git a/apps/benchmarks/FieldCommunication/CMakeLists.txt b/apps/benchmarks/FieldCommunication/CMakeLists.txt
index edb815612bdf3b4ccb520349b50bf2a29d60e209..ed587fb1de640baf3aae5fc509553fc244fcb27b 100644
--- a/apps/benchmarks/FieldCommunication/CMakeLists.txt
+++ b/apps/benchmarks/FieldCommunication/CMakeLists.txt
@@ -4,4 +4,4 @@ waLBerla_link_files_to_builddir( "*.py" )
 
 
 waLBerla_add_executable ( NAME FieldCommunication
-                          DEPENDS blockforest core domain_decomposition field postprocessing sqlite python_coupling )
+      DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::postprocessing walberla::sqlite walberla::python_coupling )
diff --git a/apps/benchmarks/FluidParticleCoupling/CMakeLists.txt b/apps/benchmarks/FluidParticleCoupling/CMakeLists.txt
index 34ffaca075f6ac90be4f9f077f779ec21f7e6603..213778d4021bf837321e4590863d3323799347f6 100644
--- a/apps/benchmarks/FluidParticleCoupling/CMakeLists.txt
+++ b/apps/benchmarks/FluidParticleCoupling/CMakeLists.txt
@@ -11,61 +11,61 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
             )
 
    waLBerla_add_executable(NAME SphereWallCollision FILES SphereWallCollision.cpp
-         DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling
-         mesa_pd postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling
+         walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM )
 
    waLBerla_add_executable(NAME SettlingSphereInBox FILES SettlingSphereInBox.cpp
-         DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling
-         mesa_pd postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling
+         walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM )
 
    waLBerla_add_executable(NAME SphereMovingWithPrescribedVelocity FILES SphereMovingWithPrescribedVelocity.cpp
-         DEPENDS blockforest boundary core domain_decomposition field lbm mesa_pd lbm_mesapd_coupling
-         postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::mesa_pd walberla::lbm_mesapd_coupling
+         walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM )
 
    waLBerla_add_executable(NAME LubricationForceEvaluation FILES LubricationForceEvaluation.cpp
-         DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
-         postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd
+         walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM )
 
    waLBerla_add_executable(NAME DragForceSphere FILES DragForceSphere.cpp
-         DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
-         postprocessing timeloop vtk FluidParticleCouplingGeneratedLBMWithForce)
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd
+         walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBMWithForce )
 
    waLBerla_add_executable(NAME ForcesOnSphereNearPlane FILES ForcesOnSphereNearPlane.cpp
-         DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
-         postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd
+         walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM )
 
    waLBerla_add_executable(NAME ObliqueWetCollision FILES ObliqueWetCollision.cpp
-         DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
-         postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd
+         walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM )
 
    waLBerla_add_executable(NAME MotionSettlingSphere FILES MotionSettlingSphere.cpp
-         DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
-         postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd
+         walberla::postprocessing walberla::timeloop walberla::vtk FluidParticleCouplingGeneratedLBM )
 
 else()
 
 waLBerla_add_executable ( NAME SphereWallCollision FILES SphereWallCollision.cpp
-                          DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable ( NAME SettlingSphereInBox FILES SettlingSphereInBox.cpp
-                          DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable ( NAME SphereMovingWithPrescribedVelocity FILES SphereMovingWithPrescribedVelocity.cpp
-                          DEPENDS blockforest boundary core domain_decomposition field lbm mesa_pd lbm_mesapd_coupling postprocessing timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::mesa_pd walberla::lbm_mesapd_coupling walberla::postprocessing walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable ( NAME LubricationForceEvaluation FILES LubricationForceEvaluation.cpp
-                          DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable ( NAME DragForceSphere FILES DragForceSphere.cpp
-                          DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable ( NAME ForcesOnSphereNearPlane FILES ForcesOnSphereNearPlane.cpp
-                          DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable ( NAME ObliqueWetCollision FILES ObliqueWetCollision.cpp
-                          DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk )
 
 endif()
 
 waLBerla_add_executable ( NAME ObliqueDryCollision FILES ObliqueDryCollision.cpp
-      DEPENDS blockforest core mesa_pd postprocessing )
+      DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::postprocessing )
diff --git a/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/CMakeLists.txt b/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/CMakeLists.txt
index 4742f47b6648f374935d7d48f35d8ec3983c39f3..44a8d9f5e5079e9464a9d5ded59924484d594740 100644
--- a/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/CMakeLists.txt
+++ b/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/CMakeLists.txt
@@ -1,3 +1,3 @@
-waLBerla_add_executable( NAME FluidParticleWorkloadEvaluation FILES FluidParticleWorkloadEvaluation.cpp DEPENDS blockforest boundary core field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk )
+waLBerla_add_executable( NAME FluidParticleWorkloadEvaluation FILES FluidParticleWorkloadEvaluation.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk )
 
-waLBerla_add_executable( NAME FluidParticleWorkloadDistribution FILES FluidParticleWorkloadDistribution.cpp DEPENDS blockforest boundary core field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk )
+waLBerla_add_executable( NAME FluidParticleWorkloadDistribution FILES FluidParticleWorkloadDistribution.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::postprocessing walberla::timeloop walberla::vtk )
diff --git a/apps/benchmarks/FluidizedBed/CMakeLists.txt b/apps/benchmarks/FluidizedBed/CMakeLists.txt
index 9c33fb523801a7f55935e99661496e38142b412a..b43a90a1eb593444fa10392be44bd0557bc7fbba 100644
--- a/apps/benchmarks/FluidizedBed/CMakeLists.txt
+++ b/apps/benchmarks/FluidizedBed/CMakeLists.txt
@@ -2,5 +2,5 @@ waLBerla_link_files_to_builddir("*.prm")
 
 if (WALBERLA_BUILD_WITH_GPU_SUPPORT AND WALBERLA_BUILD_WITH_CODEGEN AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP))
     waLBerla_add_executable(NAME FluidizedBed_PSM_GPU FILES FluidizedBedGPU.cpp
-            DEPENDS blockforest boundary core gpu domain_decomposition field lbm lbm_mesapd_coupling mesa_pd timeloop vtk PSMCodegenPython_srt_sc1)
+          DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::gpu walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::timeloop walberla::vtk PSMCodegenPython_srt_sc1 )
 endif ()
diff --git a/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/CMakeLists.txt b/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/CMakeLists.txt
index d2c67b31abd4ce5a1c17ac69a6dde65ad1ae77ef..c880740b602477425cc6e3985cb78a6bd2ef553d 100644
--- a/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/CMakeLists.txt
+++ b/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/CMakeLists.txt
@@ -1,2 +1,2 @@
 waLBerla_add_executable ( NAME ForcesOnSphereNearPlaneInShearFlow
-                          DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk )
\ No newline at end of file
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::timeloop walberla::vtk )
\ No newline at end of file
diff --git a/apps/benchmarks/FreeSurfaceAdvection/CMakeLists.txt b/apps/benchmarks/FreeSurfaceAdvection/CMakeLists.txt
index e14b5fe37fda409f4e80790593e378c8f20b98f5..8596633abba151b25f29735f3283bb427a452fee 100644
--- a/apps/benchmarks/FreeSurfaceAdvection/CMakeLists.txt
+++ b/apps/benchmarks/FreeSurfaceAdvection/CMakeLists.txt
@@ -2,12 +2,12 @@ waLBerla_link_files_to_builddir( *.prm )
 
 waLBerla_add_executable(NAME    DeformationField
                         FILES   DeformationField.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable(NAME    SingleVortex
                         FILES   SingleVortex.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable(NAME    ZalesakDisk
                         FILES   ZalesakDisk.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
\ No newline at end of file
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk )
\ No newline at end of file
diff --git a/apps/benchmarks/GranularGas/CMakeLists.txt b/apps/benchmarks/GranularGas/CMakeLists.txt
index f54ca9096aef035bd09cd0170a2c39a2b69a5576..0e389e2ebe359d924c4b2d77e80974ac282e5696 100644
--- a/apps/benchmarks/GranularGas/CMakeLists.txt
+++ b/apps/benchmarks/GranularGas/CMakeLists.txt
@@ -3,24 +3,24 @@ waLBerla_link_files_to_builddir( *.py )
 
 waLBerla_add_executable ( NAME PE_GranularGas
                           FILES PE_GranularGas.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp
-                          DEPENDS blockforest core pe postprocessing sqlite )
+      DEPENDS walberla::blockforest walberla::core walberla::pe walberla::postprocessing walberla::sqlite )
 
 waLBerla_add_executable ( NAME PE_LoadBalancing
                           FILES PE_LoadBalancing.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp
-                          DEPENDS blockforest core pe postprocessing sqlite )
+      DEPENDS walberla::blockforest walberla::core walberla::pe walberla::postprocessing walberla::sqlite )
 
 waLBerla_add_executable ( NAME MESA_PD_LoadBalancing
                           FILES MESA_PD_LoadBalancing.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp sortParticleStorage.cpp CreateParticles.cpp
-                          DEPENDS blockforest core pe mesa_pd postprocessing sqlite vtk )
+      DEPENDS walberla::blockforest walberla::core walberla::pe walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk )
 
 waLBerla_add_executable ( NAME MESA_PD_GranularGas
                           FILES MESA_PD_GranularGas.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp sortParticleStorage.cpp CreateParticles.cpp
-                          DEPENDS blockforest core mesa_pd postprocessing sqlite vtk )
+      DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk )
 
 waLBerla_add_executable ( NAME MESA_PD_KernelBenchmark
                           FILES MESA_PD_KernelBenchmark.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp sortParticleStorage.cpp CreateParticles.cpp
-                          DEPENDS blockforest core mesa_pd postprocessing sqlite vtk )
+      DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk )
 
 waLBerla_add_executable ( NAME MESA_PD_KernelLoadBalancing
                           FILES MESA_PD_KernelLoadBalancing.cpp SQLProperties.cpp Parameters.cpp NodeTimings.cpp sortParticleStorage.cpp CreateParticles.cpp
-                          DEPENDS blockforest core pe mesa_pd postprocessing sqlite vtk )
+      DEPENDS walberla::blockforest walberla::core walberla::pe walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk )
diff --git a/apps/benchmarks/IntegratorAccuracy/CMakeLists.txt b/apps/benchmarks/IntegratorAccuracy/CMakeLists.txt
index 8e95e831cc1fb275731b12bc14460cf64eedc729..c648095f1d4cc8c1659a1b3676cade6e0527b053 100644
--- a/apps/benchmarks/IntegratorAccuracy/CMakeLists.txt
+++ b/apps/benchmarks/IntegratorAccuracy/CMakeLists.txt
@@ -1,4 +1,4 @@
 waLBerla_link_files_to_builddir( "*.ipynb" )
 
-waLBerla_add_executable ( NAME IntegratorAccuracy 
-                          DEPENDS core mesa_pd )
+waLBerla_add_executable ( NAME IntegratorAccuracy
+      DEPENDS walberla::core walberla::mesa_pd )
diff --git a/apps/benchmarks/LennardJones/CMakeLists.txt b/apps/benchmarks/LennardJones/CMakeLists.txt
index f0438a66371045df61e7e1feb8471c310a622925..da7aeec3834d946623cd345781dafe11eee343cc 100644
--- a/apps/benchmarks/LennardJones/CMakeLists.txt
+++ b/apps/benchmarks/LennardJones/CMakeLists.txt
@@ -3,4 +3,4 @@ waLBerla_link_files_to_builddir( *.py )
 
 waLBerla_add_executable ( NAME LennardJones
                           FILES LennardJones.cpp
-                          DEPENDS blockforest core pe )
+      DEPENDS walberla::blockforest walberla::core walberla::pe )
diff --git a/apps/benchmarks/MeshDistance/CMakeLists.txt b/apps/benchmarks/MeshDistance/CMakeLists.txt
index 774f5329aef5ffc80445ec6a37dc60a9abd2001d..1a3c2d7145e4db8d7fa40a6f683d0b0dc000cf6f 100644
--- a/apps/benchmarks/MeshDistance/CMakeLists.txt
+++ b/apps/benchmarks/MeshDistance/CMakeLists.txt
@@ -1,7 +1,7 @@
 if ( WALBERLA_BUILD_WITH_OPENMESH )
         
     waLBerla_link_geometry_to_builddir( "bunny.obj" )                                
-	waLBerla_add_executable( NAME MeshDistanceBenchmark DEPENDS core mesh )
+    waLBerla_add_executable( NAME MeshDistanceBenchmark DEPENDS walberla::core walberla::mesh )
 
 	##############
 	# Some tests #
diff --git a/apps/benchmarks/MotionSingleHeavySphere/CMakeLists.txt b/apps/benchmarks/MotionSingleHeavySphere/CMakeLists.txt
index 5fd40d16f5c856312c9b4f1265288444eccf706e..80acdf7626a555727367c0842f6a7131f0950d58 100644
--- a/apps/benchmarks/MotionSingleHeavySphere/CMakeLists.txt
+++ b/apps/benchmarks/MotionSingleHeavySphere/CMakeLists.txt
@@ -1,2 +1,2 @@
-waLBerla_add_executable ( NAME MotionSingleHeavySphere 
-                          DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk )
\ No newline at end of file
+waLBerla_add_executable ( NAME MotionSingleHeavySphere
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::timeloop walberla::vtk )
\ No newline at end of file
diff --git a/apps/benchmarks/NonUniformGrid/CMakeLists.txt b/apps/benchmarks/NonUniformGrid/CMakeLists.txt
index 4e118017bfca8e2fb6dc90903870063f2c692c42..8ed8db3a450b35a587b2090b55e233e4880b2225 100644
--- a/apps/benchmarks/NonUniformGrid/CMakeLists.txt
+++ b/apps/benchmarks/NonUniformGrid/CMakeLists.txt
@@ -2,5 +2,5 @@
 waLBerla_link_files_to_builddir( "*.dat" )
 
 
-waLBerla_add_executable ( NAME NonUniformGridBenchmark 
-                          DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk sqlite)
\ No newline at end of file
+waLBerla_add_executable ( NAME NonUniformGridBenchmark
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk walberla::sqlite )
\ No newline at end of file
diff --git a/apps/benchmarks/NonUniformGridCPU/CMakeLists.txt b/apps/benchmarks/NonUniformGridCPU/CMakeLists.txt
index 1a58f36da0f48627a2e7f274a712fecad5a93437..ed36e4e9593dbe9f6034a8066beaa472e809887b 100644
--- a/apps/benchmarks/NonUniformGridCPU/CMakeLists.txt
+++ b/apps/benchmarks/NonUniformGridCPU/CMakeLists.txt
@@ -13,4 +13,4 @@ waLBerla_generate_target_from_python(NAME NonUniformGridCPUGenerated
 
 waLBerla_add_executable( NAME NonUniformGridCPU
                          FILES NonUniformGridCPU.cpp LdcSetup.h GridGeneration.h
-                         DEPENDS blockforest boundary core domain_decomposition field geometry lbm_generated python_coupling timeloop vtk NonUniformGridCPUGenerated )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::lbm_generated walberla::python_coupling walberla::timeloop walberla::vtk NonUniformGridCPUGenerated )
diff --git a/apps/benchmarks/NonUniformGridGPU/CMakeLists.txt b/apps/benchmarks/NonUniformGridGPU/CMakeLists.txt
index c8b02785b104a80075d2e36a1647eceec8a467c3..5158557decd121c97b1faf69d93443d3cc6be57f 100644
--- a/apps/benchmarks/NonUniformGridGPU/CMakeLists.txt
+++ b/apps/benchmarks/NonUniformGridGPU/CMakeLists.txt
@@ -12,4 +12,4 @@ waLBerla_generate_target_from_python(NAME NonUniformGridGPUGenerated
         NonUniformGridGPUInfoHeader.h)
 waLBerla_add_executable( NAME NonUniformGridGPU
                          FILES NonUniformGridGPU.cpp LdcSetup.h GridGeneration.h
-                         DEPENDS blockforest boundary core gpu domain_decomposition field geometry lbm_generated python_coupling timeloop vtk NonUniformGridGPUGenerated )
\ No newline at end of file
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::gpu walberla::domain_decomposition walberla::field walberla::geometry walberla::lbm_generated walberla::python_coupling walberla::timeloop walberla::vtk NonUniformGridGPUGenerated )
\ No newline at end of file
diff --git a/apps/benchmarks/Percolation/CMakeLists.txt b/apps/benchmarks/Percolation/CMakeLists.txt
index bb8c4f3dc9aa15c71786f4a1bc0a9cc0d28c9664..c37d6afbc3aa9a725691b137e8ade090eba61d8e 100644
--- a/apps/benchmarks/Percolation/CMakeLists.txt
+++ b/apps/benchmarks/Percolation/CMakeLists.txt
@@ -3,7 +3,7 @@ waLBerla_link_files_to_builddir("*.prm")
 if (WALBERLA_BUILD_WITH_CODEGEN)
     if (NOT WALBERLA_BUILD_WITH_GPU_SUPPORT OR (WALBERLA_BUILD_WITH_GPU_SUPPORT AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP)))
         waLBerla_add_executable(NAME Percolation FILES Percolation.cpp
-                DEPENDS blockforest core field geometry gpu lbm lbm_mesapd_coupling mesa_pd sqlite vtk PSMCodegenPython_trt-smagorinsky_sc1)
+              DEPENDS walberla::blockforest walberla::core walberla::field walberla::geometry walberla::gpu walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::sqlite walberla::vtk PSMCodegenPython_trt-smagorinsky_sc1 )
         target_compile_definitions(Percolation PRIVATE Weighting=2)
     endif ()
 endif ()
diff --git a/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt b/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt
index 14aaa76e74fa8ba909f6a5bafdd7bf4a5c87e55b..d0b064e919c5df983f70a9299dcaf5a21ddad306 100644
--- a/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt
+++ b/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt
@@ -15,10 +15,10 @@ waLBerla_generate_target_from_python(NAME BenchmarkPhaseFieldCodeGen
 if (WALBERLA_BUILD_WITH_GPU_SUPPORT )
     waLBerla_add_executable(NAME benchmark_multiphase
             FILES benchmark_multiphase.cpp InitializerFunctions.cpp multiphase_codegen.py
-            DEPENDS blockforest core gpu field postprocessing python_coupling lbm_generated geometry timeloop BenchmarkPhaseFieldCodeGen)
+          DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm_generated walberla::geometry walberla::timeloop BenchmarkPhaseFieldCodeGen )
 else ()
     waLBerla_add_executable(NAME benchmark_multiphase
             FILES benchmark_multiphase.cpp InitializerFunctions.cpp multiphase_codegen.py
-            DEPENDS blockforest core field postprocessing python_coupling lbm_generated geometry timeloop BenchmarkPhaseFieldCodeGen)
+          DEPENDS walberla::blockforest walberla::core walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm_generated walberla::geometry walberla::timeloop BenchmarkPhaseFieldCodeGen )
 endif (WALBERLA_BUILD_WITH_GPU_SUPPORT )
 
diff --git a/apps/benchmarks/PoiseuilleChannel/CMakeLists.txt b/apps/benchmarks/PoiseuilleChannel/CMakeLists.txt
index 7d354fba8ad13ad6db45d312009db2ee43305cec..c0c0519103d9e8d526fe5788d7c5dc646b229577 100644
--- a/apps/benchmarks/PoiseuilleChannel/CMakeLists.txt
+++ b/apps/benchmarks/PoiseuilleChannel/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 waLBerla_link_files_to_builddir( "*.dat" )                 
-                                  
-waLBerla_add_executable( NAME PoiseuilleChannel DEPENDS blockforest boundary core field lbm postprocessing stencil timeloop vtk sqlite)
+
+waLBerla_add_executable( NAME PoiseuilleChannel DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk walberla::sqlite )
 
 ##############
 # Some tests #
diff --git a/apps/benchmarks/ProbeVsExtraMessage/CMakeLists.txt b/apps/benchmarks/ProbeVsExtraMessage/CMakeLists.txt
index 70ff75bc67f6f5992aadf87a5d6dbae75080cf58..111fe9eab8b00e3233b80d7ba90d58a25ef2f0da 100644
--- a/apps/benchmarks/ProbeVsExtraMessage/CMakeLists.txt
+++ b/apps/benchmarks/ProbeVsExtraMessage/CMakeLists.txt
@@ -1,7 +1,7 @@
 waLBerla_add_executable ( NAME PackPerformance 
                           FILES PackPerformance.cpp
-                          DEPENDS core )
+      DEPENDS walberla::core )
 
 waLBerla_add_executable ( NAME ProbeVsExtraMessage 
                           FILES ProbeVsExtraMessage.cpp
-                          DEPENDS core postprocessing stencil sqlite)
+      DEPENDS walberla::core walberla::postprocessing walberla::stencil walberla::sqlite )
diff --git a/apps/benchmarks/SchaeferTurek/CMakeLists.txt b/apps/benchmarks/SchaeferTurek/CMakeLists.txt
index 06cfca6e34be7beb1e0dc96f87ce9d0cd05109de..36aad6cd3bc8b83a951d2498b640c37ca98c4ace 100644
--- a/apps/benchmarks/SchaeferTurek/CMakeLists.txt
+++ b/apps/benchmarks/SchaeferTurek/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 waLBerla_link_files_to_builddir( "*.dat" )   
-                                  
-waLBerla_add_executable( NAME SchaeferTurek DEPENDS blockforest boundary core field lbm postprocessing stencil timeloop vtk sqlite )
+
+waLBerla_add_executable( NAME SchaeferTurek DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk walberla::sqlite )
 
 waLBerla_execute_test( NO_MODULE_LABEL NAME SchaeferTurekTest COMMAND $<TARGET_FILE:SchaeferTurek> Test2D.dat PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo DEPENDS_ON_TARGETS SchaeferTurek )
\ No newline at end of file
diff --git a/apps/benchmarks/TurbulentChannel/CMakeLists.txt b/apps/benchmarks/TurbulentChannel/CMakeLists.txt
index 73aa9ef56addc086f49cb4b533923a00ebce1018..748b30300bea63ae9465c522207404eb335a2edc 100644
--- a/apps/benchmarks/TurbulentChannel/CMakeLists.txt
+++ b/apps/benchmarks/TurbulentChannel/CMakeLists.txt
@@ -18,9 +18,9 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
             TurbulentChannel_TKE_SGS_Writer.cpp TurbulentChannel_TKE_SGS_Writer.h
     )
 
-    walberla_add_executable ( NAME TurbulentChannel_Application
-            FILES TurbulentChannel.cpp
-            DEPENDS blockforest core domain_decomposition field geometry timeloop lbm stencil vtk
-                    TurbulentChannel_CodeGeneration )
+    walberla_add_executable( NAME TurbulentChannel_Application
+          FILES TurbulentChannel.cpp
+          DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::timeloop
+          walberla::lbm walberla::stencil walberla::vtk TurbulentChannel_CodeGeneration )
 
 endif()
\ No newline at end of file
diff --git a/apps/benchmarks/UniformGrid/CMakeLists.txt b/apps/benchmarks/UniformGrid/CMakeLists.txt
index 2f75f12b5bc13630028bfcd3c63f036c94d16dab..16eca03a2a1f292d40454300aeb320fa488cc8ad 100644
--- a/apps/benchmarks/UniformGrid/CMakeLists.txt
+++ b/apps/benchmarks/UniformGrid/CMakeLists.txt
@@ -2,5 +2,5 @@
 waLBerla_link_files_to_builddir( "*.dat" )
 
 
-waLBerla_add_executable ( NAME UniformGridBenchmark 
-                          DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk sqlite )
\ No newline at end of file
+waLBerla_add_executable ( NAME UniformGridBenchmark
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk walberla::sqlite )
\ No newline at end of file
diff --git a/apps/benchmarks/UniformGridCPU/CMakeLists.txt b/apps/benchmarks/UniformGridCPU/CMakeLists.txt
index 76c40ea570e888dd5233e4fb17aa9a1540c1fb22..49d68423e5d1a5ae2d15fd3e6442d146a1b732cb 100644
--- a/apps/benchmarks/UniformGridCPU/CMakeLists.txt
+++ b/apps/benchmarks/UniformGridCPU/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach(streaming_pattern pull push aa esotwist esopull esopush)
 
             waLBerla_add_executable(NAME UniformGridCPU_${config}
                     FILES UniformGridCPU.cpp
-                    DEPENDS blockforest boundary core domain_decomposition field geometry python_coupling timeloop vtk UniformGridCPUGenerated_${config})
+                  DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::python_coupling walberla::timeloop walberla::vtk UniformGridCPUGenerated_${config} )
 
             # all configs are excluded from all except for pull d3q27.
             if (${streaming_pattern} STREQUAL "pull" AND ${stencil} STREQUAL "d3q27")
diff --git a/apps/benchmarks/UniformGridGPU/CMakeLists.txt b/apps/benchmarks/UniformGridGPU/CMakeLists.txt
index 25ca68ed26239d63eded16ac1db639a10ba93c16..f03f6841d5530b8c07f4c976612d72625e2f6ce2 100644
--- a/apps/benchmarks/UniformGridGPU/CMakeLists.txt
+++ b/apps/benchmarks/UniformGridGPU/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach(streaming_pattern pull push aa esotwist esopull esopush)
 
             waLBerla_add_executable(NAME UniformGridGPU_${config}
                     FILES UniformGridGPU.cpp
-                    DEPENDS blockforest boundary core gpu domain_decomposition field geometry lbm_generated python_coupling timeloop vtk UniformGridGPUGenerated_${config})
+                  DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::gpu walberla::domain_decomposition walberla::field walberla::geometry walberla::lbm_generated walberla::python_coupling walberla::timeloop walberla::vtk UniformGridGPUGenerated_${config} )
 
             # all configs are excluded from all except for pull d3q27.
             if (${streaming_pattern} STREQUAL "pull" AND ${stencil} STREQUAL "d3q27")
diff --git a/apps/pythonmodule/CMakeLists.txt b/apps/pythonmodule/CMakeLists.txt
index d2c6251c1e8a9efb7d7918cf620d1f81f01a1769..b15c6ab088c1323f7fc558651ef08ca902286e52 100644
--- a/apps/pythonmodule/CMakeLists.txt
+++ b/apps/pythonmodule/CMakeLists.txt
@@ -1,12 +1,12 @@
 # waLBerla Python module
-if( NOT TARGET python_coupling )
-    message( WARNING "python module ist not build since the python_coupling target is non-existent" )
+if ( NOT TARGET walberla::python_coupling )
+    message( WARNING "python module ist not build since the walberla::python_coupling target is non-existent" )
 else()
 if ( WALBERLA_BUILD_WITH_PYTHON )
     if ( WALBERLA_BUILD_WITH_GPU_SUPPORT )
-        set(PYTHON_MODULE_DEPENDENCIES blockforest boundary domain_decomposition core field python_coupling timeloop vtk gpu)
+        set( PYTHON_MODULE_DEPENDENCIES walberla::blockforest walberla::boundary walberla::domain_decomposition walberla::core walberla::field walberla::python_coupling walberla::timeloop walberla::vtk walberla::gpu )
     else()
-        set(PYTHON_MODULE_DEPENDENCIES blockforest boundary domain_decomposition core field python_coupling timeloop vtk)
+        set( PYTHON_MODULE_DEPENDENCIES walberla::blockforest walberla::boundary walberla::domain_decomposition walberla::core walberla::field walberla::python_coupling walberla::timeloop walberla::vtk )
     endif()
 
     if( WALBERLA_CXX_COMPILER_IS_MSVC )
diff --git a/apps/showcases/Antidunes/CMakeLists.txt b/apps/showcases/Antidunes/CMakeLists.txt
index a0feea41cc2502dc568f9ee3aa2271e2932760e9..f77f729d072d4817630b8ffdfc559a4638e0dc82 100644
--- a/apps/showcases/Antidunes/CMakeLists.txt
+++ b/apps/showcases/Antidunes/CMakeLists.txt
@@ -1,16 +1,17 @@
 waLBerla_link_files_to_builddir( *.prm )
 
-if( WALBERLA_BUILD_WITH_CODEGEN )
-   walberla_generate_target_from_python( NAME      AntidunesLatticeModelGeneration
-                                         FILE      AntidunesLatticeModelGeneration.py
-                                         OUT_FILES AntidunesLatticeModel.cpp AntidunesLatticeModel.h )
+if ( WALBERLA_BUILD_WITH_CODEGEN )
+   walberla_generate_target_from_python( NAME AntidunesLatticeModelGeneration
+         FILE AntidunesLatticeModelGeneration.py
+         OUT_FILES AntidunesLatticeModel.cpp AntidunesLatticeModel.h )
 
-   waLBerla_add_executable(NAME     Antidunes
-                           FILES    Antidunes.cpp PIDController.cpp
-                           DEPENDS  blockforest boundary core domain_decomposition field lbm mesa_pd lbm_mesapd_coupling
-                                    postprocessing timeloop vtk AntidunesLatticeModelGeneration)
-endif()
+   waLBerla_add_executable( NAME Antidunes
+         FILES Antidunes.cpp PIDController.cpp
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field
+         walberla::lbm walberla::mesa_pd walberla::lbm_mesapd_coupling walberla::postprocessing walberla::timeloop
+         walberla::vtk AntidunesLatticeModelGeneration )
+endif ()
 
-waLBerla_add_executable(NAME     BedGeneration
-        FILES    BedGeneration.cpp
-        DEPENDS  blockforest core domain_decomposition mesa_pd vtk)
+waLBerla_add_executable( NAME BedGeneration
+      FILES BedGeneration.cpp
+      DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::mesa_pd walberla::vtk )
diff --git a/apps/showcases/BidisperseFluidizedBed/CMakeLists.txt b/apps/showcases/BidisperseFluidizedBed/CMakeLists.txt
index 51318ee88fdac51ecb1c046cf45c0ac379046149..a59959badb201ac16966121bc7de31f466e290c5 100644
--- a/apps/showcases/BidisperseFluidizedBed/CMakeLists.txt
+++ b/apps/showcases/BidisperseFluidizedBed/CMakeLists.txt
@@ -1,2 +1,2 @@
 waLBerla_add_executable ( NAME BidisperseFluidizedBedDPM
-                          DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk )
\ No newline at end of file
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::timeloop walberla::vtk )
\ No newline at end of file
diff --git a/apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt b/apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt
index a550c3006289f88fa9abdd26e34bdacb4a2c0b23..1d19269dd32d2d4efac99e33256afd363d657b1b 100644
--- a/apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt
+++ b/apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt
@@ -1,2 +1,2 @@
 waLBerla_add_executable ( NAME CombinedResolvedUnresolved
-                          DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::timeloop walberla::vtk )
diff --git a/apps/showcases/FlowAroundSphere/CMakeLists.txt b/apps/showcases/FlowAroundSphere/CMakeLists.txt
index f11856924f68a541dffeb1a89ce136d5f10ce52d..ba0c2a7459152b017946ab6b7d8d131d143c0331 100644
--- a/apps/showcases/FlowAroundSphere/CMakeLists.txt
+++ b/apps/showcases/FlowAroundSphere/CMakeLists.txt
@@ -22,10 +22,10 @@ waLBerla_generate_target_from_python(NAME FlowAroundSphereCodeGen
 if (WALBERLA_BUILD_WITH_CUDA OR WALBERLA_BUILD_WITH_HIP)
     waLBerla_add_executable ( NAME FlowAroundSphere
             FILES FlowAroundSphere.cpp Sphere.cpp Evaluation.cpp GridGeneration.h Types.h
-            DEPENDS blockforest boundary core field gpu lbm_generated stencil timeloop vtk FlowAroundSphereCodeGen )
+          DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::gpu walberla::lbm_generated walberla::stencil walberla::timeloop walberla::vtk FlowAroundSphereCodeGen )
 else()
     waLBerla_add_executable ( NAME FlowAroundSphere
             FILES FlowAroundSphere.cpp Sphere.cpp Evaluation.cpp GridGeneration.h Types.h
-            DEPENDS blockforest boundary core field lbm_generated stencil timeloop vtk FlowAroundSphereCodeGen )
+          DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm_generated walberla::stencil walberla::timeloop walberla::vtk FlowAroundSphereCodeGen )
 
 endif(WALBERLA_BUILD_WITH_CUDA OR WALBERLA_BUILD_WITH_HIP)
diff --git a/apps/showcases/FluidizedBed/CMakeLists.txt b/apps/showcases/FluidizedBed/CMakeLists.txt
index fd529a75126ac0aee42e7ef4175808ea43fe4c44..01ae9cd1a88824b1dae50fae65a4cbcb1307a219 100644
--- a/apps/showcases/FluidizedBed/CMakeLists.txt
+++ b/apps/showcases/FluidizedBed/CMakeLists.txt
@@ -1,7 +1,7 @@
 waLBerla_link_files_to_builddir( "*.prm" )
 
 waLBerla_add_executable ( NAME FluidizedBedMEM FILES FluidizedBedMEM.cpp
-                          DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable ( NAME FluidizedBedPSM FILES FluidizedBedPSM.cpp
-        DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::timeloop walberla::vtk )
diff --git a/apps/showcases/FreeSurface/CMakeLists.txt b/apps/showcases/FreeSurface/CMakeLists.txt
index 34bed9ecd86323ffd5f914a757ca1d4453d4fbe7..55f2a6bfe31867173ecd6de23fcc07735dd91c4d 100644
--- a/apps/showcases/FreeSurface/CMakeLists.txt
+++ b/apps/showcases/FreeSurface/CMakeLists.txt
@@ -1,52 +1,59 @@
 waLBerla_link_files_to_builddir( *.prm )
 
-waLBerla_add_executable(NAME    BubblyPoiseuille
-                        FILES   BubblyPoiseuille.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-waLBerla_add_executable(NAME    CapillaryWave
-                        FILES   CapillaryWave.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-waLBerla_add_executable(NAME    DamBreakCylindrical
-                        FILES   DamBreakCylindrical.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-waLBerla_add_executable(NAME    DamBreakRectangular
-                        FILES   DamBreakRectangular.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-waLBerla_add_executable(NAME    DropImpact
-                        FILES   DropImpact.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-waLBerla_add_executable(NAME    DropWetting
-                        FILES   DropWetting.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-waLBerla_add_executable(NAME    GravityWave
-                        FILES   GravityWave.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-if( WALBERLA_BUILD_WITH_CODEGEN )
-   walberla_generate_target_from_python( NAME      GravityWaveLatticeModelGeneration
-                                         FILE      GravityWaveLatticeModelGeneration.py
-                                         OUT_FILES GravityWaveLatticeModel.cpp GravityWaveLatticeModel.h )
-
-   waLBerla_add_executable(NAME    GravityWaveCodegen
-                           FILES   GravityWaveCodegen.cpp
-                           DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk
-                                   GravityWaveLatticeModelGeneration)
-endif()
-
-waLBerla_add_executable(NAME    MovingDrop
-                        FILES   MovingDrop.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-waLBerla_add_executable(NAME    RisingBubble
-                        FILES   RisingBubble.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
-
-waLBerla_add_executable(NAME    TaylorBubble
-                        FILES   TaylorBubble.cpp
-                        DEPENDS blockforest boundary core domain_decomposition field lbm postprocessing timeloop vtk)
\ No newline at end of file
+waLBerla_add_executable( NAME BubblyPoiseuille
+      FILES BubblyPoiseuille.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm
+      walberla::postprocessing walberla::timeloop walberla::vtk )
+
+waLBerla_add_executable( NAME CapillaryWave
+      FILES CapillaryWave.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm
+      walberla::postprocessing walberla::timeloop walberla::vtk )
+
+waLBerla_add_executable( NAME DamBreakCylindrical
+      FILES DamBreakCylindrical.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm
+      walberla::postprocessing walberla::timeloop walberla::vtk )
+
+waLBerla_add_executable( NAME DamBreakRectangular
+      FILES DamBreakRectangular.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm
+      walberla::postprocessing walberla::timeloop walberla::vtk )
+
+waLBerla_add_executable( NAME DropImpact
+      FILES DropImpact.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm
+      walberla::postprocessing walberla::timeloop walberla::vtk )
+
+waLBerla_add_executable( NAME DropWetting
+      FILES DropWetting.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm
+      walberla::postprocessing walberla::timeloop walberla::vtk )
+
+waLBerla_add_executable( NAME GravityWave
+      FILES GravityWave.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm
+      walberla::postprocessing walberla::timeloop walberla::vtk )
+
+if ( WALBERLA_BUILD_WITH_CODEGEN )
+   walberla_generate_target_from_python( NAME GravityWaveLatticeModelGeneration
+         FILE GravityWaveLatticeModelGeneration.py
+         OUT_FILES GravityWaveLatticeModel.cpp GravityWaveLatticeModel.h )
+
+   waLBerla_add_executable( NAME GravityWaveCodegen
+         FILES GravityWaveCodegen.cpp
+         DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm
+         walberla::postprocessing walberla::timeloop walberla::vtk GravityWaveLatticeModelGeneration )
+endif ()
+
+waLBerla_add_executable( NAME MovingDrop
+      FILES MovingDrop.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk )
+
+waLBerla_add_executable( NAME RisingBubble
+      FILES RisingBubble.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk )
+
+waLBerla_add_executable( NAME TaylorBubble
+      FILES TaylorBubble.cpp
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::postprocessing walberla::timeloop walberla::vtk )
\ No newline at end of file
diff --git a/apps/showcases/HeatConduction/CMakeLists.txt b/apps/showcases/HeatConduction/CMakeLists.txt
index f9465cda0679d5d0708213892a509bcc211c5bfc..0a94076996e777f0a1905e7b31d74f15a0e415a7 100644
--- a/apps/showcases/HeatConduction/CMakeLists.txt
+++ b/apps/showcases/HeatConduction/CMakeLists.txt
@@ -2,4 +2,4 @@ waLBerla_link_files_to_builddir( *.cfg )
 
 waLBerla_add_executable( NAME HeatConduction
    FILES HeatConduction.cpp
-   DEPENDS core mesa_pd vtk )
+      DEPENDS walberla::core walberla::mesa_pd walberla::vtk )
diff --git a/apps/showcases/LightRisingParticleInFluidAMR/CMakeLists.txt b/apps/showcases/LightRisingParticleInFluidAMR/CMakeLists.txt
index 96fd54bdb9f527764b8a5cb1705aa4ca635c7bb9..312abbea1748b02bbb60c6f62a134b43736cc174 100644
--- a/apps/showcases/LightRisingParticleInFluidAMR/CMakeLists.txt
+++ b/apps/showcases/LightRisingParticleInFluidAMR/CMakeLists.txt
@@ -1,3 +1,3 @@
 waLBerla_add_executable ( NAME LightRisingParticleInFluidAMR
         FILES LightRisingParticleInFluidAMR.cpp
-        DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk geometry postprocessing )
+      DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk walberla::geometry walberla::postprocessing )
diff --git a/apps/showcases/Mixer/CMakeLists.txt b/apps/showcases/Mixer/CMakeLists.txt
index c355caf515c20ba7afde2493b3b22be15c7e20d7..e1a9b35198a2d957886989e956757bda15257318 100644
--- a/apps/showcases/Mixer/CMakeLists.txt
+++ b/apps/showcases/Mixer/CMakeLists.txt
@@ -2,4 +2,4 @@ waLBerla_link_files_to_builddir( *.cfg )
 
 waLBerla_add_executable( NAME Mixer
    FILES Mixer.cpp
-   DEPENDS core mesa_pd sqlite vtk )
+      DEPENDS walberla::core walberla::mesa_pd walberla::sqlite walberla::vtk )
diff --git a/apps/showcases/ParticlePacking/CMakeLists.txt b/apps/showcases/ParticlePacking/CMakeLists.txt
index abe7636fac750d6ab7447af31ae38d0c4b157647..a385d7bd66c4950b8678a2e6b03935254b04f5ec 100644
--- a/apps/showcases/ParticlePacking/CMakeLists.txt
+++ b/apps/showcases/ParticlePacking/CMakeLists.txt
@@ -3,6 +3,6 @@ waLBerla_link_files_to_builddir( *.cfg )
 if (WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE)
    waLBerla_add_executable ( NAME ParticlePacking
                              FILES ParticlePacking.cpp
-                             DEPENDS blockforest core mesa_pd postprocessing sqlite vtk )
+         DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::postprocessing walberla::sqlite walberla::vtk )
 endif()
 
diff --git a/apps/showcases/PegIntoSphereBed/CMakeLists.txt b/apps/showcases/PegIntoSphereBed/CMakeLists.txt
index 3ddd2e024bbcf641da576604c9161f4eb79f528d..7a71c0c6e90edfa6abf3553147656bd549be5e3b 100644
--- a/apps/showcases/PegIntoSphereBed/CMakeLists.txt
+++ b/apps/showcases/PegIntoSphereBed/CMakeLists.txt
@@ -3,5 +3,5 @@ waLBerla_link_files_to_builddir( *.cfg )
 if (OPENMESH_FOUND AND WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE)
     waLBerla_add_executable ( NAME MESA_PD_MESH_APP_PegIntoSphereBed
             FILES PegIntoSphereBed.cpp
-            DEPENDS blockforest mesh_common mesa_pd core vtk )
+          DEPENDS walberla::blockforest mesh_common walberla::mesa_pd walberla::core walberla::vtk )
 endif()
\ No newline at end of file
diff --git a/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt b/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt
index 383c9d31a6e74c63a8ec24082008c4a3cb264c78..ea5b2a420302417824cfd947424bb526a9a6e0b5 100644
--- a/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt
+++ b/apps/showcases/PhaseFieldAllenCahn/CPU/CMakeLists.txt
@@ -18,4 +18,4 @@ waLBerla_generate_target_from_python(NAME PhaseFieldCodeGenCPU
 
 waLBerla_add_executable(NAME multiphaseCPU
         FILES multiphase.cpp PythonExports.cpp InitializerFunctions.cpp multiphase_codegen.py
-        DEPENDS blockforest core field postprocessing python_coupling lbm geometry timeloop PhaseFieldCodeGenCPU)
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm walberla::geometry walberla::timeloop PhaseFieldCodeGenCPU )
diff --git a/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt b/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt
index 61e4464d18c4ea1a5ee056f26792c60f6af71250..ee17a19c241529a357ac022b4385b71cb1f15d92 100644
--- a/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt
+++ b/apps/showcases/PhaseFieldAllenCahn/GPU/CMakeLists.txt
@@ -18,4 +18,4 @@ waLBerla_generate_target_from_python(NAME PhaseFieldCodeGenGPU
 
 waLBerla_add_executable(NAME multiphaseGPU
         FILES multiphase.cpp PythonExports.cpp InitializerFunctions.cpp util.cpp multiphase_codegen.py
-        DEPENDS blockforest core gpu field postprocessing python_coupling lbm geometry timeloop PhaseFieldCodeGenGPU)
+      DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm walberla::geometry walberla::timeloop PhaseFieldCodeGenGPU )
diff --git a/apps/showcases/Piping/CMakeLists.txt b/apps/showcases/Piping/CMakeLists.txt
index c86a1ee331e80325e60c529c37cc59c9f8871078..489ae94acd34670ed3081da6f28057db7952b4e8 100644
--- a/apps/showcases/Piping/CMakeLists.txt
+++ b/apps/showcases/Piping/CMakeLists.txt
@@ -2,4 +2,4 @@ add_subdirectory(setups)
 
 waLBerla_add_executable(NAME SettlingSpheres
         FILES SettlingSpheres.cpp
-        DEPENDS blockforest core field lbm_mesapd_coupling mesa_pd vtk)
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::vtk )
diff --git a/apps/showcases/PorousMedia/CMakeLists.txt b/apps/showcases/PorousMedia/CMakeLists.txt
index 73e24092991ce2334624d613319e2bc51b47e855..1376fa1c76f3747d36cf811abf0b2afc3670bd43 100644
--- a/apps/showcases/PorousMedia/CMakeLists.txt
+++ b/apps/showcases/PorousMedia/CMakeLists.txt
@@ -4,7 +4,7 @@ waLBerla_link_files_to_builddir( *.txt )
 waLBerla_add_executable (
         NAME PackedBedCreation
         FILES PackedBedCreation.cpp
-        DEPENDS blockforest core field geometry timeloop pe pe_coupling vtk)
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::geometry walberla::timeloop walberla::pe walberla::pe_coupling walberla::vtk )
 
 waLBerla_generate_target_from_python(
         NAME GeneratedLatticeModel
@@ -14,5 +14,5 @@ waLBerla_generate_target_from_python(
 waLBerla_add_executable (
         NAME PorousMedia
         FILES PorousMediaCumulantLBMKernel.py PorousMedia.cpp
-        DEPENDS blockforest core field lbm geometry timeloop pe pe_coupling GeneratedLatticeModel )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::lbm walberla::geometry walberla::timeloop walberla::pe walberla::pe_coupling GeneratedLatticeModel )
 
diff --git a/apps/showcases/Thermocapillary/CMakeLists.txt b/apps/showcases/Thermocapillary/CMakeLists.txt
index 5a06ee8e3716e4e94017b9e1e50abad07f04a1df..f884505c65085b1d461d24332b6c4ea51145c0da 100644
--- a/apps/showcases/Thermocapillary/CMakeLists.txt
+++ b/apps/showcases/Thermocapillary/CMakeLists.txt
@@ -35,9 +35,9 @@ waLBerla_generate_target_from_python(NAME ThermocapillaryGen
 if ( WALBERLA_BUILD_WITH_GPU_SUPPORT )
     waLBerla_add_executable(NAME thermocapillary
             FILES thermocapillary.cpp PythonExports.cpp InitializerFunctions.cpp thermocapillary_codegen.py
-            DEPENDS blockforest core gpu field postprocessing python_coupling lbm geometry timeloop ThermocapillaryGen)
+          DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm walberla::geometry walberla::timeloop ThermocapillaryGen )
 else ()
     waLBerla_add_executable(NAME thermocapillary
             FILES thermocapillary.cpp PythonExports.cpp InitializerFunctions.cpp thermocapillary_codegen.py
-            DEPENDS blockforest core field postprocessing python_coupling lbm geometry timeloop ThermocapillaryGen)
+          DEPENDS walberla::blockforest walberla::core walberla::field walberla::postprocessing walberla::python_coupling walberla::lbm walberla::geometry walberla::timeloop ThermocapillaryGen )
 endif ( WALBERLA_BUILD_WITH_GPU_SUPPORT )
diff --git a/apps/tools/MixedPrecision/CMakeLists.txt b/apps/tools/MixedPrecision/CMakeLists.txt
index 5f14c7e5a2b3ea377db65597d4bfe37b3f38055d..272a8c18c86b595dab437eb0c68f71eada3fe6f9 100644
--- a/apps/tools/MixedPrecision/CMakeLists.txt
+++ b/apps/tools/MixedPrecision/CMakeLists.txt
@@ -1,3 +1,3 @@
 waLBerla_add_executable ( NAME CheckFP16
         FILES CheckFP16.cpp
-        DEPENDS core )
\ No newline at end of file
+      DEPENDS walberla::core )
\ No newline at end of file
diff --git a/apps/tools/povrayFileCompressor/CMakeLists.txt b/apps/tools/povrayFileCompressor/CMakeLists.txt
index a9ad58f57a633ecab81f30536a32059b46689dd5..707b13319a939e5963d62e948cc19683ffda0643 100644
--- a/apps/tools/povrayFileCompressor/CMakeLists.txt
+++ b/apps/tools/povrayFileCompressor/CMakeLists.txt
@@ -1,3 +1,3 @@
 waLBerla_add_executable ( NAME PovrayFileCompressor 
-                          FILES main.cpp 
-                          DEPENDS postprocessing )
\ No newline at end of file
+                          FILES main.cpp
+      DEPENDS walberla::postprocessing )
\ No newline at end of file
diff --git a/apps/tutorials/basics/CMakeLists.txt b/apps/tutorials/basics/CMakeLists.txt
index e417b95163d0f2d3d1e33da3761e54598db9d66e..12617529ea75234ee913a0199a65e94b0cd66e98 100644
--- a/apps/tutorials/basics/CMakeLists.txt
+++ b/apps/tutorials/basics/CMakeLists.txt
@@ -3,13 +3,13 @@ waLBerla_link_files_to_builddir( *.png )
 
 waLBerla_add_executable ( NAME 01_Tutorial_BlocksAndFields1 
                           FILES 01_BlocksAndFields.cpp
-                          DEPENDS blockforest core field timeloop )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::timeloop )
                                                                               
 waLBerla_add_executable ( NAME 02_Tutorial_Sweeps 
                           FILES 02_Sweeps.cpp
-                          DEPENDS blockforest core field timeloop )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::timeloop )
   
 waLBerla_add_executable ( NAME 03_Tutorial_GameOfLife
                           FILES 03_GameOfLife.cpp
-                          DEPENDS blockforest core field geometry timeloop )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::geometry walberla::timeloop )
                                                                                              
diff --git a/apps/tutorials/codegen/CMakeLists.txt b/apps/tutorials/codegen/CMakeLists.txt
index f24cdab2b6827b7c66f1b7d781461b875c929bd4..fb4cc9b77fd28908db7e0df3fb472ecb7dceb74c 100644
--- a/apps/tutorials/codegen/CMakeLists.txt
+++ b/apps/tutorials/codegen/CMakeLists.txt
@@ -6,10 +6,11 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
     walberla_generate_target_from_python( NAME CodegenHeatEquationKernel
         FILE HeatEquationKernel.py
         OUT_FILES HeatEquationKernel.cpp HeatEquationKernel.h )
-    
-    walberla_add_executable ( NAME 01_CodegenHeatEquation 
-                              FILES 01_CodegenHeatEquation.cpp
-                              DEPENDS blockforest core field stencil timeloop vtk pde CodegenHeatEquationKernel )
+
+    walberla_add_executable( NAME 01_CodegenHeatEquation
+          FILES 01_CodegenHeatEquation.cpp
+          DEPENDS walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop
+          walberla::vtk walberla::pde CodegenHeatEquationKernel )
 
     #   Tutorial 2: lbmpy Lattice Model Generation
     waLBerla_link_files_to_builddir( *.prm )
@@ -19,9 +20,10 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
         OUT_FILES   SRTLatticeModel.cpp SRTLatticeModel.h 
                     SRTPackInfo.cpp SRTPackInfo.h )
 
-    walberla_add_executable ( NAME 02_LBMLatticeModelGenerationApp 
-                    FILES 02_LBMLatticeModelGeneration.cpp
-                    DEPENDS blockforest core domain_decomposition field geometry timeloop lbm stencil vtk 02_LBMLatticeModelGenerationPython )
+    walberla_add_executable( NAME 02_LBMLatticeModelGenerationApp
+          FILES 02_LBMLatticeModelGeneration.cpp
+          DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::timeloop
+          walberla::lbm walberla::stencil walberla::vtk 02_LBMLatticeModelGenerationPython )
 
     #   Tutorial 3: Advanced lbmpy Code Generation
     walberla_generate_target_from_python( NAME 03_AdvancedLBMCodegenPython
@@ -34,11 +36,11 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
     if(WALBERLA_BUILD_WITH_GPU_SUPPORT)
         walberla_add_executable ( NAME 03_AdvancedLBMCodegenApp
                 FILES 03_AdvancedLBMCodegen.cpp
-                DEPENDS blockforest gpu core domain_decomposition field geometry timeloop lbm stencil vtk 03_AdvancedLBMCodegenPython )
+              DEPENDS walberla::blockforest walberla::gpu walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::timeloop walberla::lbm walberla::stencil walberla::vtk 03_AdvancedLBMCodegenPython )
     else()
         walberla_add_executable ( NAME 03_AdvancedLBMCodegenApp
                 FILES 03_AdvancedLBMCodegen.cpp
-                DEPENDS blockforest core domain_decomposition field geometry timeloop lbm stencil vtk 03_AdvancedLBMCodegenPython )
+              DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::timeloop walberla::lbm walberla::stencil walberla::vtk 03_AdvancedLBMCodegenPython )
     endif()
 
     #   Tutorial 4: Advanced lbmpy Code Generation with Complex geometry
@@ -63,8 +65,8 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
             LBComplexGeometryBoundaryCollection.h
             InfoHeader.h
         )
-        
-        set(TUT4_DEPENDENCIES blockforest boundary core field geometry lbm lbm_generated mesh python_coupling stencil timeloop vtk 04_LBComplexGeometryPython)
+
+        set( TUT4_DEPENDENCIES walberla::blockforest walberla::boundary walberla::core walberla::field walberla::geometry walberla::lbm lbm_generated walberla::mesh walberla::python_coupling walberla::stencil walberla::timeloop walberla::vtk 04_LBComplexGeometryPython )
         
         if(WALBERLA_BUILD_WITH_GPU_SUPPORT)
             list(APPEND TUT4_DEPENDENCIES gpu)
diff --git a/apps/tutorials/gpu/CMakeLists.txt b/apps/tutorials/gpu/CMakeLists.txt
index 14590ec05cc7b0dc8d8d7033fd9e1c3d3ffcce30..8e02d00d8e98e6bc45f1eaa5732e5cd2e3519a75 100644
--- a/apps/tutorials/gpu/CMakeLists.txt
+++ b/apps/tutorials/gpu/CMakeLists.txt
@@ -3,5 +3,5 @@ waLBerla_link_files_to_builddir( *.png )
 
 waLBerla_add_executable ( NAME 01_GameOfLife_cuda
                           FILES 01_GameOfLife_cuda.cpp 01_GameOfLife_kernels.cu
-                          DEPENDS blockforest core gpu field lbm geometry timeloop )
+      DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::lbm walberla::geometry walberla::timeloop )
                                 
\ No newline at end of file
diff --git a/apps/tutorials/lbm/CMakeLists.txt b/apps/tutorials/lbm/CMakeLists.txt
index fd200aebb4ceb7fd928e3eb6fded6b3436a39e81..8fd53ddae1744a8f6ffe2b85f9e1333c0b03539a 100644
--- a/apps/tutorials/lbm/CMakeLists.txt
+++ b/apps/tutorials/lbm/CMakeLists.txt
@@ -3,15 +3,15 @@ waLBerla_link_files_to_builddir( *.png )
 
 waLBerla_add_executable ( NAME 01_BasicLBM
                           FILES 01_BasicLBM.cpp
-                          DEPENDS blockforest core field lbm geometry timeloop )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::lbm walberla::geometry walberla::timeloop )
                                                                                              
 waLBerla_add_executable ( NAME 02_BasicLBM_ExemplaryExtensions
                           FILES 02_BasicLBM_ExemplaryExtensions.cpp
-                          DEPENDS blockforest core field lbm geometry timeloop )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::lbm walberla::geometry walberla::timeloop )
                                                                                              
 waLBerla_add_executable ( NAME 03_LBLidDrivenCavity 
                           FILES 03_LBLidDrivenCavity.cpp
-                          DEPENDS blockforest boundary core field lbm stencil timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::stencil walberla::timeloop walberla::vtk )
 
 if ( WALBERLA_BUILD_WITH_OPENMESH )
 
@@ -19,14 +19,14 @@ waLBerla_link_geometry_to_builddir(*.obj)
 
 waLBerla_add_executable ( NAME 04_LBComplexGeometry
                           FILES 04_LBComplexGeometry.cpp
-                          DEPENDS blockforest boundary core field lbm mesh stencil timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm mesh walberla::stencil walberla::timeloop walberla::vtk )
                           
 endif()
 
 waLBerla_add_executable ( NAME 05_BackwardFacingStep
                           FILES 05_BackwardFacingStep.cpp
-                          DEPENDS blockforest boundary core field lbm stencil timeloop vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::stencil walberla::timeloop walberla::vtk )
 
 waLBerla_add_executable ( NAME 06_LBBoundaryCondition
                           FILES 06_LBBoundaryCondition.cpp
-                          DEPENDS blockforest boundary core field lbm stencil timeloop vtk )
\ No newline at end of file
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::stencil walberla::timeloop walberla::vtk )
\ No newline at end of file
diff --git a/apps/tutorials/mesa_pd/CMakeLists.txt b/apps/tutorials/mesa_pd/CMakeLists.txt
index 6c49f69960025fb4b2118bb20833ee616ee4398e..2a0dc30744b647c6653df387411014a32291da43 100644
--- a/apps/tutorials/mesa_pd/CMakeLists.txt
+++ b/apps/tutorials/mesa_pd/CMakeLists.txt
@@ -2,4 +2,4 @@ waLBerla_link_files_to_builddir( *.cfg )
 
 waLBerla_add_executable ( NAME 01_MESA_PD
    FILES 01_MESAPD.cpp
-                          DEPENDS blockforest core mesa_pd )
+      DEPENDS walberla::blockforest walberla::core walberla::mesa_pd )
diff --git a/apps/tutorials/pde/CMakeLists.txt b/apps/tutorials/pde/CMakeLists.txt
index b0b4514a56349056da05eacfa1b16b9b6e63139d..da96d1bc239024cea6bfe64244f2d8d023470522 100644
--- a/apps/tutorials/pde/CMakeLists.txt
+++ b/apps/tutorials/pde/CMakeLists.txt
@@ -4,13 +4,13 @@ waLBerla_link_files_to_builddir( *.png )
 
 waLBerla_add_executable ( NAME 01_SolvingPDE 
                           FILES 01_SolvingPDE.cpp
-                          DEPENDS blockforest core field stencil timeloop )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop )
                           
 waLBerla_add_executable ( NAME 02_HeatEquation 
                           FILES 02_HeatEquation.cpp
-                          DEPENDS blockforest core field stencil timeloop )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop )
                           
 waLBerla_add_executable ( NAME 03_HeatEquation_Extensions 
                           FILES 03_HeatEquation_Extensions.cpp
-                          DEPENDS blockforest core field stencil timeloop vtk )
+      DEPENDS walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop walberla::vtk )
                           
\ No newline at end of file
diff --git a/apps/tutorials/pe/CMakeLists.txt b/apps/tutorials/pe/CMakeLists.txt
index 5b71226d3565ad94d9bac56f91f3d0385c6fdf61..6c0ab17fb765ba434acbc2772cf1ed0e8e21121f 100644
--- a/apps/tutorials/pe/CMakeLists.txt
+++ b/apps/tutorials/pe/CMakeLists.txt
@@ -2,11 +2,11 @@ waLBerla_link_files_to_builddir( *.cfg )
 
 waLBerla_add_executable ( NAME 01_Tutorial_ConfinedGas
                           FILES 01_ConfinedGas.cpp
-                          DEPENDS blockforest core pe )
+      DEPENDS walberla::blockforest walberla::core walberla::pe )
 
 waLBerla_add_executable ( NAME 02_Tutorial_ConfinedGasExtended
                           FILES 02_ConfinedGasExtended.cpp
-                          DEPENDS blockforest core pe postprocessing vtk sqlite )
+      DEPENDS walberla::blockforest walberla::core walberla::pe walberla::postprocessing walberla::vtk walberla::sqlite )
 
 waLBerla_execute_test( NO_MODULE_LABEL NAME 01_Tutorial_ConfinedGas PROCESSES 8 )
 waLBerla_execute_test( NO_MODULE_LABEL NAME 02_Tutorial_ConfinedGasExtended
diff --git a/cmake/waLBerlaFunctions.cmake b/cmake/waLBerlaFunctions.cmake
index 7e957da2c43928cffdfc1f90a51c5b53ad37366a..5fa1c4993e22e4ceb8011a915d033528f658ec9f 100644
--- a/cmake/waLBerlaFunctions.cmake
+++ b/cmake/waLBerlaFunctions.cmake
@@ -9,140 +9,6 @@ set ( WALBERLA_GLOB_FILES *.cpp
       CACHE INTERNAL "File endings to glob for source files" )
 
 
-#######################################################################################################################
-#
-# Creates a walberla module library
-#
-#
-# Keywords:
-#   DEPENDS [required]   list of modules, that this module depends on
-#   FILES   [optional]   list of all source and header files belonging to that module
-#                        if this is not given, all source and header files in the directory are added.
-#                        Careful: when file was added or deleted, cmake has to be run again
-#   EXCLUDE [optional]   Files that should not be included in the module (but are located in module directory).
-#                        This makes only sense if FILES was not specified, and all files have been added automatically.
-#   BUILD_ONLY_IF_FOUND  Before building the module test if all libraries specified here are availbable.
-#   [optional]           This is done using the ${arg}_FOUND variable.
-#                        Example: waLBerla_add_module( DEPENDS someModule BUILD_ONLY_IF_FOUND pe)
-#                                 This module is only built if PE_FOUND is true.
-#   OPTIONAL_DEPENDS     Lists modules, that this module might depend on. For example a module could depend on mesh_common if OpenMesh is
-#   [optional]           available.
-#
-#######################################################################################################################
-
-function ( waLBerla_add_module )
-    message(WARNING "This function is deprecated. Please use the default cmake mechanisms like add_library.")
-    set( options )
-    set( oneValueArgs )
-    set( multiValueArgs DEPENDS EXCLUDE FILES BUILD_ONLY_IF_FOUND OPTIONAL_DEPENDS )
-    cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
-    set( ALL_DEPENDENCIES ${ARG_DEPENDS} ${ARG_OPTIONAL_DEPENDS})
-    # Module name is the directory relative to WALBERLA_MODULE_DIRS
-    get_current_module_name ( )
-    get_module_library_name ( moduleLibraryName ${moduleName} )
-
-    # Test if all required libraries are available
-    # this is detected using the _FOUND variable
-    foreach ( externalName ${ARG_BUILD_ONLY_IF_FOUND} )
-        string( TOUPPER ${externalName} externalNameUpper )
-        if ( NOT ${externalNameUpper}_FOUND )
-            message ( STATUS "Module ${moduleName} is not built, because ${externalName} not available" )
-            return()
-        endif()
-    endforeach()
-
-    # Take source files either from parameter or search all source files
-    file ( GLOB_RECURSE allFiles "*" )  # Find all files
-    if ( ARG_FILES )
-        foreach( sourceFile ${ARG_FILES} )
-           get_filename_component( sourceFile ${sourceFile} ABSOLUTE )
-           list( APPEND sourceFiles ${sourceFile} )
-        endforeach()
-    else()
-        file ( GLOB_RECURSE sourceFiles ${WALBERLA_GLOB_FILES} )  # Find all source files
-    endif()
-
-    # Remove exclude files from the sources
-    if ( ARG_EXCLUDE )
-        foreach ( fileToExclude ${ARG_EXCLUDE} )
-            get_filename_component( fileToExclude ${fileToExclude} ABSOLUTE )
-            list (REMOVE_ITEM sourceFiles ${fileToExclude} )
-        endforeach()
-    endif()
-
-    list_minus ( otherFiles LIST1 ${allFiles} LIST2 ${sourceFiles} )
-    set_source_files_properties( ${otherFiles} PROPERTIES HEADER_FILE_ONLY ON )
-
-    if ( WALBERLA_GROUP_FILES )
-       group_files( "Other Files"  FILES ${otherFiles}  )
-       group_files( "Source Files" FILES ${sourceFiles} )
-    endif ( )
-
-    # Dependency Check
-    check_dependencies( missingDeps additionalDeps FILES ${sourceFiles} EXPECTED_DEPS ${ALL_DEPENDENCIES} ${moduleName} )
-    if ( missingDeps )
-        message ( WARNING "The module ${moduleName} depends on ${missingDeps} which are not listed as dependencies!" )
-    endif()
-
-    set( hasSourceFiles FALSE )
- 	foreach ( sourceFile ${sourceFiles} )
- 	   if ( ${sourceFile} MATCHES "\\.(c|cpp|cu)" )
- 	      set( hasSourceFiles TRUE )
- 	   endif( )
- 	endforeach( )
-
-    if ( hasSourceFiles )
-       add_library( ${moduleLibraryName} STATIC ${sourceFiles} ${otherFiles} )
- 	else( )
-       add_custom_target( ${moduleLibraryName} SOURCES ${sourceFiles} ${otherFiles} )  # dummy IDE target
- 	endif( )
-
-    waLBerla_register_dependency ( ${moduleName} ${ARG_DEPENDS} )
-
-    set_property( TARGET ${moduleLibraryName} PROPERTY CXX_STANDARD ${CMAKE_CXX_STANDARD} )
-
-    # This property is needed for visual studio to group modules together
-    if( WALBERLA_GROUP_PROJECTS )
-       set_property( TARGET  ${moduleLibraryName}  PROPERTY  FOLDER  "SRC" )
-    endif()
-
-    # Install rule for library
-    get_target_property( module_type ${moduleLibraryName} TYPE )
-    if( ${module_type} MATCHES LIBRARY )
-       install ( TARGETS ${moduleLibraryName}  RUNTIME DESTINATION bin
-                                               LIBRARY DESTINATION lib
-                                               ARCHIVE DESTINATION lib )
-    endif( )
-
-    # Install rule for header
-    install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
-              DESTINATION "walberla/${moduleName}"
-              FILES_MATCHING PATTERN "*.h"
-              PATTERN "*.in.h"     EXCLUDE
-              PATTERN "CMakeFiles" EXCLUDE )
-
-    # Install generated headers if necessary
-    if ( NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR} )
-        install ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
-                  DESTINATION "walberla/${moduleName}"
-                  FILES_MATCHING PATTERN "*.h"
-                  PATTERN "*.in.h"     EXCLUDE
-                  PATTERN "CMakeFiles" EXCLUDE )
-    endif()
-
-
-    # Report module statistics - which is later on written out to a json file
-    # This file is used in the doxygen documentation to display a module graph
-    #waLBerla_module_statistics ( FILES ${sourceFiles} DEPENDS ${ARG_DEPENDS} )
-
-endfunction ( waLBerla_add_module )
-#######################################################################################################################
-
-
-
-
-
 #######################################################################################################################
 #
 # Compiles an application either from given source files, or otherwise globs all files in the current folder.
@@ -205,8 +71,7 @@ function ( waLBerla_add_executable )
     endif()
 
     add_executable( ${ARG_NAME} ${sourceFiles} )
-
-    target_link_modules  ( ${ARG_NAME} ${ARG_DEPENDS}  )
+    target_link_libraries( ${ARG_NAME} ${WALBERLA_LINK_LIBRARIES_KEYWORD} ${ARG_DEPENDS} )
     target_link_libraries( ${ARG_NAME} ${WALBERLA_LINK_LIBRARIES_KEYWORD} ${SERVICE_LIBS} )
     set_property( TARGET ${ARG_NAME} PROPERTY CXX_STANDARD ${CMAKE_CXX_STANDARD} )
 
diff --git a/cmake/waLBerlaModuleDependencySystem.cmake b/cmake/waLBerlaModuleDependencySystem.cmake
index fc3ad4f7e8f6979fb867f0e9fea4f8fbe25194ba..488b635daeabf5969a8baddfe1f7b606b41b0303 100644
--- a/cmake/waLBerlaModuleDependencySystem.cmake
+++ b/cmake/waLBerlaModuleDependencySystem.cmake
@@ -59,7 +59,7 @@ function ( get_current_module_name  )
         if ( NOT ${moduleFolder} MATCHES "\\.\\./.*" )
            #append / to make cmake_path also work with one directory only
            string(REGEX REPLACE "(.*)/.*" "\\1" moduleNameOut ${moduleFolder})
-           set(moduleName ${moduleNameOut} PARENT_SCOPE)
+           set( moduleName walberla::${moduleNameOut} PARENT_SCOPE )
            return() 
         endif()
     endforeach()
@@ -173,48 +173,6 @@ endfunction ( waLBerla_resolve_dependencies )
 
 
 
-
-
-#######################################################################################################################
-#
-# Links a list of modules to a given target
-#
-# - Translates module names to library names
-# - links transitively all modules that depend on given modules
-# 
-#######################################################################################################################
-
-function ( target_link_modules target )
-
-    set ( libs  )
-    foreach ( module ${ARGN} )
-       get_module_library_name ( libraryName ${module} )
-       list( APPEND libs ${libraryName} )
-    endforeach()
-        
-    waLBerla_resolve_dependencies ( libs ${libs} )
-        
-    # The linker needs the modules in the correct order depending on their
-    # dependencies. We would have to do a topological sorting here, instead
-    # we specify all libs twice -> Could be improved -> faster linking times
-    set ( libs ${libs} ${libs} ${libs} )
-    
-    foreach ( libraryName ${libs} )
-        if( TARGET ${libraryName} ) 
-     	   get_target_property( target_type ${libraryName} TYPE ) 
-     	   if( ${target_type} MATCHES LIBRARY ) 
-     	      target_link_libraries( ${target} ${WALBERLA_LINK_LIBRARIES_KEYWORD} ${libraryName} )
-     	   endif( )                    
-     	endif( ) 
-    endforeach()
-        
-endfunction ( target_link_modules )
-#######################################################################################################################
-
-
-
-
-
 #######################################################################################################################
 # If path contains a CMakeLists.txt, path is returned
 # otherwise recursivly the parent directories are checked and returned if they contain a CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0dea809f16ff6cd4e327e8c169ad7cfd1636b89a..fd91d9190099388762e994bd9d2545361d12d0fe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # List modules here that should not be built
-#set ( excludedModules core )
+#set ( excludedModules walberla::core )
 #
 #
 #
@@ -54,3 +54,24 @@ add_subdirectory( stencil )
 add_subdirectory( timeloop )
 add_subdirectory( vtk )
 
+#### TODO: Remove with waLBerla 7.2.
+list( APPEND MODULES blockforest boundary communication core gpu domain_decomposition executiontree field gather geometry lbm lbm_generated
+      lbm_mesapd_coupling mesa_pd pde pe pe_coupling postprocessing simd sqlite stencil timeloop vtk )
+if ( WALBERLA_BUILD_WITH_FFT AND FFTW3_FOUND )
+   list( APPEND MODULES fft )
+endif ()
+if ( OPENMESH_FOUND )
+   list( APPEND MODULES mesh mesh_common )
+endif ()
+if ( WALBERLA_BUILD_WITH_PYTHON )
+   list( APPEND MODULES python_coupling )
+endif ()
+
+
+foreach ( MODULE IN LISTS MODULES )
+   add_library( ${MODULE} INTERFACE )
+   target_link_libraries( ${MODULE} INTERFACE walberla::${MODULE} )
+   set_target_properties( ${MODULE} PROPERTIES DEPRECATION "Target '${MODULE}' is deprecated and will be removed with waLBerla 7.2.
+   Please use 'walberla::${MODULE}' instead." )
+endforeach ()
+#### TODO: Remove until here
diff --git a/src/blockforest/CMakeLists.txt b/src/blockforest/CMakeLists.txt
index 0c4e8f8bcf26d9fad475aada504f7a8ff088f9a1..56f0035c062232bb33b304234f9e1a7cf6a676a8 100644
--- a/src/blockforest/CMakeLists.txt
+++ b/src/blockforest/CMakeLists.txt
@@ -4,9 +4,10 @@ mark_as_advanced( WALBERLA_BLOCKFOREST_PRIMITIVE_BLOCKID )
 
 configure_file( CMakeDefs.in.h CMakeDefs.h )
 
-add_library( blockforest )
-target_link_libraries( blockforest PUBLIC communication core domain_decomposition stencil )
-target_sources( blockforest
+add_library( walberla_blockforest )
+add_library( walberla::blockforest ALIAS walberla_blockforest )
+target_link_libraries( walberla_blockforest PUBLIC walberla::communication walberla::core walberla::domain_decomposition walberla::stencil )
+target_sources( walberla_blockforest
       PRIVATE
       AABBRefinementSelection.h
       all.h
diff --git a/src/blockforest/communication/CMakeLists.txt b/src/blockforest/communication/CMakeLists.txt
index 9038ee5c643bd17ec5741ca2870dc15589545a06..8285df1b9240f93f2b3ce3cf132b54011292dcb9 100644
--- a/src/blockforest/communication/CMakeLists.txt
+++ b/src/blockforest/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( blockforest
+target_sources( walberla_blockforest
       PRIVATE
       DirectionBasedReduceScheme.h
       LocalCommunicationMode.h
diff --git a/src/blockforest/loadbalancing/CMakeLists.txt b/src/blockforest/loadbalancing/CMakeLists.txt
index a40165a2e3d9c19cab092ff90ad96dc7df91ba77..40d01b49c55d57b99e0fcb8398a9d68ee4380b36 100644
--- a/src/blockforest/loadbalancing/CMakeLists.txt
+++ b/src/blockforest/loadbalancing/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( blockforest
+target_sources( walberla_blockforest
       PRIVATE
       BlockInfo.h
       Cartesian.h
diff --git a/src/blockforest/loadbalancing/level_determination/CMakeLists.txt b/src/blockforest/loadbalancing/level_determination/CMakeLists.txt
index 34358b29daac9bd471955ceeabc0c309792e530e..31f3dfd0c89db282976b9899fedb678aef3209e1 100644
--- a/src/blockforest/loadbalancing/level_determination/CMakeLists.txt
+++ b/src/blockforest/loadbalancing/level_determination/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( blockforest
+target_sources( walberla_blockforest
     PRIVATE
     MinMaxLevelDetermination.h
     MinMaxLevelDetermination.cpp     
diff --git a/src/blockforest/loadbalancing/weight_assignment/CMakeLists.txt b/src/blockforest/loadbalancing/weight_assignment/CMakeLists.txt
index fd84f74ceeb8512fcdc8b4982e259bd5bc5a7702..cfe0de336599ef7ed73405a8c6ef881c8e0fc4d2 100644
--- a/src/blockforest/loadbalancing/weight_assignment/CMakeLists.txt
+++ b/src/blockforest/loadbalancing/weight_assignment/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( blockforest
+target_sources( walberla_blockforest
     PRIVATE
     WeightAssignmentFunctor.h
     MetisAssignmentFunctor.h     
diff --git a/src/boundary/CMakeLists.txt b/src/boundary/CMakeLists.txt
index 7da3ebfe360dd08ec1c60035e47944a078285139..770c907c519c857a18297fdfabb7fd7931353e13 100644
--- a/src/boundary/CMakeLists.txt
+++ b/src/boundary/CMakeLists.txt
@@ -5,9 +5,10 @@
 ###################################################################################################
 
 
-add_library( boundary )
-target_link_libraries( boundary PUBLIC core communication domain_decomposition field stencil )
-target_sources( boundary
+add_library( walberla_boundary )
+add_library( walberla::boundary ALIAS walberla_boundary )
+target_link_libraries( walberla_boundary PUBLIC walberla::core walberla::communication walberla::domain_decomposition walberla::field walberla::stencil )
+target_sources( walberla_boundary
       PRIVATE
       BoundaryHandling.h
       Boundary.h
diff --git a/src/boundary/communication/CMakeLists.txt b/src/boundary/communication/CMakeLists.txt
index 63d92d9db7fc2547845737fa5279844b3db2a4b9..4836bc2867ff753cfef17ca401a9b431ff9b6f2b 100644
--- a/src/boundary/communication/CMakeLists.txt
+++ b/src/boundary/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( boundary
+target_sources( walberla_boundary
     PRIVATE
     HandlingPackInfo.h     
     )
diff --git a/src/communication/CMakeLists.txt b/src/communication/CMakeLists.txt
index 82b1a4cc2e6505c918f7f7512804973827f67f41..04a5678a5281f9b84b3d09fc08c4b0dd88def517 100644
--- a/src/communication/CMakeLists.txt
+++ b/src/communication/CMakeLists.txt
@@ -4,13 +4,14 @@
 #
 ###################################################################################################
 
-add_library( communication INTERFACE )
-target_sources( communication
+add_library( walberla_communication INTERFACE )
+add_library( walberla::communication ALIAS walberla_communication )
+target_sources( walberla_communication
       INTERFACE
       ReducePackInfo.h
       UniformMPIDatatypeInfo.h
       UniformPackInfo.h
       )
-target_link_libraries( communication INTERFACE core domain_decomposition stencil )
+target_link_libraries( walberla_communication INTERFACE walberla::core walberla::domain_decomposition walberla::stencil )
 
 ###################################################################################################                        
\ No newline at end of file
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 1cb6a5137ee73833b39d0594215326e855decb60..230d68c5f785657b587780874e53b6d06c057ca2 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -6,93 +6,94 @@
 ############################################################################################################################
 
 
-include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REFSPEC WALBERLA_GIT_SHA1)
+include( GetGitRevisionDescription )
+get_git_head_revision( GIT_REFSPEC WALBERLA_GIT_SHA1 )
 
 string( TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPER )
 
-set      ( WALBERLA_BUILD_TYPE      ${CMAKE_BUILD_TYPE} )
-set      ( WALBERLA_COMPILER_FLAGS  "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}} ${CMAKE_CXX_FLAGS}" )
-string   ( REPLACE "\"" "\\\"" WALBERLA_COMPILER_FLAGS ${WALBERLA_COMPILER_FLAGS} )
+set( WALBERLA_BUILD_TYPE ${CMAKE_BUILD_TYPE} )
+set( WALBERLA_COMPILER_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}} ${CMAKE_CXX_FLAGS}" )
+string( REPLACE "\"" "\\\"" WALBERLA_COMPILER_FLAGS ${WALBERLA_COMPILER_FLAGS} )
 site_name( WALBERLA_BUILD_MACHINE )
 
 # Generate file with compile options, and add install rule for it
-configure_file ( waLBerlaBuildInfo.in.cpp 
-                 waLBerlaBuildInfo.cpp    )
-                 
+configure_file( waLBerlaBuildInfo.in.cpp
+      waLBerlaBuildInfo.cpp )
+
 ############################################################################################################################
 
 include( math/math.cmake )
 include( logging/logging.cmake )
 
-add_library( core )
-if( MPI_FOUND )
-   target_link_libraries( core PUBLIC MPI::MPI_CXX )
-endif()
+add_library( walberla_core )
+add_library( walberla::core ALIAS walberla_core )
+if ( MPI_FOUND )
+   target_link_libraries( walberla_core PUBLIC MPI::MPI_CXX )
+endif ()
 
 if ( WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT )
-    # Actual support for float16 is available only since C++23
-    #   before is_arithmetic and is_floating_point evaluated to false,
-    #   also many STL functions are compatible with float16 only since C++23.
-    # Which features are actually supported depend on the compiler
-    target_compile_features(core PUBLIC cxx_std_23)
+   # Actual support for float16 is available only since C++23
+   #   before is_arithmetic and is_floating_point evaluated to false,
+   #   also many STL functions are compatible with float16 only since C++23.
+   # Which features are actually supported depend on the compiler
+   target_compile_features( walberla_core PUBLIC cxx_std_23 )
 endif ()
 
-target_link_libraries( core PUBLIC ${SERVICE_LIBS} )
-target_include_directories( core PUBLIC ${walberla_SOURCE_DIR}/src/ ${walberla_BINARY_DIR}/src/ )
-target_sources( core
+target_link_libraries( walberla_core PUBLIC ${SERVICE_LIBS} )
+target_include_directories( walberla_core PUBLIC ${walberla_SOURCE_DIR}/src/ ${walberla_BINARY_DIR}/src/ )
+target_sources( walberla_core
       PRIVATE
-         Abort.cpp
-         Conversion.cpp
-         DataTypes.cpp
-         Environment.cpp
-         GetPID.cpp
-         Hostname.cpp
-         MemoryUsage.cpp
-         RandomUUID.cpp
-         Sleep.cpp
-         waLBerlaBuildInfo.cpp
-         Abort.h
-         AllSet.h
-         Any.h
-         Array.h
-         ConcatIterator.h
-         Conversion.h
-         DataTypes.h
-         EndianIndependentSerialization.h
-         Environment.h
-         Filesystem.h
-         Format.hpp
-         FunctionTraits.h
-         GetPID.h
-         Hostname.h
-         Macros.h
-         MemoryUsage.h
-         NonCopyable.h
-         NonCreateable.h
-         OpenMP.h
-         Optional.h
-         RandomUUID.h
-         Regex.h
-         Sanitizer.h
-         Set.h
-         SharedFunctor.h
-         Sleep.h
-         STLIO.h
-         stringToNum.h
-         StringUtility.h
-         StringUtility.impl.h
-         typeToString.h
-         UniqueID.h
-         Variant.h
-         VectorTrait.h
-         waLBerlaBuildInfo.h
-      )
+      Abort.cpp
+      Conversion.cpp
+      DataTypes.cpp
+      Environment.cpp
+      GetPID.cpp
+      Hostname.cpp
+      MemoryUsage.cpp
+      RandomUUID.cpp
+      Sleep.cpp
+      waLBerlaBuildInfo.cpp
+      Abort.h
+      AllSet.h
+      Any.h
+      Array.h
+      ConcatIterator.h
+      Conversion.h
+      DataTypes.h
+      EndianIndependentSerialization.h
+      Environment.h
+      Filesystem.h
+      Format.hpp
+      FunctionTraits.h
+      GetPID.h
+      Hostname.h
+      Macros.h
+      MemoryUsage.h
+      NonCopyable.h
+      NonCreateable.h
+      OpenMP.h
+      Optional.h
+      RandomUUID.h
+      Regex.h
+      Sanitizer.h
+      Set.h
+      SharedFunctor.h
+      Sleep.h
+      STLIO.h
+      stringToNum.h
+      StringUtility.h
+      StringUtility.impl.h
+      typeToString.h
+      UniqueID.h
+      Variant.h
+      VectorTrait.h
+      waLBerlaBuildInfo.h
+)
 
 add_subdirectory( cell )
 add_subdirectory( debug )
 add_subdirectory( mpi )
-add_subdirectory( logging)
+add_subdirectory( logging )
 add_subdirectory( load_balancing )
 add_subdirectory( config )
 add_subdirectory( math )
diff --git a/src/core/cell/CMakeLists.txt b/src/core/cell/CMakeLists.txt
index fbc636d7c088ce46968d23034a0889b4ea587c66..762ebbf1745849f2922e5e0fbd2641fa2b7bf688 100644
--- a/src/core/cell/CMakeLists.txt
+++ b/src/core/cell/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( core
+target_sources( walberla_core
    PRIVATE
       Cell.h
       CellArray.h
diff --git a/src/core/config/CMakeLists.txt b/src/core/config/CMakeLists.txt
index ea80d2ac43cdbd24c70a398b92578a8eb9f09861..1edb0f2981608a954a7398e684ec78bc7dd4c512 100644
--- a/src/core/config/CMakeLists.txt
+++ b/src/core/config/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( core
+target_sources( walberla_core
       PRIVATE
       Config.cpp
       Config.h
diff --git a/src/core/debug/CMakeLists.txt b/src/core/debug/CMakeLists.txt
index 1d3a9743a757725614dadcb54e51d8b65afe65cd..d0a0ec29255de7bd04eb00eeeeab6fb3ffae1092 100644
--- a/src/core/debug/CMakeLists.txt
+++ b/src/core/debug/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(core
+target_sources( walberla_core
       PRIVATE
       CMakeLists.txt
       CheckFunctions.cpp
diff --git a/src/core/grid_generator/CMakeLists.txt b/src/core/grid_generator/CMakeLists.txt
index 4570ae56fb899e473e0f2283535188b7f9d7bad7..351e1b44680eeaf8fcbe21589f1b9974238639c1 100644
--- a/src/core/grid_generator/CMakeLists.txt
+++ b/src/core/grid_generator/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( core
+target_sources( walberla_core
       PRIVATE
          HCPIterator.cpp
          HCPIterator.h
diff --git a/src/core/load_balancing/CMakeLists.txt b/src/core/load_balancing/CMakeLists.txt
index 17a1aea2362857b7af2a332ec63ad44b37b46340..351329573a332415436fe951d6779adf689c650e 100644
--- a/src/core/load_balancing/CMakeLists.txt
+++ b/src/core/load_balancing/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( core
+target_sources( walberla_core
       PRIVATE
       MetisWrapper.h
       ParMetisWrapper.h
diff --git a/src/core/logging/CMakeLists.txt b/src/core/logging/CMakeLists.txt
index 563e57263ad813d04f1c66ac7c20b84a248e7664..b663f35f5157ea11c6a3e9ef0200aa5d7690e1b0 100644
--- a/src/core/logging/CMakeLists.txt
+++ b/src/core/logging/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( core
+target_sources( walberla_core
       PRIVATE
       Initialization.cpp
       Initialization.h
diff --git a/src/core/math/CMakeLists.txt b/src/core/math/CMakeLists.txt
index 5f8733c9ae7fbcf9f8f31a50292e34c9b2c6495f..3c09c74c5303a4fd5b7717a8896c4854e3daf866 100644
--- a/src/core/math/CMakeLists.txt
+++ b/src/core/math/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( core
+target_sources( walberla_core
       PRIVATE
       AABB.h
       AABBFwd.h
diff --git a/src/core/mpi/CMakeLists.txt b/src/core/mpi/CMakeLists.txt
index 2987e28c266bce6552659cce89f5ef9546927a76..739677b3ea0805449db8fc22fb1209673aaa972e 100644
--- a/src/core/mpi/CMakeLists.txt
+++ b/src/core/mpi/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( core
+target_sources( walberla_core
       PRIVATE
       Broadcast.h
       BufferDataTypeExtensions.h
diff --git a/src/core/timing/CMakeLists.txt b/src/core/timing/CMakeLists.txt
index 1de08d9623e95fc186687d355cf07e1336a70548..974d54d88d41bde9f88e4f24eb0dc7b7050c2ffa 100644
--- a/src/core/timing/CMakeLists.txt
+++ b/src/core/timing/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( core
+target_sources( walberla_core
       PRIVATE
          CpuPolicy.h
          ReduceType.h
diff --git a/src/domain_decomposition/CMakeLists.txt b/src/domain_decomposition/CMakeLists.txt
index 548c73ed4cb91812237f6c284ef0b0d1c665f82b..12514b7360aeb0ab0eade8f3e0f5e5a117fd8664 100644
--- a/src/domain_decomposition/CMakeLists.txt
+++ b/src/domain_decomposition/CMakeLists.txt
@@ -4,9 +4,10 @@
 #
 ###################################################################################################
 
-add_library( domain_decomposition )
-target_link_libraries( domain_decomposition PUBLIC core )
-target_sources( domain_decomposition
+add_library( walberla_domain_decomposition )
+add_library( walberla::domain_decomposition ALIAS walberla_domain_decomposition )
+target_link_libraries( walberla_domain_decomposition PUBLIC walberla::core )
+target_sources( walberla_domain_decomposition
       PRIVATE
       BlockCounter.h
       BlockDataHandling.h
diff --git a/src/executiontree/CMakeLists.txt b/src/executiontree/CMakeLists.txt
index 8d7e31419ac497911a7a3ef462e7710b0b64eac1..8b7c1f387b717b876f8b75db75a140b62efd474d 100644
--- a/src/executiontree/CMakeLists.txt
+++ b/src/executiontree/CMakeLists.txt
@@ -4,9 +4,10 @@
 #
 ###################################################################################################
 
-add_library( executiontree )
-target_link_libraries( executiontree PUBLIC core domain_decomposition timeloop )
-target_sources( executiontree
+add_library( walberla_executiontree )
+add_library( walberla::executiontree ALIAS walberla_executiontree )
+target_link_libraries( walberla_executiontree PUBLIC walberla::core walberla::domain_decomposition walberla::timeloop )
+target_sources( walberla_executiontree
       PRIVATE
       ExecutionTreeSweep.h
       ExecutionTree.cpp
diff --git a/src/fft/CMakeLists.txt b/src/fft/CMakeLists.txt
index 641010004b73855fd0fd4d2d47e247cef22afcb3..6a9c17cd286dd2d2ad358e7fd590f506b5f3d1d1 100644
--- a/src/fft/CMakeLists.txt
+++ b/src/fft/CMakeLists.txt
@@ -4,9 +4,10 @@
 #
 ###################################################################################################
 
-add_library( fft )
-target_link_libraries( fft PUBLIC core blockforest field )
-target_sources( fft
+add_library( walberla_fft )
+add_library( walberla::fft ALIAS walberla_fft )
+target_link_libraries( walberla_fft PUBLIC walberla::core walberla::blockforest walberla::field )
+target_sources( walberla_fft
       PRIVATE
       Fft.h
       Fft.cpp
diff --git a/src/field/CMakeLists.txt b/src/field/CMakeLists.txt
index 6ef0a5835f537082069fad394787375e2cad1e0f..c6b03fd8f1e0171adc058fba6bf2ded2d692a9e0 100644
--- a/src/field/CMakeLists.txt
+++ b/src/field/CMakeLists.txt
@@ -1,19 +1,20 @@
 
 ###################################################################################################
 #
-# Module field ( lattice data structure )
+# Module walberla::field ( lattice data structure )
 #
 ###################################################################################################
 
 OPTION ( WALBERLA_FIELD_MONITORED_ACCESS "Enable (slow) monitoring mechanism for Fields" )
-OPTION ( WALBERLA_THREAD_SAFE_FIELD_ALLOCATION "Enables/Disables thread-safe field allocation (do NOT disable if you are not absolutely sure what you are doing!)" ON )
+OPTION( WALBERLA_THREAD_SAFE_FIELD_ALLOCATION "Enables/Disables thread-safe walberla::field allocation (do NOT disable if you are not absolutely sure what you are doing!)" ON )
 mark_as_advanced( WALBERLA_THREAD_SAFE_FIELD_ALLOCATION )
 
 configure_file ( CMakeDefs.in.h  CMakeDefs.h )
 
-add_library( field )
-target_link_libraries( field PUBLIC blockforest core communication domain_decomposition stencil vtk )
-target_sources( field
+add_library( walberla_field )
+add_library( walberla::field ALIAS walberla_field )
+target_link_libraries( walberla_field PUBLIC walberla::blockforest walberla::core walberla::communication walberla::domain_decomposition walberla::stencil walberla::vtk )
+target_sources( walberla_field
       PRIVATE
       SwapableCompare.h
       AccuracyEvaluation.h
diff --git a/src/field/adaptors/CMakeLists.txt b/src/field/adaptors/CMakeLists.txt
index b139d0e1499bb28eb692ceebdbdfec7b744d2694..660f8f5a5ea4f37c034d8cd6372f69be931a503a 100644
--- a/src/field/adaptors/CMakeLists.txt
+++ b/src/field/adaptors/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     VectorFieldAccessor.h
     GhostLayerFieldAdaptor.h
diff --git a/src/field/allocation/CMakeLists.txt b/src/field/allocation/CMakeLists.txt
index d257a62cc39dffadc96ab91e5679db7f85bf2a2b..5b6eee72335b9ccdd91715201d5200e96f3a7045 100644
--- a/src/field/allocation/CMakeLists.txt
+++ b/src/field/allocation/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     AlignedMalloc.cpp
     AlignedMalloc.h
diff --git a/src/field/blockforest/CMakeLists.txt b/src/field/blockforest/CMakeLists.txt
index cb64f75c12f7eaca6bbc829a49cac051a5b64524..5b3afea2fb430c4c6f01fb836876b2d0f1d2740a 100644
--- a/src/field/blockforest/CMakeLists.txt
+++ b/src/field/blockforest/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     GradientRefinement.h
     BlockDataHandling.h     
diff --git a/src/field/communication/CMakeLists.txt b/src/field/communication/CMakeLists.txt
index 005bda8d2ee0af014085cf1e5fa6be6cb19a0fb7..81e8c3e3bca1fc8204f1cf5074d6a43b6ffdd7c8 100644
--- a/src/field/communication/CMakeLists.txt
+++ b/src/field/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     MPIDatatypes.impl.h
     StencilRestrictedMPIDatatypeInfo.h
diff --git a/src/field/distributors/CMakeLists.txt b/src/field/distributors/CMakeLists.txt
index b74a8d3f2241f124ea3459d103e95a993f5e41ab..7ba086a1e4c4186f7705ec9f3812be0f7aa831df 100644
--- a/src/field/distributors/CMakeLists.txt
+++ b/src/field/distributors/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     NearestNeighborDistributor.h
     KernelDistributor.h
diff --git a/src/field/doc/CMakeLists.txt b/src/field/doc/CMakeLists.txt
index 4f2d83c38de36e27908e50b8d41b8accc46b41fc..f884c246debb666084a112f5a9546883f66477e9 100644
--- a/src/field/doc/CMakeLists.txt
+++ b/src/field/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
          
     )  
diff --git a/src/field/interpolators/CMakeLists.txt b/src/field/interpolators/CMakeLists.txt
index 2e78a0e25d55446a19ac538dca647e73812a0a7e..289689113b522e6229517ae0a9334c57eea5a5ab 100644
--- a/src/field/interpolators/CMakeLists.txt
+++ b/src/field/interpolators/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     NearestNeighborFieldInterpolator.h
     TrilinearInterpolator.h
diff --git a/src/field/iterators/CMakeLists.txt b/src/field/iterators/CMakeLists.txt
index 696f02855b086eade14b9356439447b66017b368..c66e1215b285eb8f3c3f2b6eda69926a7ace2fbd 100644
--- a/src/field/iterators/CMakeLists.txt
+++ b/src/field/iterators/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     FieldIterator.h
     IteratorMacros.h
diff --git a/src/field/refinement/CMakeLists.txt b/src/field/refinement/CMakeLists.txt
index b88cbdabe00ad506c7da1c76ebc1691bff42429b..a4603cc6074ab8175abd447cf1eaf85679220273 100644
--- a/src/field/refinement/CMakeLists.txt
+++ b/src/field/refinement/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     PackInfo.h     
     )
diff --git a/src/field/vtk/CMakeLists.txt b/src/field/vtk/CMakeLists.txt
index 8fbb8e8038676fe071f59c838f08d428d209b68e..9da76145c10410a0af24fb1d93b8a323e004455c 100644
--- a/src/field/vtk/CMakeLists.txt
+++ b/src/field/vtk/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( field
+target_sources( walberla_field
     PRIVATE
     FlagFieldCellFilter.h
     FlagFieldMapping.h
diff --git a/src/gather/CMakeLists.txt b/src/gather/CMakeLists.txt
index 19cdf86abbd3edf1cffe005f95a5a11aa9465b04..4f1d5e9500097a1848ffd4c9baa83441bcd8beb7 100644
--- a/src/gather/CMakeLists.txt
+++ b/src/gather/CMakeLists.txt
@@ -1,12 +1,13 @@
 ###################################################################################################
 #
-# Module gather ( all-to-one communication for output )
+# Module gather ( all-to-one walberla::communication    for output )
 #
 ###################################################################################################
 
-add_library( gather )
-target_link_libraries( gather PUBLIC core domain_decomposition field )
-target_sources( gather
+add_library( walberla_gather )
+add_library( walberla::gather ALIAS walberla_gather )
+target_link_libraries( walberla_gather PUBLIC walberla::core walberla::domain_decomposition walberla::field )
+target_sources( walberla_gather
       PRIVATE
       CellGatherPackInfo.h
       FileGatherScheme.cpp
diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt
index 43972ee5fdd81a71939328bd69bfe7b5e9a08686..2344ed8d16a8d411c0f28b2ec8998943b625feeb 100644
--- a/src/geometry/CMakeLists.txt
+++ b/src/geometry/CMakeLists.txt
@@ -4,14 +4,15 @@
 #
 ###################################################################################################
 
-add_library( geometry )
-target_sources( geometry
+add_library( walberla_geometry )
+add_library( walberla::geometry ALIAS walberla_geometry )
+target_sources( walberla_geometry
       PRIVATE
       GeometricalFunctions.h
       InitBoundaryHandling.h
       GeometricalFunctions.cpp
       )
-target_link_libraries(geometry PUBLIC core domain_decomposition boundary field stencil PRIVATE lodepng)
+target_link_libraries( walberla_geometry PUBLIC walberla::core walberla::domain_decomposition walberla::boundary walberla::field walberla::stencil PRIVATE lodepng )
 
 add_subdirectory( bodies )
 add_subdirectory( containment_octree )
diff --git a/src/geometry/bodies/CMakeLists.txt b/src/geometry/bodies/CMakeLists.txt
index 9a1194d4327a09c61cb9ad57be409ba12e4b9f82..304b12e3141877a95a268ab4f3a27066d82da6ce 100644
--- a/src/geometry/bodies/CMakeLists.txt
+++ b/src/geometry/bodies/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( geometry
+target_sources( walberla_geometry
     PRIVATE
     Torus.h
     BodyFromConfig.h
diff --git a/src/geometry/containment_octree/CMakeLists.txt b/src/geometry/containment_octree/CMakeLists.txt
index 5601695723e17a3542f2444d55db92238aa6c94c..c327d7580a3906d074f4a9188d7a27bec3a2c8aa 100644
--- a/src/geometry/containment_octree/CMakeLists.txt
+++ b/src/geometry/containment_octree/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( geometry
+target_sources( walberla_geometry
     PRIVATE
     InsideLeafNode.h
     OutsideLeafNode.h
diff --git a/src/geometry/initializer/CMakeLists.txt b/src/geometry/initializer/CMakeLists.txt
index a6af8b35115c8e6dfed8e291a80e6fc0fe96f67a..218e3cec76f9263b78d2ec6641981a1abb2f392e 100644
--- a/src/geometry/initializer/CMakeLists.txt
+++ b/src/geometry/initializer/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( geometry
+target_sources( walberla_geometry
     PRIVATE
     BoundaryFromCellInterval.h
     BoundaryFromBody.impl.h
diff --git a/src/geometry/mesh/CMakeLists.txt b/src/geometry/mesh/CMakeLists.txt
index 4979f5fac2c693fa56b791951c9a8501f3df6433..425c35d4be3c98db1a7b074070b2c57ea12ab483 100644
--- a/src/geometry/mesh/CMakeLists.txt
+++ b/src/geometry/mesh/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( geometry
+target_sources( walberla_geometry
     PRIVATE
     TriangleMeshComm.h
     TriangleMeshIO.h
diff --git a/src/geometry/structured/CMakeLists.txt b/src/geometry/structured/CMakeLists.txt
index 0b2c842aab082ad24a356cced9149c77798cc344..5171aca7ff36e40cfb6ba8a8a47318e28683c61e 100644
--- a/src/geometry/structured/CMakeLists.txt
+++ b/src/geometry/structured/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( geometry
+target_sources( walberla_geometry
     PRIVATE
     RGBAImage.h
     RGBAImage.cpp
diff --git a/src/gpu/CMakeLists.txt b/src/gpu/CMakeLists.txt
index e870cdb5de4b783d1866fce23297e21f6bedff86..263650bbc0871c878a7c0e5c58d5f0d8d72f39d6 100644
--- a/src/gpu/CMakeLists.txt
+++ b/src/gpu/CMakeLists.txt
@@ -4,11 +4,12 @@
 #
 ###################################################################################################
 
-add_library( gpu )
-target_link_libraries( gpu PUBLIC blockforest core communication domain_decomposition executiontree field stencil lbm )
+add_library( walberla_gpu )
+add_library( walberla::gpu ALIAS walberla_gpu )
+target_link_libraries( walberla_gpu PUBLIC walberla::blockforest walberla::core walberla::communication walberla::domain_decomposition walberla::executiontree walberla::field walberla::stencil walberla::lbm )
 
 # sources for HIP and CUDA
-target_sources( gpu
+target_sources( walberla_gpu
       PRIVATE
       AlignedAllocation.h
       AddGPUFieldToStorage.h
@@ -44,7 +45,7 @@ target_sources( gpu
 
 # sources only for CUDA
 if (WALBERLA_BUILD_WITH_CUDA)
-target_sources( gpu
+   target_sources( walberla_gpu
         PRIVATE
         NVTX.h
         )
diff --git a/src/gpu/communication/CMakeLists.txt b/src/gpu/communication/CMakeLists.txt
index 7b9c0cced315353be228779dc3e4dfc96764efc7..849c356d6d07e08f13753b5d045251dbe8723190 100644
--- a/src/gpu/communication/CMakeLists.txt
+++ b/src/gpu/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( gpu
+target_sources( walberla_gpu
     PRIVATE
     MemcpyPackInfo.h
     UniformGPUScheme.impl.h
diff --git a/src/gpu/lbm/CMakeLists.txt b/src/gpu/lbm/CMakeLists.txt
index ae7f60ac849311c4b01a7290b7c0b57d31f06ffe..35e8c10fa743b47ad2b264b269cde4607abf2a96 100644
--- a/src/gpu/lbm/CMakeLists.txt
+++ b/src/gpu/lbm/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( gpu
+target_sources( walberla_gpu
     PRIVATE
     CombinedInPlaceGpuPackInfo.h     
     )
diff --git a/src/gpu/sweeps/CMakeLists.txt b/src/gpu/sweeps/CMakeLists.txt
index 2126d798ceaa54823dfced6ad447039f0121f4b2..6c204b1f1010ef87cf9bfd05cbf527b8a7531b72 100644
--- a/src/gpu/sweeps/CMakeLists.txt
+++ b/src/gpu/sweeps/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( gpu
+target_sources( walberla_gpu
     PRIVATE
     GPUSweepBase.h     
     )
diff --git a/src/lbm/CMakeLists.txt b/src/lbm/CMakeLists.txt
index 3e25741538b33d957116627c73edc84f21ecab68..808223940e76273672a63cd12ab9907b77a75cd1 100644
--- a/src/lbm/CMakeLists.txt
+++ b/src/lbm/CMakeLists.txt
@@ -4,21 +4,22 @@
 #
 ###################################################################################################
 
-add_library( lbm )
-target_link_libraries( lbm
+add_library( walberla_lbm )
+add_library( walberla::lbm ALIAS walberla_lbm )
+target_link_libraries( walberla_lbm
       PUBLIC
-      blockforest
-      boundary
-      communication
-      core
-      domain_decomposition
-      field
-      geometry
-      stencil
-      timeloop
-      vtk
+      walberla::blockforest
+      walberla::boundary
+      walberla::communication
+      walberla::core
+      walberla::domain_decomposition
+      walberla::field
+      walberla::geometry
+      walberla::stencil
+      walberla::timeloop
+      walberla::vtk
       )
-target_sources( lbm
+target_sources( walberla_lbm
       PRIVATE
       PerformanceEvaluation.h
       BlockForestEvaluation.h
diff --git a/src/lbm/blockforest/CMakeLists.txt b/src/lbm/blockforest/CMakeLists.txt
index 2fa5d1378bce5fb4bc57f09a0f66426528094ae6..0c06e6f667b93819d98dc7dac881416d68f90a47 100644
--- a/src/lbm/blockforest/CMakeLists.txt
+++ b/src/lbm/blockforest/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     PostProcessing.h     
     )
diff --git a/src/lbm/blockforest/communication/CMakeLists.txt b/src/lbm/blockforest/communication/CMakeLists.txt
index a39e2f18741edaabe67ef1f946974f625f102bc6..a22e6323e456e44eb6297e8e0a5265f6c4a33e35 100644
--- a/src/lbm/blockforest/communication/CMakeLists.txt
+++ b/src/lbm/blockforest/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
         PRIVATE
         SimpleCommunication.h
         UpdateSecondGhostLayer.h
diff --git a/src/lbm/boundary/CMakeLists.txt b/src/lbm/boundary/CMakeLists.txt
index 9916174cf0736872d3339e0382c783f4325fb9a6..1ebcdf43b32461cecfd7126efddeb5c6c56ddab4 100644
--- a/src/lbm/boundary/CMakeLists.txt
+++ b/src/lbm/boundary/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     SimplePressure.h
     SimpleUBB.h
diff --git a/src/lbm/boundary/factories/CMakeLists.txt b/src/lbm/boundary/factories/CMakeLists.txt
index f15a18fd203ea20c8736cf5566ee29616c710597..153f4935914e95a901b8a93a4b78aff96e38bf7c 100644
--- a/src/lbm/boundary/factories/CMakeLists.txt
+++ b/src/lbm/boundary/factories/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     DefaultDiffusionBoundaryHandling.h
     DefaultBoundaryHandling.h
diff --git a/src/lbm/communication/CMakeLists.txt b/src/lbm/communication/CMakeLists.txt
index daac664f2d929c8a106f83b9cb85c1608e425976..41b4e126564c00cce136226e8b57a88f2daff39e 100644
--- a/src/lbm/communication/CMakeLists.txt
+++ b/src/lbm/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     PdfFieldMPIDatatypeInfo.h
     SparsePdfFieldPackInfo.h
diff --git a/src/lbm/cumulant/CMakeLists.txt b/src/lbm/cumulant/CMakeLists.txt
index f04767f95fc231cc4431cd7fb34a5a67a58e5f01..ac5887f8c9a2ab823b3fc80eb3f7fb4dec346174 100644
--- a/src/lbm/cumulant/CMakeLists.txt
+++ b/src/lbm/cumulant/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     CellwiseSweep.impl.h     
     )
diff --git a/src/lbm/evaluations/CMakeLists.txt b/src/lbm/evaluations/CMakeLists.txt
index 1e014fb72a9cfa5777058f80d9c65c530ff851c5..b6c8e2f402b41087620b6755006af7074e41ba0c 100644
--- a/src/lbm/evaluations/CMakeLists.txt
+++ b/src/lbm/evaluations/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     Permeability.impl.h
     Permeability.h     
diff --git a/src/lbm/field/CMakeLists.txt b/src/lbm/field/CMakeLists.txt
index 706196f4da0787792c1740faf98b71a0ae6890f1..d242056f9b4605226442cd93e323b8396d14cd0c 100644
--- a/src/lbm/field/CMakeLists.txt
+++ b/src/lbm/field/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     MomentumDensity.h
     MacroscopicValueCalculation.h
diff --git a/src/lbm/field/initializer/CMakeLists.txt b/src/lbm/field/initializer/CMakeLists.txt
index 4404f566cee2a51c6e1ba3718e853bafb39c75b5..ba190f8c1d1a2c03fd984b2893675acaf88c697b 100644
--- a/src/lbm/field/initializer/CMakeLists.txt
+++ b/src/lbm/field/initializer/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     PdfFieldInitializer.h
     ExprSystemInitFunction.h
diff --git a/src/lbm/free_surface/CMakeLists.txt b/src/lbm/free_surface/CMakeLists.txt
index 54b500251a5be6f3e48f70addb53a4e5fd090a69..131c8debca433f66b92ed205bf04e736771fcaab 100644
--- a/src/lbm/free_surface/CMakeLists.txt
+++ b/src/lbm/free_surface/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
         PRIVATE
         BlockStateDetectorSweep.h
         FlagDefinitions.h
diff --git a/src/lbm/free_surface/boundary/CMakeLists.txt b/src/lbm/free_surface/boundary/CMakeLists.txt
index 9b3f1195a0381d0d6cbf3137539a305863dde5d1..cf52dab51741c5316080415611b0d6aa0de5a906 100644
--- a/src/lbm/free_surface/boundary/CMakeLists.txt
+++ b/src/lbm/free_surface/boundary/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
         PRIVATE
         FreeSurfaceBoundaryHandling.h
         FreeSurfaceBoundaryHandling.impl.h
diff --git a/src/lbm/free_surface/bubble_model/CMakeLists.txt b/src/lbm/free_surface/bubble_model/CMakeLists.txt
index 712930e3823899d801b4b1b60b16cbdf4cf9b478..07cffed3e86ccd3769084a2da413d82ddbcff9ab 100644
--- a/src/lbm/free_surface/bubble_model/CMakeLists.txt
+++ b/src/lbm/free_surface/bubble_model/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
         PRIVATE
         Bubble.h
         BubbleDefinitions.h
diff --git a/src/lbm/free_surface/dynamics/CMakeLists.txt b/src/lbm/free_surface/dynamics/CMakeLists.txt
index 2d7145db359452da43a00ba17724a461cffe44c5..f2e52bb5b7ca4dc7af48b1e7b1a62e417ccaff6f 100644
--- a/src/lbm/free_surface/dynamics/CMakeLists.txt
+++ b/src/lbm/free_surface/dynamics/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
         PRIVATE
         CellConversionSweep.h
         ConversionFlagsResetSweep.h
diff --git a/src/lbm/free_surface/dynamics/functionality/CMakeLists.txt b/src/lbm/free_surface/dynamics/functionality/CMakeLists.txt
index 357412052a8cdfc0d8edab2f9a71cd2e3144dba7..5d3ec6452a72403f8b63f481d122f217d668885a 100644
--- a/src/lbm/free_surface/dynamics/functionality/CMakeLists.txt
+++ b/src/lbm/free_surface/dynamics/functionality/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
         PRIVATE
         AdvectMass.h
         FindInterfaceCellConversion.h
diff --git a/src/lbm/free_surface/surface_geometry/CMakeLists.txt b/src/lbm/free_surface/surface_geometry/CMakeLists.txt
index 42fb177b77f77d2fa745866c7f5ef2cb677ea00c..fca49e2cad60e0d193d1de4f942f91cc6d1e8f12 100644
--- a/src/lbm/free_surface/surface_geometry/CMakeLists.txt
+++ b/src/lbm/free_surface/surface_geometry/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
         PRIVATE
         ContactAngle.h
         CurvatureModel.h
diff --git a/src/lbm/geometry/CMakeLists.txt b/src/lbm/geometry/CMakeLists.txt
index a5c3af8d693905798f29aea67480af7241db829f..e219c773973825acd6e08a4ee9b571f1fd274172 100644
--- a/src/lbm/geometry/CMakeLists.txt
+++ b/src/lbm/geometry/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     IntersectionRatio.h
     IntersectionRatio.impl.h
diff --git a/src/lbm/geometry/initializer/CMakeLists.txt b/src/lbm/geometry/initializer/CMakeLists.txt
index 4dcc7bc2fef01465b6117a518e4f042ce2edbd58..8d587310d5ff9253504a02db70f73de25a75b772 100644
--- a/src/lbm/geometry/initializer/CMakeLists.txt
+++ b/src/lbm/geometry/initializer/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     PoiseuilleInitializer.impl.h
     PoiseuilleInitializer.h     
diff --git a/src/lbm/inplace_streaming/CMakeLists.txt b/src/lbm/inplace_streaming/CMakeLists.txt
index 6784a9a1a9b686897764debbd631c3b42a05bda5..61c87586b5bf68fc5d3638b4704285fc4f7bd487 100644
--- a/src/lbm/inplace_streaming/CMakeLists.txt
+++ b/src/lbm/inplace_streaming/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     TimestepTracker.h     
     )
diff --git a/src/lbm/lattice_model/CMakeLists.txt b/src/lbm/lattice_model/CMakeLists.txt
index 58f62308c907bc18b4c37887e0e8b76cf7771114..44ef969c476bf424f03255195a961ce79d8d7ff8 100644
--- a/src/lbm/lattice_model/CMakeLists.txt
+++ b/src/lbm/lattice_model/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     CollisionModel.cpp
     D3Q27.h
diff --git a/src/lbm/mrt/CMakeLists.txt b/src/lbm/mrt/CMakeLists.txt
index 6dc8a16b5e40cb9d0a807441e945dbd67d83d54f..40bfcad0e97c06fac8b108162ba9ada65760a194 100644
--- a/src/lbm/mrt/CMakeLists.txt
+++ b/src/lbm/mrt/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     SplitPureSweep.impl.h
     SplitSweep.impl.h
diff --git a/src/lbm/mrt/cell_operations/CMakeLists.txt b/src/lbm/mrt/cell_operations/CMakeLists.txt
index d5d533f233ef47fe79a2598bc77639217ea5d34d..ecd134f381ba0e9c76d4f88ba2338a8d99a048d9 100644
--- a/src/lbm/mrt/cell_operations/CMakeLists.txt
+++ b/src/lbm/mrt/cell_operations/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     DefaultCellOperation.impl.h     
     )
diff --git a/src/lbm/refinement/CMakeLists.txt b/src/lbm/refinement/CMakeLists.txt
index 6aff346986b0ea8a5f7ebf41d34ec9c0b061c6a9..a4a7ebf0352a6795c432e03b786bca99803e9c21 100644
--- a/src/lbm/refinement/CMakeLists.txt
+++ b/src/lbm/refinement/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     TimeTracker.h
     TimeStep.h
diff --git a/src/lbm/srt/CMakeLists.txt b/src/lbm/srt/CMakeLists.txt
index e95415ab92683e312685788fff35f42b6da4f408..04e9e6971fd99f380e89ee30aa8e00575344c18b 100644
--- a/src/lbm/srt/CMakeLists.txt
+++ b/src/lbm/srt/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     AdvectionDiffusionSweep.impl.h
     SplitPureSweep.impl.h
diff --git a/src/lbm/srt/cell_operations/CMakeLists.txt b/src/lbm/srt/cell_operations/CMakeLists.txt
index 6a8de6a5b6cc9a3d59c5d01dde73d71fbd030a42..e651169c06ff6b17e87b6f6d392897ce81433cb7 100644
--- a/src/lbm/srt/cell_operations/CMakeLists.txt
+++ b/src/lbm/srt/cell_operations/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     AdvectionDiffusionCellOperation.impl.h
     DefaultCellOperation.impl.h     
diff --git a/src/lbm/sweeps/CMakeLists.txt b/src/lbm/sweeps/CMakeLists.txt
index 3cf1a982fb3b95a3f248842043988a318dfd69ba..68bb794c166c25feea280a22bb69cd2d11914673 100644
--- a/src/lbm/sweeps/CMakeLists.txt
+++ b/src/lbm/sweeps/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     FlagFieldSweepBase.h
     SplitPureSweep.h
diff --git a/src/lbm/sweeps/cell_operations/CMakeLists.txt b/src/lbm/sweeps/cell_operations/CMakeLists.txt
index 3875dd5abdb21ffb94f9c980b37748f5c73c1942..606b8f69c363bf573627a770ecfea2218db9948e 100644
--- a/src/lbm/sweeps/cell_operations/CMakeLists.txt
+++ b/src/lbm/sweeps/cell_operations/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     DefaultCellOperation.h
     AdvectionDiffusionCellOperation.h     
diff --git a/src/lbm/trt/CMakeLists.txt b/src/lbm/trt/CMakeLists.txt
index 6dc8a16b5e40cb9d0a807441e945dbd67d83d54f..40bfcad0e97c06fac8b108162ba9ada65760a194 100644
--- a/src/lbm/trt/CMakeLists.txt
+++ b/src/lbm/trt/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     SplitPureSweep.impl.h
     SplitSweep.impl.h
diff --git a/src/lbm/trt/cell_operations/CMakeLists.txt b/src/lbm/trt/cell_operations/CMakeLists.txt
index d5d533f233ef47fe79a2598bc77639217ea5d34d..ecd134f381ba0e9c76d4f88ba2338a8d99a048d9 100644
--- a/src/lbm/trt/cell_operations/CMakeLists.txt
+++ b/src/lbm/trt/cell_operations/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     DefaultCellOperation.impl.h     
     )
diff --git a/src/lbm/vtk/CMakeLists.txt b/src/lbm/vtk/CMakeLists.txt
index ad2713023e1aac8f513e4be576c458294cc0c9aa..46751aae2f1d3259824411b08a6814a0f3cf119e 100644
--- a/src/lbm/vtk/CMakeLists.txt
+++ b/src/lbm/vtk/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm
+target_sources( walberla_lbm
     PRIVATE
     QCriterion.h
     NonEquilibrium.h
diff --git a/src/lbm_generated/CMakeLists.txt b/src/lbm_generated/CMakeLists.txt
index 0da224ed7cd5f2921bac3c7fe5ae3b5858d16214..ba78234a53bad5f38dc0d4d26bb6c73c78383d3a 100644
--- a/src/lbm_generated/CMakeLists.txt
+++ b/src/lbm_generated/CMakeLists.txt
@@ -1,17 +1,18 @@
-add_library( lbm_generated)
+add_library( walberla_lbm_generated )
+add_library( walberla::lbm_generated ALIAS walberla_lbm_generated )
 
-target_link_libraries( lbm_generated
+target_link_libraries( walberla_lbm_generated
         PUBLIC
-        blockforest
-        boundary
-        communication
-        core
-        domain_decomposition
-        field
-        geometry
-        stencil
-        timeloop
-        vtk
+      walberla::blockforest
+      walberla::boundary
+      walberla::communication
+      walberla::core
+      walberla::domain_decomposition
+      walberla::field
+      walberla::geometry
+      walberla::stencil
+      walberla::timeloop
+      walberla::vtk
         )
 
 add_subdirectory( boundary )
diff --git a/src/lbm_generated/boundary/CMakeLists.txt b/src/lbm_generated/boundary/CMakeLists.txt
index 201337a88fa1547002e0266b8837f369cf893b59..779775c48e8ae8b6d0abd9942382ddd6d85e29a8 100644
--- a/src/lbm_generated/boundary/CMakeLists.txt
+++ b/src/lbm_generated/boundary/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_generated
+target_sources( walberla_lbm_generated
         PRIVATE
         D3Q19BoundaryCollection.h
         D3Q27BoundaryCollection.h
diff --git a/src/lbm_generated/communication/CMakeLists.txt b/src/lbm_generated/communication/CMakeLists.txt
index cd5516b9e96a757f9d8911269d7f703b13e92105..a1040f49fd09ff744a7cca10c85a9074a3692017 100644
--- a/src/lbm_generated/communication/CMakeLists.txt
+++ b/src/lbm_generated/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_generated
+target_sources( walberla_lbm_generated
     PRIVATE
     CombinedInPlacePackInfo.h
     NonuniformCommData.h
diff --git a/src/lbm_generated/evaluation/CMakeLists.txt b/src/lbm_generated/evaluation/CMakeLists.txt
index 922cf93c3cb989af797b913baa227a2cf1735b23..9cc61f751a05f976374c26fd06e7659b93803e8c 100644
--- a/src/lbm_generated/evaluation/CMakeLists.txt
+++ b/src/lbm_generated/evaluation/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_generated
+target_sources( walberla_lbm_generated
     PRIVATE
     PerformanceEvaluation.h
     )
diff --git a/src/lbm_generated/field/CMakeLists.txt b/src/lbm_generated/field/CMakeLists.txt
index 63bc11c8f920acc3e4c244488d72899fd7a24245..4cb39eca0befba686b1ef2dbef8824dddd397d7e 100644
--- a/src/lbm_generated/field/CMakeLists.txt
+++ b/src/lbm_generated/field/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_generated
+target_sources( walberla_lbm_generated
         PRIVATE
         AddToStorage.h
         PdfField.h
diff --git a/src/lbm_generated/gpu/CMakeLists.txt b/src/lbm_generated/gpu/CMakeLists.txt
index f81e5f2b370d478473f4d02d3853c469c905799f..e80682369096108df483501573d2be15e2f47f70 100644
--- a/src/lbm_generated/gpu/CMakeLists.txt
+++ b/src/lbm_generated/gpu/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_generated
+target_sources( walberla_lbm_generated
         PRIVATE
         AddToStorage.h
         BasicRecursiveTimeStepGPU.h
diff --git a/src/lbm_generated/refinement/CMakeLists.txt b/src/lbm_generated/refinement/CMakeLists.txt
index 216b4a2683ebc426c8f30a5135d5c07db3409640..b02e160fac8009fe52ce18b4274a3e24b45bf48c 100644
--- a/src/lbm_generated/refinement/CMakeLists.txt
+++ b/src/lbm_generated/refinement/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_generated
+target_sources( walberla_lbm_generated
     PRIVATE
     BasicRecursiveTimeStep.h
     BasicRecursiveTimeStep.impl.h
diff --git a/src/lbm_generated/storage_specification/CMakeLists.txt b/src/lbm_generated/storage_specification/CMakeLists.txt
index 83d211632ca9366f1ac5f719a22d217f7c176061..7e3f28487957c141101cdf8356b1ad2d7c983778 100644
--- a/src/lbm_generated/storage_specification/CMakeLists.txt
+++ b/src/lbm_generated/storage_specification/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_generated
+target_sources( walberla_lbm_generated
         PRIVATE
         D3Q19StorageSpecification.h
         D3Q19StorageSpecification.cpp
diff --git a/src/lbm_generated/sweep_collection/CMakeLists.txt b/src/lbm_generated/sweep_collection/CMakeLists.txt
index 91fbfb9d64fa55c4f870875be3c58a3f65a06c98..ec130974fc22cde18ee73c82843470206327869e 100644
--- a/src/lbm_generated/sweep_collection/CMakeLists.txt
+++ b/src/lbm_generated/sweep_collection/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_generated
+target_sources( walberla_lbm_generated
         PRIVATE
         D3Q19SRT.h
         D3Q19SRT.cpp
diff --git a/src/lbm_mesapd_coupling/CMakeLists.txt b/src/lbm_mesapd_coupling/CMakeLists.txt
index 1e04ba7fd21b3dcf4e4ffc3518c833a4460205ed..924b9ca8b3ec69117a8b4e35024e2c8c20f81885 100644
--- a/src/lbm_mesapd_coupling/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/CMakeLists.txt
@@ -1,13 +1,14 @@
 
 ###################################################################################################
 #
-# Module lbm - mesapd - coupling
+# Module walberla::lbm - mesapd - coupling
 #
 ###################################################################################################
 
-add_library( lbm_mesapd_coupling )
-target_link_libraries( lbm_mesapd_coupling PUBLIC boundary blockforest core domain_decomposition field lbm mesa_pd stencil )
-target_sources( lbm_mesapd_coupling
+add_library( walberla_lbm_mesapd_coupling )
+add_library( walberla::lbm_mesapd_coupling ALIAS walberla_lbm_mesapd_coupling )
+target_link_libraries( walberla_lbm_mesapd_coupling PUBLIC walberla::boundary walberla::blockforest walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::mesa_pd walberla::stencil )
+target_sources( walberla_lbm_mesapd_coupling
       PRIVATE
       DataTypes.h
       )
@@ -16,11 +17,11 @@ target_sources( lbm_mesapd_coupling
 # sufficient (for a sufficiently high stiffness in the DEM).
 set(MAX_PARTICLES_PER_CELL 2)
 add_custom_target(MAX_PARTICLES_PER_CELL) # Make it a target such that the code generation runs again if changed
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
         PRIVATE
         DataTypesCodegen.h
         )
-target_compile_definitions(lbm_mesapd_coupling PUBLIC MAX_PARTICLES_PER_CELL=${MAX_PARTICLES_PER_CELL})
+target_compile_definitions( walberla_lbm_mesapd_coupling PUBLIC MAX_PARTICLES_PER_CELL=${MAX_PARTICLES_PER_CELL} )
 
 
 add_subdirectory( amr )
diff --git a/src/lbm_mesapd_coupling/amr/CMakeLists.txt b/src/lbm_mesapd_coupling/amr/CMakeLists.txt
index e88039b3e21e907176d8e5e2a61ce7d11631bd36..f25007d5e51193087d8205f56f8bf825aed08a04 100644
--- a/src/lbm_mesapd_coupling/amr/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/amr/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     BlockInfo.h
     InfoCollection.h     
diff --git a/src/lbm_mesapd_coupling/amr/level_determination/CMakeLists.txt b/src/lbm_mesapd_coupling/amr/level_determination/CMakeLists.txt
index b6177fb27c2cb4b376c8642aed70019c8f8d84e8..4d4ae90bdc6a04550c4e9ab29d6075460bf037a0 100644
--- a/src/lbm_mesapd_coupling/amr/level_determination/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/amr/level_determination/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     ParticlePresenceLevelDetermination.h     
     )
diff --git a/src/lbm_mesapd_coupling/amr/weight_assignment/CMakeLists.txt b/src/lbm_mesapd_coupling/amr/weight_assignment/CMakeLists.txt
index b13d50d4edf80d0ac939ba059dfd0d58be5e602b..dac9ace1b82a6c12e5f73a6b4a37de9d4f299c7d 100644
--- a/src/lbm_mesapd_coupling/amr/weight_assignment/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/amr/weight_assignment/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     WeightAssignmentFunctor.h
     MetisAssignmentFunctor.cpp
diff --git a/src/lbm_mesapd_coupling/mapping/CMakeLists.txt b/src/lbm_mesapd_coupling/mapping/CMakeLists.txt
index 04f7fd66d1e8d180c1862fb30385cf4b757131a8..49f3695c6aab69f5bdfad9156675f48b41339311 100644
--- a/src/lbm_mesapd_coupling/mapping/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/mapping/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     ParticleMapping.h
     ParticleBoundingBox.h     
diff --git a/src/lbm_mesapd_coupling/momentum_exchange_method/CMakeLists.txt b/src/lbm_mesapd_coupling/momentum_exchange_method/CMakeLists.txt
index e0c1a0bd3a1828cc74869951bede51cad674deaa..956918cc16aa3de2182efe1e3e7df8420a52c3b6 100644
--- a/src/lbm_mesapd_coupling/momentum_exchange_method/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/momentum_exchange_method/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     MovingParticleMapping.h     
     )
diff --git a/src/lbm_mesapd_coupling/momentum_exchange_method/boundary/CMakeLists.txt b/src/lbm_mesapd_coupling/momentum_exchange_method/boundary/CMakeLists.txt
index 092fd13c0b5efa0b62a757786fb61a9a54fdb1c4..074ab16f82dc31adaad3ac2cfa9bfb59c5e40ccf 100644
--- a/src/lbm_mesapd_coupling/momentum_exchange_method/boundary/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/momentum_exchange_method/boundary/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     CurvedLinear.h
     SimpleBB.h     
diff --git a/src/lbm_mesapd_coupling/momentum_exchange_method/reconstruction/CMakeLists.txt b/src/lbm_mesapd_coupling/momentum_exchange_method/reconstruction/CMakeLists.txt
index a5b4e0b9b1da2b81d1b156042ac60d7e52965992..dc031e495f71a8ce546139815fdfae9e58af1a77 100644
--- a/src/lbm_mesapd_coupling/momentum_exchange_method/reconstruction/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/momentum_exchange_method/reconstruction/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     PdfReconstructionManager.h
     ExtrapolationDirectionFinder.h
diff --git a/src/lbm_mesapd_coupling/overlapping/CMakeLists.txt b/src/lbm_mesapd_coupling/overlapping/CMakeLists.txt
index 1dfa6dc12d91a77a01f15baa8200835fc78c2fbb..de432419080033f625d4b164526657815a13c947 100644
--- a/src/lbm_mesapd_coupling/overlapping/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/overlapping/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
         PRIVATE
         OverlapFraction.h
         )
diff --git a/src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt b/src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt
index 4a87ce81e6dc56c3a5f3bbeb1b6d988ca2bed00c..00b352450b2c58cb2d4ea1c8c2c4307696152099 100644
--- a/src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     PSMSweep.h
     ParticleAndVolumeFractionMapping.h
diff --git a/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/CMakeLists.txt b/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/CMakeLists.txt
index 82b23cd774f80475b781e4bbc092728757277276..df20a9020752ee67cb5fb0ce15ac0a699f383c58 100644
--- a/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
         PRIVATE
         ParticleAndVolumeFractionMappingSweepsCPU.h
         PSMSweepCollection.h
@@ -22,7 +22,7 @@ if (WALBERLA_BUILD_WITH_CODEGEN)
     endforeach ()
 endif ()
 if (WALBERLA_BUILD_WITH_GPU_SUPPORT AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP))
-    target_sources(lbm_mesapd_coupling
+    target_sources( walberla_lbm_mesapd_coupling
             PRIVATE
             ParticleAndVolumeFractionMappingSweepsGPU.h
             ParticleAndVolumeFractionMappingKernels.${CODEGEN_FILE_SUFFIX}
diff --git a/src/lbm_mesapd_coupling/utility/CMakeLists.txt b/src/lbm_mesapd_coupling/utility/CMakeLists.txt
index 36f682d8efed81b54eae0fb662067e25786d26f4..2e6c5ab91e0ea884b6b7c2d0120536ddc0889891 100644
--- a/src/lbm_mesapd_coupling/utility/CMakeLists.txt
+++ b/src/lbm_mesapd_coupling/utility/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( lbm_mesapd_coupling
+target_sources( walberla_lbm_mesapd_coupling
     PRIVATE
     SubCyclingManager.h
     AddHydrodynamicInteractionKernel.h
diff --git a/src/mesa_pd/CMakeLists.txt b/src/mesa_pd/CMakeLists.txt
index b71b17698f74b9cfeb176332344f95f8eeb301c4..aacbb1a5da6502c975797678adb0744083f04f80 100644
--- a/src/mesa_pd/CMakeLists.txt
+++ b/src/mesa_pd/CMakeLists.txt
@@ -5,8 +5,9 @@
 #
 ###################################################################################################
 
-add_library( mesa_pd )
-target_link_libraries( mesa_pd PUBLIC blockforest core stencil vtk )
+add_library( walberla_mesa_pd )
+add_library( walberla::mesa_pd ALIAS walberla_mesa_pd )
+target_link_libraries( walberla_mesa_pd PUBLIC walberla::blockforest walberla::core walberla::stencil walberla::vtk )
 add_subdirectory( collision_detection )
 add_subdirectory( common )
 add_subdirectory( data )
@@ -17,7 +18,7 @@ add_subdirectory( sorting )
 add_subdirectory( vtk )
 if(OPENMESH_CORE_FOUND)
     set( WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE ON CACHE INTERNAL "")
-    target_link_libraries( mesa_pd PUBLIC mesh_common )
+    target_link_libraries( walberla_mesa_pd PUBLIC walberla::mesh_common )
     message( DEBUG "MESA-PD: ConvexPolyhedron shape is available (OpenMesh dependency satisfied)" )
 else()
     set( WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE OFF CACHE INTERNAL "")
diff --git a/src/mesa_pd/collision_detection/CMakeLists.txt b/src/mesa_pd/collision_detection/CMakeLists.txt
index 0f971b71a5ef2a655002793a088db64b27222fa4..7fcc661cce3d1baf3fdee6794aaa3093b4791024 100644
--- a/src/mesa_pd/collision_detection/CMakeLists.txt
+++ b/src/mesa_pd/collision_detection/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     AnalyticCollisionFunctions.h
     GJK.h
diff --git a/src/mesa_pd/common/CMakeLists.txt b/src/mesa_pd/common/CMakeLists.txt
index db4a239b7094716269975ab555944d851bc79d02..150900d34ee9c14bbc66081009ff0f190c5fec8a 100644
--- a/src/mesa_pd/common/CMakeLists.txt
+++ b/src/mesa_pd/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     RayParticleIntersection.h
     Contains.h
diff --git a/src/mesa_pd/data/CMakeLists.txt b/src/mesa_pd/data/CMakeLists.txt
index 01e85915b46d1d0394421a5aac642ba7a4862125..d65277f08a7d0083814231cb8e8b4c8eee46f261 100644
--- a/src/mesa_pd/data/CMakeLists.txt
+++ b/src/mesa_pd/data/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     ParticleStorage.h
     IAccessor.h
diff --git a/src/mesa_pd/data/shape/CMakeLists.txt b/src/mesa_pd/data/shape/CMakeLists.txt
index da0f608796dbe7215f8d7eec482fb88f3241e64f..ea9726c8c1652aa2bf15630371cf8af01f945816 100644
--- a/src/mesa_pd/data/shape/CMakeLists.txt
+++ b/src/mesa_pd/data/shape/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     CylindricalBoundary.h
     BaseShape.h
diff --git a/src/mesa_pd/domain/CMakeLists.txt b/src/mesa_pd/domain/CMakeLists.txt
index eaac7e4cdb1b059523f257cdb1463cda2ca7085d..0ae79882977e75eb07f63e32ceff3c8a2190d5e8 100644
--- a/src/mesa_pd/domain/CMakeLists.txt
+++ b/src/mesa_pd/domain/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     BlockForestDomain.cpp
     IDomain.h
@@ -6,5 +6,5 @@ target_sources( mesa_pd
     BlockForestDataHandling.h
     InfoCollection.h
     BlockForestDataHandling.cpp
-    BlockForestDomain.h     
+      BlockForestDomain.h
     )
diff --git a/src/mesa_pd/kernel/CMakeLists.txt b/src/mesa_pd/kernel/CMakeLists.txt
index 884aeedeffc3c7954f246430e43b5b4bdfea50f7..5467db1eac6624c89112f6c9acb529186c547045 100644
--- a/src/mesa_pd/kernel/CMakeLists.txt
+++ b/src/mesa_pd/kernel/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     NonLinearSpringDashpot.h
     SingleCast.h
diff --git a/src/mesa_pd/kernel/cnt/CMakeLists.txt b/src/mesa_pd/kernel/cnt/CMakeLists.txt
index db078539bccfbd46b73670ff94fb2db833e5efd8..7cb14e4cd6edce78deba1cef8b182c165e52bf95 100644
--- a/src/mesa_pd/kernel/cnt/CMakeLists.txt
+++ b/src/mesa_pd/kernel/cnt/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     IsotropicVDWContact.h
     VBondContact.h
diff --git a/src/mesa_pd/mpi/CMakeLists.txt b/src/mesa_pd/mpi/CMakeLists.txt
index 04e543f8a2a52a86ffe4a1201525910fe0895683..60b5c3ce1d9634790e95ca1aea1917873a805717 100644
--- a/src/mesa_pd/mpi/CMakeLists.txt
+++ b/src/mesa_pd/mpi/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     SyncNextNeighborsBlockForest.h
     BroadcastProperty.h
diff --git a/src/mesa_pd/mpi/notifications/CMakeLists.txt b/src/mesa_pd/mpi/notifications/CMakeLists.txt
index 16e1bac3779869d71835a318d0ba9b758bd47a35..540c955d7fe75b1cf97011bd40711661e3929b71 100644
--- a/src/mesa_pd/mpi/notifications/CMakeLists.txt
+++ b/src/mesa_pd/mpi/notifications/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     ParticleGhostCopyNotification.h
     ParticleRemovalNotification.h
diff --git a/src/mesa_pd/sorting/CMakeLists.txt b/src/mesa_pd/sorting/CMakeLists.txt
index 4b6badef860b9b133b38b6907553826555a6121c..97abf6df6674baac84ac31db79a5797858a1f348 100644
--- a/src/mesa_pd/sorting/CMakeLists.txt
+++ b/src/mesa_pd/sorting/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     LinearizedCompareFunctor.h
     HilbertCompareFunctor.h
diff --git a/src/mesa_pd/vtk/CMakeLists.txt b/src/mesa_pd/vtk/CMakeLists.txt
index ffda945a2195ddc9439994c303814efb54d5bf82..c93e00fef0165263d3db62d7cd22ed4a3fe9ab34 100644
--- a/src/mesa_pd/vtk/CMakeLists.txt
+++ b/src/mesa_pd/vtk/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     TensorGlyph.h
     TensorGlyph.cpp
diff --git a/src/mesa_pd/vtk/ConvexPolyhedron/CMakeLists.txt b/src/mesa_pd/vtk/ConvexPolyhedron/CMakeLists.txt
index a6a8cf4a0e37ed65d36ca82d5c6be9c7938e8d4f..3a2d0d9532cbffedba64785817ee2d7d8ab326a6 100644
--- a/src/mesa_pd/vtk/ConvexPolyhedron/CMakeLists.txt
+++ b/src/mesa_pd/vtk/ConvexPolyhedron/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     Types.h
     MeshParticleVTKOutput.h     
diff --git a/src/mesa_pd/vtk/ConvexPolyhedron/data_sources/CMakeLists.txt b/src/mesa_pd/vtk/ConvexPolyhedron/data_sources/CMakeLists.txt
index 367bb6ea8d75fa261a9149c0a555a30a956c08f0..5dd986f4be1dbefbb4c68e445b3f885bfca5e298 100644
--- a/src/mesa_pd/vtk/ConvexPolyhedron/data_sources/CMakeLists.txt
+++ b/src/mesa_pd/vtk/ConvexPolyhedron/data_sources/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     OutputSelectorFaceDataSource.h
     FaceDataSource.h
diff --git a/src/mesa_pd/vtk/ConvexPolyhedron/tesselation/CMakeLists.txt b/src/mesa_pd/vtk/ConvexPolyhedron/tesselation/CMakeLists.txt
index cdf2a2e4c51830df29cf42df955703216edd0c4f..7587d493cefdef944dc78cd56c8d955a09f99e23 100644
--- a/src/mesa_pd/vtk/ConvexPolyhedron/tesselation/CMakeLists.txt
+++ b/src/mesa_pd/vtk/ConvexPolyhedron/tesselation/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesa_pd
+target_sources( walberla_mesa_pd
     PRIVATE
     ConvexPolyhedronTesselation.h     
     )
diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt
index 9a47783b0b6d3ff79a36ef7ed95c04dead7403d1..be45ad6d02cc1f27df9f804d81c144b5f73566e9 100644
--- a/src/mesh/CMakeLists.txt
+++ b/src/mesh/CMakeLists.txt
@@ -4,12 +4,13 @@
 #
 ###################################################################################################
 
-add_library( mesh )
-target_link_libraries( mesh PUBLIC blockforest boundary core domain_decomposition field geometry pe stencil mesh_common )
+add_library( walberla_mesh )
+add_library( walberla::mesh ALIAS walberla_mesh )
+target_link_libraries( walberla_mesh PUBLIC walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla:: walberla::pe walberla::stencil walberla::mesh_common )
 if ( OPENMESH_CORE_FOUND )
-   target_link_directories( mesh PUBLIC OpenMeshCore)
+   target_link_directories( walberla::mesh PUBLIC OpenMeshCore )
 endif()
-target_sources( mesh
+target_sources( walberla_mesh
       PRIVATE
       MeshConversion.h
       )
diff --git a/src/mesh/blockforest/CMakeLists.txt b/src/mesh/blockforest/CMakeLists.txt
index d7cf9894a1b042a2c30d119d592f3a77688abe1c..8b8c471bcb91992fb67e8247afcbc9225e86193d 100644
--- a/src/mesh/blockforest/CMakeLists.txt
+++ b/src/mesh/blockforest/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh
+target_sources( walberla_mesh
     PRIVATE
     RefinementSelection.h
     BlockForestInitialization.cpp
diff --git a/src/mesh/boundary/CMakeLists.txt b/src/mesh/boundary/CMakeLists.txt
index 44f12efd6be21ae820c035d6cc7bb6db252454c4..4c8a05bf5870a4d17e06166e675d2b93ebe1c6f9 100644
--- a/src/mesh/boundary/CMakeLists.txt
+++ b/src/mesh/boundary/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh
+target_sources( walberla_mesh
     PRIVATE
     BoundarySetup.cpp
     ColorToBoundaryMapper.h
diff --git a/src/mesh/pe/CMakeLists.txt b/src/mesh/pe/CMakeLists.txt
index b6cab535d34d750a24e4bc3844f28878996624b6..325f9bb5eeca4b186f23840eb43e735171f88a02 100644
--- a/src/mesh/pe/CMakeLists.txt
+++ b/src/mesh/pe/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh
+target_sources( walberla_mesh
     PRIVATE
     DefaultTesselation.h
     Types.h     
diff --git a/src/mesh/pe/communication/CMakeLists.txt b/src/mesh/pe/communication/CMakeLists.txt
index f84235cb9d736c5f93a37bffc1e0b4c4418c7cd8..382e2ba1ee1f690585800f1367b15489bbc96605 100644
--- a/src/mesh/pe/communication/CMakeLists.txt
+++ b/src/mesh/pe/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh
+target_sources( walberla_mesh
     PRIVATE
     ConvexPolyhedron.cpp
     ConvexPolyhedron.h     
diff --git a/src/mesh/pe/raytracing/CMakeLists.txt b/src/mesh/pe/raytracing/CMakeLists.txt
index 67ee47c9f4a68317d044e168219051cc1be60307..70cf0c5f2af2f0b189cbdfdc586a5eb55f9c2830 100644
--- a/src/mesh/pe/raytracing/CMakeLists.txt
+++ b/src/mesh/pe/raytracing/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh
+target_sources( walberla_mesh
     PRIVATE
     Intersects.h     
     )
diff --git a/src/mesh/pe/rigid_body/CMakeLists.txt b/src/mesh/pe/rigid_body/CMakeLists.txt
index f8413ca679229e23f2391f0bd6863d83ea30fa88..9abe3cadd00e3df628969f6a5a65378340230708 100644
--- a/src/mesh/pe/rigid_body/CMakeLists.txt
+++ b/src/mesh/pe/rigid_body/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh
+target_sources( walberla_mesh
     PRIVATE
     ConvexPolyhedronFactory.h
     ConvexPolyhedron.cpp
diff --git a/src/mesh/pe/tesselation/CMakeLists.txt b/src/mesh/pe/tesselation/CMakeLists.txt
index 437b5ad9d1568b50361f383edb0f8312aa2ba66e..e102b8714880254709e548b78ff8a2f272160679 100644
--- a/src/mesh/pe/tesselation/CMakeLists.txt
+++ b/src/mesh/pe/tesselation/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh
+target_sources( walberla_mesh
     PRIVATE
     Sphere.h
     ConvexPolyhedron.h
diff --git a/src/mesh/pe/vtk/CMakeLists.txt b/src/mesh/pe/vtk/CMakeLists.txt
index ed2b8bfe3b4bea33fe6d96b4a5e804b4bbb4f6d8..fa10c11c39a7c1e58c529a4e810adb0b776e4f73 100644
--- a/src/mesh/pe/vtk/CMakeLists.txt
+++ b/src/mesh/pe/vtk/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh
+target_sources( walberla_mesh
     PRIVATE
     CommonDataSources.h
     PeVTKMeshWriter.h     
diff --git a/src/mesh_common/CMakeLists.txt b/src/mesh_common/CMakeLists.txt
index 9da41feda0555b65a9034efb0c8a1b40ff653a76..024e4d56ece40c2d246e7a91c2dfb56fe38dc5c9 100644
--- a/src/mesh_common/CMakeLists.txt
+++ b/src/mesh_common/CMakeLists.txt
@@ -4,12 +4,13 @@
 #
 ###################################################################################################
 
-add_library( mesh_common INTERFACE )
-target_link_libraries( mesh_common INTERFACE core vtk )
+add_library( walberla_mesh_common INTERFACE )
+add_library( walberla::mesh_common ALIAS walberla_mesh_common )
+target_link_libraries( walberla_mesh_common INTERFACE walberla::core walberla::vtk )
 if ( OPENMESH_CORE_FOUND )
-   target_link_directories( mesh_common INTERFACE OpenMeshCore)
+   target_link_directories( walberla::mesh_common INTERFACE OpenMeshCore )
 endif()
-target_sources( mesh_common
+target_sources( walberla_mesh_common
       INTERFACE
       DistanceFunction.h
       QHull.h
diff --git a/src/mesh_common/distance_octree/CMakeLists.txt b/src/mesh_common/distance_octree/CMakeLists.txt
index 8146a0ed93a4b4eec3d0caec5daa8e67d767c338..670ded93d19dc9cce21adc0bfe6cf1985d8906f6 100644
--- a/src/mesh_common/distance_octree/CMakeLists.txt
+++ b/src/mesh_common/distance_octree/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh_common
+target_sources( walberla_mesh_common
     INTERFACE
     BranchNode.h
     LeafNode.h
diff --git a/src/mesh_common/vtk/CMakeLists.txt b/src/mesh_common/vtk/CMakeLists.txt
index 570e32c99c43346361a152a5c4e069f9273b115f..6a0a02375522eba32a943f80c7f970e3ac45bd2b 100644
--- a/src/mesh_common/vtk/CMakeLists.txt
+++ b/src/mesh_common/vtk/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( mesh_common
+target_sources( walberla_mesh_common
     INTERFACE
     CommonFilters.h
     VTKMeshWriter.h
diff --git a/src/pde/CMakeLists.txt b/src/pde/CMakeLists.txt
index 33005a00678e66a07d5e607a236727404cc5320d..305db602f25141d6db67d404287a6f40b58c2b7b 100644
--- a/src/pde/CMakeLists.txt
+++ b/src/pde/CMakeLists.txt
@@ -1,12 +1,13 @@
 ###################################################################################################
 #
-# Module pde 
+# Module walberla::pde
 #
 ###################################################################################################
 
-add_library( pde )
-target_link_libraries( pde PUBLIC blockforest boundary core domain_decomposition field stencil )
-target_sources( pde
+add_library( walberla_pde )
+add_library( walberla::pde ALIAS walberla_pde )
+target_link_libraries( walberla_pde PUBLIC walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::stencil )
+target_sources( walberla_pde
       PRIVATE
       ConditionalResidualNorm.h
       ResidualNormStencilField.h
diff --git a/src/pde/boundary/CMakeLists.txt b/src/pde/boundary/CMakeLists.txt
index 7f5861ef04c789f26d6a8703f08f4cf745988c48..b00ab0ba8caaaaa4b11b5b621e3bede96cfe48c9 100644
--- a/src/pde/boundary/CMakeLists.txt
+++ b/src/pde/boundary/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pde
+target_sources( walberla_pde
     PRIVATE
     Dirichlet_withDx.h
     Dirichlet.h
diff --git a/src/pde/iterations/CMakeLists.txt b/src/pde/iterations/CMakeLists.txt
index 3356f0cb23433188f514cfe46c928d2094c90ce5..3e0184eb4cc7f9a5da73424612aa3ca48889745d 100644
--- a/src/pde/iterations/CMakeLists.txt
+++ b/src/pde/iterations/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pde
+target_sources( walberla_pde
     PRIVATE
     JacobiIteration.h
     JacobiIteration.cpp
diff --git a/src/pde/sweeps/CMakeLists.txt b/src/pde/sweeps/CMakeLists.txt
index 2f6d4893d713b2f0b64e79b3ceebc83bb647e424..1774dfcdb542474e391701bdf1e3827d73de1a57 100644
--- a/src/pde/sweeps/CMakeLists.txt
+++ b/src/pde/sweeps/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pde
+target_sources( walberla_pde
     PRIVATE
     Multigrid.impl.h
     StencilSweepBase.h
diff --git a/src/pe/CMakeLists.txt b/src/pe/CMakeLists.txt
index 12a3ebb4ee4e98f3c61fb092cf088005974c1c8b..84c293427a2dbdf3b73044d46a21e214e3bda507 100644
--- a/src/pe/CMakeLists.txt
+++ b/src/pe/CMakeLists.txt
@@ -5,9 +5,10 @@
 #
 ###################################################################################################
 
-add_library( pe )
-target_link_libraries( pe PUBLIC core blockforest domain_decomposition geometry stencil vtk PRIVATE lodepng )
-target_sources( pe
+add_library( walberla_pe )
+add_library( walberla::pe ALIAS walberla_pe )
+target_link_libraries( walberla_pe PUBLIC walberla::core walberla::blockforest walberla::domain_decomposition walberla::geometry walberla::stencil walberla::vtk PRIVATE lodepng )
+target_sources( walberla_pe
       PRIVATE
       Config.h
       Thresholds.h
diff --git a/src/pe/amr/CMakeLists.txt b/src/pe/amr/CMakeLists.txt
index c5643990db56d8f7f61653e5ce3331dde6e0b32d..5a32243474e0d71ee466a98f04ca32975aa4b086 100644
--- a/src/pe/amr/CMakeLists.txt
+++ b/src/pe/amr/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     InfoCollection.cpp
     InfoCollection.h     
diff --git a/src/pe/bg/CMakeLists.txt b/src/pe/bg/CMakeLists.txt
index 043041125a464e6c4a8d9fe2846d655fb94b5032..0ba1bd6c066e50e7122558fb47d73dc986fff442 100644
--- a/src/pe/bg/CMakeLists.txt
+++ b/src/pe/bg/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     SimpleBG.h
     SimpleBGDataHandling.h
diff --git a/src/pe/ccd/CMakeLists.txt b/src/pe/ccd/CMakeLists.txt
index bfc001c40d3f749aa1dfda9ec2a716294be86aa4..c99403c714c7d17984eb998b9636ba789e145587 100644
--- a/src/pe/ccd/CMakeLists.txt
+++ b/src/pe/ccd/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     HashGrids.cpp
     SimpleCCD.h
diff --git a/src/pe/collision/CMakeLists.txt b/src/pe/collision/CMakeLists.txt
index 132304871e5508a8603ac041440be4ca212ecb6c..126b2dfe5a3df490e1da4de0a6f68e43b1a9c76d 100644
--- a/src/pe/collision/CMakeLists.txt
+++ b/src/pe/collision/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     GJK.h
     GJK.cpp
diff --git a/src/pe/communication/CMakeLists.txt b/src/pe/communication/CMakeLists.txt
index f6a10f37c990de2fd9ba73a1d250e43065bccf1c..716b9743e861dd53136e162f20cd68c5737e2ad0 100644
--- a/src/pe/communication/CMakeLists.txt
+++ b/src/pe/communication/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     RigidBodyRemovalNotification.h
     RigidBodyCopyNotification.h
diff --git a/src/pe/communication/rigidbody/CMakeLists.txt b/src/pe/communication/rigidbody/CMakeLists.txt
index 832e9bc007c9b3dff04b837dbdd8670ddaa2cc5a..7b03c1dddc2fd50de994eebe0e4c1a52567a3c02 100644
--- a/src/pe/communication/rigidbody/CMakeLists.txt
+++ b/src/pe/communication/rigidbody/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     Capsule.h
     Capsule.cpp
diff --git a/src/pe/contact/CMakeLists.txt b/src/pe/contact/CMakeLists.txt
index 8c7387e86b1a6ff8c04b69f516592168edd35fbd..09d0248d3e9cb82beb0650505187f4b8b48df924 100644
--- a/src/pe/contact/CMakeLists.txt
+++ b/src/pe/contact/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     Contact.h
     ContactFunctions.h
diff --git a/src/pe/cr/CMakeLists.txt b/src/pe/cr/CMakeLists.txt
index 6ed5db65546c3f55d505be7ed6d21e817d58c6bc..1f41f69202e02d6fdbbeb2378f6098f581530f03 100644
--- a/src/pe/cr/CMakeLists.txt
+++ b/src/pe/cr/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     HCSITSBodyTrait.h
     Integrators.h
diff --git a/src/pe/debug/CMakeLists.txt b/src/pe/debug/CMakeLists.txt
index 15053b394716d715aa6681ff25130fd528d3c668..17baa9a65595311c85209430ad969399bfd05634 100644
--- a/src/pe/debug/CMakeLists.txt
+++ b/src/pe/debug/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     BodyData.cpp
     BodyData.h     
diff --git a/src/pe/fcd/CMakeLists.txt b/src/pe/fcd/CMakeLists.txt
index 5a720cdb046a4b0e111651e6f50bbbb9a29059ee..0109c2ac664af7b1d2bf2df964074bca379a737a 100644
--- a/src/pe/fcd/CMakeLists.txt
+++ b/src/pe/fcd/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     GenericFCD.h
     SimpleFCD.h
diff --git a/src/pe/raytracing/CMakeLists.txt b/src/pe/raytracing/CMakeLists.txt
index a130633b515cd20ed853dae86a6b05f76bbaf0b6..09a47d867aec2f398c07f008f9fe920e80ddd0e4 100644
--- a/src/pe/raytracing/CMakeLists.txt
+++ b/src/pe/raytracing/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     Intersects.h
     Ray.cpp
diff --git a/src/pe/rigidbody/CMakeLists.txt b/src/pe/rigidbody/CMakeLists.txt
index 36c0cca2e6ebae83819dad53e83f37876a5e9547..42732a775dc80c60e34ac61799bb8d85182c9e49 100644
--- a/src/pe/rigidbody/CMakeLists.txt
+++ b/src/pe/rigidbody/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     RigidBodyIterator.h
     UnionFactory.h
diff --git a/src/pe/statistics/CMakeLists.txt b/src/pe/statistics/CMakeLists.txt
index 224b36ca2ea3da5cc96857fc49a3beb39e7c6708..e2a1dc3a5a854e4fd6a77a84d31ea467c985ac62 100644
--- a/src/pe/statistics/CMakeLists.txt
+++ b/src/pe/statistics/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     BodyStatistics.cpp
     BodyStatistics.h     
diff --git a/src/pe/synchronization/CMakeLists.txt b/src/pe/synchronization/CMakeLists.txt
index 83f27e3881a30bd80840fcd478566410346cd90f..8b6ad422234970e7e94b801c0927aae26c3ac722 100644
--- a/src/pe/synchronization/CMakeLists.txt
+++ b/src/pe/synchronization/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     SyncNextNeighbors.h
     SyncShadowOwners.h
diff --git a/src/pe/utility/CMakeLists.txt b/src/pe/utility/CMakeLists.txt
index 3f9f429a53a2006f07acc63626b2441f5bfb1a91..87e245be1c1c76eac3c3a470db0292489a697645 100644
--- a/src/pe/utility/CMakeLists.txt
+++ b/src/pe/utility/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     DestroyBody.cpp
     Distance.h
diff --git a/src/pe/vtk/CMakeLists.txt b/src/pe/vtk/CMakeLists.txt
index 01cb517447f485db70d6926295e45fc9dfb977ef..e6d93c4e8b62a0e1153b96c75514dffcad1bdc28 100644
--- a/src/pe/vtk/CMakeLists.txt
+++ b/src/pe/vtk/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe
+target_sources( walberla_pe
     PRIVATE
     EllipsoidVtkOutput.cpp
     BodyVtkOutput.h
diff --git a/src/pe_coupling/CMakeLists.txt b/src/pe_coupling/CMakeLists.txt
index 7883137c42abcf7d1ffd9ed281dc9fa045a7830b..0ef08e09f72f5aee9f811de6f6cf23c248de3216 100644
--- a/src/pe_coupling/CMakeLists.txt
+++ b/src/pe_coupling/CMakeLists.txt
@@ -1,11 +1,12 @@
 ###################################################################################################
 #
-# Module pe_coupling 
+# Module walberla::pe_coupling
 #
 ###################################################################################################
 
-add_library( pe_coupling )
-target_link_libraries( pe_coupling PUBLIC blockforest boundary communication core domain_decomposition field geometry lbm pe stencil vtk )
+add_library( walberla_pe_coupling )
+add_library( walberla::pe_coupling ALIAS walberla_pe_coupling )
+target_link_libraries( walberla_pe_coupling PUBLIC walberla::blockforest walberla::boundary walberla::communication walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::lbm walberla::pe walberla::stencil walberla::vtk )
 
 add_subdirectory( amr )
 add_subdirectory( discrete_particle_methods )
diff --git a/src/pe_coupling/amr/CMakeLists.txt b/src/pe_coupling/amr/CMakeLists.txt
index 4304ceaf447a3249a7fdfb3b5d0cb1861a9298d3..cf725cb0e9719f104201903a205b4a5fd9d234d9 100644
--- a/src/pe_coupling/amr/CMakeLists.txt
+++ b/src/pe_coupling/amr/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     InfoCollection.cpp
     BlockInfo.h
diff --git a/src/pe_coupling/amr/level_determination/CMakeLists.txt b/src/pe_coupling/amr/level_determination/CMakeLists.txt
index 19072c57c47e1aeb809b7c744d9e99d4b183a992..70add798921a46376555086e3918ac3f6bc170cc 100644
--- a/src/pe_coupling/amr/level_determination/CMakeLists.txt
+++ b/src/pe_coupling/amr/level_determination/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     GlobalBodyPresenceLevelDetermination.cpp
     BodyPresenceLevelDetermination.cpp
diff --git a/src/pe_coupling/amr/weight_assignment/CMakeLists.txt b/src/pe_coupling/amr/weight_assignment/CMakeLists.txt
index 5698849c10fd956fc0eeb3eaff718b1153222221..170167338b590a306e1c7731c8ef600f676225f1 100644
--- a/src/pe_coupling/amr/weight_assignment/CMakeLists.txt
+++ b/src/pe_coupling/amr/weight_assignment/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     WeightAssignmentFunctor.h
     MetisAssignmentFunctor.cpp
diff --git a/src/pe_coupling/discrete_particle_methods/correlations/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/correlations/CMakeLists.txt
index 38f6af98352b417f6cd53da8038a939040e7be16..d4d43635048cbeee8f0a28092f0ad78274ad802f 100644
--- a/src/pe_coupling/discrete_particle_methods/correlations/CMakeLists.txt
+++ b/src/pe_coupling/discrete_particle_methods/correlations/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     DragForceCorrelations.h
     LiftForceCorrelations.h
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/evaluators/CMakeLists.txt
index 18b816062972697d6cbe63cc2b3a724bc080f720..e21d26c4c5567ed7c6e15efedd70783cc7ce4136 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/CMakeLists.txt
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     EffectiveViscosityFieldEvaluator.h
     AddedMassForceEvaluator.h
diff --git a/src/pe_coupling/discrete_particle_methods/gns_lbm/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/gns_lbm/CMakeLists.txt
index e97a9c4fc8fbef985bb8770a41783dadbade1777..567f42a23283487e985896d269f1dbb8c202b99b 100644
--- a/src/pe_coupling/discrete_particle_methods/gns_lbm/CMakeLists.txt
+++ b/src/pe_coupling/discrete_particle_methods/gns_lbm/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     GNSSweep.h     
     )
diff --git a/src/pe_coupling/discrete_particle_methods/gns_lbm/utility/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/gns_lbm/utility/CMakeLists.txt
index b5ac25e11febc6042653b8da6686d27ec4215c65..4f58057bb094d36f51de07ffc2ef53e287b4cef0 100644
--- a/src/pe_coupling/discrete_particle_methods/gns_lbm/utility/CMakeLists.txt
+++ b/src/pe_coupling/discrete_particle_methods/gns_lbm/utility/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     GNSPressureFieldEvaluator.h
     GNSVelocityFieldEvaluator.h
diff --git a/src/pe_coupling/discrete_particle_methods/utility/CMakeLists.txt b/src/pe_coupling/discrete_particle_methods/utility/CMakeLists.txt
index b6c117c97d8124e9c2aac229400c278ce59106ed..4c0cec7e5c64da7acf964936e53c955e99fa8e17 100644
--- a/src/pe_coupling/discrete_particle_methods/utility/CMakeLists.txt
+++ b/src/pe_coupling/discrete_particle_methods/utility/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     BodyVelocityInitializer.h
     AveragedInteractionForceFieldToForceFieldAdder.h
diff --git a/src/pe_coupling/geometry/CMakeLists.txt b/src/pe_coupling/geometry/CMakeLists.txt
index 9331843e2cd06f8275b52ca6e825ca8c0c101369..607013eed670ac41491c09f3f32aa2be9f599271 100644
--- a/src/pe_coupling/geometry/CMakeLists.txt
+++ b/src/pe_coupling/geometry/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     SphereEquivalentDiameter.h
     PeIntersectionRatio.cpp
diff --git a/src/pe_coupling/mapping/CMakeLists.txt b/src/pe_coupling/mapping/CMakeLists.txt
index 4954955a1d01e7097c3e1a697e19b58fba18fb5e..1c010991311fe419e62072f5ef7d59dc60949b7d 100644
--- a/src/pe_coupling/mapping/CMakeLists.txt
+++ b/src/pe_coupling/mapping/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     BodyMapping.h
     BodyBBMapping.h
diff --git a/src/pe_coupling/momentum_exchange_method/CMakeLists.txt b/src/pe_coupling/momentum_exchange_method/CMakeLists.txt
index db5a4e0f83fa9a03e49728deadd1a4ac15676cfc..cf557a1ac6972e95f573968d88051437a1d1ef1b 100644
--- a/src/pe_coupling/momentum_exchange_method/CMakeLists.txt
+++ b/src/pe_coupling/momentum_exchange_method/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     BodyMapping.h     
     )
diff --git a/src/pe_coupling/momentum_exchange_method/boundary/CMakeLists.txt b/src/pe_coupling/momentum_exchange_method/boundary/CMakeLists.txt
index 1c082cba5c1bdf481872b376a022c4de7953f976..5d81860a7f432cf2de4c827548690c80eee836e6 100644
--- a/src/pe_coupling/momentum_exchange_method/boundary/CMakeLists.txt
+++ b/src/pe_coupling/momentum_exchange_method/boundary/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     CurvedQuadratic.h
     CurvedLinear.h
diff --git a/src/pe_coupling/momentum_exchange_method/destruction/CMakeLists.txt b/src/pe_coupling/momentum_exchange_method/destruction/CMakeLists.txt
index e237634a3a73c378fe93f057c867e5f6db19299e..22f245b50b295e8ffe84218bd4c4652d533c7547 100644
--- a/src/pe_coupling/momentum_exchange_method/destruction/CMakeLists.txt
+++ b/src/pe_coupling/momentum_exchange_method/destruction/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     Destroyer.h     
     )
diff --git a/src/pe_coupling/momentum_exchange_method/restoration/CMakeLists.txt b/src/pe_coupling/momentum_exchange_method/restoration/CMakeLists.txt
index 6930bd57e4d8fc54b1df871e32d8f971fe274323..535b860db4c6fa37b2b658a66d2d5e600d4ce6c9 100644
--- a/src/pe_coupling/momentum_exchange_method/restoration/CMakeLists.txt
+++ b/src/pe_coupling/momentum_exchange_method/restoration/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     ExtrapolationDirectionFinder.h
     ExtrapolationDirectionFinder.cpp
diff --git a/src/pe_coupling/partially_saturated_cells_method/CMakeLists.txt b/src/pe_coupling/partially_saturated_cells_method/CMakeLists.txt
index df940c6fb7745ea225e2ff68b02102713014c687..bc0de60e5274252bc04e0b599660eaad825eb5c6 100644
--- a/src/pe_coupling/partially_saturated_cells_method/CMakeLists.txt
+++ b/src/pe_coupling/partially_saturated_cells_method/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     PSMUtility.h
     BodyAndVolumeFractionMapping.cpp
diff --git a/src/pe_coupling/utility/CMakeLists.txt b/src/pe_coupling/utility/CMakeLists.txt
index 007e856e04cb79f3e0149d1aedae9891597ce480..3b611f1c52eabfc94a5a7deeef579c1080685e28 100644
--- a/src/pe_coupling/utility/CMakeLists.txt
+++ b/src/pe_coupling/utility/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( pe_coupling
+target_sources( walberla_pe_coupling
     PRIVATE
     LubricationCorrection.h
     TimeStep.h
diff --git a/src/postprocessing/CMakeLists.txt b/src/postprocessing/CMakeLists.txt
index 1a1ad27e0f345fd4995d47389513252e7d23fc18..10e5371e7f1d61917c8c6b6c9482cd37dd989590 100644
--- a/src/postprocessing/CMakeLists.txt
+++ b/src/postprocessing/CMakeLists.txt
@@ -4,9 +4,10 @@
 #
 ###################################################################################################
 
-add_library( postprocessing )
-target_link_libraries( postprocessing PUBLIC core domain_decomposition field geometry )
-target_sources( postprocessing
+add_library( walberla_postprocessing )
+add_library( walberla::postprocessing ALIAS walberla_postprocessing )
+target_link_libraries( walberla_postprocessing PUBLIC walberla::core walberla::domain_decomposition walberla::field walberla::geometry )
+target_sources( walberla_postprocessing
       PRIVATE
       MarchingCubes.impl.h
       MarchingCubes.h
diff --git a/src/python_coupling/CMakeLists.txt b/src/python_coupling/CMakeLists.txt
index 309a7cb9a451fe2b9d64347851334a158f7e6a63..9bd55a3d562b74c067bdc6d913878243d2a78ca3 100644
--- a/src/python_coupling/CMakeLists.txt
+++ b/src/python_coupling/CMakeLists.txt
@@ -1,9 +1,10 @@
- add_library( python_coupling )
- target_link_libraries( python_coupling PUBLIC pybind11::embed core communication domain_decomposition stencil field blockforest vtk )
+ add_library( walberla_python_coupling )
+ add_library( walberla::python_coupling ALIAS walberla_python_coupling )
+ target_link_libraries( walberla_python_coupling PUBLIC pybind11::embed walberla::core walberla::communication walberla::domain_decomposition walberla::stencil walberla::field walberla::blockforest walberla::vtk )
  if( WALBERLA_BUILD_WITH_GPU_SUPPORT )
-  target_link_libraries( python_coupling PUBLIC gpu )
+  target_link_libraries( walberla_python_coupling PUBLIC walberla::gpu )
  endif()
- target_sources( python_coupling
+ target_sources( walberla_python_coupling
        PRIVATE
        Manager.cpp
        PythonWrapper.h
diff --git a/src/python_coupling/export/CMakeLists.txt b/src/python_coupling/export/CMakeLists.txt
index a7b38929727c181622e0615baf877fb1d38e1abf..8e6f15866f84568f31db92900529bf5004cc0833 100644
--- a/src/python_coupling/export/CMakeLists.txt
+++ b/src/python_coupling/export/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( python_coupling
+target_sources( walberla_python_coupling
     PRIVATE
     GatherExport.impl.h
     VTKExport.cpp
diff --git a/src/python_coupling/helper/CMakeLists.txt b/src/python_coupling/helper/CMakeLists.txt
index 2c9fc4587c42d8af5dfe014bf57388286f79ec4b..7581d3c8aa240b2081e0dea770a9d7b4de3b29ed 100644
--- a/src/python_coupling/helper/CMakeLists.txt
+++ b/src/python_coupling/helper/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources( python_coupling
+target_sources( walberla_python_coupling
     PRIVATE
     ConfigFromDict.h
     MplHelpers.h
diff --git a/src/simd/CMakeLists.txt b/src/simd/CMakeLists.txt
index f850ff00d6037f4b731836e754009af0e3e85f7e..eb0cf6e3ff1f5cfe285e7a2301cb0c46f567d2e3 100644
--- a/src/simd/CMakeLists.txt
+++ b/src/simd/CMakeLists.txt
@@ -5,9 +5,10 @@
 #
 ###################################################################################################
 
-add_library( simd INTERFACE )
-target_link_libraries( simd INTERFACE core )
-target_sources( simd
+add_library( walberla_simd INTERFACE )
+add_library( walberla::simd ALIAS walberla_simd )
+target_link_libraries( walberla_simd INTERFACE walberla::core )
+target_sources( walberla_simd
       INTERFACE
       AVX.h
       SSE4.h
diff --git a/src/sqlite/CMakeLists.txt b/src/sqlite/CMakeLists.txt
index b7b33975158874dc2f7dfad346963ac45f674cc6..62804e5503cad4509cde62237e9f82a0ec781ae9 100644
--- a/src/sqlite/CMakeLists.txt
+++ b/src/sqlite/CMakeLists.txt
@@ -4,9 +4,10 @@
 #
 ###################################################################################################
 
-add_library( sqlite )
-target_link_libraries( sqlite PUBLIC core PRIVATE sqlite3 )
-target_sources( sqlite
+add_library( walberla_sqlite )
+add_library( walberla::sqlite ALIAS walberla_sqlite )
+target_link_libraries( walberla_sqlite PUBLIC walberla::core PRIVATE sqlite3 )
+target_sources( walberla_sqlite
       PRIVATE
       SQLite.cpp
       SQLite.h
diff --git a/src/stencil/CMakeLists.txt b/src/stencil/CMakeLists.txt
index 466e376fab0d4f5965f483fb834aa7d339748a88..ec4f55d469fb8549134742afd0dc5da573addce7 100644
--- a/src/stencil/CMakeLists.txt
+++ b/src/stencil/CMakeLists.txt
@@ -4,8 +4,9 @@
 #
 ###################################################################################################
 
-add_library( stencil INTERFACE )
-target_sources( stencil
+add_library( walberla_stencil INTERFACE )
+add_library( walberla::stencil ALIAS walberla_stencil )
+target_sources( walberla_stencil
       INTERFACE
       AABBQuadrant.h
       D2CornerStencil.h
@@ -24,6 +25,6 @@ target_sources( stencil
       Iterator.h
       Stencil.in.h
       )
-target_link_libraries( stencil INTERFACE core )
+target_link_libraries( walberla_stencil INTERFACE walberla::core )
 
 ###################################################################################################
diff --git a/src/timeloop/CMakeLists.txt b/src/timeloop/CMakeLists.txt
index ba2ef178c97a7144d5dd5f7a06c5ad76dad763b3..b4993e408e2cc988467634e821d7a675ffc78ee8 100644
--- a/src/timeloop/CMakeLists.txt
+++ b/src/timeloop/CMakeLists.txt
@@ -4,9 +4,10 @@
 #
 ###################################################################################################
 
-add_library( timeloop )
-target_link_libraries( timeloop PUBLIC core domain_decomposition )
-target_sources( timeloop
+add_library( walberla_timeloop )
+add_library( walberla::timeloop ALIAS walberla_timeloop )
+target_link_libraries( walberla_timeloop PUBLIC walberla::core walberla::domain_decomposition )
+target_sources( walberla_timeloop
       PRIVATE
       ITimeloop.h
       PerformanceMeter.h
diff --git a/src/vtk/CMakeLists.txt b/src/vtk/CMakeLists.txt
index 2b21bd8d5f1d4bd70a4b7efc85b4ee9ced6ba4b4..5d5275495fd12352f59144b48e81757e13a5c8cd 100644
--- a/src/vtk/CMakeLists.txt
+++ b/src/vtk/CMakeLists.txt
@@ -4,8 +4,9 @@
 #
 ###################################################################################################
 
-add_library( vtk )
-target_sources( vtk
+add_library( walberla_vtk )
+add_library( walberla::vtk ALIAS walberla_vtk )
+target_sources( walberla_vtk
       PRIVATE
       Base64Writer.cpp
       Base64Writer.h
@@ -24,6 +25,6 @@ target_sources( vtk
       UtilityFunctions.h
       ChainedFilter.h
       )
-target_link_libraries( vtk PUBLIC core blockforest domain_decomposition )
+target_link_libraries( walberla_vtk PUBLIC walberla::core walberla::blockforest walberla::domain_decomposition )
 
 ###################################################################################################
diff --git a/tests/blockforest/CMakeLists.txt b/tests/blockforest/CMakeLists.txt
index 4778166c984c9c4ad07c615527bf6e129afcf971..99f9ad38c8be1bdf0e33226628195d148b8113f2 100644
--- a/tests/blockforest/CMakeLists.txt
+++ b/tests/blockforest/CMakeLists.txt
@@ -1,22 +1,22 @@
 ###################################################################################################
 #
-# Tests for blockforest module
+# Tests for walberla::blockforest  module
 #
 ###################################################################################################
 
-waLBerla_compile_test ( FILES BlockIDTest.cpp DEPENDS core )
+waLBerla_compile_test( FILES BlockIDTest.cpp DEPENDS walberla::core )
 waLBerla_execute_test ( NAME BlockIDTest LABELS longrun )
 
-waLBerla_compile_test( FILES SetupBlockForestTest.cpp DEPENDS core )
+waLBerla_compile_test( FILES SetupBlockForestTest.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME SetupBlockForestTest LABELS longrun CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES BlockForestTest.cpp DEPENDS core domain_decomposition )
+waLBerla_compile_test( FILES BlockForestTest.cpp DEPENDS walberla::core walberla::domain_decomposition )
 waLBerla_execute_test( NAME BlockForestTest PROCESSES 4 )
 
-waLBerla_compile_test( FILES DeterministicCreation.cpp DEPENDS core )
+waLBerla_compile_test( FILES DeterministicCreation.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME DeterministicCreation PROCESSES 8 )
 
-waLBerla_compile_test( NAME   SaveLoad FILES SaveLoadTest.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME SaveLoad FILES SaveLoadTest.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   SaveLoad01 COMMAND $<TARGET_FILE:SaveLoad> PROCESSES 1 )
 waLBerla_execute_test( NAME   SaveLoad02 COMMAND $<TARGET_FILE:SaveLoad> PROCESSES 2 )
 waLBerla_execute_test( NAME   SaveLoad04 COMMAND $<TARGET_FILE:SaveLoad> PROCESSES 4 )
@@ -27,10 +27,10 @@ set_property( TEST SaveLoad04 PROPERTY DEPENDS SaveLoad02 ) #serialize runs of t
 set_property( TEST SaveLoad08 PROPERTY DEPENDS SaveLoad04 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
 endif()
 
-waLBerla_compile_test( FILES StructuredBlockForestTest.cpp DEPENDS core domain_decomposition )
+waLBerla_compile_test( FILES StructuredBlockForestTest.cpp DEPENDS walberla::core walberla::domain_decomposition )
 waLBerla_execute_test( NAME StructuredBlockForestTest )
 
-waLBerla_compile_test( FILES BlockDataIOTest.cpp DEPENDS core field )
+waLBerla_compile_test( FILES BlockDataIOTest.cpp DEPENDS walberla::core walberla::field )
 waLBerla_execute_test( NAME BlockDataIOTest1 COMMAND $<TARGET_FILE:BlockDataIOTest> DEPENDS_ON_TARGETS BlockDataIOTest )
 waLBerla_execute_test( NAME BlockDataIOTest3 COMMAND $<TARGET_FILE:BlockDataIOTest> PROCESSES 3 DEPENDS_ON_TARGETS BlockDataIOTest )
 waLBerla_execute_test( NAME BlockDataIOTest8 COMMAND $<TARGET_FILE:BlockDataIOTest> PROCESSES 8 DEPENDS_ON_TARGETS BlockDataIOTest )
@@ -44,12 +44,12 @@ endif( WALBERLA_BUILD_WITH_MPI )
 
 # communication
 
-waLBerla_compile_test( FILES communication/GhostLayerCommTest.cpp DEPENDS field timeloop )
+waLBerla_compile_test( FILES communication/GhostLayerCommTest.cpp DEPENDS walberla::field walberla::timeloop )
 waLBerla_execute_test( NAME GhostLayerCommTest1 COMMAND $<TARGET_FILE:GhostLayerCommTest> DEPENDS_ON_TARGETS GhostLayerCommTest )
 waLBerla_execute_test( NAME GhostLayerCommTest4 COMMAND $<TARGET_FILE:GhostLayerCommTest> PROCESSES 4 DEPENDS_ON_TARGETS GhostLayerCommTest )
 waLBerla_execute_test( NAME GhostLayerCommTest8 COMMAND $<TARGET_FILE:GhostLayerCommTest> PROCESSES 8 DEPENDS_ON_TARGETS GhostLayerCommTest )
 
-waLBerla_compile_test( FILES communication/DirectionBasedReduceCommTest.cpp DEPENDS field timeloop )
+waLBerla_compile_test( FILES communication/DirectionBasedReduceCommTest.cpp DEPENDS walberla::field walberla::timeloop )
 waLBerla_execute_test( NAME DirectionBasedReduceCommTest1 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> DEPENDS_ON_TARGETS DirectionBasedReduceCommTest )
 waLBerla_execute_test( NAME DirectionBasedReduceCommTest3 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> PROCESSES 3 DEPENDS_ON_TARGETS DirectionBasedReduceCommTest )
 waLBerla_execute_test( NAME DirectionBasedReduceCommTest8 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> PROCESSES 8 DEPENDS_ON_TARGETS DirectionBasedReduceCommTest )
diff --git a/tests/blockforest/communication/CMakeLists.txt b/tests/blockforest/communication/CMakeLists.txt
index f7e392c47e386a9957e31eb8c5aa2f2214281d75..f8e67a5ee327da3bb3e13ad278874dcfc0a44489 100644
--- a/tests/blockforest/communication/CMakeLists.txt
+++ b/tests/blockforest/communication/CMakeLists.txt
@@ -4,12 +4,12 @@
 #
 ###################################################################################################
 
-waLBerla_compile_test( FILES GhostLayerCommTest.cpp DEPENDS timeloop )
+waLBerla_compile_test( FILES GhostLayerCommTest.cpp DEPENDS walberla::timeloop )
 waLBerla_execute_test( NAME GhostLayerCommTest1 COMMAND $<TARGET_FILE:GhostLayerCommTest> )
 waLBerla_execute_test( NAME GhostLayerCommTest4 COMMAND $<TARGET_FILE:GhostLayerCommTest> PROCESSES 4 )
 waLBerla_execute_test( NAME GhostLayerCommTest8 COMMAND $<TARGET_FILE:GhostLayerCommTest> PROCESSES 8 )
 
-waLBerla_compile_test( FILES DirectionBasedReduceCommTest.cpp DEPENDS timeloop )
+waLBerla_compile_test( FILES DirectionBasedReduceCommTest.cpp DEPENDS walberla::timeloop )
 waLBerla_execute_test( NAME DirectionBasedReduceCommTest1 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> )
 waLBerla_execute_test( NAME DirectionBasedReduceCommTest3 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> PROCESSES 3 )
 waLBerla_execute_test( NAME DirectionBasedReduceCommTest8 COMMAND $<TARGET_FILE:DirectionBasedReduceCommTest> PROCESSES 8 )
diff --git a/tests/boundary/CMakeLists.txt b/tests/boundary/CMakeLists.txt
index 8dd843d974f81d9e7ce4521f2f88604596bd618d..ab46510bbeaf50c4cee07b643f8a4993ee447b6f 100644
--- a/tests/boundary/CMakeLists.txt
+++ b/tests/boundary/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###################################################################################################
 #
-# Tests for boundary module
+# Tests for walberla::boundary   module
 #
 ###################################################################################################
 
@@ -12,7 +12,7 @@ if (WALBERLA_BUILD_WITH_PYTHON)
 
     waLBerla_link_files_to_builddir( *.py )
 
-    waLBerla_compile_test( FILES TestShiftedPeriodicity.cpp DEPENDS blockforest field python_coupling )
+    waLBerla_compile_test( FILES TestShiftedPeriodicity.cpp DEPENDS walberla::blockforest walberla::field walberla::python_coupling )
     waLBerla_execute_test( NAME TestShiftedPeriodicity1 COMMAND $<TARGET_FILE:TestShiftedPeriodicity> ${CMAKE_CURRENT_SOURCE_DIR}/TestShiftedPeriodicitySetup.py )
     waLBerla_execute_test( NAME TestShiftedPeriodicity2 COMMAND $<TARGET_FILE:TestShiftedPeriodicity> ${CMAKE_CURRENT_SOURCE_DIR}/TestShiftedPeriodicitySetup.py PROCESSES 2 )
     waLBerla_execute_test( NAME TestShiftedPeriodicity4 COMMAND $<TARGET_FILE:TestShiftedPeriodicity> ${CMAKE_CURRENT_SOURCE_DIR}/TestShiftedPeriodicitySetup.py PROCESSES 4 )
diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt
index 604de6371b573b350638ea4fb4f003d93960cb7c..74a84d6525729cbe61bf8d6276bf2f36dabb760d 100644
--- a/tests/core/CMakeLists.txt
+++ b/tests/core/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###################################################################################################
 #
-# Tests for core module
+# Tests for walberla::core module
 #
 ###################################################################################################
 
@@ -73,7 +73,7 @@ waLBerla_execute_test( NAME MatrixVector2Test )
 waLBerla_compile_test( FILES math/Matrix3Test.cpp )
 waLBerla_execute_test( NAME Matrix3Test )
 
-waLBerla_compile_test( FILES math/GenericAABBTest.cpp DEPENDS stencil domain_decomposition )
+waLBerla_compile_test( FILES math/GenericAABBTest.cpp DEPENDS walberla::stencil walberla::domain_decomposition )
 waLBerla_execute_test( NAME GenericAABBTest )
 
 
@@ -120,7 +120,7 @@ waLBerla_execute_test( NAME SetReductionTest5  COMMAND $<TARGET_FILE:SetReductio
 waLBerla_execute_test( NAME SetReductionTest27 COMMAND $<TARGET_FILE:SetReductionTest> PROCESSES 27 )
 
 if ( WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT )
-   waLBerla_compile_test( Name MPIFloat16Test FILES mpi/MPIFloat16Test.cpp DEPENDS core )
+   waLBerla_compile_test( Name MPIFloat16Test FILES mpi/MPIFloat16Test.cpp DEPENDS walberla::core )
    target_compile_features( MPIFloat16Test PUBLIC cxx_std_23 )
    waLBerla_execute_test( NAME MPIFloat16Test4 COMMAND $<TARGET_FILE:MPIFloat16Test> PROCESSES 4)
 endif ()
@@ -149,18 +149,18 @@ waLBerla_execute_test( NAME TimingPoolTest PROCESSES 3  )
 waLBerla_compile_test( FILES timing/TimingTreeTest.cpp )
 waLBerla_execute_test( NAME TimingTreeTest PROCESSES 3)
 
-waLBerla_compile_test( FILES timing/SweepTimeloopTimerReduction.cpp DEPENDS blockforest domain_decomposition timeloop)
+waLBerla_compile_test( FILES timing/SweepTimeloopTimerReduction.cpp DEPENDS walberla::blockforest walberla::domain_decomposition walberla::timeloop )
 waLBerla_execute_test( NAME SweepTimeloopTimerReduction PROCESSES 9  )
 
 
 ########
-# core #
+# walberla::core #
 ########
 
 if ( WALBERLA_BUILD_WITH_PYTHON )
-   waLBerla_compile_test( FILES AllHeaderTest.cpp DEPENDS blockforest field geometry pe pe_coupling python_coupling )
+   waLBerla_compile_test( FILES AllHeaderTest.cpp DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::pe walberla::pe_coupling walberla::python_coupling )
 else()
-   waLBerla_compile_test( FILES AllHeaderTest.cpp DEPENDS blockforest field geometry pe pe_coupling )
+   waLBerla_compile_test( FILES AllHeaderTest.cpp DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::pe walberla::pe_coupling )
 endif()
 waLBerla_execute_test( NAME AllHeaderTest )
 
@@ -211,12 +211,13 @@ endif()
 ##################
 
 if( WALBERLA_BUILD_WITH_METIS )
-   waLBerla_compile_test( NAME MetisTest FILES load_balancing/MetisTest.cpp DEPENDS field )
+   waLBerla_compile_test( NAME MetisTest FILES load_balancing/MetisTest.cpp DEPENDS walberla::field )
    waLBerla_execute_test( NAME MetisTest COMMAND $<TARGET_FILE:MetisTest> 64 64  4 --no-vtk )
 endif()
 
 if( WALBERLA_BUILD_WITH_PARMETIS )
-   waLBerla_compile_test( NAME ParMetisTest FILES load_balancing/ParMetisTest.cpp DEPENDS blockforest field stencil vtk  )
+   waLBerla_compile_test( NAME ParMetisTest FILES load_balancing/ParMetisTest.cpp
+         DEPENDS walberla::blockforest walberla::field walberla::stencil walberla::vtk )
    waLBerla_execute_test( NAME ParMetisTest1 COMMAND $<TARGET_FILE:ParMetisTest> 64 64  4 --no-vtk )
    waLBerla_execute_test( NAME ParMetisTest2 COMMAND $<TARGET_FILE:ParMetisTest> 64 64  8 --no-vtk PROCESSES 2 )
    waLBerla_execute_test( NAME ParMetisTest4 COMMAND $<TARGET_FILE:ParMetisTest> 64 64 16 --no-vtk PROCESSES 4 )
@@ -230,7 +231,7 @@ endif()
 ###################
 
 if ( WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT )
-   waLBerla_compile_test( Name Float16SupportTest FILES Float16SupportTest.cpp DEPENDS core)
+   waLBerla_compile_test( Name Float16SupportTest FILES Float16SupportTest.cpp DEPENDS walberla::core )
    # Actual support for float16 is available only since C++23
    #   before is_arithmetic and is_floating_point evaluated to false,
    #   also many STL functions are compatible with float16 only since C++23.
diff --git a/tests/domain_decomposition/CMakeLists.txt b/tests/domain_decomposition/CMakeLists.txt
index 56fd5c358a5d74fc28ee78b910a0a08b22ca4524..8ca610f248c3d2d392548ebfa536f32e5cea9423 100644
--- a/tests/domain_decomposition/CMakeLists.txt
+++ b/tests/domain_decomposition/CMakeLists.txt
@@ -1,14 +1,14 @@
 ###################################################################################################
 #
-# Tests for domain_decomposition module
+# Tests for walberla::domain_decomposition module
 #
 ###################################################################################################
 
-waLBerla_compile_test( NAME MapPointToPeriodicDomain FILES MapPointToPeriodicDomain.cpp DEPENDS core )
+waLBerla_compile_test( NAME MapPointToPeriodicDomain FILES MapPointToPeriodicDomain.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME MapPointToPeriodicDomain )
 
-waLBerla_compile_test( NAME PeriodicIntersect FILES PeriodicIntersect.cpp DEPENDS core blockforest )
+waLBerla_compile_test( NAME PeriodicIntersect FILES PeriodicIntersect.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME PeriodicIntersect )
 
-waLBerla_compile_test( NAME PeriodicIntersectionVolume FILES PeriodicIntersectionVolume.cpp DEPENDS core blockforest )
+waLBerla_compile_test( NAME PeriodicIntersectionVolume FILES PeriodicIntersectionVolume.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME PeriodicIntersectionVolume )
diff --git a/tests/fft/CMakeLists.txt b/tests/fft/CMakeLists.txt
index 97dcd8bfb8d29c09754d581cb02dda74eac2af4d..2328d182d46ce7871b90cec31981d23138cac429 100644
--- a/tests/fft/CMakeLists.txt
+++ b/tests/fft/CMakeLists.txt
@@ -1,8 +1,8 @@
 if ( WALBERLA_BUILD_WITH_FFT )
-    waLBerla_compile_test( FILES FftTest.cpp DEPENDS field fft ) 
+   waLBerla_compile_test( FILES FftTest.cpp DEPENDS walberla::field walberla::fft )
     waLBerla_execute_test( NAME FftTest COMMAND $<TARGET_FILE:FftTest> PROCESSES 1 )
     waLBerla_execute_test( NAME FftTestParallel COMMAND $<TARGET_FILE:FftTest> PROCESSES 8 )
-    waLBerla_compile_test( FILES GreensTest.cpp DEPENDS field fft ) 
+   waLBerla_compile_test( FILES GreensTest.cpp DEPENDS walberla::field walberla::fft )
     waLBerla_execute_test( NAME GreensTest COMMAND $<TARGET_FILE:GreensTest> PROCESSES 1 )
     waLBerla_execute_test( NAME GreensTestParallel COMMAND $<TARGET_FILE:GreensTest> PROCESSES 8 )
 endif()
diff --git a/tests/field/CMakeLists.txt b/tests/field/CMakeLists.txt
index c45c668aa56b97253ed33e5fa1f42ac9ebf455c5..295147c9687f0e2a6d8d76cc7868aa969f0c5828 100644
--- a/tests/field/CMakeLists.txt
+++ b/tests/field/CMakeLists.txt
@@ -1,16 +1,16 @@
 ###################################################################################################
 #
-# Tests for field module
+# Tests for walberla::field module
 #
 ###################################################################################################
 
-waLBerla_compile_test( FILES AccuracyEvaluationTest.cpp DEPENDS blockforest )
+waLBerla_compile_test( FILES AccuracyEvaluationTest.cpp DEPENDS walberla::blockforest )
 waLBerla_execute_test( NAME AccuracyEvaluationTest4 COMMAND $<TARGET_FILE:AccuracyEvaluationTest> PROCESSES 4  )
 
-waLBerla_compile_test( FILES AddToStorageTest.cpp DEPENDS blockforest )
+waLBerla_compile_test( FILES AddToStorageTest.cpp DEPENDS walberla::blockforest )
 waLBerla_execute_test( NAME AddToStorageTest )
 
-waLBerla_compile_test( FILES communication/FieldPackInfoTest.cpp DEPENDS blockforest )
+waLBerla_compile_test( FILES communication/FieldPackInfoTest.cpp DEPENDS walberla::blockforest )
 waLBerla_execute_test( NAME  FieldPackInfoTest )
 
 waLBerla_compile_test( FILES distributors/DistributionTest.cpp)
@@ -28,7 +28,7 @@ waLBerla_execute_test( NAME FieldTiming  )
 waLBerla_compile_test( FILES FlagFieldTest.cpp)
 waLBerla_execute_test( NAME FlagFieldTest )
 
-waLBerla_compile_test( FILES StabilityCheckerTest.cpp DEPENDS blockforest field timeloop )
+waLBerla_compile_test( FILES StabilityCheckerTest.cpp DEPENDS walberla::blockforest walberla::field walberla::timeloop )
 waLBerla_execute_test( NAME StabilityCheckerTest )
 
 waLBerla_compile_test( FILES interpolators/InterpolationTest.cpp)
@@ -37,14 +37,14 @@ waLBerla_execute_test( NAME InterpolationTest )
 waLBerla_compile_test( FILES interpolators/FieldInterpolationTest.cpp)
 waLBerla_execute_test( NAME FieldInterpolationTest )
 
-waLBerla_compile_test( FILES adaptors/AdaptorTest.cpp DEPENDS blockforest lbm )
+waLBerla_compile_test( FILES adaptors/AdaptorTest.cpp DEPENDS walberla::blockforest walberla::lbm )
 waLBerla_execute_test( NAME AdaptorTest )
 
-waLBerla_compile_test( FILES FieldGatherTest.cpp DEPENDS blockforest )
+waLBerla_compile_test( FILES FieldGatherTest.cpp DEPENDS walberla::blockforest )
 waLBerla_execute_test( NAME FieldGatherTest3 COMMAND $<TARGET_FILE:FieldGatherTest>  PROCESSES 3 DEPENDS_ON_TARGETS FieldGatherTest )
 waLBerla_execute_test( NAME FieldGatherTest1 COMMAND $<TARGET_FILE:FieldGatherTest>  PROCESSES 1 DEPENDS_ON_TARGETS FieldGatherTest )
 
-waLBerla_compile_test( FILES FieldFileIOTest.cpp DEPENDS blockforest )
+waLBerla_compile_test( FILES FieldFileIOTest.cpp DEPENDS walberla::blockforest )
 waLBerla_execute_test( NAME FieldFileIOTest1Proc  COMMAND $<TARGET_FILE:FieldFileIOTest> PROCESSES 1  )
 waLBerla_execute_test( NAME FieldFileIOTest2Proc  COMMAND $<TARGET_FILE:FieldFileIOTest> PROCESSES 2  )
 waLBerla_execute_test( NAME FieldFileIOTest4Proc  COMMAND $<TARGET_FILE:FieldFileIOTest> PROCESSES 4  )
@@ -57,7 +57,7 @@ if( WALBERLA_BUILD_WITH_MPI )
 endif( WALBERLA_BUILD_WITH_MPI )
 
 if( WALBERLA_BUILD_WITH_MPI )
-   waLBerla_compile_test( FILES FieldMPIDatatypesTest.cpp DEPENDS blockforest )
+   waLBerla_compile_test( FILES FieldMPIDatatypesTest.cpp DEPENDS walberla::blockforest )
    waLBerla_execute_test( NAME FieldMPIDatatypesTestRelease  COMMAND $<TARGET_FILE:FieldMPIDatatypesTest> PROCESSES 1                CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME FieldMPIDatatypesTestDebug    COMMAND $<TARGET_FILE:FieldMPIDatatypesTest> PROCESSES 1 LABELS longrun CONFIGURATIONS Debug DebugOptimized   )
 endif( WALBERLA_BUILD_WITH_MPI )
@@ -68,33 +68,33 @@ endif( WALBERLA_BUILD_WITH_MPI )
 if( WALBERLA_BUILD_WITH_CODEGEN )
 waLBerla_generate_target_from_python(NAME CodegenJacobiCPUGeneratedJacobiKernel FILE codegen/JacobiKernel.py
       OUT_FILES JacobiKernel2D.cpp JacobiKernel2D.h JacobiKernel3D.cpp JacobiKernel3D.h )
-waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp DEPENDS timeloop CodegenJacobiCPUGeneratedJacobiKernel)
+waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp DEPENDS walberla::timeloop CodegenJacobiCPUGeneratedJacobiKernel )
 waLBerla_execute_test( NAME CodegenJacobiCPU )
 
 waLBerla_generate_target_from_python(NAME SweepCollectionKernel FILE codegen/SweepCollection.py
         OUT_FILES SweepCollection.h SweepCollection.cpp)
-waLBerla_compile_test( FILES codegen/SweepCollection.cpp DEPENDS timeloop SweepCollectionKernel)
+waLBerla_compile_test( FILES codegen/SweepCollection.cpp DEPENDS walberla::timeloop SweepCollectionKernel )
 waLBerla_execute_test( NAME SweepCollection )
 
 waLBerla_generate_target_from_python(NAME CodegenPoissonCPUGeneratedKernel FILE codegen/Poisson.py
       OUT_FILES Poisson.cpp Poisson.h )
-waLBerla_compile_test( FILES codegen/CodegenPoissonCPU.cpp DEPENDS timeloop CodegenPoissonCPUGeneratedKernel)
+waLBerla_compile_test( FILES codegen/CodegenPoissonCPU.cpp DEPENDS walberla::timeloop CodegenPoissonCPUGeneratedKernel )
 waLBerla_execute_test( NAME CodegenPoissonCPU )
 
 waLBerla_generate_target_from_python(NAME CodeGenMultipleFieldSwaps FILE codegen/MultipleFieldSwaps.py
         OUT_FILES MultipleFieldSwaps.cpp MultipleFieldSwaps.h )
-waLBerla_compile_test( FILES codegen/MultipleFieldSwaps.cpp DEPENDS timeloop CodeGenMultipleFieldSwaps)
+waLBerla_compile_test( FILES codegen/MultipleFieldSwaps.cpp DEPENDS walberla::timeloop CodeGenMultipleFieldSwaps )
 waLBerla_execute_test( NAME MultipleFieldSwaps )
 
 waLBerla_generate_target_from_python(NAME CodegenGeneratedCPUFieldPackInfo FILE codegen/GeneratedFieldPackInfoTest.py
         OUT_FILES ScalarFieldCommunication.cpp ScalarFieldCommunication.h
                   ScalarFieldPullReduction.cpp ScalarFieldPullReduction.h )
 waLBerla_compile_test( FILES codegen/GeneratedFieldPackInfoTest.cpp
-        DEPENDS blockforest core field CodegenGeneratedCPUFieldPackInfo )
+      DEPENDS walberla::blockforest walberla::core walberla::field CodegenGeneratedCPUFieldPackInfo )
 waLBerla_execute_test( NAME GeneratedFieldPackInfoTest )
 
 waLBerla_generate_target_from_python(NAME CodeGenEK FILE codegen/EK.py
         OUT_FILES EKFlux.cpp EKFlux.h EKContinuity.cpp EKContinuity.h )
-waLBerla_compile_test( FILES codegen/EK.cpp DEPENDS blockforest core field timeloop CodeGenEK)
+waLBerla_compile_test( FILES codegen/EK.cpp DEPENDS walberla::blockforest walberla::core walberla::field walberla::timeloop CodeGenEK )
 waLBerla_execute_test( NAME EK )
 endif()
diff --git a/tests/gather/CMakeLists.txt b/tests/gather/CMakeLists.txt
index 1939770dd957a5a3f92fd33f1a1d35008fe7df16..3df89ff75ebf3ca20bf2cefa9e88fcef31179942 100644
--- a/tests/gather/CMakeLists.txt
+++ b/tests/gather/CMakeLists.txt
@@ -5,14 +5,11 @@
 ###################################################################################################
 
 
-
-                       
-
-waLBerla_compile_test( FILES MPIGatherSchemeTest.cpp )
+waLBerla_compile_test( FILES MPIGatherSchemeTest.cpp DEPENDS )
 waLBerla_execute_test( NAME MPIGatherSchemeTest PROCESSES 7 )
 
-waLBerla_compile_test( FILES CurveGatherTest.cpp )
+waLBerla_compile_test( FILES CurveGatherTest.cpp DEPENDS )
 waLBerla_execute_test( NAME CurveGatherTest PROCESSES 4 )
 
-waLBerla_compile_test( FILES GatherSchemeTest.cpp )
+waLBerla_compile_test( FILES GatherSchemeTest.cpp DEPENDS )
 waLBerla_execute_test( NAME GatherSchemeTest PROCESSES 4 )
diff --git a/tests/geometry/CMakeLists.txt b/tests/geometry/CMakeLists.txt
index 01ac0cba6f4b9ede6ed85c08ae9a412616f2a39d..c78d25b244f77099c118898d55f0fee9f8e4e5d3 100644
--- a/tests/geometry/CMakeLists.txt
+++ b/tests/geometry/CMakeLists.txt
@@ -17,12 +17,12 @@ waLBerla_execute_test( NAME VoxelFileTestLong COMMAND $<TARGET_FILE:VoxelFileTes
 set_property( TEST VoxelFileTestLong PROPERTY DEPENDS VoxelFileTest ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
 
 
-waLBerla_compile_test( FILES ScalarFieldFromBodyTest.cpp )
+waLBerla_compile_test( FILES ScalarFieldFromBodyTest.cpp DEPENDS )
 waLBerla_execute_test( NAME ScalarFieldFromBodyTest )
 
 
 file( COPY "test.png" DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
-waLBerla_compile_test( FILES ScalarFieldFromGrayScaleImageTest.cpp )
+waLBerla_compile_test( FILES ScalarFieldFromGrayScaleImageTest.cpp DEPENDS )
 waLBerla_execute_test( NAME ScalarFieldFromGrayScaleImageTest )
 
 
diff --git a/tests/gpu/CMakeLists.txt b/tests/gpu/CMakeLists.txt
index 7a134adde546521e7dfa3af0c0cd91664253936a..1214794a2567eb2e38182f1f025c2888a5dcb156 100644
--- a/tests/gpu/CMakeLists.txt
+++ b/tests/gpu/CMakeLists.txt
@@ -6,19 +6,21 @@
 
 if( WALBERLA_BUILD_WITH_CUDA )
 
-waLBerla_compile_test( FILES communication/GPUPackInfoTest.cpp DEPENDS blockforest )
+   waLBerla_compile_test( FILES communication/GPUPackInfoTest.cpp DEPENDS walberla::blockforest )
 waLBerla_execute_test( NAME  GPUPackInfoTest )
 
-waLBerla_compile_test( FILES communication/GPUPackInfoCommunicationTest.cpp DEPENDS domain_decomposition blockforest stencil )
+   waLBerla_compile_test( FILES communication/GPUPackInfoCommunicationTest.cpp
+         DEPENDS walberla::domain_decomposition walberla::blockforest walberla::stencil )
 waLBerla_execute_test( NAME  GPUPackInfoCommunicationTest )
 
-waLBerla_compile_test( FILES communication/GPUBlockSelectorCommunicationTest.cpp DEPENDS domain_decomposition blockforest stencil )
+   waLBerla_compile_test( FILES communication/GPUBlockSelectorCommunicationTest.cpp
+         DEPENDS walberla::domain_decomposition walberla::blockforest walberla::stencil )
 waLBerla_execute_test( NAME  GPUBlockSelectorCommunicationTest )
 
 waLBerla_compile_test( FILES FieldTransferTest.cpp )
 waLBerla_execute_test( NAME  FieldTransferTest )
 
-waLBerla_compile_test( FILES SimpleKernelTest.cpp Kernels.cu DEPENDS blockforest timeloop )
+   waLBerla_compile_test( FILES SimpleKernelTest.cpp Kernels.cu DEPENDS walberla::blockforest walberla::timeloop )
 waLBerla_execute_test( NAME  SimpleKernelTest )
 
 waLBerla_compile_test( FILES FieldIndexing3DTest.cpp FieldIndexing3DTest.cu )
@@ -29,22 +31,22 @@ waLBerla_generate_target_from_python(NAME CodegenJacobiGPUGeneratedCudaJacobiKer
       OUT_FILES CudaJacobiKernel2D.cu CudaJacobiKernel2D.h
       CudaJacobiKernel3D.cu CudaJacobiKernel3D.h)
 waLBerla_compile_test( FILES codegen/CodegenJacobiGPU.cpp
-                       DEPENDS blockforest timeloop CodegenJacobiGPUGeneratedCudaJacobiKernel )
+      DEPENDS walberla::blockforest walberla::timeloop CodegenJacobiGPUGeneratedCudaJacobiKernel )
 waLBerla_execute_test( NAME CodegenJacobiGPU )
 
 waLBerla_generate_target_from_python(NAME CodegenPoissonGPUGeneratedKernel FILE codegen/CudaPoisson.py
         OUT_FILES PoissonGPU.cu PoissonGPU.h )
-waLBerla_compile_test( FILES codegen/CodegenPoissonGPU.cpp DEPENDS gpu timeloop CodegenPoissonGPUGeneratedKernel)
+   waLBerla_compile_test( FILES codegen/CodegenPoissonGPU.cpp DEPENDS walberla::gpu walberla::timeloop CodegenPoissonGPUGeneratedKernel )
 waLBerla_execute_test( NAME CodegenPoissonGPU )
 
 # The following tests work only for CUDA enabled MPI
 waLBerla_compile_test( FILES communication/CommTest.cpp )
 #waLBerla_execute_test( NAME  CommTest PROCESSES 2)
 
-waLBerla_compile_test( FILES CudaMPI.cpp DEPENDS blockforest timeloop )
+   waLBerla_compile_test( FILES CudaMPI.cpp DEPENDS walberla::blockforest walberla::timeloop )
 #waLBerla_execute_test( NAME  CudaMPI )
 
-waLBerla_compile_test( FILES AlignmentTest.cpp DEPENDS blockforest timeloop )
+   waLBerla_compile_test( FILES AlignmentTest.cpp DEPENDS walberla::blockforest walberla::timeloop )
 
 waLBerla_generate_target_from_python(NAME MicroBenchmarkGpuLbmGenerated FILE codegen/MicroBenchmarkGpuLbm.py
       OUT_FILES MicroBenchmarkStreamKernel.cu MicroBenchmarkCopyKernel.cu MicroBenchmarkStreamKernel.h MicroBenchmarkCopyKernel.h)
@@ -54,14 +56,14 @@ waLBerla_generate_target_from_python(NAME CodegenGeneratedGPUFieldPackInfo FILE
         OUT_FILES ScalarFieldCommunicationGPU.cu ScalarFieldCommunicationGPU.h
         ScalarFieldPullReductionGPU.cu ScalarFieldPullReductionGPU.h )
 waLBerla_compile_test( FILES codegen/GeneratedFieldPackInfoTestGPU.cpp
-        DEPENDS blockforest core field CodegenGeneratedGPUFieldPackInfo )
+      DEPENDS walberla::blockforest walberla::core walberla::field CodegenGeneratedGPUFieldPackInfo )
 waLBerla_execute_test( NAME GeneratedFieldPackInfoTestGPU )
 
     if (WALBERLA_BUILD_WITH_PYTHON)
 
         waLBerla_link_files_to_builddir( *.py )
 
-        waLBerla_compile_test( FILES TestShiftedPeriodicityGPU.cpp DEPENDS gpu blockforest field python_coupling )
+        waLBerla_compile_test( FILES TestShiftedPeriodicityGPU.cpp DEPENDS walberla::gpu walberla::blockforest walberla::field walberla::python_coupling )
         waLBerla_execute_test( NAME TestShiftedPeriodicityGPU COMMAND $<TARGET_FILE:TestShiftedPeriodicityGPU> ${CMAKE_CURRENT_SOURCE_DIR}/TestShiftedPeriodicitySetupGPU.py )
 
     endif()
diff --git a/tests/lbm/CMakeLists.txt b/tests/lbm/CMakeLists.txt
index 76a38b81119c2673d8d4ca251737b4e087ede2c9..d3111aa32ce6587662a37b4283f5ac36168b7a34 100644
--- a/tests/lbm/CMakeLists.txt
+++ b/tests/lbm/CMakeLists.txt
@@ -1,63 +1,63 @@
 #############################################################################################################################
 #
-# Tests for lbm module
+# Tests for walberla::lbm module
 #
 #############################################################################################################################
 
 waLBerla_link_files_to_builddir( "*.prm" )
 
-waLBerla_compile_test( FILES SweepEquivalenceTest.cpp DEPENDS blockforest timeloop )
+waLBerla_compile_test( FILES SweepEquivalenceTest.cpp DEPENDS walberla::blockforest walberla::timeloop )
 waLBerla_execute_test( NAME SweepEquivalenceTest )
 
-waLBerla_compile_test( FILES BoundaryHandlingCommunication.cpp DEPENDS blockforest timeloop )
+waLBerla_compile_test( FILES BoundaryHandlingCommunication.cpp DEPENDS walberla::blockforest walberla::timeloop )
 waLBerla_execute_test( NAME BoundaryHandlingCommunication PROCESSES 8 )
 
-waLBerla_compile_test( FILES UnrollTest.cpp  )
+waLBerla_compile_test( FILES UnrollTest.cpp DEPENDS walberla::core )
 
 
-waLBerla_compile_test( FILES boundary/SimplePABTest.cpp DEPENDS field blockforest timeloop vtk )
+waLBerla_compile_test( FILES boundary/SimplePABTest.cpp DEPENDS walberla::field walberla::blockforest walberla::timeloop walberla::vtk )
 
 
-waLBerla_compile_test( FILES boundary/SimpleDiffusionDirichlet.cpp DEPENDS field blockforest geometry timeloop vtk )
+waLBerla_compile_test( FILES boundary/SimpleDiffusionDirichlet.cpp DEPENDS walberla::field walberla::blockforest walberla::geometry walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME SimpleDiffusionDirichletDef COMMAND $<TARGET_FILE:SimpleDiffusionDirichlet>  -l 4 -w 2 -o 1.2 -d 3 -t 333 -c 0 -r 0 )
 waLBerla_execute_test( NAME SimpleDiffusionDirichletRef COMMAND $<TARGET_FILE:SimpleDiffusionDirichlet>  -l 4 -w 4 -o 1.2 -d 3 -t 3   -c 0 -r 1 )
 waLBerla_execute_test( NAME SimpleDiffusionDirichletCav COMMAND $<TARGET_FILE:SimpleDiffusionDirichlet>  -l 5 -w 3 -o 1.2 -d 3 -t 333 -c 1 )
 
-waLBerla_compile_test( FILES boundary/BoundaryForce.cpp DEPENDS blockforest timeloop )
+waLBerla_compile_test( FILES boundary/BoundaryForce.cpp DEPENDS walberla::blockforest walberla::timeloop )
 waLBerla_execute_test( NAME BoundaryForceShort COMMAND $<TARGET_FILE:BoundaryForce> 10 PROCESSES 2 CONFIGURATIONS Debug DebugOptimized )
 waLBerla_execute_test( NAME BoundaryForce COMMAND COMMAND $<TARGET_FILE:BoundaryForce> PROCESSES 2 CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES boundary/BoundaryForceCouette.cpp DEPENDS blockforest timeloop )
+waLBerla_compile_test( FILES boundary/BoundaryForceCouette.cpp DEPENDS walberla::blockforest walberla::timeloop )
 waLBerla_execute_test( NAME BoundaryForceCouetteShort COMMAND $<TARGET_FILE:BoundaryForceCouette> 10 PROCESSES 2 CONFIGURATIONS Debug DebugOptimized )
 waLBerla_execute_test( NAME BoundaryForceCouette COMMAND COMMAND $<TARGET_FILE:BoundaryForceCouette> PROCESSES 2 CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES boundary/DiffusionDirichlet.cpp DEPENDS field blockforest geometry timeloop vtk )
+waLBerla_compile_test( FILES boundary/DiffusionDirichlet.cpp DEPENDS walberla::field walberla::blockforest walberla::geometry walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME DiffusionDirichletTest1 COMMAND $<TARGET_FILE:DiffusionDirichlet>  -l 16 -w 1 -o 1.2  -v 0.1  -e 0.097711 -t  50 )
 waLBerla_execute_test( NAME DiffusionDirichletTest2 COMMAND $<TARGET_FILE:DiffusionDirichlet>  -l 16 -w 1 -o 1.79 -v 0.05 -e 0.295170 -t 100 )
 
 
-waLBerla_compile_test( FILES DiffusionTest.cpp DEPENDS field blockforest timeloop vtk postprocessing)
+waLBerla_compile_test( FILES DiffusionTest.cpp DEPENDS walberla::field walberla::blockforest walberla::timeloop walberla::vtk walberla::postprocessing )
 waLBerla_execute_test( NAME  DiffusionTestCorr COMMAND $<TARGET_FILE:DiffusionTest>  -c 1  -dx 0.01  -dt 0.002  -d 0.005  -v 5  -err 0.0025 DEPENDS_ON_TARGETS DiffusionTest )
 waLBerla_execute_test( NAME  DiffusionTestNone COMMAND $<TARGET_FILE:DiffusionTest>  -c 0  -dx 0.01  -dt 0.002  -d 0.005  -v 5  -err 0.0040 DEPENDS_ON_TARGETS DiffusionTest )
 
 
-waLBerla_compile_test( FILES refinement/Uniformity.cpp DEPENDS blockforest stencil )
+waLBerla_compile_test( FILES refinement/Uniformity.cpp DEPENDS walberla::blockforest walberla::stencil )
 waLBerla_execute_test( NAME UniformityShortTest COMMAND $<TARGET_FILE:Uniformity> --shortrun PROCESSES 4                )
 waLBerla_execute_test( NAME UniformityLongTest  COMMAND $<TARGET_FILE:Uniformity>            PROCESSES 4 LABELS longrun verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 
 
-waLBerla_compile_test( FILES refinement/CommunicationEquivalence.cpp DEPENDS blockforest stencil )
+waLBerla_compile_test( FILES refinement/CommunicationEquivalence.cpp DEPENDS walberla::blockforest walberla::stencil )
 waLBerla_execute_test( NAME CommunicationEquivalenceShortTest COMMAND $<TARGET_FILE:CommunicationEquivalence> --shortrun PROCESSES 4                )
 waLBerla_execute_test( NAME CommunicationEquivalenceLongTest  COMMAND $<TARGET_FILE:CommunicationEquivalence>            PROCESSES 4 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo )
 
 
-waLBerla_compile_test( FILES refinement/NonConstantDiffusion.cpp DEPENDS field blockforest geometry timeloop vtk )
+waLBerla_compile_test( FILES refinement/NonConstantDiffusion.cpp DEPENDS walberla::field walberla::blockforest walberla::geometry walberla::timeloop walberla::vtk )
 
 
-waLBerla_compile_test( FILES geometry/IntersectionRatioTest.cpp DEPENDS geometry )
+waLBerla_compile_test( FILES geometry/IntersectionRatioTest.cpp DEPENDS walberla::geometry )
 waLBerla_execute_test( NAME IntersectionRatioTest COMMAND $<TARGET_FILE:IntersectionRatioTest> )
 
-waLBerla_compile_test( FILES evaluations/PermeabilityTest.cpp DEPENDS field blockforest geometry timeloop vtk )
+waLBerla_compile_test( FILES evaluations/PermeabilityTest.cpp DEPENDS walberla::field walberla::blockforest walberla::geometry walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME PermeabilityTest_TRT_16_4 COMMAND $<TARGET_FILE:PermeabilityTest> --length 16 --kappa 0.85 --omega 0.3 --collisionModel TRT --timesteps 1001 --epsilon 0.005 PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME PermeabilityTest_TRT_32_4 COMMAND $<TARGET_FILE:PermeabilityTest> --length 32 --kappa 0.85 --omega 0.3 --collisionModel TRT --timesteps 1001 --epsilon 0.005 PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME PermeabilityTest_TRT_64_1 COMMAND $<TARGET_FILE:PermeabilityTest> --length 64 --kappa 0.85 --omega 0.3 --collisionModel TRT --timesteps 1001 --epsilon 0.025 PROCESSES 1 CONFIGURATIONS Release RelWithDbgInfo )
@@ -70,11 +70,11 @@ waLBerla_execute_test( NAME UniformPdfFieldInitializerTest COMMAND $<TARGET_FILE
 waLBerla_compile_test( FILES initializer/NonUniformPdfFieldInitializerTest.cpp )
 waLBerla_execute_test( NAME NonUniformPdfFieldInitializerTest CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES field/QCriterionTest.cpp DEPENDS field blockforest )
+waLBerla_compile_test( FILES field/QCriterionTest.cpp DEPENDS walberla::field walberla::blockforest )
 waLBerla_execute_test( NAME QCriterionTest )
 
 add_subdirectory(field)
-waLBerla_compile_test( FILES field/AlignedPDFfieldTest.cpp DEPENDS field blockforest lbm )
+waLBerla_compile_test( FILES field/AlignedPDFfieldTest.cpp DEPENDS walberla::field walberla::blockforest walberla::lbm )
 waLBerla_execute_test( NAME AlignedPDFfieldTest COMMAND $<TARGET_FILE:AlignedPDFfieldTest> ${CMAKE_CURRENT_SOURCE_DIR}/field/AlignedPDFfieldTest.prm )
 
 # Code Generation
@@ -165,7 +165,7 @@ waLBerla_generate_target_from_python( NAME StreamInCellIntervalCodegen
                                       OUT_FILES GeneratedLatticeModel.h GeneratedLatticeModel.cpp)
 
 waLBerla_compile_test( FILES    codegen/StreamInCellIntervalCodegenTest.cpp
-                       DEPENDS  blockforest field lbm timeloop StreamInCellIntervalCodegen )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop StreamInCellIntervalCodegen )
 
 waLBerla_execute_test( NAME     StreamInCellIntervalCodegenTest )
 
@@ -173,7 +173,7 @@ endif()
 
 # Free Surface
 waLBerla_compile_test( FILES     free_surface/bubble_model/BubbleInitializationTest.cpp
-                       DEPENDS   blockforest field geometry lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME      BubbleInitializationTest
                        PROCESSES 2 )
 
@@ -183,36 +183,36 @@ file( COPY        free_surface/bubble_model/MergeAndSplitTestUnconnected.png
 waLBerla_compile_test( FILES        free_surface/bubble_model/MergeAndSplitTest.cpp
                                     free_surface/bubble_model/BubbleBodyMover.impl.h
                                     free_surface/bubble_model/BubbleModelTester.impl.h
-                       DEPENDS      blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME         MergeAndSplitTest
                        PROCESSES    10 )
 
 waLBerla_compile_test( FILES     free_surface/bubble_model/MergeInformationTest.cpp
-                       DEPENDS   blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME      MergeInformationTest
                        PROCESSES 3 )
 
 waLBerla_compile_test( FILES     free_surface/bubble_model/MovingSpheresTest.cpp
                                  free_surface/bubble_model/BubbleBodyMover.impl.h
                                  free_surface/bubble_model/BubbleModelTester.impl.h
-                       DEPENDS   blockforest field geometry lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME      MovingSpheresTest
                        PROCESSES 2 )
 
 waLBerla_compile_test( FILES    free_surface/bubble_model/RegionalFloodFillTest.cpp
-                       DEPENDS  field lbm )
+      DEPENDS walberla::field walberla::lbm )
 waLBerla_execute_test( NAME     RegionalFloodFillTest )
 
 waLBerla_compile_test( FILES    free_surface/bubble_model/SplitDetectionTest.cpp
-                       DEPENDS  field lbm)
+      DEPENDS walberla::field walberla::lbm )
 waLBerla_execute_test( NAME     SplitDetectionTest )
 
 waLBerla_compile_test( FILES    free_surface/dynamics/AdvectionTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     AdvectionTest )
 
 waLBerla_compile_test( FILES    free_surface/dynamics/CellConversionTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     CellConversionTest )
 
 if( WALBERLA_BUILD_WITH_CODEGEN )
@@ -221,88 +221,88 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
                                          OUT_FILES GeneratedLatticeModel_FreeSurface.cpp
                                                    GeneratedLatticeModel_FreeSurface.h )
    waLBerla_compile_test( FILES    free_surface/dynamics/CodegenTest.cpp
-                          DEPENDS  blockforest field lbm timeloop LatticeModelGenerationFreeSurfacePython )
+         DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop LatticeModelGenerationFreeSurfacePython )
    waLBerla_execute_test( NAME     CodegenTest )
 endif()
 
 waLBerla_compile_test( FILES    free_surface/dynamics/ExcessMassDistributionFallbackTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     ExcessMassDistributionFallbackTest )
 
 waLBerla_compile_test( FILES        free_surface/dynamics/ExcessMassDistributionParallelTest.cpp
-                       DEPENDS      blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME         ExcessMassDistributionParallelTest
                        PROCESSES    2)
 
 waLBerla_compile_test( FILES    free_surface/dynamics/InflowTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     InflowTest )
 
 waLBerla_compile_test( FILES        free_surface/LoadBalancingTest.cpp
-                       DEPENDS      blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME         LoadBalancingTest
                        PROCESSES    4)
 
 waLBerla_compile_test( FILES    free_surface/dynamics/PdfReconstructionFreeSlipTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     PdfReconstructionFreeSlipTest )
 
 waLBerla_compile_test( FILES    free_surface/dynamics/PdfReconstructionTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     PdfReconstructionTest )
 
 waLBerla_compile_test( FILES    free_surface/dynamics/PdfRefillingTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     PdfRefillingTest )
 
 waLBerla_compile_test( FILES    free_surface/dynamics/WettingConversionTest.cpp
-                       DEPENDS  blockforest field geometry lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     WettingConversionTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/CellFluidVolumeTest.cpp
-                       DEPENDS  lbm )
+      DEPENDS walberla::lbm )
 waLBerla_execute_test( NAME     CellFluidVolumeTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/CurvatureOfSineTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     CurvatureOfSineTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/CurvatureOfSphereTest.cpp
-                       DEPENDS  blockforest field geometry lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     CurvatureOfSphereTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/DetectWettingTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     DetectWettingTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/GetInterfacePointTest.cpp
-                       DEPENDS  lbm )
+      DEPENDS walberla::lbm )
 waLBerla_execute_test( NAME     GetInterfacePointTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/NormalsOfSineTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     NormalsOfSineTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/NormalsOfSphereTest.cpp
-                       DEPENDS  blockforest field geometry lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     NormalsOfSphereTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/NormalsEquivalenceTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     NormalsEquivalenceTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/NormalsNearSolidTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     NormalsNearSolidTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/ObstacleFillLevelTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     ObstacleFillLevelTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/ObstacleNormalsTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     ObstacleNormalsTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/WettingCurvatureTest.cpp
-                       DEPENDS  blockforest field lbm timeloop )
+      DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     WettingCurvatureTest )
\ No newline at end of file
diff --git a/tests/lbm/codegen/CMakeLists.txt b/tests/lbm/codegen/CMakeLists.txt
index b149eda3f67a65321c9583835277423d3f0db2f0..32e7b3e9248f395cfbb13a5e8f711bdb7b3a1987 100644
--- a/tests/lbm/codegen/CMakeLists.txt
+++ b/tests/lbm/codegen/CMakeLists.txt
@@ -1,6 +1,6 @@
 #############################################################################################################################
 #
-# Tests for lbm module
+# Tests for walberla::lbm module
 #
 #############################################################################################################################
 
diff --git a/tests/lbm/field/CMakeLists.txt b/tests/lbm/field/CMakeLists.txt
index 7170fde6d819ad39d446a0ac82cd91e1b069b773..bbb2be19852e9c56138ff320bf77e0120b02098f 100644
--- a/tests/lbm/field/CMakeLists.txt
+++ b/tests/lbm/field/CMakeLists.txt
@@ -1,6 +1,6 @@
 #############################################################################################################################
 #
-# Tests for lbm module
+# Tests for walberla::lbm module
 #
 #############################################################################################################################
 
diff --git a/tests/lbm_generated/CMakeLists.txt b/tests/lbm_generated/CMakeLists.txt
index 8ba33e735229aacb7a91f89f2f3912d8d1b61f85..15c0002744344b1aa1b0848df13007454c983c61 100644
--- a/tests/lbm_generated/CMakeLists.txt
+++ b/tests/lbm_generated/CMakeLists.txt
@@ -1,6 +1,6 @@
 #############################################################################################################################
 #
-# Tests for generated lbm module
+# Tests for generated walberla::lbm module
 #
 #############################################################################################################################
 waLBerla_link_files_to_builddir( "*.prm" )
@@ -17,7 +17,7 @@ waLBerla_generate_target_from_python(NAME ExampleGenerated
         UBB.h UBB.cpp
         LBMBoundaryCollection.h
         Example_InfoHeader.h)
-waLBerla_compile_test( FILES Example.cpp DEPENDS ExampleGenerated blockforest field lbm_generated timeloop )
+waLBerla_compile_test( FILES Example.cpp DEPENDS ExampleGenerated walberla::blockforest walberla::field walberla::lbm_generated walberla::timeloop )
 
 waLBerla_generate_target_from_python(NAME InterpolationNoSlipGenerated
         FILE InterpolationNoSlip.py
@@ -31,7 +31,7 @@ waLBerla_generate_target_from_python(NAME InterpolationNoSlipGenerated
         InterpolationNoSlipBoundaryCollection.h
         InterpolationNoSlipHeader.h)
 
-waLBerla_compile_test( FILES InterpolationNoSlip.cpp DEPENDS InterpolationNoSlipGenerated blockforest core field geometry lbm_generated timeloop )
+waLBerla_compile_test( FILES InterpolationNoSlip.cpp DEPENDS InterpolationNoSlipGenerated walberla::blockforest walberla::core walberla::field walberla::geometry walberla::lbm_generated walberla::timeloop )
 # waLBerla_execute_test( NAME InterpolationNoSlip1 COMMAND $<TARGET_FILE:InterpolationNoSlip> ${CMAKE_CURRENT_SOURCE_DIR}/InterpolationNoSlip.prm -Parameters.distanceWall=0.1 )
 # waLBerla_execute_test( NAME InterpolationNoSlip2 COMMAND $<TARGET_FILE:InterpolationNoSlip> ${CMAKE_CURRENT_SOURCE_DIR}/InterpolationNoSlip.prm -Parameters.distanceWall=0.5 )
 waLBerla_execute_test( NAME InterpolationNoSlip3 COMMAND $<TARGET_FILE:InterpolationNoSlip> ${CMAKE_CURRENT_SOURCE_DIR}/InterpolationNoSlip.prm )
@@ -47,8 +47,8 @@ waLBerla_generate_target_from_python(NAME FreeSlipRefinementGenerated
         Outflow.h Outflow.cpp
         FreeSlipRefinementBoundaryCollection.h
         FreeSlipRefinementInfoHeader.h)
-waLBerla_compile_test( FILES FreeSlipRefinement.cpp DEPENDS FreeSlipRefinementGenerated blockforest field lbm_generated timeloop )
+waLBerla_compile_test( FILES FreeSlipRefinement.cpp DEPENDS FreeSlipRefinementGenerated walberla::blockforest walberla::field walberla::lbm_generated walberla::timeloop )
 
 if( WALBERLA_DOUBLE_ACCURACY )
-waLBerla_compile_test( FILES LDC.cpp DEPENDS blockforest field lbm_generated timeloop )
+   waLBerla_compile_test( FILES LDC.cpp DEPENDS walberla::blockforest walberla::field walberla::lbm_generated walberla::timeloop )
 endif()
diff --git a/tests/lbm_mesapd_coupling/CMakeLists.txt b/tests/lbm_mesapd_coupling/CMakeLists.txt
index b6c8f15397a1317a5643d488b8b685f0fe37e43a..cb8f118606305012079713025636d6d4f6829f11 100644
--- a/tests/lbm_mesapd_coupling/CMakeLists.txt
+++ b/tests/lbm_mesapd_coupling/CMakeLists.txt
@@ -4,16 +4,16 @@
 #
 ###################################################################################################
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_Mapping FILES mapping/ParticleMapping.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_Mapping FILES mapping/ParticleMapping.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_Mapping PROCESSES 3)
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_MovingMapping FILES momentum_exchange_method/MovingParticleMappingMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk)
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_MovingMapping FILES momentum_exchange_method/MovingParticleMappingMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_MovingMapping PROCESSES 3)
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_DragForceSphere FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_DragForceSphere FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_DragForceSphere COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_DragForceSphere> --funcTest PROCESSES 2)
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs FILES momentum_exchange_method/ForceBetweenTwoStationaryObjectsMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs FILES momentum_exchange_method/ForceBetweenTwoStationaryObjectsMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSS1 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> PROCESSES 1)
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSS2 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> --useSBB PROCESSES 1)
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSS3 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> --useCompressible PROCESSES 1)
@@ -23,45 +23,45 @@ waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSW2 COMMAND
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSW3 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> --useSphereWallSetup --useCompressible PROCESSES 1)
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjsSW4 COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_ForceTwoStatObjs> --useSphereWallSetup --systemVelocity 0.1 PROCESSES 1)
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_SettlingSphere FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_SettlingSphere FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_SettlingSphere COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_MEM_SettlingSphere> --funcTest PROCESSES 4)
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_PdfReconstruction FILES momentum_exchange_method/PdfReconstructionMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk)
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_PdfReconstruction FILES momentum_exchange_method/PdfReconstructionMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_PdfReconstruction PROCESSES 3)
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_UpdateParticleMapping FILES momentum_exchange_method/UpdateParticleMappingMEM.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field vtk)
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_MEM_UpdateParticleMapping FILES momentum_exchange_method/UpdateParticleMappingMEM.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field walberla::vtk )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_MEM_UpdateParticleMapping PROCESSES 1)
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_LubricationCorrection FILES utility/LubricationCorrection.cpp DEPENDS mesa_pd lbm_mesapd_coupling )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_LubricationCorrection FILES utility/LubricationCorrection.cpp DEPENDS walberla::mesa_pd walberla::lbm_mesapd_coupling )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_LubricationCorrection PROCESSES 1 )
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_VirtualMass FILES utility/VirtualMass.cpp DEPENDS mesa_pd lbm_mesapd_coupling )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_VirtualMass FILES utility/VirtualMass.cpp DEPENDS walberla::mesa_pd walberla::lbm_mesapd_coupling )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_VirtualMass PROCESSES 1 )
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_InspectionProbe FILES utility/InspectionProbe.cpp DEPENDS core mesa_pd lbm lbm_mesapd_coupling domain_decomposition field )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_InspectionProbe FILES utility/InspectionProbe.cpp DEPENDS walberla::core walberla::mesa_pd walberla::lbm walberla::lbm_mesapd_coupling walberla::domain_decomposition walberla::field )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_InspectionProbe PROCESSES 1 )
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks FILES utility/HydrodynamicForceOnMultipleBlocks.cpp DEPENDS mesa_pd lbm_mesapd_coupling )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks FILES utility/HydrodynamicForceOnMultipleBlocks.cpp DEPENDS walberla::mesa_pd walberla::lbm_mesapd_coupling )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks_EulerAvg COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks> PROCESSES 4 )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks_VVAvg COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks> --useVV PROCESSES 4 )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks_EulerNoAvg COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks> --noForceAveraging PROCESSES 4 )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks_VVNoAvg COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_UTIL_HydForceMultBlocks> --noForceAveraging --useVV PROCESSES 4 )
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping FILES partially_saturated_cells_method/ParticleAndVolumeFractionMappingPSM.cpp DEPENDS blockforest boundary core field lbm_mesapd_coupling stencil mesa_pd )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping FILES partially_saturated_cells_method/ParticleAndVolumeFractionMappingPSM.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm_mesapd_coupling walberla::stencil walberla::mesa_pd )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping> PROCESSES 27 )
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping_CPU_GPU FILES partially_saturated_cells_method/codegen/ParticleAndVolumeFractionMapping.cpp DEPENDS blockforest boundary core gpu field lbm_mesapd_coupling stencil mesa_pd )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping_CPU_GPU FILES partially_saturated_cells_method/codegen/ParticleAndVolumeFractionMapping.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::gpu walberla::field walberla::lbm_mesapd_coupling walberla::stencil walberla::mesa_pd )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping_CPU_GPU COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_ParticleAndVolumeFractionMapping_CPU_GPU> PROCESSES 27 )
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS blockforest boundary core field lbm lbm_mesapd_coupling timeloop mesa_pd )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::timeloop walberla::mesa_pd )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphereFuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_DragForceSphere> --funcTest PROCESSES 8 )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_DragForceSphere> PROCESSES 8 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo)
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere FILES partially_saturated_cells_method/SettlingSpherePSM.cpp DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling timeloop mesa_pd )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere FILES partially_saturated_cells_method/SettlingSpherePSM.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::timeloop walberla::mesa_pd )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphereFuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_SettlingSphere> --funcTest PROCESSES 4 )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_SettlingSphere> --resolution 70 PROCESSES 4 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS blockforest boundary core domain_decomposition field lbm stencil timeloop )
+waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::lbm walberla::stencil walberla::timeloop )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphereSC1W1FuncTest     COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_TorqueSphere> --funcTest --SC1W1   PROCESSES 1 )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphereSC1W1SingleTest   COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_TorqueSphere> --SC1W1              PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphereSC1W1ParallelTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_TorqueSphere> --SC1W1              PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -78,7 +78,7 @@ waLBerla_execute_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphereSC3W2SingleTest
 
 if (WALBERLA_BUILD_WITH_CODEGEN)
     if (NOT WALBERLA_BUILD_WITH_GPU_SUPPORT OR (WALBERLA_BUILD_WITH_GPU_SUPPORT AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP)))
-        waLBerla_compile_test(NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU FILES partially_saturated_cells_method/codegen/DragForceSpherePSM.cpp DEPENDS blockforest core gpu field lbm_mesapd_coupling mesa_pd PSMCodegenPython_srt_sc1)
+        waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU FILES partially_saturated_cells_method/codegen/DragForceSpherePSM.cpp DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::lbm_mesapd_coupling walberla::mesa_pd PSMCodegenPython_srt_sc1 )
         waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU_FuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU> --funcTest PROCESSES 1)
         waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_DragForceSphere_CPU_GPU> PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo)
 
@@ -86,7 +86,7 @@ if (WALBERLA_BUILD_WITH_CODEGEN)
             foreach (solid_collision 1 2 3)
                 foreach (weighting 1 2)
                     set(config ${collision_setup}_sc${solid_collision}_w${weighting})
-                    waLBerla_compile_test(NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config} FILES partially_saturated_cells_method/codegen/TorqueSpherePSM.cpp DEPENDS blockforest core gpu field lbm_mesapd_coupling mesa_pd PSMCodegenPython_${collision_setup}_sc${solid_collision})
+                    waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config} FILES partially_saturated_cells_method/codegen/TorqueSpherePSM.cpp DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::lbm_mesapd_coupling walberla::mesa_pd PSMCodegenPython_${collision_setup}_sc${solid_collision} )
                     target_compile_definitions(LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config} PRIVATE SC=${solid_collision})
                     target_compile_definitions(LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config} PRIVATE Weighting=${weighting})
                     waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config}_FuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_TorqueSphere_CPU_GPU_${config}> --funcTest PROCESSES 1)
@@ -95,7 +95,7 @@ if (WALBERLA_BUILD_WITH_CODEGEN)
             endforeach ()
         endforeach ()
 
-        waLBerla_compile_test(NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU FILES partially_saturated_cells_method/codegen/SettlingSpherePSM.cpp DEPENDS blockforest core gpu field lbm lbm_mesapd_coupling mesa_pd timeloop vtk PSMCodegenPython_trt-smagorinsky_sc2)
+        waLBerla_compile_test( NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU FILES partially_saturated_cells_method/codegen/SettlingSpherePSM.cpp DEPENDS walberla::blockforest walberla::core walberla::gpu walberla::field walberla::lbm walberla::lbm_mesapd_coupling walberla::mesa_pd walberla::timeloop walberla::vtk PSMCodegenPython_trt-smagorinsky_sc2 )
         waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU_FuncTest COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU> --funcTest PROCESSES 1)
         waLBerla_execute_test(NAME LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU COMMAND $<TARGET_FILE:LBM_MESAPD_COUPLING_PSM_SettlingSphere_CPU_GPU> PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo)
     endif ()
diff --git a/tests/mesa_pd/CMakeLists.txt b/tests/mesa_pd/CMakeLists.txt
index 7b217a13677f9c56c79a81cccd0ff007e24d99dd..dd9e73ab61faa1cd993ed6bfc299e0d5b2a0759e 100644
--- a/tests/mesa_pd/CMakeLists.txt
+++ b/tests/mesa_pd/CMakeLists.txt
@@ -6,241 +6,241 @@
 
 waLBerla_link_files_to_builddir(*.prm)
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_AnalyticCollisionFunctions FILES collision_detection/AnalyticCollisionFunctions.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_AnalyticCollisionFunctions FILES collision_detection/AnalyticCollisionFunctions.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_AnalyticCollisionFunctions )
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_AnalyticContactDetection FILES collision_detection/AnalyticContactDetection.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_AnalyticContactDetection FILES collision_detection/AnalyticContactDetection.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_AnalyticContactDetection )
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_BoxSupport FILES collision_detection/BoxSupport.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_BoxSupport FILES collision_detection/BoxSupport.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_BoxSupport )
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_EllipsoidSupport FILES collision_detection/EllipsoidSupport.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_EllipsoidSupport FILES collision_detection/EllipsoidSupport.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_EllipsoidSupport )
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_EPA FILES collision_detection/EPA.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_EPA FILES collision_detection/EPA.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_EPA )
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_GeneralContactDetection FILES collision_detection/GeneralContactDetection.cpp DEPENDS blockforest core pe)
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GeneralContactDetection FILES collision_detection/GeneralContactDetection.cpp DEPENDS walberla::blockforest walberla::core walberla::pe )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_GeneralContactDetection )
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_GJK FILES collision_detection/GJK.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GJK FILES collision_detection/GJK.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_GJK )
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_GJKEPA FILES collision_detection/GJK_EPA.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_GJKEPA FILES collision_detection/GJK_EPA.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_GJKEPA )
 
-waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_SphereSupport FILES collision_detection/SphereSupport.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_SphereSupport FILES collision_detection/SphereSupport.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_SphereSupport )
 
-waLBerla_compile_test( NAME   MESA_PD_COMMON_IntersectionRatio FILES common/IntersectionRatio.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COMMON_IntersectionRatio FILES common/IntersectionRatio.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COMMON_IntersectionRatio )
 
-waLBerla_compile_test( NAME   MESA_PD_COMMON_ContainsPoint FILES common/ContainsPoint.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_COMMON_ContainsPoint FILES common/ContainsPoint.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_COMMON_ContainsPoint )
 
-waLBerla_compile_test( NAME   MESA_PD_ContactDetection FILES ContactDetection.cpp DEPENDS blockforest core pe)
+waLBerla_compile_test( NAME MESA_PD_ContactDetection FILES ContactDetection.cpp DEPENDS walberla::blockforest walberla::core walberla::pe )
 waLBerla_execute_test( NAME   MESA_PD_ContactDetection PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_Data_ContactHistory FILES data/ContactHistory.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Data_ContactHistory FILES data/ContactHistory.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Data_ContactHistory )
 
-waLBerla_compile_test( NAME   MESA_PD_Data_Flags FILES data/Flags.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Data_Flags FILES data/Flags.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Data_Flags )
 
-waLBerla_compile_test( NAME   MESA_PD_Data_HashGridsVsBruteForce FILES data/HashGridsVsBruteForce.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Data_HashGridsVsBruteForce FILES data/HashGridsVsBruteForce.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Data_HashGridsVsBruteForce PROCESSES 27 )
 
-waLBerla_compile_test( NAME   MESA_PD_Data_LinkedCells FILES data/LinkedCells.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Data_LinkedCells FILES data/LinkedCells.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Data_LinkedCells )
 
-waLBerla_compile_test( NAME   MESA_PD_Data_ParticleStorage FILES data/ParticleStorage.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Data_ParticleStorage FILES data/ParticleStorage.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Data_ParticleStorage )
 
-waLBerla_compile_test( NAME   MESA_PD_Data_SparseLinkedCells FILES data/SparseLinkedCells.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Data_SparseLinkedCells FILES data/SparseLinkedCells.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Data_SparseLinkedCells )
 
-waLBerla_compile_test( NAME   MESA_PD_Domain_BlockForestDomain FILES domain/BlockForestDomain.cpp DEPENDS blockforest core )
+waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestDomain FILES domain/BlockForestDomain.cpp DEPENDS walberla::blockforest walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Domain_BlockForestDomain )
 
-waLBerla_compile_test( NAME   MESA_PD_Domain_BlockForestSync FILES domain/BlockForestSync.cpp DEPENDS blockforest core pe)
+waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestSync FILES domain/BlockForestSync.cpp DEPENDS walberla::blockforest walberla::core walberla::pe )
 waLBerla_execute_test( NAME   MESA_PD_Domain_BlockForestSync2 COMMAND $<TARGET_FILE:MESA_PD_Domain_BlockForestSync> PROCESSES 2 )
 waLBerla_execute_test( NAME   MESA_PD_Domain_BlockForestSync4 COMMAND $<TARGET_FILE:MESA_PD_Domain_BlockForestSync> PROCESSES 4 )
 waLBerla_execute_test( NAME   MESA_PD_Domain_BlockForestSync8 COMMAND $<TARGET_FILE:MESA_PD_Domain_BlockForestSync> PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_Domain_BlockForestSyncPeriodic FILES domain/BlockForestSyncPeriodic.cpp DEPENDS blockforest core pe)
+waLBerla_compile_test( NAME MESA_PD_Domain_BlockForestSyncPeriodic FILES domain/BlockForestSyncPeriodic.cpp DEPENDS walberla::blockforest walberla::core walberla::pe )
 waLBerla_execute_test( NAME   MESA_PD_Domain_BlockForestSyncPeriodic PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_Domain_DistanceCalculation FILES domain/DistanceCalculation.cpp DEPENDS blockforest core )
+waLBerla_compile_test( NAME MESA_PD_Domain_DistanceCalculation FILES domain/DistanceCalculation.cpp DEPENDS walberla::blockforest walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Domain_DistanceCalculation )
 
-waLBerla_compile_test( NAME   MESA_PD_Domain_DynamicRefinement FILES domain/DynamicRefinement.cpp DEPENDS blockforest core pe )
+waLBerla_compile_test( NAME MESA_PD_Domain_DynamicRefinement FILES domain/DynamicRefinement.cpp DEPENDS walberla::blockforest walberla::core walberla::pe )
 waLBerla_execute_test( NAME   MESA_PD_Domain_DynamicRefinement PROCESSES 8)
 
-waLBerla_compile_test( NAME   MESA_PD_Domain_InfiniteDomain FILES domain/InfiniteDomain.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Domain_InfiniteDomain FILES domain/InfiniteDomain.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Domain_InfiniteDomain )
 
-waLBerla_compile_test( NAME   MESA_PD_Domain_SerializeDeserialize FILES domain/SerializeDeserialize.cpp DEPENDS blockforest core pe)
+waLBerla_compile_test( NAME MESA_PD_Domain_SerializeDeserialize FILES domain/SerializeDeserialize.cpp DEPENDS walberla::blockforest walberla::core walberla::pe )
 waLBerla_execute_test( NAME   MESA_PD_Domain_SerializeDeserialize PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_DropTestAnalytic FILES DropTestAnalytic.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_DropTestAnalytic FILES DropTestAnalytic.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_DropTestAnalytic )
 
-waLBerla_compile_test( NAME   MESA_PD_DropTestGeneral FILES DropTestGeneral.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_DropTestGeneral FILES DropTestGeneral.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_DropTestGeneral )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_ClearNextNeighborSync FILES kernel/ClearNextNeighborSync.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_ClearNextNeighborSync FILES kernel/ClearNextNeighborSync.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_ClearNextNeighborSync PROCESSES 2 )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CNT_AnisotropicVDWContact FILES kernel/cnt/AnisotropicVDWContact.test.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_AnisotropicVDWContact FILES kernel/cnt/AnisotropicVDWContact.test.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CNT_AnisotropicVDWContact )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CNT_IntegratedVDWContact FILES kernel/cnt/IntegratedVDWContact.test.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_IntegratedVDWContact FILES kernel/cnt/IntegratedVDWContact.test.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CNT_IntegratedVDWContact )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CNT_IsotropicVDWContact FILES kernel/cnt/IsotropicVDWContact.test.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_IsotropicVDWContact FILES kernel/cnt/IsotropicVDWContact.test.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CNT_IsotropicVDWContact )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CNT_VBondContact FILES kernel/cnt/VBondContact.test.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_VBondContact FILES kernel/cnt/VBondContact.test.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CNT_VBondContact )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CNT_VBondContactIntegration FILES kernel/cnt/VBondContactIntegration.test.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_VBondContactIntegration FILES kernel/cnt/VBondContactIntegration.test.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CNT_VBondContactIntegration )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CNT_ViscousDamping FILES kernel/cnt/ViscousDamping.test.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_ViscousDamping FILES kernel/cnt/ViscousDamping.test.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CNT_ViscousDamping )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CNT_WallContact FILES kernel/cnt/WallContact.test.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CNT_WallContact FILES kernel/cnt/WallContact.test.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CNT_WallContact )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionSD FILES kernel/CoefficientOfRestitutionSD.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionSD FILES kernel/CoefficientOfRestitutionSD.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionSDEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionSD> )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionSDVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionSD> --useVV )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionLSD FILES kernel/CoefficientOfRestitutionLSD.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionLSD FILES kernel/CoefficientOfRestitutionLSD.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionLSDEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionLSD> )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionLSDVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionLSD> --useVV )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionNLSD FILES kernel/CoefficientOfRestitutionNLSD.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_CoefficientOfRestitutionNLSD FILES kernel/CoefficientOfRestitutionNLSD.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionNLSDEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionNLSD> )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_CoefficientOfRestitutionVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_CoefficientOfRestitutionNLSD> --useVV )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_DetectAndStoreContacts FILES kernel/DetectAndStoreContacts.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_DetectAndStoreContacts FILES kernel/DetectAndStoreContacts.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_DetectAndStoreContacts )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_DoubleCast FILES kernel/DoubleCast.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_DoubleCast FILES kernel/DoubleCast.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_DoubleCast )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_ExplicitEuler FILES kernel/ExplicitEuler.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_ExplicitEuler FILES kernel/ExplicitEuler.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_ExplicitEuler )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_ForceLJ FILES kernel/ForceLJ.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_ForceLJ FILES kernel/ForceLJ.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_ForceLJ )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_GenerateAnalyticContacts FILES kernel/GenerateAnalyticContacts.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_GenerateAnalyticContacts FILES kernel/GenerateAnalyticContacts.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_GenerateAnalyticContacts PROCESSES 27 )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_GenerateLinkedCells FILES kernel/GenerateLinkedCells.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_GenerateLinkedCells FILES kernel/GenerateLinkedCells.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_GenerateLinkedCells )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_HCSITSKernels FILES kernel/HCSITSKernels.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_HCSITSKernels FILES kernel/HCSITSKernels.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_HCSITSKernels )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_HeatConduction FILES kernel/HeatConduction.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_HeatConduction FILES kernel/HeatConduction.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_HeatConduction )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_IntegratorAccuracy FILES kernel/IntegratorAccuracy.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_IntegratorAccuracy FILES kernel/IntegratorAccuracy.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_IntegratorAccuracyEuler COMMAND $<TARGET_FILE:MESA_PD_Kernel_IntegratorAccuracy> )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_IntegratorAccuracyVelocityVerlet COMMAND $<TARGET_FILE:MESA_PD_Kernel_IntegratorAccuracy> --useVV )
 
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/kernel/interfaces MESA_PD_INTERFACE_CHECKS)
-waLBerla_compile_test( NAME   MESA_PD_Kernel_Interfaces FILES kernel/Interfaces.cpp ${MESA_PD_INTERFACE_CHECKS} DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_Interfaces FILES kernel/Interfaces.cpp ${MESA_PD_INTERFACE_CHECKS} DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_Interfaces )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_LinearSpringDashpot FILES kernel/LinearSpringDashpot.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_LinearSpringDashpot FILES kernel/LinearSpringDashpot.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_LinearSpringDashpot )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_LinkedCellsVsBruteForce FILES kernel/LinkedCellsVsBruteForce.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_LinkedCellsVsBruteForce FILES kernel/LinkedCellsVsBruteForce.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_LinkedCellsVsBruteForce PROCESSES 27 )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_PFCDamping FILES kernel/PFCDamping.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_PFCDamping FILES kernel/PFCDamping.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_PFCDamping )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_SemiImplicitEuler FILES kernel/SemiImplicitEuler.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_SemiImplicitEuler FILES kernel/SemiImplicitEuler.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_SemiImplicitEuler )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_SingleCast FILES kernel/SingleCast.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_SingleCast FILES kernel/SingleCast.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_SingleCast )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_SpherePile FILES kernel/SpherePile.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_SpherePile FILES kernel/SpherePile.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_SpherePile )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_SpringDashpot FILES kernel/SpringDashpot.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_SpringDashpot FILES kernel/SpringDashpot.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_SpringDashpot )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_SyncGhostOwners FILES kernel/SyncGhostOwners.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_SyncGhostOwners FILES kernel/SyncGhostOwners.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_SyncGhostOwners PROCESSES 27 )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_SyncGhostOwnersLarge FILES kernel/SyncGhostOwnersLarge.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_SyncGhostOwnersLarge FILES kernel/SyncGhostOwnersLarge.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_SyncGhostOwnersLarge PROCESSES 27 )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_SyncNextNeighbors FILES kernel/SyncNextNeighbors.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_SyncNextNeighbors FILES kernel/SyncNextNeighbors.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_SyncNextNeighbors PROCESSES 27 )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_SyncNextNeighborsBlockForest FILES kernel/SyncNextNeighborsBlockForest.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_SyncNextNeighborsBlockForest FILES kernel/SyncNextNeighborsBlockForest.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_SyncNextNeighborsBlockForest PROCESSES 27 )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_TemperatureIntegration FILES kernel/TemperatureIntegration.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_TemperatureIntegration FILES kernel/TemperatureIntegration.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_TemperatureIntegration )
 
-waLBerla_compile_test( NAME   MESA_PD_Kernel_VelocityVerlet FILES kernel/VelocityVerlet.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Kernel_VelocityVerlet FILES kernel/VelocityVerlet.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Kernel_VelocityVerlet )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_BroadcastProperty FILES mpi/BroadcastProperty.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_MPI_BroadcastProperty FILES mpi/BroadcastProperty.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_BroadcastProperty PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_ClearGhostOwnerSync FILES mpi/ClearGhostOwnerSync.cpp DEPENDS blockforest core)
+waLBerla_compile_test( NAME MESA_PD_MPI_ClearGhostOwnerSync FILES mpi/ClearGhostOwnerSync.cpp DEPENDS walberla::blockforest walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_ClearGhostOwnerSync PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_ClearNextNeighborSync FILES mpi/ClearNextNeighborSync.cpp DEPENDS blockforest core )
+waLBerla_compile_test( NAME MESA_PD_MPI_ClearNextNeighborSync FILES mpi/ClearNextNeighborSync.cpp DEPENDS walberla::blockforest walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_ClearNextNeighborSync PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_Notifications FILES mpi/Notifications.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_MPI_Notifications FILES mpi/Notifications.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_Notifications )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_ReduceContactHistory FILES mpi/ReduceContactHistory.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_MPI_ReduceContactHistory FILES mpi/ReduceContactHistory.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_ReduceContactHistory PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_ReduceProperty FILES mpi/ReduceProperty.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_MPI_ReduceProperty FILES mpi/ReduceProperty.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_ReduceProperty PROCESSES 8 )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_ShapePackUnpack FILES mpi/ShapePackUnpack.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_MPI_ShapePackUnpack FILES mpi/ShapePackUnpack.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_ShapePackUnpack )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_SyncNextNeighborsNoGhosts FILES mpi/SyncNextNeighborsNoGhosts.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_MPI_SyncNextNeighborsNoGhosts FILES mpi/SyncNextNeighborsNoGhosts.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_SyncNextNeighborsNoGhosts PROCESSES 2 )
 
-waLBerla_compile_test( NAME   MESA_PD_MPI_VelocityCorrectionNotification FILES mpi/VelocityCorrectionNotification.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_MPI_VelocityCorrectionNotification FILES mpi/VelocityCorrectionNotification.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_MPI_VelocityCorrectionNotification PROCESSES 8)
 
-waLBerla_compile_test( NAME   MESA_PD_Sorting FILES Sorting.cpp DEPENDS core )
+waLBerla_compile_test( NAME MESA_PD_Sorting FILES Sorting.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   MESA_PD_Sorting )
 
-waLBerla_compile_test( NAME   MESA_PD_Stiffness FILES Stiffness.cpp DEPENDS blockforest core mesa_pd )
+waLBerla_compile_test( NAME MESA_PD_Stiffness FILES Stiffness.cpp DEPENDS walberla::blockforest walberla::core walberla::mesa_pd )
 
-waLBerla_compile_test( NAME   MESA_PD_VTK_Outputs FILES vtk/VTKOutputs.cpp DEPENDS blockforest core vtk )
+waLBerla_compile_test( NAME MESA_PD_VTK_Outputs FILES vtk/VTKOutputs.cpp DEPENDS walberla::blockforest walberla::core walberla::vtk )
 waLBerla_execute_test( NAME   MESA_PD_VTK_Outputs PROCESSES 8 )
 
 if (WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE)
-    waLBerla_compile_test( NAME   MESA_PD_VTK_ConvexPolyhedron FILES vtk/ConvexPolyhedronVTKOutput.cpp DEPENDS core mesa_pd mesh_common vtk )
+    waLBerla_compile_test( NAME MESA_PD_VTK_ConvexPolyhedron FILES vtk/ConvexPolyhedronVTKOutput.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common walberla::vtk )
     waLBerla_execute_test( NAME   MESA_PD_VTK_ConvexPolyhedron )
 
-    waLBerla_compile_test( NAME   MESA_PD_Common_ContainsPointConvexPolyhedron FILES common/ContainsPointConvexPolyhedron.cpp DEPENDS core mesa_pd mesh_common )
+    waLBerla_compile_test( NAME MESA_PD_Common_ContainsPointConvexPolyhedron FILES common/ContainsPointConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common )
     waLBerla_execute_test( NAME   MESA_PD_Common_ContainsPointConvexPolyhedron )
 
-    waLBerla_compile_test( NAME   MESA_PD_Data_ConvexPolyhedron FILES data/ConvexPolyhedron.cpp DEPENDS core mesa_pd mesh_common )
+    waLBerla_compile_test( NAME MESA_PD_Data_ConvexPolyhedron FILES data/ConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common )
     waLBerla_execute_test( NAME   MESA_PD_Data_ConvexPolyhedron )
 
-    waLBerla_compile_test( NAME   MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA FILES collision_detection/ConvexPolyhedron_GJK_EPA.cpp DEPENDS core mesa_pd mesh_common )
+    waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA FILES collision_detection/ConvexPolyhedron_GJK_EPA.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common )
     waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA )
 endif()
diff --git a/tests/mesh/CMakeLists.txt b/tests/mesh/CMakeLists.txt
index baa15648869e48d62e37d36c8117e005e7db2908..a420ea0bde65f1a42f307845af7516b9b3738ae5 100644
--- a/tests/mesh/CMakeLists.txt
+++ b/tests/mesh/CMakeLists.txt
@@ -1,6 +1,6 @@
 #############################################################################################################################
 #
-# Tests for mesh module
+# Tests for walberla::mesh module
 #
 #############################################################################################################################
 
@@ -8,35 +8,35 @@ if ( WALBERLA_BUILD_WITH_OPENMESH )
    waLBerla_link_files_to_builddir( "w.obj" )   
    waLBerla_link_geometry_to_builddir( "*.obj" )   
 
-   waLBerla_compile_test( FILES MatrixVectorOperationsTest.cpp DEPENDS mesh )
+   waLBerla_compile_test( FILES MatrixVectorOperationsTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MatrixVectorOperationsTest COMMAND $<TARGET_FILE:MatrixVectorOperationsTest> )
-   waLBerla_compile_test( FILES MeshConversionTest.cpp DEPENDS mesh geometry )
+   waLBerla_compile_test( FILES MeshConversionTest.cpp DEPENDS walberla::mesh walberla::geometry )
    waLBerla_execute_test( NAME  MeshConversionTest COMMAND $<TARGET_FILE:MeshConversionTest> )
 
-   waLBerla_compile_test( FILES MeshOperationsTest.cpp DEPENDS mesh )
+   waLBerla_compile_test( FILES MeshOperationsTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshOperationsTest COMMAND $<TARGET_FILE:MeshOperationsTest> )
 
-   waLBerla_compile_test( FILES MeshDistanceCompareTest.cpp DEPENDS mesh )
+   waLBerla_compile_test( FILES MeshDistanceCompareTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshDistanceCompareTest COMMAND $<TARGET_FILE:MeshDistanceCompareTest> )
 
-   waLBerla_compile_test( FILES MeshAABBSelectionTest.cpp DEPENDS mesh )
+   waLBerla_compile_test( FILES MeshAABBSelectionTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshAABBSelectionTestBunnyDbg COMMAND $<TARGET_FILE:MeshAABBSelectionTest> bunny.obj 2 2 )
    waLBerla_execute_test( NAME  MeshAABBSelectionTestBunny COMMAND $<TARGET_FILE:MeshAABBSelectionTest> bunny.obj 100 10 CONFIGURATIONS Release RelWithDbgInfo )
-   
-   waLBerla_compile_test( FILES MeshDistanceOctreeTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES MeshDistanceOctreeTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshDistanceOctreeTestBunny  COMMAND $<TARGET_FILE:MeshDistanceOctreeTest> bunny.obj CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  MeshDistanceOctreeTestW      COMMAND $<TARGET_FILE:MeshDistanceOctreeTest> w.obj )
    waLBerla_execute_test( NAME  MeshDistanceOctreeTestCube   COMMAND $<TARGET_FILE:MeshDistanceOctreeTest> cube.obj )
    waLBerla_execute_test( NAME  MeshDistanceOctreeTestSphere COMMAND $<TARGET_FILE:MeshDistanceOctreeTest> sphere.obj )
-   
-   waLBerla_compile_test( FILES MeshDistanceMollerTrumboreTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES MeshDistanceMollerTrumboreTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshDistanceMollerTrumboreTestCube COMMAND $<TARGET_FILE:MeshDistanceMollerTrumboreTest>  cube.obj )
 
-   waLBerla_compile_test( FILES MeshDistanceCallbackMollerTrumboreTest.cpp DEPENDS mesh )
+   waLBerla_compile_test( FILES MeshDistanceCallbackMollerTrumboreTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshDistanceCallbackMollerTrumboreTestCube COMMAND $<TARGET_FILE:MeshDistanceCallbackMollerTrumboreTest>  cube.obj )
    waLBerla_execute_test( NAME  MeshDistanceCallbackMollerTrumboreTestSphere COMMAND $<TARGET_FILE:MeshDistanceCallbackMollerTrumboreTest>  sphere.obj )
 
-   waLBerla_compile_test( FILES MeshDistancePlausibilityTest.cpp DEPENDS mesh )
+   waLBerla_compile_test( FILES MeshDistancePlausibilityTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshDistancePlausibilityTestBunny     COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> bunny.obj  1.25   CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  MeshDistancePlausibilityTestBunnyLong COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> bunny.obj  0.6    CONFIGURATIONS Release RelWithDbgInfo LABELS longrun )
    waLBerla_execute_test( NAME  MeshDistancePlausibilityTestW         COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> w.obj      0.005  CONFIGURATIONS Release RelWithDbgInfo )
@@ -45,30 +45,30 @@ if ( WALBERLA_BUILD_WITH_OPENMESH )
    waLBerla_execute_test( NAME  MeshDistancePlausibilityTestCubeDbg   COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> cube.obj   0.1 )
    waLBerla_execute_test( NAME  MeshDistancePlausibilityTestSphere    COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> sphere.obj 0.04   CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  MeshDistancePlausibilityTestSphereDbg COMMAND $<TARGET_FILE:MeshDistancePlausibilityTest> sphere.obj 0.1 )
-   
-   waLBerla_compile_test( FILES MeshContainmentOctreeTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES MeshContainmentOctreeTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshContainmentOctreeTestBunny  COMMAND $<TARGET_FILE:MeshContainmentOctreeTest> bunny.obj CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  MeshContainmentOctreeTestW      COMMAND $<TARGET_FILE:MeshContainmentOctreeTest> w.obj )
    waLBerla_execute_test( NAME  MeshContainmentOctreeTestCube   COMMAND $<TARGET_FILE:MeshContainmentOctreeTest> cube.obj )
    waLBerla_execute_test( NAME  MeshContainmentOctreeTestSphere COMMAND $<TARGET_FILE:MeshContainmentOctreeTest> sphere.obj )
-   
-   waLBerla_compile_test( FILES MeshVTKTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES MeshVTKTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshVTKTest  COMMAND $<TARGET_FILE:MeshVTKTest> sphere.obj )
-   
-   waLBerla_compile_test( FILES DistributedMeshVTKTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES DistributedMeshVTKTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  DistributedMeshVTKTest  COMMAND $<TARGET_FILE:DistributedMeshVTKTest> sphere.obj )
-   
-   waLBerla_compile_test( FILES PeVTKMeshWriterTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES PeVTKMeshWriterTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  PeVTKMeshWriterTest  COMMAND $<TARGET_FILE:PeVTKMeshWriterTest> )
-   
-   waLBerla_compile_test( FILES MeshPeRaytracing.cpp DEPENDS mesh pe )
+
+   waLBerla_compile_test( FILES MeshPeRaytracing.cpp DEPENDS walberla::mesh walberla::pe )
    waLBerla_execute_test( NAME  MeshPeRaytracing )
-   
-   waLBerla_compile_test( FILES MeshAABBIntersectionTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES MeshAABBIntersectionTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshAABBIntersectionTestDbg COMMAND $<TARGET_FILE:MeshAABBIntersectionTest> 10                                          )
    waLBerla_execute_test( NAME  MeshAABBIntersectionTest    COMMAND $<TARGET_FILE:MeshAABBIntersectionTest> 10000 CONFIGURATIONS Release RelWithDbgInfo )
-   
-   waLBerla_compile_test( FILES MeshInitilizationTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES MeshInitilizationTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshInitializationTestDbg1P1 COMMAND $<TARGET_FILE:MeshInitilizationTest> cube.obj 1 1  LABELS longrun )
    waLBerla_execute_test( NAME  MeshInitializationTestDbg2P1 COMMAND $<TARGET_FILE:MeshInitilizationTest> cube.obj 2 12 LABELS longrun )
    waLBerla_execute_test( NAME  MeshInitializationTestDbg2P2 COMMAND $<TARGET_FILE:MeshInitilizationTest> cube.obj 2 12 PROCESSES 2    )
@@ -76,15 +76,15 @@ if ( WALBERLA_BUILD_WITH_OPENMESH )
    waLBerla_execute_test( NAME  MeshInitializationTest1P    COMMAND $<TARGET_FILE:MeshInitilizationTest> bunny.obj 6 40 CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  MeshInitializationTest4P    COMMAND $<TARGET_FILE:MeshInitilizationTest> bunny.obj 6 40 PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo )
 
-   waLBerla_compile_test( FILES MeshInitilizationHelperTest.cpp DEPENDS mesh )
+   waLBerla_compile_test( FILES MeshInitilizationHelperTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshInitializationHelperTestDbg1P1 COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> cube.obj 1 1              )
    waLBerla_execute_test( NAME  MeshInitializationHelperTestDbg2P1 COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> cube.obj 2 12             )
    waLBerla_execute_test( NAME  MeshInitializationHelperTestDbg2P2 COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> cube.obj 2 12 PROCESSES 2 )
    
    waLBerla_execute_test( NAME  MeshInitializationHelperTest1P    COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> bunny.obj 6 40 CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  MeshInitializationHelperTest4P    COMMAND $<TARGET_FILE:MeshInitilizationHelperTest> bunny.obj 6 40 PROCESSES 4 CONFIGURATIONS Release RelWithDbgInfo )
-   
-   waLBerla_compile_test( FILES MeshBlockExclusionTest.cpp DEPENDS mesh )
+
+   waLBerla_compile_test( FILES MeshBlockExclusionTest.cpp DEPENDS walberla::mesh )
    waLBerla_execute_test( NAME  MeshBlockExclusionTestBunny  COMMAND $<TARGET_FILE:MeshBlockExclusionTest> bunny.obj  10000 CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  MeshBlockExclusionTestW      COMMAND $<TARGET_FILE:MeshBlockExclusionTest> w.obj      1000 )
    waLBerla_execute_test( NAME  MeshBlockExclusionTestCube   COMMAND $<TARGET_FILE:MeshBlockExclusionTest> cube.obj   1000 )
@@ -95,20 +95,20 @@ if ( WALBERLA_BUILD_WITH_OPENMESH )
    waLBerla_execute_test( NAME  MeshBlockExclusionTest2PCube   COMMAND $<TARGET_FILE:MeshBlockExclusionTest> cube.obj   1000 PROCESSES 2 )
    waLBerla_execute_test( NAME  MeshBlockExclusionTest2PSphere COMMAND $<TARGET_FILE:MeshBlockExclusionTest> sphere.obj 1000 PROCESSES 2 )
 
-   waLBerla_compile_test( FILES OpenMeshBufferTypeExtensionsTest.cpp DEPENDS core mesh )
+   waLBerla_compile_test( FILES OpenMeshBufferTypeExtensionsTest.cpp DEPENDS walberla::core walberla::mesh )
    waLBerla_execute_test( NAME  OpenMeshBufferTypeExtensionsTest COMMAND $<TARGET_FILE:OpenMeshBufferTypeExtensionsTest> )
 
-   waLBerla_compile_test( FILES QHullTest.cpp DEPENDS core mesh )
+   waLBerla_compile_test( FILES QHullTest.cpp DEPENDS walberla::core walberla::mesh )
    waLBerla_execute_test( NAME  QHullTest             COMMAND $<TARGET_FILE:QHullTest>             10000 CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  QHullTestFloatMesh    COMMAND $<TARGET_FILE:QHullTest> --floatMesh 10000 CONFIGURATIONS Release RelWithDbgInfo )
    waLBerla_execute_test( NAME  QHullTestDbg          COMMAND $<TARGET_FILE:QHullTest>             10 )
    waLBerla_execute_test( NAME  QHullTestFloatMeshDbg COMMAND $<TARGET_FILE:QHullTest> --floatMesh 10 )
-   
-   waLBerla_compile_test( FILES NumericIntegrationTest.cpp DEPENDS core mesh )
+
+   waLBerla_compile_test( FILES NumericIntegrationTest.cpp DEPENDS walberla::core walberla::mesh )
    waLBerla_execute_test( NAME  NumericIntegrationTestCube   COMMAND $<TARGET_FILE:NumericIntegrationTest> cube.obj )
    waLBerla_execute_test( NAME  NumericIntegrationTestSphere COMMAND $<TARGET_FILE:NumericIntegrationTest> sphere.obj )
    waLBerla_execute_test( NAME  NumericIntegrationTestBunny  COMMAND $<TARGET_FILE:NumericIntegrationTest> bunny.obj CONFIGURATIONS Release RelWithDbgInfo )
 
-   waLBerla_compile_test( FILES MeshMarshalling.cpp DEPENDS core mesh )
+   waLBerla_compile_test( FILES MeshMarshalling.cpp DEPENDS walberla::core walberla::mesh )
    waLBerla_execute_test( NAME  MeshMarshalling )
 endif()
diff --git a/tests/pde/CMakeLists.txt b/tests/pde/CMakeLists.txt
index 5dde027cce3295929ba57314b00a8494a11000a3..0d46f4dd29d7b19c3ab5806e6faf4e84956e4b6e 100644
--- a/tests/pde/CMakeLists.txt
+++ b/tests/pde/CMakeLists.txt
@@ -1,29 +1,29 @@
 #############################################################################################################################
 #
-# Tests for pde module
+# Tests for walberla::pde module
 #
 #############################################################################################################################
 
 
-waLBerla_compile_test( FILES CGTest.cpp DEPENDS blockforest timeloop vtk )
+waLBerla_compile_test( FILES CGTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME CGShortTest COMMAND $<TARGET_FILE:CGTest> --shortrun PROCESSES 8 )
 
-waLBerla_compile_test( FILES JacobiTest.cpp DEPENDS blockforest timeloop vtk )
+waLBerla_compile_test( FILES JacobiTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME JacobiShortTest COMMAND $<TARGET_FILE:JacobiTest> --shortrun PROCESSES 8 )
 
-waLBerla_compile_test( FILES RBGSTest.cpp DEPENDS blockforest timeloop vtk )
+waLBerla_compile_test( FILES RBGSTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME RBGSShortTest COMMAND $<TARGET_FILE:RBGSTest> --shortrun PROCESSES 8 )
 
-waLBerla_compile_test( FILES SORTest.cpp DEPENDS blockforest timeloop vtk )
+waLBerla_compile_test( FILES SORTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME SORShortTest COMMAND $<TARGET_FILE:SORTest> --shortrun PROCESSES 8 )
 
-waLBerla_compile_test( FILES MGTest.cpp DEPENDS blockforest timeloop vtk )
+waLBerla_compile_test( FILES MGTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME MGShortTest COMMAND $<TARGET_FILE:MGTest> --shortrun PROCESSES 8 )
 waLBerla_execute_test( NAME MGTest COMMAND $<TARGET_FILE:MGTest> PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES MGConvergenceTest.cpp DEPENDS blockforest timeloop vtk )
+waLBerla_compile_test( FILES MGConvergenceTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk )
 waLBerla_execute_test( NAME MGConvergenceTest COMMAND $<TARGET_FILE:MGConvergenceTest> PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES BoundaryTest.cpp DEPENDS blockforest timeloop vtk boundary )
+waLBerla_compile_test( FILES BoundaryTest.cpp DEPENDS walberla::blockforest walberla::timeloop walberla::vtk walberla::boundary )
 waLBerla_execute_test( NAME BoundaryShortTest COMMAND $<TARGET_FILE:BoundaryTest> --shortrun PROCESSES 8 )
 waLBerla_execute_test( NAME BoundaryTest COMMAND $<TARGET_FILE:BoundaryTest> PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo )
diff --git a/tests/pe/CMakeLists.txt b/tests/pe/CMakeLists.txt
index 9da367cc14f28a7966315d6a61f6690c9c97a46a..0b337411a5bcfb130678f6e39a5f2820bb65d3e7 100644
--- a/tests/pe/CMakeLists.txt
+++ b/tests/pe/CMakeLists.txt
@@ -1,95 +1,95 @@
 ###################################################################################################
 #
-# Tests for pe module
+# Tests for walberla::pe module
 #
 ###################################################################################################
 
 waLBerla_link_files_to_builddir( *.cfg )
 waLBerla_link_files_to_builddir( *.sbf )
 
-waLBerla_compile_test( NAME   PE_BODYFLAGS FILES BodyFlags.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_BODYFLAGS FILES BodyFlags.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_BODYFLAGS PROCESSES 8)
 
-waLBerla_compile_test( NAME   PE_BODYITERATORS FILES BodyIterators.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_BODYITERATORS FILES BodyIterators.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_BODYITERATORS PROCESSES 2 )
 
-waLBerla_compile_test( NAME   PE_BODYSTORAGE FILES BodyStorage.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_BODYSTORAGE FILES BodyStorage.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_BODYSTORAGE )
 
-waLBerla_compile_test( NAME   PE_CALLBACK FILES Callback.cpp DEPENDS blockforest core domain_decomposition  )
+waLBerla_compile_test( NAME PE_CALLBACK FILES Callback.cpp DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition )
 waLBerla_execute_test( NAME   PE_CALLBACK PROCESSES 2 )
 
-waLBerla_compile_test( NAME   PE_CHECKVITALPARAMETERS FILES CheckVitalParameters.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_CHECKVITALPARAMETERS FILES CheckVitalParameters.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_CHECKVITALPARAMETERS )
 
-waLBerla_compile_test( NAME   PE_COLLISION FILES Collision.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_COLLISION FILES Collision.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_COLLISION )
 
-waLBerla_compile_test( NAME   PE_COLLISIONTOBIASGJK FILES CollisionTobiasGJK.cpp DEPENDS core )
+waLBerla_compile_test( NAME PE_COLLISIONTOBIASGJK FILES CollisionTobiasGJK.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_COLLISIONTOBIASGJK )
 
-waLBerla_compile_test( NAME   PE_CREATEWORLD FILES CreateWorld.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_CREATEWORLD FILES CreateWorld.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_CREATEWORLD )
 
-waLBerla_compile_test( NAME   PE_DELETEBODY FILES DeleteBody.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_DELETEBODY FILES DeleteBody.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_DELETEBODY_NN COMMAND $<TARGET_FILE:PE_DELETEBODY> )
 waLBerla_execute_test( NAME   PE_DELETEBODY_SO COMMAND $<TARGET_FILE:PE_DELETEBODY> --syncShadowOwners )
 
-waLBerla_compile_test( NAME   PE_DESTROYBODY FILES DestroyBody.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_DESTROYBODY FILES DestroyBody.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_DESTROYBODY )
 
-waLBerla_compile_test( NAME   PE_DOCUMENTATIONSNIPPETS FILES PeDocumentationSnippets.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_DOCUMENTATIONSNIPPETS FILES PeDocumentationSnippets.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_DOCUMENTATIONSNIPPETS )
 
-waLBerla_compile_test( NAME   PE_DYNAMICREFINEMENT FILES DynamicRefinement.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_DYNAMICREFINEMENT FILES DynamicRefinement.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_DYNAMICREFINEMENT )
 
-waLBerla_compile_test( NAME   PE_FORCESYNC FILES ForceSync.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_FORCESYNC FILES ForceSync.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_FORCESYNC )
 
-waLBerla_compile_test( NAME   PE_HASHGRIDS FILES HashGrids.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_HASHGRIDS FILES HashGrids.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_HASHGRIDS_REL COMMAND $<TARGET_FILE:PE_HASHGRIDS> 10000 CONFIGURATIONS Release RelWithDbgInfo)
 waLBerla_execute_test( NAME   PE_HASHGRIDS_DBG COMMAND $<TARGET_FILE:PE_HASHGRIDS> 1000)
 
-waLBerla_compile_test( NAME   PE_HCSITS FILES HCSITS.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_HCSITS FILES HCSITS.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_HCSITS )
 
-waLBerla_compile_test( NAME   PE_LOADFROMCONFIG FILES LoadFromConfig.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_LOADFROMCONFIG FILES LoadFromConfig.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_LOADFROMCONFIG COMMAND $<TARGET_FILE:PE_LOADFROMCONFIG> ${CMAKE_CURRENT_SOURCE_DIR}/LoadFromConfig.cfg )
 
-waLBerla_compile_test( NAME   PE_MARSHALLING FILES Marshalling.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_MARSHALLING FILES Marshalling.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_MARSHALLING )
 
-waLBerla_compile_test( NAME   PE_MATERIAL FILES Material.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_MATERIAL FILES Material.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_MATERIAL )
 
-waLBerla_compile_test( NAME   PE_MINMAXREFINEMENT FILES MinMaxRefinement.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_MINMAXREFINEMENT FILES MinMaxRefinement.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_MINMAXREFINEMENT PROCESSES 8 )
 
-waLBerla_compile_test( NAME   PE_OVERLAP FILES Overlap.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_OVERLAP FILES Overlap.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_OVERLAP )
 
-waLBerla_compile_test( NAME   PE_PARALLELEQUIVALENCE FILES ParallelEquivalence.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_PARALLELEQUIVALENCE FILES ParallelEquivalence.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_PARALLELEQUIVALENCE PROCESSES 4 )
 
 if( WALBERLA_BUILD_WITH_PARMETIS )
-   waLBerla_compile_test( NAME   PE_PARMETIS FILES ParMetis.cpp DEPENDS core blockforest  )
+   waLBerla_compile_test( NAME PE_PARMETIS FILES ParMetis.cpp DEPENDS walberla::core walberla::blockforest )
    waLBerla_execute_test( NAME   PE_PARMETIS PROCESSES 64 )
 endif()
 
-waLBerla_compile_test( NAME   PE_PARSEMESSAGE FILES ParseMessage.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_PARSEMESSAGE FILES ParseMessage.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_PARSEMESSAGE )
 
-waLBerla_compile_test( NAME   PE_REFINEMENT FILES Refinement.cpp DEPENDS core blockforest   timeloop )
+waLBerla_compile_test( NAME PE_REFINEMENT FILES Refinement.cpp DEPENDS walberla::core walberla::blockforest walberla::timeloop )
 waLBerla_execute_test( NAME   PE_REFINEMENT )
 
-waLBerla_compile_test( NAME   PE_REFINEMENTWITHSPAREPROCESSES FILES RefinementWithSpareProcesses.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_REFINEMENTWITHSPAREPROCESSES FILES RefinementWithSpareProcesses.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_REFINEMENTWITHSPAREPROCESSES PROCESSES 27 )
 
-waLBerla_compile_test( NAME   PE_RIGIDBODY FILES RigidBody.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_RIGIDBODY FILES RigidBody.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RIGIDBODY )
 
-waLBerla_compile_test( NAME   PE_SERIALIZEDESERIALIZE FILES SerializeDeserialize.cpp DEPENDS core blockforest  )
+waLBerla_compile_test( NAME PE_SERIALIZEDESERIALIZE FILES SerializeDeserialize.cpp DEPENDS walberla::core walberla::blockforest )
 waLBerla_execute_test( NAME   PE_SERIALIZEDESERIALIZE01 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 1 )
 waLBerla_execute_test( NAME   PE_SERIALIZEDESERIALIZE02 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 2 )
 waLBerla_execute_test( NAME   PE_SERIALIZEDESERIALIZE04 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 4 )
@@ -100,23 +100,23 @@ set_property( TEST PE_SERIALIZEDESERIALIZE04 PROPERTY DEPENDS PE_SERIALIZEDESERI
 set_property( TEST PE_SERIALIZEDESERIALIZE08 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE04 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
 endif()
 
-waLBerla_compile_test( NAME   PE_SHADOWCOPY FILES ShadowCopy.cpp DEPENDS core blockforest domain_decomposition  )
+waLBerla_compile_test( NAME PE_SHADOWCOPY FILES ShadowCopy.cpp DEPENDS walberla::core walberla::blockforest walberla::domain_decomposition )
 waLBerla_execute_test( NAME   PE_SHADOWCOPY_NN COMMAND $<TARGET_FILE:PE_SHADOWCOPY> )
 waLBerla_execute_test( NAME   PE_SHADOWCOPY_SO COMMAND $<TARGET_FILE:PE_SHADOWCOPY> --syncShadowOwners )
 
-waLBerla_compile_test( NAME   PE_SIMPLECCD FILES SimpleCCD.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_SIMPLECCD FILES SimpleCCD.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_SIMPLECCD )
 
-waLBerla_compile_test( NAME   PE_SYNCEQUIVALENCE FILES SyncEquivalence.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_SYNCEQUIVALENCE FILES SyncEquivalence.cpp DEPENDS walberla::core )
 #waLBerla_execute_test( NAME   PE_SYNCEQUIVALENCE COMMAND $<TARGET_FILE:PE_SYNCEQUIVALENCE> PROCESSES  8 )
 
-waLBerla_compile_test( NAME   PE_SYNCHRONIZATION FILES Synchronization.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_SYNCHRONIZATION FILES Synchronization.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATION01 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATION03 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES  3 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATION09 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES  9 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATION27 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES 27)
 
-waLBerla_compile_test( NAME   PE_SYNCHRONIZATIONDELETE FILES SynchronizationDelete.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_SYNCHRONIZATIONDELETE FILES SynchronizationDelete.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE01_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE03_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES  3 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE09_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES  9 LABELS longrun)
@@ -126,34 +126,34 @@ waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE03_SO COMMAND $<TARGET_FIL
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE09_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES  9 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE27_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES 27)
 
-waLBerla_compile_test( NAME   PE_SYNCHRONIZATIONLARGEBODY FILES SynchronizationLargeBody.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_SYNCHRONIZATIONLARGEBODY FILES SynchronizationLargeBody.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONLARGEBODY01 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONLARGEBODY03 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES  3 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONLARGEBODY09 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES  9 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONLARGEBODY27 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES 27)
 
-waLBerla_compile_test( NAME   PE_STATICTYPEIDS FILES SetBodyTypeIDs.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_STATICTYPEIDS FILES SetBodyTypeIDs.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_STATICTYPEIDS )
 
-waLBerla_compile_test( NAME   PE_UNION FILES Union.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_UNION FILES Union.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_UNION )
 
-waLBerla_compile_test( NAME   PE_UNIONBEHAVIOR FILES UnionBehavior.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_UNIONBEHAVIOR FILES UnionBehavior.cpp DEPENDS walberla::core )
 if( WALBERLA_DOUBLE_ACCURACY )
 waLBerla_execute_test( NAME   PE_UNIONBEHAVIOR )
 endif()
 
-waLBerla_compile_test( NAME   PE_RAYTRACING FILES Raytracing.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_RAYTRACING FILES Raytracing.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RAYTRACING )
 
-waLBerla_compile_test( NAME   PE_RAYTRACING_INTERSECTION FILES RaytracingIntersection.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_RAYTRACING_INTERSECTION FILES RaytracingIntersection.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RAYTRACING_INTERSECTION )
 
-waLBerla_compile_test( NAME   PE_RAYTRACING_SPHERE FILES RaytracingSphere.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_RAYTRACING_SPHERE FILES RaytracingSphere.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RAYTRACING_SPHERE )
 
-waLBerla_compile_test( NAME   PE_RAYTRACING_HASHGRIDS FILES RaytracingHashGrids.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_RAYTRACING_HASHGRIDS FILES RaytracingHashGrids.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RAYTRACING_HASHGRIDS )
 
-waLBerla_compile_test( NAME   PE_VOLUMEINERTIA FILES VolumeInertia.cpp DEPENDS core  )
+waLBerla_compile_test( NAME PE_VOLUMEINERTIA FILES VolumeInertia.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_VOLUMEINERTIA CONFIGURATIONS Release RelWithDbgInfo)
diff --git a/tests/pe_coupling/CMakeLists.txt b/tests/pe_coupling/CMakeLists.txt
index 81fc07d822a0453b9b12454a07508c646fe0aa42..7adf21fa35fff8474d9f331835d1cd2f7201cbd4 100644
--- a/tests/pe_coupling/CMakeLists.txt
+++ b/tests/pe_coupling/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###################################################################################################
 #
-# Tests for pe_coupling module
+# Tests for walberla::pe_coupling module
 #
 ###################################################################################################
 
@@ -9,7 +9,7 @@
 # Partially saturated cells method tests
 ###################################################################################################
 
-waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME DragForceSpherePSMSC1W1FuncTest     COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1 --funcTest PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSpherePSMSC1W1SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1            PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSpherePSMSC1W1ParallelTest COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1            PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -24,7 +24,7 @@ waLBerla_execute_test( NAME DragForceSpherePSMSC2W2SingleTest   COMMAND $<TARGET
 waLBerla_execute_test( NAME DragForceSpherePSMSC3W2FuncTest     COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC3W2 --funcTest PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSpherePSMSC3W2SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC3W2            PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1FuncTest     COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1 --funcTest PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1            PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1ParallelTest COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1            PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -34,7 +34,7 @@ waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W2SingleTest   COMMAN
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC2W2SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC2W2            PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC3W2SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC3W2            PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES partially_saturated_cells_method/SegreSilberbergPSM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES partially_saturated_cells_method/SegreSilberbergPSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC1W1FuncTest     COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC1W1 --funcTest  PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC1W1Test         COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC1W1             PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC2W1FuncTest     COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC2W1 --funcTest  PROCESSES 9 )
@@ -48,7 +48,7 @@ waLBerla_execute_test( NAME SegreSilberbergPSMSC2W2Test         COMMAND $<TARGET
 waLBerla_execute_test( NAME SegreSilberbergPSMSC3W2FuncTest     COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC3W2 --funcTest  PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC3W2Test         COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC3W2             PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME TorqueSpherePSMSC1W1FuncTest     COMMAND $<TARGET_FILE:TorqueSpherePSM> --funcTest --SC1W1   PROCESSES 1 )
 waLBerla_execute_test( NAME TorqueSpherePSMSC1W1SingleTest   COMMAND $<TARGET_FILE:TorqueSpherePSM> --SC1W1              PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME TorqueSpherePSMSC1W1ParallelTest COMMAND $<TARGET_FILE:TorqueSpherePSM> --SC1W1              PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -67,15 +67,15 @@ waLBerla_execute_test( NAME TorqueSpherePSMSC3W2SingleTest   COMMAND $<TARGET_FI
 # Momentum exchange method tests
 ###################################################################################################
 
-waLBerla_compile_test( FILES momentum_exchange_method/BodyAtBlockBoarderCheck.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/BodyAtBlockBoarderCheck.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest1        COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 1         PROCESSES 8 )
 waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest2        COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 2         PROCESSES 8 LABELS longrun )
 waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest3        COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 3         PROCESSES 8 LABELS verylongrun )
 
-waLBerla_compile_test( FILES momentum_exchange_method/BodyMappingTest.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/BodyMappingTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME BodyMappingTest COMMAND $<TARGET_FILE:BodyMappingTest> PROCESSES 1 )
 
-waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME DragForceSphereMEMFuncTest        COMMAND $<TARGET_FILE:DragForceSphereMEM> --funcTest          PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSphereMEMSingleTest      COMMAND $<TARGET_FILE:DragForceSphereMEM>                     PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSphereMEMParallelTest    COMMAND $<TARGET_FILE:DragForceSphereMEM>                     PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -86,28 +86,28 @@ waLBerla_execute_test( NAME DragForceSphereMEMMRFuncTest      COMMAND $<TARGET_F
 waLBerla_execute_test( NAME DragForceSphereMEMMRSingleTest    COMMAND $<TARGET_FILE:DragForceSphereMEM> --MEMVariant MR             PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSphereMEMMRParallelTest  COMMAND $<TARGET_FILE:DragForceSphereMEM> --MEMVariant MR             PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEMRefinement.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEMRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME DragForceSphereMEMRefinementFuncTest        COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement> --funcTest          PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSphereMEMRefinementSingleTest      COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement>                     PROCESSES 4 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSphereMEMRefinementParallelTest    COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement>                     PROCESSES 5 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSphereMEMRefinementCLITest         COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement> --MO_CLI            PROCESSES 4 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME GlobalBodyAsBoundaryMEMStaticRefinementTest        COMMAND $<TARGET_FILE:GlobalBodyAsBoundaryMEMStaticRefinement>          PROCESSES 1 )
 
-waLBerla_compile_test( FILES momentum_exchange_method/LubricationCorrectionMEM.cpp DEPENDS blockforest timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/LubricationCorrectionMEM.cpp DEPENDS walberla::blockforest walberla::timeloop )
 waLBerla_execute_test( NAME LubricationCorrectionMEMFuncTest         COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --funcTest                   PROCESSES 3 )
 waLBerla_execute_test( NAME LubricationCorrectionMEMSphereSphereTest COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --split --fzyx --sphSphTest  PROCESSES 6 LABELS longrun             CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME LubricationCorrectionMEMSphereWallTest   COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --split --fzyx --sphWallTest PROCESSES 3 LABELS longrun verylongrun CONFIGURATIONS Release RelWithDbgInfo )
-  
-waLBerla_compile_test( FILES momentum_exchange_method/PeriodicParticleChannelMEM.cpp DEPENDS blockforest pe timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/PeriodicParticleChannelMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME PeriodicParticleChannelMEMTest COMMAND $<TARGET_FILE:PeriodicParticleChannelMEM> --shortrun PROCESSES 4 LABELS longrun )
 
-waLBerla_compile_test( FILES momentum_exchange_method/TaylorCouetteFlowMEM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/TaylorCouetteFlowMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME TaylorCouetteFlowMEMTest COMMAND $<TARGET_FILE:TaylorCouetteFlowMEM> --shortrun )
 waLBerla_execute_test( NAME TaylorCouetteFlowMEMTest2 COMMAND $<TARGET_FILE:TaylorCouetteFlowMEM>  PROCESSES 4 LABELS verylongrun)
 
-waLBerla_compile_test( FILES momentum_exchange_method/SegreSilberbergMEM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/SegreSilberbergMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME SegreSilberbergMEMSyncNextNeighbor    COMMAND $<TARGET_FILE:SegreSilberbergMEM> --shortrun                    PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergMEMSyncShadowOwner     COMMAND $<TARGET_FILE:SegreSilberbergMEM> --shortrun --syncShadowOwners PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergMEMTest                COMMAND $<TARGET_FILE:SegreSilberbergMEM>                      PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -120,19 +120,19 @@ waLBerla_execute_test( NAME SegreSilberbergMEMEanReconTest        COMMAND $<TARG
 waLBerla_execute_test( NAME SegreSilberbergMEMExtReconFuncTest    COMMAND $<TARGET_FILE:SegreSilberbergMEM> --funcTest --extReconstructor PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergMEMExtReconTest        COMMAND $<TARGET_FILE:SegreSilberbergMEM> --MO_CLI --extReconstructor   PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 
-waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS walberla::timeloop )
 waLBerla_execute_test( NAME SettlingSphereMEMFuncTestSerial      COMMAND $<TARGET_FILE:SettlingSphereMEM> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME SettlingSphereMEMFuncTestParallel    COMMAND $<TARGET_FILE:SettlingSphereMEM> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo)
 
-waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp DEPENDS timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp DEPENDS walberla::timeloop )
 waLBerla_execute_test( NAME SettlingSphereMEMDynamicRefinementFuncTestSerial      COMMAND $<TARGET_FILE:SettlingSphereMEMDynamicRefinement> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo)
 waLBerla_execute_test( NAME SettlingSphereMEMDynamicRefinementFuncTestParallel    COMMAND $<TARGET_FILE:SettlingSphereMEMDynamicRefinement> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo)
 
-waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp DEPENDS timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp DEPENDS walberla::timeloop )
 waLBerla_execute_test( NAME SettlingSphereMEMStaticRefinementFuncTestSerial      COMMAND $<TARGET_FILE:SettlingSphereMEMStaticRefinement> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo)
 waLBerla_execute_test( NAME SettlingSphereMEMStaticRefinementFuncTestParallel    COMMAND $<TARGET_FILE:SettlingSphereMEMStaticRefinement> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo)
 
-waLBerla_compile_test( FILES momentum_exchange_method/TorqueSphereMEM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/TorqueSphereMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME TorqueSphereMEMFuncTest        COMMAND $<TARGET_FILE:TorqueSphereMEM> --funcTest           PROCESSES 1 )
 waLBerla_execute_test( NAME TorqueSphereMEMSingleTest      COMMAND $<TARGET_FILE:TorqueSphereMEM>                      PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME TorqueSphereMEMParallelTest    COMMAND $<TARGET_FILE:TorqueSphereMEM>                      PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -143,7 +143,7 @@ waLBerla_execute_test( NAME TorqueSphereMEMMRFuncTest      COMMAND $<TARGET_FILE
 waLBerla_execute_test( NAME TorqueSphereMEMMRSingleTest    COMMAND $<TARGET_FILE:TorqueSphereMEM> --MO_MR              PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME TorqueSphereMEMMRParallelTest  COMMAND $<TARGET_FILE:TorqueSphereMEM> --MO_MR              PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )  
 
-waLBerla_compile_test( FILES momentum_exchange_method/SquirmerTest.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES momentum_exchange_method/SquirmerTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME SquirmerShortTest COMMAND $<TARGET_FILE:SquirmerTest> --shortrun PROCESSES 1 )
 waLBerla_execute_test( NAME SquirmerTest COMMAND $<TARGET_FILE:SquirmerTest> PROCESSES 1 CONFIGURATIONS Release RelWithDbgInfo  )
 
@@ -151,28 +151,28 @@ waLBerla_execute_test( NAME SquirmerTest COMMAND $<TARGET_FILE:SquirmerTest> PRO
 # Discrete particle methods tests
 ###################################################################################################
 
-waLBerla_compile_test( FILES discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME SphereWallCollisionBehaviorDPMFuncTest COMMAND $<TARGET_FILE:SphereWallCollisionBehaviorDPM> --funcTest PROCESSES 1 )
 
-waLBerla_compile_test( FILES discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME HinderedSettlingDynamicsDPMFuncTest COMMAND $<TARGET_FILE:HinderedSettlingDynamicsDPM> --funcTest PROCESSES 4 LABELS longrun CONFIGURATIONS RelWithDbgInfo )
 
 ###################################################################################################
 # Geometry tests
 ###################################################################################################
 
-waLBerla_compile_test( FILES geometry/PeIntersectionRatioTest.cpp DEPENDS pe )
+waLBerla_compile_test( FILES geometry/PeIntersectionRatioTest.cpp DEPENDS walberla::pe )
 waLBerla_execute_test( NAME PeIntersectionRatioTest COMMAND $<TARGET_FILE:PeIntersectionRatioTest> PROCESSES 1 )
 
 ###################################################################################################
 # Utility tests
 ###################################################################################################
 
-waLBerla_compile_test( FILES utility/BodiesForceTorqueContainerTest.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES utility/BodiesForceTorqueContainerTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME BodiesForceTorqueContainerTest COMMAND $<TARGET_FILE:BodiesForceTorqueContainerTest> PROCESSES 1 )
 waLBerla_execute_test( NAME BodiesForceTorqueContainerParallelTest COMMAND $<TARGET_FILE:BodiesForceTorqueContainerTest> PROCESSES 3 )
 
-waLBerla_compile_test( FILES utility/PeSubCyclingTest.cpp DEPENDS blockforest pe timeloop )
+waLBerla_compile_test( FILES utility/PeSubCyclingTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME PeSubCyclingTest COMMAND $<TARGET_FILE:PeSubCyclingTest> PROCESSES 1 )
 waLBerla_execute_test( NAME PeSubCyclingParallelTest COMMAND $<TARGET_FILE:PeSubCyclingTest> PROCESSES 3 )
 
diff --git a/tests/postprocessing/CMakeLists.txt b/tests/postprocessing/CMakeLists.txt
index ffe99cd52776ffa370638541c3a22625b834a7fc..73ac3b49c08046b855203a88254d3fefa58c2a14 100644
--- a/tests/postprocessing/CMakeLists.txt
+++ b/tests/postprocessing/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###################################################################################################
 #
-# Tests for postprocessing module
+# Tests for walberla::postprocessing module
 #
 ###################################################################################################
 
diff --git a/tests/python_coupling/CMakeLists.txt b/tests/python_coupling/CMakeLists.txt
index 4eec405aa5901c5d3e90ae83162a5dcaf1bf8444..4086fea042c130264365f568b1ab9637386245d7 100644
--- a/tests/python_coupling/CMakeLists.txt
+++ b/tests/python_coupling/CMakeLists.txt
@@ -7,15 +7,15 @@
 waLBerla_link_files_to_builddir( *.py )
 
 if (WALBERLA_BUILD_WITH_PYTHON)
-    waLBerla_compile_test( FILES ConfigFromPythonTest.cpp DEPENDS blockforest field )
+    waLBerla_compile_test( FILES ConfigFromPythonTest.cpp DEPENDS walberla::blockforest walberla::field )
     waLBerla_execute_test( NAME ConfigFromPythonTest 
                            COMMAND $<TARGET_FILE:ConfigFromPythonTest> ${CMAKE_CURRENT_SOURCE_DIR}/ConfigFromPythonTest.py )
-                           
-    waLBerla_compile_test( FILES CallbackTest.cpp  DEPENDS blockforest field )
+
+    waLBerla_compile_test( FILES CallbackTest.cpp DEPENDS walberla::blockforest walberla::field )
     waLBerla_execute_test( NAME CallbackTest
                           COMMAND $<TARGET_FILE:CallbackTest> ${CMAKE_CURRENT_SOURCE_DIR}/CallbackTest.py )
 
-    waLBerla_compile_test( FILES FieldExportTest.cpp  DEPENDS blockforest field )
+    waLBerla_compile_test( FILES FieldExportTest.cpp DEPENDS walberla::blockforest walberla::field )
     waLBerla_execute_test( NAME FieldExportTest
                            COMMAND $<TARGET_FILE:FieldExportTest> ${CMAKE_CURRENT_SOURCE_DIR}/FieldExportTest.py )
 
diff --git a/tests/simd/CMakeLists.txt b/tests/simd/CMakeLists.txt
index 03c6d94146ec42bb04b317684f7c9096617ead9c..984f67fcc91134a46f01d3a21dcef2cf2ca415bd 100644
--- a/tests/simd/CMakeLists.txt
+++ b/tests/simd/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###################################################################################################
 #
-# Tests for simd module
+# Tests for walberla::simd module
 #
 ###################################################################################################
 
diff --git a/tests/sqlite/CMakeLists.txt b/tests/sqlite/CMakeLists.txt
index 21513d96b056a643907df3eb4738d50c815796ff..f2eab8cb667120eda9b5882ea2a6fba5344de8e4 100644
--- a/tests/sqlite/CMakeLists.txt
+++ b/tests/sqlite/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###################################################################################################
 #
-# Tests for sqlite module
+# Tests for walberla::sqlite module
 #
 ###################################################################################################
 
diff --git a/tests/stencil/CMakeLists.txt b/tests/stencil/CMakeLists.txt
index 79db23bab2a2b2e5e7ea95183fa704dbac15cd5b..fad98fe4af1d12e40f24ffdf61a551ceedc5ee8d 100644
--- a/tests/stencil/CMakeLists.txt
+++ b/tests/stencil/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###################################################################################################
 #
-# Tests for stencil module
+# Tests for walberla::stencil module
 #
 ###################################################################################################
 
diff --git a/tests/timeloop/CMakeLists.txt b/tests/timeloop/CMakeLists.txt
index e39b3223f0cadd32c5e787ac06b701fa5731ab87..835ab9fe5fc32ff6db9372758fc620f0ce5b2415 100644
--- a/tests/timeloop/CMakeLists.txt
+++ b/tests/timeloop/CMakeLists.txt
@@ -1,23 +1,19 @@
 ###################################################################################################
 #
-# Tests for timeloop module
+# Tests for walberla::timeloop module
 #
 ###################################################################################################
 
-waLBerla_compile_test( FILES    MultipleSweepFailTest.cpp
-                       DEPENDS  blockforest )
-waLBerla_execute_test( NAME     MultipleSweepFailTest )
-set_property(          TEST     MultipleSweepFailTest
-                       PROPERTY WILL_FAIL TRUE )
+waLBerla_compile_test( FILES MultipleSweepFailTest.cpp DEPENDS walberla::blockforest )
+waLBerla_execute_test( NAME MultipleSweepFailTest )
+set_property( TEST MultipleSweepFailTest
+      PROPERTY WILL_FAIL TRUE )
 
-waLBerla_compile_test( FILES    MultipleSweepTest.cpp
-                       DEPENDS  blockforest )
-waLBerla_execute_test( NAME     MultipleSweepTest )
+waLBerla_compile_test( FILES MultipleSweepTest.cpp DEPENDS walberla::blockforest )
+waLBerla_execute_test( NAME MultipleSweepTest )
 
-waLBerla_compile_test( FILES    TimeloopSweepManagementTest.cpp
-                       DEPENDS  blockforest )
-waLBerla_execute_test( NAME     TimeloopSweepManagementTest )
+waLBerla_compile_test( FILES TimeloopSweepManagementTest.cpp DEPENDS walberla::blockforest )
+waLBerla_execute_test( NAME TimeloopSweepManagementTest )
 
-waLBerla_compile_test( FILES    TimeloopAndSweepRegisterTest.cpp
-                       DEPENDS  blockforest field )
-waLBerla_execute_test( NAME     TimeloopAndSweepRegisterTest )
\ No newline at end of file
+waLBerla_compile_test( FILES TimeloopAndSweepRegisterTest.cpp DEPENDS walberla::blockforest walberla::field )
+waLBerla_execute_test( NAME TimeloopAndSweepRegisterTest )
\ No newline at end of file