diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
index 83f4f73b7..816710a3f 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
@@ -16,38 +16,44 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
+        solver           PCG;
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0.01;
     };
-    U PBiCG
+    U
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     };
-    k PBiCG
+    k
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     };
-    epsilon PBiCG
+    epsilon
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     };
-    R PBiCG
+    R
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     };
-    nuTilda PBiCG
+    nuTilda
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSolution
index aff4b8eba..0fa5dab8e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSolution
@@ -16,36 +16,30 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
-        preconditioner
-        {
-            preconditioner DIC;
-        }
+        solver           PCG;
+        preconditioner   DIC;
 
         minIter          0;
         maxIter          2000;
         tolerance        1e-06;
         relTol           0.01;
     };
-    U PBiCG
+    U
     {
-        preconditioner
-        {
-            preconditioner DILU;
-        }
+        solver           PBiCG;
+        preconditioner   DILU;
 
         minIter          0;
         maxIter          500;
         tolerance        1e-05;
         relTol           0.1;
     };
-    k PBiCG
+    k
     {
-        preconditioner
-        {
-            preconditioner DILU;
-        }
+        solver           PBiCG;
+        preconditioner   DILU;
 
         minIter          0;
         maxIter          500;
@@ -54,10 +48,8 @@ solvers
     };
     epsilon PBiCG
     {
-        preconditioner
-        {
-            preconditioner DILU;
-        }
+        solver           PBiCG;
+        preconditioner   DILU;
 
         minIter          0;
         maxIter          500;
@@ -66,10 +58,8 @@ solvers
     };
     R PBiCG
     {
-        preconditioner
-        {
-            preconditioner DILU;
-        }
+        solver           PBiCG;
+        preconditioner   DILU;
 
         minIter          0;
         maxIter          500;
@@ -78,10 +68,8 @@ solvers
     };
     nuTilda PBiCG
     {
-        preconditioner
-        {
-            preconditioner DILU;
-        }
+        solver           PBiCG;
+        preconditioner   DILU;
 
         minIter          0;
         maxIter          500;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
index 83f4f73b7..816710a3f 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
@@ -16,38 +16,44 @@ FoamFile
 
 solvers
 {
-    p PCG
+    p
     {
+        solver           PCG;
         preconditioner   DIC;
         tolerance        1e-06;
         relTol           0.01;
     };
-    U PBiCG
+    U
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     };
-    k PBiCG
+    k
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     };
-    epsilon PBiCG
+    epsilon
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     };
-    R PBiCG
+    R
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     };
-    nuTilda PBiCG
+    nuTilda
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;