diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/T
index 06b50a9d3b..f1d1c59d3e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/T
@@ -20,19 +20,11 @@ internalField   uniform 293;
 
 boundaryField
 {
+    walls
+    {
+        type            zeroGradient;
+    }
 
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
-    wall
-    {
-        type            zeroGradient;
-    }
     porosityWall
     {
         type            zeroGradient;
@@ -43,6 +35,7 @@ boundaryField
         type            fixedValue;
         value           $internalField;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/U
index dbb57bd115..bb97aacfec 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/U
@@ -20,29 +20,24 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    front
-    {
-        type            noSlip;
-    }
-    back
-    {
-        type            noSlip;
-    }
     walls
     {
         type            noSlip;
     }
+
     porosityWall
     {
         type            slip;
         value           uniform (0 0 0);
     }
+
     inlet
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.1;
         rhoInlet        1;          // estimate for initial rho
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/alphat
index 8b5ad877f3..3143841a3a 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/alphat
@@ -21,31 +21,24 @@ internalField   uniform 1e-3;
 
 boundaryField
 {
-    front
-    {
-        type            compressible::alphatWallFunction;
-        value           $internalField;
-    }
-    back
-    {
-        type            compressible::alphatWallFunction;
-        value           $internalField;
-    }
     walls
     {
         type            compressible::alphatWallFunction;
         value           $internalField;
     }
+
     porosityWall
     {
         type            compressible::alphatWallFunction;
         value           $internalField;
     }
+
     inlet
     {
         type            calculated;
         value           $internalField;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/epsilon
index 5c1d94dda3..43b80afcec 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/epsilon
@@ -21,32 +21,25 @@ internalField   uniform 200;
 
 boundaryField
 {
-    front
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-    back
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
     walls
     {
         type            epsilonWallFunction;
         value           uniform 200;
     }
+
     porosityWall
     {
         type            epsilonWallFunction;
         value           uniform 200;
     }
+
     inlet
     {
         type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/k
index 37b1f49a6e..3b75ca9ac6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/k
@@ -21,32 +21,25 @@ internalField   uniform 1;
 
 boundaryField
 {
-    front
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-    back
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
     walls
     {
         type            kqRWallFunction;
         value           uniform 1;
     }
+
     porosityWall
     {
         type            kqRWallFunction;
         value           uniform 1;
     }
+
     inlet
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.05;
         value           uniform 1;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/nut
index 8d708ec40a..c8c9178fb5 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/nut
@@ -21,31 +21,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-    back
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
     walls
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     porosityWall
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/p
index f367cfe35c..13466b8f16 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/p
@@ -16,22 +16,15 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 1.0e5;
+internalField   uniform 1e5;
 
 boundaryField
 {
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -41,6 +34,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            fixedValue;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict.m4
index 7f25925fb7..a92ecd2086 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict.m4
@@ -103,51 +103,14 @@ blocks
     outlet ( noutlet ncells ncells )  simpleGrading (1 1 1)
 );
 
-edges
-(
-);
+defaultPatch
+{
+    name walls;
+    type wall;
+}
 
 boundary
 (
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    front
-    {
-        type wall;
-        faces
-        (
-            // inlet block
-            frontQuad(in1, join1, join2, in2)
-            // outlet block
-            frontQuad(poro1, out1, out2, poro2)
-        );
-    }
-
-    back
-    {
-        type wall;
-        faces
-        (
-            // inlet block
-            backQuad(in1, join1, join2, in2)
-            // outlet block
-            backQuad(poro1, out1, out2, poro2)
-        );
-    }
-
-    walls
-    {
-        type wall;
-        faces
-        (
-            // inlet block
-            quad2D(in1, join1)
-            quad2D(join2, in2)
-            // outlet block
-            quad2D(poro1, out1)
-            quad2D(out2, poro2)
-        );
-    }
-
     porosityWall
     {
         type wall;
@@ -182,8 +145,4 @@ boundary
     }
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/T
index efd936bde0..f1d1c59d3e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/T
@@ -20,19 +20,11 @@ internalField   uniform 293;
 
 boundaryField
 {
-
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -43,6 +35,7 @@ boundaryField
         type            fixedValue;
         value           $internalField;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/U
index f31fcfef8e..aecd79c6c9 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/U
@@ -20,29 +20,24 @@ internalField   uniform (47.8 0 0);
 
 boundaryField
 {
-    front
-    {
-        type            noSlip;
-    }
-    back
-    {
-        type            noSlip;
-    }
     walls
     {
         type            noSlip;
     }
+
     porosityWall
     {
         type            slip;
         value           uniform (0 0 0);
     }
+
     inlet
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.1;
         value           uniform (0 0 0);
     }
+
     outlet
     {
         type            fluxCorrectedVelocity; // inletOutlet;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/alphat
index 649ab7a3ec..1c6629b7d8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/alphat
@@ -21,31 +21,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            compressible::alphatWallFunction;
-        value           uniform 0;
-    }
-    back
-    {
-        type            compressible::alphatWallFunction;
-        value           uniform 0;
-    }
     walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     porosityWall
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/epsilon
index 5c1d94dda3..43b80afcec 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/epsilon
@@ -21,32 +21,25 @@ internalField   uniform 200;
 
 boundaryField
 {
-    front
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-    back
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
     walls
     {
         type            epsilonWallFunction;
         value           uniform 200;
     }
+
     porosityWall
     {
         type            epsilonWallFunction;
         value           uniform 200;
     }
+
     inlet
     {
         type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/k
index 37b1f49a6e..3b75ca9ac6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/k
@@ -21,32 +21,25 @@ internalField   uniform 1;
 
 boundaryField
 {
-    front
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-    back
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
     walls
     {
         type            kqRWallFunction;
         value           uniform 1;
     }
+
     porosityWall
     {
         type            kqRWallFunction;
         value           uniform 1;
     }
+
     inlet
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.05;
         value           uniform 1;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/nut
index 8d708ec40a..c8c9178fb5 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/nut
@@ -21,31 +21,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-    back
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
     walls
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     porosityWall
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/p
index f367cfe35c..13466b8f16 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/p
@@ -16,22 +16,15 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 1.0e5;
+internalField   uniform 1e5;
 
 boundaryField
 {
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -41,6 +34,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            fixedValue;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict.m4
index 85c56de956..9789b3d2a8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict.m4
@@ -103,63 +103,34 @@ blocks
     outlet ( noutlet ncells ncells )  simpleGrading (1 1 1)
 );
 
-edges
-(
-);
+defaultPatch
+{
+    name walls;
+    type wall;
+}
 
 patches
 (
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    frontQuad(in1, join1, join2, in2)
-    // outlet block
-    frontQuad(poro1, out1, out2, poro2)
-    )
-
-    wall back
-    (
-    // inlet block
-    backQuad(in1, join1, join2, in2)
-    // outlet block
-    backQuad(poro1, out1, out2, poro2)
-    )
-
-    wall walls
-    (
-    // inlet block
-    quad2D(in1, join1)
-    quad2D(join2, in2)
-    // outlet block
-    quad2D(poro1, out1)
-    quad2D(out2, poro2)
-    )
-
     wall porosityWall
     (
-    // porosity block
-    frontQuad(join1, poro1, poro2, join2)
-    // porosity block
-    backQuad(join1, poro1, poro2, join2)
-    // porosity block
-    quad2D(join1, poro1)
-    quad2D(poro2, join2)
+        // porosity block
+        frontQuad(join1, poro1, poro2, join2)
+        // porosity block
+        backQuad(join1, poro1, poro2, join2)
+        // porosity block
+        quad2D(join1, poro1)
+        quad2D(poro2, join2)
     )
 
     patch inlet
     (
-    quad2D(in2, in1)
+        quad2D(in2, in1)
     )
 
     patch outlet
     (
-    quad2D(out2, out1)
+        quad2D(out2, out1)
     )
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/T
index 0c24ae8364..cd80787e30 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/T
@@ -20,7 +20,7 @@ internalField   uniform 300;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            fixedValue;
         value           uniform 350;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/U
index 1fe686f0c0..c3200bbf67 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/U
@@ -20,7 +20,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            noSlip;
     }
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/alphat
index ceeccae444..e2293152be 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/alphat
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            compressible::alphatWallFunction;
         Prt             0.85;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/epsilon
index ba113dd880..60c612ac89 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/epsilon
@@ -21,7 +21,7 @@ internalField   uniform 200;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            epsilonWallFunction;
         Cmu             0.09;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/k
index 0097e174fa..ec37f4b6a9 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/k
@@ -21,7 +21,7 @@ internalField   uniform 1;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/nut
index 30486e0bfc..4080c58828 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/nut
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            nutkWallFunction;
         Cmu             0.09;
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/p
index ea2a7e463e..8719671a97 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0/p
@@ -20,7 +20,7 @@ internalField   uniform 1e5;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict
index 86562b6d6f..e3ababa70c 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict
@@ -71,36 +71,14 @@ edges
    arc 15 19  ( 53.033  -53.033 -25)
 );
 
+defaultPatch
+{
+    name walls;
+    type wall;
+}
+
 boundary
 (
-        // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    Default_Boundary_Region
-    {
-        type wall;
-        faces
-        (
-            // block0
-            ( 0 1 3 2 )
-            ( 11 10 12 13 )
-            ( 0 10 11 1 )
-            ( 2 3 13 12 )
-            // block1
-            ( 4 5 7 6 )
-            ( 15 14 16 17 )
-            ( 4 14 15 5 )
-            ( 6 7 17 16 )
-            // block2
-            ( 1 8 9 3 )
-            ( 18 11 13 19 )
-            ( 3 9 19 13 )
-            ( 1 11 18 8 )
-            // block3
-            ( 5 9 8 7 )
-            ( 19 15 17 18 )
-            ( 5 15 19 9 )
-            ( 7 8 18 17 )
-        );
-    }
     inlet
     {
         type patch;
@@ -120,8 +98,4 @@ boundary
     }
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
index efd936bde0..f1d1c59d3e 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
@@ -20,19 +20,11 @@ internalField   uniform 293;
 
 boundaryField
 {
-
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -43,6 +35,7 @@ boundaryField
         type            fixedValue;
         value           $internalField;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
index e7a6b7b9a3..98192cbd81 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
@@ -20,29 +20,24 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    front
-    {
-        type            noSlip;
-    }
-    back
-    {
-        type            noSlip;
-    }
     walls
     {
         type            noSlip;
     }
+
     porosityWall
     {
         type            slip;
         value           uniform (0 0 0);
     }
+
     inlet
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.1;
         value           uniform (0 0 0);
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
index 649ab7a3ec..1c6629b7d8 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
@@ -21,31 +21,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            compressible::alphatWallFunction;
-        value           uniform 0;
-    }
-    back
-    {
-        type            compressible::alphatWallFunction;
-        value           uniform 0;
-    }
     walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     porosityWall
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
index f99ca1dab0..43b80afcec 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -21,18 +21,6 @@ internalField   uniform 200;
 
 boundaryField
 {
-    front
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-
-    back
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-
     walls
     {
         type            epsilonWallFunction;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
index 393f6f4aa0..3b75ca9ac6 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
@@ -21,18 +21,6 @@ internalField   uniform 1;
 
 boundaryField
 {
-    front
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-
-    back
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
index 8ea345077c..c8c9178fb5 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
@@ -21,18 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
-    back
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
index f367cfe35c..13466b8f16 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
@@ -16,22 +16,15 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 1.0e5;
+internalField   uniform 1e5;
 
 boundaryField
 {
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -41,6 +34,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            fixedValue;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
index 85c56de956..9789b3d2a8 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
@@ -103,63 +103,34 @@ blocks
     outlet ( noutlet ncells ncells )  simpleGrading (1 1 1)
 );
 
-edges
-(
-);
+defaultPatch
+{
+    name walls;
+    type wall;
+}
 
 patches
 (
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    frontQuad(in1, join1, join2, in2)
-    // outlet block
-    frontQuad(poro1, out1, out2, poro2)
-    )
-
-    wall back
-    (
-    // inlet block
-    backQuad(in1, join1, join2, in2)
-    // outlet block
-    backQuad(poro1, out1, out2, poro2)
-    )
-
-    wall walls
-    (
-    // inlet block
-    quad2D(in1, join1)
-    quad2D(join2, in2)
-    // outlet block
-    quad2D(poro1, out1)
-    quad2D(out2, poro2)
-    )
-
     wall porosityWall
     (
-    // porosity block
-    frontQuad(join1, poro1, poro2, join2)
-    // porosity block
-    backQuad(join1, poro1, poro2, join2)
-    // porosity block
-    quad2D(join1, poro1)
-    quad2D(poro2, join2)
+        // porosity block
+        frontQuad(join1, poro1, poro2, join2)
+        // porosity block
+        backQuad(join1, poro1, poro2, join2)
+        // porosity block
+        quad2D(join1, poro1)
+        quad2D(poro2, join2)
     )
 
     patch inlet
     (
-    quad2D(in2, in1)
+        quad2D(in2, in1)
     )
 
     patch outlet
     (
-    quad2D(out2, out1)
+        quad2D(out2, out1)
     )
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
index efd936bde0..f1d1c59d3e 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
@@ -20,19 +20,11 @@ internalField   uniform 293;
 
 boundaryField
 {
-
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -43,6 +35,7 @@ boundaryField
         type            fixedValue;
         value           $internalField;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
index e7a6b7b9a3..98192cbd81 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
@@ -20,29 +20,24 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    front
-    {
-        type            noSlip;
-    }
-    back
-    {
-        type            noSlip;
-    }
     walls
     {
         type            noSlip;
     }
+
     porosityWall
     {
         type            slip;
         value           uniform (0 0 0);
     }
+
     inlet
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.1;
         value           uniform (0 0 0);
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
index 649ab7a3ec..1c6629b7d8 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
@@ -21,31 +21,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            compressible::alphatWallFunction;
-        value           uniform 0;
-    }
-    back
-    {
-        type            compressible::alphatWallFunction;
-        value           uniform 0;
-    }
     walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     porosityWall
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
index f99ca1dab0..43b80afcec 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
@@ -21,18 +21,6 @@ internalField   uniform 200;
 
 boundaryField
 {
-    front
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-
-    back
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-
     walls
     {
         type            epsilonWallFunction;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
index 393f6f4aa0..3b75ca9ac6 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
@@ -21,18 +21,6 @@ internalField   uniform 1;
 
 boundaryField
 {
-    front
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-
-    back
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
index 8ea345077c..c8c9178fb5 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
@@ -21,18 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
-    back
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
index f367cfe35c..0e3fc7c49e 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
@@ -20,18 +20,11 @@ internalField   uniform 1.0e5;
 
 boundaryField
 {
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -41,6 +34,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            fixedValue;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4 b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4
index 85c56de956..9789b3d2a8 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4
@@ -103,63 +103,34 @@ blocks
     outlet ( noutlet ncells ncells )  simpleGrading (1 1 1)
 );
 
-edges
-(
-);
+defaultPatch
+{
+    name walls;
+    type wall;
+}
 
 patches
 (
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    frontQuad(in1, join1, join2, in2)
-    // outlet block
-    frontQuad(poro1, out1, out2, poro2)
-    )
-
-    wall back
-    (
-    // inlet block
-    backQuad(in1, join1, join2, in2)
-    // outlet block
-    backQuad(poro1, out1, out2, poro2)
-    )
-
-    wall walls
-    (
-    // inlet block
-    quad2D(in1, join1)
-    quad2D(join2, in2)
-    // outlet block
-    quad2D(poro1, out1)
-    quad2D(out2, poro2)
-    )
-
     wall porosityWall
     (
-    // porosity block
-    frontQuad(join1, poro1, poro2, join2)
-    // porosity block
-    backQuad(join1, poro1, poro2, join2)
-    // porosity block
-    quad2D(join1, poro1)
-    quad2D(poro2, join2)
+        // porosity block
+        frontQuad(join1, poro1, poro2, join2)
+        // porosity block
+        backQuad(join1, poro1, poro2, join2)
+        // porosity block
+        quad2D(join1, poro1)
+        quad2D(poro2, join2)
     )
 
     patch inlet
     (
-    quad2D(in2, in1)
+        quad2D(in2, in1)
     )
 
     patch outlet
     (
-    quad2D(out2, out1)
+        quad2D(out2, out1)
     )
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/T b/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
index da2afcead3..f296c40266 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
@@ -20,7 +20,7 @@ internalField   uniform 1000;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/U b/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
index e400dea7d5..9c9806dc77 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
@@ -20,7 +20,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            noSlip;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/alphat b/tutorials/compressible/rhoSimpleFoam/squareBend/0/alphat
index 5b861c6357..a6ac29f352 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/alphat
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            compressible::alphatWallFunction;
         Prt             0.85;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/epsilon b/tutorials/compressible/rhoSimpleFoam/squareBend/0/epsilon
index 1331242ce0..5c710a0a7a 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/epsilon
@@ -21,7 +21,7 @@ internalField   uniform 200;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            epsilonWallFunction;
         Cmu             0.09;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/k b/tutorials/compressible/rhoSimpleFoam/squareBend/0/k
index c3a65a5351..b410f28486 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/k
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/k
@@ -21,7 +21,7 @@ internalField   uniform 1;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/nut b/tutorials/compressible/rhoSimpleFoam/squareBend/0/nut
index 24ec9d36e1..8bafa21047 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/nut
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/nut
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            nutkWallFunction;
         Cmu             0.09;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/p b/tutorials/compressible/rhoSimpleFoam/squareBend/0/p
index b870d570b2..aedc7ef22b 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/p
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/p
@@ -20,7 +20,7 @@ internalField   uniform 110000;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
index 86562b6d6f..e3ababa70c 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
@@ -71,36 +71,14 @@ edges
    arc 15 19  ( 53.033  -53.033 -25)
 );
 
+defaultPatch
+{
+    name walls;
+    type wall;
+}
+
 boundary
 (
-        // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    Default_Boundary_Region
-    {
-        type wall;
-        faces
-        (
-            // block0
-            ( 0 1 3 2 )
-            ( 11 10 12 13 )
-            ( 0 10 11 1 )
-            ( 2 3 13 12 )
-            // block1
-            ( 4 5 7 6 )
-            ( 15 14 16 17 )
-            ( 4 14 15 5 )
-            ( 6 7 17 16 )
-            // block2
-            ( 1 8 9 3 )
-            ( 18 11 13 19 )
-            ( 3 9 19 13 )
-            ( 1 11 18 8 )
-            // block3
-            ( 5 9 8 7 )
-            ( 19 15 17 18 )
-            ( 5 15 19 9 )
-            ( 7 8 18 17 )
-        );
-    }
     inlet
     {
         type patch;
@@ -120,8 +98,4 @@ boundary
     }
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/T b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/T
index 0c24ae8364..cd80787e30 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/T
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/T
@@ -20,7 +20,7 @@ internalField   uniform 300;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            fixedValue;
         value           uniform 350;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/U b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/U
index 108028af3b..00bbf34d72 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/U
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/U
@@ -20,7 +20,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            noSlip;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/alphat b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/alphat
index 5b861c6357..a6ac29f352 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/alphat
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            compressible::alphatWallFunction;
         Prt             0.85;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/epsilon b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/epsilon
index 1331242ce0..5c710a0a7a 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/epsilon
@@ -21,7 +21,7 @@ internalField   uniform 200;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            epsilonWallFunction;
         Cmu             0.09;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/k b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/k
index c3a65a5351..b410f28486 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/k
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/k
@@ -21,7 +21,7 @@ internalField   uniform 1;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/nut b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/nut
index 24ec9d36e1..8bafa21047 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/nut
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/nut
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            nutkWallFunction;
         Cmu             0.09;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/p b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/p
index 7566a01fd4..c1427abd91 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/p
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/p
@@ -20,7 +20,7 @@ internalField   uniform 1e5;
 
 boundaryField
 {
-    Default_Boundary_Region
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
index 86562b6d6f..e3ababa70c 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
@@ -71,36 +71,14 @@ edges
    arc 15 19  ( 53.033  -53.033 -25)
 );
 
+defaultPatch
+{
+    name walls;
+    type wall;
+}
+
 boundary
 (
-        // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    Default_Boundary_Region
-    {
-        type wall;
-        faces
-        (
-            // block0
-            ( 0 1 3 2 )
-            ( 11 10 12 13 )
-            ( 0 10 11 1 )
-            ( 2 3 13 12 )
-            // block1
-            ( 4 5 7 6 )
-            ( 15 14 16 17 )
-            ( 4 14 15 5 )
-            ( 6 7 17 16 )
-            // block2
-            ( 1 8 9 3 )
-            ( 18 11 13 19 )
-            ( 3 9 19 13 )
-            ( 1 11 18 8 )
-            // block3
-            ( 5 9 8 7 )
-            ( 19 15 17 18 )
-            ( 5 15 19 9 )
-            ( 7 8 18 17 )
-        );
-    }
     inlet
     {
         type patch;
@@ -120,8 +98,4 @@ boundary
     }
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict
index 7a95c0ae2e..2605d6b94d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict
@@ -80,10 +80,6 @@ blocks
     hex (2 5 9 8  12 15 19 18) (5 50 5) simpleGrading (1 1 1)
 );
 
-edges
-(
-);
-
 boundary
 (
     inlet
@@ -120,8 +116,4 @@ boundary
     }
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict
index 9029ba66c7..36bd053bb4 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict
@@ -80,10 +80,6 @@ blocks
     hex (2 5 9 8  12 15 19 18) (5 50 5) simpleGrading (1 1 1)
 );
 
-edges
-(
-);
-
 boundary
 (
     inlet
@@ -111,8 +107,4 @@ boundary
     }
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
index efd936bde0..f1d1c59d3e 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
@@ -20,19 +20,11 @@ internalField   uniform 293;
 
 boundaryField
 {
-
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -43,6 +35,7 @@ boundaryField
         type            fixedValue;
         value           $internalField;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
index 8a1c4c0901..bacaab7f6c 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
@@ -20,28 +20,23 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    front
-    {
-        type            noSlip;
-    }
-    back
-    {
-        type            noSlip;
-    }
     walls
     {
         type            noSlip;
     }
+
     porosityWall
     {
         type            slip;
         value           uniform (0 0 0);
     }
+
     inlet
     {
         type            flowRateInletVelocity;
         volumetricFlowRate  constant 0.1;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
index f99ca1dab0..43b80afcec 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -21,18 +21,6 @@ internalField   uniform 200;
 
 boundaryField
 {
-    front
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-
-    back
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-
     walls
     {
         type            epsilonWallFunction;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
index 393f6f4aa0..3b75ca9ac6 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
@@ -21,18 +21,6 @@ internalField   uniform 1;
 
 boundaryField
 {
-    front
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-
-    back
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-
     walls
     {
         type            kqRWallFunction;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
index 8ea345077c..c8c9178fb5 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
@@ -21,18 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
-    back
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
     walls
     {
         type            nutkWallFunction;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
index f28d4659ba..dacf025798 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
@@ -20,18 +20,11 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
@@ -41,6 +34,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            fixedValue;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
index 85c56de956..ae1d953f1f 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
@@ -103,63 +103,35 @@ blocks
     outlet ( noutlet ncells ncells )  simpleGrading (1 1 1)
 );
 
-edges
-(
-);
+
+defaultPatch
+{
+    name walls;
+    type wall;
+}
 
 patches
 (
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    frontQuad(in1, join1, join2, in2)
-    // outlet block
-    frontQuad(poro1, out1, out2, poro2)
-    )
-
-    wall back
-    (
-    // inlet block
-    backQuad(in1, join1, join2, in2)
-    // outlet block
-    backQuad(poro1, out1, out2, poro2)
-    )
-
-    wall walls
-    (
-    // inlet block
-    quad2D(in1, join1)
-    quad2D(join2, in2)
-    // outlet block
-    quad2D(poro1, out1)
-    quad2D(out2, poro2)
-    )
-
     wall porosityWall
     (
-    // porosity block
-    frontQuad(join1, poro1, poro2, join2)
-    // porosity block
-    backQuad(join1, poro1, poro2, join2)
-    // porosity block
-    quad2D(join1, poro1)
-    quad2D(poro2, join2)
+        // porosity block
+        frontQuad(join1, poro1, poro2, join2)
+        // porosity block
+        backQuad(join1, poro1, poro2, join2)
+        // porosity block
+        quad2D(join1, poro1)
+        quad2D(poro2, join2)
     )
 
     patch inlet
     (
-    quad2D(in2, in1)
+        quad2D(in2, in1)
     )
 
     patch outlet
     (
-    quad2D(out2, out1)
+        quad2D(out2, out1)
     )
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0/U b/tutorials/multiphase/interFoam/RAS/angledDuct/0/U
index 2fbd0c421f..89da064db5 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0/U
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0/U
@@ -20,29 +20,24 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    front
-    {
-        type            noSlip;
-    }
-    back
-    {
-        type            noSlip;
-    }
     walls
     {
         type            noSlip;
     }
+
     porosityWall
     {
         type            slip;
         value           uniform (0 0 0);
     }
+
     inlet
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.1;
         value           uniform (0 0 0);
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0/alpha.water b/tutorials/multiphase/interFoam/RAS/angledDuct/0/alpha.water
index 819b41ea6d..6398e3c55a 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0/alpha.water
@@ -20,28 +20,22 @@ internalField   uniform 0;
 
 boundaryField
 {
-
-    front
-    {
-        type            zeroGradient;
-    }
-    back
-    {
-        type            zeroGradient;
-    }
     walls
     {
         type            zeroGradient;
     }
+
     porosityWall
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 1;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0/epsilon b/tutorials/multiphase/interFoam/RAS/angledDuct/0/epsilon
index 5c1d94dda3..43b80afcec 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0/epsilon
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0/epsilon
@@ -21,32 +21,25 @@ internalField   uniform 200;
 
 boundaryField
 {
-    front
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
-    back
-    {
-        type            epsilonWallFunction;
-        value           uniform 200;
-    }
     walls
     {
         type            epsilonWallFunction;
         value           uniform 200;
     }
+
     porosityWall
     {
         type            epsilonWallFunction;
         value           uniform 200;
     }
+
     inlet
     {
         type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0/k b/tutorials/multiphase/interFoam/RAS/angledDuct/0/k
index 37b1f49a6e..3b75ca9ac6 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0/k
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0/k
@@ -21,32 +21,25 @@ internalField   uniform 1;
 
 boundaryField
 {
-    front
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-    back
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
     walls
     {
         type            kqRWallFunction;
         value           uniform 1;
     }
+
     porosityWall
     {
         type            kqRWallFunction;
         value           uniform 1;
     }
+
     inlet
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.05;
         value           uniform 1;
     }
+
     outlet
     {
         type            inletOutlet;
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0/nut b/tutorials/multiphase/interFoam/RAS/angledDuct/0/nut
index 8d708ec40a..c8c9178fb5 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0/nut
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0/nut
@@ -21,31 +21,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-    back
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
     walls
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     porosityWall
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     inlet
     {
         type            calculated;
         value           uniform 0;
     }
+
     outlet
     {
         type            calculated;
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0/p_rgh b/tutorials/multiphase/interFoam/RAS/angledDuct/0/p_rgh
index 419643f5c7..26075c2dd6 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0/p_rgh
@@ -20,31 +20,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            fixedFluxPressure;
-        value           $internalField;
-    }
-    back
-    {
-        type            fixedFluxPressure;
-        value           $internalField;
-    }
     walls
     {
         type            fixedFluxPressure;
         value           $internalField;
     }
+
     porosityWall
     {
         type            fixedFluxPressure;
         value           $internalField;
     }
+
     inlet
     {
         type            fixedFluxPressure;
         value           $internalField;
     }
+
     outlet
     {
         type            fixedValue;
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict.m4
index 7f25925fb7..a92ecd2086 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict.m4
@@ -103,51 +103,14 @@ blocks
     outlet ( noutlet ncells ncells )  simpleGrading (1 1 1)
 );
 
-edges
-(
-);
+defaultPatch
+{
+    name walls;
+    type wall;
+}
 
 boundary
 (
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    front
-    {
-        type wall;
-        faces
-        (
-            // inlet block
-            frontQuad(in1, join1, join2, in2)
-            // outlet block
-            frontQuad(poro1, out1, out2, poro2)
-        );
-    }
-
-    back
-    {
-        type wall;
-        faces
-        (
-            // inlet block
-            backQuad(in1, join1, join2, in2)
-            // outlet block
-            backQuad(poro1, out1, out2, poro2)
-        );
-    }
-
-    walls
-    {
-        type wall;
-        faces
-        (
-            // inlet block
-            quad2D(in1, join1)
-            quad2D(join2, in2)
-            // outlet block
-            quad2D(poro1, out1)
-            quad2D(out2, poro2)
-        );
-    }
-
     porosityWall
     {
         type wall;
@@ -182,8 +145,4 @@ boundary
     }
 );
 
-mergePatchPairs
-(
-);
-
 // ************************************************************************* //