diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/Allclean b/tutorials/compressible/acousticFoam/obliqueAirJet/main/Allclean
index 7c16473df2..6897daf72a 100755
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/Allclean
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/Allclean
@@ -6,8 +6,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 cleanCase0
 
 rm -rf constant/boundaryData
-rm -f constant/faMesh/faceLabels
-rm -f constant/faMesh/faBoundary
 rm -rf constant/triSurface
 
 # -----------------------------------------------------------------------------
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition
index 323a46fcff..eff3656d39 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition
@@ -14,13 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  ( window );
+polyMeshPatches ( window );
 
 boundary
 {
     sealing
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  fixedWall;
     }
 }
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition
index ff3067a18c..153eb2dffd 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition
@@ -14,37 +14,37 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  ( film );
+polyMeshPatches ( film );
 
 boundary
 {
     inlet
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  inlet;
     }
 
     outlet
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  outlet;
     }
 
     side
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  side;
     }
 
     symmetry
     {
-        type                symmetry;
+        type symmetry;
         neighbourPolyPatch  symmetry;
     }
 
     cylinder
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  cylinder;
     }
 }
@@ -52,8 +52,8 @@ boundary
 
 defaultPatch
 {
-    name    empty;
-    type    empty;
+    name empty;
+    type empty;
 }
 
 
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition
index f6d421dedb..1c6d6b0d2b 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  ( outer );
+polyMeshPatches ( outer );
 
 boundary
 {
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition
index 95813d696b..8f8dcbae43 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  ( "top.*" );
+polyMeshPatches ( "top.*" );
 
 boundary
 {
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faMeshDefinition b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faMeshDefinition
index 9e9490832e..98516add1c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faMeshDefinition
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faMeshDefinition
@@ -14,35 +14,31 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches             (ceiling);
+polyMeshPatches ( ceiling );
 
 boundary
 {
     side1
     {
-        type                patch;
-        ownerPolyPatch      ceiling;
+        type patch;
         neighbourPolyPatch  fixedWall1;
     }
 
     side2
     {
-        type                patch;
-        ownerPolyPatch      ceiling;
+        type patch;
         neighbourPolyPatch  fixedWall2;
     }
 
     side3
     {
-        type                patch;
-        ownerPolyPatch      ceiling;
+        type patch;
         neighbourPolyPatch  fixedWall3;
     }
 
     side4
     {
-        type                patch;
-        ownerPolyPatch      ceiling;
+        type patch;
         neighbourPolyPatch  fixedWall4;
     }
 }
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition
index ead009718a..3ca5e5cc9d 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition
@@ -14,25 +14,25 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  ( top );
+polyMeshPatches ( top );
 
 boundary
 {
     left
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  left;
     }
 
     right
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  right;
     }
 
     frontAndBack
     {
-        type                empty;
+        type empty;
         neighbourPolyPatch  frontAndBack;
     }
 }
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition
index 1d1dfdbd6a..40412bb163 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition
@@ -14,13 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  ( freeSurface );
+polyMeshPatches ( freeSurface );
 
 boundary
 {
     frontAndBack
     {
-        type                empty;
+        type empty;
         neighbourPolyPatch  frontAndBack;
     }
 }
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faMeshDefinition
index 15a6a4d934..7d1eac3254 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faMeshDefinition
@@ -10,30 +10,29 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/faMesh";
     object      faMeshDefinition;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  ( film );
+polyMeshPatches ( film );
 
 boundary
 {
     inlet
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  inlet;
     }
 
     outlet
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  outlet;
     }
 
     side
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  side;
     }
 }
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faMeshDefinition
index cd9f3f8903..18ab4a4533 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faMeshDefinition
@@ -14,42 +14,42 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  ( film );
+polyMeshPatches ( film );
 
 boundary
 {
     inlet
     {
-        type                patch;
-        ownerPolyPatch      film;
+        type patch;
+        //ownerPolyPatch      film;
         neighbourPolyPatch  inlet;
     }
 
     outlet
     {
-        type                patch;
-        ownerPolyPatch      film;
+        type patch;
+        //ownerPolyPatch      film;
         neighbourPolyPatch  outlet;
     }
 
     side
     {
-        type                patch;
-        ownerPolyPatch      film;
+        type patch;
+        //ownerPolyPatch      film;
         neighbourPolyPatch  side;
     }
 
     symmetry
     {
-        type                patch;
-        ownerPolyPatch      film;
+        type patch;
+        //ownerPolyPatch      film;
         neighbourPolyPatch  bottom;
     }
 
     cylinder
     {
-        type                patch;
-        ownerPolyPatch      film;
+        type patch;
+        //ownerPolyPatch      film;
         neighbourPolyPatch  cylinder;
     }
 }
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition
index 24f479620f..3ca5e5cc9d 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition
@@ -20,19 +20,19 @@ boundary
 {
     left
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  left;
     }
 
     right
     {
-        type                patch;
+        type patch;
         neighbourPolyPatch  right;
     }
 
     frontAndBack
     {
-        type                empty;
+        type empty;
         neighbourPolyPatch  frontAndBack;
     }
 }
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faMeshDefinition b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faMeshDefinition
index 3499617408..2a847bead2 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faMeshDefinition
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faMeshDefinition
@@ -14,28 +14,28 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches   ( base );
+polyMeshPatches ( base );
 
 boundary
 {
     inlet
     {
-        type                patch;
-        ownerPolyPatch      base;
+        type patch;
+        //ownerPolyPatch      base;
         neighbourPolyPatch  inlet;
     }
 
     outlet
     {
-        type                patch;
-        ownerPolyPatch      base;
+        type patch;
+        //ownerPolyPatch      base;
         neighbourPolyPatch  outlet;
     }
 
     sides
     {
-        type                patch;
-        ownerPolyPatch      base;
+        type patch;
+        //ownerPolyPatch      base;
         neighbourPolyPatch  sides;
     }
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition
index e8081bcd74..2a847bead2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition
@@ -10,33 +10,32 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/faMesh";
     object      faMeshDefinition;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-polyMeshPatches  1( base );
+polyMeshPatches ( base );
 
 boundary
 {
     inlet
     {
-        type                patch;
-        ownerPolyPatch      base;
+        type patch;
+        //ownerPolyPatch      base;
         neighbourPolyPatch  inlet;
     }
 
     outlet
     {
-        type                patch;
-        ownerPolyPatch      base;
+        type patch;
+        //ownerPolyPatch      base;
         neighbourPolyPatch  outlet;
     }
 
     sides
     {
-        type                patch;
-        ownerPolyPatch      base;
+        type patch;
+        //ownerPolyPatch      base;
         neighbourPolyPatch  sides;
     }
 }