diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/dynamicMeshDict
deleted file mode 100644
index a82e4e41baef91a7b1e183d76471fb35b5a3327a..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/dynamicMeshDict
+++ /dev/null
@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      dynamicMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solver volumetricBSplinesMotionSolver;
-
-volumetricBSplinesMotionSolverCoeffs
-{
-    controlBoxes (duct);
-    duct
-    {
-        name    duct;
-        type    cartesian;
-        nCPsU   9;
-        nCPsV   5;
-        nCPsW   3;
-        degreeU 3;
-        degreeV 3;
-        degreeW 2;
-
-        controlPointsDefinition axisAligned;
-        lowerCpBounds           (-1.1 -0.21 -0.05);
-        upperCpBounds           ( 1.1  0.39  0.15);
-
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
-        confineBoundaryControlPoints false;
-
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/dynamicMeshDict
deleted file mode 100644
index a82e4e41baef91a7b1e183d76471fb35b5a3327a..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/dynamicMeshDict
+++ /dev/null
@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      dynamicMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solver volumetricBSplinesMotionSolver;
-
-volumetricBSplinesMotionSolverCoeffs
-{
-    controlBoxes (duct);
-    duct
-    {
-        name    duct;
-        type    cartesian;
-        nCPsU   9;
-        nCPsV   5;
-        nCPsW   3;
-        degreeU 3;
-        degreeV 3;
-        degreeW 2;
-
-        controlPointsDefinition axisAligned;
-        lowerCpBounds           (-1.1 -0.21 -0.05);
-        upperCpBounds           ( 1.1  0.39  0.15);
-
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
-        confineBoundaryControlPoints false;
-
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/dynamicMeshDict
deleted file mode 100644
index a82e4e41baef91a7b1e183d76471fb35b5a3327a..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/dynamicMeshDict
+++ /dev/null
@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      dynamicMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solver volumetricBSplinesMotionSolver;
-
-volumetricBSplinesMotionSolverCoeffs
-{
-    controlBoxes (duct);
-    duct
-    {
-        name    duct;
-        type    cartesian;
-        nCPsU   9;
-        nCPsV   5;
-        nCPsW   3;
-        degreeU 3;
-        degreeV 3;
-        degreeW 2;
-
-        controlPointsDefinition axisAligned;
-        lowerCpBounds           (-1.1 -0.21 -0.05);
-        upperCpBounds           ( 1.1  0.39  0.15);
-
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
-        confineBoundaryControlPoints false;
-
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/Allrun
index a8c290b238f0d07bba0837b6906e97b2e16a5e52..8ebaeb27956bd8713b8b0def6b25f6640b86f865 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/Allrun
@@ -39,7 +39,6 @@ runParallel $decompDict patchSummary
 runParallel $decompDict potentialFoam
 runParallel $decompDict checkMesh -writeFields '(nonOrthoAngle)' -constant
 
-runParallel $decompDict writeActiveDesignVariables
 runParallel $decompDict $(getApplication)
 runParallel $decompDict cumulativeDisplacement
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/dynamicMeshDict
index c78d98c798094c3ab6b786efeb9802baf68ed9c5..c04def7f36bac3f181039a0882932ba643b665f1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/dynamicMeshDict
@@ -30,17 +30,17 @@ volumetricBSplinesMotionSolverCoeffs
 
         controlPointsDefinition fromFile;
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement false;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement false;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) );
-        boundVMinCPs ( (true true true) (true true true) );
-        boundVMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) );
+        confineVMinCPs ( (true true true) (true true true) );
+        confineVMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/constant/dynamicMeshDict
index bccb4d7660b821a4db20a18c5f08d2f676a8f68c..39447ce1c85a8416a15269977949eb4f63534de1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           ( 0.1 -0.25  -0.1);
         upperCpBounds           ( 0.9  0.25   1.1);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints true;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundVMinCPs ( (true true true) );
-        boundVMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineVMinCPs ( (true true true) );
+        confineVMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/Allrun
index 1c5e7996bd44d365917196c26aeb1394a7e6175d..6a63e36ffb520f7090d4d0a6f7e1ec1b82a00c56 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/Allrun
@@ -7,7 +7,6 @@ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
 
 \cp -r $resourcesDir/meshes/sbend/polyMesh constant
 runApplication decomposePar
-runParallel writeActiveDesignVariables
 runParallel $(getApplication)
 runParallel cumulativeDisplacement
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/BFGS/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/BFGS/Allrun
index 1c5e7996bd44d365917196c26aeb1394a7e6175d..6a63e36ffb520f7090d4d0a6f7e1ec1b82a00c56 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/BFGS/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/BFGS/Allrun
@@ -7,7 +7,6 @@ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
 
 \cp -r $resourcesDir/meshes/sbend/polyMesh constant
 runApplication decomposePar
-runParallel writeActiveDesignVariables
 runParallel $(getApplication)
 runParallel cumulativeDisplacement
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/BFGS/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/BFGS/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/BFGS/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/BFGS/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/SD/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/SD/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/SD/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/SD/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS-continuation/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS-continuation/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS-continuation/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS-continuation/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/multiPoint/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/multiPoint/Allrun
index 1c5e7996bd44d365917196c26aeb1394a7e6175d..6a63e36ffb520f7090d4d0a6f7e1ec1b82a00c56 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/multiPoint/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/multiPoint/Allrun
@@ -7,7 +7,6 @@ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
 
 \cp -r $resourcesDir/meshes/sbend/polyMesh constant
 runApplication decomposePar
-runParallel writeActiveDesignVariables
 runParallel $(getApplication)
 runParallel cumulativeDisplacement
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/multiPoint/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/multiPoint/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/multiPoint/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/multiPoint/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/Allrun
index 1c5e7996bd44d365917196c26aeb1394a7e6175d..6a63e36ffb520f7090d4d0a6f7e1ec1b82a00c56 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/Allrun
@@ -7,7 +7,6 @@ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
 
 \cp -r $resourcesDir/meshes/sbend/polyMesh constant
 runApplication decomposePar
-runParallel writeActiveDesignVariables
 runParallel $(getApplication)
 runParallel cumulativeDisplacement
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op2/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op2/Allrun
index 1c5e7996bd44d365917196c26aeb1394a7e6175d..6a63e36ffb520f7090d4d0a6f7e1ec1b82a00c56 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op2/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op2/Allrun
@@ -7,7 +7,6 @@ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources
 
 \cp -r $resourcesDir/meshes/sbend/polyMesh constant
 runApplication decomposePar
-runParallel writeActiveDesignVariables
 runParallel $(getApplication)
 runParallel cumulativeDisplacement
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op2/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op2/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op2/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op2/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/primalAdjoint/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/primalAdjoint/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/primalAdjoint/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/primalAdjoint/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/primalAdjointFullSetup/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/primalAdjointFullSetup/constant/dynamicMeshDict
index 97e98a99d3cab48d412fa079065e3554a9d49d4a..1d2bc04f8ffb8d23dfd52902f6cdce10d03e97a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/primalAdjointFullSetup/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/primalAdjointFullSetup/constant/dynamicMeshDict
@@ -32,15 +32,15 @@ volumetricBSplinesMotionSolverCoeffs
         lowerCpBounds           (-1.1 -0.21 -0.05);
         upperCpBounds           ( 1.1  0.39  0.15);
 
-        confineX1movement false;
-        confineX2movement false;
-        confineX3movement true;
+        confineUMovement false;
+        confineVMovement false;
+        confineWMovement true;
         confineBoundaryControlPoints false;
 
-        boundUMinCPs ( (true true true) (true true true) );
-        boundUMaxCPs ( (true true true) (true true true) );
-        boundWMinCPs ( (true true true) );
-        boundWMaxCPs ( (true true true) );
+        confineUMinCPs ( (true true true) (true true true) );
+        confineUMaxCPs ( (true true true) (true true true) );
+        confineWMinCPs ( (true true true) );
+        confineWMaxCPs ( (true true true) );
     }
 }