diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 3f6fb0b16e..48330b91a7 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -117,6 +117,7 @@ becomes
 #include "argList.H"
 #include "polyTopoChange.H"
 #include "mappedWallPolyPatch.H"
+#include "mappedExtrudedWallPolyPatch.H"
 #include "createShellMesh.H"
 #include "syncTools.H"
 #include "cyclicPolyPatch.H"
@@ -145,60 +146,6 @@ label findPatchID(const List<polyPatch*>& newPatches, const word& name)
 }
 
 
-template<class PatchType>
-label addPatch
-(
-    const polyBoundaryMesh& patches,
-    const word& patchName,
-    DynamicList<polyPatch*>& newPatches
-)
-{
-    label patchi = findPatchID(newPatches, patchName);
-
-    if (patchi != -1)
-    {
-        if (isA<PatchType>(*newPatches[patchi]))
-        {
-            // Already there
-            return patchi;
-        }
-        else
-        {
-            FatalErrorInFunction
-                << "Already have patch " << patchName
-                << " but of type " << newPatches[patchi]->type()
-                << exit(FatalError);
-        }
-    }
-
-
-    patchi = newPatches.size();
-
-    label startFacei = 0;
-    if (patchi > 0)
-    {
-        const polyPatch& pp = *newPatches.last();
-        startFacei = pp.start()+pp.size();
-    }
-
-
-    newPatches.append
-    (
-        polyPatch::New
-        (
-            PatchType::typeName,
-            patchName,
-            0,                          // size
-            startFacei,                 // nFaces
-            patchi,
-            patches
-        ).ptr()
-    );
-
-    return patchi;
-}
-
-
 template<class PatchType>
 label addPatch
 (
@@ -214,7 +161,6 @@ label addPatch
     {
         if (isA<PatchType>(*newPatches[patchi]))
         {
-            // Already there
             return patchi;
         }
         else
@@ -226,7 +172,6 @@ label addPatch
         }
     }
 
-
     patchi = newPatches.size();
 
     label startFacei = 0;
@@ -338,59 +283,6 @@ void deleteEmptyPatches(fvMesh& mesh)
 }
 
 
-void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
-{
-    // Create dummy system/fv*
-    {
-        typeIOobject<IOdictionary> io
-        (
-            "fvSchemes",
-            mesh.time().system(),
-            regionName,
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        Info<< "Testing:" << io.objectPath() << endl;
-
-        if (!io.headerOk())
-        {
-            Info<< "Writing dummy " << regionName/io.name() << endl;
-            dictionary dummyDict;
-            dictionary divDict;
-            dummyDict.add("divSchemes", divDict);
-            dictionary gradDict;
-            dummyDict.add("gradSchemes", gradDict);
-            dictionary laplDict;
-            dummyDict.add("laplacianSchemes", laplDict);
-
-            IOdictionary(io, dummyDict).regIOobject::write();
-        }
-    }
-    {
-        typeIOobject<IOdictionary> io
-        (
-            "fvSolution",
-            mesh.time().system(),
-            regionName,
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        if (!io.headerOk())
-        {
-            Info<< "Writing dummy " << regionName/io.name() << endl;
-            dictionary dummyDict;
-            IOdictionary(io, dummyDict).regIOobject::write();
-        }
-    }
-}
-
-
 // Check zone either all internal or all external faces
 void checkZoneInside
 (
@@ -574,27 +466,36 @@ label findUncoveredCyclicPatchFace
 }
 
 
-// Calculate per edge min and max zone
-void calcEdgeMinMaxZone
+static label edgeNoZoneID = labelMin;
+
+
+static label edgeMultipleZoneID = labelMax;
+
+
+// Calculate per edge the zone
+labelList calcEdgeZone
 (
     const fvMesh& mesh,
     const primitiveFacePatch& extrudePatch,
     const labelList& extrudeMeshEdges,
     const labelList& zoneID,
     const distributionMap& extrudeEdgeFacesMap,
-    const labelListList& extrudeEdgeGlobalFaces,
-
-    labelList& minZoneID,
-    labelList& maxZoneID
+    const labelListList& extrudeEdgeGlobalFaces
 )
 {
     // Get zoneIDs in extrudeEdgeGlobalFaces order
     labelList mappedZoneID(zoneID);
     extrudeEdgeFacesMap.distribute(mappedZoneID);
 
-    // Get min and max zone per edge
-    minZoneID.setSize(extrudeEdgeGlobalFaces.size(), labelMax);
-    maxZoneID.setSize(extrudeEdgeGlobalFaces.size(), labelMin);
+    // Zone ID per edge
+    labelList edgeZoneID(extrudeEdgeGlobalFaces.size(), edgeNoZoneID);
+
+    // Set operator. Set the zone if the same or unset. Set the multiple zone
+    // ID if the edge already has a different zone.
+    auto eqOp = [](label& x, const label y)
+    {
+        x = x == y || x == edgeNoZoneID ? y : edgeMultipleZoneID;
+    };
 
     forAll(extrudeEdgeGlobalFaces, edgeI)
     {
@@ -603,129 +504,34 @@ void calcEdgeMinMaxZone
         {
             forAll(eFaces, i)
             {
-                label zoneI = mappedZoneID[eFaces[i]];
-                minZoneID[edgeI] = min(minZoneID[edgeI], zoneI);
-                maxZoneID[edgeI] = max(maxZoneID[edgeI], zoneI);
+                eqOp(edgeZoneID[edgeI], mappedZoneID[eFaces[i]]);
             }
         }
     }
+
     syncTools::syncEdgeList
     (
         mesh,
         extrudeMeshEdges,
-        minZoneID,
-        minEqOp<label>(),
-        labelMax        // null value
+        edgeZoneID,
+        eqOp,
+        edgeNoZoneID
     );
-    syncTools::syncEdgeList
-    (
-        mesh,
-        extrudeMeshEdges,
-        maxZoneID,
-        maxEqOp<label>(),
-        labelMin        // null value
-    );
-}
 
-
-// Count the number of faces in patches that need to be created. Calculates:
-//  zoneSidePatch[zoneI]         : the number of side faces to be created
-//  zoneZonePatch[zoneA,zoneB]   : the number of faces in between zoneA and B
-// Since this only counts we're not taking the processor patches into
-// account.
-void countExtrudePatches
-(
-    const fvMesh& mesh,
-    const label nZones,
-    const primitiveFacePatch& extrudePatch,
-    const labelList& extrudeMeshFaces,
-    const labelList& extrudeMeshEdges,
-
-    const labelListList& extrudeEdgeGlobalFaces,
-    const labelList& minZoneID,
-    const labelList& maxZoneID,
-
-    labelList& zoneSidePatch,
-    labelList& zoneZonePatch
-)
-{
-    // Check on master edge for use of zones. Since we only want to know
-    // whether they are being used at all no need to accurately count on slave
-    // edge as well. Just add all together at the end of this routine so it
-    // gets detected at least.
-
-    forAll(extrudePatch.edgeFaces(), edgeI)
-    {
-        const labelList& eFaces = extrudePatch.edgeFaces()[edgeI];
-
-        if (eFaces.size() == 2)
-        {
-            // Internal edge - check if in between different zones.
-            if (minZoneID[edgeI] != maxZoneID[edgeI])
-            {
-                zoneZonePatch[minZoneID[edgeI]*nZones+maxZoneID[edgeI]]++;
-            }
-        }
-        else if
-        (
-            eFaces.size() == 1
-         && extrudeEdgeGlobalFaces[edgeI].size() == 2
-        )
-        {
-            // Coupled edge - check if in between different zones.
-            if (minZoneID[edgeI] != maxZoneID[edgeI])
-            {
-                const edge& e = extrudePatch.edges()[edgeI];
-                const pointField& pts = extrudePatch.localPoints();
-                WarningInFunction
-                    << "Edge " << edgeI
-                    << "at " << pts[e[0]] << pts[e[1]]
-                    << " is a coupled edge and in between two different zones "
-                    << minZoneID[edgeI] << " and " << maxZoneID[edgeI] << endl
-                    << "    This is currently not supported." << endl;
-
-                zoneZonePatch[minZoneID[edgeI]*nZones+maxZoneID[edgeI]]++;
-            }
-        }
-        else
-        {
-            // One or more than two edge-faces.
-            // Check whether we are on a mesh edge with external patches. If
-            // so choose any uncovered one. If none found put face in
-            // undetermined zone 'side' patch
-
-            label facei = findUncoveredPatchFace
-            (
-                mesh,
-                UIndirectList<label>(extrudeMeshFaces, eFaces),
-                extrudeMeshEdges[edgeI]
-            );
-
-            if (facei == -1)
-            {
-                zoneSidePatch[minZoneID[edgeI]]++;
-            }
-        }
-    }
-    // Synchronise decision. Actual numbers are not important, just make
-    // sure that they're > 0 on all processors.
-    Pstream::listCombineGather(zoneSidePatch, plusEqOp<label>());
-    Pstream::listCombineScatter(zoneSidePatch);
-    Pstream::listCombineGather(zoneZonePatch, plusEqOp<label>());
-    Pstream::listCombineScatter(zoneZonePatch);
+    return edgeZoneID;
 }
 
 
 void addCouplingPatches
 (
     const fvMesh& mesh,
+    const bool isShellMesh,
     const word& regionName,
-    const word& shellRegionName,
+    const word& sampleRegionName,
     const wordList& zoneNames,
     const wordList& zoneShadowNames,
     const boolList& isInternal,
     const labelList& zoneIDs,
-
     DynamicList<polyPatch*>& newPatches,
     labelList& interRegionTopPatch,
     labelList& interRegionBottomPatch
@@ -739,99 +545,243 @@ void addCouplingPatches
     interRegionTopPatch.setSize(zoneNames.size(), -1);
     interRegionBottomPatch.setSize(zoneNames.size(), -1);
 
+    dictionary patchDict;
+    patchDict.add
+    (
+        "sampleMode",
+        mappedPatchBase::sampleModeNames_[mappedPatchBase::NEARESTPATCHFACE]
+    );
+    patchDict.add("sampleRegion", sampleRegionName);
+
     label nOldPatches = newPatches.size();
     forAll(zoneNames, zoneI)
     {
-        word interName
-        (
-            regionName
-           +"_to_"
-           +shellRegionName
-           +'_'
-           +zoneNames[zoneI]
-        );
+        const word patchNamePrefix =
+            regionName + "_to_" + sampleRegionName + '_';
+        const word samplePatchNamePrefix =
+            sampleRegionName + "_to_" + regionName + '_';
 
+        word bottomPatchName, bottomSamplePatchName;
+        word topPatchName, topSamplePatchName;
         if (isInternal[zoneI])
         {
-            interRegionTopPatch[zoneI] = addPatch<mappedWallPolyPatch>
-            (
-                mesh.boundaryMesh(),
-                interName + "_top",
-                newPatches
-            );
-            Pout<< interRegionTopPatch[zoneI]
-                << '\t' << newPatches[interRegionTopPatch[zoneI]]->name()
-                << '\t' << newPatches[interRegionTopPatch[zoneI]]->type()
-                << nl;
-
-            interRegionBottomPatch[zoneI] = addPatch<mappedWallPolyPatch>
-            (
-                mesh.boundaryMesh(),
-                interName + "_bottom",
-                newPatches
-            );
-            Pout<< interRegionBottomPatch[zoneI]
-                << '\t' << newPatches[interRegionBottomPatch[zoneI]]->name()
-                << '\t' << newPatches[interRegionBottomPatch[zoneI]]->type()
-                << nl;
+            bottomPatchName = patchNamePrefix + zoneNames[zoneI] + "_bottom";
+            bottomSamplePatchName =
+                samplePatchNamePrefix + zoneNames[zoneI] + "_bottom";
+            topPatchName = patchNamePrefix + zoneNames[zoneI] + "_top";
+            topSamplePatchName =
+                samplePatchNamePrefix + zoneNames[zoneI] + "_top";
         }
-        else if (zoneShadowNames.size() == 0)
+        else if (!zoneShadowNames.empty())
         {
-            interRegionTopPatch[zoneI] = addPatch<polyPatch>
-            (
-                mesh.boundaryMesh(),
-                zoneNames[zoneI] + "_top",
-                newPatches
-            );
-            Pout<< interRegionTopPatch[zoneI]
-                << '\t' << newPatches[interRegionTopPatch[zoneI]]->name()
-                << '\t' << newPatches[interRegionTopPatch[zoneI]]->type()
-                << nl;
-
-            interRegionBottomPatch[zoneI] = addPatch<mappedWallPolyPatch>
-            (
-                mesh.boundaryMesh(),
-                interName,
-                newPatches
-            );
-            Pout<< interRegionBottomPatch[zoneI]
-                << '\t' << newPatches[interRegionBottomPatch[zoneI]]->name()
-                << '\t' << newPatches[interRegionBottomPatch[zoneI]]->type()
-                << nl;
+            bottomPatchName = patchNamePrefix + zoneNames[zoneI];
+            bottomSamplePatchName = samplePatchNamePrefix + zoneNames[zoneI];
+            topPatchName = patchNamePrefix + zoneShadowNames[zoneI];
+            topSamplePatchName = samplePatchNamePrefix + zoneShadowNames[zoneI];
         }
-        else    // patch using shadow face zones.
+        else
         {
-            interRegionTopPatch[zoneI] = addPatch<mappedWallPolyPatch>
-            (
-                mesh.boundaryMesh(),
-                zoneShadowNames[zoneI] + "_top",
-                newPatches
-            );
-            Pout<< interRegionTopPatch[zoneI]
-                << '\t' << newPatches[interRegionTopPatch[zoneI]]->name()
-                << '\t' << newPatches[interRegionTopPatch[zoneI]]->type()
-                << nl;
-
-            interRegionBottomPatch[zoneI] = addPatch<mappedWallPolyPatch>
-            (
-                mesh.boundaryMesh(),
-                interName,
-                newPatches
-            );
-            Pout<< interRegionBottomPatch[zoneI]
-                << '\t' << newPatches[interRegionBottomPatch[zoneI]]->name()
-                << '\t' << newPatches[interRegionBottomPatch[zoneI]]->type()
-                << nl;
+            bottomPatchName = patchNamePrefix + zoneNames[zoneI];
+            bottomSamplePatchName = samplePatchNamePrefix + zoneNames[zoneI];
+            topPatchName = zoneNames[zoneI] + "_top";
         }
+
+        dictionary bottomPatchDict(patchDict);
+        bottomPatchDict.add("samplePatch", bottomSamplePatchName);
+
+        interRegionBottomPatch[zoneI] =
+            addPatch<mappedWallPolyPatch>
+            (
+                mesh.boundaryMesh(),
+                bottomPatchName,
+                bottomPatchDict,
+                newPatches
+            );
+
+        Pout<< interRegionBottomPatch[zoneI]
+            << '\t' << newPatches[interRegionBottomPatch[zoneI]]->name()
+            << '\t' << newPatches[interRegionBottomPatch[zoneI]]->type()
+            << nl;
+
+        if (isInternal[zoneI] || !zoneShadowNames.empty())
+        {
+            dictionary topPatchDict(patchDict);
+            topPatchDict.add("samplePatch", topSamplePatchName);
+            if (isShellMesh)
+            {
+                topPatchDict.add("bottomPatch", bottomPatchName);
+            }
+
+            interRegionTopPatch[zoneI] =
+                addPatch<mappedExtrudedWallPolyPatch>
+                (
+                    mesh.boundaryMesh(),
+                    topPatchName,
+                    topPatchDict,
+                    newPatches
+                );
+        }
+        else
+        {
+            interRegionTopPatch[zoneI] =
+                addPatch<polyPatch>
+                (
+                    mesh.boundaryMesh(),
+                    topPatchName,
+                    dictionary(),
+                    newPatches
+                );
+        }
+
+        Pout<< interRegionTopPatch[zoneI]
+            << '\t' << newPatches[interRegionTopPatch[zoneI]]->name()
+            << '\t' << newPatches[interRegionTopPatch[zoneI]]->type()
+            << nl;
     }
+
     Pout<< "Added " << newPatches.size()-nOldPatches
         << " inter-region patches." << nl
         << endl;
 }
 
 
-// Sets sidePatch[edgeI] to interprocessor or cyclic patch. Adds any
-// coupled patches if necessary.
+// Count the number of faces in patches that need to be created
+labelList countExtrudePatches
+(
+    const fvMesh& mesh,
+    const label nZones,
+    const primitiveFacePatch& extrudePatch,
+    const labelList& extrudeMeshFaces,
+    const labelList& extrudeMeshEdges,
+    const labelListList& extrudeEdgeGlobalFaces,
+    const labelList& edgeZoneID
+)
+{
+    labelList zoneSideNFaces(nZones, 0);
+
+    forAll(extrudePatch.edgeFaces(), edgeI)
+    {
+        const labelList& eFaces = extrudePatch.edgeFaces()[edgeI];
+
+        if (eFaces.size() == 2)
+        {
+            // Internal edge
+        }
+        else if
+        (
+            eFaces.size() == 1
+         && extrudeEdgeGlobalFaces[edgeI].size() == 2
+        )
+        {
+            // Coupled edge
+        }
+        else
+        {
+            // Perimeter edge. Check whether we are on a mesh edge with
+            // external patches. If so choose any uncovered one. If none found
+            // put face in undetermined zone 'side' patch.
+            const label facei = findUncoveredPatchFace
+            (
+                mesh,
+                UIndirectList<label>(extrudeMeshFaces, eFaces),
+                extrudeMeshEdges[edgeI]
+            );
+
+            if (facei == -1)
+            {
+                zoneSideNFaces[edgeZoneID[edgeI]]++;
+            }
+        }
+    }
+
+    Pstream::listCombineGather(zoneSideNFaces, plusEqOp<label>());
+    Pstream::listCombineScatter(zoneSideNFaces);
+
+    return zoneSideNFaces;
+}
+
+
+void addZoneSidePatches
+(
+    const fvMesh& mesh,
+    const wordList& zoneNames,
+    const labelList& zoneSideNFaces,
+    const word& oneDPolyPatchType,
+    DynamicList<polyPatch*>& newPatches,
+    labelList& zoneSidePatch
+)
+{
+    Pout<< "Adding patches for sides on zones:" << nl << nl
+        << "patchID\tpatch" << nl << "-------\t-----" << endl;
+
+    const label nOldPatches = newPatches.size();
+
+    if (oneDPolyPatchType != word::null)
+    {
+        forAll(zoneSideNFaces, zoneI)
+        {
+            word patchName;
+
+            if (oneDPolyPatchType == "empty")
+            {
+                patchName = "oneDEmptyPatch";
+                zoneSidePatch[zoneI] = addPatch<emptyPolyPatch>
+                (
+                    mesh.boundaryMesh(),
+                    patchName,
+                    dictionary(),
+                    newPatches
+                );
+            }
+            else if (oneDPolyPatchType == "wedge")
+            {
+                patchName = "oneDWedgePatch";
+                zoneSidePatch[zoneI] = addPatch<wedgePolyPatch>
+                (
+                    mesh.boundaryMesh(),
+                    patchName,
+                    dictionary(),
+                    newPatches
+                );
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "Type " << oneDPolyPatchType << " does not exist "
+                    << exit(FatalError);
+            }
+
+            Pout<< zoneSidePatch[zoneI] << '\t' << patchName << nl;
+        }
+    }
+    else
+    {
+        forAll(zoneSideNFaces, zoneI)
+        {
+            if (zoneSideNFaces[zoneI] > 0)
+            {
+                word patchName = zoneNames[zoneI] + "_" + "side";
+
+                zoneSidePatch[zoneI] = addPatch<polyPatch>
+                (
+                    mesh.boundaryMesh(),
+                    patchName,
+                    dictionary(),
+                    newPatches
+                );
+
+                Pout<< zoneSidePatch[zoneI] << '\t' << patchName << nl;
+            }
+        }
+    }
+
+    Pout<< "Added " << newPatches.size() - nOldPatches << " zone-side patches."
+        << nl << endl;
+}
+
+
+// Sets edgeSidePatchID[edgeI] to interprocessor or cyclic patch. Adds any
+// coupled patches if necessary. Note: Does not support processor cyclics.
 void addCoupledPatches
 (
     const fvMesh& mesh,
@@ -840,21 +790,18 @@ void addCoupledPatches
     const labelList& extrudeMeshEdges,
     const distributionMap& extrudeEdgeFacesMap,
     const labelListList& extrudeEdgeGlobalFaces,
-
-    labelList& sidePatchID,
+    labelList& edgeSidePatchID,
     DynamicList<polyPatch*>& newPatches
 )
 {
-    // Calculate opposite processor for coupled edges (only if shared by
-    // two procs). Note: could have saved original globalEdgeFaces structure.
-
     // Get procID in extrudeEdgeGlobalFaces order
     labelList procID(extrudeEdgeGlobalFaces.size(), Pstream::myProcNo());
     extrudeEdgeFacesMap.distribute(procID);
 
+    // Calculate opposite processor for coupled edges (only if shared by
+    // two procs). Note: Could have saved original globalEdgeFaces structure.
     labelList minProcID(extrudeEdgeGlobalFaces.size(), labelMax);
     labelList maxProcID(extrudeEdgeGlobalFaces.size(), labelMin);
-
     forAll(extrudeEdgeGlobalFaces, edgeI)
     {
         const labelList& eFaces = extrudeEdgeGlobalFaces[edgeI];
@@ -886,13 +833,11 @@ void addCoupledPatches
     );
 
     Pout<< "Adding processor or cyclic patches:" << nl << nl
-        << "patchID\tpatch" << nl
-        << "-------\t-----"
-        << endl;
+        << "patchID\tpatch" << nl << "-------\t-----" << endl;
 
-    label nOldPatches = newPatches.size();
+    const label nOldPatches = newPatches.size();
 
-    sidePatchID.setSize(extrudePatch.edgeFaces().size(), -1);
+    edgeSidePatchID.setSize(extrudePatch.edgeFaces().size(), -1);
     forAll(extrudePatch.edgeFaces(), edgeI)
     {
         const labelList& eFaces = extrudePatch.edgeFaces()[edgeI];
@@ -903,20 +848,19 @@ void addCoupledPatches
          && extrudeEdgeGlobalFaces[edgeI].size() == 2
         )
         {
-            // coupled boundary edge. Find matching patch.
+            // Coupled boundary edge. Find matching patch.
             label nbrProci = minProcID[edgeI];
             if (nbrProci == Pstream::myProcNo())
             {
                 nbrProci = maxProcID[edgeI];
             }
 
-
             if (nbrProci == Pstream::myProcNo())
             {
                 // Cyclic patch since both procs the same. This cyclic should
                 // already exist in newPatches so no adding necessary.
 
-                label facei = findUncoveredCyclicPatchFace
+                const label facei = findUncoveredCyclicPatchFace
                 (
                     mesh,
                     UIndirectList<label>(extrudeMeshFaces, eFaces),
@@ -927,13 +871,13 @@ void addCoupledPatches
                 {
                     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-                    label newPatchi = findPatchID
+                    const label newPatchi = findPatchID
                     (
                         newPatches,
                         patches[patches.whichPatch(facei)].name()
                     );
 
-                    sidePatchID[edgeI] = newPatchi;
+                    edgeSidePatchID[edgeI] = newPatchi;
                 }
                 else
                 {
@@ -945,20 +889,18 @@ void addCoupledPatches
             else
             {
                 // Processor patch
-                word name
-                (
-                    processorPolyPatch::newName(Pstream::myProcNo(), nbrProci)
-                );
+                const word name =
+                    processorPolyPatch::newName(Pstream::myProcNo(), nbrProci);
 
-                sidePatchID[edgeI] = findPatchID(newPatches, name);
+                edgeSidePatchID[edgeI] = findPatchID(newPatches, name);
 
-                if (sidePatchID[edgeI] == -1)
+                if (edgeSidePatchID[edgeI] == -1)
                 {
                     dictionary patchDict;
                     patchDict.add("myProcNo", Pstream::myProcNo());
                     patchDict.add("neighbProcNo", nbrProci);
 
-                    sidePatchID[edgeI] = addPatch<processorPolyPatch>
+                    edgeSidePatchID[edgeI] = addPatch<processorPolyPatch>
                     (
                         mesh.boundaryMesh(),
                         name,
@@ -966,418 +908,17 @@ void addCoupledPatches
                         newPatches
                     );
 
-                    Pout<< sidePatchID[edgeI] << '\t' << name
-                        << nl;
+                    Pout<< edgeSidePatchID[edgeI] << '\t' << name << nl;
                 }
             }
         }
     }
-    Pout<< "Added " << newPatches.size()-nOldPatches
-        << " coupled patches." << nl
-        << endl;
+
+    Pout<< "Added " << newPatches.size() - nOldPatches
+        << " coupled patches." << nl << endl;
 }
 
 
-void addZoneSidePatches
-(
-    const fvMesh& mesh,
-    const wordList& zoneNames,
-    const word& oneDPolyPatchType,
-
-    DynamicList<polyPatch*>& newPatches,
-    labelList& zoneSidePatch
-)
-{
-    Pout<< "Adding patches for sides on zones:" << nl << nl
-        << "patchID\tpatch" << nl
-        << "-------\t-----"
-        << endl;
-
-    label nOldPatches = newPatches.size();
-
-    forAll(zoneSidePatch, zoneI)
-    {
-        if (oneDPolyPatchType != word::null)
-        {
-            // Reuse single empty patch.
-            word patchName;
-            if (oneDPolyPatchType == "empty")
-            {
-                patchName = "oneDEmptyPatch";
-                zoneSidePatch[zoneI] = addPatch<emptyPolyPatch>
-                (
-                    mesh.boundaryMesh(),
-                    patchName,
-                    newPatches
-                );
-            }
-            else if (oneDPolyPatchType == "wedge")
-            {
-                patchName = "oneDWedgePatch";
-                zoneSidePatch[zoneI] = addPatch<wedgePolyPatch>
-                (
-                    mesh.boundaryMesh(),
-                    patchName,
-                    newPatches
-                );
-            }
-            else
-            {
-                FatalErrorInFunction
-                    << "Type " << oneDPolyPatchType << " does not exist "
-                    << exit(FatalError);
-            }
-
-            Pout<< zoneSidePatch[zoneI] << '\t' << patchName << nl;
-        }
-        else if (zoneSidePatch[zoneI] > 0)
-        {
-            word patchName = zoneNames[zoneI] + "_" + "side";
-
-            zoneSidePatch[zoneI] = addPatch<polyPatch>
-            (
-                mesh.boundaryMesh(),
-                patchName,
-                newPatches
-            );
-
-            Pout<< zoneSidePatch[zoneI] << '\t' << patchName << nl;
-        }
-    }
-    Pout<< "Added " << newPatches.size()-nOldPatches << " zone-side patches."
-        << nl << endl;
-}
-
-
-tmp<pointField> calcOffset
-(
-    const primitiveFacePatch& extrudePatch,
-    const createShellMesh& extruder,
-    const polyPatch& pp
-)
-{
-    vectorField::subField fc = pp.faceCentres();
-
-    tmp<pointField> toffsets(new pointField(fc.size()));
-    pointField& offsets = toffsets.ref();
-
-    forAll(fc, i)
-    {
-        label meshFacei = pp.start()+i;
-        label patchFacei = mag(extruder.faceToFaceMap()[meshFacei])-1;
-        point patchFc = extrudePatch[patchFacei].centre
-        (
-            extrudePatch.points()
-        );
-        offsets[i] = patchFc - fc[i];
-    }
-    return toffsets;
-}
-
-
-void setCouplingInfo
-(
-    fvMesh& mesh,
-    const labelList& zoneToPatch,
-    const word& sampleRegion,
-    const mappedWallPolyPatch::sampleMode mode,
-    const List<pointField>& offsets
-)
-{
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-    List<polyPatch*> newPatches
-    (
-        patches.size(),
-        static_cast<polyPatch*>(nullptr)
-    );
-
-    forAll(zoneToPatch, zoneI)
-    {
-        label patchi = zoneToPatch[zoneI];
-
-        if (patchi != -1)
-        {
-            const polyPatch& pp = patches[patchi];
-
-            if (isA<mappedWallPolyPatch>(pp))
-            {
-                newPatches[patchi] = new mappedWallPolyPatch
-                (
-                    pp.name(),
-                    pp.size(),
-                    pp.start(),
-                    patchi,
-                    sampleRegion,                           // sampleRegion
-                    mode,                                   // sampleMode
-                    pp.name(),                              // samplePatch
-                    offsets[zoneI],                         // offset
-                    patches
-                );
-            }
-        }
-    }
-
-    forAll(newPatches, patchi)
-    {
-        if (!newPatches[patchi])
-        {
-            newPatches[patchi] = patches[patchi].clone(patches).ptr();
-        }
-    }
-
-    mesh.removeFvBoundary();
-    mesh.addFvPatches(newPatches, true);
-}
-
-
-// Extrude and write geometric properties
-void extrudeGeometricProperties
-(
-    const polyMesh& mesh,
-    const primitiveFacePatch& extrudePatch,
-    const createShellMesh& extruder,
-    const polyMesh& regionMesh,
-    const extrudeModel& model
-)
-{
-     const pointIOField patchFaceCentres
-     (
-        IOobject
-        (
-            "patchFaceCentres",
-            mesh.pointsInstance(),
-            mesh.meshSubDir,
-            mesh,
-            IOobject::MUST_READ
-        )
-    );
-
-    const pointIOField patchEdgeCentres
-    (
-        IOobject
-        (
-            "patchEdgeCentres",
-            mesh.pointsInstance(),
-            mesh.meshSubDir,
-            mesh,
-            IOobject::MUST_READ
-        )
-    );
-
-    // forAll(extrudePatch.edges(), edgeI)
-    //{
-    //    const edge& e = extrudePatch.edges()[edgeI];
-    //    Pout<< "Edge:" << e.centre(extrudePatch.localPoints()) << nl
-    //        << "read:" << patchEdgeCentres[edgeI]
-    //        << endl;
-    //}
-
-
-    // Determine edge normals on original patch
-    labelList patchEdges;
-    labelList coupledEdges;
-    PackedBoolList sameEdgeOrientation;
-    PatchTools::matchEdges
-    (
-        extrudePatch,
-        mesh.globalData().coupledPatch(),
-        patchEdges,
-        coupledEdges,
-        sameEdgeOrientation
-    );
-
-    pointField patchEdgeNormals
-    (
-        PatchTools::edgeNormals
-        (
-            mesh,
-            extrudePatch,
-            patchEdges,
-            coupledEdges
-        )
-    );
-
-
-    pointIOField faceCentres
-    (
-        IOobject
-        (
-            "faceCentres",
-            regionMesh.pointsInstance(),
-            regionMesh.meshSubDir,
-            regionMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        regionMesh.nFaces()
-    );
-
-
-    // Work out layers. Guaranteed in columns so no fancy parallel bits.
-
-
-    forAll(extruder.faceToFaceMap(), facei)
-    {
-        if (extruder.faceToFaceMap()[facei] != 0)
-        {
-            // 'horizontal' face
-            label patchFacei = mag(extruder.faceToFaceMap()[facei])-1;
-
-            label celli = regionMesh.faceOwner()[facei];
-            if (regionMesh.isInternalFace(facei))
-            {
-                celli = max(celli, regionMesh.faceNeighbour()[facei]);
-            }
-
-            // Calculate layer from cell numbering (see createShellMesh)
-            label layerI = (celli % model.nLayers());
-
-            if
-            (
-               !regionMesh.isInternalFace(facei)
-             && extruder.faceToFaceMap()[facei] > 0
-            )
-            {
-                // Top face
-                layerI++;
-            }
-
-
-            // Recalculate based on extrusion model
-            faceCentres[facei] = model
-            (
-                patchFaceCentres[patchFacei],
-                extrudePatch.faceNormals()[patchFacei],
-                layerI
-            );
-        }
-        else
-        {
-            // 'vertical face
-            label patchEdgeI = extruder.faceToEdgeMap()[facei];
-            label layerI =
-            (
-                regionMesh.faceOwner()[facei]
-              % model.nLayers()
-            );
-
-            // Extrude patch edge centre to this layer
-            point pt0 = model
-            (
-                patchEdgeCentres[patchEdgeI],
-                patchEdgeNormals[patchEdgeI],
-                layerI
-            );
-            // Extrude patch edge centre to next layer
-            point pt1 = model
-            (
-                patchEdgeCentres[patchEdgeI],
-                patchEdgeNormals[patchEdgeI],
-                layerI+1
-            );
-
-            // Interpolate
-            faceCentres[facei] = 0.5*(pt0+pt1);
-        }
-    }
-
-    pointIOField cellCentres
-    (
-        IOobject
-        (
-            "cellCentres",
-            regionMesh.pointsInstance(),
-            regionMesh.meshSubDir,
-            regionMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        regionMesh.nCells()
-    );
-
-    forAll(extruder.cellToFaceMap(), celli)
-    {
-        label patchFacei = extruder.cellToFaceMap()[celli];
-
-        // Calculate layer from cell numbering (see createShellMesh)
-        label layerI = (celli % model.nLayers());
-
-        // Recalculate based on extrusion model
-        point pt0 = model
-        (
-            patchFaceCentres[patchFacei],
-            extrudePatch.faceNormals()[patchFacei],
-            layerI
-        );
-        point pt1 = model
-        (
-            patchFaceCentres[patchFacei],
-            extrudePatch.faceNormals()[patchFacei],
-            layerI+1
-        );
-
-        // Interpolate
-        cellCentres[celli] = 0.5*(pt0+pt1);
-    }
-
-
-    // Bit of checking
-    if (false)
-    {
-        OBJstream faceStr(regionMesh.time().path()/"faceCentres.obj");
-        OBJstream cellStr(regionMesh.time().path()/"cellCentres.obj");
-
-        forAll(faceCentres, facei)
-        {
-            Pout<< "Model     :" << faceCentres[facei] << endl
-                << "regionMesh:" << regionMesh.faceCentres()[facei] << endl;
-            faceStr.write
-            (
-                linePointRef
-                (
-                    faceCentres[facei],
-                    regionMesh.faceCentres()[facei]
-                )
-            );
-        }
-        forAll(cellCentres, celli)
-        {
-            Pout<< "Model     :" << cellCentres[celli] << endl
-                << "regionMesh:" << regionMesh.cellCentres()[celli] << endl;
-            cellStr.write
-            (
-                linePointRef
-                (
-                    cellCentres[celli],
-                    regionMesh.cellCentres()[celli]
-                )
-            );
-        }
-    }
-
-
-
-    Info<< "Writing geometric properties for mesh " << regionMesh.name()
-        << " to " << regionMesh.pointsInstance() << nl
-        << endl;
-
-    bool ok = faceCentres.write() && cellCentres.write();
-
-    if (!ok)
-    {
-        FatalErrorInFunction
-            << "Failed writing " << faceCentres.objectPath()
-            << " and " << cellCentres.objectPath()
-            << exit(FatalError);
-    }
-}
-
-
-
-
 int main(int argc, char *argv[])
 {
     argList::addNote("Create region mesh by extruding a faceZone or faceSet");
@@ -1402,32 +943,27 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-
-    const word oldInstance = mesh.pointsInstance();
     bool overwrite = args.optionFound("overwrite");
 
+    const word oldInstance = mesh.pointsInstance();
 
     const dictionary dict(systemDict("extrudeToRegionMeshDict", args, mesh));
 
-
     // Point generator
     autoPtr<extrudeModel> model(extrudeModel::New(dict));
 
-
     // Region
     const word shellRegionName(dict.lookup("region"));
 
     // Faces to extrude - either faceZones or faceSets (boundary faces only)
     wordList zoneNames;
     wordList zoneShadowNames;
-
     bool hasZones = dict.found("faceZones");
     if (hasZones)
     {
         dict.lookup("faceZones") >> zoneNames;
         dict.readIfPresent("faceZonesShadow", zoneShadowNames);
 
-        // Check
         if (dict.found("faceSets"))
         {
             FatalIOErrorIn(args.executable().c_str(), dict)
@@ -1442,11 +978,8 @@ int main(int argc, char *argv[])
         dict.readIfPresent("faceSetsShadow", zoneShadowNames);
     }
 
-
-    mappedPatchBase::sampleMode sampleMode =
-        mappedPatchBase::sampleModeNames_[dict.lookup("sampleMode")];
-
-    const Switch oneD(dict.lookup("oneD"));
+    // One-dimensional extrusion settings
+    const Switch oneD(dict.lookupOrDefault("oneD", false));
     Switch oneDNonManifoldEdges(false);
     word oneDPatchType(emptyPolyPatch::typeName);
     if (oneD)
@@ -1455,6 +988,7 @@ int main(int argc, char *argv[])
         dict.lookup("oneDPolyPatchType") >> oneDPatchType;
     }
 
+    // Change the primary mesh?
     const Switch adaptMesh(dict.lookup("adaptMesh"));
 
     if (hasZones)
@@ -1481,7 +1015,6 @@ int main(int argc, char *argv[])
             << exit(FatalIOError);
     }
 
-
     if (oneD)
     {
         if (oneDNonManifoldEdges)
@@ -1501,10 +1034,6 @@ int main(int argc, char *argv[])
     }
 
 
-    // Create dummy fv* files
-    createDummyFvMeshFiles(mesh, shellRegionName);
-
-
     word meshInstance;
     if (!overwrite)
     {
@@ -1523,23 +1052,23 @@ int main(int argc, char *argv[])
 
     // Extract faces to extrude
     // ~~~~~~~~~~~~~~~~~~~~~~~~
-    // Note: zoneID are regions of extrusion. They are not mesh.faceZones
-    // indices.
 
-    // From extrude zone to mesh zone (or -1 if extruding faceSets)
-    labelList meshZoneID;
     // Per extrude zone whether contains internal or external faces
     boolList isInternal(zoneNames.size(), false);
 
+    // From extrude zone to mesh zone (or -1 if extruding faceSets)
+    labelList meshZoneID;
+    labelList shadowMeshZoneID;
+
+    // Primary
     labelList extrudeMeshFaces;
-    faceList zoneFaces;
     labelList zoneID;
     boolList zoneFlipMap;
+
     // Shadow
-    labelList zoneShadowIDs;    // from extrude shadow zone to mesh zone
     labelList extrudeMeshShadowFaces;
-    boolList zoneShadowFlipMap;
     labelList zoneShadowID;
+    boolList zoneShadowFlipMap;
 
     if (hasZones)
     {
@@ -1557,25 +1086,24 @@ int main(int argc, char *argv[])
                     << exit(FatalIOError);
             }
         }
-        // Collect per face information
+
         label nExtrudeFaces = 0;
         forAll(meshZoneID, i)
         {
             nExtrudeFaces += faceZones[meshZoneID[i]].size();
         }
+
         extrudeMeshFaces.setSize(nExtrudeFaces);
-        zoneFaces.setSize(nExtrudeFaces);
         zoneID.setSize(nExtrudeFaces);
         zoneFlipMap.setSize(nExtrudeFaces);
+
         nExtrudeFaces = 0;
         forAll(meshZoneID, i)
         {
             const faceZone& fz = faceZones[meshZoneID[i]];
-            const primitiveFacePatch& fzp = fz();
             forAll(fz, j)
             {
                 extrudeMeshFaces[nExtrudeFaces] = fz[j];
-                zoneFaces[nExtrudeFaces] = fzp[j];
                 zoneID[nExtrudeFaces] = i;
                 zoneFlipMap[nExtrudeFaces] = fz.flipMap()[j];
                 nExtrudeFaces++;
@@ -1587,16 +1115,14 @@ int main(int argc, char *argv[])
             }
         }
 
-        // Shadow zone
-        // ~~~~~~~~~~~
-
+        // Shadow zones
         if (zoneShadowNames.size())
         {
-            zoneShadowIDs.setSize(zoneShadowNames.size());
+            shadowMeshZoneID.setSize(zoneShadowNames.size());
             forAll(zoneShadowNames, i)
             {
-                zoneShadowIDs[i] = faceZones.findZoneID(zoneShadowNames[i]);
-                if (zoneShadowIDs[i] == -1)
+                shadowMeshZoneID[i] = faceZones.findZoneID(zoneShadowNames[i]);
+                if (shadowMeshZoneID[i] == -1)
                 {
                     FatalIOErrorIn(args.executable().c_str(), dict)
                         << "Cannot find zone " << zoneShadowNames[i] << endl
@@ -1606,24 +1132,33 @@ int main(int argc, char *argv[])
             }
 
             label nShadowFaces = 0;
-            forAll(zoneShadowIDs, i)
+            forAll(shadowMeshZoneID, i)
             {
-                nShadowFaces += faceZones[zoneShadowIDs[i]].size();
+                nShadowFaces += faceZones[shadowMeshZoneID[i]].size();
+            }
+
+            if (nExtrudeFaces != nShadowFaces)
+            {
+                FatalIOErrorIn(args.executable().c_str(), dict)
+                    << "Extruded faces " << nExtrudeFaces << endl
+                    << "is different from shadow faces. " << nShadowFaces
+                    << "This is not permitted " << endl
+                    << exit(FatalIOError);
             }
 
             extrudeMeshShadowFaces.setSize(nShadowFaces);
-            zoneShadowFlipMap.setSize(nShadowFaces);
             zoneShadowID.setSize(nShadowFaces);
+            zoneShadowFlipMap.setSize(nShadowFaces);
 
             nShadowFaces = 0;
-            forAll(zoneShadowIDs, i)
+            forAll(shadowMeshZoneID, i)
             {
-                const faceZone& fz = faceZones[zoneShadowIDs[i]];
+                const faceZone& fz = faceZones[shadowMeshZoneID[i]];
                 forAll(fz, j)
                 {
                     extrudeMeshShadowFaces[nShadowFaces] = fz[j];
-                    zoneShadowFlipMap[nShadowFaces] = fz.flipMap()[j];
                     zoneShadowID[nShadowFaces] = i;
+                    zoneShadowFlipMap[nShadowFaces] = fz.flipMap()[j];
                     nShadowFaces++;
                 }
             }
@@ -1632,6 +1167,7 @@ int main(int argc, char *argv[])
     else
     {
         meshZoneID.setSize(zoneNames.size(), -1);
+
         // Load faceSets
         PtrList<faceSet> zones(zoneNames.size());
         forAll(zoneNames, i)
@@ -1640,15 +1176,13 @@ int main(int argc, char *argv[])
             zones.set(i, new faceSet(mesh, zoneNames[i]));
         }
 
-
-        // Collect per face information
         label nExtrudeFaces = 0;
         forAll(zones, i)
         {
             nExtrudeFaces += zones[i].size();
         }
+
         extrudeMeshFaces.setSize(nExtrudeFaces);
-        zoneFaces.setSize(nExtrudeFaces);
         zoneID.setSize(nExtrudeFaces);
         zoneFlipMap.setSize(nExtrudeFaces);
 
@@ -1668,7 +1202,6 @@ int main(int argc, char *argv[])
                         << exit(FatalIOError);
                 }
                 extrudeMeshFaces[nExtrudeFaces] = facei;
-                zoneFaces[nExtrudeFaces] = mesh.faces()[facei];
                 zoneID[nExtrudeFaces] = i;
                 zoneFlipMap[nExtrudeFaces] = false;
                 nExtrudeFaces++;
@@ -1680,14 +1213,13 @@ int main(int argc, char *argv[])
             }
         }
 
-
-        // Shadow zone
-        // ~~~~~~~~~~~
-
-        PtrList<faceSet> shadowZones(zoneShadowNames.size());
+        // Shadow sets
         if (zoneShadowNames.size())
         {
-            zoneShadowIDs.setSize(zoneShadowNames.size(), -1);
+            shadowMeshZoneID.setSize(zoneShadowNames.size(), -1);
+
+            // Load faceSets
+            PtrList<faceSet> shadowZones(zoneShadowNames.size());
             forAll(zoneShadowNames, i)
             {
                 shadowZones.set(i, new faceSet(mesh, zoneShadowNames[i]));
@@ -1735,17 +1267,21 @@ int main(int argc, char *argv[])
             }
         }
     }
-    const primitiveFacePatch extrudePatch(move(zoneFaces), mesh.points());
 
 
-    Pstream::listCombineGather(isInternal, orEqOp<bool>());
-    Pstream::listCombineScatter(isInternal);
+    const primitiveFacePatch extrudePatch
+    (
+        faceList(UIndirectList<face>(mesh.faces(), extrudeMeshFaces)),
+        mesh.points()
+    );
+
 
     // Check zone either all internal or all external faces
+    Pstream::listCombineGather(isInternal, orEqOp<bool>());
+    Pstream::listCombineScatter(isInternal);
     checkZoneInside(mesh, zoneNames, zoneID, extrudeMeshFaces, isInternal);
 
 
-
     const pointField& extrudePoints = extrudePatch.localPoints();
     const faceList& extrudeFaces = extrudePatch.localFaces();
     const labelListList& edgeFaces = extrudePatch.edgeFaces();
@@ -1755,8 +1291,7 @@ int main(int argc, char *argv[])
         << " faces:" << extrudePatch.size()
         << " points:" << extrudePatch.nPoints()
         << " edges:" << extrudePatch.nEdges()
-        << nl
-        << endl;
+        << nl << endl;
 
 
     // Determine per-extrude-edge info
@@ -1793,40 +1328,34 @@ int main(int argc, char *argv[])
         compactMap
     );
 
-
-    // Determine min and max zone per edge
-    labelList edgeMinZoneID;
-    labelList edgeMaxZoneID;
-    calcEdgeMinMaxZone
+    // Determine zone for each extruded edge
+    labelList edgeZoneID
     (
-        mesh,
-        extrudePatch,
-        extrudeMeshEdges,
-        zoneID,
-        extrudeEdgeFacesMap,
-        extrudeEdgeGlobalFaces,
-
-        edgeMinZoneID,
-        edgeMaxZoneID
+        calcEdgeZone
+        (
+            mesh,
+            extrudePatch,
+            extrudeMeshEdges,
+            zoneID,
+            extrudeEdgeFacesMap,
+            extrudeEdgeGlobalFaces
+        )
     );
 
 
-
-
-    DynamicList<polyPatch*> regionPatches(patches.size());
     // Copy all non-local patches since these are used on boundary edges of
     // the extrusion
+    DynamicList<polyPatch*> regionPatches(patches.size());
     forAll(patches, patchi)
     {
         if (!isA<processorPolyPatch>(patches[patchi]))
         {
-            label newPatchi = regionPatches.size();
             regionPatches.append
             (
                 patches[patchi].clone
                 (
                     patches,
-                    newPatchi,
+                    regionPatches.size(),
                     0,              // size
                     0               // start
                 ).ptr()
@@ -1841,67 +1370,82 @@ int main(int argc, char *argv[])
     // From zone to interface patch (region side)
     labelList interRegionTopPatch;
     labelList interRegionBottomPatch;
-
     addCouplingPatches
     (
         mesh,
-        regionName,
+        true,
         shellRegionName,
+        regionName,
         zoneNames,
         zoneShadowNames,
         isInternal,
         meshZoneID,
-
         regionPatches,
         interRegionTopPatch,
         interRegionBottomPatch
     );
 
-
     // From zone to interface patch (mesh side)
     labelList interMeshTopPatch;
     labelList interMeshBottomPatch;
-
     if (adaptMesh)
     {
-        // Add coupling patches to mesh
-
-        // Clone existing patches
+        // Clone existing non-processor patches
         DynamicList<polyPatch*> newPatches(patches.size());
         forAll(patches, patchi)
         {
-            newPatches.append(patches[patchi].clone(patches).ptr());
+            if (!isA<processorPolyPatch>(patches[patchi]))
+            {
+                newPatches.append(patches[patchi].clone(patches).ptr());
+            }
         }
 
         // Add new patches
         addCouplingPatches
         (
             mesh,
+            false,
             regionName,
             shellRegionName,
             zoneNames,
             zoneShadowNames,
             isInternal,
             meshZoneID,
-
             newPatches,
             interMeshTopPatch,
             interMeshBottomPatch
         );
 
+        // Clone existing processor patches
+        forAll(patches, patchi)
+        {
+            if (isA<processorPolyPatch>(patches[patchi]))
+            {
+                newPatches.append
+                (
+                    patches[patchi].clone
+                    (
+                        patches,
+                        newPatches.size(),
+                        patches[patchi].size(),
+                        patches[patchi].start()
+                    ).ptr()
+                );
+            }
+        }
+
         // Add to mesh
         mesh.clearOut();
         mesh.removeFvBoundary();
         mesh.addFvPatches(newPatches, true);
 
-        //!Note: from this point on mesh patches differs from regionPatches
+        // Note: from this point on mesh patches differs from regionPatches
     }
 
 
     // Patch per extruded face
     labelList extrudeTopPatchID(extrudePatch.size());
     labelList extrudeBottomPatchID(extrudePatch.size());
-
     forAll(zoneID, facei)
     {
         extrudeTopPatchID[facei] = interRegionTopPatch[zoneID[facei]];
@@ -1909,53 +1453,38 @@ int main(int argc, char *argv[])
     }
 
 
-
     // Count how many patches on special edges of extrudePatch are necessary
-    // - zoneXXX_sides
-    // - zoneXXX_zoneYYY
-    labelList zoneSidePatch(zoneNames.size(), 0);
-    // Patch to use for minZone
-    labelList zoneZonePatch_min(zoneNames.size()*zoneNames.size(), 0);
-    // Patch to use for maxZone
-    labelList zoneZonePatch_max(zoneNames.size()*zoneNames.size(), 0);
-
-    countExtrudePatches
+    labelList zoneSideNFaces
     (
-        mesh,
-        zoneNames.size(),
-
-        extrudePatch,           // patch
-        extrudeMeshFaces,       // mesh face per patch face
-        extrudeMeshEdges,       // mesh edge per patch edge
-
-        extrudeEdgeGlobalFaces, // global indexing per patch edge
-        edgeMinZoneID,          // minZone per patch edge
-        edgeMaxZoneID,          // maxZone per patch edge
-
-        zoneSidePatch,          // per zone-side num edges that extrude into it
-        zoneZonePatch_min       // per zone-zone num edges that extrude into it
+        countExtrudePatches
+        (
+            mesh,
+            zoneNames.size(),
+            extrudePatch,           // patch
+            extrudeMeshFaces,       // mesh face per patch face
+            extrudeMeshEdges,       // mesh edge per patch edge
+            extrudeEdgeGlobalFaces, // global indexing per patch edge
+            edgeZoneID              // zone per patch edge
+        )
     );
 
-    // Now we'll have:
-    //  zoneSidePatch[zoneA] : number of faces needed on the side of zoneA
-    //  zoneZonePatch_min[zoneA,zoneB] : number of faces needed in between A,B
-
 
     // Add the zone-side patches.
+    labelList zoneSidePatch(zoneNames.size(), -labelMax);
     addZoneSidePatches
     (
         mesh,
         zoneNames,
+        zoneSideNFaces,
         (oneD ? oneDPatchType : word::null),
-
         regionPatches,
         zoneSidePatch
     );
 
 
-    // Sets sidePatchID[edgeI] to interprocessor patch. Adds any
+    // Sets edgeSidePatchID[edgeI] to interprocessor patch. Adds any
     // interprocessor or cyclic patches if necessary.
-    labelList sidePatchID;
+    labelList edgeSidePatchID;
     addCoupledPatches
     (
         mesh,
@@ -1964,42 +1493,11 @@ int main(int argc, char *argv[])
         extrudeMeshEdges,
         extrudeEdgeFacesMap,
         extrudeEdgeGlobalFaces,
-
-        sidePatchID,
+        edgeSidePatchID,
         regionPatches
     );
 
 
-//    // Add all the newPatches to the mesh and fields
-//    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//    {
-//        forAll(newPatches, patchi)
-//        {
-//            Pout<< "Adding patch " << patchi
-//                << " name:" << newPatches[patchi]->name()
-//                << endl;
-//        }
-//        // label nOldPatches = mesh.boundary().size();
-//        mesh.clearOut();
-//        mesh.removeFvBoundary();
-//        mesh.addFvPatches(newPatches, true);
-//        //// Add calculated fvPatchFields for the added patches
-//        // for
-//        //(
-//        //    label patchi = nOldPatches;
-//        //    patchi < mesh.boundary().size();
-//        //    patchi++
-//        //)
-//        //{
-//        //    Pout<< "ADDing calculated to patch " << patchi
-//        //        << endl;
-//        //    addCalculatedPatchFields(mesh);
-//        //}
-//        // Pout<< "** Added " << mesh.boundary().size()-nOldPatches
-//        //    << " patches." << endl;
-//    }
-
-
     // Set patches to use for edges to be extruded into boundary faces
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // In order of edgeFaces: per edge, per originating face the
@@ -2008,13 +1506,12 @@ int main(int argc, char *argv[])
     labelListList extrudeEdgePatches(extrudePatch.nEdges());
 
     // Is edge a non-manifold edge
-    PackedBoolList nonManifoldEdge(extrudePatch.nEdges());
+    PackedBoolList nonManifoldEdge(extrudePatch.nEdges(), false);
 
     // Note: logic has to be same as in countExtrudePatches.
     forAll(edgeFaces, edgeI)
     {
         const labelList& eFaces = edgeFaces[edgeI];
-
         labelList& ePatches = extrudeEdgePatches[edgeI];
 
         if (oneD)
@@ -2027,58 +1524,33 @@ int main(int argc, char *argv[])
 
             if (oneDNonManifoldEdges)
             {
-                //- Set nonManifoldEdge[edgeI] for non-manifold edges only
-                //  The other option is to have non-manifold edges everywhere
-                //  and generate space overlapping columns of cells.
                 if (eFaces.size() != 2)
                 {
-                    nonManifoldEdge[edgeI] = 1;
+                    nonManifoldEdge[edgeI] = true;
                 }
             }
             else
             {
-                nonManifoldEdge[edgeI] = 1;
+                nonManifoldEdge[edgeI] = true;
             }
         }
         else if (eFaces.size() == 2)
         {
-            label zone0 = zoneID[eFaces[0]];
-            label zone1 = zoneID[eFaces[1]];
-
-            if (zone0 != zone1) // || (cos(angle) > blabla))
-            {
-                label minZone = min(zone0,zone1);
-                label maxZone = max(zone0,zone1);
-                label index = minZone*zoneNames.size()+maxZone;
-
-                ePatches.setSize(eFaces.size());
-
-                if (zone0 == minZone)
-                {
-                    ePatches[0] = zoneZonePatch_min[index];
-                    ePatches[1] = zoneZonePatch_max[index];
-                }
-                else
-                {
-                    ePatches[0] = zoneZonePatch_max[index];
-                    ePatches[1] = zoneZonePatch_min[index];
-                }
-
-                nonManifoldEdge[edgeI] = 1;
-            }
+            // Internal edge
         }
-        else if (sidePatchID[edgeI] != -1)
+        else if (edgeSidePatchID[edgeI] != -1)
         {
-            // Coupled extrusion
+            // Coupled edge
             ePatches.setSize(eFaces.size());
             forAll(eFaces, i)
             {
-                ePatches[i] = sidePatchID[edgeI];
+                ePatches[i] = edgeSidePatchID[edgeI];
             }
         }
         else
         {
-            label facei = findUncoveredPatchFace
+            // Perimeter edge
+            const label facei = findUncoveredPatchFace
             (
                 mesh,
                 UIndirectList<label>(extrudeMeshFaces, eFaces),
@@ -2102,7 +1574,7 @@ int main(int argc, char *argv[])
                     ePatches[i] = zoneSidePatch[zoneID[eFaces[i]]];
                 }
             }
-            nonManifoldEdge[edgeI] = 1;
+            nonManifoldEdge[edgeI] = true;
         }
     }
 
@@ -2122,7 +1594,6 @@ int main(int argc, char *argv[])
         extrudePatch,
         nonManifoldEdge,
         false,              // keep cyclic separated regions apart
-
         pointGlobalRegions,
         pointLocalRegions,
         localToGlobalRegion
@@ -2307,7 +1778,8 @@ int main(int argc, char *argv[])
         );
     }
 
-    // Necessary?
+
+    // Set region mesh instance. Necessary?
     regionMesh.setInstance(meshInstance);
 
 
@@ -2315,210 +1787,13 @@ int main(int argc, char *argv[])
     extruder.topoChange(shellMap);
 
 
-    // Calculate offsets from shell mesh back to original mesh
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    List<pointField> topOffsets(zoneNames.size());
-    List<pointField> bottomOffsets(zoneNames.size());
-
-    forAll(regionMesh.boundaryMesh(), patchi)
-    {
-        const polyPatch& pp = regionMesh.boundaryMesh()[patchi];
-
-        if (isA<mappedWallPolyPatch>(pp))
-        {
-            if (findIndex(interRegionTopPatch, patchi) != -1)
-            {
-                label zoneI = findIndex(interRegionTopPatch, patchi);
-                topOffsets[zoneI] = calcOffset(extrudePatch, extruder, pp);
-            }
-            else if (findIndex(interRegionBottomPatch, patchi) != -1)
-            {
-                label zoneI = findIndex(interRegionBottomPatch, patchi);
-                bottomOffsets[zoneI] = calcOffset(extrudePatch, extruder, pp);
-            }
-        }
-    }
-
-
-    // Change top and bottom boundary conditions on regionMesh
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    {
-        // Correct top patches for offset
-        setCouplingInfo
-        (
-            regionMesh,
-            interRegionTopPatch,
-            regionName,                 // name of main mesh
-            sampleMode,                 // sampleMode
-            topOffsets
-        );
-
-        // Correct bottom patches for offset
-        setCouplingInfo
-        (
-            regionMesh,
-            interRegionBottomPatch,
-            regionName,
-            sampleMode,                 // sampleMode
-            bottomOffsets
-        );
-
-        // Remove any unused patches
-        deleteEmptyPatches(regionMesh);
-    }
-
-    // Change top and bottom boundary conditions on main mesh
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    if (adaptMesh)
-    {
-        // Correct top patches for offset
-        setCouplingInfo
-        (
-            mesh,
-            interMeshTopPatch,
-            shellRegionName,                        // name of shell mesh
-            sampleMode,                             // sampleMode
-            -topOffsets
-        );
-
-        // Correct bottom patches for offset
-        setCouplingInfo
-        (
-            mesh,
-            interMeshBottomPatch,
-            shellRegionName,
-            sampleMode,
-            -bottomOffsets
-        );
-    }
-
-
-
-    // Write addressing from region mesh back to originating patch
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelIOList cellToPatchFaceAddressing
-    (
-        IOobject
-        (
-            "cellToPatchFaceAddressing",
-            regionMesh.facesInstance(),
-            regionMesh.meshSubDir,
-            regionMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        extruder.cellToFaceMap()
-    );
-    cellToPatchFaceAddressing.note() = "cell to patch face addressing";
-
-    labelIOList faceToPatchFaceAddressing
-    (
-        IOobject
-        (
-            "faceToPatchFaceAddressing",
-            regionMesh.facesInstance(),
-            regionMesh.meshSubDir,
-            regionMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        extruder.faceToFaceMap()
-    );
-    faceToPatchFaceAddressing.note() =
-        "front/back face + turning index to patch face addressing";
-
-    labelIOList faceToPatchEdgeAddressing
-    (
-        IOobject
-        (
-            "faceToPatchEdgeAddressing",
-            regionMesh.facesInstance(),
-            regionMesh.meshSubDir,
-            regionMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        extruder.faceToEdgeMap()
-    );
-    faceToPatchEdgeAddressing.note() =
-        "side face to patch edge addressing";
-
-    labelIOList pointToPatchPointAddressing
-    (
-        IOobject
-        (
-            "pointToPatchPointAddressing",
-            regionMesh.facesInstance(),
-            regionMesh.meshSubDir,
-            regionMesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        extruder.pointToPointMap()
-    );
-    pointToPatchPointAddressing.note() =
-        "point to patch point addressing";
-
-
-    Info<< "Writing mesh " << regionMesh.name()
-        << " to " << regionMesh.facesInstance() << nl
-        << endl;
-
-    bool ok =
-        regionMesh.write()
-     && cellToPatchFaceAddressing.write()
-     && faceToPatchFaceAddressing.write()
-     && faceToPatchEdgeAddressing.write()
-     && pointToPatchPointAddressing.write();
-
-    if (!ok)
-    {
-        FatalErrorInFunction
-            << "Failed writing mesh " << regionMesh.name()
-            << " at location " << regionMesh.facesInstance()
-            << exit(FatalError);
-    }
-
-
-    // See if we need to extrude coordinates as well
-    {
-        autoPtr<pointIOField> patchFaceCentresPtr;
-
-        typeIOobject<pointIOField> io
-        (
-            "patchFaceCentres",
-            mesh.pointsInstance(),
-            mesh.meshSubDir,
-            mesh,
-            IOobject::MUST_READ
-        );
-
-        if (io.headerOk())
-        {
-            // Read patchFaceCentres and patchEdgeCentres
-            Info<< "Reading patch face,edge centres : "
-                << io.name() << " and patchEdgeCentres" << endl;
-
-            extrudeGeometricProperties
-            (
-                mesh,
-                extrudePatch,
-                extruder,
-                regionMesh,
-                model()
-            );
-        }
-    }
+    // Remove any unused patches
+    deleteEmptyPatches(regionMesh);
 
 
+    Info<< "Writing mesh " << regionMesh.name() << " to "
+        << regionMesh.facesInstance() << nl << endl;
+    regionMesh.write();
 
 
     // Insert baffles into original mesh
@@ -2661,11 +1936,6 @@ int main(int argc, char *argv[])
         // Update fields
         mesh.topoChange(addBafflesMap);
 
-
-//XXXXXX
-// Update maps! e.g. faceToPatchFaceAddressing
-//XXXXXX
-
         // Move mesh (since morphing might not do this)
         if (addBafflesMap().hasMotionPoints())
         {
@@ -2677,17 +1947,9 @@ int main(int argc, char *argv[])
         // Remove any unused patches
         deleteEmptyPatches(mesh);
 
-        Info<< "Writing mesh " << mesh.name()
-            << " to " << mesh.facesInstance() << nl
-            << endl;
-
-        if (!mesh.write())
-        {
-            FatalErrorInFunction
-                << "Failed writing mesh " << mesh.name()
-                << " at location " << mesh.facesInstance()
-                << exit(FatalError);
-        }
+        Info<< "Writing mesh " << mesh.name() << " to "
+            << mesh.facesInstance() << nl << endl;
+        mesh.write();
     }
 
     Info << "End\n" << endl;
diff --git a/etc/caseDicts/annotated/extrudeToRegionMeshDict b/etc/caseDicts/annotated/extrudeToRegionMeshDict
index 5afc66e6c5..fcf71e85b2 100644
--- a/etc/caseDicts/annotated/extrudeToRegionMeshDict
+++ b/etc/caseDicts/annotated/extrudeToRegionMeshDict
@@ -13,66 +13,36 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Name of region to create
+// Name of the region to create
 region          liquidFilm;
 
 // Specification of faces to extrude. Either faceZones (either exclusively
-// internal faces or boundary faces) or faceSets (boundary faces only).
+// internal faces or boundary faces) or faceSets (boundary faces only). These
+// faces will be connected to the bottom patch of the extruded region. If
+// shadow faces are also specified then these will be connected to the top
+// patch of the extruded region.
 
-// FaceZones to extrude
+// The faceZones to extrude
 faceZones       (f0 f1);
-//faceZonesShadow (f0Shadow f1Shadow);
+// faceZonesShadow (f0Shadow f1Shadow);
 
-// faceSets to extrude
-//faceSets       (f0 f1);
-//faceSetsShadow (f0Shadow f1Shadow);
+// The faceSets to extrude
+// faceSets        (f0 f1);
+// faceSetsShadow  (f0Shadow f1Shadow);
 
-// Adapt the original mesh to have mapped patches at where the
-// faceZones are?
-// If true:
-// - extruding internal faces: become baffles on mapped patches
-// - extruding boundary faces: repatched to be on mapped patches
-// If false: leave original mesh intact. Extruded mesh will still have
-// mapped patch which might need to be adapted.
+// Adapt the original mesh to have mapped patches that connect to the extruded
+// region? If so, then extruded internal faces become baffles with mapped
+// patches, and extruded boundary faces are repatched onto mapped patches.
+// Otherwise the original mesh is not modified. The extruded mesh will still
+// have mapped patches created which will need to be changed.
 adaptMesh       true;
 
-// Sample mode for inter-region communication
-sampleMode      nearestPatchFace;
-
-
-// 1 D extrusion
-// ~~~~~~~~~~~~~
-
-    // Extrude 1D-columns of cells? This by default duplicates points so can
-    // have overlapping columns (i.e. non space filling)
-    oneD            false;
-
-    //- If oneD: specify which boundary is wanted between the layers
-    // oneDPolyPatchType empty; // wedge
-
-    //- If oneD: specify whether to duplicate points (i.e. disconnect 1D
-    //  columns) or only on non-manifold extrusion areas. Default is false.
-    //  nonManifold true;
-
-
-//- Extrusion model to use. The only logical choice is linearNormal?
-
-//- Linear extrusion in normal direction
+//- Extrusion settings
 extrudeModel    linearNormal;
-
-//- Linear extrusion in specified direction
 // extrudeModel   linearDirection;
-
-//- Wedge extrusion. If nLayers is 1 assumes symmetry around plane.
 // extrudeModel   wedge;
-
-//- Extrudes into sphere around (0 0 0)
 // extrudeModel   linearRadial;
-
-//- Extrudes into sphere around (0 0 0) with specified radii
-//extrudeModel        radial;
-
-//- Extrudes into sphere with grading according to pressure (atmospherics)
+// extrudeModel   radial;
 // extrudeModel   sigmaRadial;
 
 nLayers         10;
@@ -84,6 +54,12 @@ linearNormalCoeffs
     thickness       0.05;
 }
 
+linearDirectionCoeffs
+{
+    direction       (0 1 0);
+    thickness       0.05;
+}
+
 wedgeCoeffs
 {
     axisPt      (0 0.1 -0.05);
@@ -91,15 +67,9 @@ wedgeCoeffs
     angle       360;  // For nLayers=1 assume symmetry so angle/2 on each side
 }
 
-linearDirectionCoeffs
-{
-    direction       (0 1 0);
-    thickness       0.05;
-}
-
 linearRadialCoeffs
 {
-     R              0.1;
+    R              0.1;
     // Optional inner radius
     Rsurface        0.01;
 }
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index dbb7806120..617a989dbc 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -39,6 +39,7 @@ derivedFvPatches = $(fvPatches)/derived
 $(derivedFvPatches)/wall/wallFvPatch.C
 $(derivedFvPatches)/mapped/mappedFvPatch.C
 $(derivedFvPatches)/mapped/mappedWallFvPatch.C
+$(derivedFvPatches)/mapped/mappedExtrudedWallFvPatch.C
 
 
 meshWave = algorithms/FvFaceCellWave
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedExtrudedWallFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedExtrudedWallFvPatch.C
new file mode 100644
index 0000000000..9093390c03
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedExtrudedWallFvPatch.C
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "mappedExtrudedWallFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(mappedExtrudedWallFvPatch, 0);
+    addToRunTimeSelectionTable(fvPatch, mappedExtrudedWallFvPatch, polyPatch);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedExtrudedWallFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedExtrudedWallFvPatch.H
new file mode 100644
index 0000000000..4e1b3eff94
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedExtrudedWallFvPatch.H
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::mappedExtrudedWallFvPatch
+
+SourceFiles
+    mappedExtrudedWallFvPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef mappedExtrudedWallFvPatch_H
+#define mappedExtrudedWallFvPatch_H
+
+#include "wallFvPatch.H"
+#include "mappedExtrudedWallPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class mappedExtrudedWallFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class mappedExtrudedWallFvPatch
+:
+    public wallFvPatch
+{
+
+public:
+
+    //- Runtime type information
+    TypeName(mappedExtrudedWallPolyPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from components
+        mappedExtrudedWallFvPatch
+        (
+            const polyPatch& patch,
+            const fvBoundaryMesh& bm
+        )
+        :
+            wallFvPatch(patch, bm)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 21b4df99cb..f0338596e3 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -250,9 +250,11 @@ patchToPatch/rays/raysPatchToPatch.C
 mappedPatches/mappedPolyPatch/mappedPatchBase.C
 mappedPatches/mappedPolyPatch/mappedPolyPatch.C
 mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
+mappedPatches/mappedPolyPatch/mappedExtrudedWallPolyPatch.C
 
 mappedPatches/mappedPointPatch/mappedPointPatch.C
 mappedPatches/mappedPointPatch/mappedWallPointPatch.C
+mappedPatches/mappedPointPatch/mappedExtrudedWallPointPatch.C
 
 meshStructure/meshStructure.C
 meshStructure/topoDistanceData.C
diff --git a/src/regionModels/thermalBaffle/thermalBaffle/DeltaInfoData.H b/src/meshTools/layerInfo/LayerInfoData.H
similarity index 64%
rename from src/regionModels/thermalBaffle/thermalBaffle/DeltaInfoData.H
rename to src/meshTools/layerInfo/LayerInfoData.H
index 4b783b7a6b..0d63171d96 100644
--- a/src/regionModels/thermalBaffle/thermalBaffle/DeltaInfoData.H
+++ b/src/meshTools/layerInfo/LayerInfoData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,22 +22,21 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DeltaInfoData
+    Foam::LayerInfoData
 
 Description
-    Class to be used with FaceCellWave which calculates the delta (thickness)
-    across a layered mesh
+    Class to be used with FaceCellWave which enumerates layers of cells and
+    transports data through those layers
 
 SourceFiles
-    DeltaInfoDataI.H
+    LayerInfoDataI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DeltaInfoData_H
-#define DeltaInfoData_H
+#ifndef LayerInfoData_H
+#define LayerInfoData_H
 
-#include "pointField.H"
-#include "face.H"
+#include "layerInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,29 +50,23 @@ class transformer;
 
 // Forward declaration of friend functions and operators
 template<class Type>
-class DeltaInfoData;
+class LayerInfoData;
 template<class Type>
-Ostream& operator<<(Ostream&, const DeltaInfoData<Type>&);
+Ostream& operator<<(Ostream&, const LayerInfoData<Type>&);
 template<class Type>
-Istream& operator>>(Istream&, DeltaInfoData<Type>&);
+Istream& operator>>(Istream&, LayerInfoData<Type>&);
 
 /*---------------------------------------------------------------------------*\
-                          Class DeltaInfoData Declaration
+                        Class LayerInfoData Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-class DeltaInfoData
+class LayerInfoData
+:
+    public layerInfo
 {
     // Private Data
 
-        //- Direction of propagation (+1 or -1) relative to the face normal.
-        //  Only valid when on a face. Takes a value of 0 when in a cell.
-        label direction_;
-
-        //- The previous face index. Only valid when in a cell. Takes a value
-        //  of -1 if on a face.
-        label prevFace_;
-
         //- Data
         Type data_;
 
@@ -83,10 +76,15 @@ public:
     // Constructors
 
         //- Construct null
-        inline DeltaInfoData();
+        inline LayerInfoData();
 
-        //- Construct for a face given a direction and data
-        inline DeltaInfoData(const label direction, const Type& data);
+        //- Construct given the face layer index and direction
+        inline LayerInfoData
+        (
+            const label faceLayer,
+            const label direction,
+            const Type& data
+        );
 
 
     // Member Functions
@@ -99,22 +97,6 @@ public:
 
         // Needed by FaceCellWave
 
-            //- Check whether the DeltaInfoData has been changed at all or still
-            //  contains original (invalid) value.
-            template<class TrackingData>
-            inline bool valid(TrackingData& td) const;
-
-            //- Check for identical geometrical data. Used for checking
-            //  consistency across cyclics.
-            template<class TrackingData>
-            inline bool sameGeometry
-            (
-                const polyMesh&,
-                const DeltaInfoData<Type>&,
-                const scalar,
-                TrackingData& td
-            ) const;
-
             //- Transform across an interface
             template<class TrackingData>
             inline void transform
@@ -131,8 +113,8 @@ public:
             (
                 const polyMesh&,
                 const label thisCelli,
-                const label neighbourFacei,
-                const DeltaInfoData<Type>& neighbourInfo,
+                const label nbrFacei,
+                const LayerInfoData<Type>& nbrInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -143,8 +125,8 @@ public:
             (
                 const polyMesh&,
                 const label thisFacei,
-                const label neighbourCelli,
-                const DeltaInfoData<Type>& neighbourInfo,
+                const label nbrCelli,
+                const LayerInfoData<Type>& nbrInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -155,7 +137,7 @@ public:
             (
                 const polyMesh&,
                 const label thisFacei,
-                const DeltaInfoData<Type>& neighbourInfo,
+                const LayerInfoData<Type>& nbrInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -164,15 +146,15 @@ public:
             template<class TrackingData>
             inline bool equal
             (
-                const DeltaInfoData<Type>&,
+                const LayerInfoData<Type>&,
                 TrackingData& td
             ) const;
 
 
     // Member Operators
 
-        inline bool operator==(const DeltaInfoData<Type>&) const;
-        inline bool operator!=(const DeltaInfoData<Type>&) const;
+        inline bool operator==(const LayerInfoData<Type>&) const;
+        inline bool operator!=(const LayerInfoData<Type>&) const;
 
 
     // IOstream Operators
@@ -180,12 +162,12 @@ public:
         friend Ostream& operator<< <Type>
         (
             Ostream&,
-            const DeltaInfoData<Type>&
+            const LayerInfoData<Type>&
         );
         friend Istream& operator>> <Type>
         (
             Istream&,
-            DeltaInfoData<Type>&
+            LayerInfoData<Type>&
         );
 };
 
@@ -195,7 +177,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "DeltaInfoDataI.H"
+#include "LayerInfoDataI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionModels/thermalBaffle/thermalBaffle/DeltaInfoDataI.H b/src/meshTools/layerInfo/LayerInfoDataI.H
similarity index 52%
rename from src/regionModels/thermalBaffle/thermalBaffle/DeltaInfoDataI.H
rename to src/meshTools/layerInfo/LayerInfoDataI.H
index 9af7fd9aeb..247d0b8f2a 100644
--- a/src/regionModels/thermalBaffle/thermalBaffle/DeltaInfoDataI.H
+++ b/src/meshTools/layerInfo/LayerInfoDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,29 +23,28 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DeltaInfoData.H"
+#include "LayerInfoData.H"
 #include "polyMesh.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-inline Foam::DeltaInfoData<Type>::DeltaInfoData()
+inline Foam::LayerInfoData<Type>::LayerInfoData()
 :
-    direction_(0),
-    prevFace_(-labelMax),
+    layerInfo(),
     data_()
 {}
 
 
 template<class Type>
-inline Foam::DeltaInfoData<Type>::DeltaInfoData
+inline Foam::LayerInfoData<Type>::LayerInfoData
 (
+    const label faceLayer,
     const label direction,
     const Type& data
 )
 :
-    direction_(direction),
-    prevFace_(-labelMax),
+    layerInfo(faceLayer, direction),
     data_(data)
 {}
 
@@ -53,7 +52,7 @@ inline Foam::DeltaInfoData<Type>::DeltaInfoData
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-inline const Type& Foam::DeltaInfoData<Type>::data() const
+inline const Type& Foam::LayerInfoData<Type>::data() const
 {
     return data_;
 }
@@ -61,58 +60,33 @@ inline const Type& Foam::DeltaInfoData<Type>::data() const
 
 template<class Type>
 template<class TrackingData>
-inline bool Foam::DeltaInfoData<Type>::valid(TrackingData& td) const
-{
-    return direction_ != 0 || prevFace_ != -labelMax;
-}
-
-
-template<class Type>
-template<class TrackingData>
-inline bool Foam::DeltaInfoData<Type>::sameGeometry
-(
-    const polyMesh&,
-    const DeltaInfoData<Type>& l,
-    const scalar tol,
-    TrackingData& td
-) const
-{
-    return true;
-}
-
-
-template<class Type>
-template<class TrackingData>
-inline void Foam::DeltaInfoData<Type>::transform
+inline void Foam::LayerInfoData<Type>::transform
 (
     const polyPatch& patch,
     const label patchFacei,
     const transformer& transform,
     TrackingData& td
 )
-{}
+{
+    data_ = transform.transform(data_);
+}
 
 
 template<class Type>
 template<class TrackingData>
-inline bool Foam::DeltaInfoData<Type>::updateCell
+inline bool Foam::LayerInfoData<Type>::updateCell
 (
     const polyMesh& mesh,
     const label thisCelli,
-    const label neighbourFacei,
-    const DeltaInfoData<Type>& neighbourDeltaInfo,
+    const label nbrFacei,
+    const LayerInfoData<Type>& nbrInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const bool o = thisCelli == mesh.faceOwner()[neighbourFacei];
-
-    if (o == (neighbourDeltaInfo.direction_ < 0))
+    if (layerInfo::updateCell(mesh, thisCelli, nbrFacei, nbrInfo, tol, td))
     {
-        direction_ = 0;
-        prevFace_ = neighbourFacei;
-        data_ = neighbourDeltaInfo.data_;
-
+        data_ = nbrInfo.data_;
         return true;
     }
     else
@@ -124,29 +98,19 @@ inline bool Foam::DeltaInfoData<Type>::updateCell
 
 template<class Type>
 template<class TrackingData>
-inline bool Foam::DeltaInfoData<Type>::updateFace
+inline bool Foam::LayerInfoData<Type>::updateFace
 (
     const polyMesh& mesh,
     const label thisFacei,
-    const label neighbourCelli,
-    const DeltaInfoData<Type>& neighbourDeltaInfo,
+    const label nbrCelli,
+    const LayerInfoData<Type>& nbrInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const cell& c = mesh.cells()[neighbourCelli];
-    const label prevFacei = neighbourDeltaInfo.prevFace_;
-    const label nextFacei = c.opposingFaceLabel(prevFacei, mesh.faces());
-
-    if (nextFacei == thisFacei)
+    if (layerInfo::updateFace(mesh, thisFacei, nbrCelli, nbrInfo, tol, td))
     {
-        const label direction =
-            mesh.faceOwner()[thisFacei] == neighbourCelli ? +1 : -1;
-
-        direction_ = direction;
-        prevFace_ = -labelMax;
-        data_ = neighbourDeltaInfo.data_;
-
+        data_ = nbrInfo.data_;
         return true;
     }
     else
@@ -158,30 +122,32 @@ inline bool Foam::DeltaInfoData<Type>::updateFace
 
 template<class Type>
 template<class TrackingData>
-inline bool Foam::DeltaInfoData<Type>::updateFace
+inline bool Foam::LayerInfoData<Type>::updateFace
 (
     const polyMesh& mesh,
     const label thisFacei,
-    const DeltaInfoData<Type>& neighbourDeltaInfo,
+    const LayerInfoData<Type>& nbrInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const label direction = -neighbourDeltaInfo.direction_;
-
-    direction_ = direction;
-    prevFace_ = -labelMax;
-    data_ = neighbourDeltaInfo.data_;
-
-    return true;
+    if (layerInfo::updateFace(mesh, thisFacei, nbrInfo, tol, td))
+    {
+        data_ = nbrInfo.data_;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 
 template<class Type>
 template<class TrackingData>
-inline bool Foam::DeltaInfoData<Type>::equal
+inline bool Foam::LayerInfoData<Type>::equal
 (
-    const DeltaInfoData<Type>& rhs,
+    const LayerInfoData<Type>& rhs,
     TrackingData& td
 ) const
 {
@@ -192,19 +158,19 @@ inline bool Foam::DeltaInfoData<Type>::equal
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Type>
-inline bool Foam::DeltaInfoData<Type>::operator==
+inline bool Foam::LayerInfoData<Type>::operator==
 (
-    const Foam::DeltaInfoData<Type>& rhs
+    const Foam::LayerInfoData<Type>& rhs
 ) const
 {
-    return direction_ == rhs.direction_ && prevFace_ == rhs.prevFace_;
+    return layerInfo::operator==(rhs) && data_ == rhs.data_;
 }
 
 
 template<class Type>
-inline bool Foam::DeltaInfoData<Type>::operator!=
+inline bool Foam::LayerInfoData<Type>::operator!=
 (
-    const Foam::DeltaInfoData<Type>& rhs
+    const Foam::LayerInfoData<Type>& rhs
 ) const
 {
     return !(*this == rhs);
@@ -214,19 +180,16 @@ inline bool Foam::DeltaInfoData<Type>::operator!=
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Ostream& Foam::operator<<(Ostream& os, const DeltaInfoData<Type>& l)
+Foam::Ostream& Foam::operator<<(Ostream& os, const LayerInfoData<Type>& l)
 {
-    return os
-        << l.direction_ << token::SPACE
-        << l.prevFace_ << token::SPACE
-        << l.data_;
+    return os << static_cast<const layerInfo&>(l) << token::SPACE << l.data_;
 }
 
 
 template<class Type>
-Foam::Istream& Foam::operator>>(Istream& is, DeltaInfoData<Type>& l)
+Foam::Istream& Foam::operator>>(Istream& is, LayerInfoData<Type>& l)
 {
-    return is >> l.direction_ >> l.prevFace_ >> l.data_;
+    return is >> static_cast<layerInfo&>(l) >> l.data_;
 }
 
 
diff --git a/src/functionObjects/field/layerAverage/layerInfo.H b/src/meshTools/layerInfo/layerInfo.H
similarity index 96%
rename from src/functionObjects/field/layerAverage/layerInfo.H
rename to src/meshTools/layerInfo/layerInfo.H
index aa62b0aea5..ff16c698ef 100644
--- a/src/functionObjects/field/layerAverage/layerInfo.H
+++ b/src/meshTools/layerInfo/layerInfo.H
@@ -135,8 +135,8 @@ public:
             (
                 const polyMesh&,
                 const label thisCelli,
-                const label neighbourFacei,
-                const layerInfo& neighbourInfo,
+                const label nbrFacei,
+                const layerInfo& nbrInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -147,8 +147,8 @@ public:
             (
                 const polyMesh&,
                 const label thisFacei,
-                const label neighbourCelli,
-                const layerInfo& neighbourInfo,
+                const label nbrCelli,
+                const layerInfo& nbrInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -159,7 +159,7 @@ public:
             (
                 const polyMesh&,
                 const label thisFacei,
-                const layerInfo& neighbourInfo,
+                const layerInfo& nbrInfo,
                 const scalar tol,
                 TrackingData& td
             );
diff --git a/src/functionObjects/field/layerAverage/layerInfoI.H b/src/meshTools/layerInfo/layerInfoI.H
similarity index 84%
rename from src/functionObjects/field/layerAverage/layerInfoI.H
rename to src/meshTools/layerInfo/layerInfoI.H
index 841a17d3b1..1e7ca071a3 100644
--- a/src/functionObjects/field/layerAverage/layerInfoI.H
+++ b/src/meshTools/layerInfo/layerInfoI.H
@@ -100,7 +100,7 @@ inline bool Foam::layerInfo::sameGeometry
     TrackingData& td
 ) const
 {
-    return layer_ == l.layer_;
+    return true;
 }
 
 
@@ -120,21 +120,21 @@ inline bool Foam::layerInfo::updateCell
 (
     const polyMesh& mesh,
     const label thisCelli,
-    const label neighbourFacei,
-    const layerInfo& neighbourLayerInfo,
+    const label nbrFacei,
+    const layerInfo& nbrInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const bool o = thisCelli == mesh.faceOwner()[neighbourFacei];
+    const bool o = thisCelli == mesh.faceOwner()[nbrFacei];
 
-    if (o == (neighbourLayerInfo.direction_ < 0))
+    if (o == (nbrInfo.direction_ < 0))
     {
-        if (valid(td) && prevFace_ != neighbourFacei) collide();
+        if (valid(td) && prevFace_ != nbrFacei) collide();
 
-        layer_ = valid(td) ? -labelMax : neighbourLayerInfo.layer_ + 1;
+        layer_ = valid(td) ? -labelMax : nbrInfo.layer_ + 1;
         direction_ = 0;
-        prevFace_ = neighbourFacei;
+        prevFace_ = nbrFacei;
 
         return true;
     }
@@ -150,24 +150,24 @@ inline bool Foam::layerInfo::updateFace
 (
     const polyMesh& mesh,
     const label thisFacei,
-    const label neighbourCelli,
-    const layerInfo& neighbourLayerInfo,
+    const label nbrCelli,
+    const layerInfo& nbrInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const cell& c = mesh.cells()[neighbourCelli];
-    const label prevFacei = neighbourLayerInfo.prevFace_;
+    const cell& c = mesh.cells()[nbrCelli];
+    const label prevFacei = nbrInfo.prevFace_;
     const label nextFacei = c.opposingFaceLabel(prevFacei, mesh.faces());
 
     if (nextFacei == thisFacei)
     {
         const label direction =
-            mesh.faceOwner()[thisFacei] == neighbourCelli ? +1 : -1;
+            mesh.faceOwner()[thisFacei] == nbrCelli ? +1 : -1;
 
         if (valid(td) && direction != direction_) collide();
 
-        layer_ = valid(td) ? -labelMax : neighbourLayerInfo.layer_ + 1;
+        layer_ = valid(td) ? -labelMax : nbrInfo.layer_ + 1;
         direction_ = direction;
         prevFace_ = -labelMax;
 
@@ -185,16 +185,16 @@ inline bool Foam::layerInfo::updateFace
 (
     const polyMesh& mesh,
     const label thisFacei,
-    const layerInfo& neighbourLayerInfo,
+    const layerInfo& nbrInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const label direction = -neighbourLayerInfo.direction_;
+    const label direction = -nbrInfo.direction_;
 
     if (valid(td) && direction != direction_) collide();
 
-    layer_ = valid(td) ? -labelMax : neighbourLayerInfo.layer_;
+    layer_ = valid(td) ? -labelMax : nbrInfo.layer_;
     direction_ = direction;
     prevFace_ = -labelMax;
 
diff --git a/src/meshTools/mappedPatches/mappedPointPatch/mappedExtrudedWallPointPatch.C b/src/meshTools/mappedPatches/mappedPointPatch/mappedExtrudedWallPointPatch.C
new file mode 100644
index 0000000000..a76c03fece
--- /dev/null
+++ b/src/meshTools/mappedPatches/mappedPointPatch/mappedExtrudedWallPointPatch.C
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "mappedExtrudedWallPointPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(mappedExtrudedWallPointPatch, 0);
+
+// Add the patch constructor functions to the hash tables
+addToRunTimeSelectionTable
+(
+    facePointPatch,
+    mappedExtrudedWallPointPatch,
+    polyPatch
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/meshTools/mappedPatches/mappedPointPatch/mappedExtrudedWallPointPatch.H b/src/meshTools/mappedPatches/mappedPointPatch/mappedExtrudedWallPointPatch.H
new file mode 100644
index 0000000000..e0b4acfede
--- /dev/null
+++ b/src/meshTools/mappedPatches/mappedPointPatch/mappedExtrudedWallPointPatch.H
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::mappedExtrudedWallPointPatch
+
+SourceFiles
+    mappedExtrudedWallPointPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef mappedExtrudedWallPointPatch_H
+#define mappedExtrudedWallPointPatch_H
+
+#include "wallPointPatch.H"
+#include "mappedExtrudedWallPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class mappedExtrudedWallPointPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class mappedExtrudedWallPointPatch
+:
+    public wallPointPatch
+{
+
+public:
+
+    //- Runtime type information
+    TypeName(mappedExtrudedWallPolyPatch::typeName_());
+
+
+    // Constructors
+
+        //- Construct from polyPatch
+        mappedExtrudedWallPointPatch
+        (
+            const polyPatch& patch,
+            const pointBoundaryMesh& bm
+        )
+        :
+            wallPointPatch(patch, bm)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedExtrudedWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedExtrudedWallPolyPatch.C
new file mode 100644
index 0000000000..fa7a59f15a
--- /dev/null
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedExtrudedWallPolyPatch.C
@@ -0,0 +1,277 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "mappedExtrudedWallPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "LayerInfoData.H"
+#include "FaceCellWave.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(mappedExtrudedWallPolyPatch, 0);
+
+    addToRunTimeSelectionTable(polyPatch, mappedExtrudedWallPolyPatch, word);
+    addToRunTimeSelectionTable
+    (
+        polyPatch,
+        mappedExtrudedWallPolyPatch,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::mappedExtrudedWallPolyPatch::initCalcGeometry(PstreamBuffers& pBufs)
+{
+    mappedWallPolyPatch::initCalcGeometry(pBufs);
+}
+
+
+void Foam::mappedExtrudedWallPolyPatch::calcGeometry(PstreamBuffers& pBufs)
+{
+    mappedWallPolyPatch::calcGeometry(pBufs);
+    samplePointsPtr_.clear();
+}
+
+
+void Foam::mappedExtrudedWallPolyPatch::initMovePoints
+(
+    PstreamBuffers& pBufs,
+    const pointField& p
+)
+{
+    mappedWallPolyPatch::initMovePoints(pBufs, p);
+}
+
+
+void Foam::mappedExtrudedWallPolyPatch::movePoints
+(
+    PstreamBuffers& pBufs,
+    const pointField& p
+)
+{
+    mappedWallPolyPatch::movePoints(pBufs, p);
+    samplePointsPtr_.clear();
+}
+
+
+void Foam::mappedExtrudedWallPolyPatch::initTopoChange(PstreamBuffers& pBufs)
+{
+    mappedWallPolyPatch::initTopoChange(pBufs);
+}
+
+
+void Foam::mappedExtrudedWallPolyPatch::topoChange(PstreamBuffers& pBufs)
+{
+    mappedWallPolyPatch::topoChange(pBufs);
+    samplePointsPtr_.clear();
+}
+
+
+// * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * * * * //
+
+Foam::mappedExtrudedWallPolyPatch::mappedExtrudedWallPolyPatch
+(
+    const word& name,
+    const label size,
+    const label start,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& patchType
+)
+:
+    mappedWallPolyPatch(name, size, start, index, bm, patchType),
+    bottomPatch_(word::null)
+{}
+
+
+Foam::mappedExtrudedWallPolyPatch::mappedExtrudedWallPolyPatch
+(
+    const word& name,
+    const dictionary& dict,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& patchType
+)
+:
+    mappedWallPolyPatch(name, dict, index, bm, patchType),
+    bottomPatch_(dict.lookupOrDefault<word>("bottomPatch", word::null))
+{}
+
+
+Foam::mappedExtrudedWallPolyPatch::mappedExtrudedWallPolyPatch
+(
+    const mappedExtrudedWallPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    mappedWallPolyPatch(pp, bm),
+    bottomPatch_(pp.bottomPatch_)
+{}
+
+
+Foam::mappedExtrudedWallPolyPatch::mappedExtrudedWallPolyPatch
+(
+    const mappedExtrudedWallPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
+)
+:
+    mappedWallPolyPatch(pp, bm, index, newSize, newStart),
+    bottomPatch_(pp.bottomPatch_)
+{}
+
+
+Foam::mappedExtrudedWallPolyPatch::mappedExtrudedWallPolyPatch
+(
+    const mappedExtrudedWallPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const labelUList& mapAddressing,
+    const label newStart
+)
+:
+    mappedWallPolyPatch(pp, bm, index, mapAddressing, newStart),
+    bottomPatch_(pp.bottomPatch_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::mappedExtrudedWallPolyPatch::~mappedExtrudedWallPolyPatch()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::pointField>
+Foam::mappedExtrudedWallPolyPatch::samplePoints() const
+{
+    if (!samplePointsPtr_.valid())
+    {
+        const bool isExtrudedRegion = bottomPatch_ != word::null;
+
+        if (isExtrudedRegion)
+        {
+            // If this is the extruded region we need to work out where the
+            // corresponding sampling points are on the bottom patch. We do
+            // this by waving the bottom patch points across the layers.
+
+            const polyMesh& mesh = boundaryMesh().mesh();
+            const polyPatch& pp = *this;
+            const polyPatch& bottomPp = boundaryMesh()[bottomPatch_];
+
+            // Get the sample points from the bottom patch
+            const pointField bottomSamplePoints
+            (
+                refCast<const mappedPatchBase>(bottomPp).samplePoints()
+            );
+
+            // Initialise faces on the bottom patch to wave from
+            labelList initialFaces(bottomPp.size());
+            List<LayerInfoData<point>> initialFaceInfo(bottomPp.size());
+            forAll(bottomPp, bottomPpFacei)
+            {
+                initialFaces[bottomPpFacei] =
+                    bottomPp.start() + bottomPpFacei;
+                initialFaceInfo[bottomPpFacei] =
+                    LayerInfoData<point>
+                    (
+                        0,
+                        -1,
+                        bottomSamplePoints[bottomPpFacei]
+                    );
+            }
+
+            // Wave across the mesh layers
+            List<LayerInfoData<point>> faceInfo(mesh.nFaces());
+            List<LayerInfoData<point>> cellInfo(mesh.nCells());
+            FaceCellWave<LayerInfoData<point>>
+            (
+                mesh,
+                initialFaces,
+                initialFaceInfo,
+                faceInfo,
+                cellInfo,
+                mesh.globalData().nTotalCells() + 1
+            );
+
+            // Unpack into this patch's sample points
+            samplePointsPtr_.set(new pointField(pp.size()));
+            forAll(pp, ppFacei)
+            {
+                const LayerInfoData<point>& info =
+                    faceInfo[pp.start() + ppFacei];
+
+                static nil td;
+
+                if (!info.valid(td))
+                {
+                    FatalErrorInFunction
+                        << "Mesh \"" << mesh.name()
+                        << "\" is not layered between the extruded wall patch "
+                        << "\"" << pp.name() << "\" and the bottom patch \""
+                        << bottomPp.name() << "\"" << exit(FatalError);
+                }
+
+                samplePointsPtr_()[ppFacei] = info.data();
+            }
+        }
+        else
+        {
+            // If this is not the extruded region then we trigger construction
+            // of mapping on the extruded region and then reverse map the
+            // extruded region's sampling locations so they are available here
+
+            const mappedExtrudedWallPolyPatch& samplePp =
+                refCast<const mappedExtrudedWallPolyPatch>(samplePolyPatch());
+
+            samplePointsPtr_.set
+            (
+                samplePp.reverseDistribute
+                (
+                    samplePp.mappedPatchBase::samplePoints()
+                ).ptr()
+            );
+        }
+    }
+
+    return samplePointsPtr_();
+}
+
+
+void Foam::mappedExtrudedWallPolyPatch::write(Ostream& os) const
+{
+    mappedWallPolyPatch::write(os);
+    writeEntryIfDifferent(os, "bottomPatch", word::null, bottomPatch_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedExtrudedWallPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedExtrudedWallPolyPatch.H
new file mode 100644
index 0000000000..ca6ca7c5bb
--- /dev/null
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedExtrudedWallPolyPatch.H
@@ -0,0 +1,226 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::mappedExtrudedWallPolyPatch
+
+Description
+    Mapped wall patch which offsets the sampling points to account for the
+    extrusion thickness
+
+SourceFiles
+    mappedExtrudedWallPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef mappedExtrudedWallPolyPatch_H
+#define mappedExtrudedWallPolyPatch_H
+
+#include "mappedWallPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                     Class mappedExtrudedWallPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class mappedExtrudedWallPolyPatch
+:
+    public mappedWallPolyPatch
+{
+private:
+
+    // Private Member Data
+
+        //- The bottom patch on the other side of the extruded region. Empty if
+        //  this is not the extruded region.
+        word bottomPatch_;
+
+        //- The sample points
+        mutable autoPtr<vectorField> samplePointsPtr_;
+
+
+protected:
+
+    // Protected Member Functions
+
+        //- Initialise the calculation of the patch geometry
+        virtual void initCalcGeometry(PstreamBuffers&);
+
+        //- Calculate the patch geometry
+        virtual void calcGeometry(PstreamBuffers&);
+
+        //- Initialise the patches for moving points
+        virtual void initMovePoints(PstreamBuffers&, const pointField&);
+
+        //- Correct patches after moving points
+        virtual void movePoints(PstreamBuffers&, const pointField&);
+
+        //- Initialise the update of the patch topology
+        virtual void initTopoChange(PstreamBuffers&);
+
+        //- Update of the patch topology
+        virtual void topoChange(PstreamBuffers&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("mappedExtrudedWall");
+
+
+    // Constructors
+
+        //- Construct from components
+        mappedExtrudedWallPolyPatch
+        (
+            const word& name,
+            const label size,
+            const label start,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& patchType
+        );
+
+        //- Construct from dictionary
+        mappedExtrudedWallPolyPatch
+        (
+            const word& name,
+            const dictionary& dict,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& patchType
+        );
+
+        //- Construct as copy, resetting the boundary mesh
+        mappedExtrudedWallPolyPatch
+        (
+            const mappedExtrudedWallPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
+        //- Construct given the original patch and resetting the
+        //  face list and boundary mesh information
+        mappedExtrudedWallPolyPatch
+        (
+            const mappedExtrudedWallPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        );
+
+        //- Construct given the original patch and a map
+        mappedExtrudedWallPolyPatch
+        (
+            const mappedExtrudedWallPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const labelUList& mapAddressing,
+            const label newStart
+        );
+
+        //- Construct and return a clone, resetting the boundary mesh
+        virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new mappedExtrudedWallPolyPatch(*this, bm)
+            );
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new mappedExtrudedWallPolyPatch
+                (
+                    *this,
+                    bm,
+                    index,
+                    newSize,
+                    newStart
+                )
+            );
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const labelUList& mapAddressing,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new mappedExtrudedWallPolyPatch
+                (
+                    *this,
+                    bm,
+                    index,
+                    mapAddressing,
+                    newStart
+                )
+            );
+        }
+
+
+    //- Destructor
+    virtual ~mappedExtrudedWallPolyPatch();
+
+
+    // Member Functions
+
+        //- Return the sampling points
+        virtual tmp<pointField> samplePoints() const;
+
+        //- Write the polyPatch data as a dictionary
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
index 507b509b26..65bcb1d46d 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
@@ -296,7 +296,7 @@ public:
             const polyPatch& samplePolyPatch() const;
 
             //- Get the sample points
-            tmp<pointField> samplePoints() const;
+            virtual tmp<pointField> samplePoints() const;
 
 
 
diff --git a/src/regionModels/thermalBaffle/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffle/thermalBaffle/thermalBaffle.C
index 53b0021ed0..e37a6eb263 100644
--- a/src/regionModels/thermalBaffle/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffle/thermalBaffle/thermalBaffle.C
@@ -31,7 +31,7 @@ License
 #include "wedgePolyPatch.H"
 #include "emptyPolyPatch.H"
 #include "FaceCellWave.H"
-#include "DeltaInfoData.H"
+#include "LayerInfoData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,7 +62,7 @@ tmp<volScalarField::Internal> thermalBaffle::calcDelta() const
 
     // Initialise faces on the first coupled patch with their centres as data
     initialFaces.clear();
-    DynamicList<DeltaInfoData<point>> initialFaceInfoPoints;
+    DynamicList<LayerInfoData<point>> initialFaceInfoPoints;
     {
         const polyPatch& pp =
             regionMesh().boundaryMesh()[intCoupledPatchIDs_[0]];
@@ -75,14 +75,14 @@ tmp<volScalarField::Internal> thermalBaffle::calcDelta() const
             const point& c = pp.faceCentres()[ppFacei];
 
             initialFaces.append(pp.start() + ppFacei);
-            initialFaceInfoPoints.append(DeltaInfoData<point>(-1, c));
+            initialFaceInfoPoints.append(LayerInfoData<point>(0, -1, c));
         }
     }
 
     // Wave across the mesh layers
-    List<DeltaInfoData<point>> faceInfoPoints(regionMesh().nFaces());
-    List<DeltaInfoData<point>> cellInfoPoints(regionMesh().nCells());
-    FaceCellWave<DeltaInfoData<point>>
+    List<LayerInfoData<point>> faceInfoPoints(regionMesh().nFaces());
+    List<LayerInfoData<point>> cellInfoPoints(regionMesh().nCells());
+    FaceCellWave<LayerInfoData<point>>
     (
         regionMesh(),
         initialFaces,
@@ -95,7 +95,7 @@ tmp<volScalarField::Internal> thermalBaffle::calcDelta() const
     // Calculate the distances between the opposite patch and load into data to
     // wave back in the opposite direction
     initialFaces.clear();
-    DynamicList<DeltaInfoData<scalar>> initialFaceInfoDeltas;
+    DynamicList<LayerInfoData<scalar>> initialFaceInfoDeltas;
     {
         const polyPatch& pp =
             regionMesh().boundaryMesh()[intCoupledPatchIDs_[1]];
@@ -112,15 +112,15 @@ tmp<volScalarField::Internal> thermalBaffle::calcDelta() const
                     mag(c - faceInfoPoints[pp.start() + ppFacei].data());
 
                 initialFaces.append(pp.start() + ppFacei);
-                initialFaceInfoDeltas.append(DeltaInfoData<scalar>(-1, d));
+                initialFaceInfoDeltas.append(LayerInfoData<scalar>(0, -1, d));
             }
         }
     }
 
     // Wave back across the layers
-    List<DeltaInfoData<scalar>> faceInfoDeltas(regionMesh().nFaces());
-    List<DeltaInfoData<scalar>> cellInfoDeltas(regionMesh().nCells());
-    FaceCellWave<DeltaInfoData<scalar>>
+    List<LayerInfoData<scalar>> faceInfoDeltas(regionMesh().nFaces());
+    List<LayerInfoData<scalar>> cellInfoDeltas(regionMesh().nCells());
+    FaceCellWave<LayerInfoData<scalar>>
     (
         regionMesh(),
         initialFaces,
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/H2O b/tutorials/modules/multicomponentFluid/cylinder/0/H2O
index 6193adfdf4..0b80049bb9 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/H2O
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/H2O
@@ -14,18 +14,27 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   uniform 0.0;
+internalField   uniform 0;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     "(sides|frontAndBack)"
     {
         type            zeroGradient;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    "region0_to_wallFilm_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/N2 b/tutorials/modules/multicomponentFluid/cylinder/0/N2
index dc10fbd04a..75b6e72f82 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/N2
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/N2
@@ -14,18 +14,27 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.77;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     "(sides|frontAndBack)"
     {
         type            zeroGradient;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    "region0_to_wallFilm_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/O2 b/tutorials/modules/multicomponentFluid/cylinder/0/O2
index f4091a216c..95dbea25fa 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/O2
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/O2
@@ -12,7 +12,6 @@ FoamFile
     location    "0";
     object      O2;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 0 0 0 0 0];
@@ -21,11 +20,21 @@ internalField   uniform 0.23;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     "(sides|frontAndBack)"
     {
         type            zeroGradient;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    "region0_to_wallFilm_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/T b/tutorials/modules/multicomponentFluid/cylinder/0/T
index e366b6ccc3..ba05fa5a53 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/T
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/T
@@ -8,8 +8,8 @@
 FoamFile
 {
     format      ascii;
-    location    "0";
     class       volScalarField;
+    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,15 +20,25 @@ internalField   uniform 300;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     "(sides|frontAndBack)"
     {
         type            fixedValue;
-        value           uniform 300;
+        value           $internalField;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    "region0_to_wallFilm_.*"
     {
         type            fixedValue;
-        value           uniform 300;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/U b/tutorials/modules/multicomponentFluid/cylinder/0/U
index 24ef459aed..d84e45bf61 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/U
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/U
@@ -20,11 +20,20 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     "(sides|frontAndBack)"
     {
         type            noSlip;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    top
+    {
+        type            pressureInletOutletVelocity;
+        value           $internalField;
+    }
+
+    "region0_to_wallFilm_.*"
     {
         type            noSlip;
     }
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/p b/tutorials/modules/multicomponentFluid/cylinder/0/p
index b1870c6b83..ca100728ec 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/p
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/p
@@ -16,16 +16,25 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 100000;
+internalField   uniform 1e5;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     "(sides|frontAndBack)"
     {
         type            calculated;
         value           $internalField;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    top
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    "region0_to_wallFilm_.*"
     {
         type            calculated;
         value           $internalField;
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/p_rgh b/tutorials/modules/multicomponentFluid/cylinder/0/p_rgh
index 7861327b27..340b37c821 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/p_rgh
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/p_rgh
@@ -16,15 +16,24 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 100000;
+internalField   uniform 1e5;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     "(sides|frontAndBack)"
     {
         type            fixedFluxPressure;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    top
+    {
+        type            prghTotalPressure;
+        p0              $internalField;
+    }
+
+    "region0_to_wallFilm_.*"
     {
         type            fixedFluxPressure;
     }
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/T b/tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/T
similarity index 75%
rename from tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/T
rename to tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/T
index f1b32afe01..7bfbe5b65a 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/T
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/T
@@ -9,33 +9,25 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 0 1 0 0 0];
 
-internalField   uniform  300;
+internalField   uniform 300;
 
 boundaryField
 {
-    wallFilmFaces_top
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    "(sides|frontAndBack|wallFilmFaces_top|cylinderFilmFaces_top)"
     {
         type            zeroGradient;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
-    {
-        type            zeroGradient;
-    }
-
-    sides
-    {
-        type            zeroGradient;
-    }
-
-    frontAndBack
+    "wallFilm_to_region0_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/U b/tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/U
similarity index 85%
rename from tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/U
rename to tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/U
index 60c3884952..739ea5bb0f 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/U
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/U
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volVectorField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,16 +20,13 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    wallFilmFaces_top
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    "(wallFilmFaces_top|cylinderFilmFaces_top)"
     {
         type            slip;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
-    {
-        type            noSlip;
-    }
-
     sides
     {
         type            noSlip;
@@ -39,6 +36,11 @@ boundaryField
     {
         type            slip;
     }
+
+    "wallFilm_to_region0_.*"
+    {
+        type            noSlip;
+    }
 }
 
 
diff --git a/tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/delta b/tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/delta
similarity index 78%
rename from tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/delta
rename to tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/delta
index 7c946301d2..0aa1e0969d 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/0/wallFilmRegion/delta
+++ b/tutorials/modules/multicomponentFluid/cylinder/0/wallFilm/delta
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      delta;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,22 +20,14 @@ internalField   uniform 0;
 
 boundaryField
 {
-    wallFilmFaces_top
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    "(sides|frontAndBack|wallFilmFaces_top|cylinderFilmFaces_top)"
     {
         type            zeroGradient;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
-    {
-        type            zeroGradient;
-    }
-
-    sides
-    {
-        type            zeroGradient;
-    }
-
-    frontAndBack
+    "wallFilm_to_region0_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/cylinder/Allclean b/tutorials/modules/multicomponentFluid/cylinder/Allclean
index 1ece050446..aaa05f5653 100755
--- a/tutorials/modules/multicomponentFluid/cylinder/Allclean
+++ b/tutorials/modules/multicomponentFluid/cylinder/Allclean
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-rm -rf constant/wallFilmRegion/polyMesh
+rm -rf constant/wallFilm/polyMesh
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/cylinder/Allmesh b/tutorials/modules/multicomponentFluid/cylinder/Allmesh
deleted file mode 100755
index 5e0388d1f1..0000000000
--- a/tutorials/modules/multicomponentFluid/cylinder/Allmesh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-runApplication blockMesh
-runApplication topoSet
-runApplication extrudeToRegionMesh -overwrite
-
-paraFoam -touch
-paraFoam -touch -region wallFilmRegion
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/cylinder/Allrun b/tutorials/modules/multicomponentFluid/cylinder/Allrun
index def1062b02..5d0be424c3 100755
--- a/tutorials/modules/multicomponentFluid/cylinder/Allrun
+++ b/tutorials/modules/multicomponentFluid/cylinder/Allrun
@@ -3,10 +3,13 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-./Allmesh
+runApplication blockMesh
+runApplication topoSet
+runApplication extrudeToRegionMesh -overwrite
 
-application=$(getApplication)
+runApplication $(getApplication)
 
-runApplication $application
+paraFoam -touch
+paraFoam -touch -region wallFilm
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/cylinder/Allrun-parallel b/tutorials/modules/multicomponentFluid/cylinder/Allrun-parallel
new file mode 100755
index 0000000000..929a3edb71
--- /dev/null
+++ b/tutorials/modules/multicomponentFluid/cylinder/Allrun-parallel
@@ -0,0 +1,21 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+runApplication decomposePar -noFields
+runParallel topoSet
+runParallel extrudeToRegionMesh -overwrite
+
+runApplication -s fields decomposePar -fields -copyZero
+
+runParallel $(getApplication)
+
+runApplication reconstructPar
+runApplication -s wallFilm reconstructPar -region wallFilm
+
+paraFoam -touch
+paraFoam -touch -region wallFilm
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/cylinder/constant/surfaceFilmProperties b/tutorials/modules/multicomponentFluid/cylinder/constant/surfaceFilmProperties
index 7f133f3e6c..aeb126b2ac 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/modules/multicomponentFluid/cylinder/constant/surfaceFilmProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-regionName      wallFilmRegion;
+regionName      wallFilm;
 
 viscosity
 {
diff --git a/tutorials/modules/multicomponentFluid/cylinder/constant/wallFilmRegion/physicalProperties b/tutorials/modules/multicomponentFluid/cylinder/constant/wallFilm/physicalProperties
similarity index 100%
rename from tutorials/modules/multicomponentFluid/cylinder/constant/wallFilmRegion/physicalProperties
rename to tutorials/modules/multicomponentFluid/cylinder/constant/wallFilm/physicalProperties
diff --git a/tutorials/modules/multicomponentFluid/cylinder/system/blockMeshDict b/tutorials/modules/multicomponentFluid/cylinder/system/blockMeshDict
index d8b4994301..e22ef4d2b1 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/system/blockMeshDict
+++ b/tutorials/modules/multicomponentFluid/cylinder/system/blockMeshDict
@@ -99,7 +99,7 @@ defaultPatch
 
 boundary
 (
-    filmWalls
+    walls
     {
         type wall;
         faces
@@ -108,8 +108,15 @@ boundary
             (1 2 21 20)
             (12 11 30 31)
             (13 12 31 32)
-            (10 5 24 29)
+        );
+    }
+    cylinder
+    {
+        type wall;
+        faces
+        (
             (5 0 19 24)
+            (10 5 24 29)
             (16 10 29 35)
             (11 16 35 30)
         );
@@ -121,14 +128,21 @@ boundary
         (
             (2 3 22 21)
             (3 6 25 22)
-            (7 8 27 26)
-            (6 7 26 25)
-            (8 18 37 27)
-            (18 17 36 37)
             (14 13 32 33)
             (17 14 33 36)
         );
     }
+    top
+    {
+        type patch;
+        faces
+        (
+            (6 7 26 25)
+            (7 8 27 26)
+            (8 18 37 27)
+            (18 17 36 37)
+        );
+    }
 );
 
 
diff --git a/tutorials/modules/multicomponentFluid/cylinder/system/decomposeParDict b/tutorials/modules/multicomponentFluid/cylinder/system/decomposeParDict
index 7e0bc7832d..285afcd541 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/system/decomposeParDict
+++ b/tutorials/modules/multicomponentFluid/cylinder/system/decomposeParDict
@@ -16,32 +16,7 @@ FoamFile
 
 numberOfSubdomains 4;
 
-method          metis;
-
-simpleCoeffs
-{
-    n               (2 2 1);
-}
-
-hierarchicalCoeffs
-{
-    n               (1 1 1);
-    order           xyz;
-}
-
-metisCoeffs
-{
-    processorWeights ( 1 1 1 1 );
-}
-
-manualCoeffs
-{
-    dataFile        "";
-}
-
-distributed     no;
-
-roots           ( );
+method          scotch;
 
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multicomponentFluid/cylinder/system/extrudeToRegionMeshDict b/tutorials/modules/multicomponentFluid/cylinder/system/extrudeToRegionMeshDict
index f436dce6f0..55147d7008 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/system/extrudeToRegionMeshDict
+++ b/tutorials/modules/multicomponentFluid/cylinder/system/extrudeToRegionMeshDict
@@ -13,13 +13,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-region          wallFilmRegion;
+region          wallFilm;
 
-faceZones       (wallFilmFaces);
-
-sampleMode      nearestPatchFace;
-
-oneD            false;
+faceZones       (wallFilmFaces cylinderFilmFaces);
 
 extrudeModel    linearNormal;
 
diff --git a/tutorials/modules/multicomponentFluid/cylinder/system/topoSetDict b/tutorials/modules/multicomponentFluid/cylinder/system/topoSetDict
index 147c1be01b..fa2f21df37 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/system/topoSetDict
+++ b/tutorials/modules/multicomponentFluid/cylinder/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        patch   filmWalls;
+        patch   walls;
     }
     {
         name    wallFilmFaces;
@@ -30,6 +30,20 @@ actions
         source  setToFaceZone;
         faceSet wallFilmFaceSet;
     }
+    {
+        name    cylinderFilmFaceSet;
+        type    faceSet;
+        action  new;
+        source  patchToFace;
+        patch   cylinder;
+    }
+    {
+        name    cylinderFilmFaces;
+        type    faceZoneSet;
+        action  new;
+        source  setToFaceZone;
+        faceSet cylinderFilmFaceSet;
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multicomponentFluid/cylinder/system/wallFilmRegion/fvSchemes b/tutorials/modules/multicomponentFluid/cylinder/system/wallFilm/fvSchemes
similarity index 96%
rename from tutorials/modules/multicomponentFluid/cylinder/system/wallFilmRegion/fvSchemes
rename to tutorials/modules/multicomponentFluid/cylinder/system/wallFilm/fvSchemes
index e80df787ad..3c4eca56ea 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/system/wallFilmRegion/fvSchemes
+++ b/tutorials/modules/multicomponentFluid/cylinder/system/wallFilm/fvSchemes
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
+    location    "system/wallFilm";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multicomponentFluid/cylinder/system/wallFilmRegion/fvSolution b/tutorials/modules/multicomponentFluid/cylinder/system/wallFilm/fvSolution
similarity index 96%
rename from tutorials/modules/multicomponentFluid/cylinder/system/wallFilmRegion/fvSolution
rename to tutorials/modules/multicomponentFluid/cylinder/system/wallFilm/fvSolution
index 346f452433..a72a7158d3 100644
--- a/tutorials/modules/multicomponentFluid/cylinder/system/wallFilmRegion/fvSolution
+++ b/tutorials/modules/multicomponentFluid/cylinder/system/wallFilm/fvSolution
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
+    location    "system/wallFilm";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/H2O b/tutorials/modules/multicomponentFluid/hotBoxes/0/H2O
index 1cda847ad7..20492502b3 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/H2O
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/H2O
@@ -20,12 +20,14 @@ internalField   uniform 0;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            zeroGradient;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/N2 b/tutorials/modules/multicomponentFluid/hotBoxes/0/N2
index 3a316f6e0f..2972742924 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/N2
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/N2
@@ -20,12 +20,14 @@ internalField   uniform 0.77;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            zeroGradient;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/O2 b/tutorials/modules/multicomponentFluid/hotBoxes/0/O2
index 96b2221225..1074abe23a 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/O2
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/O2
@@ -20,12 +20,14 @@ internalField   uniform 0.23;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            zeroGradient;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/T b/tutorials/modules/multicomponentFluid/hotBoxes/0/T
index 2a86f9e810..8c2c940c52 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/T
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/T
@@ -20,19 +20,21 @@ internalField   uniform 300;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            fixedValue;
-        value           uniform 300;
+        value           $internalField;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            mapped;
         field           T;
-        average         300;
         setAverage      no;
-        value           uniform 300;
+        average         300;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/U b/tutorials/modules/multicomponentFluid/hotBoxes/0/U
index 296c2a50ba..9a691a2803 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/U
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/U
@@ -20,20 +20,21 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            uniformFixedValue;
         uniformValue    (0 0 0);
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            mapped;
-        uniformValue    constant (0 0 0);
-        value           uniform (0 0 0);
         field           U;
-        average         (0 0 0);
         setAverage      no;
+        average         (0 0 0);
+        value           uniform (0 0 0);
     }
 }
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/alphat b/tutorials/modules/multicomponentFluid/hotBoxes/0/alphat
index 35c3242759..3be27dd8f1 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/alphat
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/alphat
@@ -20,6 +20,8 @@ internalField   uniform 1e-7;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            compressible::alphatWallFunction;
@@ -27,7 +29,7 @@ boundaryField
         value           uniform 0;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            alphatFilmWallFunction;
         B               5.5;
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/epsilon b/tutorials/modules/multicomponentFluid/hotBoxes/0/epsilon
index 52114321b9..cec19317fe 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/epsilon
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/epsilon
@@ -20,16 +20,18 @@ internalField   uniform 1e-7;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            epsilonWallFunction;
         value           uniform 1e-7;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            epsilonWallFunction;
-        value           uniform 1e-07;
+        value           uniform 1e-7;
     }
 }
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/htcConv b/tutorials/modules/multicomponentFluid/hotBoxes/0/htcConv
index d1f34b4b22..7ef2e54f34 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/htcConv
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/htcConv
@@ -20,13 +20,15 @@ internalField   uniform 0;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            calculated;
         value           uniform 0;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            convectiveHeatTransfer;
         L               1;
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/k b/tutorials/modules/multicomponentFluid/hotBoxes/0/k
index 70f7c84bee..a7c1b35ed6 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/k
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/k
@@ -20,16 +20,18 @@ internalField   uniform 1e-5;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            kqRWallFunction;
         value           uniform 1e-5;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            kqRWallFunction;
-        value           uniform 1e-05;
+        value           uniform 1e-5;
     }
 }
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/nut b/tutorials/modules/multicomponentFluid/hotBoxes/0/nut
index 02ef416a0a..dc37784f29 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/nut
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/nut
@@ -20,13 +20,15 @@ internalField   uniform 1e-7;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            nutkFilmWallFunction;
         B               5.5;
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/p b/tutorials/modules/multicomponentFluid/hotBoxes/0/p
index 7ea84caa6a..b0aa7b94e2 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/p
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/p
@@ -20,16 +20,18 @@ internalField   uniform 100000;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            calculated;
         value           $internalField;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            calculated;
-        value           uniform 100000;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/p_rgh b/tutorials/modules/multicomponentFluid/hotBoxes/0/p_rgh
index 0839230040..5a2ba3e06f 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/p_rgh
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/p_rgh
@@ -20,17 +20,18 @@ internalField   uniform 100000;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     walls
     {
         type            fixedFluxPressure;
-        value           uniform 100000;
+        value           $internalField;
     }
 
-    "(region0_to.*)"
+    "region0_to_wallFilm_.*"
     {
         type            fixedFluxPressure;
-        gradient        uniform 0;
-        value           uniform 100000;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/T b/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/T
similarity index 83%
rename from tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/T
rename to tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/T
index e91cfc0e53..d19ee45988 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/T
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/T
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,22 +20,20 @@ internalField   uniform  300;
 
 boundaryField
 {
-    // top film surface
-    "(.*top)"
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    walls
     {
         type            zeroGradient;
     }
 
-    // mapped boundaries
-    "(region0_to.*)"
+    "wallFilm_to_region0_.*"
     {
-//        type            zeroGradient;
         type            fixedValue;
         value           uniform 350.0;
     }
 
-    // floor sides
-    walls
+    ".*_top"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/U b/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/U
similarity index 86%
rename from tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/U
rename to tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/U
index 00af783e58..8148b54d09 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/U
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/U
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volVectorField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,23 +20,22 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    // top film surface
-    "(.*top)"
-    {
-        type            slip;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
 
-    // mapped boundaries
-    "(region0_to.*)"
-    {
-        type            slip;
-    }
-
-    // floor sides
     walls
     {
         type            noSlip;
     }
+
+    "wallFilm_to_region0_.*"
+    {
+        type            slip;
+    }
+
+    ".*_top"
+    {
+        type            slip;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/delta b/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/delta
similarity index 86%
rename from tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/delta
rename to tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/delta
index c1adbeb45d..27992bb30a 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilmRegion/delta
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/0/wallFilm/delta
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      delta;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,23 +20,22 @@ internalField   uniform 0.0;
 
 boundaryField
 {
-    // top film surface
-    "(.*top)"
-    {
-        type            zeroGradient;
-    }
+    #includeEtc "caseDicts/setConstraintTypes"
 
-    // mapped boundaries
-    "(region0_to.*)"
-    {
-        type            zeroGradient;
-    }
-
-    // floor sides
     walls
     {
         type            zeroGradient;
     }
+
+    "wallFilm_to_region0_.*"
+    {
+        type            zeroGradient;
+    }
+
+    ".*_top"
+    {
+        type            zeroGradient;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/Allclean b/tutorials/modules/multicomponentFluid/hotBoxes/Allclean
index 1ece050446..c6ae8a9d73 100755
--- a/tutorials/modules/multicomponentFluid/hotBoxes/Allclean
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/Allclean
@@ -4,8 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cleanCase
-
-rm -rf constant/wallFilmRegion/polyMesh
+cleanCase && rm -rf constant/wallFilm/polyMesh
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/Allmesh b/tutorials/modules/multicomponentFluid/hotBoxes/Allmesh
deleted file mode 100755
index 91bdf3f1b8..0000000000
--- a/tutorials/modules/multicomponentFluid/hotBoxes/Allmesh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Create the underlying block mesh
-runApplication blockMesh
-
-# Create the set for the obstacles
-runApplication topoSet
-
-# Create the obstacles - add obstacle patches to wallFilm patch
-runApplication subsetMesh c0 -patch wallFilm -overwrite -noFields
-
-# Create a wallFilmRegion faceZone from the obstacles and floor
-runApplication -s wallFilmRegion topoSet -dict topoSetDict.wallFilmRegion
-
-# Create the wall film region from the wallFilmRegion faceZone via extrusion
-runApplication extrudeToRegionMesh -overwrite
-
-paraFoam -touch
-paraFoam -touch -region wallFilmRegion
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/Allrun b/tutorials/modules/multicomponentFluid/hotBoxes/Allrun
index a3fb25a097..5c1effa780 100755
--- a/tutorials/modules/multicomponentFluid/hotBoxes/Allrun
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/Allrun
@@ -4,9 +4,30 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=$(getApplication)
+runApplication blockMesh
 
-./Allmesh
-runApplication $application
+runApplication decomposePar -noFields
+
+# Create a set for the bits of the mesh that are not boxes
+runParallel topoSet
+
+# Create the boxes and add their surfaces to the boxes patch
+runParallel subsetMesh notBoxes -patch boxes -overwrite -noFields
+
+# Create zones from the floor and the boxes
+runParallel -s wallFilm topoSet -dict topoSetDict.wallFilm
+
+# Create the film mesh
+runParallel extrudeToRegionMesh -overwrite
+
+runApplication -s fields decomposePar -fields -copyZero
+
+runParallel $(getApplication);
+
+runApplication reconstructPar
+runApplication -s wallFilm reconstructPar -region wallFilm
+
+paraFoam -touch
+paraFoam -touch -region wallFilm
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/Allrun-parallel b/tutorials/modules/multicomponentFluid/hotBoxes/Allrun-parallel
deleted file mode 100755
index 0a78d8e6cd..0000000000
--- a/tutorials/modules/multicomponentFluid/hotBoxes/Allrun-parallel
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-./Allmesh
-
-cp -Rf 0.orig 0
-
-application=$(getApplication)
-
-runApplication -s primaryRegion  decomposePar
-runApplication -s wallFilmRegion decomposePar -region wallFilmRegion
-
-runParallel $application
-
-runApplication -s primaryRegion  reconstructPar
-runApplication -s wallFilmRegion reconstructPar -region wallFilmRegion
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/constant/surfaceFilmProperties b/tutorials/modules/multicomponentFluid/hotBoxes/constant/surfaceFilmProperties
index b3849ee8e8..d5f3122461 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/constant/surfaceFilmProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-regionName      wallFilmRegion;
+regionName      wallFilm;
 
 viscosity
 {
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/constant/wallFilmRegion/physicalProperties b/tutorials/modules/multicomponentFluid/hotBoxes/constant/wallFilm/physicalProperties
similarity index 100%
rename from tutorials/modules/multicomponentFluid/hotBoxes/constant/wallFilmRegion/physicalProperties
rename to tutorials/modules/multicomponentFluid/hotBoxes/constant/wallFilm/physicalProperties
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/system/blockMeshDict b/tutorials/modules/multicomponentFluid/hotBoxes/system/blockMeshDict
index 11fe7c6df7..2572e50bc1 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/system/blockMeshDict
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/system/blockMeshDict
@@ -46,7 +46,7 @@ boundary
             (1 5 4 0)
         );
     }
-    wallFilm
+    floor
     {
         type wall;
         faces
@@ -54,6 +54,12 @@ boundary
             (0 3 2 1)
         );
     }
+    boxes
+    {
+        type wall;
+        faces
+        ();
+    }
 );
 
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/system/decomposeParDict b/tutorials/modules/multicomponentFluid/hotBoxes/system/decomposeParDict
index 7369d8d595..7c3a0d3455 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/system/decomposeParDict
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/system/decomposeParDict
@@ -14,13 +14,15 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 4;
+numberOfSubdomains 12;
 
-method          scotch;
+method          hierarchical;
 
-distributed     no;
-
-roots           ( );
+hierarchicalCoeffs
+{
+    n               (2 2 3);
+    order           xyz;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/system/extrudeToRegionMeshDict b/tutorials/modules/multicomponentFluid/hotBoxes/system/extrudeToRegionMeshDict
index adaac0a9f9..170a1f91a0 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/system/extrudeToRegionMeshDict
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/system/extrudeToRegionMeshDict
@@ -13,13 +13,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-region          wallFilmRegion;
+region          wallFilm;
 
-faceZones       (wallFilmFaces);
-
-oneD            false;
-
-sampleMode      nearestPatchFace;
+faceZones       (floorFilmFaces boxesFilmFaces);
 
 extrudeModel    linearNormal;
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict b/tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict
index 5e4c5cc051..c4ca3c0906 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict
@@ -17,38 +17,38 @@ FoamFile
 actions
 (
     {
-        name    c0;
+        name    notBoxes;
         type    cellSet;
         action  clear;
     }
     {
-        name    c0;
+        name    notBoxes;
         type    cellSet;
         action  invert;
     }
     {
-        name    c0;
+        name    notBoxes;
         type    cellSet;
         action  delete;
         source  boxToCell;
         box     (0.4 0.1 0.1) (0.6 0.3 0.3);
     }
     {
-        name    c0;
+        name    notBoxes;
         type    cellSet;
         action  delete;
         source  boxToCell;
         box     (0.4 0.1 0.4) (0.6 0.3 0.6);
     }
     {
-        name    c0;
+        name    notBoxes;
         type    cellSet;
         action  delete;
         source  boxToCell;
         box     (0.4 0.4 0.1) (0.6 0.6 0.3);
     }
     {
-        name    c0;
+        name    notBoxes;
         type    cellSet;
         action  delete;
         source  boxToCell;
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict.wallFilmRegion b/tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict.wallFilm
similarity index 66%
rename from tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict.wallFilmRegion
rename to tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict.wallFilm
index 47204ad0dd..fcd3f675b7 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict.wallFilmRegion
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/system/topoSetDict.wallFilm
@@ -17,18 +17,32 @@ FoamFile
 actions
 (
     {
-        name    wallFilmFaceSet;
+        name    floorFilmFaceSet;
         type    faceSet;
         action  new;
         source  patchToFace;
-        patch   wallFilm;
+        patch   floor;
     }
     {
-        name    wallFilmFaces;
+        name    floorFilmFaces;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        faceSet wallFilmFaceSet;
+        faceSet floorFilmFaceSet;
+    }
+    {
+        name    boxesFilmFaceSet;
+        type    faceSet;
+        action  new;
+        source  patchToFace;
+        patch   boxes;
+    }
+    {
+        name    boxesFilmFaces;
+        type    faceZoneSet;
+        action  new;
+        source  setToFaceZone;
+        faceSet boxesFilmFaceSet;
     }
 );
 
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilmRegion/fvSchemes b/tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilm/fvSchemes
similarity index 96%
rename from tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilmRegion/fvSchemes
rename to tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilm/fvSchemes
index e80df787ad..3c4eca56ea 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilmRegion/fvSchemes
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilm/fvSchemes
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
+    location    "system/wallFilm";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilmRegion/fvSolution b/tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilm/fvSolution
similarity index 96%
rename from tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilmRegion/fvSolution
rename to tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilm/fvSolution
index 07029141b3..cea5cc526d 100644
--- a/tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilmRegion/fvSolution
+++ b/tutorials/modules/multicomponentFluid/hotBoxes/system/wallFilm/fvSolution
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
+    location    "system/wallFilm";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/H2O b/tutorials/modules/multicomponentFluid/rivuletPanel/0/H2O
index b4192fa2ad..52b42f0706 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/H2O
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/H2O
@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.0;
@@ -23,17 +22,24 @@ boundaryField
 {
     inlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     sides
     {
         type            zeroGradient;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    region0_to_wallFilm_wallFilmFaces
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/N2 b/tutorials/modules/multicomponentFluid/rivuletPanel/0/N2
index 6efb1c8df5..0b4535bed8 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/N2
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/N2
@@ -14,7 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.77;
@@ -23,17 +22,24 @@ boundaryField
 {
     inlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     sides
     {
         type            zeroGradient;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    region0_to_wallFilm_wallFilmFaces
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/O2 b/tutorials/modules/multicomponentFluid/rivuletPanel/0/O2
index 2fb0eb24c3..d0b6f570f1 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/O2
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/O2
@@ -12,7 +12,6 @@ FoamFile
     location    "0";
     object      O2;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 0 0 0 0 0];
@@ -23,17 +22,24 @@ boundaryField
 {
     inlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     sides
     {
         type            zeroGradient;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    region0_to_wallFilm_wallFilmFaces
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/T b/tutorials/modules/multicomponentFluid/rivuletPanel/0/T
index 81a26efb18..ed5098a96c 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/T
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/T
@@ -8,8 +8,8 @@
 FoamFile
 {
     format      ascii;
-    location    "0";
     class       volScalarField;
+    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,23 +22,28 @@ boundaryField
 {
     inlet
     {
-        type            fixedValue;
-        value           uniform 300;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     outlet
     {
-        type            fixedValue;
-        value           uniform 300;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     sides
     {
         type            fixedValue;
-        value           uniform 300;
+        value           $internalField;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    region0_to_wallFilm_wallFilmFaces
     {
         type            fixedValue;
-        value           uniform 300;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/U b/tutorials/modules/multicomponentFluid/rivuletPanel/0/U
index b3670e60e5..467d9d5f4c 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/U
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/U
@@ -23,19 +23,21 @@ boundaryField
     inlet
     {
         type            pressureInletOutletVelocity;
-        value           uniform (0 0 0);
+        value           $internalField;
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
-        value           uniform (0 0 0);
+        value           $internalField;
     }
+
     sides
     {
-        type            pressureInletOutletVelocity;
-        value           uniform (0 0 0);
+        type            noSlip;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    region0_to_wallFilm_wallFilmFaces
     {
         type            noSlip;
     }
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/p b/tutorials/modules/multicomponentFluid/rivuletPanel/0/p
index 577377a8a9..7f235130b8 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/p
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/p
@@ -25,17 +25,20 @@ boundaryField
         type            calculated;
         value           $internalField;
     }
+
     outlet
     {
         type            calculated;
         value           $internalField;
     }
+
     sides
     {
         type            calculated;
         value           $internalField;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    region0_to_wallFilm_wallFilmFaces
     {
         type            calculated;
         value           $internalField;
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/p_rgh b/tutorials/modules/multicomponentFluid/rivuletPanel/0/p_rgh
index 5972cecc49..610f8e8f75 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/p_rgh
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/p_rgh
@@ -22,17 +22,22 @@ boundaryField
 {
     inlet
     {
-        type            fixedFluxPressure;
+        type            prghTotalPressure;
+        p0              $internalField;
     }
+
     outlet
     {
-        type            fixedFluxPressure;
+        type            prghTotalPressure;
+        p0              $internalField;
     }
+
     sides
     {
         type            fixedFluxPressure;
     }
-    region0_to_wallFilmRegion_wallFilmFaces
+
+    region0_to_wallFilm_wallFilmFaces
     {
         type            fixedFluxPressure;
     }
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/T b/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/T
similarity index 93%
rename from tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/T
rename to tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/T
index 120a67621f..01c71e0dfd 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/T
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/T
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,16 +20,6 @@ internalField   uniform  300;
 
 boundaryField
 {
-    wallFilmFaces_top
-    {
-        type            zeroGradient;
-    }
-
-    region0_to_wallFilmRegion_wallFilmFaces
-    {
-        type            zeroGradient;
-    }
-
     inlet
     {
         type            fixedValue;
@@ -45,6 +35,16 @@ boundaryField
     {
         type            zeroGradient;
     }
+
+    wallFilmFaces_top
+    {
+        type            zeroGradient;
+    }
+
+    wallFilm_to_region0_wallFilmFaces
+    {
+        type            zeroGradient;
+    }
 }
 
 
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/U b/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/U
similarity index 92%
rename from tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/U
rename to tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/U
index e380cafde5..4cb86922b9 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/U
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/U
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volVectorField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,16 +20,6 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    wallFilmFaces_top
-    {
-        type            slip;
-    }
-
-    region0_to_wallFilmRegion_wallFilmFaces
-    {
-        type            noSlip;
-    }
-
     inlet
     {
         type            fixedValue;
@@ -45,6 +35,16 @@ boundaryField
     {
         type            noSlip;
     }
+
+    wallFilmFaces_top
+    {
+        type            slip;
+    }
+
+    wallFilm_to_region0_wallFilmFaces
+    {
+        type            noSlip;
+    }
 }
 
 
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/delta b/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/delta
similarity index 93%
rename from tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/delta
rename to tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/delta
index b4bbbec9be..02b64118c1 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilmRegion/delta
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/0/wallFilm/delta
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      delta;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,16 +20,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    wallFilmFaces_top
-    {
-        type            zeroGradient;
-    }
-
-    region0_to_wallFilmRegion_wallFilmFaces
-    {
-        type            zeroGradient;
-    }
-
     inlet
     {
         type            fixedValue;
@@ -45,6 +35,16 @@ boundaryField
     {
         type            zeroGradient;
     }
+
+    wallFilmFaces_top
+    {
+        type            zeroGradient;
+    }
+
+    wallFilm_to_region0_wallFilmFaces
+    {
+        type            zeroGradient;
+    }
 }
 
 
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/Allclean b/tutorials/modules/multicomponentFluid/rivuletPanel/Allclean
index 1ece050446..aaa05f5653 100755
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/Allclean
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/Allclean
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-rm -rf constant/wallFilmRegion/polyMesh
+rm -rf constant/wallFilm/polyMesh
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/Allmesh b/tutorials/modules/multicomponentFluid/rivuletPanel/Allmesh
deleted file mode 100755
index c4ee8ed1d9..0000000000
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/Allmesh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-runApplication blockMesh
-runApplication topoSet -dict wallFilmRegion.topoSet
-runApplication extrudeToRegionMesh -overwrite
-
-paraFoam -touch
-paraFoam -touch -region wallFilmRegion
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/Allrun b/tutorials/modules/multicomponentFluid/rivuletPanel/Allrun
index def1062b02..5c9cd321ca 100755
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/Allrun
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/Allrun
@@ -3,10 +3,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-./Allmesh
+runApplication blockMesh
+runApplication topoSet
+runApplication extrudeToRegionMesh -overwrite
 
-application=$(getApplication)
+paraFoam -touchAll
 
-runApplication $application
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/constant/surfaceFilmProperties b/tutorials/modules/multicomponentFluid/rivuletPanel/constant/surfaceFilmProperties
index 02a9eb421f..49a26710bd 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/constant/surfaceFilmProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-regionName      wallFilmRegion;
+regionName      wallFilm;
 
 viscosity
 {
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/constant/wallFilmRegion/physicalProperties b/tutorials/modules/multicomponentFluid/rivuletPanel/constant/wallFilm/physicalProperties
similarity index 100%
rename from tutorials/modules/multicomponentFluid/rivuletPanel/constant/wallFilmRegion/physicalProperties
rename to tutorials/modules/multicomponentFluid/rivuletPanel/constant/wallFilm/physicalProperties
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/system/extrudeToRegionMeshDict b/tutorials/modules/multicomponentFluid/rivuletPanel/system/extrudeToRegionMeshDict
index 6a33fc0148..cfe999ec81 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/system/extrudeToRegionMeshDict
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/system/extrudeToRegionMeshDict
@@ -13,14 +13,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-region          wallFilmRegion;
+region          wallFilm;
 
 faceZones       (wallFilmFaces);
 
-oneD            false;
-
-sampleMode      nearestPatchFace;
-
 extrudeModel    linearNormal;
 
 nLayers         1;
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/system/fvSolution b/tutorials/modules/multicomponentFluid/rivuletPanel/system/fvSolution
index afe8c0717d..a9f314bf6b 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/system/fvSolution
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/system/fvSolution
@@ -33,8 +33,8 @@ solvers
 
     "(U|h)"
     {
-        solver          smoothSolver;
-        smoother        symGaussSeidel;
+        solver          PBiCGStab;
+        preconditioner  DILU;
         tolerance       0;
         relTol          0.1;
     }
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/modules/multicomponentFluid/rivuletPanel/system/topoSetDict
similarity index 99%
rename from tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion.topoSet
rename to tutorials/modules/multicomponentFluid/rivuletPanel/system/topoSetDict
index 0c1af23c5c..ff971bc273 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/system/topoSetDict
@@ -11,7 +11,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion/fvSchemes b/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilm/fvSchemes
similarity index 96%
rename from tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion/fvSchemes
rename to tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilm/fvSchemes
index 0ee0ed1707..c9856ed9a5 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion/fvSchemes
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilm/fvSchemes
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
+    location    "system/wallFilm";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilm/fvSolution
similarity index 83%
rename from tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion/fvSolution
rename to tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilm/fvSolution
index 8d732248f2..a2aab5532f 100644
--- a/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/modules/multicomponentFluid/rivuletPanel/system/wallFilm/fvSolution
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
+    location    "system/wallFilm";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,16 +18,16 @@ solvers
 {
     "alpha.*"
     {
-        solver          smoothSolver;
-        smoother        symGaussSeidel;
+        solver          PBiCGStab;
+        preconditioner  DILU;
         tolerance       1e-10;
         relTol          0;
     }
 
     "(U|e).*"
     {
-        solver          smoothSolver;
-        smoother        symGaussSeidel;
+        solver          PBiCGStab;
+        preconditioner  DILU;
         tolerance       1e-10;
         relTol          0;
     }
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/H2O b/tutorials/modules/multicomponentFluid/splashPanel/0/H2O
index 88417ebc0d..1b3d49c768 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/H2O
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/H2O
@@ -28,6 +28,7 @@ boundaryField
         inletValue      $internalField;
         value           $internalField;
     }
+
     region0_to_wallFilm_walls
     {
         type            zeroGradient;
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/N2 b/tutorials/modules/multicomponentFluid/splashPanel/0/N2
index 2eabf05efd..0b9ec83840 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/N2
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/N2
@@ -28,6 +28,7 @@ boundaryField
         inletValue      $internalField;
         value           $internalField;
     }
+
     region0_to_wallFilm_walls
     {
         type            zeroGradient;
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/O2 b/tutorials/modules/multicomponentFluid/splashPanel/0/O2
index a17888c2e2..3bdce9490e 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/O2
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/O2
@@ -28,6 +28,7 @@ boundaryField
         inletValue      $internalField;
         value           $internalField;
     }
+
     region0_to_wallFilm_walls
     {
         type            zeroGradient;
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/T b/tutorials/modules/multicomponentFluid/splashPanel/0/T
index 58295616cd..1a6ba0b2b3 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/T
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/T
@@ -8,8 +8,8 @@
 FoamFile
 {
     format      ascii;
-    location    "0";
     class       volScalarField;
+    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,6 +28,7 @@ boundaryField
         inletValue      $internalField;
         value           $internalField;
     }
+
     region0_to_wallFilm_walls
     {
         type            fixedValue;
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/U b/tutorials/modules/multicomponentFluid/splashPanel/0/U
index 9c248e568e..8707100075 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/U
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/U
@@ -27,6 +27,7 @@ boundaryField
         type            pressureInletOutletVelocity;
         value           $internalField;
     }
+
     region0_to_wallFilm_walls
     {
         type            noSlip;
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/p b/tutorials/modules/multicomponentFluid/splashPanel/0/p
index 9667a58220..dc3beb8060 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/p
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/p
@@ -27,6 +27,7 @@ boundaryField
         type            calculated;
         value           $internalField;
     }
+
     region0_to_wallFilm_walls
     {
         type            calculated;
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/T b/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/T
index a2f979cf9c..5285ef169a 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/T
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/T
@@ -27,7 +27,7 @@ boundaryField
         type            zeroGradient;
     }
 
-    region0_to_wallFilm_walls
+    wallFilm_to_region0_walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/U b/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/U
index b94cf034e9..eea37681cf 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/U
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/U
@@ -27,7 +27,7 @@ boundaryField
         type            slip;
     }
 
-    region0_to_wallFilm_walls
+    wallFilm_to_region0_walls
     {
         type            noSlip;
     }
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/delta b/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/delta
index 3971097f39..0ddf5569c7 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/delta
+++ b/tutorials/modules/multicomponentFluid/splashPanel/0/wallFilm/delta
@@ -27,7 +27,7 @@ boundaryField
         type            zeroGradient;
     }
 
-    region0_to_wallFilm_walls
+    wallFilm_to_region0_walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/modules/multicomponentFluid/splashPanel/system/extrudeToRegionMeshDict b/tutorials/modules/multicomponentFluid/splashPanel/system/extrudeToRegionMeshDict
index eca2e3c617..cadfe779f6 100644
--- a/tutorials/modules/multicomponentFluid/splashPanel/system/extrudeToRegionMeshDict
+++ b/tutorials/modules/multicomponentFluid/splashPanel/system/extrudeToRegionMeshDict
@@ -17,10 +17,6 @@ region          wallFilm;
 
 faceZones       (walls);
 
-oneD            false;
-
-sampleMode      nearestPatchFace;
-
 extrudeModel    linearNormal;
 
 nLayers         1;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/T b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/T
index 6523866180..57e7bc784b 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/T
@@ -8,8 +8,8 @@
 FoamFile
 {
     format      ascii;
-    location    "0";
     class       volScalarField;
+    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -32,7 +32,7 @@ boundaryField
         inletValue      $internalField;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
+    "region0_to_wallFilm_.*"
     {
         type            fixedValue;
         value           uniform 300;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/U
index 2e8cde3c3d..1cdc7fdd91 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/U
@@ -31,7 +31,7 @@ boundaryField
         value           $internalField;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
+    "region0_to_wallFilm_.*"
     {
         type            noSlip;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/alpha.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/alpha.liquid
index 41929dbda4..21f21e329a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/alpha.liquid
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/alpha.liquid
@@ -9,6 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -29,7 +30,7 @@ boundaryField
         type            zeroGradient;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
+    "region0_to_wallFilm_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p
index f1eb5c9cd2..bd285fe182 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p
@@ -32,7 +32,7 @@ boundaryField
         value           $internalField;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
+    "region0_to_wallFilm_.*"
     {
         type            calculated;
         value           $internalField;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p_rgh
index 42929be6fe..8698ff1009 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/p_rgh
@@ -32,7 +32,7 @@ boundaryField
         rho             thermo:rho;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
+    "region0_to_wallFilm_.*"
     {
         type            fixedFluxPressure;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/T b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/T
similarity index 90%
rename from tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/T
rename to tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/T
index a1718b1f2f..eaf9ab9b88 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/T
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,12 +20,12 @@ internalField   uniform  300;
 
 boundaryField
 {
-    wallFilmFaces_top
+    ".*_top"
     {
         type            zeroGradient;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
+    "wallFilm_to_region0_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/U b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/U
similarity index 90%
rename from tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/U
rename to tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/U
index 9e79513689..60987925fc 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/U
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volVectorField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,12 +20,12 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    wallFilmFaces_top
+    ".*_top"
     {
         type            slip;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
+    "wallFilm_to_region0_.*"
     {
         type            noSlip;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/delta b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/delta
similarity index 90%
rename from tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/delta
rename to tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/delta
index 705f122ea9..74fd09d98a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilmRegion/delta
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/0/wallFilm/delta
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/wallFilmRegion";
+    location    "0/wallFilm";
     object      delta;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,12 +20,12 @@ internalField   uniform 0;
 
 boundaryField
 {
-    wallFilmFaces_top
+    ".*_top"
     {
         type            zeroGradient;
     }
 
-    region0_to_wallFilmRegion_wallFilmFaces
+    "wallFilm_to_region0_.*"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allclean
index 841522c59a..9089c9d67c 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allclean
@@ -4,8 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cleanVoFCase
-
-rm -rf constant/wallFilmRegion/polyMesh
+cleanVoFCase && rm -rf constant/wallFilm/polyMesh
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allmesh b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allmesh
deleted file mode 100755
index 5e0388d1f1..0000000000
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allmesh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-runApplication blockMesh
-runApplication topoSet
-runApplication extrudeToRegionMesh -overwrite
-
-paraFoam -touch
-paraFoam -touch -region wallFilmRegion
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allrun
index def1062b02..cef7db96ac 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/Allrun
@@ -1,12 +1,16 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
+# Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-./Allmesh
+runApplication blockMesh
+runApplication topoSet
+runApplication extrudeToRegionMesh -overwrite
 
-application=$(getApplication)
+runApplication $(getApplication)
 
-runApplication $application
+paraFoam -touch
+paraFoam -touch -region wallFilm
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/surfaceFilmProperties b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/surfaceFilmProperties
index 7d622c0d82..bc514da505 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/surfaceFilmProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-regionName      wallFilmRegion;
+regionName      wallFilm;
 
 phase           liquid;
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/wallFilmRegion/physicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/wallFilm/physicalProperties
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/wallFilmRegion/physicalProperties
rename to tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/wallFilm/physicalProperties
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/blockMeshDict
index 6809079308..e22ef4d2b1 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/blockMeshDict
@@ -99,7 +99,7 @@ defaultPatch
 
 boundary
 (
-    filmWalls
+    walls
     {
         type wall;
         faces
@@ -108,13 +108,19 @@ boundary
             (1 2 21 20)
             (12 11 30 31)
             (13 12 31 32)
-            (10 5 24 29)
+        );
+    }
+    cylinder
+    {
+        type wall;
+        faces
+        (
             (5 0 19 24)
+            (10 5 24 29)
             (16 10 29 35)
             (11 16 35 30)
         );
     }
-
     sides
     {
         type patch;
@@ -126,14 +132,13 @@ boundary
             (17 14 33 36)
         );
     }
-
     top
     {
         type patch;
         faces
         (
-            (7 8 27 26)
             (6 7 26 25)
+            (7 8 27 26)
             (8 18 37 27)
             (18 17 36 37)
         );
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/extrudeToRegionMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/extrudeToRegionMeshDict
index f436dce6f0..55147d7008 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/extrudeToRegionMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/extrudeToRegionMeshDict
@@ -13,13 +13,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-region          wallFilmRegion;
+region          wallFilm;
 
-faceZones       (wallFilmFaces);
-
-sampleMode      nearestPatchFace;
-
-oneD            false;
+faceZones       (wallFilmFaces cylinderFilmFaces);
 
 extrudeModel    linearNormal;
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict
index 147c1be01b..fa2f21df37 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        patch   filmWalls;
+        patch   walls;
     }
     {
         name    wallFilmFaces;
@@ -30,6 +30,20 @@ actions
         source  setToFaceZone;
         faceSet wallFilmFaceSet;
     }
+    {
+        name    cylinderFilmFaceSet;
+        type    faceSet;
+        action  new;
+        source  patchToFace;
+        patch   cylinder;
+    }
+    {
+        name    cylinderFilmFaces;
+        type    faceZoneSet;
+        action  new;
+        source  setToFaceZone;
+        faceSet cylinderFilmFaceSet;
+    }
 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilmRegion/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilm/fvSchemes
similarity index 96%
rename from tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilmRegion/fvSchemes
rename to tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilm/fvSchemes
index e80df787ad..3c4eca56ea 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilmRegion/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilm/fvSchemes
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
+    location    "system/wallFilm";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilmRegion/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilm/fvSolution
similarity index 96%
rename from tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilmRegion/fvSolution
rename to tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilm/fvSolution
index 58d4fdd6c2..f22989bd68 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilmRegion/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/wallFilm/fvSolution
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/wallFilmRegion";
+    location    "system/wallFilm";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/T b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/T
index 18f546a07d..93afbc48db 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/T
@@ -19,7 +19,7 @@ internalField   uniform 300;
 
 boundaryField
 {
-    region0_to_plateRegion_plateFaces
+    region0_to_plate_plateFaces
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/U
index cfe75cc8a9..83ea4fa6d2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/U
@@ -20,7 +20,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    region0_to_plateRegion_plateFaces
+    region0_to_plate_plateFaces
     {
         type        noSlip;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/alpha.liquid.orig b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/alpha.liquid.orig
index 15af42eaef..573e3a4eae 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/alpha.liquid.orig
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/alpha.liquid.orig
@@ -19,7 +19,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    region0_to_plateRegion_plateFaces
+    region0_to_plate_plateFaces
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p
index 2198d4b3f4..3c98abcee9 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p
@@ -19,7 +19,7 @@ internalField   uniform 1e5;
 
 boundaryField
 {
-    region0_to_plateRegion_plateFaces
+    region0_to_plate_plateFaces
     {
         type            calculated;
         value           $internalField;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p_rgh
index b155e3fa89..a1de42bcb3 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/p_rgh
@@ -19,7 +19,7 @@ internalField   uniform 1e5;
 
 boundaryField
 {
-    region0_to_plateRegion_plateFaces
+    region0_to_plate_plateFaces
     {
         type            fixedFluxPressure;
         value           $internalField;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/T.orig b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/T
similarity index 96%
rename from tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/T.orig
rename to tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/T
index 33124e407f..f4f7324d58 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/T.orig
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/T
@@ -20,11 +20,18 @@ internalField   uniform 300;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     plateFaces_top
     {
         type            zeroGradient;
     }
 
+    plate_to_region0_plateFaces
+    {
+        type            zeroGradient;
+    }
+
     bottom
     {
         type            inletOutlet;
@@ -36,13 +43,6 @@ boundaryField
         type            inletOutlet;
         inletValue      $internalField;
     }
-
-    region0_to_plateRegion_plateFaces
-    {
-        type            zeroGradient;
-    }
-
-    #includeEtc "caseDicts/setConstraintTypes"
 }
 
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/U.orig b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/U
similarity index 96%
rename from tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/U.orig
rename to tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/U
index 29b40a1bc3..7853a689b9 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/U.orig
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/U
@@ -20,11 +20,18 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     plateFaces_top
     {
         type            slip;
     }
 
+    plate_to_region0_plateFaces
+    {
+        type            noSlip;
+    }
+
     bottom
     {
         type            zeroGradient;
@@ -35,13 +42,6 @@ boundaryField
         type            fixedValue;
         value           $internalField;
     }
-
-    region0_to_plateRegion_plateFaces
-    {
-        type            noSlip;
-    }
-
-    #includeEtc "caseDicts/setConstraintTypes"
 }
 
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/delta.orig b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/delta
similarity index 93%
rename from tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/delta.orig
rename to tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/delta
index 9ae2d15e96..01af9d6112 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plateRegion/delta.orig
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/0/plate/delta
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       volScalarField;
-    location    "0/plateRegion";
+    location    "0/plate";
     object      delta;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,11 +20,18 @@ internalField   uniform 0;
 
 boundaryField
 {
+    #includeEtc "caseDicts/setConstraintTypes"
+
     plateFaces_top
     {
         type            zeroGradient;
     }
 
+    plate_to_region0_plateFaces
+    {
+        type            zeroGradient;
+    }
+
     bottom
     {
         type            inletOutlet;
@@ -36,13 +43,6 @@ boundaryField
         type            inletOutlet;
         inletValue      $internalField;
     }
-
-    region0_to_plateRegion_plateFaces
-    {
-        type            zeroGradient;
-    }
-
-    #includeEtc "caseDicts/setConstraintTypes"
 }
 
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/Allclean
index 696de8c562..56f9b88ab5 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/Allclean
@@ -4,7 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cleanVoFCase
-rm -rf constant/plateRegion/polyMesh
+cleanVoFCase && rm -rf constant/plate/polyMesh
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/Allrun
index bb6507edec..7173be589d 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/Allrun
@@ -4,15 +4,15 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name
-application=$(getApplication)
-
 runApplication blockMesh
 runApplication topoSet
 runApplication extrudeToRegionMesh -overwrite
 
 runApplication setFields
 
-runApplication $application
+runApplication $(getApplication)
+
+paraFoam -touch
+paraFoam -touch -region plate
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/constant/plateRegion/physicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/constant/plate/physicalProperties
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/constant/plateRegion/physicalProperties
rename to tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/constant/plate/physicalProperties
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/constant/surfaceFilmProperties b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/constant/surfaceFilmProperties
index 518d1e9556..d56f951895 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/constant/surfaceFilmProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/constant/surfaceFilmProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-regionName      plateRegion;
+regionName      plate;
 
 phase           liquid;
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/extrudeToRegionMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/extrudeToRegionMeshDict
index 967ec762ce..06811c24dd 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/extrudeToRegionMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/extrudeToRegionMeshDict
@@ -13,14 +13,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-region          plateRegion;
+region          plate;
 
 faceZones       (plateFaces);
 
-oneD            false;
-
-sampleMode      nearestPatchFace;
-
 extrudeModel    linearNormal;
 
 nLayers         1;
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plateRegion/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plate/fvSchemes
similarity index 96%
rename from tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plateRegion/fvSchemes
rename to tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plate/fvSchemes
index 3101c12c4a..76df743ef6 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plateRegion/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plate/fvSchemes
@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    location    "system/plateRegion";
+    location    "system/plate";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plateRegion/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plate/fvSolution
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plateRegion/fvSolution
rename to tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/plate/fvSolution
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict
index 751d670a4c..99b9b86fac 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict
@@ -23,7 +23,6 @@ actions
         source  patchToFace;
         patch   plate;
     }
-
     {
         name    plateFaces;
         type    faceZoneSet;