diff --git a/apps/benchmarks/ComplexGeometry/CMakeLists.txt b/apps/benchmarks/ComplexGeometry/CMakeLists.txt
index 76a434fbb21c0a6f29bb42f0ebd92140890c5fe4..27176e2746c5d0bb61ce8348224652b47bb1b2c7 100644
--- a/apps/benchmarks/ComplexGeometry/CMakeLists.txt
+++ b/apps/benchmarks/ComplexGeometry/CMakeLists.txt
@@ -3,7 +3,7 @@ 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 walberla::boundary walberla::core walberla::lbm mesh walberla::vtk )
+   waLBerla_add_executable( NAME ComplexGeometry FILES ComplexGeometry.cpp DEPENDS walberla::boundary walberla::core walberla::lbm walberla::mesh walberla::vtk )
 
 	##############
 	# Some tests #
diff --git a/apps/showcases/PegIntoSphereBed/CMakeLists.txt b/apps/showcases/PegIntoSphereBed/CMakeLists.txt
index 7a71c0c6e90edfa6abf3553147656bd549be5e3b..e5daf1026ec7a5d124adc5ede596159a605a0c6b 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 walberla::blockforest mesh_common walberla::mesa_pd walberla::core walberla::vtk )
+          DEPENDS walberla::blockforest walberla::mesh_common walberla::mesa_pd walberla::core walberla::vtk )
 endif()
\ No newline at end of file
diff --git a/apps/tutorials/codegen/CMakeLists.txt b/apps/tutorials/codegen/CMakeLists.txt
index fb4cc9b77fd28908db7e0df3fb472ecb7dceb74c..f0cad4bd45389f704761ee1c811c1e26db6fd1e4 100644
--- a/apps/tutorials/codegen/CMakeLists.txt
+++ b/apps/tutorials/codegen/CMakeLists.txt
@@ -66,10 +66,10 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
             InfoHeader.h
         )
 
-        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 )
+        set( TUT4_DEPENDENCIES walberla::blockforest walberla::boundary walberla::core walberla::field walberla::geometry walberla::lbm walberla::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)
+            list(APPEND TUT4_DEPENDENCIES walberla::gpu)
         endif()
         
         walberla_generate_target_from_python( 
diff --git a/apps/tutorials/lbm/CMakeLists.txt b/apps/tutorials/lbm/CMakeLists.txt
index 8fd53ddae1744a8f6ffe2b85f9e1333c0b03539a..38d23d84dab0466b2a15b44d8a41ae0004bf9341 100644
--- a/apps/tutorials/lbm/CMakeLists.txt
+++ b/apps/tutorials/lbm/CMakeLists.txt
@@ -19,7 +19,7 @@ waLBerla_link_geometry_to_builddir(*.obj)
 
 waLBerla_add_executable ( NAME 04_LBComplexGeometry
                           FILES 04_LBComplexGeometry.cpp
-      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm mesh walberla::stencil walberla::timeloop walberla::vtk )
+      DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::mesh walberla::stencil walberla::timeloop walberla::vtk )
                           
 endif()
 
diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt
index be45ad6d02cc1f27df9f804d81c144b5f73566e9..af4df5ad5d4faa51512554fb76322eaea06dfee5 100644
--- a/src/mesh/CMakeLists.txt
+++ b/src/mesh/CMakeLists.txt
@@ -6,9 +6,9 @@
 
 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 )
+target_link_libraries( walberla_mesh PUBLIC walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::pe walberla::stencil walberla::mesh_common )
 if ( OPENMESH_CORE_FOUND )
-   target_link_directories( walberla::mesh PUBLIC OpenMeshCore )
+   target_link_directories( walberla_mesh PUBLIC OpenMeshCore )
 endif()
 target_sources( walberla_mesh
       PRIVATE
diff --git a/src/mesh_common/CMakeLists.txt b/src/mesh_common/CMakeLists.txt
index 024e4d56ece40c2d246e7a91c2dfb56fe38dc5c9..2b4344448a1e505a64c061ea46d50fa9663a45d0 100644
--- a/src/mesh_common/CMakeLists.txt
+++ b/src/mesh_common/CMakeLists.txt
@@ -8,7 +8,7 @@ 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( walberla::mesh_common INTERFACE OpenMeshCore )
+   target_link_directories( walberla_mesh_common INTERFACE OpenMeshCore )
 endif()
 target_sources( walberla_mesh_common
       INTERFACE
diff --git a/tests/mesa_pd/CMakeLists.txt b/tests/mesa_pd/CMakeLists.txt
index dd9e73ab61faa1cd993ed6bfc299e0d5b2a0759e..0292c02cfde9156bd1ffe40b65efb14703747114 100644
--- a/tests/mesa_pd/CMakeLists.txt
+++ b/tests/mesa_pd/CMakeLists.txt
@@ -232,15 +232,15 @@ waLBerla_compile_test( NAME MESA_PD_VTK_Outputs FILES vtk/VTKOutputs.cpp DEPENDS
 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 walberla::core walberla::mesa_pd mesh_common walberla::vtk )
+    waLBerla_compile_test( NAME MESA_PD_VTK_ConvexPolyhedron FILES vtk/ConvexPolyhedronVTKOutput.cpp DEPENDS walberla::core walberla::mesa_pd walberla::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 walberla::core walberla::mesa_pd mesh_common )
+    waLBerla_compile_test( NAME MESA_PD_Common_ContainsPointConvexPolyhedron FILES common/ContainsPointConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd walberla::mesh_common )
     waLBerla_execute_test( NAME   MESA_PD_Common_ContainsPointConvexPolyhedron )
 
-    waLBerla_compile_test( NAME MESA_PD_Data_ConvexPolyhedron FILES data/ConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common )
+    waLBerla_compile_test( NAME MESA_PD_Data_ConvexPolyhedron FILES data/ConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd walberla::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 walberla::core walberla::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 walberla::mesh_common )
     waLBerla_execute_test( NAME   MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA )
 endif()