diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
index 8fe8686f668d61cb15760be0b739f8ee1c17a298..f9a4d17aafc15baa3ea4fe88a56e203124adb1af 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
@@ -20,7 +20,7 @@ EXE_INC =  \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I../conformalVoronoiMesh/lnInclude
 
 EXE_LIBS =  \
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
index 44c1d87758d5258e02108d66f7a3ce1d089c6826..d2bdc98f84554dbfe9fb5c526895d634fe54ee89 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
@@ -22,7 +22,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -IPrintTable \
     -I/usr/include
 
@@ -35,4 +35,4 @@ LIB_LIBS = \
     -ldynamicMesh \
     -lsurfMesh \
     -lsampling \
-    -lautoMesh
+    -lsnappyHexMesh
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
index b3f2e7dd7ceed3f5a69ecb53a20f978ea2a58abf..6cbbd9a4ab05e3b958e56978d1fee1f88b7640fe 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
@@ -22,7 +22,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -IvectorTools
 
 EXE_LIBS = \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
index 07f6800de62364583b2cf2105c5c654ac066e319..dae842a311f2b824ce444521d06d04d6375bba62 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
@@ -10,7 +10,7 @@ EXE_INC = \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
index 18ce8326c785c59becb6ecae26b10d299abc3711..5cb1f8676ddc626dcede0ee8e65034f443e9a68a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
     -I$(FASTDUALOCTREE_SRC_PATH) \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
index 0c04fa99bee1ca5e70ae9d7e1114216a7971095d..1dace00f1e4cba029c9859eb4eb7c0b7f4aaa210 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
@@ -21,7 +21,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I/usr/include
 
 EXE_LIBS = \
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index 219e3d419c848efd02e7e363825c5ebece691a80..c233730d42323910fb39154e264758933ae5c825 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -1,7 +1,7 @@
 EXE_INC = \
     /* -g -DFULLDEBUG -O0 */ \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
@@ -18,4 +18,4 @@ EXE_LIBS = \
     -lsurfMesh \
     -lfileFormats \
     -ldynamicMesh \
-    -lautoMesh
+    -lsnappyHexMesh
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
index 30fde688e5aa0fe88f1940882bf0b5d3f888af9c..56e8dc4f1748e4297e3e770831a54074c6a0263c 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
@@ -1,9 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
-    -lautoMesh \
+    -lsnappyHexMesh \
     -ltriSurface
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 2324ff61d041f5223e891040930416e2a7cc053e..0a415b6bfbd4a1a947ba3cdf1719e1f978ffb34c 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -1,5 +1,5 @@
 EXE_LIBS = \
-    -lautoMesh \
+    -lsnappyHexMesh \
     -lbarotropicCompressibilityModel \
     -lsolidThermo \
     -lcompressibleTransportModels \
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index 0b948da366b981d9238b8ca41bf8c40ab8678a5e..9fc260a1a19f7f913c816aa41032deb44d206403 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -6,7 +6,7 @@ targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $targetType autoMesh
+wmake $targetType snappyHexMesh
 wmake $targetType blockMesh
 wmake $targetType extrudeModel
 
diff --git a/src/mesh/autoMesh/Make/files b/src/mesh/autoMesh/Make/files
deleted file mode 100644
index 2bc9cd80a17ee6186e46e895250e16ba14cfcf35..0000000000000000000000000000000000000000
--- a/src/mesh/autoMesh/Make/files
+++ /dev/null
@@ -1,36 +0,0 @@
-autoHexMesh             = autoHexMesh
-autoHexMeshDriver       = $(autoHexMesh)/autoHexMeshDriver
-
-$(autoHexMeshDriver)/autoLayerDriver.C
-/* $(autoHexMeshDriver)/autoLayerDriverShrink.C */
-$(autoHexMeshDriver)/autoSnapDriver.C
-$(autoHexMeshDriver)/autoSnapDriverFeature.C
-$(autoHexMeshDriver)/autoRefineDriver.C
-
-$(autoHexMeshDriver)/layerParameters/layerParameters.C
-$(autoHexMeshDriver)/refinementParameters/refinementParameters.C
-$(autoHexMeshDriver)/snapParameters/snapParameters.C
-$(autoHexMeshDriver)/pointData/pointData.C
-
-$(autoHexMesh)/meshRefinement/meshRefinementBaffles.C
-$(autoHexMesh)/meshRefinement/meshRefinement.C
-$(autoHexMesh)/meshRefinement/meshRefinementMerge.C
-$(autoHexMesh)/meshRefinement/meshRefinementProblemCells.C
-$(autoHexMesh)/meshRefinement/meshRefinementRefine.C
-$(autoHexMesh)/meshRefinement/patchFaceOrientation.C
-
-$(autoHexMesh)/refinementFeatures/refinementFeatures.C
-$(autoHexMesh)/refinementSurfaces/surfaceZonesInfo.C
-$(autoHexMesh)/refinementSurfaces/refinementSurfaces.C
-$(autoHexMesh)/shellSurfaces/shellSurfaces.C
-$(autoHexMesh)/trackedParticle/trackedParticle.C
-$(autoHexMesh)/trackedParticle/trackedParticleCloud.C
-
-meshMover = $(autoHexMesh)/externalDisplacementMeshMover
-$(meshMover)/displacementMeshMoverMotionSolver.C
-$(meshMover)/externalDisplacementMeshMover.C
-$(meshMover)/medialAxisMeshMover.C
-$(meshMover)/zeroFixedValue/zeroFixedValuePointPatchFields.C
-
-LIB = $(FOAM_LIBBIN)/libautoMesh
-
diff --git a/src/mesh/snappyHexMesh/Make/files b/src/mesh/snappyHexMesh/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..476ecc79dab5c4dc66c07ade8cddce6faa2d7f9c
--- /dev/null
+++ b/src/mesh/snappyHexMesh/Make/files
@@ -0,0 +1,31 @@
+autoHexMeshDriver/autoLayerDriver.C
+/* autoHexMeshDriver/autoLayerDriverShrink.C */
+autoHexMeshDriver/autoSnapDriver.C
+autoHexMeshDriver/autoSnapDriverFeature.C
+autoHexMeshDriver/autoRefineDriver.C
+
+autoHexMeshDriver/layerParameters/layerParameters.C
+autoHexMeshDriver/refinementParameters/refinementParameters.C
+autoHexMeshDriver/snapParameters/snapParameters.C
+autoHexMeshDriver/pointData/pointData.C
+
+meshRefinement/meshRefinementBaffles.C
+meshRefinement/meshRefinement.C
+meshRefinement/meshRefinementMerge.C
+meshRefinement/meshRefinementProblemCells.C
+meshRefinement/meshRefinementRefine.C
+meshRefinement/patchFaceOrientation.C
+
+refinementFeatures/refinementFeatures.C
+refinementSurfaces/surfaceZonesInfo.C
+refinementSurfaces/refinementSurfaces.C
+shellSurfaces/shellSurfaces.C
+trackedParticle/trackedParticle.C
+trackedParticle/trackedParticleCloud.C
+
+externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+externalDisplacementMeshMover/externalDisplacementMeshMover.C
+externalDisplacementMeshMover/medialAxisMeshMover.C
+externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
+
+LIB = $(FOAM_LIBBIN)/libsnappyHexMesh
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/snappyHexMesh/Make/options
similarity index 100%
rename from src/mesh/autoMesh/Make/options
rename to src/mesh/snappyHexMesh/Make/options
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.H
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
similarity index 97%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
index afb66396c88747a2baac3b68632d19d90c1f9d53..adae5237220b9fe93bf41c026768bbe9d4d75706 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C
index 8c63239f397c6ece0c5baedcb2c9bf433c303337..81fda9a3a26470bb56f08b12aa62458368ef560a 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H
index a72f3c0796d291f8d16409cefdfd09bec479f9c0..a4cb07506db7a0db7833f7b8e3126aa8f9b4dce6 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.H
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
index 49125589a3e8b9dcbb8950ec98255c29cbba794e..d2b12b8780c3161ad68ff200b671c3dc50b1f2a6 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
index 52b4855ae26f059f35744bc5597227d81daa8d31..a9bd6a64a1ef089d85e5a13999ee5af161667ba1 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C
similarity index 96%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C
index e3d36bfcb3a3a183d54ace65213372f32708dc65..7306051e378edad947b7ef5b550b1925cf7b8a2c 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H
index 9b933d744c0d6f4f1ad47e2135ce597d8c9eac74..8541a5cd3e7ccbb98250158e115b95a9aabef6df 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H
index 69d59bcb0007e0545f1df44fbaeabf0db1bf7513..14fa39fe943fa9f62f1c0bbd16b319f25d1bae71 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
index b87015effac5f1508e052fe6a2e573a1e3e4fefa..3bb4ade11d2fe44d56a0773e98293b96d9a23c68 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
index 06b90b07580b41986f45d86db2c77352fc7af2a5..beb3a0039efc7507818160c674bda029a4035e60 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C b/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
similarity index 96%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
index 364a6aae490a4f36dc44b0b74e2ccbe53640fe54..40f1453a072fb341e37d7067aa7cc56a8f14e9f0 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H b/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
rename to src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
index 5dc4ca34e80a28d9cb494a02ad20b6d7b6d8e131..8913e8fcf8aeda26d93ffececd980ada72eef112 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
+++ b/src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
index 84d212e4251ce0b684056c4068b6a360210f7237..1c90909ebedc2a2b06f5493b1e9b45ca2b686435 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
similarity index 97%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
index 273f5fc301b0c19ecd821f9d9820e22ad20d23c9..e056ec807ae288046684ace570544374f7891b09 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
index 14916efc9c4e7712c9bbe6a17dec64f88e1f9aaa..404503632959f83d6fe9645164cd472eb56a42f5 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
index 9d98b435b8d0d0d12268c9b422bf99be6b551f16..4a6074683e384062e3dc14f913cc0aacf45d89f0 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
index 71c66c5c3ccebbc5c81d8e65c25317530f8a5e2c..2af66f6dc03a5ac35cc3c0b3b45702cb5c07117d 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
similarity index 97%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
index 8ee5b49f046b1028f9a6b84ce28bed6d15c1538f..0caa4f166cb96102a0ccee954ac48d016bc716cb 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
similarity index 95%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
index 71ed2c092c637cbf047b25c1d4b933df709eaa90..1ec629a11d4e7e538e86b6a3a2cc4624b82470e7 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
similarity index 96%
rename from src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
rename to src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
index d0826b73d49da1b9a2bcc70d2fae924bfff5d25d..59afbb82b2f896c769cb3dff5e61fad01dda1c78 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 1f2101155ed619ee3a4ba535e454490f2ba12ee0..b637a0f6d4e7063c8fa8ef7af247c380257517e6 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index 4fc1b400771c030c59ed7b3a83dd230e2e601f94..3f4880f03a5ae817149856fc5117a81395eda8b5 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index f1b8776f8a1cbd8b7a453a0c49d580d5feaa7ced..7d81e62011c150949f83b6f3edeabcede13e213a 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index e2224f7cd4ec77a361b1a732003044c9846086e2..a46c41a4120e65d1e1764917ea47b19e5f24ad0b 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
rename to src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
index 1bdb191299ccee4e32917b25039c7615ce39f3ca..7e42869451fd6504ad724e73958efb854bd7aa28 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.C b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.C
similarity index 95%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.C
rename to src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.C
index 8bdd1c410654e616483825b4c0433f85c6fc772a..0cce24342e39253b0aa4116acf581f17d795b3b7 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.H b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.H
rename to src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.H
index 116a68ee39a0390d79f69e275b7994144f82a797..e86eae1c03fc001e9d1dca76ef1ae82b987befef 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientation.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientationI.H b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientationI.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientationI.H
rename to src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientationI.H
index c66e696d4aed605a5f3875d79467c8875a98776b..f8a4429a4964085475917c4e221ba3b74161729b 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/patchFaceOrientationI.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/patchFaceOrientationI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
rename to src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H
rename to src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.H
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
rename to src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
rename to src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
index 7f777daf334a51f4755e6cc8b94d4f8a38623b42..f19fa4949ea3e75f15226e7c3ede7b3bfedd89cc 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
similarity index 99%
rename from src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C
rename to src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
index cb247ede20434cb2f9b992f2077c30d36602a323..0669d2fb5f5049fdbfd15d9bd8bff2a51703b8b3 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H
rename to src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
index eb59aad34fab72539af60b17a02d55a2c05051e2..467d4331ba2e94f38747ed08b99ae9ed463e004c 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
rename to src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
rename to src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
similarity index 98%
rename from src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
rename to src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
index a883c39d421d4fa7e2c859bc5b2648c9c32886f2..686593e3b5db610fad71321ce9a9a7cf7440c4d0 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
+++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
similarity index 100%
rename from src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
rename to src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C b/src/mesh/snappyHexMesh/trackedParticle/trackedParticleCloud.C
similarity index 95%
rename from src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
rename to src/mesh/snappyHexMesh/trackedParticle/trackedParticleCloud.C
index 109a7bd870e4a4f409449d88d9189a20fc297ca3..29bdad32fd44de57b9567107a609d1043154e451 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
+++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License