diff --git a/tutorials/incompressible/pimpleFoam/RAS/waveSubSurface/0/p b/tutorials/incompressible/pimpleFoam/RAS/waveSubSurface/0/p
index fb1f71a0a5..d9a73c90db 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/waveSubSurface/0/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/waveSubSurface/0/p
@@ -30,7 +30,7 @@ boundaryField
     }
     outlet
     {
-        type            entrainmentPressure;
+        type            totalPressure;
         p0              $internalField;
         value           $internalField;
     }
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
index b1adbb517f..3bcb46c5a2 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
@@ -28,7 +28,6 @@ boundaryField
     {
         type            totalPressure;
         p0              uniform 0;
-        gamma           1.4;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/compressibleInterFoam/RAS/damBreak/0/p_rgh b/tutorials/multiphase/compressibleInterFoam/RAS/damBreak/0/p_rgh
index 38f8f5fb9a..0871a3eb96 100644
--- a/tutorials/multiphase/compressibleInterFoam/RAS/damBreak/0/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/RAS/damBreak/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              $internalField;
         rho             thermo:rho;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/p_rgh
index ed3997c94f..fb2fb64265 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/p_rgh
@@ -27,7 +27,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              $internalField;
         rho             thermo:rho;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p_rgh
index 9f7ad05669..42929be6fe 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p_rgh
@@ -27,7 +27,7 @@ boundaryField
 
     top
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              $internalField;
         rho             thermo:rho;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p_rgh
index fd04c6c1ab..b155e3fa89 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p_rgh
@@ -33,7 +33,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              $internalField;
         rho             thermo:rho;
     }
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
index 3e3e302669..af150129bd 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 1e5;
         rho             thermo:rho;
     }
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/p_rgh b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/p_rgh
index a63c070ec8..73482dd7b0 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/p_rgh
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/p_rgh
@@ -36,7 +36,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig b/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig
index a9ae8ae768..2f47db3998 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig
@@ -36,7 +36,7 @@ boundaryField
 
     atmosphere
     {
-        type            prghEntrainmentPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
index a9ae8ae768..2f47db3998 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
@@ -36,7 +36,7 @@ boundaryField
 
     atmosphere
     {
-        type            prghEntrainmentPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig
index a9ae8ae768..2f47db3998 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig
@@ -36,7 +36,7 @@ boundaryField
 
     atmosphere
     {
-        type            prghEntrainmentPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/p_rgh
index f500de5c29..6e232cb9eb 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/p_rgh
index 171f85d1ba..363cae44e2 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/p_rgh
@@ -40,7 +40,7 @@ boundaryField
     }
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         rho             rho;
         psi             none;
         gamma           1;
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh b/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh
index df542cb740..2c910ad5d1 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh
@@ -30,7 +30,7 @@ boundaryField
     }
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         rho             rho;
         psi             none;
         gamma           1;
diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/0/p_rgh b/tutorials/multiphase/interFoam/RAS/planingHullW3/0/p_rgh
index a9ae8ae768..2f47db3998 100644
--- a/tutorials/multiphase/interFoam/RAS/planingHullW3/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/0/p_rgh
@@ -36,7 +36,7 @@ boundaryField
 
     atmosphere
     {
-        type            prghEntrainmentPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/propeller/0/p_rgh b/tutorials/multiphase/interFoam/RAS/propeller/0/p_rgh
index f96705c0ac..717e3d6c0b 100644
--- a/tutorials/multiphase/interFoam/RAS/propeller/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/propeller/0/p_rgh
@@ -30,7 +30,7 @@ boundaryField
 
     outlet
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              $internalField;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0/p_rgh b/tutorials/multiphase/interFoam/RAS/waterChannel/0/p_rgh
index 4a5215ab85..63d4f22a1e 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0/p_rgh
@@ -33,7 +33,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0/p_rgh b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/p_rgh
index c1a7db624c..37899adcce 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/p_rgh
@@ -38,7 +38,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/laminar/climbingRod/0/p_rgh b/tutorials/multiphase/interFoam/laminar/climbingRod/0/p_rgh
index be11b4fcab..c81123a1bb 100644
--- a/tutorials/multiphase/interFoam/laminar/climbingRod/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/climbingRod/0/p_rgh
@@ -27,7 +27,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              $internalField;
     }
 
diff --git a/tutorials/multiphase/interFoam/laminar/containerDischarge2D/0/p_rgh b/tutorials/multiphase/interFoam/laminar/containerDischarge2D/0/p_rgh
index 788eccb529..18f0d2b372 100644
--- a/tutorials/multiphase/interFoam/laminar/containerDischarge2D/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/containerDischarge2D/0/p_rgh
@@ -21,7 +21,7 @@ boundaryField
 {
     "(left|right|atmosphere)"
     {
-        type            prghEntrainmentPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
index f500de5c29..6e232cb9eb 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh
index 646f287d1a..964035f0ea 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         rho             rho;
         psi             none;
         gamma           1;
diff --git a/tutorials/multiphase/interFoam/laminar/wave3D/0/p_rgh b/tutorials/multiphase/interFoam/laminar/wave3D/0/p_rgh
index 5238ec72d5..6d7d84490c 100644
--- a/tutorials/multiphase/interFoam/laminar/wave3D/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/wave3D/0/p_rgh
@@ -29,7 +29,7 @@ boundaryField
     }
     top
     {
-        type            entrainmentPressure;
+        type            totalPressure;
         p0              uniform 0;
     }
     bottom
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
index f500de5c29..6e232cb9eb 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/RAS/damBreak4phase/0/p_rgh b/tutorials/multiphase/multiphaseInterFoam/RAS/damBreak4phase/0/p_rgh
index f500de5c29..6e232cb9eb 100644
--- a/tutorials/multiphase/multiphaseInterFoam/RAS/damBreak4phase/0/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/RAS/damBreak4phase/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
index f500de5c29..6e232cb9eb 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p_rgh
index f500de5c29..6e232cb9eb 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghTotalPressure;
         p0              uniform 0;
     }