diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
index f6681086d09f83a52d2d50955e5b6235263d4176..d942f2c5012634b2639e206b3e7a64aad7e6f375 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
@@ -7,6 +7,7 @@
 
     surfaceScalarField phiHbyA
     (
+        "phiHbyA",
         (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phiAbs)
     );
diff --git a/applications/solvers/multiphase/settlingFoam/pEqn.H b/applications/solvers/multiphase/settlingFoam/pEqn.H
index bf632adb4dc4aa07da6f189e920b4e4295d81ff8..9f27e992a89188859d93458a2ec2c444afa0be1c 100644
--- a/applications/solvers/multiphase/settlingFoam/pEqn.H
+++ b/applications/solvers/multiphase/settlingFoam/pEqn.H
@@ -8,6 +8,7 @@
 
     surfaceScalarField phiHbyA
     (
+        "phiHbyA",
         fvc::interpolate(rho)
        *(
            (fvc::interpolate(HbyA) & mesh.Sf())
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
index 1e34387a33c4d5d115d2cb94d650067ee138c190..f0770e8bd9f126c2b835c19726d70b454ea2a2d4 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
@@ -23,7 +23,7 @@ boundaryField
 {
     ground
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -35,7 +35,7 @@ boundaryField
 
     burner
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -53,7 +53,7 @@ boundaryField
 
     "(region0_to.*)"
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
index 54e8cbeb298e8c45907959cbddbb524af49a9a78..d941becc551742da4f35fe43749b8516e56d2499 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
@@ -23,7 +23,7 @@ boundaryField
 {
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -41,13 +41,13 @@ boundaryField
 
     base
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
index 7a8d6054f8b5d17a9ef31f3cafc8063aa642674f..420c10de474b2ae6866af082ef3acadff0ba3c7b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
@@ -23,7 +23,7 @@ boundaryField
 {
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     sides
@@ -39,12 +39,12 @@ boundaryField
     }
     base
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
index 7dc56a62899ed9872805bbc12110ff75bfb8b634..b2d94f6866564315997e7d855bffedce38e5e164 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
@@ -22,21 +22,21 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
index 7dc56a62899ed9872805bbc12110ff75bfb8b634..b2d94f6866564315997e7d855bffedce38e5e164 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
@@ -22,21 +22,21 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
index 0ce8d85c2b156dbb4a70afd4143856cc9c4cc41e..eb39e94eab1eb3cfce6119022fd24a4eb499c102 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
@@ -22,28 +22,28 @@ boundaryField
 {
     ground
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     igloo_region0
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     twoFridgeFreezers_seal_0
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     twoFridgeFreezers_herring_1
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
index c851c9391a2283b03c70557e4f1482ac666c91df..86029469114e191c8e6061f8f577c434af5349d8 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
index fcf8d57e51baf9fb540061ad7b11402602be99c4..15979d020e33ed2769512df863c4ccb772b6eeca 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
@@ -23,25 +23,25 @@ boundaryField
 {
     frontAndBack
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     topAndBottom
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     hot
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     cold
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
index 94fc0bd9f339981c6d0bf17cb33f9f0a7183be4e..8cb7d58cdf5374a02b7f54e8539a5e3bb28102b8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
@@ -23,22 +23,22 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     fixedWalls
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh
index c851c9391a2283b03c70557e4f1482ac666c91df..86029469114e191c8e6061f8f577c434af5349d8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh
index 5b0b64b9761eb0a2c4745e49c0755bfc23698501..b8deb5e5951a0cdbd637f101ab6283b1a5b051b3 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh
@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh
index 5b0b64b9761eb0a2c4745e49c0755bfc23698501..b8deb5e5951a0cdbd637f101ab6283b1a5b051b3 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh
@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
index 5370728b89383ef6e1703e358b92b7bde12a9292..ff3254a0cb60dfcc732d8651e9cc43f1738c5533 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
@@ -15,37 +15,31 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-5
+4
 (
-    left
-    {
-        type            symmetryPlane;
-        nFaces          320;
-        startFace       99210;
-    }
     outlet
     {
         type            patch;
         nFaces          320;
-        startFace       99530;
+        startFace       99370;
     }
     up
     {
         type            symmetryPlane;
         nFaces          380;
-        startFace       99850;
+        startFace       99690;
     }
     hole
     {
         type            wall;
         nFaces          560;
-        startFace       100230;
+        startFace       100070;
     }
     frontAndBack
     {
         type            empty;
         nFaces          100000;
-        startFace       100790;
+        startFace       100630;
     }
 )
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
index 61d9570ec5bc6fca095b15121c8ef736c311bd6c..99be8758e28097d60213fbafa52d0f6294d6544f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
@@ -23,11 +23,11 @@ boundaryField
 {
     "(sides|frontAndBack)"
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
index 5ab863aeccf8f9efbde8f6088dbc5f9a882ee2d7..df06f47fd0da72a24bd0edc94d00274ef8e54505 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
@@ -23,12 +23,12 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
     wallFilm
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
index 09857d680529cd430584112f2921072e2a5903f2..7333dfae9b2fd7a7022875ce94221883feecbcce 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
@@ -23,19 +23,19 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     sides
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
index f30165dfb783231954d96aa6a1a988ef633e7c5b..840f0d21be7d0fa8f26873011284147f559a960d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
@@ -23,11 +23,11 @@ boundaryField
 {
     sides
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
index 54e73a08ae51b2c75a153ba8266ecfe5641a04ea..2b4915fe5c6ec12273419990fe4a76274d4eeb1f 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -50,7 +50,7 @@ boundaryField
 
     hull_wall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p
index 8f2ec50ff3a474e82d133f7b699115bf324249e3..ae2c14b7460e91d82d3717d540b6a9d33dc087e8 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     outlet
@@ -32,7 +32,7 @@ boundaryField
     }
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 }
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
index 9c4de0da512d78d3fcd7499ef5621c328e3d56e0..72f221208d63bd2bb025e53a1aca041cb7c0c742 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
index e3f442956da4fbe4fe0ad93d72bdead2d0ade842..5c911a0345a594e93bda4ea5a00079c63723c8dc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
@@ -22,13 +22,13 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     obstacle
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
index 03c2b46b04460ab258396af7c20618722be05ea1..825a15d6dc99da40eadda49f7cb085281d7a3ec4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     stationaryWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
     atmosphere
@@ -38,7 +38,7 @@ boundaryField
     }
     floatingObject
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
index 6fd77ea86aebdfa2ea51e0c8e9d56327db65a4fa..5c0b4be6fd997364797adbf679d53bfbabe379d7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
@@ -30,7 +30,7 @@ boundaryField
     }
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
index 6fd77ea86aebdfa2ea51e0c8e9d56327db65a4fa..5c0b4be6fd997364797adbf679d53bfbabe379d7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
@@ -30,7 +30,7 @@ boundaryField
     }
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
index 1f97b19664ab01d8c9fd79ba09823507b0e87e9e..29202adadbe7d1acbcceb457c21c5d120c7dfe7f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
index 1f97b19664ab01d8c9fd79ba09823507b0e87e9e..29202adadbe7d1acbcceb457c21c5d120c7dfe7f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
index 1f97b19664ab01d8c9fd79ba09823507b0e87e9e..29202adadbe7d1acbcceb457c21c5d120c7dfe7f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
index 1f97b19664ab01d8c9fd79ba09823507b0e87e9e..29202adadbe7d1acbcceb457c21c5d120c7dfe7f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
index 7ef84e282bacd00fe686b4129770ecb0a8819c1f..cfabea4db1c624bd7b28007c7e1c119856b1a412 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
index 7ef84e282bacd00fe686b4129770ecb0a8819c1f..cfabea4db1c624bd7b28007c7e1c119856b1a412 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
index 2b5d9fde975e5d8cf3706bbac886e25343a18234..c085da2cb601d8fefbe9daf36bd3be31cf44688d 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
@@ -23,19 +23,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
index 7ef84e282bacd00fe686b4129770ecb0a8819c1f..cfabea4db1c624bd7b28007c7e1c119856b1a412 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh
index f32544b279f7897112478db7e8b24cf48e042f4b..f2ef63d0be0ced1f66ff74471e1a87f72bc2a739 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     bullet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p
index 6fe844d27aafcb4ce1d92de1a206013e20cfe364..278db348b8d23f65b5c4c722224f9a40143ee86b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
     outlet
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
index 7d12a339569a8ca8a9ef78453ef2963f94f5fba0..037f82d0b09721783dadd7f04dd0944e7dd8e6fa 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p
index 7d12a339569a8ca8a9ef78453ef2963f94f5fba0..037f82d0b09721783dadd7f04dd0944e7dd8e6fa 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
index 75717ab2755c7adb1ce32c50f1026fa9fef03767..32d92ebc3637af3a1e125f0f79d738521aac9fd8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
index 7ef84e282bacd00fe686b4129770ecb0a8819c1f..cfabea4db1c624bd7b28007c7e1c119856b1a412 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
index 7ef84e282bacd00fe686b4129770ecb0a8819c1f..cfabea4db1c624bd7b28007c7e1c119856b1a412 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh b/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh
index f289b34b7c0085f8c7ad0f446387070d8f758900..81c72d7f7a91b9bb4387eaa5ec75d11af4dfa047 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -34,19 +34,19 @@ boundaryField
 
     bottomWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     endWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     top
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh
index 75d1cda22d24218c818448a0c72e88aa1852327f..0e6a2c640f58aec3dcdbee1f366e27e6695e7efd 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh
@@ -22,115 +22,115 @@ boundaryField
 {
     SYMP3
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     INLE1
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL9
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL10
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL11
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL12
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL6
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL8
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL61
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL62
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL63
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL64
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL65
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL66
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL67
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL68
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL69
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL7
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL70
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
index a9156248a7f0c07bd2d7d4bc0ce935b441d7a1cf..b61e0277ec8f8c8470f2596dfe9705b49ecca2b9 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
@@ -23,19 +23,19 @@ boundaryField
 {
     left
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     right
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     bottom
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     top
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     frontBack
     {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
index 63e3f73b31401551576637875edbbfd179238e84..e5e362d9581416422955cfda91f20e06e4e30c0b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
@@ -22,7 +22,7 @@ boundaryField
 {
     bottom
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 
@@ -34,7 +34,7 @@ boundaryField
 
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
index d8384de3d5ca030b0e0472dc0a8f3148e1f8f3e8..5b2c9cfa86f1a79371639e8ac1932bc0a602cb51 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     outlet
@@ -32,7 +32,7 @@ boundaryField
     }
     inlet
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     frontAndBackPlanes
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
index db1aca2e2a4e704567622e7f4d8a094e0f2152d2..5fffa73a19c7bb4636820cdc2558cd1f43b0429d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
@@ -1901,7 +1901,7 @@ boundaryField
 {
     inlet
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -1913,7 +1913,7 @@ boundaryField
 
     walls
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
index 75717ab2755c7adb1ce32c50f1026fa9fef03767..32d92ebc3637af3a1e125f0f79d738521aac9fd8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }