diff --git a/references/applications/plugins/SofaDistanceGrid/examples/RigidDistanceGridCollisionModel_liver_DefaultAnimationLoop.scn.reference_0_dofs_mstate.txt.gz b/references/applications/plugins/SofaDistanceGrid/examples/RigidDistanceGridCollisionModel_liver_DefaultAnimationLoop.scn.reference_0_dofs_mstate.txt.gz
index d1811fe..d6ad4c8 100644
Binary files a/references/applications/plugins/SofaDistanceGrid/examples/RigidDistanceGridCollisionModel_liver_DefaultAnimationLoop.scn.reference_0_dofs_mstate.txt.gz and b/references/applications/plugins/SofaDistanceGrid/examples/RigidDistanceGridCollisionModel_liver_DefaultAnimationLoop.scn.reference_0_dofs_mstate.txt.gz differ
diff --git a/references/applications/plugins/SofaDistanceGrid/examples/RigidDistanceGridCollisionModel_liver_FreeMotionAnimationLoop.scn.reference_0_dofs_mstate.txt.gz b/references/applications/plugins/SofaDistanceGrid/examples/RigidDistanceGridCollisionModel_liver_FreeMotionAnimationLoop.scn.reference_0_dofs_mstate.txt.gz
index 89df121..c85460a 100644
Binary files a/references/applications/plugins/SofaDistanceGrid/examples/RigidDistanceGridCollisionModel_liver_FreeMotionAnimationLoop.scn.reference_0_dofs_mstate.txt.gz and b/references/applications/plugins/SofaDistanceGrid/examples/RigidDistanceGridCollisionModel_liver_FreeMotionAnimationLoop.scn.reference_0_dofs_mstate.txt.gz differ
diff --git a/references/examples/Benchmark/Analysis/Pendulum.scn.reference_1_Particles_mstate.txt.gz b/references/examples/Benchmark/Analysis/Pendulum.scn.reference_1_Particles_mstate.txt.gz
index a6d7e64..5ef7d0a 100644
Binary files a/references/examples/Benchmark/Analysis/Pendulum.scn.reference_1_Particles_mstate.txt.gz and b/references/examples/Benchmark/Analysis/Pendulum.scn.reference_1_Particles_mstate.txt.gz differ
diff --git a/references/examples/Component/Collision/Detection/CompositeCollisionPipeline_none.scn.reference_0_rigid_mstate.txt.gz b/references/examples/Component/Collision/Detection/CompositeCollisionPipeline_none.scn.reference_0_rigid_mstate.txt.gz
index 6a1aecd..9de665a 100644
Binary files a/references/examples/Component/Collision/Detection/CompositeCollisionPipeline_none.scn.reference_0_rigid_mstate.txt.gz and b/references/examples/Component/Collision/Detection/CompositeCollisionPipeline_none.scn.reference_0_rigid_mstate.txt.gz differ
diff --git a/references/examples/Component/Collision/Detection/CompositeCollisionPipeline_none.scn.reference_1_rigid_mstate.txt.gz b/references/examples/Component/Collision/Detection/CompositeCollisionPipeline_none.scn.reference_1_rigid_mstate.txt.gz
index 0ed2bb2..3b60dec 100644
Binary files a/references/examples/Component/Collision/Detection/CompositeCollisionPipeline_none.scn.reference_1_rigid_mstate.txt.gz and b/references/examples/Component/Collision/Detection/CompositeCollisionPipeline_none.scn.reference_1_rigid_mstate.txt.gz differ
diff --git a/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_0_MechanicalObject1_mstate.txt.gz b/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_0_MechanicalObject1_mstate.txt.gz
index ed1be71..6572197 100644
Binary files a/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_0_MechanicalObject1_mstate.txt.gz and b/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_0_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_1_MechanicalObject1_mstate.txt.gz b/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_1_MechanicalObject1_mstate.txt.gz
index 87c7b0f..a9a2515 100644
Binary files a/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_1_MechanicalObject1_mstate.txt.gz and b/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_1_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_2_MechanicalObject1_mstate.txt.gz b/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_2_MechanicalObject1_mstate.txt.gz
index cabb9c9..4824ca6 100644
Binary files a/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_2_MechanicalObject1_mstate.txt.gz and b/references/examples/Component/Collision/Response/RuleBasedContactManager.scn.reference_2_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Component/ODESolver/Backward/EulerImplicitSolver.scn.reference b/references/examples/Component/IntegrationScheme/Backward/EulerImplicitIntegrationScheme.scn.reference
similarity index 100%
rename from references/examples/Component/ODESolver/Backward/EulerImplicitSolver.scn.reference
rename to references/examples/Component/IntegrationScheme/Backward/EulerImplicitIntegrationScheme.scn.reference
diff --git a/references/examples/Component/ODESolver/Backward/EulerImplicitSolver.scn.reference_0_MechanicalObject1_mstate.txt.gz b/references/examples/Component/IntegrationScheme/Backward/EulerImplicitIntegrationScheme.scn.reference_0_MechanicalObject1_mstate.txt.gz
similarity index 100%
rename from references/examples/Component/ODESolver/Backward/EulerImplicitSolver.scn.reference_0_MechanicalObject1_mstate.txt.gz
rename to references/examples/Component/IntegrationScheme/Backward/EulerImplicitIntegrationScheme.scn.reference_0_MechanicalObject1_mstate.txt.gz
diff --git a/references/examples/Component/ODESolver/Forward/EulerExplicitSolver.scn.reference b/references/examples/Component/IntegrationScheme/Forward/EulerExplicitIntegrationScheme.scn.reference
similarity index 100%
rename from references/examples/Component/ODESolver/Forward/EulerExplicitSolver.scn.reference
rename to references/examples/Component/IntegrationScheme/Forward/EulerExplicitIntegrationScheme.scn.reference
diff --git a/references/examples/Component/ODESolver/Forward/EulerExplicitSolver.scn.reference_0_dofs_mstate.txt.gz b/references/examples/Component/IntegrationScheme/Forward/EulerExplicitIntegrationScheme.scn.reference_0_dofs_mstate.txt.gz
similarity index 100%
rename from references/examples/Component/ODESolver/Forward/EulerExplicitSolver.scn.reference_0_dofs_mstate.txt.gz
rename to references/examples/Component/IntegrationScheme/Forward/EulerExplicitIntegrationScheme.scn.reference_0_dofs_mstate.txt.gz
diff --git a/references/examples/Component/ODESolver/Forward/EulerExplicitSolver_diagonal.scn.reference b/references/examples/Component/IntegrationScheme/Forward/EulerExplicitIntegrationScheme_diagonal.scn.reference
similarity index 100%
rename from references/examples/Component/ODESolver/Forward/EulerExplicitSolver_diagonal.scn.reference
rename to references/examples/Component/IntegrationScheme/Forward/EulerExplicitIntegrationScheme_diagonal.scn.reference
diff --git a/references/examples/Component/ODESolver/Forward/EulerExplicitSolver_diagonal.scn.reference_0_dofs_mstate.txt.gz b/references/examples/Component/IntegrationScheme/Forward/EulerExplicitIntegrationScheme_diagonal.scn.reference_0_dofs_mstate.txt.gz
similarity index 100%
rename from references/examples/Component/ODESolver/Forward/EulerExplicitSolver_diagonal.scn.reference_0_dofs_mstate.txt.gz
rename to references/examples/Component/IntegrationScheme/Forward/EulerExplicitIntegrationScheme_diagonal.scn.reference_0_dofs_mstate.txt.gz
diff --git a/references/examples/Component/ODESolver/Forward/RungeKutta4Solver.scn.reference b/references/examples/Component/IntegrationScheme/Forward/RungeKutta4IntegrationScheme.scn.reference
similarity index 100%
rename from references/examples/Component/ODESolver/Forward/RungeKutta4Solver.scn.reference
rename to references/examples/Component/IntegrationScheme/Forward/RungeKutta4IntegrationScheme.scn.reference
diff --git a/references/examples/Component/ODESolver/Forward/RungeKutta4Solver.scn.reference_0_MechanicalObject1_mstate.txt.gz b/references/examples/Component/IntegrationScheme/Forward/RungeKutta4IntegrationScheme.scn.reference_0_MechanicalObject1_mstate.txt.gz
similarity index 100%
rename from references/examples/Component/ODESolver/Forward/RungeKutta4Solver.scn.reference_0_MechanicalObject1_mstate.txt.gz
rename to references/examples/Component/IntegrationScheme/Forward/RungeKutta4IntegrationScheme.scn.reference_0_MechanicalObject1_mstate.txt.gz
diff --git a/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_BlockJacobiPreconditioner.scn.reference_0_DoFs_mstate.txt.gz b/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_BlockJacobiPreconditioner.scn.reference_0_DoFs_mstate.txt.gz
index fa99ddb..c016305 100644
Binary files a/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_BlockJacobiPreconditioner.scn.reference_0_DoFs_mstate.txt.gz and b/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_BlockJacobiPreconditioner.scn.reference_0_DoFs_mstate.txt.gz differ
diff --git a/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_JacobiPreconditioner.scn.reference_0_DoFs_mstate.txt.gz b/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_JacobiPreconditioner.scn.reference_0_DoFs_mstate.txt.gz
index fc63ed8..04cf7f2 100644
Binary files a/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_JacobiPreconditioner.scn.reference_0_DoFs_mstate.txt.gz and b/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_JacobiPreconditioner.scn.reference_0_DoFs_mstate.txt.gz differ
diff --git a/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_NoPreconditioner.scn.reference_0_DoFs_mstate.txt.gz b/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_NoPreconditioner.scn.reference_0_DoFs_mstate.txt.gz
index e610cc6..6c43bf1 100644
Binary files a/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_NoPreconditioner.scn.reference_0_DoFs_mstate.txt.gz and b/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_NoPreconditioner.scn.reference_0_DoFs_mstate.txt.gz differ
diff --git a/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_SSORPreconditioner.scn.reference_0_DoFs_mstate.txt.gz b/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_SSORPreconditioner.scn.reference_0_DoFs_mstate.txt.gz
index 6436bb3..46118ed 100644
Binary files a/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_SSORPreconditioner.scn.reference_0_DoFs_mstate.txt.gz and b/references/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_SSORPreconditioner.scn.reference_0_DoFs_mstate.txt.gz differ
diff --git a/references/examples/Component/Mapping/NonLinear/DistanceMapping.scn.reference_0_defoDOF_mstate.txt.gz b/references/examples/Component/Mapping/NonLinear/DistanceMapping.scn.reference_0_defoDOF_mstate.txt.gz
index 4679de6..dba92a1 100644
Binary files a/references/examples/Component/Mapping/NonLinear/DistanceMapping.scn.reference_0_defoDOF_mstate.txt.gz and b/references/examples/Component/Mapping/NonLinear/DistanceMapping.scn.reference_0_defoDOF_mstate.txt.gz differ
diff --git a/references/examples/Component/Mapping/NonLinear/DistanceMultiMapping.scn.reference_0_defoDOF_mstate.txt.gz b/references/examples/Component/Mapping/NonLinear/DistanceMultiMapping.scn.reference_0_defoDOF_mstate.txt.gz
index 90c8217..6ec7403 100644
Binary files a/references/examples/Component/Mapping/NonLinear/DistanceMultiMapping.scn.reference_0_defoDOF_mstate.txt.gz and b/references/examples/Component/Mapping/NonLinear/DistanceMultiMapping.scn.reference_0_defoDOF_mstate.txt.gz differ
diff --git a/references/examples/Component/Mapping/NonLinear/DistanceMultiMapping.scn.reference_1_defoDOF_mstate.txt.gz b/references/examples/Component/Mapping/NonLinear/DistanceMultiMapping.scn.reference_1_defoDOF_mstate.txt.gz
index ccb2995..fb9a190 100644
Binary files a/references/examples/Component/Mapping/NonLinear/DistanceMultiMapping.scn.reference_1_defoDOF_mstate.txt.gz and b/references/examples/Component/Mapping/NonLinear/DistanceMultiMapping.scn.reference_1_defoDOF_mstate.txt.gz differ
diff --git a/references/examples/Component/Mapping/NonLinear/SquareDistanceMapping.scn.reference_0_defoDOF_mstate.txt.gz b/references/examples/Component/Mapping/NonLinear/SquareDistanceMapping.scn.reference_0_defoDOF_mstate.txt.gz
index 9560e83..5fdda2b 100644
Binary files a/references/examples/Component/Mapping/NonLinear/SquareDistanceMapping.scn.reference_0_defoDOF_mstate.txt.gz and b/references/examples/Component/Mapping/NonLinear/SquareDistanceMapping.scn.reference_0_defoDOF_mstate.txt.gz differ
diff --git a/references/examples/Component/SolidMechanics/FEM/TriangularFEMForceFieldOptim.scn.reference_0_DOFs_mstate.txt.gz b/references/examples/Component/SolidMechanics/FEM/TriangularFEMForceFieldOptim.scn.reference_0_DOFs_mstate.txt.gz
index 169ab15..e0dc161 100644
Binary files a/references/examples/Component/SolidMechanics/FEM/TriangularFEMForceFieldOptim.scn.reference_0_DOFs_mstate.txt.gz and b/references/examples/Component/SolidMechanics/FEM/TriangularFEMForceFieldOptim.scn.reference_0_DOFs_mstate.txt.gz differ
diff --git a/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_0_MechanicalObject1_mstate.txt.gz b/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_0_MechanicalObject1_mstate.txt.gz
index 0eb7c74..174c3f4 100644
Binary files a/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_0_MechanicalObject1_mstate.txt.gz and b/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_0_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_1_MechanicalObject1_mstate.txt.gz b/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_1_MechanicalObject1_mstate.txt.gz
index 7c5d497..4c90f9b 100644
Binary files a/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_1_MechanicalObject1_mstate.txt.gz and b/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_1_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_2_MechanicalObject1_mstate.txt.gz b/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_2_MechanicalObject1_mstate.txt.gz
index 0e99453..ef30dc0 100644
Binary files a/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_2_MechanicalObject1_mstate.txt.gz and b/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_2_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_3_MechanicalObject1_mstate.txt.gz b/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_3_MechanicalObject1_mstate.txt.gz
index 3c5d9ba..3931e8e 100644
Binary files a/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_3_MechanicalObject1_mstate.txt.gz and b/references/examples/Component/SolidMechanics/Spring/MeshSpringForceField.scn.reference_3_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Demos/collisionMultiple.scn.reference_0_MechanicalObject1_mstate.txt.gz b/references/examples/Demos/collisionMultiple.scn.reference_0_MechanicalObject1_mstate.txt.gz
index c012736..b81f32e 100644
Binary files a/references/examples/Demos/collisionMultiple.scn.reference_0_MechanicalObject1_mstate.txt.gz and b/references/examples/Demos/collisionMultiple.scn.reference_0_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Demos/collisionMultiple.scn.reference_1_MechanicalObject1_mstate.txt.gz b/references/examples/Demos/collisionMultiple.scn.reference_1_MechanicalObject1_mstate.txt.gz
index d60b1c4..68e9314 100644
Binary files a/references/examples/Demos/collisionMultiple.scn.reference_1_MechanicalObject1_mstate.txt.gz and b/references/examples/Demos/collisionMultiple.scn.reference_1_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Demos/collisionMultiple.scn.reference_2_MechanicalObject1_mstate.txt.gz b/references/examples/Demos/collisionMultiple.scn.reference_2_MechanicalObject1_mstate.txt.gz
index 269dd6d..419a221 100644
Binary files a/references/examples/Demos/collisionMultiple.scn.reference_2_MechanicalObject1_mstate.txt.gz and b/references/examples/Demos/collisionMultiple.scn.reference_2_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Demos/collisionMultiple.scn.reference_3_MechanicalObject1_mstate.txt.gz b/references/examples/Demos/collisionMultiple.scn.reference_3_MechanicalObject1_mstate.txt.gz
index 666f33e..806e35e 100644
Binary files a/references/examples/Demos/collisionMultiple.scn.reference_3_MechanicalObject1_mstate.txt.gz and b/references/examples/Demos/collisionMultiple.scn.reference_3_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Demos/collisionMultiple.scn.reference_4_MechanicalObject1_mstate.txt.gz b/references/examples/Demos/collisionMultiple.scn.reference_4_MechanicalObject1_mstate.txt.gz
index 41a3d48..0d1f385 100644
Binary files a/references/examples/Demos/collisionMultiple.scn.reference_4_MechanicalObject1_mstate.txt.gz and b/references/examples/Demos/collisionMultiple.scn.reference_4_MechanicalObject1_mstate.txt.gz differ
diff --git a/references/examples/Demos/collisionMultiple.scn.reference_5_MechanicalObject1_mstate.txt.gz b/references/examples/Demos/collisionMultiple.scn.reference_5_MechanicalObject1_mstate.txt.gz
index 324576d..845260b 100644
Binary files a/references/examples/Demos/collisionMultiple.scn.reference_5_MechanicalObject1_mstate.txt.gz and b/references/examples/Demos/collisionMultiple.scn.reference_5_MechanicalObject1_mstate.txt.gz differ