diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
index 561ca236be3bbed252ef63b29c24063a3bea4c6b..76e54ad382f43e125823fe484246da452995bbbd 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
@@ -29,7 +29,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
index 713bdebe4a1ae6141aed1c1b8764f065fc4f5663..454300ab0e9135a7b1dc0f8cbe1587a4d6db5ec2 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
@@ -30,7 +30,7 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
index dc2104f83c5ce3f90987cad077de403fcd15988e..33ecb425e27cb111e2666f0fa5ffc8d0172cfbcc 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
@@ -31,7 +31,7 @@ boundaryField
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
-    wall
+    walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
index e4dccfe57777d09934d55a61d67f94e2917585f0..c6f28faeeaf202cd08718d61816fa127f2566cbd 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
@@ -31,7 +31,7 @@ boundaryField
         type            compressible::epsilonWallFunction;
         value           uniform 200;
     }
-    wall
+    walls
     {
         type            compressible::epsilonWallFunction;
         value           uniform 200;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
index 655a91bb45e3aa597a5280c13d1a8262524a0fbd..b92ab42afed9c7b45cf4466d159470b451dc2f00 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
@@ -31,7 +31,7 @@ boundaryField
         type            compressible::kqRWallFunction;
         value           uniform 1;
     }
-    wall
+    walls
     {
         type            compressible::kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut
index 0cea2db2d2e1aa076b70254b0e314b9959cc0d78..6f779fd4165aa85ac33ecc18e39ae1a43a7dda6d 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut
@@ -31,7 +31,7 @@ boundaryField
         type            mutkWallFunction;
         value           uniform 0;
     }
-    wall
+    walls
     {
         type            mutkWallFunction;
         value           uniform 0;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
index 21db04d6109a0348229d019cb3a13d728044c86d..e3bdb75a7e4f8064978713b2ae58d4fde47f382e 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
@@ -28,7 +28,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
index 2e865a7856a7ac268e22302a7b752184d8bc0ba7..ce48c80996201835928337f288825089fcb610a9 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
@@ -134,7 +134,7 @@ boundary
         );
     }
 
-    wall
+    walls
     {
         type wall;
         faces
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
index 1105ba84b0d3d45703447c25e8255a293531b6c5..590ae2411e1f9b8cd3d51ca85154c20be0780665 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
@@ -30,7 +30,7 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
index dc2104f83c5ce3f90987cad077de403fcd15988e..33ecb425e27cb111e2666f0fa5ffc8d0172cfbcc 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
@@ -31,7 +31,7 @@ boundaryField
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
-    wall
+    walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
index e4dccfe57777d09934d55a61d67f94e2917585f0..c6f28faeeaf202cd08718d61816fa127f2566cbd 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
@@ -31,7 +31,7 @@ boundaryField
         type            compressible::epsilonWallFunction;
         value           uniform 200;
     }
-    wall
+    walls
     {
         type            compressible::epsilonWallFunction;
         value           uniform 200;
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
index 655a91bb45e3aa597a5280c13d1a8262524a0fbd..b92ab42afed9c7b45cf4466d159470b451dc2f00 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
@@ -31,7 +31,7 @@ boundaryField
         type            compressible::kqRWallFunction;
         value           uniform 1;
     }
-    wall
+    walls
     {
         type            compressible::kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut
index 0cea2db2d2e1aa076b70254b0e314b9959cc0d78..6f779fd4165aa85ac33ecc18e39ae1a43a7dda6d 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut
@@ -31,7 +31,7 @@ boundaryField
         type            mutkWallFunction;
         value           uniform 0;
     }
-    wall
+    walls
     {
         type            mutkWallFunction;
         value           uniform 0;
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/p b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/p
index 21db04d6109a0348229d019cb3a13d728044c86d..e3bdb75a7e4f8064978713b2ae58d4fde47f382e 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/p
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/p
@@ -28,7 +28,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
index 2e865a7856a7ac268e22302a7b752184d8bc0ba7..ce48c80996201835928337f288825089fcb610a9 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
@@ -134,7 +134,7 @@ boundary
         );
     }
 
-    wall
+    walls
     {
         type wall;
         faces
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/boundary
deleted file mode 100644
index 0abd1608aba0dcb6aa66c9488133a3c4b51c7588..0000000000000000000000000000000000000000
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        nFaces          700;
-        startFace       64100;
-    }
-    wall
-    {
-        type            wall;
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
index 561ca236be3bbed252ef63b29c24063a3bea4c6b..76e54ad382f43e125823fe484246da452995bbbd 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
@@ -29,7 +29,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
index 20e25d12a8c318b8b0532714ad2919ed4068fe7c..e121b9c3c157f21d94a780f473154c71cf8d6449 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
@@ -30,7 +30,7 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
index dc2104f83c5ce3f90987cad077de403fcd15988e..33ecb425e27cb111e2666f0fa5ffc8d0172cfbcc 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
@@ -31,7 +31,7 @@ boundaryField
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
-    wall
+    walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
index 7588e13063f38c366c8ffde4243960a54be45481..12c9b362e351103e30b05972cde2500ebdd1db6a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 200;
     }
 
-    wall
+    walls
     {
         type            compressible::epsilonWallFunction;
         value           uniform 200;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
index 85df9b83c3bce148f8c7ac811acd0cf59387505a..3dbe46f030c7483050fa5023e9cb4716939c57a8 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 1;
     }
 
-    wall
+    walls
     {
         type            compressible::kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut
index 2ba718d5b53378d89430ecd57f631fb03f833a0f..a01a5a0eed8c3424ca6025f067546ab01055b02e 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 0;
     }
 
-    wall
+    walls
     {
         type            mutkWallFunction;
         value           uniform 0;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
index 21db04d6109a0348229d019cb3a13d728044c86d..e3bdb75a7e4f8064978713b2ae58d4fde47f382e 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
@@ -28,7 +28,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
index 79da11e10ac8f655aa16fc6287c9496875d8672f..09a4670392e59bae438f7ff2a8f5e7a3c1a66a6a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
@@ -126,7 +126,7 @@ patches
     backQuad(poro1, out1, out2, poro2)
     )
 
-    wall wall
+    wall walls
     (
     // inlet block
     quad2D(in1, join1)
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
index 561ca236be3bbed252ef63b29c24063a3bea4c6b..76e54ad382f43e125823fe484246da452995bbbd 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
@@ -29,7 +29,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
index 20e25d12a8c318b8b0532714ad2919ed4068fe7c..e121b9c3c157f21d94a780f473154c71cf8d6449 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
@@ -30,7 +30,7 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
index dc2104f83c5ce3f90987cad077de403fcd15988e..33ecb425e27cb111e2666f0fa5ffc8d0172cfbcc 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
@@ -31,7 +31,7 @@ boundaryField
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
-    wall
+    walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
index 7588e13063f38c366c8ffde4243960a54be45481..12c9b362e351103e30b05972cde2500ebdd1db6a 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 200;
     }
 
-    wall
+    walls
     {
         type            compressible::epsilonWallFunction;
         value           uniform 200;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
index 85df9b83c3bce148f8c7ac811acd0cf59387505a..3dbe46f030c7483050fa5023e9cb4716939c57a8 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 1;
     }
 
-    wall
+    walls
     {
         type            compressible::kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/mut b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/mut
index 2ba718d5b53378d89430ecd57f631fb03f833a0f..a01a5a0eed8c3424ca6025f067546ab01055b02e 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/mut
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/mut
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 0;
     }
 
-    wall
+    walls
     {
         type            mutkWallFunction;
         value           uniform 0;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
index 21db04d6109a0348229d019cb3a13d728044c86d..e3bdb75a7e4f8064978713b2ae58d4fde47f382e 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
@@ -28,7 +28,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/blockMeshDict.m4
index 79da11e10ac8f655aa16fc6287c9496875d8672f..09a4670392e59bae438f7ff2a8f5e7a3c1a66a6a 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/blockMeshDict.m4
@@ -126,7 +126,7 @@ patches
     backQuad(poro1, out1, out2, poro2)
     )
 
-    wall wall
+    wall walls
     (
     // inlet block
     quad2D(in1, join1)
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary
index 0abd1608aba0dcb6aa66c9488133a3c4b51c7588..76e163242f2a76e34b8b5ca9f1aee9844f006eaf 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary
@@ -29,7 +29,7 @@ FoamFile
         nFaces          700;
         startFace       64100;
     }
-    wall
+    walls
     {
         type            wall;
         nFaces          1400;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
index c854ce532d428bb89c9389ccb5b1a3085f262077..265f4083449402e40055f6285e9d4eeefe3d0b4b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
@@ -79,7 +79,6 @@ boundary
     ground
     {
         type        wall;
-        inGroups    (wall);
         faces
         (
             (0 3 2 1)
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index a6e206d5256b2bd365ca802844aaedffd1c81b50..ff6504711bb70b4fd89b02689dba4f4ca27ce9f1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -168,7 +168,6 @@ castellatedMeshControls
             patchInfo
             {
                 type        wall;
-                inGroups    (wall);
             }
         }
 
@@ -182,7 +181,6 @@ castellatedMeshControls
             patchInfo
             {
                 type        wall;
-                inGroups    (wall);
             }
         }
     }
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
index 561ca236be3bbed252ef63b29c24063a3bea4c6b..76e54ad382f43e125823fe484246da452995bbbd 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
@@ -29,7 +29,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
index ad11b09e1e850ffc6943363fb5dfe9128be79ec2..fe2432b8aa31373eaca58308bfd278fc01dbf8bd 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
@@ -30,7 +30,7 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
index 6d30851be3cba86edd2360f6cb107b1f652905a9..21b1e98ef916e45e087b197e36c0e1d1e8190105 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 200;
     }
 
-    wall
+    walls
     {
         type            epsilonWallFunction;
         value           uniform 200;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
index 673cfc8310efe40606aa7b4207dff3ee5febdda5..cd7aa31096656069b0dd238accfc2160b6efb306 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 1;
     }
 
-    wall
+    walls
     {
         type            kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
index 5db002b34bb9d7deddd49f503c5264d352725c9c..fcb2bc9b0086d3236de4cfe6d5891b3035585ce9 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 0;
     }
 
-    wall
+    walls
     {
         type            nutkWallFunction;
         value           uniform 0;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
index 865e81e29f92154d863cf935505f6fdcd626ca08..dd95d3a8eb3530417c1373e9ff5d94457a8182de 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
@@ -28,7 +28,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
index 79da11e10ac8f655aa16fc6287c9496875d8672f..09a4670392e59bae438f7ff2a8f5e7a3c1a66a6a 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
@@ -126,7 +126,7 @@ patches
     backQuad(poro1, out1, out2, poro2)
     )
 
-    wall wall
+    wall walls
     (
     // inlet block
     quad2D(in1, join1)
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
index a664893343e7216491ca9913ee0171ee31980aba..1e23642ed6cb5dde77b349a2cff0acebffe36789 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
@@ -29,7 +29,7 @@ FoamFile
         nFaces          700;
         startFace       64100;
     }
-    wall
+    walls
     {
         type            wall;
         nFaces          1400;
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/T b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/T
index 52286928be798d362a503978df62cb9d6a68d8d3..0b87371528b98effb17f6a8bc9b76206d755c060 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/T
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/T
@@ -29,7 +29,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
index c411935183eb96211ba3ffb5df7117f635dbedc5..155713c25c47f833c5040dd47fcffac88a467e36 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
@@ -30,7 +30,7 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
index fc7c3ed34935271859d2f46561a4407d1b0a0445..1d7a756c5c6967a7a06e824f3bfe9d188345a67f 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 200;
     }
 
-    wall
+    walls
     {
         type            epsilonWallFunction;
         value           uniform 200;
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
index 13f51bec6b7419e4702012f93b2037be58f5dff0..1626050988f1c29c8a348c0276a46a7692b54871 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 1;
     }
 
-    wall
+    walls
     {
         type            kqRWallFunction;
         value           uniform 1;
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/nut b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/nut
index 6f819a789120c8c1d52e5a2a99f77f8e4da66b7e..86f8c112857f3890be3021530aae3bf3080b119c 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/nut
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/nut
@@ -33,7 +33,7 @@ boundaryField
         value           uniform 0;
     }
 
-    wall
+    walls
     {
         type            nutkWallFunction;
         value           uniform 0;
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/p b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/p
index 682ac792a89a1c4fcbe1ec8fb2b605c6fe1a0043..0d408ac6316de7a297696c3117186575325f6699 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/p
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/p
@@ -28,7 +28,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
index 3a02370217ed1075a46e2608b74fd03c33a82181..14f681a614d78d4daa1a17d833fe83f1001c8bc4 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
@@ -22,7 +22,7 @@ runApplication checkMesh -allTopology -allGeometry -latestTime
 latestTime=`foamInfoExec -latestTime`
 
 # Move the mesh into polyMesh
-\rm -r constant/polyMesh
+\rm -rf constant/polyMesh
 \mv "${latestTime}"/polyMesh constant
 
 # Clean up intermediate meshes
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
index b3d5aa612816da6745b6c3ad3b7375be939948d3..83061a79752173111ca7e39c7bf9cc523c20d82a 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
@@ -23,7 +23,7 @@ straightDuct.stl
     {
         wall
         {
-            name wall;
+            name walls;
         }
         porosityWall
         {
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/U b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
index 0f4b7d581b326a608a989c0d0f6f1fd9e5629421..3fa0d8ab8baa0ac63f6fd106ff55e73110487c26 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/U
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
@@ -32,7 +32,7 @@ boundaryField
         freestreamValue uniform (25.75 3.62 0);
     }
 
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
index 90565ca85a1ad59195b1db85330e9c297e4221a0..42e1dccd972b8fe1eb393ae067de0ca4b8c0be24 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
@@ -32,7 +32,7 @@ boundaryField
         freestreamValue uniform 0.14;
     }
 
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform 0;
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
index 688ffe90ffafd7a83b8b9dc0a8186850f8be4738..1e2a80af91cd3c7a1490decc154f9926aa3a1592 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
@@ -32,7 +32,7 @@ boundaryField
         freestreamValue uniform 0.14;
     }
 
-    wall
+    walls
     {
         type            nutUSpaldingWallFunction;
         value           uniform 0;
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/p b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
index 76d0d89ff59b60aa2817271ecbf82b64dbe325d1..5e451816728d7349339ea0b3670fda6503fbe328 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/p
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
@@ -30,7 +30,7 @@ boundaryField
         type            freestreamPressure;
     }
 
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
index 5bca16c74ece39f11383d0ae58869bcad1b5e1af..34e79da6d3ee3b2d58c47abac477f9463e3111f2 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
@@ -31,7 +31,7 @@ outlet
     startFace 21388;
 }
 
-wall
+walls
 {
     type wall;
     physicalType wall;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
index 373561912991882c87ef3a5828301580db60c5df..8b03633eb9cadb3767903fec8ccf4a26fd0db7b0 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
@@ -31,7 +31,7 @@ boundaryField
         value           uniform (460 0 0);
     }
 
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
index baf41e0bb39de6cc40881d524c069d522a56c79b..b6b34155c19d92573f678d1ce70f0baf92d40f8e 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
@@ -31,7 +31,7 @@ boundaryField
         value           uniform 1;
     }
 
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
index b42409456a9db3386c16aadf9e7f16a87d7b5cd1..948e99914a9568db94ae2d0296c669fb44b70cdd 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
@@ -31,7 +31,7 @@ boundaryField
         value           uniform 1e-05;
     }
 
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform 1e-11;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
index 202a0d920760d596a55719c5574bfced30a36327..95e02c374ead3fedc9215a0921654b85fd66cc51 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
@@ -30,7 +30,7 @@ boundaryField
         type            zeroGradient;
     }
 
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
index 56a11e4e7103691722c4a224b7e140ab2cd0394b..bbbcc3b281aca331473e4746afc36e4dbe0db9e5 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
@@ -31,7 +31,7 @@ boundaryField
         value           uniform 0;
     }
 
-    wall
+    walls
     {
         type            fixedValue;
         value           uniform 0;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
index 120a41b910947ba3978accad7e1983f9493b2589..7590b3df5d5f51e719d2a2a592abddaf15ec0d2d 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
@@ -30,7 +30,7 @@ boundaryField
         type            zeroGradient;
     }
 
-    wall
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
index 07136745bfa1a8867d8b46cebff322c9aad29c81..a0f3c09a37c16dfd1162c501316231476c608ab4 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
@@ -82,7 +82,7 @@ boundary
         );
     }
 
-    wall
+    walls
     {
         type wall;
         faces
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary
deleted file mode 100644
index 0b4b7a6a88eaba2c614d4cbd143a5510bfdc83d7..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,68 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-axis
-{
-    type empty;
-    physicalType empty;
-    nFaces 0;
-    startFace 41031;
-}
-
-inlet
-{
-    type patch;
-    physicalType inlet;
-    nFaces 30;
-    startFace 41031;
-}
-
-wall
-{
-    type wall;
-    physicalType wall;
-    nFaces 70;
-    startFace 41061;
-}
-
-atmosphere
-{
-    type patch;
-    physicalType atmosphere;
-    nFaces 175;
-    startFace 41131;
-}
-
-front
-{
-    type wedge;
-    physicalType wedge;
-    nFaces 20603;
-    startFace 41306;
-}
-
-back
-{
-    type wedge;
-    physicalType wedge;
-    nFaces 20603;
-    startFace 61909;
-}
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org
deleted file mode 100644
index 0b4b7a6a88eaba2c614d4cbd143a5510bfdc83d7..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org
+++ /dev/null
@@ -1,68 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-axis
-{
-    type empty;
-    physicalType empty;
-    nFaces 0;
-    startFace 41031;
-}
-
-inlet
-{
-    type patch;
-    physicalType inlet;
-    nFaces 30;
-    startFace 41031;
-}
-
-wall
-{
-    type wall;
-    physicalType wall;
-    nFaces 70;
-    startFace 41061;
-}
-
-atmosphere
-{
-    type patch;
-    physicalType atmosphere;
-    nFaces 175;
-    startFace 41131;
-}
-
-front
-{
-    type wedge;
-    physicalType wedge;
-    nFaces 20603;
-    startFace 41306;
-}
-
-back
-{
-    type wedge;
-    physicalType wedge;
-    nFaces 20603;
-    startFace 61909;
-}
-)
-
-// ************************************************************************* //