diff --git a/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp b/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp
index 4def37b..93b9c0f 100644
--- a/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp
+++ b/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp
@@ -5,7 +5,6 @@
 #include <sofa/simulation/Simulation.h>
 #include <sofa/simpleapi/SimpleApi.h>
 #include <sofa/simulation/Node.h>
-#include <sofa/simulation/graph/DAGNode.h>
 
 /**
  * Benchmark of HexahedronFEMForceField::buildStiffnessMatrix
@@ -20,7 +19,7 @@
 static void BM_HexahedronFEMForceField_buildStiffnessMatrix(benchmark::State& state)
 {
     const auto multiplier = state.range(0);
-    const sofa::simulation::NodeSPtr root = sofa::core::objectmodel::New<sofa::simulation::graph::DAGNode>();
+    const sofa::simulation::NodeSPtr root = sofa::core::objectmodel::New<sofa::simulation::Node>();
     sofa::simpleapi::createObject(root, "DefaultAnimationLoop");
 
     sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward");
diff --git a/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp b/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp
index 2543546..68925fc 100644
--- a/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp
+++ b/src/benchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp
@@ -1,11 +1,10 @@
-#include <benchmark/benchmark.h>
+#include <benchmark/benchmark.h>
 #include <sofa/config.h>
 #include <sofa/core/behavior/BaseLocalForceFieldMatrix.h>
 #include <sofa/core/behavior/ForceField.h>
 #include <sofa/simulation/Simulation.h>
 #include <sofa/simpleapi/SimpleApi.h>
 #include <sofa/simulation/Node.h>
-#include <sofa/simulation/graph/DAGNode.h>
 
 /**
  * Benchmark of TetrahedronFEMForceField::buildStiffnessMatrix
@@ -20,7 +19,7 @@
 static void BM_TetrahedronFEMForceField_buildStiffnessMatrix(benchmark::State& state)
 {
     const auto multiplier = state.range(0);
-    const sofa::simulation::NodeSPtr root = sofa::core::objectmodel::New<sofa::simulation::graph::DAGNode>();
+    const sofa::simulation::NodeSPtr root = sofa::core::objectmodel::New<sofa::simulation::Node>();
     sofa::simpleapi::createObject(root, "DefaultAnimationLoop");
 
     sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward");
diff --git a/src/benchmarks/Sofa.LinearAlgebra/SparseMatrixProduct.cpp b/src/benchmarks/Sofa.LinearAlgebra/SparseMatrixProduct.cpp
index fbaad53..6d80b59 100644
--- a/src/benchmarks/Sofa.LinearAlgebra/SparseMatrixProduct.cpp
+++ b/src/benchmarks/Sofa.LinearAlgebra/SparseMatrixProduct.cpp
@@ -1,10 +1,10 @@
-#include <iostream>
+#include <iostream>
 #include <benchmark/benchmark.h>
 
 #include <sofa/linearalgebra/SparseMatrixProduct.inl>
 #include <sofa/simulation/BaseSimulationExporter.h>
-#include <sofa/simulation/MainTaskSchedulerFactory.h>
-#include <sofa/simulation/MainTaskSchedulerRegistry.h>
+#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
+#include <sofa/simulation/task/MainTaskSchedulerRegistry.h>
 #include <sofa/simulation/ParallelSparseMatrixProduct.h>
 #include <utils/SparseMatrix.h>
 
diff --git a/src/benchmarks/SofaCore/NarrowPhaseDetection.cpp b/src/benchmarks/SofaCore/NarrowPhaseDetection.cpp
index b5bf487..c052838 100644
--- a/src/benchmarks/SofaCore/NarrowPhaseDetection.cpp
+++ b/src/benchmarks/SofaCore/NarrowPhaseDetection.cpp
@@ -1,6 +1,6 @@
 #include "NarrowPhaseDetection.h"
 
-#include <sofa/component/collision/geometry/PointModel.h>
+#include <sofa/component/collision/geometry/PointCollisionModel.h>
 #include <benchmark/benchmark.h>
 
 using sofa::core::objectmodel::New;
diff --git a/src/benchmarks/SofaSimulationCore/TaskScheduler.cpp b/src/benchmarks/SofaSimulationCore/TaskScheduler.cpp
index dedc19d..aab1cfe 100644
--- a/src/benchmarks/SofaSimulationCore/TaskScheduler.cpp
+++ b/src/benchmarks/SofaSimulationCore/TaskScheduler.cpp
@@ -1,8 +1,8 @@
 #include <benchmark/benchmark.h>
-#include <sofa/simulation/DefaultTaskScheduler.h>
-#include <sofa/simulation/CpuTask.h>
-#include <sofa/simulation/MainTaskSchedulerFactory.h>
-#include <sofa/simulation/ParallelForEach.h>
+#include <sofa/simulation/task/DefaultTaskScheduler.h>
+#include <sofa/simulation/task/CpuTask.h>
+#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
+#include <sofa/simulation/task/ParallelForEach.h>
 #include <sofa/type/Mat.h>
 #include <sofa/type/vector_T.h>
 #include <utils/RandomValuePool.h>