diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
index a22a3e271f641e6aea70599f194a9112c8f8c0e7..45a1d6fdeb7f1eb87e80c39eb9fba8854d8ff676 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
@@ -29,7 +29,25 @@ solvers
         mergeLevels     1;
     }
 
-    "(U|k|epsilon)"
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        nSweeps         2;
+        tolerance       1e-07;
+        relTol          0.1;
+    }
+
+    k
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        nSweeps         2;
+        tolerance       1e-07;
+        relTol          0.1;
+    }
+
+    epsilon
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
@@ -50,7 +68,8 @@ relaxationFactors
 {
     p               0.3;
     U               0.5;
-    "(k|epsilon)"   0.5;
+    k               0.5;
+    epsilon         0.5;
 }
 
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
index 7f5a658f5ef151c34362786dbfbde79b17aa99e9..25a2d8138daa68c02f6dfea70a0beb4cc3b7bafd 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
@@ -25,7 +25,31 @@ solvers
         relTol          0;
     }
 
-    "(k|epsilon|R|nuTilda)"
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -43,7 +67,9 @@ PISO
 relaxationFactors
 {
     U               0.5;
-    "(k|epsilon|R)" 0.7;
+    k               0.7;
+    epsilon         0.7;
+    R               0.7;
     nuTilda         0.7;
 }
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
index 79e20e5d760d0ab8418133458cf7e0bff1782959..a165f8313b928e5ee395e74d2b97fe3a1638782a 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
@@ -25,7 +25,31 @@ solvers
         relTol          0;
     }
 
-    "(k|epsilon|R|nuTilda)"
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -45,7 +69,9 @@ PISO
 relaxationFactors
 {
     U               0.5;
-    "(k|epsilon|R)" 0.7;
+    k               0.7;
+    epsilon         0.7;
+    R               0.7;
     nuTilda         0.7;
 }
 
diff --git a/tutorials/incompressible/channelFoam/channel395/system/fvSolution b/tutorials/incompressible/channelFoam/channel395/system/fvSolution
index ae7e11a0ee776b2696b20d3b15a367e411d3788d..09f407752061df0fcf127ea4972371475066a94c 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/fvSolution
+++ b/tutorials/incompressible/channelFoam/channel395/system/fvSolution
@@ -27,12 +27,37 @@ solvers
 
     pFinal
     {
-        $p;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-06;
         relTol          0;
     }
 
-    "(U|k|B|nuTilda)"
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    B
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
index 5e3959e48967e5beae54f6e1651389a893fe5219..98831f2c8fff414cf1466b1d82ae0c35019d0803 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
@@ -17,32 +17,27 @@ FoamFile
 
 solvers
 {
-    p
+    pcorr
     {
         solver          PCG;
         preconditioner  DIC;
-        tolerance       1e-06;
-        relTol          0.05;
-    }
-
-    pcorr
-    {
-        $p;
         tolerance       0.01;
         relTol          0;
     }
 
-    pFinal
+    p
     {
-        $p;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-06;
-        relTol          0;
+        relTol          0.05;
     }
 
-    cellMotionUx
+    pFinal
     {
-        $p;
-        tolerance       1e-08;
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
         relTol          0;
     }
 
@@ -53,6 +48,14 @@ solvers
         tolerance       1e-05;
         relTol          0;
     }
+
+    cellMotionUx
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-08;
+        relTol          0;
+    }
 }
 
 PIMPLE
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
index 4c8d252b92326d5c29a9b6f3967f0cb83a023d9d..5a9f970576f5d40f5e374cdea918ed11b483351b 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
@@ -31,9 +31,14 @@ solvers
 
     pFinal
     {
-        $p;
+        solver          GAMG;
         tolerance       1e-06;
         relTol          0;
+        smoother        GaussSeidel;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
     }
 
     U
@@ -44,9 +49,26 @@ solvers
         relTol          0.1;
     }
 
-    "(UFinal|k|epsilon)"
+    UFinal
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    k
     {
-        $U;
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
     }
@@ -64,7 +86,8 @@ PIMPLE
 relaxationFactors
 {
     U               1;
-    "(k|epsilon)"   1;
+    k               1;
+    epsilon         1;
 }
 
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
index 613ef8058ad92a2619e695b4a1f437347d6d8674..80345d9518d5851cdfba57a65f59b688268fe93d 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
@@ -27,12 +27,37 @@ solvers
 
     pFinal
     {
-        $p;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-06;
         relTol          0;
     }
 
-    "(U|k|B|nuTilda)"
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    B
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution
index 613ef8058ad92a2619e695b4a1f437347d6d8674..80345d9518d5851cdfba57a65f59b688268fe93d 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution
@@ -27,12 +27,37 @@ solvers
 
     pFinal
     {
-        $p;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-06;
         relTol          0;
     }
 
-    "(U|k|B|nuTilda)"
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    B
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
index 586a7a4c4c9cfbe47c77939e4ded5a4424382d6a..aeb8d201668b236d68e90752507e2a45b5448523 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
@@ -27,12 +27,45 @@ solvers
 
     pFinal
     {
-        $p;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-06;
         relTol          0;
     }
 
-    "(U|k|epsilon|R|nuTilda)"
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
index 1f0138d38089503925fa67a5c36aff5be79b7835..18870c0af00f0cc629c3a87ae4abb538ad45dd8a 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
@@ -26,7 +26,8 @@ solvers
 
     hFinal
     {
-        $h;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
     }
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
index cb2c2504b35ccfd1248b57ae8048ceb032d13855..8088687562f18dde1f35c160494d2a38efe3cb34 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
@@ -31,7 +31,16 @@ solvers
         mergeLevels     1;
     }
 
-    "(U|nuTilda)"
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        nSweeps         2;
+        tolerance       1e-08;
+        relTol          0.1;
+    }
+
+    nuTilda
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index 23dd0e05288947d380409a4f8758066b0cadbbed..3b0a3e35b679d7ba421255aaa4b43dfc003b8fe0 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,25 +18,43 @@ solvers
 {
     p
     {
-        solver          GAMG;
-        tolerance       1e-07;
-        relTol          0.1;
-        smoother        GaussSeidel;
-        nPreSweeps      0;
-        nPostSweeps     2;
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.1;
+        smoother         GaussSeidel;
+        nPreSweeps       0;
+        nPostSweeps      2;
         cacheAgglomeration on;
-        agglomerator    faceAreaPair;
+        agglomerator     faceAreaPair;
         nCellsInCoarsestLevel 10;
-        mergeLevels     1;
+        mergeLevels      1;
     }
 
-    "(U|k|omega)"
+    U
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        tolerance       1e-08;
-        relTol          0.1;
-        nSweeps         1;
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
+    }
+
+    k
+    {
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
+    }
+
+    omega
+    {
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
     }
 }
 
@@ -50,8 +67,8 @@ relaxationFactors
 {
     p               0.3;
     U               0.7;
-    "(k|omega)"     0.7;
+    k               0.7;
+    omega           0.7;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
index c64cab73b24f7199f0f205c5803daabc34ca0737..b0b6699e0d54537abd342ccab2dd6d6c0460365f 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
@@ -25,7 +25,39 @@ solvers
         relTol          0.01;
     }
 
-    "(U|k|epsilon|R|nuTilda)"
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -43,7 +75,9 @@ relaxationFactors
 {
     p               0.3;
     U               0.7;
-    "(k|epsilon|R)" 0.7;
+    k               0.7;
+    epsilon         0.7;
+    R               0.7;
     nuTilda         0.7;
 }
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
index c64cab73b24f7199f0f205c5803daabc34ca0737..b0b6699e0d54537abd342ccab2dd6d6c0460365f 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
@@ -25,7 +25,39 @@ solvers
         relTol          0.01;
     }
 
-    "(U|k|epsilon|R|nuTilda)"
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -43,7 +75,9 @@ relaxationFactors
 {
     p               0.3;
     U               0.7;
-    "(k|epsilon|R)" 0.7;
+    k               0.7;
+    epsilon         0.7;
+    R               0.7;
     nuTilda         0.7;
 }
 
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
index d3fbef1eb7c7d8115cafc44bae05175fe6c79d6b..a74ada8eae3eaa2854eb4aeec574c0158a71986a 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
@@ -25,7 +25,47 @@ solvers
         relTol          0.01;
     }
 
-    "(Urel|k|epsilon|omega|R|nuTilda)"
+    Urel
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    omega
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    nuTilda
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -43,7 +83,10 @@ relaxationFactors
 {
     p               0.3;
     Urel            0.7;
-    "(k|epsilon|omega|R)"   0.7;
+    k               0.7;
+    epsilon         0.7;
+    omega           0.7;
+    R               0.7;
     nuTilda         0.7;
 }