diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
index 48ca530c96..1e4d6a3041 100755
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/applications/utilities/mesh/generation/Allwmake
@@ -11,7 +11,7 @@ wmake snappyHexMesh
 
 if [ -d "$CGAL_ARCH_PATH" ]
 then
-    cvMesh/Allwmake
+    foamyHexMesh/Allwmake
     cv2DMesh/Allwmake
 fi
 
diff --git a/applications/utilities/mesh/generation/cvMesh/Make/files b/applications/utilities/mesh/generation/cvMesh/Make/files
deleted file mode 100644
index 425e0f5b83..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-cvMesh.C
-
-EXE = $(FOAM_APPBIN)/cvMesh
diff --git a/applications/utilities/mesh/generation/cvMesh/Allwclean b/applications/utilities/mesh/generation/foamyHexMesh/Allwclean
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/Allwclean
rename to applications/utilities/mesh/generation/foamyHexMesh/Allwclean
diff --git a/applications/utilities/mesh/generation/cvMesh/Allwmake b/applications/utilities/mesh/generation/foamyHexMesh/Allwmake
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/Allwmake
rename to applications/utilities/mesh/generation/foamyHexMesh/Allwmake
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/Make/files
new file mode 100644
index 0000000000..58ec50cdc6
--- /dev/null
+++ b/applications/utilities/mesh/generation/foamyHexMesh/Make/files
@@ -0,0 +1,3 @@
+foamyHexMesh.C
+
+EXE = $(FOAM_APPBIN)/foamyHexMesh
diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/Make/options
rename to applications/utilities/mesh/generation/foamyHexMesh/Make/options
diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/files
rename to applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/files
diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/options
rename to applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options
diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
rename to applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
index a0327ce04f..fd0b574b3b 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
index 841e5c9024..733f1230f7 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index c3102f531b..250dd062c1 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -345,7 +345,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
     labelList owner(Triangulation::number_of_finite_facets());
     labelList neighbour(Triangulation::number_of_finite_facets());
 
-    wordList patchNames(1, "cvMesh_defaultPatch");
+    wordList patchNames(1, "foamyHexMesh_defaultPatch");
     wordList patchTypes(1, wallPolyPatch::typeName);
 
     PtrList<dictionary> patchDicts(1);
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index b2ed781b8b..53b332749b 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index fcc5d8c2ba..1eaa483c74 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTable.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTable.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTable.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTable.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTable.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H
index 6c093bc13a..786ec97158 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 1774ead3a4..c02ff6ffb4 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -608,7 +608,8 @@ bool Foam::backgroundMeshDecomposition::refineCell
     }
     else if (volType == volumeType::INSIDE)
     {
-        // scalar s = cvMesh_.cellShapeControl_.cellSize(cellBb.midpoint());
+        // scalar s =
+        //    foamyHexMesh_.cellShapeControl_.cellSize(cellBb.midpoint());
 
         // Estimate the number of points in the cell by the size at the cell
         // midpoint
@@ -835,7 +836,7 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
             "Foam::backgroundMeshDecomposition::backgroundMeshDecomposition"
             "("
                 "const dictionary& coeffsDict, "
-                "const conformalVoronoiMesh& cvMesh"
+                "const conformalVoronoiMesh& foamyHexMesh"
             ")"
         )
             << "This cannot be used when not running in parallel."
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index b93064d216..97b270a606 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -197,7 +197,7 @@ public:
 
     // Constructors
 
-        //- Construct from components in cvMesh operation
+        //- Construct from components in foamyHexMesh operation
         backgroundMeshDecomposition
         (
             const Time& runTime,
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
similarity index 96%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
index 1f8b7b0a32..f7f981e547 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H
index ac47311940..cdc7510f23 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
index 07c4a6e34c..17ac184f19 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
@@ -47,17 +47,20 @@ defineTypeNameAndDebug(cellShapeControl, 0);
 Foam::cellShapeControl::cellShapeControl
 (
     const Time& runTime,
-    const cvControls& cvMeshControls,
+    const cvControls& foamyHexMeshControls,
     const searchableSurfaces& allGeometry,
     const conformationSurfaces& geometryToConformTo
 )
 :
-    dictionary(cvMeshControls.cvMeshDict().subDict("motionControl")),
+    dictionary
+    (
+        foamyHexMeshControls.foamyHexMeshDict().subDict("motionControl")
+    ),
     runTime_(runTime),
     allGeometry_(allGeometry),
     geometryToConformTo_(geometryToConformTo),
-    defaultCellSize_(cvMeshControls.defaultCellSize()),
-    minimumCellSize_(cvMeshControls.minimumCellSize()),
+    defaultCellSize_(foamyHexMeshControls.defaultCellSize()),
+    minimumCellSize_(foamyHexMeshControls.minimumCellSize()),
     shapeControlMesh_(runTime),
     aspectRatio_(*this),
     sizeAndAlignment_
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H
index a25d5b8fe7..c9a3ae67bf 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H
@@ -105,7 +105,7 @@ public:
         cellShapeControl
         (
             const Time& runTime,
-            const cvControls& cvMeshControls,
+            const cvControls& foamyHexMeshControls,
             const searchableSurfaces& allGeometry,
             const conformationSurfaces& geometryToConformTo
         );
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index f4e3317bfe..42e8a161f9 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -90,7 +90,7 @@ defineTypeNameAndDebug(cellShapeControlMesh, 0);
 //
 //    const tensor Rp = rotationTensor(vector(0,0,1), np);
 //
-//    const label s = 36;//cvMeshControls().alignmentSearchSpokes();
+//    const label s = 36;//foamyHexMeshControls().alignmentSearchSpokes();
 //
 //    scalar closestSpokeHitDistance = GREAT;
 //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H
similarity index 96%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H
index 305256d4cc..8bceb79ed4 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H
similarity index 96%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H
index e80b3fb8f4..b3cc3dd5a3 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
similarity index 96%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
index 4e7dd48c38..59c627c946 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 805140fde3..2b422996de 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -78,7 +78,7 @@ void Foam::conformalVoronoiMesh::cellSizeMeshOverlapsBackground() const
             << endl;
 
         Pout<< "Cell Size Mesh Bounds = " << cellSizeMesh.bounds() << endl;
-        Pout<< "cvMesh Bounds         = " << bb << endl;
+        Pout<< "foamyHexMesh Bounds         = " << bb << endl;
 
         fullyContained = false;
     }
@@ -251,7 +251,7 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
 
     insertPoints(pts, true);
 
-    if (cvMeshControls().objOutput() && fName != fileName::null)
+    if (foamyHexMeshControls().objOutput() && fName != fileName::null)
     {
         writePoints(fName, pts);
     }
@@ -291,7 +291,7 @@ void Foam::conformalVoronoiMesh::insertEdgePointGroups
 
     insertPoints(pts, true);
 
-    if (cvMeshControls().objOutput() && fName != fileName::null)
+    if (foamyHexMeshControls().objOutput() && fName != fileName::null)
     {
         writePoints(fName, pts);
     }
@@ -337,7 +337,7 @@ void Foam::conformalVoronoiMesh::distribute()
 {
     if (!Pstream::parRun())
     {
-        return ;
+        return;
     }
 
     autoPtr<mapDistribute> mapDist =
@@ -439,12 +439,12 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
         }
     }
 
+    const dictionary& motionControlDict
+        = foamyHexMeshControls().foamyHexMeshDict().subDict("motionControl");
+
     label nMaxIter = readLabel
     (
-        cvMeshControls().cvMeshDict().subDict("motionControl").lookup
-        (
-            "maxRefinementIterations"
-        )
+        motionControlDict.lookup("maxRefinementIterations")
     );
 
     Info<< "Maximum number of refinement iterations : " << nMaxIter << endl;
@@ -481,10 +481,7 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
 
     label maxSmoothingIterations = readLabel
     (
-        cvMeshControls().cvMeshDict().subDict("motionControl").lookup
-        (
-            "maxSmoothingIterations"
-        )
+        motionControlDict.lookup("maxSmoothingIterations")
     );
     meshAlignmentSmoother.smoothAlignments(maxSmoothingIterations);
 
@@ -501,10 +498,18 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
         cellSizeMesh.write();
     }
 
-    if (cvMeshControls().printVertexInfo())
+    if (foamyHexMeshControls().printVertexInfo())
     {
         cellSizeMesh.printVertexInfo(Info);
     }
+
+//    Info<< "Estimated number of cells in final mesh = "
+//        << returnReduce
+//           (
+//               cellSizeMesh.estimateCellCount(decomposition_),
+//               sumOp<label>()
+//           )
+//        << endl;
 }
 
 
@@ -896,13 +901,13 @@ bool Foam::conformalVoronoiMesh::ownerAndNeighbour
 Foam::conformalVoronoiMesh::conformalVoronoiMesh
 (
     const Time& runTime,
-    const dictionary& cvMeshDict
+    const dictionary& foamyHexMeshDict
 )
 :
     DistributedDelaunayMesh<Delaunay>(),
     runTime_(runTime),
     rndGen_(64293*Pstream::myProcNo()),
-    cvMeshControls_(cvMeshDict),
+    foamyHexMeshControls_(foamyHexMeshDict),
     allGeometry_
     (
         IOobject
@@ -914,19 +919,19 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         ),
-        cvMeshDict.subDict("geometry")
+        foamyHexMeshDict.subDict("geometry")
     ),
     geometryToConformTo_
     (
         runTime_,
         rndGen_,
         allGeometry_,
-        cvMeshDict.subDict("surfaceConformation")
+        foamyHexMeshDict.subDict("surfaceConformation")
     ),
     cellShapeControl_
     (
         runTime_,
-        cvMeshControls_,
+        foamyHexMeshControls_,
         allGeometry_,
         geometryToConformTo_
     ),
@@ -944,7 +949,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
     (
         initialPointsMethod::New
         (
-            cvMeshDict.subDict("initialPoints"),
+            foamyHexMeshDict.subDict("initialPoints"),
             *this
         )
     ),
@@ -952,7 +957,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
     (
         relaxationModel::New
         (
-            cvMeshDict.subDict("motionControl"),
+            foamyHexMeshDict.subDict("motionControl"),
             runTime_
         )
     ),
@@ -960,14 +965,14 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
     (
         faceAreaWeightModel::New
         (
-            cvMeshDict.subDict("motionControl")
+            foamyHexMeshDict.subDict("motionControl")
         )
     ),
     decomposition_()
 {
-    if (cvMeshControls().objOutput())
+    if (foamyHexMeshControls().objOutput())
     {
-        geometryToConformTo_.writeFeatureObj("cvMesh");
+        geometryToConformTo_.writeFeatureObj("foamyHexMesh");
     }
 
     if (Pstream::parRun())
@@ -979,7 +984,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
                 runTime_,
                 rndGen_,
                 geometryToConformTo_,
-                cvMeshDict.subDict("backgroundMeshDecomposition")
+                foamyHexMeshDict.subDict("backgroundMeshDecomposition")
             )
         );
     }
@@ -1024,12 +1029,12 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
 
     cellSizeMeshOverlapsBackground();
 
-    if (cvMeshControls().printVertexInfo())
+    if (foamyHexMeshControls().printVertexInfo())
     {
         printVertexInfo(Info);
     }
 
-    if (cvMeshControls().objOutput())
+    if (foamyHexMeshControls().objOutput())
     {
         writePoints
         (
@@ -1238,7 +1243,7 @@ void Foam::conformalVoronoiMesh::move()
                 if
                 (
                     alignmentDotProd
-                  > cvMeshControls().cosAlignmentAcceptanceAngle()
+                  > foamyHexMeshControls().cosAlignmentAcceptanceAngle()
                 )
                 {
                     scalar targetCellSize = averageCellSize(vA, vB);
@@ -1311,11 +1316,13 @@ void Foam::conformalVoronoiMesh::move()
 //                            )
                         )
                      && rABMag
-                      > cvMeshControls().insertionDistCoeff()*targetCellSize
+                      > foamyHexMeshControls().insertionDistCoeff()
+                       *targetCellSize
                      && faceArea
-                      > cvMeshControls().faceAreaRatioCoeff()*targetFaceArea
+                      > foamyHexMeshControls().faceAreaRatioCoeff()
+                       *targetFaceArea
                      && alignmentDotProd
-                      > cvMeshControls().cosInsertionAcceptanceAngle()
+                      > foamyHexMeshControls().cosInsertionAcceptanceAngle()
                     )
                     {
                         // Point insertion
@@ -1344,7 +1351,7 @@ void Foam::conformalVoronoiMesh::move()
                          || (vB->internalPoint() && !vB->referred())
                         )
                      && rABMag
-                      < cvMeshControls().removalDistCoeff()
+                      < foamyHexMeshControls().removalDistCoeff()
                        *targetCellSize
                     )
                     {
@@ -1465,7 +1472,7 @@ void Foam::conformalVoronoiMesh::move()
     pointsToInsert.shrink();
 
     // Save displacements to file.
-    if (cvMeshControls().objOutput() && runTime_.outputTime())
+    if (foamyHexMeshControls().objOutput() && runTime_.outputTime())
     {
         Pout<< "Writing point displacement vectors to file." << endl;
         OFstream str("displacements_" + runTime_.timeName() + ".obj");
@@ -1578,7 +1585,7 @@ void Foam::conformalVoronoiMesh::move()
 
     conformToSurface();
 
-    if (cvMeshControls().objOutput())
+    if (foamyHexMeshControls().objOutput())
     {
         writePoints
         (
@@ -1587,14 +1594,14 @@ void Foam::conformalVoronoiMesh::move()
         );
     }
 
-    if (cvMeshControls().objOutput() && runTime_.outputTime())
+    if (foamyHexMeshControls().objOutput() && runTime_.outputTime())
     {
         writeBoundaryPoints("boundaryPoints_" + runTime_.timeName() + ".obj");
     }
 
     timeCheck("After conformToSurface");
 
-    if (cvMeshControls().printVertexInfo())
+    if (foamyHexMeshControls().printVertexInfo())
     {
         printVertexInfo(Info);
     }
@@ -1736,7 +1743,7 @@ void Foam::conformalVoronoiMesh::checkCoPlanarCells() const
         ++cit
     )
     {
-        const scalar quality = cvMeshChecks::coplanarTet(cit, 1e-16);
+        const scalar quality = foamyHexMeshChecks::coplanarTet(cit, 1e-16);
 
         if (quality == 0)
         {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 18ab434869..974724af9d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -140,7 +140,7 @@ private:
         mutable Random rndGen_;
 
         //- Controls for the conformal Voronoi meshing process
-        cvControls cvMeshControls_;
+        cvControls foamyHexMeshControls_;
 
         //- All geometry of the meshing process, including surfaces to be
         //  conformed to and those to be used for refinement
@@ -989,11 +989,11 @@ public:
 
     // Constructors
 
-        //- Construct from Time and cvMeshDict
+        //- Construct from Time and foamyHexMeshDict
         conformalVoronoiMesh
         (
             const Time& runTime,
-            const dictionary& cvMeshDict
+            const dictionary& foamyHexMeshDict
         );
 
 
@@ -1055,8 +1055,8 @@ public:
             //- Return the cellShapeControl object
             inline const cellShapeControl& cellShapeControls() const;
 
-            //- Return the cvMeshControls object
-            inline const cvControls& cvMeshControls() const;
+            //- Return the foamyHexMeshControls object
+            inline const cvControls& foamyHexMeshControls() const;
 
 
         // Write
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 24c45c239b..cfaf452d71 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -643,7 +643,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
 
     patchNames.setSize(patchNames.size() + 1);
 
-    patchNames[patchNames.size() - 1] = "cvMesh_defaultPatch";
+    patchNames[patchNames.size() - 1] = "foamyHexMesh_defaultPatch";
     patchTypes.setSize(patchNames.size(), wallPolyPatch::typeName);
 
     label nPatches = patchNames.size();
@@ -916,7 +916,7 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
 //                << endl;
 //        }
 //
-//        if (++iterI > cvMeshControls().maxCollapseIterations())
+//        if (++iterI > foamyHexMeshControls().maxCollapseIterations())
 //        {
 //            Info<< "    maxCollapseIterations reached, stopping collapse"
 //                << endl;
@@ -938,7 +938,7 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
 ////
 ////        label fC = cit->filterCount();
 ////
-////        if (fC > cvMeshControls().filterCountSkipThreshold())
+////        if (fC > foamyHexMeshControls().filterCountSkipThreshold())
 ////        {
 ////            // This vertex has been limited too many times, skip
 ////            continue;
@@ -967,7 +967,8 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
 ////                    pt += (surfHit.hitPoint() - pt)
 ////                         *pow
 ////                          (
-////                              cvMeshControls().filterErrorReductionCoeff(),
+////                              foamyHexMeshControls()
+////                                .filterErrorReductionCoeff(),
 ////                              fC
 ////                          );
 ////                }
@@ -990,7 +991,7 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
 //
 //    const scalar cosPerpendicularToleranceAngle = cos
 //    (
-//        degToRad(cvMeshControls().surfaceStepFaceAngle())
+//        degToRad(foamyHexMeshControls().surfaceStepFaceAngle())
 //    );
 //
 //    for
@@ -1036,7 +1037,7 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
 //
 //            label maxFC = maxFilterCount(eit);
 //
-//            if (maxFC > cvMeshControls().filterCountSkipThreshold())
+//            if (maxFC > foamyHexMeshControls().filterCountSkipThreshold())
 //            {
 //                // A vertex on this face has been limited too many
 //                // times, skip
@@ -1212,7 +1213,7 @@ Foam::conformalVoronoiMesh::createPolyMeshFromPoints
         (
             IOobject
             (
-                "cvMesh_temporary",
+                "foamyHexMesh_temporary",
                 runTime_.timeName(),
                 runTime_,
                 IOobject::NO_READ,
@@ -1328,9 +1329,13 @@ void Foam::conformalVoronoiMesh::checkCellSizing()
         << " cells "<< endl;
 
     const dictionary& dict
-        = cvMeshControls().cvMeshDict().subDict("meshQualityControls");
+        = foamyHexMeshControls().foamyHexMeshDict();
 
-    const scalar maxNonOrtho = readScalar(dict.lookup("maxNonOrtho", true));
+    const dictionary& meshQualityDict
+        = dict.subDict("meshQualityControls");
+
+    const scalar maxNonOrtho =
+        readScalar(meshQualityDict.lookup("maxNonOrtho", true));
 
     label nWrongFaces = 0;
 
@@ -1368,7 +1373,7 @@ void Foam::conformalVoronoiMesh::checkCellSizing()
 //    (
 //        false,
 //        pMesh,
-//        cvMeshControls().cvMeshDict().subDict("meshQualityControls"),
+//        meshQualityDict,
 //        checkFaces,
 //        wrongFaces
 //    );
@@ -1433,7 +1438,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findOffsetPatchFaces
     cellSet offsetBoundaryCells
     (
         mesh,
-        "cvMesh_protrudingCells",
+        "foamyHexMesh_protrudingCells",
         mesh.nCells()/1000
     );
 
@@ -1476,7 +1481,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findOffsetPatchFaces
         }
     }
 
-    if (cvMeshControls().objOutput())
+    if (foamyHexMeshControls().objOutput())
     {
         offsetBoundaryCells.write();
     }
@@ -1515,11 +1520,17 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
         << returnReduce(fAreas.size() - checkFaces.size(), sumOp<label>())
         << " faces from check, < " << faceAreaLimit << " area" << endl;
 
+    const dictionary& dict
+        = foamyHexMeshControls().foamyHexMeshDict();
+
+    const dictionary& meshQualityDict
+        = dict.subDict("meshQualityControls");
+
     motionSmoother::checkMesh
     (
         false,
         pMesh,
-        cvMeshControls().cvMeshDict().subDict("meshQualityControls"),
+        meshQualityDict,
         checkFaces,
         wrongFaces
     );
@@ -1869,7 +1880,7 @@ Foam::label Foam::conformalVoronoiMesh::createPatchInfo
 
     patchNames.setSize(patchNames.size() + 1);
     label defaultPatchIndex = patchNames.size() - 1;
-    patchNames[defaultPatchIndex] = "cvMesh_defaultPatch";
+    patchNames[defaultPatchIndex] = "foamyHexMesh_defaultPatch";
     patchDicts.set(defaultPatchIndex, new dictionary());
 
     label nProcPatches = 0;
@@ -2249,7 +2260,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
         patchPointPairSlaves[patchI].transfer(patchPPSlaves[patchI]);
     }
 
-//    if (cvMeshControls().objOutput())
+//    if (foamyHexMeshControls().objOutput())
     {
         Info<< "Writing processor interfaces" << endl;
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 87b999ff89..24116b56cc 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -96,7 +96,7 @@ Foam::conformalVoronoiMesh::reconformationControl() const
     if
     (
         runTime_.timeIndex()
-      % cvMeshControls().surfaceConformationRebuildFrequency() == 0
+      % foamyHexMeshControls().surfaceConformationRebuildFrequency() == 0
     )
     {
         return rmOn;
@@ -196,7 +196,7 @@ Foam::label Foam::conformalVoronoiMesh::findVerticesNearBoundaries()
 //
 //            const scalar range = sqr
 //            (
-//                cvMeshControls().nearBoundaryDistanceCoeff()
+//                foamyHexMeshControls().nearBoundaryDistanceCoeff()
 //               *targetCellSize(pt)
 //            );
 //
@@ -287,10 +287,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation()
     timeCheck("After set near boundary");
 
     const scalar edgeSearchDistCoeffSqr =
-        cvMeshControls().edgeSearchDistCoeffSqr();
+        foamyHexMeshControls().edgeSearchDistCoeffSqr();
 
     const scalar surfacePtReplaceDistCoeffSqr =
-        cvMeshControls().surfacePtReplaceDistCoeffSqr();
+        foamyHexMeshControls().surfacePtReplaceDistCoeffSqr();
 
     const label AtoV = label(6/Foam::pow(scalar(number_of_vertices()), 3));
 
@@ -429,10 +429,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation()
 
     label iterationNo = 0;
 
-    label maxIterations = cvMeshControls().maxConformationIterations();
+    label maxIterations = foamyHexMeshControls().maxConformationIterations();
 
     scalar iterationToInitialHitRatioLimit =
-        cvMeshControls().iterationToInitialHitRatioLimit();
+        foamyHexMeshControls().iterationToInitialHitRatioLimit();
 
     label hitLimit = label(iterationToInitialHitRatioLimit*initialTotalHits);
 
@@ -1022,7 +1022,7 @@ bool Foam::conformalVoronoiMesh::dualCellSurfaceAllIntersections
                         const scalar minSepDist =
                             sqr
                             (
-                                cvMeshControls().removalDistCoeff()
+                                foamyHexMeshControls().removalDistCoeff()
                                *targetCellSize(p)
                             );
 
@@ -1455,7 +1455,7 @@ void Foam::conformalVoronoiMesh::limitDisplacement
         scalar searchDistanceSqr = sqr
         (
             2*vit->targetCellSize()
-           *cvMeshControls().pointPairDistanceCoeff()
+           *foamyHexMeshControls().pointPairDistanceCoeff()
         );
 
         geometryToConformTo_.findSurfaceNearest
@@ -1803,7 +1803,8 @@ bool Foam::conformalVoronoiMesh::nearFeatureEdgeLocation
                 mag(cosAngle) < searchConeAngle
              && (
                     mag(lineBetweenPoints)
-                  > cvMeshControls().pointPairDistanceCoeff()*targetCellSize(pt)
+                  > foamyHexMeshControls().pointPairDistanceCoeff()
+                   *targetCellSize(pt)
                 )
             )
             {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
index 0782b8387b..f26c7a5b51 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
@@ -349,7 +349,7 @@ bool Foam::conformalVoronoiMesh::createSpecialisedFeaturePoint
           + radAngleBetween(concaveEdgePlaneANormal, concaveEdgePlaneBNormal)
         );
 
-        if (totalAngle > cvMeshControls().maxQuadAngle())
+        if (totalAngle > foamyHexMeshControls().maxQuadAngle())
         {
             // Add additional mitreing points
             //scalar angleSign = 1.0;
@@ -691,7 +691,7 @@ bool Foam::conformalVoronoiMesh::createSpecialisedFeaturePoint
           + radAngleBetween(convexEdgePlaneANormal, convexEdgePlaneBNormal)
         );
 
-        if (totalAngle > cvMeshControls().maxQuadAngle())
+        if (totalAngle > foamyHexMeshControls().maxQuadAngle())
         {
             // Add additional mitreing points
             //scalar angleSign = 1.0;
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
index 4b29bde8ec..24d69aa966 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
@@ -222,7 +222,7 @@ void Foam::conformalVoronoiMesh::createInternalEdgePointGroup
         radToDeg(constant::mathematical::pi + radAngleBetween(nA, nB));
 
     // Number of quadrants the angle should be split into
-    int nQuads = int(totalAngle/cvMeshControls().maxQuadAngle()) + 1;
+    int nQuads = int(totalAngle/foamyHexMeshControls().maxQuadAngle()) + 1;
 
     // The number of additional master points needed to obtain the
     // required number of quadrants.
@@ -404,7 +404,7 @@ void Foam::conformalVoronoiMesh::createMixedFeaturePoints
     DynamicList<Vb>& pts
 )
 {
-    if (cvMeshControls().mixedFeaturePointPPDistanceCoeff() < 0)
+    if (foamyHexMeshControls().mixedFeaturePointPPDistanceCoeff() < 0)
     {
         Info<< nl << "Skipping specialised handling for mixed feature points"
             << endl;
@@ -445,7 +445,7 @@ void Foam::conformalVoronoiMesh::createMixedFeaturePoints
 
             bool specialisedSuccess = false;
 
-            if (cvMeshControls().specialiseFeaturePoints())
+            if (foamyHexMeshControls().specialiseFeaturePoints())
             {
                 specialisedSuccess = createSpecialisedFeaturePoint
                 (
@@ -607,7 +607,7 @@ void Foam::conformalVoronoiMesh::insertFeaturePoints()
     // Insert the created points, distributing to the appropriate processor
     insertPoints(pts, true);
 
-    if (cvMeshControls().objOutput())
+    if (foamyHexMeshControls().objOutput())
     {
         writePoints("featureVertices.obj", pts);
     }
@@ -642,7 +642,7 @@ void Foam::conformalVoronoiMesh::constructFeaturePointLocations()
     {
         const extendedFeatureEdgeMesh& feMesh(feMeshes[i]);
 
-        if (cvMeshControls().mixedFeaturePointPPDistanceCoeff() < 0)
+        if (foamyHexMeshControls().mixedFeaturePointPPDistanceCoeff() < 0)
         {
             // Ignoring mixed feature points
             for
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index ca09259e0d..32810c7eed 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -27,7 +27,7 @@ License
 
 inline Foam::scalar Foam::conformalVoronoiMesh::defaultCellSize() const
 {
-    return cvMeshControls().defaultCellSize();
+    return foamyHexMeshControls().defaultCellSize();
 }
 
 
@@ -154,7 +154,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::pointPairDistance
     const Foam::point& pt
 ) const
 {
-    return targetCellSize(pt)*cvMeshControls().pointPairDistanceCoeff();
+    return targetCellSize(pt)*foamyHexMeshControls().pointPairDistanceCoeff();
 }
 
 
@@ -165,7 +165,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::mixedFeaturePointDistance
 {
     return
         pointPairDistance(pt)
-       *cvMeshControls().mixedFeaturePointPPDistanceCoeff();
+       *foamyHexMeshControls().mixedFeaturePointPPDistanceCoeff();
 }
 
 
@@ -178,7 +178,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::featurePointExclusionDistanceSqr
         sqr
         (
             targetCellSize(pt)
-           *cvMeshControls().featurePointExclusionDistanceCoeff()
+           *foamyHexMeshControls().featurePointExclusionDistanceCoeff()
         );
 }
 
@@ -192,7 +192,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::featureEdgeExclusionDistanceSqr
         sqr
         (
             targetCellSize(pt)
-           *cvMeshControls().featureEdgeExclusionDistanceCoeff()
+           *foamyHexMeshControls().featureEdgeExclusionDistanceCoeff()
         );
 }
 
@@ -206,7 +206,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::surfacePtExclusionDistanceSqr
         sqr
         (
             targetCellSize(pt)
-           *cvMeshControls().surfacePtExclusionDistanceCoeff()
+           *foamyHexMeshControls().surfacePtExclusionDistanceCoeff()
         );
 }
 
@@ -217,7 +217,11 @@ inline Foam::scalar Foam::conformalVoronoiMesh::surfaceSearchDistanceSqr
 ) const
 {
     return
-        sqr(targetCellSize(pt)*cvMeshControls().surfaceSearchDistanceCoeff());
+        sqr
+        (
+            targetCellSize(pt)
+           *foamyHexMeshControls().surfaceSearchDistanceCoeff()
+        );
 }
 
 
@@ -226,7 +230,9 @@ inline Foam::scalar Foam::conformalVoronoiMesh::maxSurfaceProtrusion
     const Foam::point& pt
 ) const
 {
-    return targetCellSize(pt)*cvMeshControls().maxSurfaceProtrusionCoeff();
+    return
+        targetCellSize(pt)
+       *foamyHexMeshControls().maxSurfaceProtrusionCoeff();
 }
 
 
@@ -683,9 +689,9 @@ Foam::conformalVoronoiMesh::cellShapeControls() const
 
 
 inline const Foam::cvControls&
-Foam::conformalVoronoiMesh::cvMeshControls() const
+Foam::conformalVoronoiMesh::foamyHexMeshControls() const
 {
-    return cvMeshControls_;
+    return foamyHexMeshControls_;
 }
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 3c00459baf..3514b83de7 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -41,7 +41,7 @@ void Foam::conformalVoronoiMesh::timeCheck
     const string& description
 ) const
 {
-    timeCheck(time(), description, cvMeshControls().timeChecks());
+    timeCheck(time(), description, foamyHexMeshControls().timeChecks());
 }
 
 
@@ -387,7 +387,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
         }
     }
 
-    if (cvMeshControls().writeTetDualMesh())
+    if (foamyHexMeshControls().writeTetDualMesh())
     {
         // Determine map from Delaunay vertex to Dual mesh
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -961,7 +961,7 @@ void Foam::conformalVoronoiMesh::writeMesh
     const PackedBoolList& boundaryFacesToRemove
 ) const
 {
-    if (cvMeshControls().objOutput())
+    if (foamyHexMeshControls().objOutput())
     {
         writeObjMesh(points, faces, word(meshName + ".obj"));
     }
@@ -1099,7 +1099,7 @@ void Foam::conformalVoronoiMesh::writeMesh
 
     label nInitialBadFaces = 0;
 
-    if (cvMeshControls().filterEdges())
+    if (foamyHexMeshControls().filterEdges())
     {
         Info<< nl << "Filtering edges on polyMesh" << nl << endl;
 
@@ -1117,7 +1117,7 @@ void Foam::conformalVoronoiMesh::writeMesh
         }
     }
 
-    if (cvMeshControls().filterFaces())
+    if (foamyHexMeshControls().filterFaces())
     {
         Info<< nl << "Filtering faces on polyMesh" << nl << endl;
 
@@ -1616,7 +1616,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
     cellSet protrudingCells
     (
         mesh,
-        "cvMesh_remainingProtrusions",
+        "foamyHexMesh_remainingProtrusions",
         mesh.nCells()/1000
     );
 
@@ -1635,7 +1635,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
 
     reduce(protrudingCellsSize, sumOp<label>());
 
-    if (cvMeshControls().objOutput() && protrudingCellsSize > 0)
+    if (foamyHexMeshControls().objOutput() && protrudingCellsSize > 0)
     {
         Info<< nl << "Found " << protrudingCellsSize
             << " cells protruding from the surface, writing cellSet "
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
index dcc4a51dd1..89e09a336d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
@@ -90,7 +90,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
 
         if
         (
-            maxLoadUnbalance <= cvMeshControls().maxLoadUnbalance()
+            maxLoadUnbalance <= foamyHexMeshControls().maxLoadUnbalance()
          || maxLoadUnbalance <= previousLoadUnbalance
         )
         {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
index bd4973b32b..d751d352ba 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
index 5f42f0e352..e38c1cb355 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
@@ -30,7 +30,7 @@ License
 
 
 template<typename Cell>
-Foam::scalar Foam::cvMeshChecks::coplanarTet
+Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
 (
     Cell& c,
     const scalar tol
@@ -75,7 +75,7 @@ Foam::scalar Foam::cvMeshChecks::coplanarTet
 
 
 template<typename Cell>
-bool Foam::cvMeshChecks::closePoints
+bool Foam::foamyHexMeshChecks::closePoints
 (
     Cell& c,
     const scalar tol
@@ -105,7 +105,7 @@ bool Foam::cvMeshChecks::closePoints
 
 
 template<typename Cell>
-bool Foam::cvMeshChecks::smallVolume
+bool Foam::foamyHexMeshChecks::smallVolume
 (
     Cell& c,
     const scalar tol
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
similarity index 96%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
index 64960b931c..9c986960cc 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
@@ -31,7 +31,7 @@ License
 namespace Foam
 {
 
-namespace cvMeshChecks
+namespace foamyHexMeshChecks
 {
 
     template<typename Cell>
@@ -58,7 +58,7 @@ namespace cvMeshChecks
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace cvMeshChecks
+} // End namespace foamyHexMeshChecks
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
index 5d7d953948..bba22e5ecd 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
similarity index 96%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
index 5ccef621e7..965d37c202 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
index 30c65801e6..709db776fb 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
@@ -111,7 +111,7 @@ int CGAL::indexedCell<Gt, Cb>::cellIndex() const
     template<class Gt, class Cb>
     const Foam::point& CGAL::indexedCell<Gt, Cb>::dual()
     {
-    //    if (Foam::cvMeshChecks::coplanarTet(*this, 1e-20) == 0)
+    //    if (Foam::foamyHexMeshChecks::coplanarTet(*this, 1e-20) == 0)
     //    {
             // Do exact calc
     //    }
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
index 5aa3936874..bd39374288 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
similarity index 96%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
index ee394b16fa..2cdba67720 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
index c597d8a173..d11ff8e260 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
index 6242a3a6fe..7038fbdaef 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H
index 5bae06d86f..3dd3761c59 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControls.C
similarity index 93%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControls.C
index f4ed8b66bd..a44390fb9e 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControls.C
@@ -30,14 +30,17 @@ License
 
 Foam::cvControls::cvControls
 (
-    const dictionary& cvMeshDict
+    const dictionary& foamyHexMeshDict
 )
 :
-    cvMeshDict_(cvMeshDict)
+    foamyHexMeshDict_(foamyHexMeshDict)
 {
     // Surface conformation controls
 
-    const dictionary& surfDict(cvMeshDict_.subDict("surfaceConformation"));
+    const dictionary& surfDict
+    (
+        foamyHexMeshDict_.subDict("surfaceConformation")
+    );
 
     pointPairDistanceCoeff_ = readScalar
     (
@@ -123,7 +126,7 @@ Foam::cvControls::cvControls
 
     // Motion control controls
 
-    const dictionary& motionDict(cvMeshDict_.subDict("motionControl"));
+    const dictionary& motionDict(foamyHexMeshDict_.subDict("motionControl"));
 
     defaultCellSize_ = readScalar(motionDict.lookup("defaultCellSize"));
 
@@ -193,7 +196,10 @@ Foam::cvControls::cvControls
 
     // polyMesh filtering controls
 
-    const dictionary& filteringDict(cvMeshDict_.subDict("polyMeshFiltering"));
+    const dictionary& filteringDict
+    (
+        foamyHexMeshDict_.subDict("polyMeshFiltering")
+    );
 
     filterEdges_ = Switch
     (
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControls.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControls.H
index 3deb133ba1..1485722517 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControls.H
@@ -55,8 +55,8 @@ class cvControls
 {
     // Private data
 
-        //- Reference to the cvMeshDict
-        const dictionary& cvMeshDict_;
+        //- Reference to the foamyHexMeshDict
+        const dictionary& foamyHexMeshDict_;
 
         // Surface conformation controls
 
@@ -204,7 +204,7 @@ public:
         //- Construct from references to conformalVoronoiMesh and dictionary
         cvControls
         (
-            const dictionary& cvMeshDict
+            const dictionary& foamyHexMeshDict
         );
 
 
@@ -216,8 +216,8 @@ public:
 
         // Access
 
-            //- Return the cvMeshDict
-            inline const dictionary& cvMeshDict() const;
+            //- Return the foamyHexMeshDict
+            inline const dictionary& foamyHexMeshDict() const;
 
             //- Return the pointPairDistanceCoeff
             inline scalar pointPairDistanceCoeff() const;
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
index 97995349f7..4503d1a6ab 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
@@ -25,9 +25,9 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const Foam::dictionary& Foam::cvControls::cvMeshDict() const
+inline const Foam::dictionary& Foam::cvControls::foamyHexMeshDict() const
 {
-    return cvMeshDict_;
+    return foamyHexMeshDict_;
 }
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
index 88c1e0bef4..a8940feea1 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
index d7afd964a6..f6ca44330b 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
index 07496e3517..623dc7b60c 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
index 58fd55da03..0181571d29 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
similarity index 93%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index ecd239489b..f128b26e8a 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -49,7 +49,7 @@ void Foam::autoDensity::writeOBJ
     fileName name
 ) const
 {
-    OFstream str(cvMesh_.time().path()/name + ".obj");
+    OFstream str(foamyHexMesh_.time().path()/name + ".obj");
 
     Pout<< "Writing " << str.name() << endl;
 
@@ -74,11 +74,11 @@ bool Foam::autoDensity::combinedOverlaps(const treeBoundBox& box) const
     if (Pstream::parRun())
     {
         return
-            cvMesh_.decomposition().overlapsThisProcessor(box)
-         || cvMesh_.geometryToConformTo().overlaps(box);
+            foamyHexMesh_.decomposition().overlapsThisProcessor(box)
+         || foamyHexMesh_.geometryToConformTo().overlaps(box);
     }
 
-    return cvMesh_.geometryToConformTo().overlaps(box);
+    return foamyHexMesh_.geometryToConformTo().overlaps(box);
 }
 
 
@@ -87,11 +87,11 @@ bool Foam::autoDensity::combinedInside(const point& p) const
     if (Pstream::parRun())
     {
         return
-            cvMesh_.decomposition().positionOnThisProcessor(p)
-         && cvMesh_.geometryToConformTo().inside(p);
+            foamyHexMesh_.decomposition().positionOnThisProcessor(p)
+         && foamyHexMesh_.geometryToConformTo().inside(p);
     }
 
-    return cvMesh_.geometryToConformTo().inside(p);
+    return foamyHexMesh_.geometryToConformTo().inside(p);
 }
 
 
@@ -103,7 +103,7 @@ Foam::Field<bool> Foam::autoDensity::combinedWellInside
 {
     if (!Pstream::parRun())
     {
-        return cvMesh_.geometryToConformTo().wellInside
+        return foamyHexMesh_.geometryToConformTo().wellInside
         (
             pts,
             minimumSurfaceDistanceCoeffSqr_*sqr(sizes)
@@ -117,14 +117,17 @@ Foam::Field<bool> Foam::autoDensity::combinedWellInside
 
     Field<bool> insideA
     (
-        cvMesh_.geometryToConformTo().wellInside
+        foamyHexMesh_.geometryToConformTo().wellInside
         (
             pts,
             minimumSurfaceDistanceCoeffSqr_*sqr(sizes)
         )
     );
 
-    Field<bool> insideB(cvMesh_.decomposition().positionOnThisProcessor(pts));
+    Field<bool> insideB
+    (
+        foamyHexMesh_.decomposition().positionOnThisProcessor(pts)
+    );
 
     // inside = insideA && insideB;
 
@@ -159,14 +162,14 @@ bool Foam::autoDensity::combinedWellInside
 
     if (Pstream::parRun())
     {
-        inside = cvMesh_.decomposition().positionOnThisProcessor(p);
+        inside = foamyHexMesh_.decomposition().positionOnThisProcessor(p);
     }
 
     // Perform AND operation between testing the surfaces and the previous
     // result, i.e the parallel result, or in serial, with true.
     inside =
         inside
-     && cvMesh_.geometryToConformTo().wellInside
+     && foamyHexMesh_.geometryToConformTo().wellInside
         (
             p,
             minimumSurfaceDistanceCoeffSqr_*sqr(size)
@@ -190,7 +193,7 @@ void Foam::autoDensity::recurseAndFill
 
         word newName = recursionName + "_" + Foam::name(i);
 
-        conformalVoronoiMesh::timeCheck(cvMesh_.time(), newName, debug);
+        conformalVoronoiMesh::timeCheck(foamyHexMesh_.time(), newName, debug);
 
         if (combinedOverlaps(subBB))
         {
@@ -275,9 +278,9 @@ bool Foam::autoDensity::fillBox
     bool overlapping
 ) const
 {
-    const conformationSurfaces& geometry(cvMesh_.geometryToConformTo());
+    const conformationSurfaces& geometry(foamyHexMesh_.geometryToConformTo());
 
-    Random& rnd = cvMesh_.rndGen();
+    Random& rnd = foamyHexMesh_.rndGen();
 
     unsigned int initialSize = initialPoints.size();
 
@@ -337,7 +340,8 @@ bool Foam::autoDensity::fillBox
 
         pointField corners(bb.points());
 
-        scalarField cornerSizes = cvMesh_.cellShapeControls().cellSize(corners);
+        scalarField cornerSizes =
+            foamyHexMesh_.cellShapeControls().cellSize(corners);
 
         Field<bool> insideCorners = combinedWellInside(corners, cornerSizes);
 
@@ -446,7 +450,8 @@ bool Foam::autoDensity::fillBox
                         );
                 }
 
-                lineSizes = cvMesh_.cellShapeControls().cellSize(linePoints);
+                lineSizes =
+                    foamyHexMesh_.cellShapeControls().cellSize(linePoints);
 
                 Field<bool> insideLines = combinedWellInside
                 (
@@ -545,7 +550,7 @@ bool Foam::autoDensity::fillBox
         // corner when only some these points are required.
         shuffle(samplePoints);
 
-        scalarField sampleSizes = cvMesh_.cellShapeControls().cellSize
+        scalarField sampleSizes = foamyHexMesh_.cellShapeControls().cellSize
         (
             samplePoints
         );
@@ -711,7 +716,7 @@ bool Foam::autoDensity::fillBox
 
             point p = min + cmptMultiply(span, rnd.vector01());
 
-            scalar localSize = cvMesh_.cellShapeControls().cellSize(p);
+            scalar localSize = foamyHexMesh_.cellShapeControls().cellSize(p);
 
             bool insidePoint = false;
 
@@ -842,10 +847,10 @@ bool Foam::autoDensity::fillBox
 autoDensity::autoDensity
 (
     const dictionary& initialPointsDict,
-    const conformalVoronoiMesh& cvMesh
+    const conformalVoronoiMesh& foamyHexMesh
 )
 :
-    initialPointsMethod(typeName, initialPointsDict, cvMesh),
+    initialPointsMethod(typeName, initialPointsDict, foamyHexMesh),
     globalTrialPoints_(0),
     minCellSizeLimit_
     (
@@ -868,7 +873,7 @@ autoDensity::autoDensity
             "autoDensity::autoDensity"
             "("
                 "const dictionary& initialPointsDict,"
-                "const conformalVoronoiMesh& cvMesh"
+                "const conformalVoronoiMesh& foamyHexMesh"
             ")"
         )
             << "The maxSizeRatio must be greater than one to be sensible, "
@@ -888,14 +893,14 @@ List<Vb::Point> autoDensity::initialPoints() const
     // on whether this is a parallel run.
     if (Pstream::parRun())
     {
-        hierBB = cvMesh_.decomposition().procBounds();
+        hierBB = foamyHexMesh_.decomposition().procBounds();
     }
     else
     {
         // Extend the global box to move it off large plane surfaces
-        hierBB = cvMesh_.geometryToConformTo().globalBounds().extend
+        hierBB = foamyHexMesh_.geometryToConformTo().globalBounds().extend
         (
-            cvMesh_.rndGen(),
+            foamyHexMesh_.rndGen(),
             1e-6
         );
     }
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
index 2ef7cb00b0..6a547be49e 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,7 @@ public:
         autoDensity
         (
             const dictionary& initialPointsDict,
-            const conformalVoronoiMesh& cvMesh
+            const conformalVoronoiMesh& foamyHexMesh
         );
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
similarity index 85%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
index c69e7ac8fb..7237d2980a 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,10 @@ addToRunTimeSelectionTable(initialPointsMethod, bodyCentredCubic, dictionary);
 bodyCentredCubic::bodyCentredCubic
 (
     const dictionary& initialPointsDict,
-    const conformalVoronoiMesh& cvMesh
+    const conformalVoronoiMesh& foamyHexMesh
 )
 :
-    initialPointsMethod(typeName, initialPointsDict, cvMesh),
+    initialPointsMethod(typeName, initialPointsDict, foamyHexMesh),
     initialCellSize_(readScalar(detailsDict().lookup("initialCellSize"))),
     randomiseInitialGrid_(detailsDict().lookup("randomiseInitialGrid")),
     randomPerturbationCoeff_
@@ -64,11 +64,11 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
     // on whether this is a parallel run.
     if (Pstream::parRun())
     {
-        bb = cvMesh_.decomposition().procBounds();
+        bb = foamyHexMesh_.decomposition().procBounds();
     }
     else
     {
-        bb = cvMesh_.geometryToConformTo().globalBounds();
+        bb = foamyHexMesh_.geometryToConformTo().globalBounds();
     }
 
     scalar x0 = bb.min().x();
@@ -87,7 +87,7 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
 
     delta *= pow((1.0/2.0),-(1.0/3.0));
 
-    Random& rndGen = cvMesh_.rndGen();
+    Random& rndGen = foamyHexMesh_.rndGen();
 
     scalar pert = randomPerturbationCoeff_*cmptMin(delta);
 
@@ -123,9 +123,12 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
                     pA.z() += pert*(rndGen.scalar01() - 0.5);
                 }
 
+                const backgroundMeshDecomposition& decomp =
+                    foamyHexMesh_.decomposition();
+
                 if (Pstream::parRun())
                 {
-                    if (cvMesh_.decomposition().positionOnThisProcessor(pA))
+                    if (decomp.positionOnThisProcessor(pA))
                     {
                         // Add this point in parallel only if this position is
                         // on this processor.
@@ -146,7 +149,7 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
 
                 if (Pstream::parRun())
                 {
-                    if (cvMesh_.decomposition().positionOnThisProcessor(pB))
+                    if (decomp.positionOnThisProcessor(pB))
                     {
                         // Add this point in parallel only if this position is
                         // on this processor.
@@ -161,15 +164,16 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
 
             points.setSize(pI);
 
-            Field<bool> insidePoints = cvMesh_.geometryToConformTo().wellInside
-            (
-                points,
-                minimumSurfaceDistanceCoeffSqr_
-               *sqr
+            Field<bool> insidePoints =
+                foamyHexMesh_.geometryToConformTo().wellInside
                 (
-                    cvMesh_.cellShapeControls().cellSize(points)
-                )
-            );
+                    points,
+                    minimumSurfaceDistanceCoeffSqr_
+                   *sqr
+                    (
+                        foamyHexMesh_.cellShapeControls().cellSize(points)
+                    )
+                );
 
             forAll(insidePoints, i)
             {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
index f75fa599d3..507c718bb6 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
         bodyCentredCubic
         (
             const dictionary& initialPointsDict,
-            const conformalVoronoiMesh& cvMesh
+            const conformalVoronoiMesh& foamyHexMesh
         );
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
similarity index 87%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
index af2e7dfbf4..9a6642170d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,10 @@ addToRunTimeSelectionTable(initialPointsMethod, faceCentredCubic, dictionary);
 faceCentredCubic::faceCentredCubic
 (
     const dictionary& initialPointsDict,
-    const conformalVoronoiMesh& cvMesh
+    const conformalVoronoiMesh& foamyHexMesh
 )
 :
-    initialPointsMethod(typeName, initialPointsDict, cvMesh),
+    initialPointsMethod(typeName, initialPointsDict, foamyHexMesh),
     initialCellSize_(readScalar(detailsDict().lookup("initialCellSize"))),
     randomiseInitialGrid_(detailsDict().lookup("randomiseInitialGrid")),
     randomPerturbationCoeff_
@@ -64,11 +64,11 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
     // on whether this is a parallel run.
     if (Pstream::parRun())
     {
-        bb = cvMesh_.decomposition().procBounds();
+        bb = foamyHexMesh_.decomposition().procBounds();
     }
     else
     {
-        bb = cvMesh_.geometryToConformTo().globalBounds();
+        bb = foamyHexMesh_.geometryToConformTo().globalBounds();
     }
 
     scalar x0 = bb.min().x();
@@ -87,7 +87,7 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
     delta *= pow((1.0/4.0),-(1.0/3.0));
 
-    Random& rndGen = cvMesh_.rndGen();
+    Random& rndGen = foamyHexMesh_.rndGen();
 
     scalar pert = randomPerturbationCoeff_*cmptMin(delta);
 
@@ -121,9 +121,12 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
                     p.z() += pert*(rndGen.scalar01() - 0.5);
                 }
 
+                const backgroundMeshDecomposition& decomp =
+                    foamyHexMesh_.decomposition();
+
                 if (Pstream::parRun())
                 {
-                    if (cvMesh_.decomposition().positionOnThisProcessor(p))
+                    if (decomp.positionOnThisProcessor(p))
                     {
                         // Add this point in parallel only if this position is
                         // on this processor.
@@ -151,7 +154,7 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
                 if (Pstream::parRun())
                 {
-                    if (cvMesh_.decomposition().positionOnThisProcessor(p))
+                    if (decomp.positionOnThisProcessor(p))
                     {
                         // Add this point in parallel only if this position is
                         // on this processor.
@@ -179,7 +182,7 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
                 if (Pstream::parRun())
                 {
-                    if (cvMesh_.decomposition().positionOnThisProcessor(p))
+                    if (decomp.positionOnThisProcessor(p))
                     {
                         // Add this point in parallel only if this position is
                         // on this processor.
@@ -207,7 +210,7 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
                 if (Pstream::parRun())
                 {
-                    if (cvMesh_.decomposition().positionOnThisProcessor(p))
+                    if (decomp.positionOnThisProcessor(p))
                     {
                         // Add this point in parallel only if this position is
                         // on this processor.
@@ -222,15 +225,16 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
             points.setSize(pI);
 
-            Field<bool> insidePoints = cvMesh_.geometryToConformTo().wellInside
-            (
-                points,
-                minimumSurfaceDistanceCoeffSqr_
-               *sqr
+            Field<bool> insidePoints =
+                foamyHexMesh_.geometryToConformTo().wellInside
                 (
-                    cvMesh_.cellShapeControls().cellSize(points)
-                )
-            );
+                    points,
+                    minimumSurfaceDistanceCoeffSqr_
+                   *sqr
+                    (
+                        foamyHexMesh_.cellShapeControls().cellSize(points)
+                    )
+                );
 
             forAll(insidePoints, i)
             {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
index 3444b386c3..9a426c4666 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
         faceCentredCubic
         (
             const dictionary& initialPointsDict,
-            const conformalVoronoiMesh& cvMesh
+            const conformalVoronoiMesh& foamyHexMesh
         );
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
similarity index 90%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
index bd0e6d732f..b0b8a9e3bc 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,11 +43,11 @@ initialPointsMethod::initialPointsMethod
 (
     const word& type,
     const dictionary& initialPointsDict,
-    const conformalVoronoiMesh& cvMesh
+    const conformalVoronoiMesh& foamyHexMesh
 )
 :
     dictionary(initialPointsDict),
-    cvMesh_(cvMesh),
+    foamyHexMesh_(foamyHexMesh),
     detailsDict_(subDict(type + "Coeffs")),
     minimumSurfaceDistanceCoeffSqr_
     (
@@ -67,7 +67,7 @@ initialPointsMethod::initialPointsMethod
 autoPtr<initialPointsMethod> initialPointsMethod::New
 (
     const dictionary& initialPointsDict,
-    const conformalVoronoiMesh& cvMesh
+    const conformalVoronoiMesh& foamyHexMesh
 )
 {
     word initialPointsMethodTypeName
@@ -95,7 +95,11 @@ autoPtr<initialPointsMethod> initialPointsMethod::New
             << exit(FatalError);
     }
 
-    return autoPtr<initialPointsMethod>(cstrIter()(initialPointsDict, cvMesh));
+    return
+        autoPtr<initialPointsMethod>
+        (
+            cstrIter()(initialPointsDict, foamyHexMesh)
+        );
 }
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
similarity index 92%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
index 8c8df91c92..8343a72950 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ protected:
     // Protected data
 
         //- Reference to the conformalVoronoiMesh holding this object
-        const conformalVoronoiMesh& cvMesh_;
+        const conformalVoronoiMesh& foamyHexMesh_;
 
         //- Method details dictionary
         dictionary detailsDict_;
@@ -99,9 +99,9 @@ public:
             dictionary,
             (
                 const dictionary& initialPointsDict,
-                const conformalVoronoiMesh& cvMesh
+                const conformalVoronoiMesh& foamyHexMesh
             ),
-            (initialPointsDict, cvMesh)
+            (initialPointsDict, foamyHexMesh)
         );
 
 
@@ -112,7 +112,7 @@ public:
         (
             const word& type,
             const dictionary& initialPointsDict,
-            const conformalVoronoiMesh& cvMesh
+            const conformalVoronoiMesh& foamyHexMesh
         );
 
 
@@ -122,7 +122,7 @@ public:
         static autoPtr<initialPointsMethod> New
         (
             const dictionary& initialPointsDict,
-            const conformalVoronoiMesh& cvMesh
+            const conformalVoronoiMesh& foamyHexMesh
         );
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
similarity index 89%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
index 19861f3e81..32ce53d376 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,10 @@ addToRunTimeSelectionTable(initialPointsMethod, pointFile, dictionary);
 pointFile::pointFile
 (
     const dictionary& initialPointsDict,
-    const conformalVoronoiMesh& cvMesh
+    const conformalVoronoiMesh& foamyHexMesh
 )
 :
-    initialPointsMethod(typeName, initialPointsDict, cvMesh),
+    initialPointsMethod(typeName, initialPointsDict, foamyHexMesh),
     pointFileName_(detailsDict().lookup("pointFile"))
 {}
 
@@ -58,8 +58,8 @@ List<Vb::Point> pointFile::initialPoints() const
         IOobject
         (
             pointFileName_.name(),
-            cvMesh_.time().constant(),
-            cvMesh_.time(),
+            foamyHexMesh_.time().constant(),
+            foamyHexMesh_.time(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )
@@ -85,13 +85,13 @@ List<Vb::Point> pointFile::initialPoints() const
 
         if (!isParentFile)
         {
-            cvMesh_.decomposition().distributePoints(points);
+            foamyHexMesh_.decomposition().distributePoints(points);
         }
         else
         {
             // Otherwise, this is assumed to be points covering the whole
             // domain, so filter the points to be only those on this processor
-            boolList procPt(cvMesh_.positionOnThisProc(points));
+            boolList procPt(foamyHexMesh_.positionOnThisProc(points));
 
             List<boolList> allProcPt(Pstream::nProcs());
 
@@ -126,13 +126,13 @@ List<Vb::Point> pointFile::initialPoints() const
         }
     }
 
-    Field<bool> insidePoints = cvMesh_.geometryToConformTo().wellInside
+    Field<bool> insidePoints = foamyHexMesh_.geometryToConformTo().wellInside
     (
         points,
         minimumSurfaceDistanceCoeffSqr_
        *sqr
         (
-            cvMesh_.cellShapeControls().cellSize(points)
+            foamyHexMesh_.cellShapeControls().cellSize(points)
         )
     );
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
index bcb898bac6..05cc0bc488 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ public:
         pointFile
         (
             const dictionary& initialPointsDict,
-            const conformalVoronoiMesh& cvMesh
+            const conformalVoronoiMesh& foamyHexMesh
         );
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
similarity index 86%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
index 644a57c4a3..567188549d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
@@ -41,10 +41,10 @@ addToRunTimeSelectionTable(initialPointsMethod, uniformGrid, dictionary);
 uniformGrid::uniformGrid
 (
     const dictionary& initialPointsDict,
-    const conformalVoronoiMesh& cvMesh
+    const conformalVoronoiMesh& foamyHexMesh
 )
 :
-    initialPointsMethod(typeName, initialPointsDict, cvMesh),
+    initialPointsMethod(typeName, initialPointsDict, foamyHexMesh),
     initialCellSize_(readScalar(detailsDict().lookup("initialCellSize"))),
     randomiseInitialGrid_(detailsDict().lookup("randomiseInitialGrid")),
     randomPerturbationCoeff_
@@ -64,11 +64,11 @@ List<Vb::Point> uniformGrid::initialPoints() const
     // on whether this is a parallel run.
     if (Pstream::parRun())
     {
-        bb = cvMesh_.decomposition().procBounds();
+        bb = foamyHexMesh_.decomposition().procBounds();
     }
     else
     {
-        bb = cvMesh_.geometryToConformTo().globalBounds();
+        bb = foamyHexMesh_.geometryToConformTo().globalBounds();
     }
 
     scalar x0 = bb.min().x();
@@ -87,7 +87,7 @@ List<Vb::Point> uniformGrid::initialPoints() const
 
     delta *= pow((1.0),-(1.0/3.0));
 
-    Random& rndGen = cvMesh_.rndGen();
+    Random& rndGen = foamyHexMesh_.rndGen();
 
     scalar pert = randomPerturbationCoeff_*cmptMin(delta);
 
@@ -125,7 +125,7 @@ List<Vb::Point> uniformGrid::initialPoints() const
                 if
                 (
                     Pstream::parRun()
-                 && !cvMesh_.decomposition().positionOnThisProcessor(p)
+                 && !foamyHexMesh_.decomposition().positionOnThisProcessor(p)
                 )
                 {
                     // Skip this point if, in parallel, this position is not on
@@ -138,15 +138,16 @@ List<Vb::Point> uniformGrid::initialPoints() const
 
             points.setSize(pI);
 
-            Field<bool> insidePoints = cvMesh_.geometryToConformTo().wellInside
-            (
-                points,
-                minimumSurfaceDistanceCoeffSqr_
-               *sqr
+            Field<bool> insidePoints =
+                foamyHexMesh_.geometryToConformTo().wellInside
                 (
-                    cvMesh_.cellShapeControls().cellSize(points)
-                )
-            );
+                    points,
+                    minimumSurfaceDistanceCoeffSqr_
+                   *sqr
+                    (
+                        foamyHexMesh_.cellShapeControls().cellSize(points)
+                    )
+                );
 
             forAll(insidePoints, i)
             {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
similarity index 95%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
index 913d2a5a98..4782e98533 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
         uniformGrid
         (
             const dictionary& initialPointsDict,
-            const conformalVoronoiMesh& cvMesh
+            const conformalVoronoiMesh& foamyHexMesh
         );
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
index 3e33715cb5..d6dcc77617 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
index 02aa61256a..291f73a342 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
index be9b2537b3..32edd4c664 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
index 3c156c1971..b04f60d7ac 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
similarity index 97%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
index 7649339055..29056698bf 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
similarity index 98%
rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
index 433a5d38e1..f790ec6ff4 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/files
rename to applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/files
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
rename to applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/options
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
rename to applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
index 53766c59a0..0a207b707d 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2012 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2012-2013 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Allwmake b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Allwmake
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Allwmake
rename to applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Allwmake
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files
rename to applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/files
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
rename to applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/options
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
rename to applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
index ae4f8812f7..1a91ce4ac0 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2012 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2012-2013 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C
rename to applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C
index c3518ef1a0..3bc7c013cd 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2012 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2012-2013 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C
similarity index 92%
rename from applications/utilities/mesh/generation/cvMesh/cvMesh.C
rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C
index e9487b909b..9c32ce867a 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2012 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2013 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    cvMesh
+    foamyHexMesh
 
 Description
     Conformal Voronoi automatic mesh generator
@@ -52,11 +52,11 @@ int main(int argc, char *argv[])
 
     const bool checkGeometry = args.optionFound("checkGeometry");
 
-    IOdictionary cvMeshDict
+    IOdictionary foamyHexMeshDict
     (
         IOobject
         (
-            "cvMeshDict",
+            "foamyHexMeshDict",
             runTime.system(),
             runTime,
             IOobject::MUST_READ_IF_MODIFIED,
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE
             ),
-            cvMeshDict.subDict("geometry")
+            foamyHexMeshDict.subDict("geometry")
         );
 
         // Write some stats
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 
     conformalVoronoiMesh::debug = true;
 
-    conformalVoronoiMesh mesh(runTime, cvMeshDict);
+    conformalVoronoiMesh mesh(runTime, foamyHexMeshDict);
 
 
     while (runTime.loop())
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshDict b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshDict
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshDict
rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshDict
index 29a1321144..9d2a4ad253 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshDict
+++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshDict
@@ -5,23 +5,21 @@
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
     version         2.0;
     format          ascii;
     class           dictionary;
-    object          cvMeshDict;
+    object          foamyHexMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
 /*
 
-Control dictionary for cvMesh - polyhedral mesh generator.
+Control dictionary for foamyHexMesh - automatic mesh generator.
 
-cvMesh phases:
+foamyHexMesh phases:
 1. fill volume with initial points (initialPoints subdictionary). An option
    is to reread from previous set of points.
 
diff --git a/applications/utilities/mesh/generation/cvMesh/vectorTools/vectorTools.H b/applications/utilities/mesh/generation/foamyHexMesh/vectorTools/vectorTools.H
similarity index 100%
rename from applications/utilities/mesh/generation/cvMesh/vectorTools/vectorTools.H
rename to applications/utilities/mesh/generation/foamyHexMesh/vectorTools/vectorTools.H
diff --git a/tutorials/mesh/cvMesh/blob/system/cvMeshDict b/tutorials/mesh/cvMesh/blob/system/cvMeshDict
deleted file mode 100644
index fe9cf5cfd5..0000000000
--- a/tutorials/mesh/cvMesh/blob/system/cvMeshDict
+++ /dev/null
@@ -1,212 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version         2.0;
-    format          ascii;
-    class           dictionary;
-    object          cvMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Any scalar with a name <name>Coeff specifies a value that will be implemented
-// as a faction of the local target cell size
-
-geometry
-{
-    blob.stl
-    {
-        name blob;
-        type triSurfaceMesh;
-    }
-
-    refinementBox
-    {
-        type searchableBox;
-        min (-0.2  -0.6 -0.2);
-        max ( 0.4   0.2  0.35);
-    }
-}
-
-
-backgroundMeshDecomposition
-{
-    minLevels 0;
-    sampleResolution 4;
-    spanScale 20;
-    maxCellWeightCoeff 20;
-}
-
-
-initialPoints
-{
-    minimumSurfaceDistanceCoeff 0.55;
-
-    initialPointsMethod         autoDensity;
-    // initialPointsMethod     pointFile;
-
-    autoDensityCoeffs
-    {
-        minLevels               0;
-        maxSizeRatio            5.0;
-        sampleResolution        5;
-        surfaceSampleResolution 5;
-    }
-
-    pointFileCoeffs
-    {
-        pointFile               "constant/internalDelaunayVertices";
-    }
-}
-
-
-surfaceConformation
-{
-    locationInMesh                      (0.1 0.1 0.2);
-
-    pointPairDistanceCoeff              0.1;
-
-    mixedFeaturePointPPDistanceCoeff    5.0;
-
-    featurePointExclusionDistanceCoeff  0.4;
-
-    featureEdgeExclusionDistanceCoeff   0.2;
-
-    surfaceSearchDistanceCoeff          5;
-
-    nearBoundaryDistanceCoeff           5;
-
-    maxSurfaceProtrusionCoeff           0.001;
-
-    maxQuadAngle                        125;
-
-    surfaceConformationRebuildFrequency 10;
-
-    specialiseFeaturePoints             off;
-
-    conformationControls
-    {
-        edgeSearchDistCoeff             5;
-        surfacePtReplaceDistCoeff       0.5;
-        surfacePtExclusionDistanceCoeff 0.5;
-
-        maxIterations                   15;
-
-        iterationToInitialHitRatioLimit 0.0001;
-    }
-
-    geometryToConformTo
-    {
-        blob
-        {
-            featureMethod       none;
-        }
-    }
-
-    additionalFeatures
-    {}
-}
-
-
-motionControl
-{
-    defaultCellSize             0.1;
-
-    minimumCellSizeCoeff        0;
-
-    maxSmoothingIterations      0;
-    maxRefinementIterations     0;
-
-    shapeControlFunctions
-    {
-/*        blob*/
-/*        {*/
-/*            type                    searchableSurfaceControl;*/
-/*            priority                1;*/
-/*            mode                    bothSides;*/
-
-/*            surfaceCellSizeFunction uniformValue;*/
-/*            uniformValueCoeffs*/
-/*            {*/
-/*                surfaceCellSizeCoeff     1;*/
-/*            }*/
-
-/*            cellSizeFunction        uniform;*/
-/*            uniformCoeffs*/
-/*            {}*/
-/*        }*/
-
-        fileControl
-        {
-            type                    fileControl;
-            priority                1;
-            pointsFile              "points";
-            sizesFile               "sizes";
-            alignmentsFile          "alignments";
-        }
-    }
-
-    cellAspectRatioControl
-    {
-        aspectRatio                 1.0;
-        aspectRatioDirection        (1 0 0);
-    }
-
-    relaxationModel     adaptiveLinear;
-
-    adaptiveLinearCoeffs
-    {
-        relaxationStart 1.0;
-        relaxationEnd   0.0;
-    }
-
-    objOutput                   no;
-
-    timeChecks                  no;
-
-    maxLoadUnbalance            0.5;
-
-    alignmentAcceptanceAngle    48;
-
-    pointInsertionCriteria
-    {
-        cellCentreDistCoeff     1.75;
-        faceAreaRatioCoeff      0.0025;
-        acceptanceAngle         21.5;
-    }
-
-    pointRemovalCriteria
-    {
-        cellCentreDistCoeff     0.65;
-    }
-
-    faceAreaWeightModel piecewiseLinearRamp;
-
-    piecewiseLinearRampCoeffs
-    {
-        lowerAreaFraction       0.5;
-        upperAreaFraction       1.0;
-    }
-}
-
-
-polyMeshFiltering
-{
-    filterEdges                 on;
-    filterFaces                 off;
-    writeTetDualMesh            false;
-}
-
-
-meshQualityControls
-{
-    #include "meshQualityDict"
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/cvMesh/blob/Allclean b/tutorials/mesh/foamyHexMesh/blob/Allclean
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/Allclean
rename to tutorials/mesh/foamyHexMesh/blob/Allclean
diff --git a/tutorials/mesh/cvMesh/blob/Allrun b/tutorials/mesh/foamyHexMesh/blob/Allrun
similarity index 92%
rename from tutorials/mesh/cvMesh/blob/Allrun
rename to tutorials/mesh/foamyHexMesh/blob/Allrun
index ab12a6cbd5..d947db9ca1 100755
--- a/tutorials/mesh/cvMesh/blob/Allrun
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-runApplication cvMesh
+runApplication foamyHexMesh
 runApplication collapseEdges -latestTime -collapseFaces
 runApplication checkMesh -latestTime -allGeometry -allTopology
 
diff --git a/tutorials/mesh/cvMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
similarity index 94%
rename from tutorials/mesh/cvMesh/blob/Allrun-parallel
rename to tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
index 253294de1f..320aec0029 100755
--- a/tutorials/mesh/cvMesh/blob/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
@@ -10,7 +10,7 @@ nProc=$(getNumberOfProcessors)
 runApplication blockMesh
 runApplication decomposePar
 
-runParallel cvMesh $nProc
+runParallel foamyHexMesh $nProc
 runParallel collapseEdges $nProc -latestTime -collapseFaces
 runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
 
diff --git a/tutorials/mesh/cvMesh/blob/Alltest b/tutorials/mesh/foamyHexMesh/blob/Alltest
similarity index 94%
rename from tutorials/mesh/cvMesh/blob/Alltest
rename to tutorials/mesh/foamyHexMesh/blob/Alltest
index fc9136aea5..747ac9eb61 100755
--- a/tutorials/mesh/cvMesh/blob/Alltest
+++ b/tutorials/mesh/foamyHexMesh/blob/Alltest
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-runApplication cvMesh
+runApplication foamyHexMesh
 
 # Change collapseEdges to only do one iteration
 cp system/collapseDict system/collapseDict.org
diff --git a/tutorials/mesh/cvMesh/blob/constant/polyMesh/blockMeshDict b/tutorials/mesh/foamyHexMesh/blob/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/foamyHexMesh/blob/constant/polyMesh/blockMeshDict
diff --git a/tutorials/mesh/cvMesh/blob/constant/polyMesh/boundary b/tutorials/mesh/foamyHexMesh/blob/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/constant/polyMesh/boundary
rename to tutorials/mesh/foamyHexMesh/blob/constant/polyMesh/boundary
diff --git a/tutorials/mesh/cvMesh/blob/constant/triSurface/blob.stl b/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/blob.stl
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/constant/triSurface/blob.stl
rename to tutorials/mesh/foamyHexMesh/blob/constant/triSurface/blob.stl
diff --git a/tutorials/mesh/cvMesh/blob/system/collapseDict b/tutorials/mesh/foamyHexMesh/blob/system/collapseDict
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/system/collapseDict
rename to tutorials/mesh/foamyHexMesh/blob/system/collapseDict
diff --git a/tutorials/mesh/cvMesh/blob/system/controlDict b/tutorials/mesh/foamyHexMesh/blob/system/controlDict
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/system/controlDict
rename to tutorials/mesh/foamyHexMesh/blob/system/controlDict
diff --git a/tutorials/mesh/cvMesh/blob/system/decomposeParDict b/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/system/decomposeParDict
rename to tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
new file mode 100644
index 0000000000..62649be994
--- /dev/null
+++ b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
@@ -0,0 +1,122 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          foamyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include defaults parameters from master dictionary
+#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
+
+geometry
+{
+    blob.stl
+    {
+        name blob;
+        type triSurfaceMesh;
+    }
+
+    refinementBox
+    {
+        type searchableBox;
+        min (-0.2  -0.6 -0.2);
+        max ( 0.4   0.2  0.35);
+    }
+}
+
+
+backgroundMeshDecomposition
+{
+    minLevels 0;
+    sampleResolution 4;
+    spanScale 20;
+    maxCellWeightCoeff 20;
+}
+
+
+initialPoints
+{
+    initialPointsMethod         autoDensity;
+    // initialPointsMethod     pointFile;
+
+    autoDensityCoeffs
+    {
+        minLevels               0;
+        maxSizeRatio            5.0;
+        sampleResolution        5;
+        surfaceSampleResolution 5;
+    }
+
+    pointFileCoeffs
+    {
+        pointFile               "constant/internalDelaunayVertices";
+    }
+}
+
+
+surfaceConformation
+{
+    locationInMesh                      (0.1 0.1 0.2);
+
+    geometryToConformTo
+    {
+        blob
+        {
+            featureMethod       none;
+        }
+    }
+}
+
+
+motionControl
+{
+    defaultCellSize             0.1;
+
+    minimumCellSizeCoeff        0;
+
+    maxSmoothingIterations      100;
+
+    maxRefinementIterations     0;
+
+    shapeControlFunctions
+    {
+        blob
+        {
+            type                    searchableSurfaceControl;
+            priority                1;
+            mode                    bothSides;
+
+            surfaceCellSizeFunction uniformValue;
+            uniformValueCoeffs
+            {
+                surfaceCellSizeCoeff     1;
+            }
+
+            cellSizeFunction        uniform;
+            uniformCoeffs
+            {}
+        }
+    }
+
+    objOutput                   no;
+
+    timeChecks                  no;
+}
+
+
+meshQualityControls
+{
+    #include "meshQualityDict"
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/cvMesh/blob/system/fvSchemes b/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/system/fvSchemes
rename to tutorials/mesh/foamyHexMesh/blob/system/fvSchemes
diff --git a/tutorials/mesh/cvMesh/blob/system/fvSolution b/tutorials/mesh/foamyHexMesh/blob/system/fvSolution
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/system/fvSolution
rename to tutorials/mesh/foamyHexMesh/blob/system/fvSolution
diff --git a/tutorials/mesh/cvMesh/blob/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/system/meshQualityDict
rename to tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
diff --git a/tutorials/mesh/cvMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/system/snappyHexMeshDict
rename to tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict
diff --git a/tutorials/mesh/cvMesh/blob/system/topoSetDict b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
similarity index 100%
rename from tutorials/mesh/cvMesh/blob/system/topoSetDict
rename to tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
diff --git a/tutorials/mesh/cvMesh/flange/Allclean b/tutorials/mesh/foamyHexMesh/flange/Allclean
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/Allclean
rename to tutorials/mesh/foamyHexMesh/flange/Allclean
diff --git a/tutorials/mesh/cvMesh/flange/Allrun b/tutorials/mesh/foamyHexMesh/flange/Allrun
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/Allrun
rename to tutorials/mesh/foamyHexMesh/flange/Allrun
diff --git a/tutorials/mesh/cvMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/Allrun-parallel
rename to tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
diff --git a/tutorials/mesh/cvMesh/flange/Alltest b/tutorials/mesh/foamyHexMesh/flange/Alltest
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/Alltest
rename to tutorials/mesh/foamyHexMesh/flange/Alltest
diff --git a/tutorials/mesh/cvMesh/flange/constant/polyMesh/blockMeshDict b/tutorials/mesh/foamyHexMesh/flange/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/foamyHexMesh/flange/constant/polyMesh/blockMeshDict
diff --git a/tutorials/mesh/cvMesh/flange/constant/polyMesh/boundary b/tutorials/mesh/foamyHexMesh/flange/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/constant/polyMesh/boundary
rename to tutorials/mesh/foamyHexMesh/flange/constant/polyMesh/boundary
diff --git a/tutorials/mesh/cvMesh/flange/constant/triSurface/flange.obj b/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/flange.obj
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/constant/triSurface/flange.obj
rename to tutorials/mesh/foamyHexMesh/flange/constant/triSurface/flange.obj
diff --git a/tutorials/mesh/cvMesh/flange/system/collapseDict b/tutorials/mesh/foamyHexMesh/flange/system/collapseDict
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/collapseDict
rename to tutorials/mesh/foamyHexMesh/flange/system/collapseDict
diff --git a/tutorials/mesh/cvMesh/flange/system/controlDict b/tutorials/mesh/foamyHexMesh/flange/system/controlDict
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/controlDict
rename to tutorials/mesh/foamyHexMesh/flange/system/controlDict
diff --git a/tutorials/mesh/cvMesh/flange/system/decomposeParDict b/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/decomposeParDict
rename to tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict
diff --git a/tutorials/mesh/cvMesh/flange/system/faceSetDict b/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/faceSetDict
rename to tutorials/mesh/foamyHexMesh/flange/system/faceSetDict
diff --git a/tutorials/mesh/cvMesh/flange/system/cvMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
similarity index 57%
rename from tutorials/mesh/cvMesh/flange/system/cvMeshDict
rename to tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
index a75d49de36..91d3059bd8 100644
--- a/tutorials/mesh/cvMesh/flange/system/cvMeshDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
@@ -10,10 +10,13 @@ FoamFile
     version         2.0;
     format          ascii;
     class           dictionary;
-    object          cvMeshDict;
+    object          foamyHexMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Include defaults parameters from master dictionary
+#include "$WM_PROJECT_DIR/etc/caseDicts/foamyHexMeshDict"
+
 // Any scalar with a name <name>Coeff specifies a value that will be implemented
 // as a faction of the target cell size
 
@@ -40,35 +43,6 @@ surfaceConformation
 {
     locationInMesh                      (0 0 0);
 
-    pointPairDistanceCoeff              0.1;
-
-    mixedFeaturePointPPDistanceCoeff    5.0;
-
-    featurePointExclusionDistanceCoeff  0.7;
-
-    featureEdgeExclusionDistanceCoeff   0.7;
-
-    surfaceSearchDistanceCoeff          5;
-
-    maxSurfaceProtrusionCoeff           0.1;
-
-    maxQuadAngle                        125;
-
-    surfaceConformationRebuildFrequency 10;
-
-    specialiseFeaturePoints             on;
-
-    conformationControls
-    {
-        edgeSearchDistCoeff             5;
-        surfacePtReplaceDistCoeff       0.5;
-        surfacePtExclusionDistanceCoeff 0.5;
-
-        maxIterations                   15;
-
-        iterationToInitialHitRatioLimit 0.0001;
-    }
-
     geometryToConformTo
     {
         flange
@@ -77,16 +51,11 @@ surfaceConformation
             extendedFeatureEdgeMesh "flange.extendedFeatureEdgeMesh";
         }
     }
-
-    additionalFeatures
-    {}
 }
 
 
 initialPoints
 {
-    minimumSurfaceDistanceCoeff 0.55;
-
     initialPointsMethod         autoDensity;
 
     autoDensityCoeffs
@@ -96,11 +65,6 @@ initialPoints
         sampleResolution        4;
         surfaceSampleResolution 5;
     }
-
-    pointFileCoeffs
-    {
-        pointFile              "constant/internalDelaunayVertices";
-    }
 }
 
 
@@ -113,7 +77,7 @@ motionControl
     // For background cell size and alignment grid
     maxSmoothingIterations      100;
 
-    maxRefinementIterations     5;
+    maxRefinementIterations     0;
 
     shapeControlFunctions
     {
@@ -135,66 +99,17 @@ motionControl
                 linearDistanceCoeff     2.5;
             }
         }
-
-/*        fileControl*/
-/*        {*/
-/*            type                    fileControl;*/
-/*            priority                1;*/
-/*            pointsFile              "points";*/
-/*            sizesFile               "sizes";*/
-/*            alignmentsFile          "alignments";*/
-/*        }*/
     }
 
-    cellAspectRatioControl
-    {
-        aspectRatio             1.0;
-        aspectRatioDirection    (0 0 0);
-    }
-
-    relaxationModel             adaptiveLinear;
-
     adaptiveLinearCoeffs
     {
-        relaxationStart         0.5;
+        relaxationStart         1.0;
         relaxationEnd           0.0;
     }
 
     objOutput                   no;
 
     timeChecks                  no;
-
-    maxLoadUnbalance            0.2;
-
-    alignmentAcceptanceAngle    48;
-
-    pointInsertionCriteria
-    {
-        cellCentreDistCoeff     1.75;
-        faceAreaRatioCoeff      0.0025;
-        acceptanceAngle         21.5;
-    }
-
-    pointRemovalCriteria
-    {
-        cellCentreDistCoeff     0.65;
-    }
-
-    faceAreaWeightModel         piecewiseLinearRamp;
-
-    piecewiseLinearRampCoeffs
-    {
-        lowerAreaFraction       0.5;
-        upperAreaFraction       1.0;
-    }
-}
-
-
-polyMeshFiltering
-{
-    filterEdges                 on;
-    filterFaces                 off;
-    writeTetDualMesh            false;
 }
 
 
diff --git a/tutorials/mesh/cvMesh/flange/system/fvSchemes b/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/fvSchemes
rename to tutorials/mesh/foamyHexMesh/flange/system/fvSchemes
diff --git a/tutorials/mesh/cvMesh/flange/system/fvSolution b/tutorials/mesh/foamyHexMesh/flange/system/fvSolution
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/fvSolution
rename to tutorials/mesh/foamyHexMesh/flange/system/fvSolution
diff --git a/tutorials/mesh/cvMesh/flange/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/meshQualityDict
rename to tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
diff --git a/tutorials/mesh/cvMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/snappyHexMeshDict
rename to tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict
diff --git a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHexMesh/flange/system/surfaceFeatureExtractDict
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
rename to tutorials/mesh/foamyHexMesh/flange/system/surfaceFeatureExtractDict
diff --git a/tutorials/mesh/cvMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/topoSetDict-background
rename to tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
diff --git a/tutorials/mesh/cvMesh/flange/system/topoSetDict-slices b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
similarity index 100%
rename from tutorials/mesh/cvMesh/flange/system/topoSetDict-slices
rename to tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
diff --git a/tutorials/mesh/cvMesh/simpleShapes/Allclean b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/Allclean
rename to tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
diff --git a/tutorials/mesh/cvMesh/simpleShapes/Allrun b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/Allrun
rename to tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
diff --git a/tutorials/mesh/cvMesh/simpleShapes/constant/triSurface/cone.stl b/tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/cone.stl
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/constant/triSurface/cone.stl
rename to tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/cone.stl
diff --git a/tutorials/mesh/cvMesh/simpleShapes/constant/triSurface/coneAndSphere.obj b/tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/coneAndSphere.obj
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/constant/triSurface/coneAndSphere.obj
rename to tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/coneAndSphere.obj
diff --git a/tutorials/mesh/cvMesh/simpleShapes/constant/triSurface/domain.stl b/tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/domain.stl
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/constant/triSurface/domain.stl
rename to tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/domain.stl
diff --git a/tutorials/mesh/cvMesh/simpleShapes/constant/triSurface/sphere.stl b/tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/sphere.stl
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/constant/triSurface/sphere.stl
rename to tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/sphere.stl
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/collapseDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/system/collapseDict
rename to tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/controlDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/system/controlDict
rename to tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/cvMeshDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/cvMeshDict
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/system/cvMeshDict
rename to tutorials/mesh/foamyHexMesh/simpleShapes/system/cvMeshDict
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/fvSchemes b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/system/fvSchemes
rename to tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/fvSolution b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/system/fvSolution
rename to tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/system/meshQualityDict
rename to tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/surfaceFeatureExtractDict
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
rename to tutorials/mesh/foamyHexMesh/simpleShapes/system/surfaceFeatureExtractDict
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/topoSetDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
similarity index 100%
rename from tutorials/mesh/cvMesh/simpleShapes/system/topoSetDict
rename to tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict