diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
index e442484176e19cd5f75e193a645fac47967ef5e8..951ae7bf9fe07f42e42f09bc065a8fc04e678dce 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
@@ -58,7 +58,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "(Xi|Su)"       1;
+    fields
+    {
+    }
+    equations
+    {
+        "(Xi|Su)"       1;
+    }
 }
 
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
index cef123630535d7ce3d4574dd22ee74f9722a5d29..bacb583b37aec5b50f4c6218e71fb894497c40bc 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
@@ -58,7 +58,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "(Xi|Su)"       1;
+    fields
+    {
+    }
+    equations
+    {
+        "(Xi|Su)"       1;
+    }
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution
index bc4f92fb8d70fb2d4c82e623a05743b4caac55d5..859d4a6dd9650e153963643e26606b31b1f25556 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution
@@ -111,8 +111,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "(U|k).*"                   1;
-    "(C3H8|O2|H2O|CO2|hs).*"    1;
+    fields
+    {
+    }
+    equations
+    {
+        "(U|k).*"                   1;
+        "(C3H8|O2|H2O|CO2|hs).*"    1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
index f4b3703178372bb931d48df78d357fbbfdb38ba7..4d6beffa87b2ee67a1e83b739f82196f56ecb795 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
@@ -49,7 +49,13 @@ SIMPLE
 
 relaxationFactors
 {
-    T               1;
+    fields
+    {
+    }
+    equations
+    {
+        T               1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
index 24a71832c1665a5d90be00febd3dd74a24f7f334..5685f010f111c423e7e4cec6dd9925c7b3b0ba45 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
@@ -102,8 +102,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "(U|k).*"                   1;
-    "(C3H8|O2|H2O|CO2|hs).*"    0.9;
+    fields
+    {
+    }
+    equations
+    {
+        "(U|k).*"                   1;
+        "(C3H8|O2|H2O|CO2|hs).*"    0.9;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
index 95ecdf2aa6260318e6229a5cc5f853fcfa12758a..a0e2c8dc969288d325789c54ffc6177de9f880ce 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
@@ -93,8 +93,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "(U|k).*"                   1;
-    "(C3H8|O2|H2O|CO2|hs).*"    0.9;
+    fields
+    {
+    }
+    equations
+    {
+        "(U|k).*"                   1;
+        "(C3H8|O2|H2O|CO2|hs).*"    0.9;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
index 5e0a1dec71dcbb7bd4d4b43a8527a4f43fb7095f..2437c9b3ab1d700beef94c425357a9dfef644e28 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
@@ -58,7 +58,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "(U|h|k|epsilon|omega).*"  1;
+    fields
+    {
+    }
+    equations
+    {
+        "(U|h|k|epsilon|omega).*"  1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index 4e307f0ced49bee3cc5b64ccb3f0a4783d82e376..859a3d046413714e9d9bfe3cc04be1a0e22d11b4 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -70,9 +70,15 @@ PIMPLE
 
 relaxationFactors
 {
-    "p.*"           0.3;
-    "rho.*"         1;
-    "(U|h|k|epsilon|omega).*" 0.7;
+    fields
+    {
+        "p.*"           0.3;
+        "rho.*"         1;
+    }
+    equations
+    {
+        "(U|h|k|epsilon|omega).*" 0.7;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
index ca20954dd2ab0eda1af112e3a8e2262ffb77d5d0..5bd627be1b879030d0fab9599396a4a3bb1b9dec 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
@@ -102,10 +102,16 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
-    "h.*"           1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+        "h.*"           1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
index bc26641fc45412d38005316f4ac63708a8c2a16e..317c954ef60beb892d00878b5fc21b414ca99a4d 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -73,11 +73,17 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    rho             0.05;
-    U               0.7;
-    "(k|epsilon)"   0.7;
-    h               0.5;
+    fields
+    {
+        p               0.3;
+        rho             0.05;
+    }
+    equations
+    {
+        U               0.7;
+        "(k|epsilon)"   0.7;
+        h               0.5;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
index 27e48923117d71c88ee88a2e5a4bb82486db5a10..6f93606315e870b623e74ae0992328c26c6e7735 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -67,11 +67,17 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    rho             1;
-    U               0.7;
-    "(k|epsilon)"   0.9;
-    h               0.9;
+    fields
+    {
+        p               0.3;
+        rho             1;
+    }
+    equations
+    {
+        U               0.7;
+        "(k|epsilon)"   0.9;
+        h               0.9;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
index 3ef1397a90f1f46f84350f64e5006fa9f29f1339..346b9ea433a2ef3f6dadaa5f0185d45f62d09baf 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
@@ -179,22 +179,34 @@ SIMPLE
 
 relaxationFactors
 {
-    p               1;
-    rho             1; //0.1;
-    U               0.9;
-    h               0.95;
-    k               0.9;
-    epsilon         0.9;
+    fields
+    {
+        p               1;
+        rho             1; //0.1;
+    }
+    equations
+    {
+        U               0.9;
+        h               0.95;
+        k               0.9;
+        epsilon         0.9;
+    }w
 }
 
 relaxationFactors0
 {
-    p               0.3;
-    rho             0.1;
-    U               0.7;
-    h               0.7;
-    k               0.7;
-    epsilon         0.7;
+    fields
+    {
+        p               0.3;
+        rho             0.1;
+    }
+    equations
+    {
+        U               0.7;
+        h               0.7;
+        k               0.7;
+        epsilon         0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBaffleSimpleFoam/circuitBoardCooling/system/fvSolution b/tutorials/heatTransfer/buoyantBaffleSimpleFoam/circuitBoardCooling/system/fvSolution
index a9b8a28a42640e76a50b6b48b736ec8c28211b6b..d30cdf20b496e354128a273418811f504df1abed 100644
--- a/tutorials/heatTransfer/buoyantBaffleSimpleFoam/circuitBoardCooling/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBaffleSimpleFoam/circuitBoardCooling/system/fvSolution
@@ -60,11 +60,17 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1.0;
-    p_rgh           0.7;
-    U               0.3;
-    h               0.3;
-    "(k|epsilon|omega)" 0.7;
+    fields
+    {
+        rho             1.0;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.3;
+        h               0.3;
+        "(k|epsilon|omega)" 0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
index 40702072e542f96bc97c37a1adb013b22a5ad242..323be37716e66b36f3ce0e724069c39204ec24bf 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
@@ -58,8 +58,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "(U|T|k|epsilon|R)" 1;
-    "(U|T|k|epsilon|R)Final" 1;
+    fields
+    {
+    }
+    equations
+    {
+        "(U|T|k|epsilon|R)" 1;
+        "(U|T|k|epsilon|R)Final" 1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
index 5f31a51a67376beb2314b7f62484f5f37ab8c8f8..a5df85e653117b7d6f318de1b11152b1583e0431 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
@@ -53,10 +53,16 @@ SIMPLE
 
 relaxationFactors
 {
-    p_rgh           0.7;
-    U               0.3;
-    T               0.5;
-    "(k|epsilon|R)" 0.7;
+    fields
+    {
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.3;
+        T               0.5;
+        "(k|epsilon|R)" 0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
index 0cddd08b1917d7cf638f953f018b50aca1cac179..627615c534bed3dab1b2f02f3a01f3cbef507916 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
@@ -53,10 +53,16 @@ SIMPLE
 
 relaxationFactors
 {
-    p_rgh           0.7;
-    U               0.2;
-    T               0.5;
-    "(k|epsilon)"   0.7;
+    fields
+    {
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.2;
+        T               0.5;
+        "(k|epsilon)"   0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
index a9b8a28a42640e76a50b6b48b736ec8c28211b6b..d30cdf20b496e354128a273418811f504df1abed 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
@@ -60,11 +60,17 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1.0;
-    p_rgh           0.7;
-    U               0.3;
-    h               0.3;
-    "(k|epsilon|omega)" 0.7;
+    fields
+    {
+        rho             1.0;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.3;
+        h               0.3;
+        "(k|epsilon|omega)" 0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
index 01220389298f206e7949663479c9819a117426b4..c80f4db413b0c2e6e620077102bec99bcf7a9e1b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
@@ -53,11 +53,17 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1.0;
-    p_rgh           0.7;
-    U               0.2;
-    h               0.2;
-    "(k|epsilon|R)" 0.5;
+    fields
+    {
+        rho             1.0;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.2;
+        h               0.2;
+        "(k|epsilon|R)" 0.5;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
index 3bc750a5287bda540d4a6c70d60dc3df6190d211..c4fd0cde06011fc0bbe94511b86954b0fb8effc2 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
@@ -61,12 +61,18 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1.0;
-    p_rgh           0.7;
-    U               0.2;
-    h               0.2;
-    "(k|epsilon|R)" 0.5;
-    G               0.7;
+    fields
+    {
+        rho             1.0;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.2;
+        h               0.2;
+        "(k|epsilon|R)" 0.5;
+        G               0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
index 6d25cfe65fd0c13455cb2a2533a5242edbf53ece..f3fc1aee1393cba861301a3743e7a1d1a3a6d83c 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
@@ -58,13 +58,19 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1.0;
-    p_rgh           0.3;
-    U               0.7;
-    h               0.7;
-    k               0.7;
-    epsilon         0.7;
-    "ILambda.*"     0.7;
+    fields
+    {
+        rho             1.0;
+        p_rgh           0.3;
+    }
+    equations
+    {
+        U               0.7;
+        h               0.7;
+        k               0.7;
+        epsilon         0.7;
+        "ILambda.*"     0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
index 11195b49a20e6b8888ff21ac0111375f619ea36c..b0820c94a58663f8be86b06761f1c1a1f52c9c14 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
@@ -77,8 +77,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "h.*"           1;
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
index 9b70fbdaa7cdfc684c14847c971d2d58960d831a..53fcb04628c66bf00b6664beb34463bf521ee634 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
@@ -79,8 +79,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "h.*"           1;
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution
index a2a9b704b60c020b2df75085ff9fb82148987a22..4bf760de7a857db7e7218e58430db00cc255c429 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution
@@ -77,8 +77,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "h.*"           1;
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSolution
index 3b6bfd2e6e394bae557f326a52002aca98e7420e..7b840f454fcef6e9a93abba94d570216461607c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSolution
@@ -79,8 +79,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "h.*"           1;
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
index 0277a981a774d89d29415d875b8a852fada0845b..4d4598a644737ace4070d24d90058b397b81f729 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -70,8 +70,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "h.*"           1;
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
index 4204b18a7c4394489e6132661828ba0a4bcbbf69..72af23d71917318ab5e4c6ce0a448a8fd35e88e6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -72,8 +72,14 @@ PIMPLE
 
 relaxationFactors
 {
-    "h.*"           1;
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution
index 4a1e22da9f7dacb6742091d5f07d1af1d15483e0..630fd144ab42224ff2dae7b122a943a600d2152c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution
@@ -59,15 +59,21 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1;
-    p_rgh           0.7;
-    U               0.3;
-    h               0.7;
-    nuTilda         0.7;
-    k               0.7;
-    epsilon         0.7;
-    omega           0.7;
-    "ILambda.*"     0.7;
+    fields
+    {
+        rho             1;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.3;
+        h               0.7;
+        nuTilda         0.7;
+        k               0.7;
+        epsilon         0.7;
+        omega           0.7;
+        "ILambda.*"     0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
index db6f8f50a2c4f2712d17498eef30677d94da6ddf..e049fd30ff9646c54e5239067e860a5f93bc01ac 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
@@ -32,7 +32,13 @@ SIMPLE
 
 relaxationFactors
 {
-    T               0.7;
+    fields
+    {
+    }
+    equations
+    {
+        T               0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution
index db6f8f50a2c4f2712d17498eef30677d94da6ddf..e049fd30ff9646c54e5239067e860a5f93bc01ac 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution
@@ -32,7 +32,13 @@ SIMPLE
 
 relaxationFactors
 {
-    T               0.7;
+    fields
+    {
+    }
+    equations
+    {
+        T               0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution
index db6f8f50a2c4f2712d17498eef30677d94da6ddf..e049fd30ff9646c54e5239067e860a5f93bc01ac 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution
@@ -32,7 +32,13 @@ SIMPLE
 
 relaxationFactors
 {
-    T               0.7;
+    fields
+    {
+    }
+    equations
+    {
+        T               0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
index 057a976f92c890a264aaf7ba5e08a8220ed91a1a..5db08c0bddf8801d7b76a2a528378f92dce5f89f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
@@ -61,15 +61,21 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1;
-    p_rgh           0.7;
-    U               0.3;
-    h               0.7;
-    nuTilda         0.7;
-    k               0.7;
-    epsilon         0.7;
-    omega           0.7;
-    "ILambda.*"     0.7;
+    fields
+    {
+        rho             1;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.3;
+        h               0.7;
+        nuTilda         0.7;
+        k               0.7;
+        epsilon         0.7;
+        omega           0.7;
+        "ILambda.*"     0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
index 9f868cea6f63255eb31903e46514a2fcb50de2d7..413d6bdec1970f4b3c3197ee4da7a0164b00c6da 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
@@ -66,14 +66,20 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1.0;
-    p_rgh           0.7;
-    U               0.3;
-    h               0.7;
-    "(k|epsilon|omega)" 0.7;
-    G               0.7;
-    "ILambda.*"     0.7;
-    Qr              0.7;
+    fields
+    {
+        rho             1.0;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.3;
+        h               0.7;
+        "(k|epsilon|omega)" 0.7;
+        G               0.7;
+        "ILambda.*"     0.7;
+        Qr              0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
index db6f8f50a2c4f2712d17498eef30677d94da6ddf..e049fd30ff9646c54e5239067e860a5f93bc01ac 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
@@ -32,7 +32,13 @@ SIMPLE
 
 relaxationFactors
 {
-    T               0.7;
+    fields
+    {
+    }
+    equations
+    {
+        T               0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
index db6f8f50a2c4f2712d17498eef30677d94da6ddf..e049fd30ff9646c54e5239067e860a5f93bc01ac 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
@@ -32,7 +32,13 @@ SIMPLE
 
 relaxationFactors
 {
-    T               0.7;
+    fields
+    {
+    }
+    equations
+    {
+        T               0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
index db6f8f50a2c4f2712d17498eef30677d94da6ddf..e049fd30ff9646c54e5239067e860a5f93bc01ac 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
@@ -32,7 +32,13 @@ SIMPLE
 
 relaxationFactors
 {
-    T               0.7;
+    fields
+    {
+    }
+    equations
+    {
+        T               0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
index 388c8c12371c06392e87e238ad9f52f08eea9416..98bc0a622bb92acd520d1f1fc276e7a7af5b25c3 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
@@ -68,13 +68,19 @@ SIMPLE
 
 relaxationFactors
 {
-    rho             1.0;
-    p_rgh           0.7;
-    U               0.3;
-    h               0.7;
-    "(k|epsilon|omega)" 0.7;
-    "ILambda.*"     0.7;
-    Qr              0.7;
+    fields
+    {
+        rho             1.0;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.3;
+        h               0.7;
+        "(k|epsilon|omega)" 0.7;
+        "ILambda.*"     0.7;
+        Qr              0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
index e0ef87453f265712d50b2817cf6a9d2b4e1918cb..474b439f825620808e9d29b88230cba4174a47f0 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
@@ -66,10 +66,16 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    U               0.5;
-    k               0.5;
-    epsilon         0.5;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.5;
+        k               0.5;
+        epsilon         0.5;
+    }
 }
 
 
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
index ff5dd010f421a1dad44c8115f9f5c81681a4813c..253bf016b7d4f110d7e77657832e80a4c68c514a 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
@@ -74,9 +74,15 @@ PIMPLE
 
 relaxationFactors
 {
-    "Urel.*"        1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "Urel.*"        1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }
 
 
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
index e0260f89282e102cc62731704d46ab4fc8c0d3a4..d3b6f9d65bd5dda84dd4edd76d0833f1b6d38264 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
@@ -81,13 +81,19 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    Urel            0.7;
-    k               0.7;
-    epsilon         0.7;
-    omega           0.7;
-    R               0.7;
-    nuTilda         0.7;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        Urel            0.7;
+        k               0.7;
+        epsilon         0.7;
+        omega           0.7;
+        R               0.7;
+        nuTilda         0.7;
+    }
 }
 
 
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
index 3e4364cd75cedfcf6e0da0891a041947f99dd2dd..064d11bf5c657893ff5f5b7fbd600431cf6a63e3 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
@@ -50,10 +50,16 @@ SIMPLE
 
 relaxationFactors
 {
-    "(p|pa)"        0.3;
-    "(U|Ua)"        0.7;
-    "(k|epsilon)"   0.7;
-    alpha           0.1;
+    fields
+    {
+        "(p|pa)"        0.3;
+        alpha           0.1;
+    }
+    equations
+    {
+        "(U|Ua)"        0.7;
+        "(k|epsilon)"   0.7;
+    }
 }
 
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
index 4330eb0c88d24919b50de7319acfc21633ab01ab..8ffa1bc5ffea52bd7067d19de02e121cef7c1db7 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
@@ -66,11 +66,17 @@ PISO
 
 relaxationFactors
 {
-    U               0.5;
-    k               0.7;
-    epsilon         0.7;
-    R               0.7;
-    nuTilda         0.7;
+    fields
+    {
+    }
+    equations
+    {
+        U               0.5;
+        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 9cd09e7507870888201df238d5adaf90fb9711cc..16b9956a585cbbba76fb025c72f7a85042fc95c6 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
@@ -67,11 +67,17 @@ PISO
 
 relaxationFactors
 {
-    U               0.5;
-    k               0.7;
-    epsilon         0.7;
-    R               0.7;
-    nuTilda         0.7;
+    fields
+    {
+    }
+    equations
+    {
+        U               0.5;
+        k               0.7;
+        epsilon         0.7;
+        R               0.7;
+        nuTilda         0.7;
+    }
 }
 
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
index aba969ea37400aa4da95428738af46bea54ab6eb..050b2628982133cc033809ddd6ab9210e5a908a4 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
@@ -75,12 +75,18 @@ PISO
 
 relaxationFactors
 {
-    U               0.5;
-    k               0.7;
-    epsilon         0.7;
-    omega           0.7;
-    R               0.7;
-    nuTilda         0.7;
+    fields
+    {
+    }
+    equations
+    {
+        U               0.5;
+        k               0.7;
+        epsilon         0.7;
+        omega           0.7;
+        R               0.7;
+        nuTilda         0.7;
+    }
 }
 
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution
index 8584eeaed6bc0ca54cf91f8336cfa57903bff27e..be4f7d6dd61aea6731fb330c2d943ac297ef2f6d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution
@@ -77,7 +77,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
index cbdced7a2bd2a7cf0ab9a2d6ea37ad50ae2fe613..6c9287ac8c5f11c2244d93c2ce5dea0247076e1d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
@@ -74,7 +74,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
index 8cdaf4c608c81d401a2b44b476ad52b38b078181..0340484469b51266f6107bbb231d009609a41dd8 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
@@ -82,9 +82,15 @@ PIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    "(U|k|omega)"   0.7;
-    "(U|k|omega)Final" 1.0;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        "(U|k|omega)"   0.7;
+        "(U|k|omega)Final" 1.0;
+    }
 }
 
 cache
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
index b009b2e58efbb4c47a0823ca7b5cc824faf6db90..0505b50bb6040ad99b93626f23875ed36b02b79b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
@@ -65,9 +65,15 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    "(U|k|omega)"   0.7;
-    "(U|k|omega)Final" 1.0;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        "(U|k|omega)"   0.7;
+        "(U|k|omega)Final" 1.0;
+    }
 }
 
 cache
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
index 0c52b999730c8833fd65b321786a29174026dba7..876e1532a994748ded26ced00ae554ad8ae0aaf3 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
@@ -68,9 +68,15 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
index 0c52b999730c8833fd65b321786a29174026dba7..876e1532a994748ded26ced00ae554ad8ae0aaf3 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
@@ -68,9 +68,15 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }
 
 
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution
index 56198897c6b41c969fc7a213338a4ff1fe01d1b9..7b598444f79df11230d6cb85c0fdd9248afabb50 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -55,10 +55,16 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    U               0.7;
-    k               0.9;
-    epsilon         0.9;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        k               0.9;
+        epsilon         0.9;
+    }
 }
 
 
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution
index 704395c193ecc9d2f721a571736c0b3da201ba5d..7cb8b518286b7a24bd86e560d8bdde399c3dd2db 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -47,10 +47,16 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    U               0.7;
-    k               0.9;
-    epsilon         0.9;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        k               0.9;
+        epsilon         0.9;
+    }
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
index 9b25cf012d47299a932e8b9e05cf3171769a4d69..38cb42ae26eea50d4f4a95207cc8dff47e8766c6 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
@@ -66,10 +66,15 @@ SIMPLE
 
 relaxationFactors
 {
-    default         0;
-    p               0.3;
-    U               0.7;
-    nuTilda         0.7;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        nuTilda         0.7;
+    }
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index 10c23fdeb4f15bb281ad2afb0cdd5694d8bb4cfc..5037a3c14f6efef9376e464f2694dcbaead87e6b 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
@@ -70,10 +70,16 @@ potentialFlow
 
 relaxationFactors
 {
-    p               0.3;
-    U               0.7;
-    k               0.7;
-    omega           0.7;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        k               0.7;
+        omega           0.7;
+    }
 }
 
 cache
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
index 92d83d0aaf90f5bf8a42ab7a9a0f8ff1b78e6bd8..55696bd510f39e8470506abe6fe7bd5960d4c1dc 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
@@ -80,12 +80,18 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    U               0.7;
-    k               0.7;
-    epsilon         0.7;
-    R               0.7;
-    nuTilda         0.7;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               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 92d83d0aaf90f5bf8a42ab7a9a0f8ff1b78e6bd8..55696bd510f39e8470506abe6fe7bd5960d4c1dc 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
@@ -80,12 +80,18 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    U               0.7;
-    k               0.7;
-    epsilon         0.7;
-    R               0.7;
-    nuTilda         0.7;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        k               0.7;
+        epsilon         0.7;
+        R               0.7;
+        nuTilda         0.7;
+    }
 }
 
 
diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution
index b92d04ab288f7861b1db7752ab77b889929c8922..2768f93c43803c5fc91b22517d41dae5221b8f55 100644
--- a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution
+++ b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution
@@ -72,10 +72,16 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.3;
-    U               0.7;
-    k               0.7;
-    epsilon         0.7;
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        k               0.7;
+        epsilon         0.7;
+    }
 }
 
 cache
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index 16ae845f9964730ebc120ef5cd6f219f967e86d9..474ae84eb33fa2ce97933bcf85c1e43ade1ad827 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -97,7 +97,14 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
index d16163fe35126519efb2f4cfb7076bbba7441769..574d2ac6a419ce943ed08c9a7cb330f2c96ffc43 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
@@ -91,7 +91,14 @@ additional
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
index 44dd277ef8cfb41b1d40cf862df542e0deb30996..2927bf0ea22c1315df025babf1c54bbd6fbafa64 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
@@ -89,7 +89,14 @@ additional
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
index 3a67c2b85109d4bf5e5047eb86c3691a497e36e4..f5ac901b11cb2e0dd831d58c915b37b30d19edc6 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
@@ -95,7 +95,14 @@ additional
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
index a5f133352f3de0a462530e16c4a22cd6519856bf..5cc362f928d3a8fcd8544d884fea1ce0790b4769 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
@@ -82,7 +82,14 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
index 1a4c4f8868af04c1d385478f959612dc0c1b4733..b6542d1c662c8998bb831c0de4df386e04b39b64 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
@@ -38,12 +38,19 @@ PISO
 {
     momentumPredictor true;
     nOuterCorr      1;
-    nCorr           1;
+    nCorr           2;
     nNonOrthCorr    0;
 }
 
 
 relaxationFactors
-{}
+{
+    fields
+    {
+    }
+    equations
+    {
+    {
+}
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
index 1460de623960383481a04d8fdc7067c07b7fa422..ccf9d4a524cb87c3dbd263fa01d24bdaa2d58f55 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
@@ -84,7 +84,14 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
index 46f162c87cb9deb3c3335da0a2a1eb2239c3e3a6..fccf5fcd99830e4b561819604d21b8ffc3b852c0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
@@ -40,12 +40,19 @@ PISO
 {
     momentumPredictor true;
     nOuterCorr      1;
-    nCorr           1;
+    nCorr           2;
     nNonOrthCorr    0;
 }
 
 
 relaxationFactors
-{}
+{
+    fields
+    {
+    }
+    equations
+    {
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
index a5f133352f3de0a462530e16c4a22cd6519856bf..5cc362f928d3a8fcd8544d884fea1ce0790b4769 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
@@ -82,7 +82,14 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
index 39bdb2fcbe8c20275481ae2774fe889e7feee158..0c910f668d08a9bde3adb045ef1f75c3c26ae39c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
@@ -38,12 +38,19 @@ PISO
 {
     momentumPredictor  true;
     nOuterCorr      1;
-    nCorr           1;
+    nCorr           2;
     nNonOrthCorr    0;
 }
 
 
 relaxationFactors
-{}
+{
+    fields
+    {
+    }
+    equations
+    {
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
index a5f133352f3de0a462530e16c4a22cd6519856bf..5cc362f928d3a8fcd8544d884fea1ce0790b4769 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
@@ -82,7 +82,14 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
index 1a4c4f8868af04c1d385478f959612dc0c1b4733..1f7ef7077dc59783ed583d3e83f551e84dbdb843 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
@@ -38,12 +38,19 @@ PISO
 {
     momentumPredictor true;
     nOuterCorr      1;
-    nCorr           1;
+    nCorr           2;
     nNonOrthCorr    0;
 }
 
 
 relaxationFactors
-{}
+{
+    fields
+    {
+    }
+    equations
+    {
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
index 2b55c1893bb49432f9dda52d3033658857800e81..da8532734c6e42d0b4b76650313b1c16f262a4bf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
@@ -83,7 +83,14 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
index e139fd412ab7a84e1b798408f68b092f868b3612..1766415070018ad2149394378f93d2c608de9cf5 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
@@ -88,7 +88,14 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final"       1;
+    fields
+    {
+        ".*Final"       1;
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
index 08be901b0aeba71072dec55088b95297ea028c86..7d940c54e8121d663fcee5eb723101d8d89a8e4f 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
@@ -94,8 +94,12 @@ PIMPLE
 
 relaxationFactors
 {
-    p_rgh           0.3;
-    p_rghFinal      0.3;
+    fields
+    {
+    }
+    equations
+    {
+    }
 }
 
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
index 0f24c7202d4518a7073f4ffa8cd17e7a014bb108..19a9d9e0f3ecbf4de125c079b3b1d703b756ee2b 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
@@ -65,7 +65,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution
index b32d4db5825a7096742768b969ed999534c37a7c..9d4bfea5c024637160060544272ed4ca6a108e46 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution
@@ -98,12 +98,18 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
-    "T.*"           1;
-    "alpha.*"       1;
-    "Theta.*"       1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+        "T.*"           1;
+        "alpha.*"       1;
+        "Theta.*"       1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSolution b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSolution
index 4180445f3260b065b711e70c4a832a3037f7ef75..bfbead65739875a2f8269f683a3c12579a81450c 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSolution
@@ -99,12 +99,18 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
-    "T.*"           1;
-    "alpha.*"       1;
-    "Theta.*"       1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+        "T.*"           1;
+        "alpha.*"       1;
+        "Theta.*"       1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
index 8c408e330d087992e2773b69c2dacb9488ea16c1..570725e73782db0c77a19e2a78dd52a92ed698db 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
@@ -123,7 +123,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "(U|k|epsilon|omega|R|nuTilda)" 1;
+    fields
+    {
+    }
+    equations
+    {
+        "(U|k|epsilon|omega|R|nuTilda)" 1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
index 910ccb27c3230d11be9a97dd2ba1c636b0e210fe..ae85bdfaba79415bf8d80a6659b8136c483796ed 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -105,7 +105,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
index 910ccb27c3230d11be9a97dd2ba1c636b0e210fe..ae85bdfaba79415bf8d80a6659b8136c483796ed 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
@@ -105,7 +105,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
index 910ccb27c3230d11be9a97dd2ba1c636b0e210fe..ae85bdfaba79415bf8d80a6659b8136c483796ed 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
@@ -105,7 +105,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
index 910ccb27c3230d11be9a97dd2ba1c636b0e210fe..ae85bdfaba79415bf8d80a6659b8136c483796ed 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
@@ -105,7 +105,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
index 910ccb27c3230d11be9a97dd2ba1c636b0e210fe..ae85bdfaba79415bf8d80a6659b8136c483796ed 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
@@ -105,7 +105,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
index d22351d43c1ff06161c04ea6df703b78790b6462..d6ad27dc796fd3b5f2cee6bb3421f6bf19c95a13 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
@@ -105,7 +105,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
index 9421f32ba6c5261f67e6e05d17c41bd3477e8813..68884d2d04d380a3463d9ca17d3d252359998761 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
@@ -105,7 +105,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"                      1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"                      1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
index cf4ce79ecf23c40a9c8a6335556f98005881425d..9379d3029f5ef8c2a0612c7f586ea588736f09ee 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
@@ -97,12 +97,18 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
-    "T.*"           1;
-    "alpha.*"       1;
-    "Theta.*"       1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+        "T.*"           1;
+        "alpha.*"       1;
+        "Theta.*"       1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
index 296b0cd48839b3ce647e02a066bcaaa341e692f1..39c47f6efcb6931edabaff134cfb31c1fd4ece44 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
@@ -88,7 +88,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index cf3d95ce55a499cf7677a90757e9bf1d11e34a08..3c8c89ad22b85685f9a189472d90f0f180a438d2 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -104,7 +104,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index 23e919a12ee831372f86238c18dea22f164ff27f..34ad1289b35d559848fbd643fb9a3c5553f7151b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -98,7 +98,13 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
index 15f3ea5cfaeee87cfb52e6e3db69ce33c7a7a515..10796a09f68108f5e647ffb512418e000ce5b8a4 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
@@ -71,9 +71,15 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }
 
 
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
index 15f3ea5cfaeee87cfb52e6e3db69ce33c7a7a515..10796a09f68108f5e647ffb512418e000ce5b8a4 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
@@ -71,9 +71,15 @@ PIMPLE
 
 relaxationFactors
 {
-    "U.*"           1;
-    "k.*"           1;
-    "epsilon.*"     1;
+    fields
+    {
+    }
+    equations
+    {
+        "U.*"           1;
+        "k.*"           1;
+        "epsilon.*"     1;
+    }
 }