diff --git a/lib/walberla/experimental/lbm/GenericHbbBoundary.hpp b/lib/walberla/experimental/lbm/GenericHbbBoundary.hpp
index c0692144282549b0d6b0fe23d905fcec382c6fa4..aad3c4bcb383d7cf2aeb5341f5ec3cb57a82c83e 100644
--- a/lib/walberla/experimental/lbm/GenericHbbBoundary.hpp
+++ b/lib/walberla/experimental/lbm/GenericHbbBoundary.hpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <tuple>
 
-#include "walberla/experimental/field/SparseIndexList.hpp"
+#include "walberla/experimental/sweep/SparseIndexList.hpp"
 
 namespace walberla::experimental
 {
@@ -49,7 +49,7 @@ class GenericHbbBoundary
 {
 public:
   using Stencil      = Stencil_T;
-  using IndexVectors = internal::IndexListBuffer< HbbLink >;
+  using IndexVectors = sweep::internal::IndexListBuffer< HbbLink >;
 
   GenericHbbBoundary(StructuredBlockForest& blocks)
   {
diff --git a/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp b/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
index 55fdf16b0354abec90c50a68a498572785b935a2..d9f806997a1987cc6bb8fabd5a3af3fc930b5d1b 100644
--- a/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
+++ b/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
@@ -15,6 +15,10 @@ namespace BasicLbmScenarios
 {
 using namespace walberla;
 
+/**
+ * Fully periodic force-driven flow.
+ * The velocity in each cell should be steadily increasing.
+ */
 void fullyPeriodic(Environment& env)
 {
    SimDomain dom{ SimDomainBuilder{
diff --git a/user_manual/examples/ForceDrivenChannel/CMakeLists.txt b/user_manual/examples/ForceDrivenChannel/CMakeLists.txt
index dc8b9295f23c3c71d92a6d60bf6c30424d08ba31..3d7391c1ed7399d7436f070218e210c93bf9c7b3 100644
--- a/user_manual/examples/ForceDrivenChannel/CMakeLists.txt
+++ b/user_manual/examples/ForceDrivenChannel/CMakeLists.txt
@@ -10,5 +10,5 @@ walberla_generate_sources( Ex_ForceDrivenChannel
 target_link_libraries(
     Ex_ForceDrivenChannel
     PRIVATE 
-    walberla::core walberla::stencil walberla::blockforest walberla::geometry walberla::vtk walberla::codegen 
+    walberla::core walberla::stencil walberla::blockforest walberla::geometry walberla::vtk walberla::experimental
 )
diff --git a/user_manual/examples/FreeSlipBubble/CMakeLists.txt b/user_manual/examples/FreeSlipBubble/CMakeLists.txt
index a47e511dc3dfcd129c09b81c7f1322e0c3e54221..63299c46ce7987d32ccc91f61b928abc5f2b8383 100644
--- a/user_manual/examples/FreeSlipBubble/CMakeLists.txt
+++ b/user_manual/examples/FreeSlipBubble/CMakeLists.txt
@@ -3,4 +3,4 @@ walberla_link_files_to_builddir( *.prm )
 add_executable( FreeSlipBubble FreeSlipBubble.cpp )
 
 walberla_generate_sources( FreeSlipBubble SCRIPTS LbmAlgorithms.py )
-target_link_libraries( FreeSlipBubble walberla::core walberla::blockforest walberla::field walberla::geometry walberla::stencil walberla::codegen )
+target_link_libraries( FreeSlipBubble walberla::core walberla::blockforest walberla::field walberla::geometry walberla::stencil walberla::experimental )
diff --git a/user_manual/examples/SparseSpiral/CMakeLists.txt b/user_manual/examples/SparseSpiral/CMakeLists.txt
index d973f8a173863aa58081f49ac47ab0c23e0c0866..e5698a1b3448ea13c2dcc8a640952489147c0a95 100644
--- a/user_manual/examples/SparseSpiral/CMakeLists.txt
+++ b/user_manual/examples/SparseSpiral/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 add_executable( SparseSpiral SparseSpiral.cpp )
 walberla_generate_sources( SparseSpiral SCRIPTS SpiralSweep.py )
-target_link_libraries( SparseSpiral PRIVATE walberla::core walberla::blockforest walberla::field walberla::vtk walberla::codegen )
+target_link_libraries( SparseSpiral PRIVATE walberla::core walberla::blockforest walberla::field walberla::vtk walberla::experimental )
 
diff --git a/user_manual/examples/SparseSpiral/SparseSpiral.cpp b/user_manual/examples/SparseSpiral/SparseSpiral.cpp
index 1612e9c48b359c8df8dab570395a42ecde74acd4..6d11b4bebac9a6d50f43562342ca076a5d5d4db0 100644
--- a/user_manual/examples/SparseSpiral/SparseSpiral.cpp
+++ b/user_manual/examples/SparseSpiral/SparseSpiral.cpp
@@ -3,7 +3,7 @@
 #include "field/GhostLayerField.h"
 #include "field/AddToStorage.h"
 #include "field/vtk/all.h"
-#include "walberla/experimental/field/SparseIndexList.hpp"
+#include "walberla/experimental/sweep/SparseIndexList.hpp"
 
 #include <array>
 
@@ -44,7 +44,7 @@ namespace SparseSpiral
             cpb[0], cpb[1], cpb[2]);
 
         BlockDataID fID = field::addToStorage<PointField>(blocks, "f", real_c(0.0), field::fzyx);
-        field::SparseIndexList indexList{*blocks};
+        sweep::SparseIndexList indexList{*blocks};
 
         auto isOnSpiral = [&](Cell globalCell) -> bool
         {