diff --git a/applications/utilities/mesh/generation/extrudeMesh/Allwclean b/applications/utilities/mesh/generation/extrude/Allwclean
similarity index 79%
rename from applications/utilities/mesh/generation/extrudeMesh/Allwclean
rename to applications/utilities/mesh/generation/extrude/Allwclean
index 3ac620b145..c1c94a806b 100755
--- a/applications/utilities/mesh/generation/extrudeMesh/Allwclean
+++ b/applications/utilities/mesh/generation/extrude/Allwclean
@@ -3,6 +3,7 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wclean libso extrudeModel
-wclean
+wclean extrudeMesh
+wclean extrudeToRegionMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/extrudeMesh/Allwmake b/applications/utilities/mesh/generation/extrude/Allwmake
similarity index 79%
rename from applications/utilities/mesh/generation/extrudeMesh/Allwmake
rename to applications/utilities/mesh/generation/extrude/Allwmake
index 871cad2b68..091ec04743 100755
--- a/applications/utilities/mesh/generation/extrudeMesh/Allwmake
+++ b/applications/utilities/mesh/generation/extrude/Allwmake
@@ -3,6 +3,8 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wmake libso extrudeModel
-wmake
+wmake extrudeMesh
+wmake extrudeToRegionMesh
+
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/extrudeMesh/Make/files b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/Make/files
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/Make/files
diff --git a/applications/utilities/mesh/generation/extrudeMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
similarity index 89%
rename from applications/utilities/mesh/generation/extrudeMesh/Make/options
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
index 1cdc68a2c7..9a10a36f3c 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     -IextrudedMesh \
-    -IextrudeModel/lnInclude \
+    -I../extrudeModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/utilities/mesh/generation/extrudeMesh/createTimeExtruded.H b/applications/utilities/mesh/generation/extrude/extrudeMesh/createTimeExtruded.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/createTimeExtruded.H
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/createTimeExtruded.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
similarity index 99%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 6de1574703..0b0ad610bc 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -214,9 +214,8 @@ int main(int argc, char *argv[])
     (
         IOobject
         (
-            "extrudeProperties",
-            runTimeExtruded.constant(),
-            regionDir,
+            "extrudeMeshDict",
+            runTimeExtruded.system(),
             runTimeExtruded,
             IOobject::MUST_READ_IF_MODIFIED
         )
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
similarity index 98%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
index c820e3f8a8..a38614047b 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      extrudeProperties;
+    object      extrudeMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.H b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.H
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files b/applications/utilities/mesh/generation/extrude/extrudeModel/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files
rename to applications/utilities/mesh/generation/extrude/extrudeModel/Make/files
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/options b/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/options
rename to applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModel.C b/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModel.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModel.H b/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModel.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C b/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModelNew.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModelNew.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.C b/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.H b/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.C b/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.H b/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C b/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H b/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.C b/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.H b/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.C b/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.H b/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/files b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/Make/files
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/files
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
similarity index 78%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
index 7c1ab5a64a..abe16677f5 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@@ -1,9 +1,11 @@
 EXE_INC = \
+    -I../extrudeModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
+    -lextrudeModel \
     -lfiniteVolume \
     -lmeshTools \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
similarity index 59%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
index 4034428bfb..543e5550a2 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
@@ -93,7 +93,7 @@ void Foam::createShellMesh::calcPointRegions
                         label fp2 = findIndex(f2, pointI);
                         label& region = pointRegions[face2][fp2];
                         if (region != -1)
-                        {   
+                        {
                             FatalErrorIn
                             (
                                 "createShellMesh::calcPointRegions(..)"
@@ -185,18 +185,20 @@ Foam::createShellMesh::createShellMesh
 
 void Foam::createShellMesh::setRefinement
 (
-    const pointField& thickness,
+    const pointField& firstLayerDisp,
+    const scalar expansionRatio,
+    const label nLayers,
     const labelList& topPatchID,
     const labelList& bottomPatchID,
     const labelListList& extrudeEdgePatches,
     polyTopoChange& meshMod
 )
 {
-    if (thickness.size() != regionPoints_.size())
+    if (firstLayerDisp.size() != regionPoints_.size())
     {
         FatalErrorIn("createShellMesh::setRefinement(..)")
             << "nRegions:" << regionPoints_.size()
-            << " thickness:" << thickness.size()
+            << " firstLayerDisp:" << firstLayerDisp.size()
             << exit(FatalError);
     }
 
@@ -224,30 +226,36 @@ void Foam::createShellMesh::setRefinement
 
 
     // From cell to patch (trivial)
-    DynamicList<label> cellToFaceMap(patch_.size());
+    DynamicList<label> cellToFaceMap(nLayers*patch_.size());
     // From face to patch+turning index
-    DynamicList<label> faceToFaceMap(2*patch_.size()+patch_.nEdges());
+    DynamicList<label> faceToFaceMap
+    (
+        (nLayers+1)*(patch_.size()+patch_.nEdges())
+    );
     // From face to patch edge index
-    DynamicList<label> faceToEdgeMap(patch_.nEdges()+patch_.nEdges());
+    DynamicList<label> faceToEdgeMap(nLayers*(patch_.nEdges()+patch_.nEdges()));
     // From point to patch point index
-    DynamicList<label> pointToPointMap(2*patch_.nPoints());
+    DynamicList<label> pointToPointMap((nLayers+1)*patch_.nPoints());
 
 
     // Introduce new cell for every face
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    labelList addedCells(patch_.size());
+    labelList addedCells(nLayers*patch_.size());
     forAll(patch_, faceI)
     {
-        addedCells[faceI] = meshMod.addCell
-        (
-            -1,                     // masterPointID
-            -1,                     // masterEdgeID
-            -1,                     // masterFaceID
-            cellToFaceMap.size(),   // masterCellID
-            -1                      // zoneID
-        );
-        cellToFaceMap.append(faceI);
+        for (label layerI = 0; layerI < nLayers; layerI++)
+        {
+            addedCells[nLayers*faceI+layerI] = meshMod.addCell
+            (
+                -1,                     // masterPointID
+                -1,                     // masterEdgeID
+                -1,                     // masterFaceID
+                cellToFaceMap.size(),   // masterCellID
+                -1                      // zoneID
+            );
+            cellToFaceMap.append(faceI);
+        }
     }
 
 
@@ -261,7 +269,7 @@ void Foam::createShellMesh::setRefinement
         meshMod.addPoint
         (
             patch_.localPoints()[pointI],   // point
-            pointToPointMap.size(),         // masterPointID 
+            pointToPointMap.size(),         // masterPointID
             -1,                             // zoneID
             true                            // inCell
         );
@@ -277,25 +285,28 @@ void Foam::createShellMesh::setRefinement
     // Introduce new points (one for every region)
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    labelList addedPoints(regionPoints_.size());
+    labelList addedPoints(nLayers*regionPoints_.size());
     forAll(regionPoints_, regionI)
     {
         label pointI = regionPoints_[regionI];
-        point extrudedPt = patch_.localPoints()[pointI] + thickness[regionI];
 
-        addedPoints[regionI] = meshMod.addPoint
-        (
-            extrudedPt,             // point
-            pointToPointMap.size(), // masterPointID - used only addressing
-            -1,                     // zoneID
-            true                    // inCell
-        );
-        pointToPointMap.append(pointI);
+        point pt = patch_.localPoints()[pointI];
+        point disp = firstLayerDisp[regionI];
+        for (label layerI = 0; layerI < nLayers; layerI++)
+        {
+            pt += disp;
 
-        //Pout<< "Added top point " << addedPoints[regionI]
-        //    << " at " << extrudedPt
-        //    << "  from point " << pointI
-        //    << endl;
+            addedPoints[nLayers*regionI+layerI] = meshMod.addPoint
+            (
+                pt,                     // point
+                pointToPointMap.size(), // masterPointID - used only addressing
+                -1,                     // zoneID
+                true                    // inCell
+            );
+            pointToPointMap.append(pointI);
+
+            disp *= expansionRatio;
+        }
     }
 
 
@@ -305,61 +316,84 @@ void Foam::createShellMesh::setRefinement
         meshMod.addFace
         (
             patch_.localFaces()[faceI].reverseFace(),// vertices
-            addedCells[faceI],          // own
+            addedCells[nLayers*faceI],  // own
             -1,                         // nei
             -1,                         // masterPointID
             -1,                         // masterEdgeID
             faceToFaceMap.size(),       // masterFaceID : current faceI
             true,                       // flipFaceFlux
-            bottomPatchID[faceI],// patchID
+            bottomPatchID[faceI],       // patchID
             -1,                         // zoneID
             false                       // zoneFlip
         );
         faceToFaceMap.append(-faceI-1); // points to flipped original face
         faceToEdgeMap.append(-1);
 
+        //const face newF(patch_.localFaces()[faceI].reverseFace());
         //Pout<< "Added bottom face "
-        //    << patch_.localFaces()[faceI].reverseFace()
+        //    << newF
+        //    << " coords:" << UIndirectList<point>(meshMod.points(), newF)
         //    << " own " << addedCells[faceI]
+        //    << " patch:" << bottomPatchID[faceI]
         //    << "  at " << patch_.faceCentres()[faceI]
         //    << endl;
-
     }
 
-    // Add face on top
+    // Add inbetween faces and face on top
     forAll(patch_.localFaces(), faceI)
     {
         // Get face in original ordering
         const face& f = patch_.localFaces()[faceI];
 
-        // Pick up point based on region
         face newF(f.size());
-        forAll(f, fp)
+
+        for (label layerI = 0; layerI < nLayers; layerI++)
         {
-            label region = pointRegions_[faceI][fp];
-            newF[fp] = addedPoints[region];
+            // Pick up point based on region and layer
+            forAll(f, fp)
+            {
+                label region = pointRegions_[faceI][fp];
+                newF[fp] = addedPoints[region*nLayers+layerI];
+            }
+
+            label own = addedCells[faceI*nLayers+layerI];
+            label nei;
+            label patchI;
+            if (layerI == nLayers-1)
+            {
+                nei = -1;
+                patchI = topPatchID[faceI];
+            }
+            else
+            {
+                nei = addedCells[faceI*nLayers+layerI+1];
+                patchI = -1;
+            }
+
+            meshMod.addFace
+            (
+                newF,                       // vertices
+                own,                        // own
+                nei,                        // nei
+                -1,                         // masterPointID
+                -1,                         // masterEdgeID
+                faceToFaceMap.size(),       // masterFaceID : current faceI
+                false,                      // flipFaceFlux
+                patchI,                     // patchID
+                -1,                         // zoneID
+                false                       // zoneFlip
+            );
+            faceToFaceMap.append(faceI+1);  // unflipped
+            faceToEdgeMap.append(-1);
+
+            //Pout<< "Added inbetween face " << newF
+            //    << " coords:" << UIndirectList<point>(meshMod.points(), newF)
+            //    << " at layer " << layerI
+            //    << " own " << own
+            //    << " nei " << nei
+            //    << "  at " << patch_.faceCentres()[faceI]
+            //    << endl;
         }
-
-        meshMod.addFace
-        (
-            newF,                       // vertices
-            addedCells[faceI],          // own
-            -1,                         // nei
-            -1,                         // masterPointID
-            -1,                         // masterEdgeID
-            faceToFaceMap.size(),       // masterFaceID : current faceI
-            false,                      // flipFaceFlux
-            topPatchID[faceI],          // patchID
-            -1,                         // zoneID
-            false                       // zoneFlip
-        );
-        faceToFaceMap.append(faceI+1);  // unflipped
-        faceToEdgeMap.append(-1);
-
-        //Pout<< "Added top face " << newF
-        //    << " own " << addedCells[faceI]
-        //    << "  at " << patch_.faceCentres()[faceI]
-        //    << endl;
     }
 
 
@@ -376,8 +410,7 @@ void Foam::createShellMesh::setRefinement
 
         if (ePatches.size() == 0)
         {
-            // internal face.
-
+            // Internal face
             if (eFaces.size() != 2)
             {
                 FatalErrorIn("createShellMesh::setRefinement(..)")
@@ -385,61 +418,6 @@ void Foam::createShellMesh::setRefinement
                     << " not internal but does not have side-patches defined."
                     << exit(FatalError);
             }
-
-            // Extrude
-
-            // Make face pointing in to eFaces[0] so out of new master face
-            const face& f = patch_.localFaces()[eFaces[0]];
-            const edge& e = patch_.edges()[edgeI];
-
-            label fp0 = findIndex(f, e[0]);
-            label fp1 = f.fcIndex(fp0);
-
-            if (f[fp1] != e[1])
-            {
-                fp1 = fp0;
-                fp0 = f.rcIndex(fp1);
-            }
-
-            face newF(4);
-            newF[0] = f[fp0];
-            newF[1] = f[fp1];
-            newF[2] = addedPoints[pointRegions_[eFaces[0]][fp1]];
-            newF[3] = addedPoints[pointRegions_[eFaces[0]][fp0]];
-
-            label minCellI = addedCells[eFaces[0]];
-            label maxCellI = addedCells[eFaces[1]];
-
-            if (minCellI > maxCellI)
-            {
-                // Swap
-                Swap(minCellI, maxCellI);
-                newF = newF.reverseFace();
-            }
-
-            //Pout<< "for internal edge:" << e
-            //    << " at:" << patch_.localPoints()[e[0]]
-            //    << patch_.localPoints()[e[1]]
-            //    << " adding face:" << newF
-            //    << " from f:" << f
-            //    << " inbetween " << minCellI << " and " << maxCellI << endl;
-
-            // newF already outwards pointing.
-            meshMod.addFace
-            (
-                newF,       // vertices
-                minCellI,   // own
-                maxCellI,   // nei
-                -1,         // masterPointID
-                -1,         // masterEdgeID
-                faceToFaceMap.size(),   // masterFaceID
-                false,      // flipFaceFlux
-                -1,         // patchID
-                -1,         // zoneID
-                false       // zoneFlip
-            );
-            faceToFaceMap.append(0);
-            faceToEdgeMap.append(edgeI);
         }
         else
         {
@@ -451,52 +429,91 @@ void Foam::createShellMesh::setRefinement
                     << " but only " << ePatches.size()
                     << " boundary faces defined." << exit(FatalError);
             }
+        }
 
 
-            // Extrude eFaces[0]
-            label minFaceI = eFaces[0];
 
-            // Make face pointing in to eFaces[0] so out of new master face
-            const face& f = patch_.localFaces()[minFaceI];
+        // Make face pointing in to eFaces[0] so out of new master face
+        const face& f = patch_.localFaces()[eFaces[0]];
+        const edge& e = patch_.edges()[edgeI];
 
-            const edge& e = patch_.edges()[edgeI];
-            label fp0 = findIndex(f, e[0]);
-            label fp1 = f.fcIndex(fp0);
+        label fp0 = findIndex(f, e[0]);
+        label fp1 = f.fcIndex(fp0);
 
-            if (f[fp1] != e[1])
+        if (f[fp1] != e[1])
+        {
+            fp1 = fp0;
+            fp0 = f.rcIndex(fp1);
+        }
+
+        face newF(4);
+
+        for (label layerI = 0; layerI < nLayers; layerI++)
+        {
+            label region0 = pointRegions_[eFaces[0]][fp0];
+            label region1 = pointRegions_[eFaces[0]][fp1];
+
+            if (layerI == 0)
             {
-                fp1 = fp0;
-                fp0 = f.rcIndex(fp1);
+                newF[0] = f[fp0];
+                newF[1] = f[fp1];
+                newF[2] = addedPoints[nLayers*region1+layerI];
+                newF[3] = addedPoints[nLayers*region0+layerI];
+            }
+            else
+            {
+                newF[0] = addedPoints[nLayers*region0+layerI-1];
+                newF[1] = addedPoints[nLayers*region1+layerI-1];
+                newF[2] = addedPoints[nLayers*region1+layerI];
+                newF[3] = addedPoints[nLayers*region0+layerI];
             }
 
-            face newF(4);
-            newF[0] = f[fp0];
-            newF[1] = f[fp1];
-            newF[2] = addedPoints[pointRegions_[minFaceI][fp1]];
-            newF[3] = addedPoints[pointRegions_[minFaceI][fp0]];
+            label minCellI = addedCells[nLayers*eFaces[0]+layerI];
+            label maxCellI;
+            label patchI;
+            if (ePatches.size() == 0)
+            {
+                maxCellI = addedCells[nLayers*eFaces[1]+layerI];
+                if (minCellI > maxCellI)
+                {
+                    // Swap
+                    Swap(minCellI, maxCellI);
+                    newF = newF.reverseFace();
+                }
+                patchI = -1;
+            }
+            else
+            {
+                maxCellI = -1;
+                patchI = ePatches[0];
+            }
 
-
-            //Pout<< "for external edge:" << e
-            //    << " at:" << patch_.localPoints()[e[0]]
-            //    << patch_.localPoints()[e[1]]
-            //    << " adding first patch face:" << newF
-            //    << " from:" << f
-            //    << " into patch:" << ePatches[0]
-            //    << " own:" << addedCells[minFaceI]
-            //    << endl;
+            //{
+            //    Pout<< "Adding from face:" << patch_.faceCentres()[eFaces[0]]
+            //        << " from edge:"
+            //        << patch_.localPoints()[f[fp0]]
+            //        << patch_.localPoints()[f[fp1]]
+            //        << " at layer:" << layerI
+            //        << " with new points:" << newF
+            //        << " locations:"
+            //        << UIndirectList<point>(meshMod.points(), newF)
+            //        << " own:" << minCellI
+            //        << " nei:" << maxCellI
+            //        << endl;
+            //}
 
 
             // newF already outwards pointing.
             meshMod.addFace
             (
                 newF,                   // vertices
-                addedCells[minFaceI],   // own
-                -1,                     // nei
+                minCellI,               // own
+                maxCellI,               // nei
                 -1,                     // masterPointID
                 -1,                     // masterEdgeID
                 faceToFaceMap.size(),   // masterFaceID
                 false,                  // flipFaceFlux
-                ePatches[0],            // patchID
+                patchI,                 // patchID
                 -1,                     // zoneID
                 false                   // zoneFlip
             );
@@ -532,35 +549,57 @@ void Foam::createShellMesh::setRefinement
                 }
 
                 face newF(4);
-                newF[0] = f[fp0];
-                newF[1] = f[fp1];
-                newF[2] = addedPoints[pointRegions_[minFaceI][fp1]];
-                newF[3] = addedPoints[pointRegions_[minFaceI][fp0]];
+                for (label layerI = 0; layerI < nLayers; layerI++)
+                {
+                    label region0 = pointRegions_[minFaceI][fp0];
+                    label region1 = pointRegions_[minFaceI][fp1];
 
-                //Pout<< "for external edge:" << e
-                //    << " at:" << patch_.localPoints()[e[0]]
-                //    << patch_.localPoints()[e[1]]
-                //    << " adding patch face:" << newF
-                //    << " from:" << f
-                //    << " into patch:" << ePatches[i]
-                //    << endl;
+                    if (layerI == 0)
+                    {
+                        newF[0] = f[fp0];
+                        newF[1] = f[fp1];
+                        newF[2] = addedPoints[nLayers*region1+layerI];
+                        newF[3] = addedPoints[nLayers*region0+layerI];
+                    }
+                    else
+                    {
+                        newF[0] = addedPoints[nLayers*region0+layerI-1];
+                        newF[1] = addedPoints[nLayers*region1+layerI-1];
+                        newF[2] = addedPoints[nLayers*region1+layerI];
+                        newF[3] = addedPoints[nLayers*region0+layerI];
+                    }
 
-                // newF already outwards pointing.
-                meshMod.addFace
-                (
-                    newF,                   // vertices
-                    addedCells[minFaceI],   // own
-                    -1,                     // nei
-                    -1,                     // masterPointID
-                    -1,                     // masterEdgeID
-                    faceToFaceMap.size(),   // masterFaceID
-                    false,                  // flipFaceFlux
-                    ePatches[i],            // patchID
-                    -1,                     // zoneID
-                    false                   // zoneFlip
-                );
-                faceToFaceMap.append(0);
-                faceToEdgeMap.append(edgeI);
+                    ////if (ePatches.size() == 0)
+                    //{
+                    //    Pout<< "Adding from MULTI face:"
+                    //        << patch_.faceCentres()[minFaceI]
+                    //        << " from edge:"
+                    //        << patch_.localPoints()[f[fp0]]
+                    //        << patch_.localPoints()[f[fp1]]
+                    //        << " at layer:" << layerI
+                    //        << " with new points:" << newF
+                    //        << " locations:"
+                    //        << UIndirectList<point>(meshMod.points(), newF)
+                    //        << endl;
+                    //}
+
+                    // newF already outwards pointing.
+                    meshMod.addFace
+                    (
+                        newF,                   // vertices
+                        addedCells[nLayers*minFaceI+layerI],   // own
+                        -1,                     // nei
+                        -1,                     // masterPointID
+                        -1,                     // masterEdgeID
+                        faceToFaceMap.size(),   // masterFaceID
+                        false,                  // flipFaceFlux
+                        ePatches[i],            // patchID
+                        -1,                     // zoneID
+                        false                   // zoneFlip
+                    );
+                    faceToFaceMap.append(0);
+                    faceToEdgeMap.append(edgeI);
+                }
             }
         }
     }
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.H
similarity index 93%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.H
index 132e70f1fb..1cb691f38c 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.H
@@ -109,7 +109,8 @@ public:
 
         // Access
 
-            //- From region cell to patch face
+            //- From region cell to patch face. Consecutively added so
+            //  cell at layerI is at patchFaceI*nLayers+layerI
             const labelList& cellToFaceMap() const
             {
                 return cellToFaceMap_;
@@ -120,7 +121,7 @@ public:
             //            be in top patch
             //      < 0 : face in opposite orientation as patch face. face will
             //            be in bottom patch
-            //      = 0 : for all side faces
+            //      = 0 : for all side and internal faces
             const labelList& faceToFaceMap() const
             {
                 return faceToFaceMap_;
@@ -153,7 +154,9 @@ public:
             //- Play commands into polyTopoChange to create layer mesh.
             void setRefinement
             (
-                const pointField& thickness,
+                const pointField& firstLayerThickness,
+                const scalar expansionRatio,
+                const label nLayers,
                 const labelList& topPatchID,
                 const labelList& bottomPatchID,
                 const labelListList& extrudeEdgePatches,
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
similarity index 97%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index fb019694da..87c936fe21 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -133,6 +133,7 @@ Usage
 #include "syncTools.H"
 #include "cyclicPolyPatch.H"
 #include "nonuniformTransformCyclicPolyPatch.H"
+#include "extrudeModel.H"
 
 using namespace Foam;
 
@@ -689,39 +690,6 @@ void countExtrudePatches
 }
 
 
-// Lexical ordering for vectors.
-bool lessThan(const point& x, const point& y)
-{
-    for (direction dir = 0; dir < point::nComponents; dir++)
-    {
-        if (x[dir] < y[dir]) return true;
-        if (x[dir] > y[dir]) return false;
-    }
-    return false;
-}
-
-
-// Combine vectors
-class minEqVectorOp
-{
-    public:
-    void operator()(vector& x, const vector& y) const
-    {
-        if (y != vector::zero)
-        {
-            if (x == vector::zero)
-            {
-                x = y;
-            }
-            else if (lessThan(y, x))
-            {
-                x = y;
-            }
-        }
-    }
-};
-
-
 // Constrain&sync normals on points that are on coupled patches to make sure
 // the face extruded from the edge has a valid normal with its coupled
 // equivalent.
@@ -846,14 +814,14 @@ void constrainCoupledNormals
     (
         mesh,
         edgeNormals0,
-        minEqVectorOp(),
+        maxMagSqrEqOp<vector>(),
         vector::zero            // nullValue
     );
     syncTools::syncEdgeList
     (
         mesh,
         edgeNormals1,
-        minEqVectorOp(),
+        maxMagSqrEqOp<vector>(),
         vector::zero            // nullValue
     );
 
@@ -951,14 +919,9 @@ tmp<pointField> calcOffset
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validArgs.append("shellRegion");
-    argList::validArgs.append("faceZones");
-    argList::validArgs.append("thickness");
-
-    Foam::argList::addBoolOption
+    argList::addNote
     (
-        "oneD",
-        "generate columns of 1D cells"
+        "Create region mesh by extruding a faceZone"
     );
 
     #include "addRegionOption.H"
@@ -966,19 +929,34 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createNamedMesh.H"
-    const word oldInstance = mesh.pointsInstance();
 
-    word shellRegionName = args.additionalArgs()[0];
-    const wordList zoneNames(IStringStream(args.additionalArgs()[1])());
-    scalar thickness = readScalar(IStringStream(args.additionalArgs()[2])());
+    const word oldInstance = mesh.pointsInstance();
     bool overwrite = args.optionFound("overwrite");
-    bool oneD = args.optionFound("oneD");
+
+    IOdictionary dict
+    (
+        IOobject
+        (
+            "extrudeToRegionMeshDict",
+            runTime.system(),
+            runTime,
+            IOobject::MUST_READ_IF_MODIFIED
+        )
+    );
+
+    // Point generator
+    autoPtr<extrudeModel> model(extrudeModel::New(dict));
+
+
+    // Region
+    const word shellRegionName(dict.lookup("region"));
+    const wordList zoneNames(dict.lookup("faceZones"));
+    const Switch oneD(dict.lookup("oneD"));
 
 
     Info<< "Extruding zones " << zoneNames
         << " on mesh " << regionName
         << " into shell mesh " << shellRegionName
-        << " of thickness " << thickness << nl
         << endl;
 
     if (shellRegionName == regionName)
@@ -1081,7 +1059,6 @@ int main(int argc, char *argv[])
     );
 
 
-
     // Check whether the zone is internal or external faces to determine
     // what patch type to insert. Cannot be mixed
     // since then how to couple? - directMapped only valid for a whole patch.
@@ -1437,6 +1414,8 @@ int main(int argc, char *argv[])
     // Calculate a normal per region
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     vectorField regionNormals(regionPoints.size(), vector::zero);
+    vectorField regionCentres(regionPoints.size(), vector::zero);
+    labelList nRegionFaces(regionPoints.size(), 0);
 
     forAll(pointRegions, faceI)
     {
@@ -1446,9 +1425,15 @@ int main(int argc, char *argv[])
         {
             label region = pointRegions[faceI][fp];
             regionNormals[region] += extrudePatch.faceNormals()[faceI];
+            regionCentres[region] += extrudePatch.faceCentres()[faceI];
+            nRegionFaces[region]++;
         }
     }
     regionNormals /= mag(regionNormals);
+    forAll(regionCentres, regionI)
+    {
+        regionCentres[regionI] /= nRegionFaces[regionI];
+    }
 
 
     // Constrain&sync normals on points that are on coupled patches.
@@ -1463,10 +1448,13 @@ int main(int argc, char *argv[])
     );
 
     // For debugging: dump hedgehog plot of normals
+    if (false)
     {
         OFstream str(runTime.path()/"regionNormals.obj");
         label vertI = 0;
 
+        scalar thickness = model().sumThickness(1);
+
         forAll(pointRegions, faceI)
         {
             const face& f = extrudeFaces[faceI];
@@ -1486,6 +1474,16 @@ int main(int argc, char *argv[])
     }
 
 
+    // Use model to create displacements of first layer
+    vectorField firstDisp(regionNormals.size());
+    forAll(firstDisp, regionI)
+    {
+        const point& regionPt = regionCentres[regionI];
+        const vector& n = regionNormals[regionI];
+        firstDisp[regionI] = model()(regionPt, n, 1) - regionPt;
+    }
+
+
 
     // Create a new mesh
     // ~~~~~~~~~~~~~~~~~
@@ -1500,7 +1498,9 @@ int main(int argc, char *argv[])
 
         extruder.setRefinement
         (
-            thickness*regionNormals,
+            firstDisp,                              // first displacement
+            model().expansionRatio(),
+            model().nLayers(),                      // nLayers
             extrudeTopPatchID,
             extrudeBottomPatchID,
             extrudeEdgePatches,
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict
new file mode 100644
index 0000000000..6f6fc40f17
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict
@@ -0,0 +1,78 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      extrudeToRegionMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Name of region to create
+region  liquidFilm;
+
+// faceZones to extrude
+faceZones (f0);
+
+// Extrude 1D-columns of cells?
+oneD false;
+
+//- Extrusion model to use. The only logical choice is linearNormal?
+
+//- Linear extrusion in normal direction
+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 with grading according to pressure (atmospherics)
+//extrudeModel        sigmaRadial;
+
+nLayers             10;
+
+expansionRatio      0.9;
+
+linearNormalCoeffs
+{
+    thickness       0.05;
+}
+
+wedgeCoeffs
+{
+    axisPt      (0 0.1 -0.05);
+    axis        (-1 0 0);
+    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;
+}
+
+sigmaRadialCoeffs
+{
+    RTbyg           1;
+    pRef            1;
+    pStrat          1;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculator.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.C
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculator.C
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.H b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculator.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.H
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculator.H
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 7f80d01e5d..0e1631e776 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -55,23 +55,6 @@ namespace Foam
     defineTemplateTypeNameAndDebug(IOPtrList<dictionary>, 0);
 }
 
-// Combine operator to synchronise points. We choose point nearest to origin so
-// we can use e.g. great,great,great as null value.
-class nearestEqOp
-{
-
-public:
-
-    void operator()(vector& x, const vector& y) const
-    {
-        if (magSqr(y) < magSqr(x))
-        {
-            x = y;
-        }
-    }
-};
-
-
 void changePatchID
 (
     const polyMesh& mesh,
@@ -854,7 +837,7 @@ int main(int argc, char *argv[])
         (
             mesh,
             newPoints,
-            nearestEqOp(),
+            minMagSqrEqOp<vector>(),
             point(GREAT, GREAT, GREAT)
         );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
index 26d8b065c8..b36cf66ad4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
@@ -36,12 +36,12 @@ using namespace Foam;
 template<class Type>
 void ensightCloudField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
-    const Foam::word& cloudName,
-    Foam::Ostream& ensightCaseFile,
+    const IOobject& fieldObject,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
+    const word& cloudName,
+    Ostream& ensightCaseFile,
     const bool dataExists
 )
 {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
index 376e537037..8a624c11ee 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
@@ -42,13 +42,13 @@ SourceFiles
 template<class Type>
 void ensightCloudField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
-    const Foam::word& timeFile,
-    const Foam::word& cloudName,
-    Foam::Ostream& ensightCaseFile,
+    const IOobject& fieldObject,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
+    const word& timeFile,
+    const word& cloudName,
+    Ostream& ensightCaseFile,
     const bool dataExists
 );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index 5434209711..b9cb04b0d6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -105,11 +105,11 @@ void writeField
 template<class Type>
 bool writePatchField
 (
-    const Foam::Field<Type>& pf,
-    const Foam::label patchi,
-    const Foam::label ensightPatchI,
-    const Foam::faceSets& boundaryFaceSet,
-    const Foam::ensightMesh::nFacePrimitives& nfp,
+    const Field<Type>& pf,
+    const label patchi,
+    const label ensightPatchI,
+    const faceSets& boundaryFaceSet,
+    const ensightMesh::nFacePrimitives& nfp,
     ensightStream& ensightFile
 )
 {
@@ -153,15 +153,15 @@ bool writePatchField
 template<class Type>
 void writePatchField
 (
-    const Foam::word& fieldName,
-    const Foam::Field<Type>& pf,
-    const Foam::word& patchName,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const word& fieldName,
+    const Field<Type>& pf,
+    const word& patchName,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     const Time& runTime = eMesh.mesh().time();
@@ -271,12 +271,12 @@ template<class Type>
 void ensightField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     Info<< "Converting field " << vf.name() << endl;
@@ -500,12 +500,12 @@ template<class Type>
 void ensightPointField
 (
     const GeometricField<Type, pointPatchField, pointMesh>& pf,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     Info<< "Converting field " << pf.name() << endl;
@@ -679,14 +679,14 @@ void ensightPointField
 template<class Type>
 void ensightField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const IOobject& fieldObject,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
     const bool nodeValues,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     // Read field
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
index 20bb59b72a..bd23d234a4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
@@ -37,10 +37,10 @@ using namespace Foam;
 
 void ensightParticlePositions
 (
-    const Foam::fvMesh& mesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& timeFile,
-    const Foam::word& cloudName,
+    const fvMesh& mesh,
+    const fileName& postProcPath,
+    const word& timeFile,
+    const word& cloudName,
     const bool dataExists
 )
 {