diff --git a/applications/test/fieldMapping/pipe1D/system/fvSolution b/applications/test/fieldMapping/pipe1D/system/fvSolution
index 9749de42c65fad973ec910eab9ccb6d45769db54..3a2cfb6b3e4de2b4ecd8f0f14fb837daf96f9046 100644
--- a/applications/test/fieldMapping/pipe1D/system/fvSolution
+++ b/applications/test/fieldMapping/pipe1D/system/fvSolution
@@ -27,7 +27,7 @@ solvers
 
     U
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
diff --git a/applications/test/hexRef8/block/system/fvSolution b/applications/test/hexRef8/block/system/fvSolution
index 9749de42c65fad973ec910eab9ccb6d45769db54..3a2cfb6b3e4de2b4ecd8f0f14fb837daf96f9046 100644
--- a/applications/test/hexRef8/block/system/fvSolution
+++ b/applications/test/hexRef8/block/system/fvSolution
@@ -27,7 +27,7 @@ solvers
 
     U
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
diff --git a/applications/test/patchRegion/cavity_pinched/system/fvSolution b/applications/test/patchRegion/cavity_pinched/system/fvSolution
index 74dd4bc3983d6939690b4df2fe6d5e739f8e408e..6075235962adbd9ae4cd16ee62e59744405103c5 100644
--- a/applications/test/patchRegion/cavity_pinched/system/fvSolution
+++ b/applications/test/patchRegion/cavity_pinched/system/fvSolution
@@ -40,7 +40,7 @@ solvers
 
     U
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
diff --git a/applications/test/volField/cavity/system/fvSolution b/applications/test/volField/cavity/system/fvSolution
index cfa2532bdbc1db7ae745fe92872f16d1d0376aee..5d0391dd0d138624b44055f7dba6245970307107 100644
--- a/applications/test/volField/cavity/system/fvSolution
+++ b/applications/test/volField/cavity/system/fvSolution
@@ -19,7 +19,7 @@ solvers
 {
     st
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution
index 79b943b73424732cdd93f0f96dbe8066ab4235e2..a0e75dab131796fdaa9ba30a40794f18369241a5 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution
@@ -43,7 +43,7 @@ solvers
 
     "(U|b|ft|fu|Su|Xi|ha|hau|k|epsilon)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;
@@ -52,7 +52,7 @@ solvers
 
     "(U|b|ft|fu|Su|Xi|ha|hau|k|epsilon)Final"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution
index 79770c0d3c80ccbed4f89ebda3f8439f69802416..61f0eaa59c5de478d9330dfd9f7a77cbd5636643 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution
@@ -43,7 +43,7 @@ solvers
 
     "(U|b|ft|fu|Su|Xi|ha|hau|k|epsilon)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;
@@ -52,7 +52,7 @@ solvers
 
     "(U|b|ft|fu|Su|Xi|ha|hau|k|epsilon)Final"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0/p_rgh b/tutorials/combustion/fireFoam/LES/compartmentFire/0/p_rgh
index 0ba6e491a03d9f3317d1adcd3405212184d7128b..5bb1849e75c30a663043c0ac07bf5d66158375cc 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0/p_rgh
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0/p_rgh
@@ -30,20 +30,12 @@ boundaryField
     entrainment
     {
         type            totalPressure;
-        rho             rho;
-        psi             none;
-        gamma           1.4;
         p0              uniform 101325;
-        value           uniform 101325;
     }
     outlet
     {
         type            totalPressure;
-        rho             rho;
-        psi             none;
-        gamma           1.4;
         p0              uniform 101325;
-        value           uniform 101325;
     }
     region0_to_panelRegion_wallPanel
     {
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
index 441fd950d35dff3ed9064bc916bd357deba28ea6..6ec26cc8c2e82094ba8407d42d53052010e84255 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
@@ -48,9 +48,5 @@ snGradSchemes
     default        uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/p_rgh b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/p_rgh
index 6994c4afbddbb12d572051ce7aabb4cf344a1138..3d614b6a339755ee0bdb727156bd998948afc579 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/p_rgh
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0/p_rgh
@@ -37,13 +37,7 @@ boundaryField
     side
     {
         type            totalPressure;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           1.4;
         p0              $internalField;
-        value           $internalField;
     }
 
     frontAndBack
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes
index 7167da8dd4d05558dcea608db50a85af0843018a..ad33d32e163be35ad2fde9bb189e14ceffda5667 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes
@@ -61,11 +61,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution
index 65488fd24ff727ab187384a5619b4a45f4f932f6..7792ff265f407bdeb71e6f3b72ca93302e5fe3e2 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution
@@ -54,7 +54,7 @@ solvers
 
     Yi
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-8;
         relTol          0;
@@ -62,7 +62,7 @@ solvers
 
     U
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-6;
         relTol          0.0;
@@ -70,7 +70,7 @@ solvers
 
     UFinal
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-7;
         relTol          0;
@@ -78,7 +78,7 @@ solvers
 
     k
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-8;
         relTol          0;
@@ -87,7 +87,7 @@ solvers
     //hs
     h
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-8;
         relTol          0;
@@ -95,7 +95,7 @@ solvers
 
     Ii
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-8;
         relTol          0;
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes
index 1847ceeebc5e588654fcfbc13b822123bbfebfb0..da53a546d83e29e53a9d6f4e4ae55ca3ab0958ab 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes
@@ -49,9 +49,5 @@ snGradSchemes
     default        uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution
index e74dfcec0783f3c5fb14f6e276d088678fbd781e..3db9143bdc8a3d8171abc145a6f3a08e5b933b31 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution
@@ -27,7 +27,7 @@ solvers
 
     "Yi"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-06;
         relTol          0;
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution
index e1d1d98ec6931e5a4b810636c1728900b186e983..3507acbca3a99e1554fecd1956a4f0b50cf089cb 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution
@@ -41,7 +41,7 @@ solvers
 
     "(U|h|e|k|epsilon|R)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-6;
         relTol          0.1;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSolution
index f3615658e104485b8d227c089782e528bc95979f..6af47447eab2ab4e4a6addda24beaf05463b5c76 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSolution
@@ -54,7 +54,7 @@ solvers
 
     "(U|h|k|epsilon|R)"
     {
-        solver           PBiCG;
+        solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/p_rgh
index f26a5ce4303b57465a8525c00418e1435df5be22..4b049554b971bae13c78259d4eed5e96754f7ad7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/p_rgh
@@ -24,79 +24,37 @@ boundaryField
     maxY
     {
         type            totalPressure;
-        value           $internalField;
         p0              $internalField;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           0;
     }
     minX
     {
         type            totalPressure;
-        value           $internalField;
         p0              $internalField;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           0;
     }
     maxX
     {
         type            totalPressure;
-        value           $internalField;
         p0              $internalField;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           0;
     }
     minY
     {
         type            totalPressure;
-        value           $internalField;
         p0              $internalField;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           0;
     }
     maxZ
     {
         type            totalPressure;
-        value           $internalField;
         p0              $internalField;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           0;
     }
     air_to_floor
     {
         type            fixedFluxPressure;
-        value           uniform 100000;
         p0              $internalField;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           0;
     }
     air_to_solid
     {
         type            fixedFluxPressure;
-        value           uniform 100000;
         p0              $internalField;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           0;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
index 92b630af9bf14896a91c097cd35e62e294530974..33ce84e5598af295e95415c33fab6d2a861601b9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
@@ -128,12 +128,6 @@ dictionaryReplacement
             {
                 type            totalPressure;
                 p0              $internalField;
-                U               U;
-                phi             phi;
-                rho             rho;
-                psi             none;
-                gamma           0;
-                value           $internalField;
             }
 
             "air.*"
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes
index 71325a6c6d32e26e34c12a7f2e9206883125355e..87bd9fb745fffcabf28f8192fa3941b6b20b0e65 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes
@@ -55,10 +55,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution
index a759cd243b88d9d3c31e524a3e0a921190562ede..a338a81f6c4f353aaf5370751790a49431fb9c85 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution
@@ -40,7 +40,7 @@ solvers
 
     "(U|h|e|k|epsilon|R)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-6;
         relTol          0.1;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes
index cbb3cc34327a617f694252af1c5474043246609e..0ff1d2be3a9d4b8c8d92e3416f3505b7346d7b8c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes
@@ -45,9 +45,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSchemes
index a44ede94afe5624521f4bea73b68578afc04e9cb..9288e0ae16b2f8a504719494e3b36aa7225a66bf 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSchemes
@@ -38,9 +38,5 @@ snGradSchemes
 {
 }
 
-fluxRequired
-{
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes
index 594cb9682a2b17b0cb350ae469930890525b6e2a..db3e38a1a7e167c690684d7eaaa4dccf17f3d00c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes
@@ -45,9 +45,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh
index bb3617673abe3ffff3113dc0f4af8466dbdce011..e999538886a97d84518fc89a5e92495e885a18a0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh
@@ -30,11 +30,7 @@ boundaryField
     outlet
     {
         type            totalPressure;
-        rho             rho;
-        psi             none;
-        gamma           1;
         p0              uniform 100000;
-        value           uniform 100000;
     }
     symmetry
     {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh
index a9cb369399264bf687715ea32f83719c98922b4d..d1c78a163b1d424b82496e481dc9d427a547b54e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh
@@ -24,11 +24,7 @@ boundaryField
     atmosphere
     {
         type            totalPressure;
-        rho             rho;
-        psi             none;
-        gamma           1;
         p0              uniform 100000;
-        value           uniform 100000;
     }
     symmetry
     {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes
index 878217cca3a2f91e2354bcac673e6cc404fab0d2..c5f7ff0831a3373ad2ff067bf77ad3f58d0b1e14 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes
@@ -57,12 +57,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh               ;
-}
-
 wallDist
 {
     method meshWave;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes
index 1eddf7a1d6264bea5fa05d0cab6bab5b631d4acd..199f31472a0308026a8bfbe3fcebbaf871d9cdda 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes
@@ -57,12 +57,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh               ;
-}
-
 wallDist
 {
     method meshWave;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution
index 1cd25d928038c5faa6feac621c8b734bb8efe207..d4d688d6e2ebb8998a47ffc699d4938ae521a545 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution
@@ -48,7 +48,7 @@ solvers
 
     "(U|h|R|k|epsilon|omega)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes
index 9bf0aa7cd0c3f1b75b2f720aec5ab0ddde4be9fd..354f90beaff2471f7dd95c9f25b9d3f9f6df4b3c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes
@@ -53,11 +53,5 @@ snGradSchemes
     default         limited corrected 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh               ;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution
index d0c9e063169a4ac801457d01b5a45b43b9f12197..0c2e7c9b8b95069b40121ccfc76b1d209bbf8ce9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution
@@ -64,7 +64,7 @@ solvers
 
     "(U|h)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;
diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/fvSchemes
index 11697433cedbc72a87242a5601dca543f298d258..fd3a9fd8030fd02c9b0190f837e3769ed1033e0d 100644
--- a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/fvSchemes
@@ -51,11 +51,5 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes b/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
index feaf482086bac5d68f1f8b2024866f424b6f6951..343332cb9ec4ac848d1e7446e6e1f63ada645b5e 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
@@ -54,12 +54,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 wallDist
 {
     method meshWave;
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes b/tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes
index 0c3f89d4fbc1f331ae21342c2ffa7e404d87fb9d..83aa80a00f0c558a24cb5222f5ce9868c9fb1b87 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes
@@ -49,11 +49,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
index ebe093026fcd3dd4ac4068ae40c26e985f72ce26..822d86950c3e69230b5860ae806da986c4bb9bce 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
@@ -29,8 +29,6 @@ boundaryField
     {
         type            totalPressure;
         p0              uniform 0;
-        gamma           1.4;
-        value           uniform 0;
     }
 
     wall
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.orig/p_rgh
index 81d2632626d5e95b4a4a4036ebe61c67133e8cd6..220e94121f34a9bf9632c174aa8d870c34e32944 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.orig/p_rgh
@@ -25,12 +25,6 @@ boundaryField
     {
         type            totalPressure;
         p0              $internalField;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           0;
-        value           $internalField;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
diff --git a/tutorials/mesh/parallel/filter/system/fvSolution b/tutorials/mesh/parallel/filter/system/fvSolution
index ce228830838e2d150ae6cbde6f29548d1d2ccea0..ab5ba3875d2c16dc7163caf83d7f874530dea907 100644
--- a/tutorials/mesh/parallel/filter/system/fvSolution
+++ b/tutorials/mesh/parallel/filter/system/fvSolution
@@ -70,7 +70,7 @@ solvers
 
     "(Yi|O2|N2|H2O)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-6;
         relTol          0;
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
index 4ce1c5c290d2f91041258223250046cc652836b0..c4fce639e21e895d8de96b6d66f1fd8a0f49163e 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
@@ -52,13 +52,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh;
-    pcorr;
-    alpha.water;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSchemes
index 7fdcd8e68efb32c75bf4ac509d71ec7fe097e09c..5b3d21a1f0bd0f0bd937dae1c1f691c52ad562b4 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSchemes
@@ -57,15 +57,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr           ;
-    p               ;
-    pd;
-    alpha1;
-    p_rgh;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh
index df33f57baba23aaaf43bdf18fc8b846d22104eea..e4ef7b27492f8ea4c36ca95abe4e45393db86702 100644
--- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh
+++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh
@@ -28,14 +28,8 @@ boundaryField
 
     top
     {
-        type                totalPressure;
-        p0                  $internalField;
-        U                   U;
-        phi                 phi;
-        rho                 rho;
-        psi                 none;
-        gamma               1;
-        value               $internalField;
+        type            totalPressure;
+        p0              $internalField;
     }
 
     left
diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes
index 305d727946320217e95c37ddf9ed0b29c6827591..c86e066a900ef72dcabcd7879f6a33e41ef7e398 100644
--- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes
+++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes
@@ -60,12 +60,5 @@ wallDist
     method meshWave;
 }
 
-fluxRequired
-{
-    default             none;
-    p_rgh;
-    alpha.liquid;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution
index 52d1527ecc02def4cfceffbfe8ed80f3e1703345..7701eb121f45224a7fc0ef0082524ab245928cd1 100644
--- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution
+++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution
@@ -100,7 +100,7 @@ solvers
 
      "(k.*|omega.*|Theta.*).*"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-7;
         relTol          0;
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/p_rgh
index 5b6eba19284e660a95e761fc55e51941301638b5..856b5318111f42ef91454cc0af2e0666d37a437d 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/p_rgh
@@ -34,12 +34,6 @@ boundaryField
     {
         type            totalPressure;
         p0              uniform 0;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           1;
-        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/fvSchemes
index 9d794bb101464c8cf36d180b29347be037429ed6..3f391076bc7887f1de2a0c7acb7d64e0e6d01c50 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/fvSchemes
@@ -50,13 +50,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh;
-    pcorr;
-}
-
 wallDist
 {
     method meshWave;
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
index cdd1c23f7920b726bd0b90348087ee28f48d2a89..33612c97f9f44f3df282e188aa01a18510d557d5 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
@@ -51,11 +51,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    s;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
index 488e0eedb2815af48ab3c7d78371843bd0a76f89..f71679bf0ccb9b83249410c15044e44a41a994e2 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
@@ -60,11 +60,5 @@ wallDist
     method meshWave;
 }
 
-fluxRequired
-{
-    default         no;
-    s;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh
index 7ad5729cbfb902af1952dc5d9c949d8ed9967080..fc70fdea5388de40aa038c8ec4a8f72cee473d1d 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh
@@ -40,19 +40,13 @@ boundaryField
 
     sides
     {
-	type            empty;
+        type            empty;
     }
 
     top
     {
         type            totalPressure;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           1;
         p0              uniform 0;
-        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh
index 7ad5729cbfb902af1952dc5d9c949d8ed9967080..fc70fdea5388de40aa038c8ec4a8f72cee473d1d 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh
@@ -40,19 +40,13 @@ boundaryField
 
     sides
     {
-	type            empty;
+        type            empty;
     }
 
     top
     {
         type            totalPressure;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           1;
         p0              uniform 0;
-        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh
index 7ad5729cbfb902af1952dc5d9c949d8ed9967080..fc70fdea5388de40aa038c8ec4a8f72cee473d1d 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh
@@ -40,19 +40,13 @@ boundaryField
 
     sides
     {
-	type            empty;
+        type            empty;
     }
 
     top
     {
         type            totalPressure;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           1;
         p0              uniform 0;
-        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh
index 7ad5729cbfb902af1952dc5d9c949d8ed9967080..fc70fdea5388de40aa038c8ec4a8f72cee473d1d 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh
@@ -40,19 +40,13 @@ boundaryField
 
     sides
     {
-	type            empty;
+        type            empty;
     }
 
     top
     {
         type            totalPressure;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           1;
         p0              uniform 0;
-        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh
index 7ad5729cbfb902af1952dc5d9c949d8ed9967080..fc70fdea5388de40aa038c8ec4a8f72cee473d1d 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh
@@ -40,19 +40,13 @@ boundaryField
 
     sides
     {
-	type            empty;
+        type            empty;
     }
 
     top
     {
         type            totalPressure;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           1;
         p0              uniform 0;
-        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
index 2ec7a2729c27f750de606ffb0dd2ce791b04b174..6f1fd239722f2e742098a8f677af3f16f80c0298 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
@@ -63,12 +63,5 @@ snGradSchemes
     default    corrected;
 }
 
-fluxRequired
-{
-    default     no;
-    p_rgh;
-    alpha.solids;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
index f85e922d8da4b895da1d4060645cae4e4ae04a6e..a5cd126fa30115d974a32fe87d2de5891c6297c9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
@@ -63,11 +63,6 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 wallDist
 {
     method          meshWave;
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
index 319f67166a49afa816fccff9aca3d07c7ec04d72..99a5b3879c78c48ea789dcca698287f05d0bc76f 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -49,7 +49,7 @@ solvers
 
     "(U|h|k|epsilon|R)"
     {
-        solver           PBiCG;
+        solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
index 9ff9227ca5c05b712cd0529b7a9b859a4c9b4974..7f5e19a75e5394e7e5025e5db7f393daddec862e 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -49,7 +49,7 @@ solvers
 
     "(U|h|k|epsilon|R)"
     {
-        solver           PBiCG;
+        solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;