diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
index 59c13c6f7..86fd08c27 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
@@ -16,8 +16,9 @@ FoamFile
 
 solvers
 {
-    p GAMG
+    p
     {
+        solver           GAMG;
         tolerance        1e-8;
         relTol           0.05;
 
@@ -28,31 +29,34 @@ solvers
         nCellsInCoarsestLevel 20;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
 
-    U smoothSolver
+    U
     {
+        solver           smoothSolver;
         smoother         GaussSeidel;
         nSweeps          2;
         tolerance        1e-7;
         relTol           0.1;
-    };
+    }
 
-    k smoothSolver
+    k
     {
+        solver           smoothSolver;
         smoother         GaussSeidel;
         nSweeps          2;
         tolerance        1e-7;
         relTol           0.1;
-    };
+    }
 
-    epsilon smoothSolver
+    epsilon
     {
+        solver           smoothSolver;
         smoother         GaussSeidel;
         nSweeps          2;
         tolerance        1e-7;
         relTol           0.1;
-    };
+    }
 }
 
 SIMPLE
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
index 616163f49..2364e4edf 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
@@ -16,8 +16,9 @@ FoamFile
 
 solvers
 {
-    p GAMG
+    p
     {
+        solver           GAMG;
         tolerance        1e-8;
         relTol           0;
 
@@ -30,49 +31,56 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
-    Ua PBiCG
+    }
+    Ua
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
-    Ub PBiCG
+    }
+    Ub
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
-    alpha PBiCG
+    }
+    alpha
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-10;
         relTol           0;
-    };
-    beta PBiCG
+    }
+    beta
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-10;
         relTol           0;
-    };
-    Theta PBiCG
+    }
+    Theta
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
-    k PBiCG
+    }
+    k
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
-    epsilon PBiCG
+    }
+    epsilon
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
index aa2c6e4e0..8636a5cce 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
@@ -16,8 +16,9 @@ FoamFile
 
 solvers
 {
-    p GAMG
+    p
     {
+        solver           GAMG;
         tolerance        1e-8;
         relTol           0;
 
@@ -30,49 +31,55 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
-    Ua PBiCG
+    }
+    Ua
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
-    Ub PBiCG
+    }
+    Ub
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
-    alpha PBiCG
+    }
+    alpha
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-10;
         relTol           0;
-    };
-    beta PBiCG
+    }
+    beta
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-10;
         relTol           0;
-    };
-    Theta PBiCG
+    }
+    Theta
+    {
+        solver           PBiCG;
+        preconditioner   DILU;
+        tolerance        1e-05;
+        relTol           0;
+    }
+    k
     {
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
-    k PBiCG
+    }
+    epsilon
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0;
-    };
-    epsilon PBiCG
-    {
-        preconditioner   DILU;
-        tolerance        1e-05;
-        relTol           0;
-    };
+    }
 }
 
 PISO