diff --git a/CMakeLists.txt b/CMakeLists.txt
index a53979a6ef0d2a9cfd37a331c6eafaff25a27451..67d70743c918a04b7b17af09d987599ab3d5c67e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,11 +120,11 @@ endif()
 
 target_link_libraries(${CPU_BIN} ${CMAKE_EXE_LINKER_FLAGS})
 set_target_properties(${CPU_BIN} PROPERTIES CXX_STANDARD_REQUIRED ON)
-set_target_properties(${CPU_BIN} PROPERTIES CXX_STANDARD 14)
+set_target_properties(${CPU_BIN} PROPERTIES CXX_STANDARD 17)
 
 target_link_libraries(${GPU_BIN} ${CMAKE_EXE_LINKER_FLAGS})
 set_target_properties(${GPU_BIN} PROPERTIES CXX_STANDARD_REQUIRED ON)
-set_target_properties(${GPU_BIN} PROPERTIES CXX_STANDARD 14)
+set_target_properties(${GPU_BIN} PROPERTIES CXX_STANDARD 17)
 
 if(USE_MPI)
     find_package(MPI REQUIRED)
diff --git a/runtime/domain/block_forest.hpp b/runtime/domain/block_forest.hpp
index fd49eb13fe0a8ba3b46127373c511fef7381abcc..7a11aa45a24588ab2e55391b99a2c4423e00cfe6 100644
--- a/runtime/domain/block_forest.hpp
+++ b/runtime/domain/block_forest.hpp
@@ -23,9 +23,9 @@ namespace pairs {
 class BlockForest : public DomainPartitioner {
 private:
     std::shared_ptr<BlockForest> forest;
-    blockforest::InfoCollection info;
-    std::map<int, std::vector<math::AABB>> neighborhood;
-    std::map<int, std::vector<BlockID>> blocks_pushed;
+    walberla::blockforest::InfoCollection info;
+    std::map<int, std::vector<walberla::math::AABB>> neighborhood;
+    std::map<int, std::vector<walberla::BlockID>> blocks_pushed;
     std::vector<int> ranks;
     std::vector<int> naabbs;
     std::vector<int> aabb_offsetss;
@@ -56,7 +56,7 @@ public:
     void initializeWorkloadBalancer();
     void updateNeighborhood();
     void updateWeights(real_t *position, int nparticles);
-    Vector3<int> getBlockConfig(int num_processes, int nx, int ny, int nz);
+    walberla::Vector3<int> getBlockConfig(int num_processes, int nx, int ny, int nz);
     int getInitialRefinementLevel(int num_processes);
     void setBoundingBox();
     void rebalance();