diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 627dd41b6f..9b064b14c6 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -34,6 +34,7 @@ License
 #include "fvcFlux.H"
 #include "fvcMeshPhi.H"
 #include "surfaceInterpolate.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -43,10 +44,6 @@ namespace Foam
 }
 
 
-const Foam::scalar Foam::multiphaseMixtureThermo::convertToRad =
-    Foam::constant::mathematical::pi/180.0;
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::multiphaseMixtureThermo::calcAlphas()
@@ -855,7 +852,7 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
 
             bool matched = (tp.key().first() == alpha1.name());
 
-            scalar theta0 = convertToRad*tp().theta0(matched);
+            const scalar theta0 = degToRad(tp().theta0(matched));
             scalarField theta(boundary[patchi].size(), theta0);
 
             scalar uTheta = tp().uTheta();
@@ -863,8 +860,8 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
             // Calculate the dynamic contact angle if required
             if (uTheta > SMALL)
             {
-                scalar thetaA = convertToRad*tp().thetaA(matched);
-                scalar thetaR = convertToRad*tp().thetaR(matched);
+                const scalar thetaA = degToRad(tp().thetaA(matched));
+                const scalar thetaR = degToRad(tp().thetaR(matched));
 
                 // Calculated the component of the velocity parallel to the wall
                 vectorField Uwall
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
index 7c8c5b6f03..1fd4e40639 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
@@ -144,9 +144,6 @@ private:
         //- Stabilisation for normalisation of the interface normal
         const dimensionedScalar deltaN_;
 
-        //- Conversion factor for degrees into radians
-        static const scalar convertToRad;
-
 
     // Private member functions
 
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
index 644c3b25a0..b5495dd6ae 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
@@ -30,12 +30,7 @@ License
 #include "fvcDiv.H"
 #include "fvcGrad.H"
 #include "fvcSnGrad.H"
-
-// * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
-
-const Foam::scalar Foam::threePhaseInterfaceProperties::convertToRad =
-    Foam::constant::mathematical::pi/180.0;
-
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -83,7 +78,7 @@ void Foam::threePhaseInterfaceProperties::correctContactAngle
 
             scalarField theta
             (
-                convertToRad
+                degToRad()
               * (
                    twoPhaseAlpha2*(180 - a2cap.theta(U[patchi], nHatp))
                  + twoPhaseAlpha3*(180 - a3cap.theta(U[patchi], nHatp))
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
index 826d6658d9..482a8a1a8e 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
@@ -91,10 +91,6 @@ class threePhaseInterfaceProperties
 
 public:
 
-    //- Conversion factor for degrees into radians
-    static const scalar convertToRad;
-
-
     // Constructors
 
         //- Construct from volume fraction field alpha and IOdictionary
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index de3084f69f..425be38063 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -35,12 +35,7 @@ License
 #include "fvcDiv.H"
 #include "fvcFlux.H"
 #include "fvcAverage.H"
-
-// * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
-
-const Foam::scalar Foam::multiphaseSystem::convertToRad =
-    Foam::constant::mathematical::pi/180.0;
-
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -290,7 +285,7 @@ void Foam::multiphaseSystem::correctContactAngle
 
             bool matched = (tp.key().first() == phase1.name());
 
-            scalar theta0 = convertToRad*tp().theta0(matched);
+            const scalar theta0 = degToRad(tp().theta0(matched));
             scalarField theta(boundary[patchi].size(), theta0);
 
             scalar uTheta = tp().uTheta();
@@ -298,8 +293,8 @@ void Foam::multiphaseSystem::correctContactAngle
             // Calculate the dynamic contact angle if required
             if (uTheta > SMALL)
             {
-                scalar thetaA = convertToRad*tp().thetaA(matched);
-                scalar thetaR = convertToRad*tp().thetaR(matched);
+                const scalar thetaA = degToRad(tp().thetaA(matched));
+                const scalar thetaR = degToRad(tp().thetaR(matched));
 
                 // Calculated the component of the velocity parallel to the wall
                 vectorField Uwall
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index 02b56684da..0094c2c164 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -187,9 +187,6 @@ private:
         //- Stabilisation for normalisation of the interface normal
         const dimensionedScalar deltaN_;
 
-        //- Conversion factor for degrees into radians
-        static const scalar convertToRad;
-
 
     // Private member functions
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index b6144051a4..63a2776db4 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -33,12 +33,7 @@ License
 #include "fvcSnGrad.H"
 #include "fvcDiv.H"
 #include "fvcFlux.H"
-
-// * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
-
-const Foam::scalar Foam::multiphaseMixture::convertToRad =
-    Foam::constant::mathematical::pi/180.0;
-
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -456,7 +451,7 @@ void Foam::multiphaseMixture::correctContactAngle
 
             bool matched = (tp.key().first() == alpha1.name());
 
-            scalar theta0 = convertToRad*tp().theta0(matched);
+            const scalar theta0 = degToRad(tp().theta0(matched));
             scalarField theta(boundary[patchi].size(), theta0);
 
             scalar uTheta = tp().uTheta();
@@ -464,8 +459,8 @@ void Foam::multiphaseMixture::correctContactAngle
             // Calculate the dynamic contact angle if required
             if (uTheta > SMALL)
             {
-                scalar thetaA = convertToRad*tp().thetaA(matched);
-                scalar thetaR = convertToRad*tp().thetaR(matched);
+                const scalar thetaA = degToRad(tp().thetaA(matched));
+                const scalar thetaR = degToRad(tp().thetaR(matched));
 
                 // Calculated the component of the velocity parallel to the wall
                 vectorField Uwall
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
index 44150c9d2b..0183652ffc 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
@@ -154,9 +154,6 @@ private:
         //- Stabilisation for normalisation of the interface normal
         const dimensionedScalar deltaN_;
 
-        //- Conversion factor for degrees into radians
-        static const scalar convertToRad;
-
 
     // Private member functions
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 627af1db87..1f8f83599b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -40,6 +40,8 @@ License
 #include "fvmLaplacian.H"
 #include "fvmSup.H"
 
+#include "unitConversion.H"
+
 // * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
 
 namespace Foam
@@ -48,9 +50,6 @@ namespace Foam
     defineRunTimeSelectionTable(multiphaseSystem, dictionary);
 }
 
-const Foam::scalar Foam::multiphaseSystem::convertToRad =
-    Foam::constant::mathematical::pi/180.0;
-
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -399,7 +398,7 @@ void Foam::multiphaseSystem::correctContactAngle
 
             bool matched = (tp.key().first() == phase1.name());
 
-            scalar theta0 = convertToRad*tp().theta0(matched);
+            const scalar theta0 = degToRad(tp().theta0(matched));
             scalarField theta(boundary[patchi].size(), theta0);
 
             scalar uTheta = tp().uTheta();
@@ -407,8 +406,8 @@ void Foam::multiphaseSystem::correctContactAngle
             // Calculate the dynamic contact angle if required
             if (uTheta > SMALL)
             {
-                scalar thetaA = convertToRad*tp().thetaA(matched);
-                scalar thetaR = convertToRad*tp().thetaR(matched);
+                const scalar thetaA = degToRad(tp().thetaA(matched));
+                const scalar thetaR = degToRad(tp().thetaR(matched));
 
                 // Calculated the component of the velocity parallel to the wall
                 vectorField Uwall
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index dca55bf873..0c43f6dd8f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -65,9 +65,6 @@ class multiphaseSystem
         //- Stabilisation for normalisation of the interface normal
         const dimensionedScalar deltaN_;
 
-        //- Conversion factor for degrees into radians
-        static const scalar convertToRad;
-
 
     // Private member functions
 
@@ -207,10 +204,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "multiphaseSystemI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index 034da57349..a1ac6c46f6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -43,26 +43,17 @@ using namespace Foam::constant::mathematical;
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
 <
     Foam::compressible::
-    alphatWallBoilingWallFunctionFvPatchScalarField::phaseType,
-    2
->::names[] =
-{
-    "vapor",
-    "liquid"
-};
-
-const Foam::NamedEnum
-<
-    Foam::compressible::
-    alphatWallBoilingWallFunctionFvPatchScalarField::phaseType,
-    2
+    alphatWallBoilingWallFunctionFvPatchScalarField::phaseType
 >
 Foam::compressible::
-alphatWallBoilingWallFunctionFvPatchScalarField::phaseTypeNames_;
+alphatWallBoilingWallFunctionFvPatchScalarField::phaseTypeNames_
+{
+    { phaseType::vaporPhase, "vapor" },
+    { phaseType::liquidPhase, "liquid" },
+};
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -111,7 +102,7 @@ alphatWallBoilingWallFunctionFvPatchScalarField
 )
 :
     alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(p, iF, dict),
-    phaseType_(phaseTypeNames_.read(dict.lookup("phaseType"))),
+    phaseType_(phaseTypeNames_.lookup("phaseType", dict)),
     relax_(dict.lookupOrDefault<scalar>("relax", 0.5)),
     AbyV_(p.size(), 0),
     alphatConv_(p.size(), 0),
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
index 665d41197e..33ca2fe31e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
@@ -164,7 +164,7 @@ private:
     // Private data
 
         //- Heat source type names
-        static const NamedEnum<phaseType, 2> phaseTypeNames_;
+        static const Enum<phaseType> phaseTypeNames_;
 
         //- Heat source type
         phaseType phaseType_;
diff --git a/applications/test/PackedList2/Test-PackedList2.C b/applications/test/PackedList2/Test-PackedList2.C
index 26981b484f..ce9b15ed51 100644
--- a/applications/test/PackedList2/Test-PackedList2.C
+++ b/applications/test/PackedList2/Test-PackedList2.C
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
     std::vector<bool> stlVector(n, true);
 
     labelHashSet emptyHash;
-    labelHashSet fullHash(1000);
+    labelHashSet fullHash(1024);
     for (label i = 0; i < n; i++)
     {
         fullHash.insert(i);
diff --git a/applications/test/dictionary/Test-dictionary.C b/applications/test/dictionary/Test-dictionary.C
index dc55b9902f..3d7e445ab5 100644
--- a/applications/test/dictionary/Test-dictionary.C
+++ b/applications/test/dictionary/Test-dictionary.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
         dictionary dict;
         dict.add(word("aa" + getEnv("WM_MPLIB") + "cc"), 16);
 
-        string s("DDD${aa${WM_MPLIB}cc}EEE");
+        string s("DDD_${aa${WM_MPLIB}cc}_EEE");
         stringOps::inplaceExpand(s, dict, true, false);
         Info<< "variable expansion:" << s << endl;
     }
diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index 7a61b77f72..14ba97f7a5 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/applications/test/parallel/Test-parallel.C
@@ -51,7 +51,7 @@ void testMapDistribute()
     List<Tuple2<label, List<scalar>>> complexData(100);
     forAll(complexData, i)
     {
-        complexData[i].first() = rndGen.integer(0, Pstream::nProcs()-1);
+        complexData[i].first() = rndGen.position(0, Pstream::nProcs()-1);
         complexData[i].second().setSize(3);
         complexData[i].second()[0] = 1;
         complexData[i].second()[1] = 2;
diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
index ec4b6e994f..06564cd80f 100644
--- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
+++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
     fileName pointsFile(runTime.constantPath()/"points.tmp");
     OFstream pFile(pointsFile);
 
-    scalar a(degToRad(0.1));
+    const scalar a = 0.1_deg;
     tensor rotateZ =
         tensor
         (
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 6b5fa8621c..8db1bdfec8 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -419,7 +419,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
     {
         // Distribute the points to be +/- 2.5deg from the x-z plane
 
-        scalar tanTheta = Foam::tan(degToRad(2.5));
+        const scalar tanTheta = Foam::tan(2.5_deg);
 
         SLList<face>::iterator iterf = pFaces[WEDGE][0].begin();
         SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 26b23f691a..52dba40d6e 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -69,18 +69,12 @@ enum ExtrudeMode
     SURFACE
 };
 
-namespace Foam
+static const Enum<ExtrudeMode> ExtrudeModeNames
 {
-    template<>
-    const char* NamedEnum<ExtrudeMode, 3>::names[] =
-    {
-        "mesh",
-        "patch",
-        "surface"
-    };
-}
-
-static const NamedEnum<ExtrudeMode, 3> ExtrudeModeNames;
+    { ExtrudeMode::MESH, "mesh" },
+    { ExtrudeMode::PATCH, "patch" },
+    { ExtrudeMode::SURFACE, "surface" },
+};
 
 
 void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
@@ -305,9 +299,10 @@ int main(int argc, char *argv[])
     const Switch flipNormals(dict.lookup("flipNormals"));
 
     // What to extrude
-    const ExtrudeMode mode = ExtrudeModeNames.read
+    const ExtrudeMode mode = ExtrudeModeNames.lookup
     (
-        dict.lookup("constructFrom")
+        "constructFrom",
+        dict
     );
 
     // Any merging of small edges
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index f10a593a29..e978b44e61 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -60,17 +60,11 @@ enum ExtrudeMode
     MESHEDSURFACE
 };
 
-namespace Foam
+static const Enum<ExtrudeMode> ExtrudeModeNames
 {
-    template<>
-    const char* NamedEnum<ExtrudeMode, 2>::names[] =
-    {
-        "polyMesh2D",
-        "MeshedSurface"
-    };
-}
-
-static const NamedEnum<ExtrudeMode, 2> ExtrudeModeNames;
+    { ExtrudeMode::POLYMESH2D, "polyMesh2D" },
+    { ExtrudeMode::MESHEDSURFACE, "MeshedSurface" },
+};
 
 
 //pointField moveInitialPoints
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 43131671d5..141f36b933 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -42,24 +42,20 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(conformalVoronoiMesh, 0);
-
-    template<>
-    const char* NamedEnum
-    <
-        conformalVoronoiMesh::dualMeshPointType,
-        5
-    >::names[] =
-    {
-        "internal",
-        "surface",
-        "featureEdge",
-        "featurePoint",
-        "constrained"
-    };
 }
 
-const Foam::NamedEnum<Foam::conformalVoronoiMesh::dualMeshPointType, 5>
-    Foam::conformalVoronoiMesh::dualMeshPointTypeNames_;
+const Foam::Enum
+<
+    Foam::conformalVoronoiMesh::dualMeshPointType
+>
+Foam::conformalVoronoiMesh::dualMeshPointTypeNames_
+{
+    { dualMeshPointType::internal, "internal" },
+    { dualMeshPointType::surface, "surface" },
+    { dualMeshPointType::featureEdge, "featureEdge" },
+    { dualMeshPointType::featurePoint, "featurePoint" },
+    { dualMeshPointType::constrained, "constrained" },
+};
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index d204911c8f..0960b5e63c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -122,7 +122,7 @@ public:
             constrained  = 4
         };
 
-        static const NamedEnum<dualMeshPointType, 5> dualMeshPointTypeNames_;
+        static const Enum<dualMeshPointType> dualMeshPointTypeNames_;
 
 
 private:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 9567b8886b..df009f3083 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -33,10 +33,10 @@ License
 using namespace Foam::vectorTools;
 
 const Foam::scalar Foam::conformalVoronoiMesh::searchConeAngle
-    = Foam::cos(degToRad(30));
+    = Foam::cos(30.0_deg);
 
 const Foam::scalar Foam::conformalVoronoiMesh::searchAngleOppositeSurface
-    = Foam::cos(degToRad(150));
+    = Foam::cos(150.0_deg);
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
index 5dfac3963c..b9542b22ab 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
@@ -27,20 +27,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char*
-Foam::NamedEnum<Foam::indexedCellEnum::cellTypes, 6>::names[] =
+const Foam::Enum
+<
+    Foam::indexedCellEnum::cellTypes
+>
+Foam::indexedCellEnum::cellTypesNames_
 {
-    "Unassigned",
-    "Internal",
-    "Surface",
-    "FeatureEdge",
-    "FeaturePoint",
-    "Far"
+    { cellTypes::ctUnassigned, "Unassigned" },
+    { cellTypes::ctFar, "Far" },
+    { cellTypes::ctInternal, "Internal" },
+    { cellTypes::ctSurface, "Surface" },
+    { cellTypes::ctFeatureEdge, "FeatureEdge" },
+    { cellTypes::ctFeaturePoint,"FeaturePoint" },
 };
 
-const Foam::NamedEnum<Foam::indexedCellEnum::cellTypes, 6>
-cellTypesNames_;
-
 
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
index d81deca00c..eeab020502 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
@@ -34,7 +34,7 @@ SourceFiles
 #ifndef indexedCellEnum_H
 #define indexedCellEnum_H
 
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,7 +47,6 @@ class indexedCellEnum
 {
 public:
 
-
     enum cellTypes
     {
         ctUnassigned    = INT_MIN,
@@ -58,7 +57,7 @@ public:
         ctFeaturePoint  = INT_MIN + 5
     };
 
-    static const Foam::NamedEnum<cellTypes, 6> cellTypesNames_;
+    static const Enum<cellTypes> cellTypesNames_;
 };
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
index ddb03fa28e..729eea93d2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
@@ -28,42 +28,42 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char*
-Foam::NamedEnum<Foam::indexedVertexEnum::vertexType, 15>::names[] =
+const Foam::Enum
+<
+    Foam::indexedVertexEnum::vertexType
+>
+Foam::indexedVertexEnum::vertexTypeNames_
 {
-    "Unassigned",
-    "Internal",
-    "InternalNearBoundary",
-    "InternalSurface",
-    "InternalSurfaceBaffle",
-    "ExternalSurfaceBaffle",
-    "InternalFeatureEdge",
-    "InternalFeatureEdgeBaffle",
-    "ExternalFeatureEdgeBaffle",
-    "InternalFeaturePoint",
-    "ExternalSurface",
-    "ExternalFeatureEdge",
-    "ExternalFeaturePoint",
-    "Far",
-    "Constrained"
+    { vertexType::vtUnassigned, "Unassigned" },
+    { vertexType::vtInternal, "Internal" },
+    { vertexType::vtInternalNearBoundary, "InternalNearBoundary" },
+    { vertexType::vtInternalSurface, "InternalSurface" },
+    { vertexType::vtInternalSurfaceBaffle, "InternalSurfaceBaffle" },
+    { vertexType::vtExternalSurfaceBaffle, "ExternalSurfaceBaffle" },
+    { vertexType::vtInternalFeatureEdge, "InternalFeatureEdge" },
+    { vertexType::vtInternalFeatureEdgeBaffle, "InternalFeatureEdgeBaffle" },
+    { vertexType::vtExternalFeatureEdgeBaffle, "ExternalFeatureEdgeBaffle" },
+    { vertexType::vtInternalFeaturePoint, "InternalFeaturePoint" },
+    { vertexType::vtExternalSurface, "ExternalSurface" },
+    { vertexType::vtExternalFeatureEdge, "ExternalFeatureEdge" },
+    { vertexType::vtExternalFeaturePoint, "ExternalFeaturePoint" },
+    { vertexType::vtFar, "Far" },
+    { vertexType::vtConstrained, "Constrained" },
 };
 
-const Foam::NamedEnum<Foam::indexedVertexEnum::vertexType, 15>
-Foam::indexedVertexEnum::vertexTypeNames_;
 
-
-template<>
-const char*
-Foam::NamedEnum<Foam::indexedVertexEnum::vertexMotion, 2>::names[] =
+const Foam::Enum
+<
+    Foam::indexedVertexEnum::vertexMotion
+>
+Foam::indexedVertexEnum::vertexMotionNames_
 {
-    "fixed",
-    "movable"
+    { vertexMotion::fixed, "fixed" },
+    { vertexMotion::movable, "movable" },
 };
 
-const Foam::NamedEnum<Foam::indexedVertexEnum::vertexMotion, 2>
-vertexMotionNames_;
 
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<
 (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
index 581bcf80a6..1568061fae 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
@@ -34,7 +34,7 @@ SourceFiles
 #ifndef indexedVertexEnum_H
 #define indexedVertexEnum_H
 
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -72,9 +72,9 @@ public:
         movable = 1
     };
 
-    static const Foam::NamedEnum<vertexType, 15> vertexTypeNames_;
+    static const Enum<vertexType> vertexTypeNames_;
 
-    static const Foam::NamedEnum<vertexMotion, 2> vertexMotionNames_;
+    static const Enum<vertexMotion> vertexMotionNames_;
 
     friend Ostream& operator<<(Foam::Ostream&, const vertexType&);
 
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 3e91747415..00f2c7d05d 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -393,7 +393,7 @@ void extractSurface
 
     // Collect sizes. Hash on names to handle local-only patches (e.g.
     //  processor patches)
-    HashTable<label> patchSize(1000);
+    HashTable<label> patchSize(1024);
     label nFaces = 0;
     forAllConstIter(labelHashSet, includePatches, iter)
     {
@@ -405,7 +405,7 @@ void extractSurface
 
 
     // Allocate zone/patch for all patches
-    HashTable<label> compactZoneID(1000);
+    HashTable<label> compactZoneID(1024);
     forAllConstIter(HashTable<label>, patchSize, iter)
     {
         label sz = compactZoneID.size();
@@ -848,7 +848,7 @@ int main(int argc, char *argv[])
             (
                 meshRefinement::readFlags
                 (
-                    meshRefinement::IOdebugTypeNames,
+                    meshRefinement::debugTypeNames,
                     flags
                 )
             );
@@ -873,7 +873,7 @@ int main(int argc, char *argv[])
                 (
                     meshRefinement::readFlags
                     (
-                        meshRefinement::IOwriteTypeNames,
+                        meshRefinement::writeTypeNames,
                         flags
                     )
                 )
@@ -892,7 +892,7 @@ int main(int argc, char *argv[])
                 (
                     meshRefinement::readFlags
                     (
-                        meshRefinement::IOoutputTypeNames,
+                        meshRefinement::outputTypeNames,
                         flags
                     )
                 )
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 5c4862f2b8..b61718dbff 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -59,6 +59,7 @@ Usage
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "sigFpe.H"
 #include "Time.H"
 #include "fvMesh.H"
 #include "fvMeshTools.H"
@@ -2277,7 +2278,7 @@ int main(int argc, char *argv[])
     bool newTimes = args.optionFound("newTimes");
 
 
-    if (env("FOAM_SIGFPE"))
+    if (Foam::sigFpe::requested())
     {
         WarningInFunction
             << "Detected floating point exception trapping (FOAM_SIGFPE)."
@@ -2287,7 +2288,6 @@ int main(int argc, char *argv[])
     }
 
 
-
     const HashSet<word> selectedFields(0);
     const HashSet<word> selectedLagrangianFields(0);
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C b/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
index 88bf926c42..4df3379e3c 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
@@ -45,6 +45,7 @@ Description
 #include "fvMesh.H"
 #include "cellModeller.H"
 #include "globalFoam.H"
+#include "foamVersion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
index 11fc19ac3e..5ea7f196f5 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
@@ -33,23 +33,14 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::vector::components,
-        3
-    >::names[] =
-    {
-        "x",
-        "y",
-        "z"
-    };
-}
-
-const Foam::NamedEnum<Foam::vector::components, 3>
-    Foam::channelIndex::vectorComponentsNames_;
+const Foam::Enum
+<
+    Foam::vector::components
+>
+Foam::channelIndex::vectorComponentsNames_
+(
+    Foam::vector::components::X, { "x", "y", "z" }
+);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -233,7 +224,7 @@ Foam::channelIndex::channelIndex
 )
 :
     symmetric_(readBool(dict.lookup("symmetric"))),
-    dir_(vectorComponentsNames_.read(dict.lookup("component")))
+    dir_(vectorComponentsNames_.lookup("component", dict))
 {
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
index 5e554fa062..36e7764c4d 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
@@ -55,7 +55,7 @@ class channelIndex
 
     // Private data
 
-        static const NamedEnum<vector::components, 3> vectorComponentsNames_;
+        static const Enum<vector::components> vectorComponentsNames_;
 
         //- Is mesh symmetric
         const bool symmetric_;
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
index 4bea82a295..280e2ac645 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
@@ -29,24 +29,19 @@ License
 #include "polyMesh.H"
 #include "regionProperties.H"
 
-using namespace Foam;
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::solverTemplate::solverType
+>
+Foam::solverTemplate::solverTypeNames_
 {
-    template<>
-    const char* Foam::NamedEnum<Foam::solverTemplate::solverType, 4>::names[] =
-    {
-        "compressible",
-        "incompressible",
-        "buoyant",
-        "unknown"
-    };
-}
-
-const Foam::NamedEnum<Foam::solverTemplate::solverType, 4>
-    Foam::solverTemplate::solverTypeNames_;
+    { solverType::stCompressible, "compressible" },
+    { solverType::stIncompressible, "incompressible" },
+    { solverType::stBuoyant, "buoyant" },
+    { solverType::stUnknown, "unknown" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -261,7 +256,7 @@ Foam::solverTemplate::solverTemplate
 
     Info<< "Selecting " << solverName << ": ";
 
-    solverType_ = solverTypeNames_.read(solverDict.lookup("solverType"));
+    solverType_ = solverTypeNames_.lookup("solverType", solverDict);
     Info<< solverTypeNames_[solverType_];
 
     multiRegion_ = readBool(solverDict.lookup("multiRegion"));
@@ -366,7 +361,7 @@ bool Foam::solverTemplate::multiRegion() const
 }
 
 
-label Foam::solverTemplate::nRegion() const
+Foam::label Foam::solverTemplate::nRegion() const
 {
     return regionTypes_.size();
 }
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
index 26c9577f4c..89810575fc 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
@@ -36,7 +36,7 @@ Description
 #include "wordList.H"
 #include "dimensionSet.H"
 #include "IOobject.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,7 +65,7 @@ public:
         };
 
         //- Solver type names
-        static const NamedEnum<solverType, 4> solverTypeNames_;
+        static const Enum<solverType> solverTypeNames_;
 
 
 private:
diff --git a/applications/utilities/preProcessing/setAlphaField/Make/files b/applications/utilities/preProcessing/setAlphaField/Make/files
old mode 100755
new mode 100644
diff --git a/applications/utilities/preProcessing/setAlphaField/Make/options b/applications/utilities/preProcessing/setAlphaField/Make/options
old mode 100755
new mode 100644
diff --git a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
index 6fe8001e31..58fde7f78d 100644
--- a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
+++ b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
@@ -59,7 +59,12 @@ class shapeSelector
     static const Foam::Enum<shapeType> shapeTypeNames;
 };
 
-const Foam::Enum<shapeSelector::shapeType> shapeSelector::shapeTypeNames
+
+const Foam::Enum
+<
+    shapeSelector::shapeType
+>
+shapeSelector::shapeTypeNames
 {
     { shapeSelector::shapeType::PLANE, "plane" },
     { shapeSelector::shapeType::SPHERE, "sphere" },
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
index 7857569be3..eb38f408b2 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
@@ -41,22 +41,16 @@ namespace Foam
             dictionary
         );
     }
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::tabulatedWallFunctions::general::interpolationType,
-        1
-    >::names[] =
-    {
-        "linear"
-    };
-
 }
 
-const
-Foam::NamedEnum<Foam::tabulatedWallFunctions::general::interpolationType, 1>
-    Foam::tabulatedWallFunctions::general::interpolationTypeNames_;
+const Foam::Enum
+<
+    Foam::tabulatedWallFunctions::general::interpolationType
+>
+Foam::tabulatedWallFunctions::general::interpolationTypeNames_
+{
+    { interpolationType::itLinear, "linear" },
+};
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
@@ -138,7 +132,7 @@ Foam::tabulatedWallFunctions::general::general
 )
 :
     tabulatedWallFunction(dict, mesh, typeName),
-    interpType_(interpolationTypeNames_[coeffDict_.lookup("interpType")]),
+    interpType_(interpolationTypeNames_.lookup("interpType", coeffDict_)),
     yPlus_(),
     uPlus_(),
     log10YPlus_(coeffDict_.lookup("log10YPlus")),
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
index c61cc356d6..fc3c7ead91 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
@@ -63,7 +63,7 @@ SourceFiles
 #define general_H
 
 #include "tabulatedWallFunction.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -91,7 +91,7 @@ public:
             itLinear
         };
 
-        static const NamedEnum<interpolationType, 1> interpolationTypeNames_;
+        static const Enum<interpolationType> interpolationTypeNames_;
 
 
 protected:
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 712ed6564e..e97ab81549 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
 
 
         // From (name of) patch to compact 'zone' index
-        HashTable<label> compactZoneID(1000);
+        HashTable<label> compactZoneID(1024);
         // Mesh face and compact zone indx
         DynamicList<label> faceLabels;
         DynamicList<label> compactZones;
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
         {
             // Collect sizes. Hash on names to handle local-only patches (e.g.
             //  processor patches)
-            HashTable<label> patchSize(1000);
+            HashTable<label> patchSize(1024);
             label nFaces = 0;
             forAllConstIter(labelHashSet, includePatches, iter)
             {
@@ -247,7 +247,7 @@ int main(int argc, char *argv[])
                 nFaces += pp.size();
             }
 
-            HashTable<label> zoneSize(1000);
+            HashTable<label> zoneSize(1024);
             forAllConstIter(labelHashSet, includeFaceZones, iter)
             {
                 const faceZone& pp = fzm[iter.key()];
diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index dca869faad..a17b6a033e 100755
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -39,8 +39,9 @@ usage: ${0##*/}
   -foamVersion ver        specify project version (eg, 1612)
   -projectName name       specify project directory name (eg, openfoam1612)
   -archOption 32|64       specify 'WM_ARCH_OPTION' architecture option
+  -SP | -float32          specify 'WM_PRECISION_OPTION'
+  -DP | -float64          specify 'WM_PRECISION_OPTION'
   -int32  | -int64        specify 'WM_LABEL_SIZE'
-  -SP     | -DP           specify 'WM_PRECISION_OPTION'
   -system name            specify 'system' compiler to be used
   -third  name            specify 'ThirdParty' compiler to be used
   -boost ver              specify 'boost_version'
@@ -63,7 +64,7 @@ usage: ${0##*/}
   -scotch-path dir        specify 'SCOTCH_ARCH_PATH' (eg, /opt/OpenFOAM-scotch_6.0.4)
   -vtk  ver               specify 'vtk_version' (eg, VTK-7.1.0)
   -mesa ver               specify 'mesa_version' (eg, mesa-13.0.1)
-  -sigfpe | -no-sigfpe    activate/deactivate FOAM_SIGFPE handling
+  -sigfpe | -no-sigfpe    [defunct - now under etc/controlDict]
   gmp-VERSION             for ThirdParty gcc (gmp-system for system library)
   mpfr-VERSION            for ThirdParty gcc (mpfr-system for system library)
   mpc-VERSION             for ThirdParty gcc (mpc-system for system library)
@@ -251,6 +252,18 @@ do
         shift
         ;;
 
+    -SP | -float32)
+        # Replace WM_PRECISION_OPTION=...
+        replace etc/bashrc  WM_PRECISION_OPTION "SP"
+        adjusted=true
+        ;;
+
+    -DP | -float64)
+        # Replace WM_PRECISION_OPTION=...
+        replace etc/bashrc  WM_PRECISION_OPTION "DP"
+        adjusted=true
+        ;;
+
     -int32 | -int64)
         # Replace WM_LABEL_SIZE=...
         optionValue="${1#-int}"
@@ -258,13 +271,6 @@ do
         adjusted=true
         ;;
 
-    -SP | -DP)
-        # Replace WM_PRECISION_OPTION=...
-        optionValue="${1#-}"
-        replace etc/bashrc  WM_PRECISION_OPTION "$optionValue"
-        adjusted=true
-        ;;
-
     -system)
         # Replace WM_COMPILER_TYPE=... and WM_COMPILER=...
         [ "$#" -ge 2 ] || die "'$1' option requires an argument"
@@ -471,20 +477,8 @@ do
         adjusted=true
         ;;
 
-    -sigfpe)
-        # Enable FOAM_SIGFPE handling
-        _inlineSed etc/bashrc \
-            "[a-z][a-z]* FOAM_SIGFPE.*" \
-            "export FOAM_SIGFPE=" \
-            "Activate FOAM_SIGFPE handling"
-        ;;
-
-    -no-sigfpe)
-        # Disable FOAM_SIGFPE handling
-        _inlineSed etc/bashrc \
-            "[a-z][a-z]* FOAM_SIGFPE.*" \
-            "unset FOAM_SIGFPE" \
-            "Deactivate FOAM_SIGFPE handling"
+    -sigfpe | -no-sigfpe)
+        echo "Enable/disable FOAM_SIGFPE now via controlDict" 1>&2
         ;;
 
     *)
diff --git a/etc/bashrc b/etc/bashrc
index 2060a58690..97c8152b33 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -96,13 +96,13 @@ export WM_MPLIB=SYSTEMOPENMPI
 #    WM_OSTYPE = POSIX
 #export WM_OSTYPE=POSIX
 
-#- Floating-point signal handling:
-#    set or unset
-export FOAM_SIGFPE=
+#- Alternative to 'trapFpe' controlDict entry
+#  for floating-point exceptions (true|false)
+#export FOAM_SIGFPE=true
 
-#- memory initialisation:
-#    set or unset
-#export FOAM_SETNAN=
+#- Alternative to 'setNaN' controlDict entry
+#  for memory initialisation (true|false)
+#export FOAM_SETNAN=false
 
 
 ################################################################################
diff --git a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
index 14af1b9e48..c637c7b4f7 100644
--- a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
+++ b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
@@ -16,11 +16,9 @@ FoamFile
 
 extractionMethod     extractFromSurface;
 
-extractFromSurfaceCoeffs
-{
-    includedAngle    150;
-    geometricTestOnly no;
-}
+includedAngle        150;
+
+geometricTestOnly    no;
 
 subsetFeatures
 {
diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index c4df2b627e..e1e7fba8e1 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -257,19 +257,7 @@ if ( "$FOAM_MPI" != dummy ) then
     _foamAddLib ${FOAM_LIBBIN}/${FOAM_MPI}
 endif
 
-
-# Minimum MPI buffer size (used by all except SGI MPI)
-if ( ! $?minBufferSize ) set minBufferSize=20000000
-if ( $?MPI_BUFFER_SIZE ) then
-    if ( $MPI_BUFFER_SIZE < $minBufferSize ) then
-        setenv MPI_BUFFER_SIZE $minBufferSize
-    endif
-else
-    setenv MPI_BUFFER_SIZE $minBufferSize
-endif
-
-# Cleanup environment
-# ~~~~~~~~~~~~~~~~~~~
-unset minBufferSize
+# Alternative to 'mpiBufferSize' controlDict entry
+#setenv MPI_BUFFER_SIZE 20000000
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 4c663ce276..9d22c3e700 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -274,18 +274,7 @@ then
     _foamAddLib $FOAM_LIBBIN/$FOAM_MPI
 fi
 
-
-# Minimum MPI buffer size (used by all except SGI MPI)
-: ${minBufferSize:=20000000}
-if [ "${MPI_BUFFER_SIZE:=$minBufferSize}" -lt $minBufferSize ]
-then
-    MPI_BUFFER_SIZE=$minBufferSize
-fi
-export MPI_BUFFER_SIZE
-
-
-# Cleanup environment
-# ~~~~~~~~~~~~~~~~~~~
-unset minBufferSize
+# Alternative to 'mpiBufferSize' controlDict entry
+#export MPI_BUFFER_SIZE=20000000
 
 #------------------------------------------------------------------------------
diff --git a/etc/controlDict b/etc/controlDict
index 72112b0ddc..2b435d1fe4 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -65,6 +65,11 @@ OptimisationSwitches
     floatTransfer   0;
     nProcsSimpleSum 0;
 
+    // MPI buffer size (bytes)
+    // Can override with the MPI_BUFFER_SIZE env variable.
+    // The default and minimum is (20000000).
+    mpiBufferSize   0;
+
     // Optional max size (bytes) for unstructured data exchanges. In some
     // phases of OpenFOAM it can send over very large data chunks
     // (e.g. in parallel load balancing) and some Pstream implementations have
@@ -74,6 +79,14 @@ OptimisationSwitches
     // global reduction, even if multi-pass is not needed)
     maxCommsSize    0;
 
+    // Trap floating point exception.
+    // Can override with FOAM_SIGFPE (true|false)
+    trapFpe         1;
+
+    // Initialization malloced memory to NaN.
+    // Can override with FOAM_SETNAN (true|false)
+    setNaN          0;
+
     // Force dumping (at next timestep) upon signal (-1 to disable)
     writeNowSignal              -1; // 10;
 
diff --git a/etc/cshrc b/etc/cshrc
index 3208ca0ac8..6c42ebdf61 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -93,13 +93,13 @@ setenv WM_MPLIB SYSTEMOPENMPI
 #    WM_OSTYPE = POSIX
 #setenv WM_OSTYPE POSIX
 
-#- Floating-point signal handling:
-#    set or unset
-setenv FOAM_SIGFPE
+#- Alternative to 'trapFpe' controlDict entry
+#  for floating-point exceptions (true|false)
+#setenv FOAM_SIGFPE true
 
-#- memory initialisation:
-#    set or unset
-#setenv FOAM_SETNAN
+#- Alternative to 'setNaN' controlDict entry
+#  for memory initialisation (true|false)
+#setenv FOAM_SETNAN false
 
 
 ################################################################################
diff --git a/etc/templates/closedVolume/system/surfaceFeatureExtractDict b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
index ba8a72f5d0..a2642e67a3 100644
--- a/etc/templates/closedVolume/system/surfaceFeatureExtractDict
+++ b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
 {
     extractionMethod     extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle    150;
-    }
+    includedAngle        150;
 
     subsetFeatures
     {
diff --git a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
index ba8a72f5d0..a2642e67a3 100644
--- a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
 {
     extractionMethod     extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle    150;
-    }
+    includedAngle        150;
 
     subsetFeatures
     {
diff --git a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
index ba8a72f5d0..a2642e67a3 100644
--- a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
 {
     extractionMethod     extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle    150;
-    }
+    includedAngle        150;
 
     subsetFeatures
     {
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index ff7deb7538..bdab2431b7 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -45,25 +45,22 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
-    Foam::fileMonitor::fileStateNames_;
+const Foam::Enum
+<
+    Foam::fileMonitor::fileState
+>
+Foam::fileMonitor::fileStateNames_
+{
+    { fileState::UNMODIFIED, "unmodified" },
+    { fileState::MODIFIED, "modified" },
+    { fileState::DELETED, "deleted" },
+};
+
 
 namespace Foam
 {
     defineTypeNameAndDebug(fileMonitor, 0);
 
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::fileMonitor::fileState,
-        3
-    >::names[] =
-    {
-        "unmodified",
-        "modified",
-        "deleted"
-    };
-
     //- Reduction operator for PackedList of fileState
     class reduceFileStates
     {
diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor.H
index 18e4ab05ff..6a9cc1245e 100644
--- a/src/OSspecific/POSIX/fileMonitor.H
+++ b/src/OSspecific/POSIX/fileMonitor.H
@@ -43,7 +43,7 @@ SourceFiles
 #define fileMonitor_H
 
 #include <sys/types.h>
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "className.H"
 #include "DynamicList.H"
 
@@ -74,7 +74,7 @@ public:
             DELETED = 2
         };
 
-        static const NamedEnum<fileState, 3> fileStateNames_;
+        static const Enum<fileState> fileStateNames_;
 
 private:
     // Private data
diff --git a/src/OSspecific/POSIX/regExp.C b/src/OSspecific/POSIX/regExp.C
index 95e70ece9d..0f9cd7cb21 100644
--- a/src/OSspecific/POSIX/regExp.C
+++ b/src/OSspecific/POSIX/regExp.C
@@ -77,38 +77,6 @@ bool Foam::regExp::matchGrouping
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::regExp::regExp()
-:
-    preg_(nullptr)
-{}
-
-
-Foam::regExp::regExp(const char* pattern, bool ignoreCase)
-:
-    preg_(nullptr)
-{
-    set(pattern, ignoreCase);
-}
-
-
-Foam::regExp::regExp(const std::string& pattern, bool ignoreCase)
-:
-    preg_(nullptr)
-{
-    set(pattern.c_str(), ignoreCase);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::regExp::~regExp()
-{
-    clear();
-}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 bool Foam::regExp::set(const char* pattern, bool ignoreCase)
diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H
index 640f6a819e..1f82552d07 100644
--- a/src/OSspecific/POSIX/regExp.H
+++ b/src/OSspecific/POSIX/regExp.H
@@ -77,7 +77,7 @@ class regExp
         //- Return true if it matches and sets the sub-groups matched.
         bool matchGrouping
         (
-            const std::string&,
+            const std::string& text,
             List<std::string>& groups
         ) const;
 
@@ -99,17 +99,23 @@ public:
     // Constructors
 
         //- Construct null
-        regExp();
+        inline regExp();
+
+        //- Construct from character array
+        inline explicit regExp(const char* pattern);
+
+        //- Construct from string
+        inline explicit regExp(const std::string& pattern);
 
         //- Construct from character array, optionally ignore case
-        regExp(const char* pattern, bool ignoreCase=false);
+        inline regExp(const char* pattern, bool ignoreCase);
 
         //- Construct from string, optionally ignore case
-        regExp(const std::string& pattern, bool ignoreCase=false);
+        inline regExp(const std::string& pattern, bool ignoreCase);
 
 
     //- Destructor
-    ~regExp();
+    inline ~regExp();
 
 
     // Member functions
@@ -143,20 +149,20 @@ public:
 
       // Matching/Searching
 
-        //- Find position within string.
-        //  \Return The index where it begins or string::npos if not found
+        //- Find position within the text.
+        //  \return The index where it begins or string::npos if not found
         std::string::size_type find(const std::string& text) const;
 
-        //- Return true if it matches the entire string
+        //- True if the regex matches the entire text.
         //  The begin-of-line (^) and end-of-line ($) anchors are implicit
         bool match(const std::string& text) const;
 
-        //- Return true if it matches and sets the sub-groups matched
+        //- True if the regex matches the text, set the sub-groups matched.
         //  The begin-of-line (^) and end-of-line ($) anchors are implicit
         bool match(const std::string& text, List<std::string>& groups) const;
 
-        //- Return true if the regex was found within string
-        bool search(const std::string& text) const;
+        //- Return true if the regex was found within the text
+        inline bool search(const std::string& text) const;
 
 
     // Member Operators
diff --git a/src/OSspecific/POSIX/regExpI.H b/src/OSspecific/POSIX/regExpI.H
index e33564e611..7302e02410 100644
--- a/src/OSspecific/POSIX/regExpI.H
+++ b/src/OSspecific/POSIX/regExpI.H
@@ -38,6 +38,54 @@ inline bool Foam::regExp::meta(const char c)
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::regExp::regExp()
+:
+    preg_(nullptr)
+{}
+
+
+inline Foam::regExp::regExp(const char* pattern)
+:
+    preg_(nullptr)
+{
+    set(pattern, false);
+}
+
+
+inline Foam::regExp::regExp(const std::string& pattern)
+:
+    preg_(nullptr)
+{
+    set(pattern, false);
+}
+
+
+inline Foam::regExp::regExp(const char* pattern, bool ignoreCase)
+:
+    preg_(nullptr)
+{
+    set(pattern, ignoreCase);
+}
+
+
+inline Foam::regExp::regExp(const std::string& pattern, bool ignoreCase)
+:
+    preg_(nullptr)
+{
+    set(pattern, ignoreCase);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+inline Foam::regExp::~regExp()
+{
+    clear();
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 inline bool Foam::regExp::empty() const
diff --git a/src/OSspecific/POSIX/signals/sigFpe.C b/src/OSspecific/POSIX/signals/sigFpe.C
index 609de778ab..513a6d6d36 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.C
+++ b/src/OSspecific/POSIX/signals/sigFpe.C
@@ -28,6 +28,7 @@ License
 #include "JobInfo.H"
 #include "OSspecific.H"
 #include "IOstreams.H"
+#include "Switch.H"
 
 #ifdef LINUX_GNUC
     #ifndef __USE_GNU
@@ -43,17 +44,41 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+bool Foam::sigFpe::switchFpe_(Foam::debug::optimisationSwitch("trapFpe", 0));
+bool Foam::sigFpe::switchNan_(Foam::debug::optimisationSwitch("setNaN", 0));
+
+bool Foam::sigFpe::sigActive_ = false;
+bool Foam::sigFpe::mallocNanActive_ = false;
+
 struct sigaction Foam::sigFpe::oldAction_;
 
-bool Foam::sigFpe::sigFpeActive_ = false;
+
+// File-scope function.
+// Controlled by env variable containing a bool (true|false|on|off ...)
+// or by the specified flag
+static bool isTrue(const char* envName, const bool flag)
+{
+    const std::string str = Foam::getEnv(envName);
+
+    if (str.size())
+    {
+        Foam::Switch sw(str, true); // silently ignore bad input
+        if (sw.valid())
+        {
+            return sw;
+        }
+    }
+
+    // Env was not set or did not contain a valid bool value
+    return flag;
+}
+
 
 void Foam::sigFpe::fillNan(UList<scalar>& lst)
 {
     lst = std::numeric_limits<scalar>::signaling_NaN();
 }
 
-bool Foam::sigFpe::mallocNanActive_ = false;
-
 
 #ifdef LINUX
 extern "C"
@@ -128,9 +153,15 @@ Foam::sigFpe::~sigFpe()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+bool Foam::sigFpe::requested()
+{
+    return isTrue("FOAM_SIGFPE", switchFpe_);
+}
+
+
 void Foam::sigFpe::set(const bool verbose)
 {
-    if (!sigFpeActive_ && env("FOAM_SIGFPE"))
+    if (!sigActive_ && requested())
     {
         bool supported = false;
 
@@ -155,7 +186,7 @@ void Foam::sigFpe::set(const bool verbose)
                 << abort(FatalError);
         }
 
-        sigFpeActive_ = true;
+        sigActive_ = true;
 
         #elif defined(sgiN32) || defined(sgiN32Gcc)
         supported = true;
@@ -179,28 +210,28 @@ void Foam::sigFpe::set(const bool verbose)
             nullptr
         );
 
-        sigFpeActive_ = true;
+        sigActive_ = true;
 
         #endif
 
 
         if (verbose)
         {
+            Info<< "trapFpe: Floating point exception trapping ";
+
             if (supported)
             {
-                Info<< "sigFpe : Enabling floating point exception trapping"
-                    << " (FOAM_SIGFPE)." << endl;
+                Info<< "enabled (FOAM_SIGFPE)." << endl;
             }
             else
             {
-                Info<< "sigFpe : Floating point exception trapping"
-                    << " - not supported on this platform" << endl;
+                Info<< "- not supported on this platform" << endl;
             }
         }
     }
 
 
-    if (env("FOAM_SETNAN"))
+    if (isTrue("FOAM_SETNAN", switchNan_))
     {
         #ifdef LINUX
         mallocNanActive_ = true;
@@ -208,15 +239,15 @@ void Foam::sigFpe::set(const bool verbose)
 
         if (verbose)
         {
+            Info<< "setNaN : Initialise allocated memory to NaN ";
+
             if (mallocNanActive_)
             {
-                Info<< "SetNaN : Initialising allocated memory to NaN"
-                    << " (FOAM_SETNAN)." << endl;
+                Info<< "enabled (FOAM_SETNAN)." << endl;
             }
             else
             {
-                Info<< "SetNaN : Initialise allocated memory to NaN"
-                    << " - not supported on this platform" << endl;
+                Info<< " - not supported on this platform" << endl;
             }
         }
     }
@@ -227,7 +258,7 @@ void Foam::sigFpe::unset(const bool verbose)
 {
     #ifdef LINUX_GNUC
     // Reset signal
-    if (sigFpeActive_)
+    if (sigActive_)
     {
         if (verbose)
         {
@@ -256,7 +287,7 @@ void Foam::sigFpe::unset(const bool verbose)
                 << "Cannot reset SIGFPE trapping"
                 << abort(FatalError);
         }
-        sigFpeActive_ = false;
+        sigActive_ = false;
     }
     #endif
 
diff --git a/src/OSspecific/POSIX/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H
index a4473825bb..fe1c49b638 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.H
+++ b/src/OSspecific/POSIX/signals/sigFpe.H
@@ -27,17 +27,24 @@ Class
 Description
     Set up trapping for floating point exceptions (signal FPE).
 
-    Controlled by two env vars:
-      - \par FOAM_SIGFPE
-        Exception trapping
-      - \par FOAM_SETNAN
-        Initialization of all malloced memory to NaN. If FOAM_SIGFPE
-        also set, this will cause usage of uninitialized scalars to trigger
-        an abort.
+    Defined by controlDict InfoSwitch entries:
+    - \par trapFpe
+      Enable floating point exception trapping.
 
-    Can be used either directly through the static member functions or
-    through the scope of the object (constructor sets trapping; destructor
-    restores original).
+    - \par setNaN
+      Initialization all malloced memory to NaN.
+      Combined with \c trapFpe, this causes usage of uninitialized scalars
+      to trigger an abort.
+
+    Environment variables:
+      - \par FOAM_SIGFPE (true|false)
+        overrides \c trapFpe
+      - \par FOAM_SETNAN  (true|false)
+        overrides \c setNaN
+
+    Note that trapping can be set/removed through the static member functions
+    or through the scope of the object (constructor sets trapping; destructor
+    restores original). The class behaves as a singleton.
 
 SourceFiles
     sigFpe.C
@@ -73,12 +80,20 @@ class sigFpe
 {
     // Private data
 
+        //- Flag that floating point trapping should be used.
+        //  Can override with FOAM_SIGFPE env variable
+        static bool switchFpe_;
+
+        //- Flag that NaN initialisation should be used.
+        //  Can override with FOAM_SETNAN env variable
+        static bool switchNan_;
+
+        //- Flag to indicate floating point trapping is currently active
+        static bool sigActive_;
+
         //- Saved old signal trapping setting
         static struct sigaction oldAction_;
 
-        //- Flag to indicate floating point trapping is enabled
-        static bool sigFpeActive_;
-
 
     // Static data members
 
@@ -90,6 +105,11 @@ class sigFpe
 
 public:
 
+    // Public data
+
+        //- Flag to indicate mallocNan is enabled
+        static bool mallocNanActive_;
+
 
     // Constructors
 
@@ -103,6 +123,11 @@ public:
 
     // Member functions
 
+        //- Check if SIGFPE signals handler is to be enabled.
+        //  This is controlled by the trapFpe entry or the FOAM_SIGFPE
+        //  environment variable
+        static bool requested();
+
         //- Activate SIGFPE signal handler when FOAM_SIGFPE is %set
         //  Fill memory with NaN when FOAM_SETNAN is %set
         static void set(const bool verbose);
@@ -110,16 +135,13 @@ public:
         //- Deactivate SIGFPE signal handler and NaN memory initialisation
         static void unset(const bool verbose);
 
-        //- Flag to indicate mallocNan is enabled
-        static bool mallocNanActive_;
-
         #ifdef LINUX
         //- Malloc function which initializes to NaN
         static void* mallocNan(size_t size);
         #endif
 
         //- Fill block of data with NaN
-        static void fillNan(UList<scalar>&);
+        static void fillNan(UList<scalar>& lst);
 };
 
 
diff --git a/src/OSspecific/POSIX/signals/sigQuit.C b/src/OSspecific/POSIX/signals/sigQuit.C
index 9b0a7443f0..b8352dd832 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.C
+++ b/src/OSspecific/POSIX/signals/sigQuit.C
@@ -86,7 +86,7 @@ void Foam::sigQuit::set(const bool verbose)
         if (sigaction(SIGQUIT, &newAction, &oldAction_) < 0)
         {
             FatalErrorInFunction
-                << "Cannot call sigQuit::set() more than once"
+                << "Cannot call more than once"
                 << abort(FatalError);
         }
         sigActive_ = true;
@@ -100,9 +100,9 @@ void Foam::sigQuit::unset(const bool)
     {
         if (sigaction(SIGQUIT, &oldAction_, nullptr) < 0)
         {
-        FatalErrorInFunction
-            << "Cannot set SIGQUIT trapping"
-            << abort(FatalError);
+            FatalErrorInFunction
+                << "Cannot unset SIGQUIT trapping"
+                << abort(FatalError);
         }
         sigActive_ = false;
     }
diff --git a/src/OSspecific/POSIX/signals/sigSegv.C b/src/OSspecific/POSIX/signals/sigSegv.C
index 188c24495a..27cf667884 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.C
+++ b/src/OSspecific/POSIX/signals/sigSegv.C
@@ -86,7 +86,7 @@ void Foam::sigSegv::set(const bool)
         if (sigaction(SIGSEGV, &newAction, &oldAction_) < 0)
         {
             FatalErrorInFunction
-                << "Cannot call sigSegv::set() more than once"
+                << "Cannot call more than once"
                 << abort(FatalError);
         }
         sigActive_ = true;
@@ -101,7 +101,7 @@ void Foam::sigSegv::unset(const bool)
         if (sigaction(SIGSEGV, &oldAction_, nullptr) < 0)
         {
             FatalErrorInFunction
-                << "Cannot set SIGSEGV trapping"
+                << "Cannot unset SIGSEGV trapping"
                 << abort(FatalError);
         }
         sigActive_ = false;
diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
index 9808f91c11..1198daa6ad 100644
--- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
@@ -78,7 +78,6 @@ addstopAtWriteNowSignalToOpt addstopAtWriteNowSignalToOpt_
 
 Foam::Time const* Foam::sigStopAtWriteNow::runTimePtr_ = nullptr;
 
-
 struct sigaction Foam::sigStopAtWriteNow::oldAction_;
 
 
@@ -109,7 +108,8 @@ void Foam::sigStopAtWriteNow::sigHandler(int)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::sigStopAtWriteNow::sigStopAtWriteNow(){}
+Foam::sigStopAtWriteNow::sigStopAtWriteNow()
+{}
 
 
 Foam::sigStopAtWriteNow::sigStopAtWriteNow
diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
index bf83a350d7..22510310be 100644
--- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
+++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
@@ -67,6 +67,7 @@ class sigStopAtWriteNow
 
     // Private Member Functions
 
+        //- Handler for caught signals
         static void sigHandler(int);
 
 
diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.C b/src/OSspecific/POSIX/signals/sigWriteNow.C
index c226ff6e1f..01d13cfddf 100644
--- a/src/OSspecific/POSIX/signals/sigWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigWriteNow.C
@@ -33,13 +33,13 @@ License
 
 namespace Foam
 {
-
 // Signal number to catch
 int sigWriteNow::signal_
 (
     debug::optimisationSwitch("writeNowSignal", -1)
 );
 
+
 // Register re-reader
 class addwriteNowSignalToOpt
 :
@@ -75,7 +75,6 @@ addwriteNowSignalToOpt addwriteNowSignalToOpt_("writeNowSignal");
 
 Foam::Time* Foam::sigWriteNow::runTimePtr_ = nullptr;
 
-
 struct sigaction Foam::sigWriteNow::oldAction_;
 
 
diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.H b/src/OSspecific/POSIX/signals/sigWriteNow.H
index 67506f7fa2..12fa7c3131 100644
--- a/src/OSspecific/POSIX/signals/sigWriteNow.H
+++ b/src/OSspecific/POSIX/signals/sigWriteNow.H
@@ -66,6 +66,7 @@ class sigWriteNow
 
     // Private Member Functions
 
+        //- Handler for caught signals
         static void sigHandler(int);
 
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index f95dc85741..91781cff7c 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -123,6 +123,7 @@ $(ranges)/labelRange/labelRange.C
 $(ranges)/labelRange/labelRanges.C
 $(ranges)/scalarRange/scalarRange.C
 $(ranges)/scalarRange/scalarRanges.C
+$(ranges)/tableBounds/tableBounds.C
 
 spatialVectorAlgebra = primitives/spatialVectorAlgebra
 $(spatialVectorAlgebra)/SpatialVector/spatialVector/spatialVector.C
diff --git a/src/OpenFOAM/algorithms/indexedOctree/volumeType.C b/src/OpenFOAM/algorithms/indexedOctree/volumeType.C
index 1bb1356b96..beabdfb614 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/volumeType.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/volumeType.C
@@ -27,23 +27,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::volumeType
+>
+Foam::volumeType::names
 {
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::volumeType,
-        4
-    >::names[] =
-    {
-        "unknown",
-        "mixed",
-        "inside",
-        "outside"
-    };
-}
-
-const Foam::NamedEnum<Foam::volumeType, 4> Foam::volumeType::names;
+    { type::UNKNOWN, "unknown" },
+    { type::MIXED, "mixed" },
+    { type::INSIDE, "inside" },
+    { type::OUTSIDE, "outside" },
+};
 
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/algorithms/indexedOctree/volumeType.H b/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
index 3d845c414b..56c6c93f2e 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
@@ -34,7 +34,7 @@ SourceFiles
 #ifndef volumeType_H
 #define volumeType_H
 
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,8 +44,8 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class volumeType;
-Istream& operator>>(Istream& is, volumeType&);
-Ostream& operator<<(Ostream& os, const volumeType& C);
+Istream& operator>>(Istream& is, volumeType& vt);
+Ostream& operator<<(Ostream& os, const volumeType& vt);
 
 
 /*---------------------------------------------------------------------------*\
@@ -65,6 +65,9 @@ public:
         OUTSIDE = 3
     };
 
+    // Static data
+    static const Enum<volumeType> names;
+
 
 private:
 
@@ -76,11 +79,6 @@ private:
 
 public:
 
-    // Static data
-
-        static const NamedEnum<volumeType, 4> names;
-
-
     // Constructors
 
         //- Construct null
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
index a6f960db6e..992ffd287a 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
@@ -50,7 +50,7 @@ Foam::Distribution<Type>::Distribution(const Type& binWidth)
 template<class Type>
 Foam::Distribution<Type>::Distribution(const Distribution<Type>& d)
 :
-    List<List<scalar>>(static_cast<const List<List<scalar>>& >(d)),
+    List<List<scalar>>(static_cast<const List<List<scalar>>&>(d)),
     binWidth_(d.binWidth()),
     listStarts_(d.listStarts())
 {}
@@ -603,7 +603,7 @@ Foam::Ostream& Foam::operator<<
     const Distribution<Type>& d
 )
 {
-    os  <<  static_cast<const List<List<scalar>>& >(d)
+    os  << static_cast<const List<List<scalar>>&>(d)
         << d.binWidth_ << token::SPACE
         << d.listStarts_;
 
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 5953185baa..60734683a4 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,37 +32,32 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(IOobject, 0);
-
-    template<>
-    const char* NamedEnum
-    <
-        IOobject::fileCheckTypes,
-        4
-    >::names[] =
-    {
-        "timeStamp",
-        "timeStampMaster",
-        "inotify",
-        "inotifyMaster"
-    };
 }
 
+const Foam::Enum
+<
+    Foam::IOobject::fileCheckTypes
+>
+Foam::IOobject::fileCheckTypesNames
+{
+    { fileCheckTypes::timeStamp, "timeStamp" },
+    { fileCheckTypes::timeStampMaster, "timeStampMaster" },
+    { fileCheckTypes::inotify, "inotify" },
+    { fileCheckTypes::inotifyMaster, "inotifyMaster" },
+};
 
-const Foam::NamedEnum<Foam::IOobject::fileCheckTypes, 4>
-    Foam::IOobject::fileCheckTypesNames;
 
 // Default fileCheck type
 Foam::IOobject::fileCheckTypes Foam::IOobject::fileModificationChecking
 (
-    fileCheckTypesNames.read
+    fileCheckTypesNames.lookup
     (
-        debug::optimisationSwitches().lookup
-        (
-            "fileModificationChecking"
-        )
+        "fileModificationChecking",
+        debug::optimisationSwitches()
     )
 );
 
+
 namespace Foam
 {
     // Register re-reader
@@ -100,6 +95,17 @@ namespace Foam
 }
 
 
+// file-scope
+//
+// A file is 'outside' of the case if it has been specified using an
+// absolute path (starts with '/')
+//
+static inline bool isOutsideOfCase(const std::string& file)
+{
+    return !file.empty() && file[0] == '/';
+}
+
+
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
 // Return components following the IOobject requirements
@@ -109,10 +115,10 @@ namespace Foam
 //    -----               ------
 //    "foo"               ("", "", "foo")
 //    "foo/bar"           ("foo", "", "bar")
-//    "/XXX/bar"          ("/XXX", "", "bar")
 //    "foo/bar/"          ERROR - no name
 //    "foo/xxx/bar"       ("foo", "xxx", "bar")
 //    "foo/xxx/yyy/bar"   ("foo", "xxx/yyy", "bar")
+//    "/xxx/yyy/bar"      ("/xxx/yyy", "", "bar")
 bool Foam::IOobject::fileNameComponents
 (
     const fileName& path,
@@ -125,7 +131,7 @@ bool Foam::IOobject::fileNameComponents
     local.clear();
     name.clear();
 
-    // called with directory
+    // Called with directory
     if (isDir(path))
     {
         WarningInFunction
@@ -134,44 +140,49 @@ bool Foam::IOobject::fileNameComponents
         return false;
     }
 
-    if (path.isAbsolute())
+    const auto first = path.find('/');
+    const auto last  = path.rfind('/');
+
+    // The raw length of name (without validating for word chars)
+    auto nameLen = path.size();
+
+    if (first == std::string::npos)
     {
-        string::size_type last = path.rfind('/');
+        // No '/' found (or empty entirely)
+        // => no instance or local
+
+        name = word::validated(path, false);
+    }
+    else if (first == 0)
+    {
+        // Absolute path (starts with '/')
+        // => no local
+
         instance = path.substr(0, last);
 
-        // Check afterwards
-        name.string::operator=(path.substr(last+1));
+        const std::string ending = path.substr(last+1);
+        nameLen = ending.size();  // The raw length of name
+        name = word::validated(ending, false);
     }
     else
     {
-        string::size_type first = path.find('/');
+        // Normal case.
+        // First part is instance, remainder is local
+        instance = path.substr(0, first);
 
-        if (first == string::npos)
+        if (last > first)
         {
-            // no '/' found - no instance or local
-
-            // check afterwards
-            name.string::operator=(path);
+            // With local
+            local = path.substr(first+1, last-first-1);
         }
-        else
-        {
-            instance = path.substr(0, first);
 
-            string::size_type last = path.rfind('/');
-            if (last > first)
-            {
-                // with local
-                local = path.substr(first+1, last-first-1);
-            }
-
-            // check afterwards
-            name.string::operator=(path.substr(last+1));
-        }
+        const std::string ending = path.substr(last+1);
+        nameLen = ending.size();  // The raw length of name
+        name = word::validated(ending, false);
     }
 
-
     // Check for valid (and stripped) name, regardless of the debug level
-    if (name.empty() || string::stripInvalid<word>(name))
+    if (!nameLen || nameLen != name.size())
     {
         WarningInFunction
             << "has invalid word for name: \"" << name
@@ -351,6 +362,12 @@ const Foam::Time& Foam::IOobject::time() const
 }
 
 
+const Foam::fileName& Foam::IOobject::rootPath() const
+{
+    return time().rootPath();
+}
+
+
 const Foam::fileName& Foam::IOobject::caseName() const
 {
     return time().caseName();
@@ -359,24 +376,24 @@ const Foam::fileName& Foam::IOobject::caseName() const
 
 Foam::word Foam::IOobject::group() const
 {
-    word::size_type i = name_.find_last_of('.');
+    const auto i = name_.rfind('.');
 
-    if (i == word::npos || i == 0)
+    if (i == std::string::npos || i == 0)
     {
         return word::null;
     }
     else
     {
-        return name_.substr(i+1, word::npos);
+        return name_.substr(i+1);
     }
 }
 
 
 Foam::word Foam::IOobject::member() const
 {
-    word::size_type i = name_.find_last_of('.');
+    const auto i = name_.rfind('.');
 
-    if (i == word::npos || i == 0)
+    if (i == std::string::npos || i == 0)
     {
         return name_;
     }
@@ -387,15 +404,9 @@ Foam::word Foam::IOobject::member() const
 }
 
 
-const Foam::fileName& Foam::IOobject::rootPath() const
-{
-    return time().rootPath();
-}
-
-
 Foam::fileName Foam::IOobject::path() const
 {
-    if (instance().isAbsolute())
+    if (isOutsideOfCase(instance()))
     {
         return instance();
     }
@@ -419,9 +430,9 @@ Foam::fileName Foam::IOobject::path
 
 Foam::fileName Foam::IOobject::localFilePath(const bool search) const
 {
-    if (instance().isAbsolute())
+    if (isOutsideOfCase(instance()))
     {
-        fileName objectPath = instance()/name();
+        const fileName objectPath = instance()/name();
 
         if (isFile(objectPath))
         {
@@ -434,8 +445,8 @@ Foam::fileName Foam::IOobject::localFilePath(const bool search) const
     }
     else
     {
-        fileName path = this->path();
-        fileName objectPath = path/name();
+        const fileName path = this->path();
+        const fileName objectPath = path/name();
 
         if (isFile(objectPath))
         {
@@ -445,14 +456,14 @@ Foam::fileName Foam::IOobject::localFilePath(const bool search) const
         {
             if (!isDir(path) && search)
             {
-                word newInstancePath = time().findInstancePath
+                const word newInstancePath = time().findInstancePath
                 (
                     instant(instance())
                 );
 
                 if (newInstancePath.size())
                 {
-                    fileName fName
+                    const fileName fName
                     (
                         rootPath()/caseName()
                        /newInstancePath/db_.dbDir()/local()/name()
@@ -473,9 +484,9 @@ Foam::fileName Foam::IOobject::localFilePath(const bool search) const
 
 Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
 {
-    if (instance().isAbsolute())
+    if (isOutsideOfCase(instance()))
     {
-        fileName objectPath = instance()/name();
+        const fileName objectPath = instance()/name();
         if (isFile(objectPath))
         {
             if (objectRegistry::debug)
@@ -497,8 +508,8 @@ Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
     }
     else
     {
-        fileName path = this->path();
-        fileName objectPath = path/name();
+        const fileName path = this->path();
+        const fileName objectPath = path/name();
 
         if (isFile(objectPath))
         {
@@ -521,7 +532,7 @@ Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
             {
                 // Constant & system can come from global case
 
-                fileName parentObjectPath =
+                const fileName parentObjectPath =
                     rootPath()/time().globalCaseName()
                    /instance()/db().dbDir()/local()/name();
 
@@ -539,14 +550,14 @@ Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
             // Check for approximately same (local) time
             if (!isDir(path) && search)
             {
-                word newInstancePath = time().findInstancePath
+                const word newInstancePath = time().findInstancePath
                 (
                     instant(instance())
                 );
 
                 if (newInstancePath.size())
                 {
-                    fileName fName
+                    const fileName fName
                     (
                         rootPath()/caseName()
                        /newInstancePath/db().dbDir()/local()/name()
@@ -591,10 +602,8 @@ Foam::Istream* Foam::IOobject::objectStream(const fileName& fName)
             return nullptr;
         }
     }
-    else
-    {
-        return nullptr;
-    }
+
+    return nullptr;
 }
 
 
@@ -617,6 +626,8 @@ void Foam::IOobject::setBad(const string& s)
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
 void Foam::IOobject::operator=(const IOobject& io)
 {
     name_ = io.name_;
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index b08b3bb661..567511f6ab 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,7 +76,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "InfoProxy.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -129,7 +129,7 @@ public:
             inotifyMaster
         };
 
-        static const NamedEnum<fileCheckTypes, 4> fileCheckTypesNames;
+        static const Enum<fileCheckTypes> fileCheckTypesNames;
 
 private:
 
@@ -191,6 +191,12 @@ public:
     TypeName("IOobject");
 
 
+    // Static data members
+
+        //- Type of file modification checking
+        static fileCheckTypes fileModificationChecking;
+
+
     // Static Member Functions
 
         //- Split path into instance, local, name components
@@ -202,11 +208,9 @@ public:
             word& name
         );
 
-        template<class Name>
-        static inline word groupName(Name name, const word& group);
-
-        //- Type of file modification checking
-        static fileCheckTypes fileModificationChecking;
+        //- Create dot-delimited name.group
+        template<class StringType>
+        static inline word groupName(StringType name, const word& group);
 
 
     // Constructors
@@ -280,214 +284,162 @@ public:
 
     // Member Functions
 
-        // General access
+      // General access
 
-            //- Return time
-            const Time& time() const;
+        //- Return the local objectRegistry
+        const objectRegistry& db() const;
 
-            //- Return the local objectRegistry
-            const objectRegistry& db() const;
+        //- Return time
+        const Time& time() const;
 
-            //- Return name
-            const word& name() const
-            {
-                return name_;
-            }
+        //- Return name
+        inline const word& name() const;
 
-            //- Return name of the class name read from header
-            const word& headerClassName() const
-            {
-                return headerClassName_;
-            }
+        //- Return name of the class name read from header
+        inline const word& headerClassName() const;
 
-            //- Return non-constant access to the optional note
-            string& note()
-            {
-                return note_;
-            }
+        //- Return the optional note
+        inline const string& note() const;
 
-            //- Return the optional note
-            const string& note() const
-            {
-                return note_;
-            }
+        //- Return non-constant access to the optional note
+        inline string& note();
 
-            //- Rename
-            virtual void rename(const word& newName)
-            {
-                name_ = newName;
-            }
+        //- Rename
+        virtual void rename(const word& newName)
+        {
+            name_ = newName;
+        }
 
-            //- Register object created from this IOobject with registry if true
-            bool& registerObject()
-            {
-                return registerObject_;
-            }
+        //- Register object created from this IOobject with registry if true
+        inline bool registerObject() const;
 
-            //- Register object created from this IOobject with registry if true
-            bool registerObject() const
-            {
-                return registerObject_;
-            }
+        //- Register object created from this IOobject with registry if true
+        inline bool& registerObject();
 
-            //- Is object same for all processors
-            bool& globalObject()
-            {
-                return globalObject_;
-            }
+        //- Is object same for all processors
+        inline bool globalObject() const;
 
-            //- Is object same for all processors
-            bool globalObject() const
-            {
-                return globalObject_;
-            }
+        //- Is object same for all processors
+        inline bool& globalObject();
 
 
-        // Read/write options
+      // Read/write options
 
-            readOption readOpt() const
-            {
-                return rOpt_;
-            }
+        //- The read option
+        inline readOption readOpt() const;
 
-            readOption& readOpt()
-            {
-                return rOpt_;
-            }
+        //- Non-constant access to the read option
+        inline readOption& readOpt();
 
-            writeOption writeOpt() const
-            {
-                return wOpt_;
-            }
+        //- The write option
+        inline writeOption writeOpt() const;
 
-            writeOption& writeOpt()
-            {
-                return wOpt_;
-            }
+        //- Non-constant access to the write option
+        inline writeOption& writeOpt();
 
 
-        // Path components
+     // Path components
 
-            //- Return group (extension part of name)
-            word group() const;
+        //- Return group (extension part of name)
+        word group() const;
 
-            //- Return member (name without the extension)
-            word member() const;
+        //- Return member (name without the extension)
+        word member() const;
 
-            const fileName& rootPath() const;
+        const fileName& rootPath() const;
 
-            const fileName& caseName() const;
+        const fileName& caseName() const;
 
-            const fileName& instance() const
-            {
-                return instance_;
-            }
+        inline const fileName& instance() const;
 
-            fileName& instance()
-            {
-                return instance_;
-            }
+        inline fileName& instance();
 
-            const fileName& local() const
-            {
-                return local_;
-            }
+        inline const fileName& local() const;
 
-            //- Return complete path
-            fileName path() const;
+        //- Return complete path
+        fileName path() const;
 
-            //- Return complete path with alternative instance and local
-            fileName path
-            (
-                const word& instance,
-                const fileName& local = fileName::null
-            ) const;
+        //- Return complete path with alternative instance and local
+        fileName path
+        (
+            const word& instance,
+            const fileName& local = fileName::null
+        ) const;
 
-            //- Return complete path + object name
-            fileName objectPath() const
-            {
-                return path()/name();
-            }
+        //- Return complete path + object name
+        inline fileName objectPath() const;
 
-            //- Helper for filePath that searches locally.
-            //  When search is false, simply use the current instance,
-            //  otherwise search previous instances.
-            fileName localFilePath(const bool search=true) const;
+        //- Helper for filePath that searches locally.
+        //  When search is false, simply use the current instance,
+        //  otherwise search previous instances.
+        fileName localFilePath(const bool search=true) const;
 
-            //- Helper for filePath that searches up if in parallel
-            //  When search is false, simply use the current instance,
-            //  otherwise search previous instances.
-            fileName globalFilePath(const bool search=true) const;
+        //- Helper for filePath that searches up if in parallel
+        //  When search is false, simply use the current instance,
+        //  otherwise search previous instances.
+        fileName globalFilePath(const bool search=true) const;
 
 
-        // Reading
+      // Reading
 
-            //- Read header
-            bool readHeader(Istream&);
+        //- Read header
+        bool readHeader(Istream& is);
 
-            //- Read header (uses typeFilePath to find file) and check its info.
-            //  Optionally checks headerClassName against the type-name.
-            //  When search is false, simply use the current instance,
-            //  otherwise search previous instances.
-            template<class Type>
-            bool typeHeaderOk
-            (
-                const bool checkType = true,
-                const bool search = true
-            );
+        //- Read header (uses typeFilePath to find file) and check its info.
+        //  Optionally checks headerClassName against the type-name.
+        //  When search is false, simply use the current instance,
+        //  otherwise search previous instances.
+        template<class Type>
+        bool typeHeaderOk
+        (
+            const bool checkType = true,
+            const bool search = true
+        );
 
-            //- Helper: warn that type does not support re-reading
-            template<class Type>
-            void warnNoRereading() const;
-
-        // Writing
-
-            //- Write the standard OpenFOAM file/dictionary banner
-            //  Optionally without -*- C++ -*- editor hint (eg, for logs)
-            template<class Stream>
-            static inline Stream& writeBanner(Stream& os, bool noHint=false);
-
-            //- Write the standard file section divider
-            template<class Stream>
-            static inline Stream& writeDivider(Stream& os);
-
-            //- Write the standard end file divider
-            template<class Stream>
-            static inline Stream& writeEndDivider(Stream& os);
-
-            //- Write header
-            bool writeHeader(Ostream&) const;
-
-            //- Write header. Allow override of type
-            bool writeHeader(Ostream&, const word& objectType) const;
+        //- Helper: warn that type does not support re-reading
+        template<class Type>
+        void warnNoRereading() const;
 
 
-        // Error Handling
+      // Writing
 
-            bool good() const
-            {
-                return objState_ == GOOD;
-            }
+        //- Write the standard OpenFOAM file/dictionary banner
+        //  Optionally without -*- C++ -*- editor hint (eg, for logs)
+        static Ostream& writeBanner(Ostream& os, bool noHint=false);
 
-            bool bad() const
-            {
-                return objState_ == BAD;
-            }
+        //- Write the standard file section divider
+        static Ostream& writeDivider(Ostream& os);
+
+        //- Write the standard end file divider
+        static Ostream& writeEndDivider(Ostream& os);
+
+        //- Write header
+        bool writeHeader(Ostream& os) const;
+
+        //- Write header. Allow override of type
+        bool writeHeader(Ostream& os, const word& objectType) const;
 
 
-        // Info
+      // Error Handling
 
-            //- Return info proxy.
-            //  Used to print token information to a stream
-            InfoProxy<IOobject> info() const
-            {
-                return *this;
-            }
+        inline bool good() const;
+
+        inline bool bad() const;
+
+
+      // Info
+
+        //- Return info proxy.
+        //  Used to print token information to a stream
+        InfoProxy<IOobject> info() const
+        {
+            return *this;
+        }
 
 
     // Member operators
 
-        void operator=(const IOobject&);
+        void operator=(const IOobject& io);
 };
 
 
diff --git a/src/OpenFOAM/db/IOobject/IOobjectI.H b/src/OpenFOAM/db/IOobject/IOobjectI.H
index be0a0760a2..adce4e7fdc 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectI.H
+++ b/src/OpenFOAM/db/IOobject/IOobjectI.H
@@ -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) 2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,95 +23,137 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "foamVersion.H"
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Name>
-inline Foam::word Foam::IOobject::groupName(Name name, const word& group)
+template<class StringType>
+inline Foam::word Foam::IOobject::groupName(StringType name, const word& group)
 {
-    if (group != word::null)
-    {
-        return name + ('.' + group);
-    }
-    else
+    if (group.empty())
     {
         return name;
     }
-}
-
-
-template<class Stream>
-inline Stream& Foam::IOobject::writeBanner(Stream& os, bool noHint)
-{
-    static bool spacesSet(false);
-    static char spaces[40];
-
-    if (!spacesSet)
-    {
-        memset(spaces, ' ', 40);
-
-        size_t len = strlen(Foam::FOAMversion);
-        if (len < 38)
-        {
-            spaces[38 - len] = '\0';
-        }
-        else
-        {
-            spaces[0] = '\0';
-        }
-        spacesSet = true;
-    }
-
-    if (noHint)
-    {
-        os  <<
-            "/*--------------------------------------"
-            "-------------------------------------*\\\n";
-    }
     else
     {
-        os  <<
-            "/*--------------------------------*- C++ "
-            "-*----------------------------------*\\\n";
+        return name + ('.' + group);
     }
-
-    os  <<
-        "| =========                 |"
-        "                                                 |\n"
-        "| \\\\      /  F ield         |"
-        " OpenFOAM: The Open Source CFD Toolbox           |\n"
-        "|  \\\\    /   O peration     |"
-        " Version:  " << FOAMversion << spaces << "|\n"
-        "|   \\\\  /    A nd           |"
-        " Web:      www.OpenFOAM.com                      |\n"
-        "|    \\\\/     M anipulation  |"
-        "                                                 |\n"
-        "\\*-----------------------------------------"
-        "----------------------------------*/\n";
-
-    return os;
 }
 
 
-template<class Stream>
-inline Stream& Foam::IOobject::writeDivider(Stream& os)
-{
-    os  <<
-        "// * * * * * * * * * * * * * * * * * "
-        "* * * * * * * * * * * * * * * * * * * * //\n";
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-    return os;
+// General access
+
+inline const Foam::word& Foam::IOobject::name() const
+{
+    return name_;
 }
 
-template<class Stream>
-inline Stream& Foam::IOobject::writeEndDivider(Stream& os)
-{
-    os  << "\n\n"
-        "// *****************************************"
-        "******************************** //\n";
 
-    return os;
+inline const Foam::word& Foam::IOobject::headerClassName() const
+{
+    return headerClassName_;
+}
+
+
+inline const Foam::string& Foam::IOobject::note() const
+{
+    return note_;
+}
+
+
+inline Foam::string& Foam::IOobject::note()
+{
+    return note_;
+}
+
+
+inline bool Foam::IOobject::registerObject() const
+{
+    return registerObject_;
+}
+
+
+inline bool& Foam::IOobject::registerObject()
+{
+    return registerObject_;
+}
+
+
+inline bool Foam::IOobject::globalObject() const
+{
+    return globalObject_;
+}
+
+
+inline bool& Foam::IOobject::globalObject()
+{
+    return globalObject_;
+}
+
+
+// Read/write options
+
+inline Foam::IOobject::readOption Foam::IOobject::readOpt() const
+{
+    return rOpt_;
+}
+
+
+inline Foam::IOobject::readOption& Foam::IOobject::readOpt()
+{
+    return rOpt_;
+}
+
+
+inline Foam::IOobject::writeOption Foam::IOobject::writeOpt() const
+{
+    return wOpt_;
+}
+
+
+inline Foam::IOobject::writeOption& Foam::IOobject::writeOpt()
+{
+    return wOpt_;
+}
+
+
+// Path components
+
+inline const Foam::fileName& Foam::IOobject::instance() const
+{
+    return instance_;
+}
+
+
+inline Foam::fileName& Foam::IOobject::instance()
+{
+    return instance_;
+}
+
+
+inline const Foam::fileName& Foam::IOobject::local() const
+{
+    return local_;
+}
+
+
+inline Foam::fileName Foam::IOobject::objectPath() const
+{
+    return path()/name();
+}
+
+
+// Error Handling
+
+inline bool Foam::IOobject::good() const
+{
+    return objState_ == GOOD;
+}
+
+
+inline bool Foam::IOobject::bad() const
+{
+    return objState_ == BAD;
 }
 
 
diff --git a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
index f93384bf8c..58757394db 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
@@ -116,9 +116,8 @@ void Foam::IOobject::warnNoRereading() const
     {
         WarningInFunction
             << Type::typeName << ' ' << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but " << Type::typeName
-            << " does not support automatic rereading."
+            << " constructed with IOobject::MUST_READ_IF_MODIFIED but "
+            << Type::typeName << " does not support automatic rereading."
             << endl;
     }
 }
diff --git a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
index 51d6f7d853..4e01787843 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,29 +29,91 @@ Description
 
 #include "IOobject.H"
 #include "objectRegistry.H"
-#include "endian.H"
-#include "label.H"
-#include "scalar.H"
+#include "foamVersion.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// file-scope
-// Hint about machine endian, OpenFOAM label and scalar sizes
-static const std::string archHint =
-(
-#ifdef WM_LITTLE_ENDIAN
-    "LSB"
-#elif defined (WM_BIG_ENDIAN)
-    "MSB"
-#else
-    "???"
-#endif
-    ";label="  + std::to_string(8*sizeof(Foam::label))
-  + ";scalar=" + std::to_string(8*sizeof(Foam::scalar))
-);
+// A banner corresponding to this:
+//
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  VERSION                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+Foam::Ostream& Foam::IOobject::writeBanner(Ostream& os, bool noHint)
+{
+    // The version padded with spaces to fit after "Version:  "
+    // - initialized with zero-length string to detect if it has been populated
+    static char paddedVersion[39] = "";
+
+    if (!*paddedVersion)
+    {
+        // Populate: like strncpy but without trailing '\0'
+        const char *p = Foam::FOAMversion;
+
+        memset(paddedVersion, ' ', 38);
+        for (int i = 0; *p && i < 38; ++i)
+        {
+            paddedVersion[i] = *p++;
+        }
+        paddedVersion[38] = '\0';
+    }
+
+    os  <<
+        "/*--------------------------------";
+
+    if (noHint)
+    {
+        // Without syntax hint
+        os  << "---------";
+    }
+    else
+    {
+        // With syntax hint
+        os  << "*- C++ -*";
+    }
+
+    os  <<
+        "----------------------------------*\\\n"
+        "| =========                 |"
+        "                                                 |\n"
+        "| \\\\      /  F ield         |"
+        " OpenFOAM: The Open Source CFD Toolbox           |\n"
+        "|  \\\\    /   O peration     |"
+        " Version:  " << paddedVersion << "|\n"
+        "|   \\\\  /    A nd           |"
+        " Web:      www.OpenFOAM.com                      |\n"
+        "|    \\\\/     M anipulation  |"
+        "                                                 |\n"
+        "\\*-----------------------------------------"
+        "----------------------------------*/\n";
+
+    return os;
+}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+Foam::Ostream& Foam::IOobject::writeDivider(Ostream& os)
+{
+    os  <<
+        "// * * * * * * * * * * * * * * * * * "
+        "* * * * * * * * * * * * * * * * * * * * //\n";
+
+    return os;
+}
+
+
+Foam::Ostream& Foam::IOobject::writeEndDivider(Ostream& os)
+{
+    os  << "\n\n"
+        "// *****************************************"
+        "******************************** //\n";
+
+    return os;
+}
+
 
 bool Foam::IOobject::writeHeader(Ostream& os, const word& type) const
 {
@@ -72,7 +134,7 @@ bool Foam::IOobject::writeHeader(Ostream& os, const word& type) const
 
     if (os.format() == IOstream::BINARY)
     {
-        os  << "    arch        " << archHint << ";\n";
+        os  << "    arch        " << Foam::FOAMbuildArch << ";\n";
     }
 
     if (!note().empty())
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
index b558fbd321..f48aa9982b 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
@@ -91,12 +91,11 @@ Foam::IFstream::IFstream
     ISstream
     (
         *ifPtr_,
-        "IFstream.sourceFile_",
+        pathname,
         format,
         version,
         IFstreamAllocator::compression_
-    ),
-    pathname_(pathname)
+    )
 {
     setClosed();
 
@@ -166,7 +165,7 @@ Foam::IFstream& Foam::IFstream::operator()() const
     if (!good())
     {
         // also checks .gz file
-        if (isFile(pathname_, true))
+        if (isFile(this->name(), true))
         {
             check("IFstream::operator()");
             FatalIOError.exit();
@@ -174,7 +173,7 @@ Foam::IFstream& Foam::IFstream::operator()() const
         else
         {
             FatalIOErrorInFunction(*this)
-                << "file " << pathname_ << " does not exist"
+                << "file " << this->name() << " does not exist"
                 << exit(FatalIOError);
         }
     }
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
index 4a0361b345..b2280d70ae 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
@@ -84,10 +84,6 @@ class IFstream
     public IFstreamAllocator,
     public ISstream
 {
-    // Private data
-
-        fileName pathname_;
-
 public:
 
     // Declare name of the class and its debug switch
@@ -113,17 +109,8 @@ public:
 
         // Access
 
-            //- Return the name of the stream
-            const fileName& name() const
-            {
-                return pathname_;
-            }
-
-            //- Return non-const access to the name of the stream
-            fileName& name()
-            {
-                return pathname_;
-            }
+            //- Read/write access to the name of the stream
+            using ISstream::name;
 
 
         // STL stream
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index 6e4ca2d057..384d40dfce 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -93,8 +93,7 @@ Foam::OFstream::OFstream
 )
 :
     OFstreamAllocator(pathname, compression),
-    OSstream(*ofPtr_, "OFstream.sinkFile_", format, version, compression),
-    pathname_(pathname)
+    OSstream(*ofPtr_, pathname, format, version, compression)
 {
     setClosed();
     setState(ofPtr_->rdstate());
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
index 2350e3f394..6601fcd53c 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
@@ -84,11 +84,6 @@ class OFstream
     private OFstreamAllocator,
     public OSstream
 {
-    // Private data
-
-        fileName pathname_;
-
-
 public:
 
     // Declare name of the class and its debug switch
@@ -115,17 +110,8 @@ public:
 
         // Access
 
-            //- Return the name of the stream
-            const fileName& name() const
-            {
-                return pathname_;
-            }
-
-            //- Return non-const access to the name of the stream
-            fileName& name()
-            {
-                return pathname_;
-            }
+            //- Read/write access to the name of the stream
+            using OSstream::name;
 
 
         // STL stream
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
index 5f80c3a4a3..016fc281d8 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
@@ -30,7 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-Foam::fileName Foam::IOstream::name_("IOstream");
+Foam::fileName Foam::IOstream::staticName_("IOstream");
 
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
@@ -89,6 +89,18 @@ Foam::IOstream::compressionEnum(const word& compression)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+const Foam::fileName& Foam::IOstream::name() const
+{
+    return staticName_;
+}
+
+
+Foam::fileName& Foam::IOstream::name()
+{
+    return staticName_;
+}
+
+
 bool Foam::IOstream::check(const char* operation) const
 {
     if (bad())
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index 0fe6ede26a..653fe66e50 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -214,8 +214,8 @@ private:
 
     // Private data
 
-        //- Name of the stream
-        static fileName name_;
+        //- Name for any generic stream - normally treat as readonly
+        static fileName staticName_;
 
         streamFormat format_;
         versionNumber version_;
@@ -295,17 +295,11 @@ public:
 
             //- Return the name of the stream
             //  Useful for Fstream to return the filename
-            virtual const fileName& name() const
-            {
-                return name_;
-            }
+            virtual const fileName& name() const;
 
             //- Return non-const access to the name of the stream
             //  Useful to alter the stream name
-            virtual fileName& name()
-            {
-                return name_;
-            }
+            virtual fileName& name();
 
 
         // Check
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
index 984110e314..7713176196 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
@@ -72,7 +72,7 @@ public:
 
     // Constructors
 
-        //- Set stream status
+        //- Construct and set stream status
         Istream
         (
             streamFormat format=ASCII,
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index 1634689c64..3604a22d0b 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -74,7 +74,7 @@ public:
 
     // Constructors
 
-        //- Set stream status
+        //- Construct and set stream status
         Ostream
         (
             streamFormat format=ASCII,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 77692890b3..9bd97a1349 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -34,23 +34,18 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(UPstream, 0);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::UPstream::commsTypes,
-        3
-    >::names[] =
-    {
-        "blocking",
-        "scheduled",
-        "nonBlocking"
-    };
 }
 
-
-const Foam::NamedEnum<Foam::UPstream::commsTypes, 3>
-    Foam::UPstream::commsTypeNames;
+const Foam::Enum
+<
+    Foam::UPstream::commsTypes
+>
+Foam::UPstream::commsTypeNames
+{
+    { commsTypes::blocking, "blocking" },
+    { commsTypes::scheduled, "scheduled" },
+    { commsTypes::nonBlocking, "nonBlocking" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -351,7 +346,7 @@ template<>
 const Foam::UPstream::commsStruct&
 Foam::UList<Foam::UPstream::commsStruct>::operator[](const label procID) const
 {
-    return const_cast<UList<UPstream::commsStruct>& >(*this).operator[](procID);
+    return const_cast<UList<UPstream::commsStruct>&>(*this).operator[](procID);
 }
 
 
@@ -411,7 +406,11 @@ registerOptSwitch
 
 Foam::UPstream::commsTypes Foam::UPstream::defaultCommsType
 (
-    commsTypeNames.read(Foam::debug::optimisationSwitches().lookup("commsType"))
+    commsTypeNames.lookup
+    (
+        "commsType",
+        Foam::debug::optimisationSwitches()
+    )
 );
 
 namespace Foam
@@ -476,4 +475,10 @@ registerOptSwitch
 );
 
 
+const int Foam::UPstream::mpiBufferSize
+(
+    Foam::debug::optimisationSwitch("mpiBufferSize", 0)
+);
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index d6a62e3af6..7e71fc543c 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -43,7 +43,7 @@ SourceFiles
 #include "DynamicList.H"
 #include "HashTable.H"
 #include "string.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "ListOps.H"
 #include "LIFOStack.H"
 
@@ -69,7 +69,7 @@ public:
         nonBlocking
     };
 
-    static const NamedEnum<commsTypes, 3> commsTypeNames;
+    static const Enum<commsTypes> commsTypeNames;
 
     // Public classes
 
@@ -272,6 +272,9 @@ public:
         //- Optional maximum message size (bytes)
         static int maxCommsSize;
 
+        //- MPI buffer-size (bytes)
+        static const int mpiBufferSize;
+
         //- Default communicator (all processors)
         static label worldComm;
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index 3f6ebb42cd..b77f79ed13 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -75,7 +75,7 @@ class ISstream
         Istream& readVariable(string&);
 
         //- Disallow default bitwise assignment
-        void operator=(const ISstream&);
+        void operator=(const ISstream&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
index b43b46e564..e0b56d725b 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
@@ -62,14 +62,14 @@ class OSstream
     // Private Member Functions
 
         //- Disallow default bitwise assignment
-        void operator=(const OSstream&);
+        void operator=(const OSstream&) = delete;
 
 
 public:
 
     // Constructors
 
-        //- Set stream status
+        //- Construct and set stream status
         OSstream
         (
             ostream& os,
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
index b4188f75fc..3c32f578c0 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
@@ -44,7 +44,7 @@ namespace Foam
 
 //- Read a hex label from an input stream
 template<class T>
-T ReadHex(ISstream&);
+T ReadHex(ISstream& is);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
index d372d6b144..b7f0ddc5b8 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
@@ -68,7 +68,7 @@ public:
 
     // Constructors
 
-        //- Set stream status
+        //- Construct and set stream status
         prefixOSstream
         (
             ostream& os,
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
index 5bf068b81b..b4f86ec62e 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
@@ -67,7 +67,7 @@ public:
             ISstream
             (
                 *(new std::istringstream(buffer)),
-                "IStringStream.sourceFile",
+                "input",
                 format,
                 version
             )
@@ -85,7 +85,7 @@ public:
             ISstream
             (
                 *(new std::istringstream(buffer)),
-                "IStringStream.sourceFile",
+                "input",
                 format,
                 version
             )
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
index 896f3cfc5d..c6fc3103f2 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
@@ -66,7 +66,7 @@ public:
             OSstream
             (
                *(new std::ostringstream()),
-                "OStringStream.sinkFile",
+                "output",
                 format,
                 version
             )
@@ -126,7 +126,7 @@ public:
         // Print
 
             //- Print description to Ostream
-            void print(Ostream&) const;
+            void print(Ostream& os) const;
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/StringStreamsPrint.C b/src/OpenFOAM/db/IOstreams/StringStreams/StringStreamsPrint.C
index 1024ed8186..334235ff6b 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/StringStreamsPrint.C
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/StringStreamsPrint.C
@@ -34,7 +34,7 @@ Description
 void Foam::IStringStream::print(Ostream& os) const
 {
     os  << "IStringStream " << name() << " : "
-        << "buffer = \n" << str() << Foam::endl;
+        << "buffer =\n" << str() << Foam::endl;
 
     ISstream::print(os);
 }
@@ -43,7 +43,7 @@ void Foam::IStringStream::print(Ostream& os) const
 void Foam::OStringStream::print(Ostream& os) const
 {
     os  << "OStringStream " << name() << " : "
-        << "buffer = \n" << str() << Foam::endl;
+        << "buffer =\n" << str() << Foam::endl;
 
     OSstream::print(os);
 }
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
index 9a179e2d07..26617cb37e 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
@@ -126,13 +126,13 @@ public:
         // Inquiry
 
             //- Return the name of the stream
-            const fileName& name() const
+            virtual const fileName& name() const
             {
                 return name_;
             }
 
             //- Return non-const access to the name of the stream
-            fileName& name()
+            virtual fileName& name()
             {
                 return name_;
             }
@@ -165,7 +165,7 @@ public:
         // Read functions
 
             //- Return next token from stream
-            virtual Istream& read(token&);
+            virtual Istream& read(token& t);
 
             //- Read a character
             virtual Istream& read(char&);
@@ -203,8 +203,8 @@ public:
 
         // Print
 
-            //- Print description of IOstream to Ostream
-            void print(Ostream&) const;
+            //- Print description of stream to Ostream
+            void print(Ostream& os) const;
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
index 49f5f439f2..d0f3ce2d59 100644
--- a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
+++ b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
@@ -72,7 +72,7 @@ public:
 
     // Member Functions
 
-    // Write
+      // Write
 
         //- Process unbuffered
         virtual std::streamsize xsputn(const char* str, std::streamsize n)
@@ -109,7 +109,7 @@ public:
 
     // Member Functions
 
-    // Access
+      // Access
 
         //- This hides both signatures of std::basic_ios::rdbuf()
         sha1streambuf* rdbuf()
@@ -139,16 +139,16 @@ class OSHA1stream
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        OSHA1stream(const OSHA1stream&);
+        OSHA1stream(const OSHA1stream&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const OSHA1stream&);
+        void operator=(const OSHA1stream&) = delete;
 
 public:
 
     // Constructors
 
-        //- Construct and set stream status
+        //- Construct with an empty digest
         OSHA1stream
         (
             streamFormat format=ASCII,
@@ -158,7 +158,7 @@ public:
             OSstream
             (
                 *(new osha1stream),
-                "OSHA1stream.sinkFile_",
+                "OSHA1stream",
                 format,
                 version
             )
@@ -174,7 +174,7 @@ public:
 
     // Member functions
 
-    // Access
+      // Access
 
         //- Full access to the sha1
         Foam::SHA1& sha1()
@@ -188,7 +188,8 @@ public:
             return sha1().digest();
         }
 
-    // Edit
+
+      // Edit
 
         //- Clear the SHA1 calculation
         void rewind()
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 7229e58b86..26dc543f5b 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -134,10 +134,10 @@ public:
         // Private Member Functions
 
             //- Disallow default bitwise copy construct
-            compound(const compound&);
+            compound(const compound&) = delete;
 
             //- Disallow default bitwise assignment
-            void operator=(const compound&);
+            void operator=(const compound&) = delete;
 
 
     public:
@@ -195,11 +195,6 @@ public:
 
                 virtual label size() const = 0;
 
-
-            // Check
-
-            // Edit
-
             // Write
 
                 virtual void write(Ostream&) const = 0;
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index fbf6ebff65..0a7ae9f3df 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -37,40 +37,34 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(Time, 0);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::Time::stopAtControls,
-        4
-    >::names[] =
-    {
-        "endTime",
-        "noWriteNow",
-        "writeNow",
-        "nextWrite"
-    };
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::Time::writeControls,
-        5
-    >::names[] =
-    {
-        "timeStep",
-        "runTime",
-        "adjustableRunTime",
-        "clockTime",
-        "cpuTime"
-    };
 }
 
-const Foam::NamedEnum<Foam::Time::stopAtControls, 4>
-    Foam::Time::stopAtControlNames_;
+const Foam::Enum
+<
+    Foam::Time::stopAtControls
+>
+Foam::Time::stopAtControlNames_
+{
+    { stopAtControls::saEndTime, "endTime" },
+    { stopAtControls::saNoWriteNow, "noWriteNow" },
+    { stopAtControls::saWriteNow, "writeNow" },
+    { stopAtControls::saNextWrite, "nextWrite" },
+};
+
+
+const Foam::Enum
+<
+    Foam::Time::writeControls
+>
+Foam::Time::writeControlNames_
+{
+    { writeControls::wcTimeStep, "timeStep" },
+    { writeControls::wcRunTime, "runTime" },
+    { writeControls::wcAdjustableRunTime, "adjustableRunTime" },
+    { writeControls::wcClockTime, "clockTime" },
+    { writeControls::wcCpuTime, "cpuTime" },
+};
 
-const Foam::NamedEnum<Foam::Time::writeControls, 5>
-    Foam::Time::writeControlNames_;
 
 Foam::Time::fmtflags Foam::Time::format_(Foam::Time::general);
 
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 5f6dc17321..f43f74d360 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -47,7 +47,7 @@ SourceFiles
 #include "TimeState.H"
 #include "Switch.H"
 #include "instantList.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "typeInfo.H"
 #include "dlLibraryTable.H"
 #include "functionObjectList.H"
@@ -130,10 +130,10 @@ protected:
         scalar startTime_;
         mutable scalar endTime_;
 
-        static const NamedEnum<stopAtControls, 4> stopAtControlNames_;
+        static const Enum<stopAtControls> stopAtControlNames_;
         mutable stopAtControls stopAt_;
 
-        static const NamedEnum<writeControls, 5> writeControlNames_;
+        static const Enum<writeControls> writeControlNames_;
         writeControls writeControl_;
 
         scalar writeInterval_;
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 86517390fa..5c8c2c5c5a 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -201,9 +201,10 @@ void Foam::Time::readDict()
 
     if (controlDict_.found("writeControl"))
     {
-        writeControl_ = writeControlNames_.read
+        writeControl_ = writeControlNames_.lookup
         (
-            controlDict_.lookup("writeControl")
+            "writeControl",
+            controlDict_
         );
     }
 
@@ -288,7 +289,7 @@ void Foam::Time::readDict()
     // if nothing is specified, the endTime is zero
     if (controlDict_.found("stopAt"))
     {
-        stopAt_ = stopAtControlNames_.read(controlDict_.lookup("stopAt"));
+        stopAt_ = stopAtControlNames_.lookup("stopAt", controlDict_);
 
         if (stopAt_ == saEndTime)
         {
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 067fbb2c2b..33acac0ace 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -35,12 +35,50 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(dictionary, 0);
-    const dictionary dictionary::null;
+}
 
-    bool dictionary::writeOptionalEntries
+const Foam::dictionary Foam::dictionary::null;
+
+bool Foam::dictionary::writeOptionalEntries
+(
+    Foam::debug::infoSwitch("writeOptionalEntries", 0)
+);
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    // file-scope
+    //- Walk lists of patterns and regexps for an exact match
+    //  or regular expression match
+    template<class WcIterator, class ReIterator>
+    static bool findInPatterns
     (
-        debug::infoSwitch("writeOptionalEntries", 0)
-    );
+        const bool patternMatch,
+        const word& keyword,
+        WcIterator& wcIter,
+        ReIterator& reIter
+    )
+    {
+        while (wcIter.found())
+        {
+            if
+            (
+                patternMatch
+              ? reIter()->match(keyword)
+              : wcIter()->keyword() == keyword
+            )
+            {
+                return true;
+            }
+
+            ++reIter;
+            ++wcIter;
+        }
+
+        return false;
+    }
 }
 
 
@@ -158,68 +196,6 @@ const Foam::entry* Foam::dictionary::lookupScopedSubEntryPtr
 }
 
 
-bool Foam::dictionary::findInPatterns
-(
-    const bool patternMatch,
-    const word& keyword,
-    DLList<entry*>::const_iterator& wcLink,
-    DLList<autoPtr<regExp>>::const_iterator& reLink
-) const
-{
-    if (patternEntries_.size())
-    {
-        while (wcLink != patternEntries_.end())
-        {
-            if
-            (
-                patternMatch
-              ? reLink()->match(keyword)
-              : wcLink()->keyword() == keyword
-            )
-            {
-                return true;
-            }
-
-            ++reLink;
-            ++wcLink;
-        }
-    }
-
-    return false;
-}
-
-
-bool Foam::dictionary::findInPatterns
-(
-    const bool patternMatch,
-    const word& keyword,
-    DLList<entry*>::iterator& wcLink,
-    DLList<autoPtr<regExp>>::iterator& reLink
-)
-{
-    if (patternEntries_.size())
-    {
-        while (wcLink != patternEntries_.end())
-        {
-            if
-            (
-                patternMatch
-              ? reLink()->match(keyword)
-              : wcLink()->keyword() == keyword
-            )
-            {
-                return true;
-            }
-
-            ++reLink;
-            ++wcLink;
-        }
-    }
-
-    return false;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::dictionary::dictionary()
@@ -242,17 +218,17 @@ Foam::dictionary::dictionary
 )
 :
     dictionaryName(dict.name()),
-    IDLList<entry>(dict, *this),
+    parent_type(dict, *this),
     parent_(parentDict)
 {
-    forAllIter(IDLList<entry>, *this, iter)
+    forAllIter(parent_type, *this, iter)
     {
         hashedEntries_.insert(iter().keyword(), &iter());
 
         if (iter().keyword().isPattern())
         {
-            patternEntries_.insert(&iter());
-            patternRegexps_.insert
+            patterns_.insert(&iter());
+            regexps_.insert
             (
                 autoPtr<regExp>(new regExp(iter().keyword()))
             );
@@ -267,17 +243,17 @@ Foam::dictionary::dictionary
 )
 :
     dictionaryName(dict.name()),
-    IDLList<entry>(dict, *this),
+    parent_type(dict, *this),
     parent_(dictionary::null)
 {
-    forAllIter(IDLList<entry>, *this, iter)
+    forAllIter(parent_type, *this, iter)
     {
         hashedEntries_.insert(iter().keyword(), &iter());
 
         if (iter().keyword().isPattern())
         {
-            patternEntries_.insert(&iter());
-            patternRegexps_.insert
+            patterns_.insert(&iter());
+            regexps_.insert
             (
                 autoPtr<regExp>(new regExp(iter().keyword()))
             );
@@ -384,7 +360,7 @@ Foam::SHA1Digest Foam::dictionary::digest() const
     OSHA1stream os;
 
     // Process entries
-    forAllConstIter(IDLList<entry>, *this, iter)
+    forAllConstIter(parent_type, *this, iter)
     {
         os << *iter;
     }
@@ -423,31 +399,25 @@ bool Foam::dictionary::found
     {
         return true;
     }
-    else
+
+    if (patternMatch && patterns_.size())
     {
-        if (patternMatch && patternEntries_.size())
-        {
-            DLList<entry*>::const_iterator wcLink =
-                patternEntries_.begin();
-            DLList<autoPtr<regExp>>::const_iterator reLink =
-                patternRegexps_.begin();
+        pattern_const_iterator wcLink = patterns_.begin();
+        regexp_const_iterator  reLink = regexps_.begin();
 
-            // Find in patterns using regular expressions only
-            if (findInPatterns(patternMatch, keyword, wcLink, reLink))
-            {
-                return true;
-            }
-        }
-
-        if (recursive && &parent_ != &dictionary::null)
+        // Find in patterns using regular expressions only
+        if (findInPatterns(patternMatch, keyword, wcLink, reLink))
         {
-            return parent_.found(keyword, recursive, patternMatch);
-        }
-        else
-        {
-            return false;
+            return true;
         }
     }
+
+    if (recursive && &parent_ != &dictionary::null)
+    {
+        return parent_.found(keyword, recursive, patternMatch);
+    }
+
+    return false;
 }
 
 
@@ -458,35 +428,31 @@ const Foam::entry* Foam::dictionary::lookupEntryPtr
     bool patternMatch
 ) const
 {
-    HashTable<entry*>::const_iterator iter = hashedEntries_.find(keyword);
+    auto iter = hashedEntries_.cfind(keyword);
 
-    if (iter == hashedEntries_.end())
+    if (iter.found())
     {
-        if (patternMatch && patternEntries_.size())
-        {
-            DLList<entry*>::const_iterator wcLink =
-                patternEntries_.begin();
-            DLList<autoPtr<regExp>>::const_iterator reLink =
-                patternRegexps_.begin();
+        return iter();
+    }
 
-            // Find in patterns using regular expressions only
-            if (findInPatterns(patternMatch, keyword, wcLink, reLink))
-            {
-                return wcLink();
-            }
-        }
+    if (patternMatch && patterns_.size())
+    {
+        pattern_const_iterator wcLink = patterns_.begin();
+        regexp_const_iterator  reLink = regexps_.begin();
 
-        if (recursive && &parent_ != &dictionary::null)
+        // Find in patterns using regular expressions only
+        if (findInPatterns(patternMatch, keyword, wcLink, reLink))
         {
-            return parent_.lookupEntryPtr(keyword, recursive, patternMatch);
-        }
-        else
-        {
-            return nullptr;
+            return wcLink();
         }
     }
 
-    return iter();
+    if (recursive && &parent_ != &dictionary::null)
+    {
+        return parent_.lookupEntryPtr(keyword, recursive, patternMatch);
+    }
+
+    return nullptr;
 }
 
 
@@ -497,40 +463,36 @@ Foam::entry* Foam::dictionary::lookupEntryPtr
     bool patternMatch
 )
 {
-    HashTable<entry*>::iterator iter = hashedEntries_.find(keyword);
+    auto iter = hashedEntries_.find(keyword);
 
-    if (iter == hashedEntries_.end())
+    if (iter.found())
     {
-        if (patternMatch && patternEntries_.size())
-        {
-            DLList<entry*>::iterator wcLink =
-                patternEntries_.begin();
-            DLList<autoPtr<regExp>>::iterator reLink =
-                patternRegexps_.begin();
+        return iter();
+    }
 
-            // Find in patterns using regular expressions only
-            if (findInPatterns(patternMatch, keyword, wcLink, reLink))
-            {
-                return wcLink();
-            }
-        }
+    if (patternMatch && patterns_.size())
+    {
+        pattern_iterator wcLink = patterns_.begin();
+        regexp_iterator  reLink = regexps_.begin();
 
-        if (recursive && &parent_ != &dictionary::null)
+        // Find in patterns using regular expressions only
+        if (findInPatterns(patternMatch, keyword, wcLink, reLink))
         {
-            return const_cast<dictionary&>(parent_).lookupEntryPtr
-            (
-                keyword,
-                recursive,
-                patternMatch
-            );
-        }
-        else
-        {
-            return nullptr;
+            return wcLink();
         }
     }
 
-    return iter();
+    if (recursive && &parent_ != &dictionary::null)
+    {
+        return const_cast<dictionary&>(parent_).lookupEntryPtr
+        (
+            keyword,
+            recursive,
+            patternMatch
+        );
+    }
+
+    return nullptr;
 }
 
 
@@ -575,7 +537,7 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
     bool patternMatch
 ) const
 {
-    if (keyword[0] == ':' || keyword[0] == '^')
+    if ((keyword[0] == ':' || keyword[0] == '^'))
     {
         // Go up to top level
         const dictionary* dictPtr = this;
@@ -591,15 +553,13 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
             patternMatch
         );
     }
-    else
-    {
-        return lookupScopedSubEntryPtr
-        (
-            keyword,
-            recursive,
-            patternMatch
-        );
-    }
+
+    return lookupScopedSubEntryPtr
+    (
+        keyword,
+        recursive,
+        patternMatch
+    );
 }
 
 
@@ -609,7 +569,8 @@ bool Foam::dictionary::substituteScopedKeyword
     bool mergeEntry
 )
 {
-    const word varName = keyword(1, keyword.size()-1);
+    // Drop first character of keyword to get the var-name, already validated.
+    const word varName(keyword.substr(1), false);
 
     // Lookup the variable name in the given dictionary
     const entry* ePtr = lookupScopedEntryPtr(varName, true, true);
@@ -619,7 +580,7 @@ bool Foam::dictionary::substituteScopedKeyword
     {
         const dictionary& addDict = ePtr->dict();
 
-        forAllConstIter(IDLList<entry>, addDict, iter)
+        forAllConstIter(parent_type, addDict, iter)
         {
             add(iter(), mergeEntry);
         }
@@ -766,7 +727,7 @@ Foam::wordList Foam::dictionary::toc() const
     wordList keys(size());
 
     label nKeys = 0;
-    forAllConstIter(IDLList<entry>, *this, iter)
+    forAllConstIter(parent_type, *this, iter)
     {
         keys[nKeys++] = iter().keyword();
     }
@@ -786,7 +747,7 @@ Foam::List<Foam::keyType> Foam::dictionary::keys(bool patterns) const
     List<keyType> keys(size());
 
     label nKeys = 0;
-    forAllConstIter(IDLList<entry>, *this, iter)
+    forAllConstIter(parent_type, *this, iter)
     {
         if (iter().keyword().isPattern() ? patterns : !patterns)
         {
@@ -801,12 +762,9 @@ Foam::List<Foam::keyType> Foam::dictionary::keys(bool patterns) const
 
 bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
 {
-    HashTable<entry*>::iterator iter = hashedEntries_.find
-    (
-        entryPtr->keyword()
-    );
+    auto iter = hashedEntries_.find(entryPtr->keyword());
 
-    if (mergeEntry && iter != hashedEntries_.end())
+    if (mergeEntry && iter.found())
     {
         // Merge dictionary with dictionary
         if (iter()->isDict() && entryPtr->isDict())
@@ -816,50 +774,50 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
 
             return true;
         }
+
+
+        // Replace existing dictionary with entry or vice versa
+        parent_type::replace(iter(), entryPtr);
+        delete iter();
+        hashedEntries_.erase(iter);
+
+        if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
+        {
+            entryPtr->name() = name() + '.' + entryPtr->keyword();
+
+            if (entryPtr->keyword().isPattern())
+            {
+                patterns_.insert(entryPtr);
+                regexps_.insert
+                (
+                    autoPtr<regExp>(new regExp(entryPtr->keyword()))
+                );
+            }
+
+            return true;
+        }
         else
         {
-            // Replace existing dictionary with entry or vice versa
-            IDLList<entry>::replace(iter(), entryPtr);
-            delete iter();
-            hashedEntries_.erase(iter);
+            IOWarningInFunction((*this))
+                << "problem replacing entry "<< entryPtr->keyword()
+                << " in dictionary " << name() << endl;
 
-            if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
-            {
-                entryPtr->name() = name() + '.' + entryPtr->keyword();
-
-                if (entryPtr->keyword().isPattern())
-                {
-                    patternEntries_.insert(entryPtr);
-                    patternRegexps_.insert
-                    (
-                        autoPtr<regExp>(new regExp(entryPtr->keyword()))
-                    );
-                }
-
-                return true;
-            }
-            else
-            {
-                IOWarningInFunction((*this))
-                    << "problem replacing entry "<< entryPtr->keyword()
-                    << " in dictionary " << name() << endl;
-
-                IDLList<entry>::remove(entryPtr);
-                delete entryPtr;
-                return false;
-            }
+            parent_type::remove(entryPtr);
+            delete entryPtr;
+            return false;
         }
     }
 
+
     if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
     {
         entryPtr->name() = name() + '.' + entryPtr->keyword();
-        IDLList<entry>::append(entryPtr);
+        parent_type::append(entryPtr);
 
         if (entryPtr->keyword().isPattern())
         {
-            patternEntries_.insert(entryPtr);
-            patternRegexps_.insert
+            patterns_.insert(entryPtr);
+            regexps_.insert
             (
                 autoPtr<regExp>(new regExp(entryPtr->keyword()))
             );
@@ -928,6 +886,7 @@ void Foam::dictionary::add
 
 void Foam::dictionary::set(entry* entryPtr)
 {
+    // Find non-recursive with patterns
     entry* existingPtr = lookupEntryPtr(entryPtr->keyword(), false, true);
 
     // Clear dictionary so merge acts like overwrite
@@ -953,24 +912,22 @@ void Foam::dictionary::set(const keyType& k, const dictionary& d)
 
 bool Foam::dictionary::remove(const word& keyword)
 {
-    HashTable<entry*>::iterator iter = hashedEntries_.find(keyword);
+    auto iter = hashedEntries_.find(keyword);
 
     if (iter.found())
     {
-        // Delete from patterns first
-        DLList<entry*>::iterator wcLink =
-            patternEntries_.begin();
-        DLList<autoPtr<regExp>>::iterator reLink =
-            patternRegexps_.begin();
+        // Delete from patterns
+        pattern_iterator wcLink = patterns_.begin();
+        regexp_iterator  reLink = regexps_.begin();
 
         // Find in pattern using exact match only
         if (findInPatterns(false, keyword, wcLink, reLink))
         {
-            patternEntries_.remove(wcLink);
-            patternRegexps_.remove(reLink);
+            patterns_.remove(wcLink);
+            regexps_.remove(reLink);
         }
 
-        IDLList<entry>::remove(iter());
+        parent_type::remove(iter());
         delete iter();
         hashedEntries_.erase(iter);
 
@@ -996,10 +953,10 @@ bool Foam::dictionary::changeKeyword
         return false;
     }
 
-    HashTable<entry*>::iterator iter = hashedEntries_.find(oldKeyword);
+    // Check that oldKeyword exists and can be changed
+    auto iter = hashedEntries_.find(oldKeyword);
 
-    // oldKeyword not found - do nothing
-    if (iter == hashedEntries_.end())
+    if (!iter.found())
     {
         return false;
     }
@@ -1016,30 +973,28 @@ bool Foam::dictionary::changeKeyword
     }
 
 
-    HashTable<entry*>::iterator iter2 = hashedEntries_.find(newKeyword);
+    auto iter2 = hashedEntries_.find(newKeyword);
 
     // newKeyword already exists
-    if (iter2 != hashedEntries_.end())
+    if (iter2.found())
     {
         if (forceOverwrite)
         {
             if (iter2()->keyword().isPattern())
             {
-                // Delete from patterns first
-                DLList<entry*>::iterator wcLink =
-                    patternEntries_.begin();
-                DLList<autoPtr<regExp>>::iterator reLink =
-                    patternRegexps_.begin();
+                // Delete from patterns
+                pattern_iterator wcLink = patterns_.begin();
+                regexp_iterator  reLink = regexps_.begin();
 
                 // Find in patterns using exact match only
                 if (findInPatterns(false, iter2()->keyword(), wcLink, reLink))
                 {
-                    patternEntries_.remove(wcLink);
-                    patternRegexps_.remove(reLink);
+                    patterns_.remove(wcLink);
+                    regexps_.remove(reLink);
                 }
             }
 
-            IDLList<entry>::replace(iter2(), iter());
+            parent_type::replace(iter2(), iter());
             delete iter2();
             hashedEntries_.erase(iter2);
         }
@@ -1063,8 +1018,8 @@ bool Foam::dictionary::changeKeyword
 
     if (newKeyword.isPattern())
     {
-        patternEntries_.insert(iter());
-        patternRegexps_.insert
+        patterns_.insert(iter());
+        regexps_.insert
         (
             autoPtr<regExp>(new regExp(newKeyword))
         );
@@ -1086,11 +1041,11 @@ bool Foam::dictionary::merge(const dictionary& dict)
 
     bool changed = false;
 
-    forAllConstIter(IDLList<entry>, dict, iter)
+    forAllConstIter(parent_type, dict, iter)
     {
-        HashTable<entry*>::iterator fnd = hashedEntries_.find(iter().keyword());
+        auto fnd = hashedEntries_.find(iter().keyword());
 
-        if (fnd != hashedEntries_.end())
+        if (fnd.found())
         {
             // Recursively merge sub-dictionaries
             // TODO: merge without copying
@@ -1121,10 +1076,10 @@ bool Foam::dictionary::merge(const dictionary& dict)
 
 void Foam::dictionary::clear()
 {
-    IDLList<entry>::clear();
+    parent_type::clear();
     hashedEntries_.clear();
-    patternEntries_.clear();
-    patternRegexps_.clear();
+    patterns_.clear();
+    regexps_.clear();
 }
 
 
@@ -1134,10 +1089,10 @@ void Foam::dictionary::transfer(dictionary& dict)
     // but what about the names?
     name() = dict.name();
 
-    IDLList<entry>::transfer(dict);
+    parent_type::transfer(dict);
     hashedEntries_.transfer(dict.hashedEntries_);
-    patternEntries_.transfer(dict.patternEntries_);
-    patternRegexps_.transfer(dict.patternRegexps_);
+    patterns_.transfer(dict.patterns_);
+    regexps_.transfer(dict.regexps_);
 }
 
 
@@ -1171,7 +1126,7 @@ void Foam::dictionary::operator=(const dictionary& rhs)
     // Create clones of the entries in the given dictionary
     // resetting the parentDict to this dictionary
 
-    forAllConstIter(IDLList<entry>, rhs, iter)
+    forAllConstIter(parent_type, rhs, iter)
     {
         add(iter().clone(*this).ptr());
     }
@@ -1188,7 +1143,7 @@ void Foam::dictionary::operator+=(const dictionary& rhs)
             << abort(FatalIOError);
     }
 
-    forAllConstIter(IDLList<entry>, rhs, iter)
+    forAllConstIter(parent_type, rhs, iter)
     {
         add(iter().clone(*this).ptr());
     }
@@ -1205,7 +1160,7 @@ void Foam::dictionary::operator|=(const dictionary& rhs)
             << abort(FatalIOError);
     }
 
-    forAllConstIter(IDLList<entry>, rhs, iter)
+    forAllConstIter(parent_type, rhs, iter)
     {
         if (!found(iter().keyword()))
         {
@@ -1225,7 +1180,7 @@ void Foam::dictionary::operator<<=(const dictionary& rhs)
             << abort(FatalIOError);
     }
 
-    forAllConstIter(IDLList<entry>, rhs, iter)
+    forAllConstIter(parent_type, rhs, iter)
     {
         set(iter().clone(*this).ptr());
     }
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 9a2296632b..fc34a32d99 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -100,8 +100,8 @@ class regExp;
 class dictionary;
 class SHA1Digest;
 
-Istream& operator>>(Istream&, dictionary&);
-Ostream& operator<<(Ostream&, const dictionary&);
+Istream& operator>>(Istream& is, dictionary& dict);
+Ostream& operator<<(Ostream& os, const dictionary& dict);
 
 /*---------------------------------------------------------------------------*\
                         Class dictionaryName Declaration
@@ -176,20 +176,31 @@ class dictionary
         //- Report optional keywords and values if not present in dictionary
         static bool writeOptionalEntries;
 
-        //- HashTable of the entries held on the DL-list for quick lookup
-        HashTable<entry*> hashedEntries_;
-
         //- Parent dictionary
         const dictionary& parent_;
 
+        //- HashTable of the entries held on the IDLList for quick lookup
+        HashTable<entry*> hashedEntries_;
+
         //- Entries of matching patterns
-        DLList<entry*> patternEntries_;
+        DLList<entry*> patterns_;
 
         //- Patterns as precompiled regular expressions
-        DLList<autoPtr<regExp>> patternRegexps_;
+        DLList<autoPtr<regExp>> regexps_;
 
 
-   // Private Member Functions
+    // Typedefs
+
+        //- The storage container
+        typedef IDLList<entry> parent_type;
+
+        typedef DLList<entry*>::iterator pattern_iterator;
+        typedef DLList<entry*>::const_iterator pattern_const_iterator;
+        typedef DLList<autoPtr<regExp>>::iterator regexp_iterator;
+        typedef DLList<autoPtr<regExp>>::const_iterator regexp_const_iterator;
+
+
+    // Private Member Functions
 
         //- Find and return an entry data stream pointer if present
         //  otherwise return nullptr. Allows scoping using '.'
@@ -200,24 +211,6 @@ class dictionary
             bool patternMatch
         ) const;
 
-        //- Search patterns table for exact match or regular expression match
-        bool findInPatterns
-        (
-            const bool patternMatch,
-            const word& Keyword,
-            DLList<entry*>::const_iterator& wcLink,
-            DLList<autoPtr<regExp>>::const_iterator& reLink
-        ) const;
-
-        //- Search patterns table for exact match or regular expression match
-        bool findInPatterns
-        (
-            const bool patternMatch,
-            const word& Keyword,
-            DLList<entry*>::iterator& wcLink,
-            DLList<autoPtr<regExp>>::iterator& reLink
-        );
-
 
 public:
 
@@ -228,8 +221,7 @@ public:
     // Declare name of the class and its debug switch
     ClassName("dictionary");
 
-
-    //- Null dictionary
+    //- An empty dictionary, which is also the parent for all dictionaries
     static const dictionary null;
 
 
@@ -287,6 +279,8 @@ public:
 
     // Member functions
 
+      // Access
+
         //- Return the parent dictionary
         const dictionary& parent() const
         {
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index 1d55ff2794..836add62f9 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -103,7 +103,7 @@ bool Foam::dictionary::read(Istream& is, const bool keepHeader)
     while (!is.eof() && entry::New(*this, is))
     {}
 
-    // normally remove the FoamFile header entry if it exists
+    // Normally remove the FoamFile header entry if it exists
     if (!keepHeader)
     {
         remove("FoamFile");
@@ -140,7 +140,7 @@ bool Foam::dictionary::substituteKeyword(const word& keyword, bool mergeEntry)
     {
         const dictionary& addDict = ePtr->dict();
 
-        forAllConstIter(IDLList<entry>, addDict, iter)
+        forAllConstIter(parent_type, addDict, iter)
         {
             add(iter(), mergeEntry);
         }
@@ -179,7 +179,7 @@ void Foam::dictionary::writeEntry(const keyType& kw, Ostream& os) const
 
 void Foam::dictionary::writeEntries(Ostream& os, const bool extraNewLine) const
 {
-    forAllConstIter(IDLList<entry>, *this, iter)
+    forAllConstIter(parent_type, *this, iter)
     {
         const entry& e = *iter;
 
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
index 816049967d..5a10c23e1f 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
@@ -28,27 +28,22 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::timeControl::timeControls
+>
+Foam::timeControl::timeControlNames_
 {
-    template<>
-    const char* NamedEnum<timeControl::timeControls, 9>::
-    names[] =
-    {
-        "timeStep",
-        "writeTime",
-        "outputTime",
-        "adjustableRunTime",
-        "runTime",
-        "clockTime",
-        "cpuTime",
-        "onEnd",
-        "none"
-    };
-}
-
-const Foam::NamedEnum<Foam::timeControl::timeControls, 9>
-    Foam::timeControl::timeControlNames_;
-
+    { timeControl::ocTimeStep, "timeStep" },
+    { timeControl::ocWriteTime, "writeTime" },
+    { timeControl::ocOutputTime, "outputTime" },
+    { timeControl::ocAdjustableRunTime, "adjustableRunTime" },
+    { timeControl::ocRunTime, "runTime" },
+    { timeControl::ocClockTime, "clockTime" },
+    { timeControl::ocCpuTime, "cpuTime" },
+    { timeControl::ocOnEnd, "onEnd" },
+    { timeControl::ocNone, "none" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -117,7 +112,7 @@ void Foam::timeControl::read(const dictionary& dict)
 
     if (dict.found(controlName))
     {
-        timeControl_ = timeControlNames_.read(dict.lookup(controlName));
+        timeControl_ = timeControlNames_.lookup(controlName, dict);
     }
     else
     {
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
index 247ef2d3de..86b91b2466 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
@@ -77,7 +77,7 @@ private:
         const word prefix_;
 
         //- String representation of timeControls enums
-        static const NamedEnum<timeControls, 9> timeControlNames_;
+        static const Enum<timeControls> timeControlNames_;
 
         //- Type of time control
         timeControls timeControl_;
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index 513efc44e5..3cf47f0cd5 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -42,7 +42,7 @@ tmp<DimensionedField<TypeR, GeoMesh>> New
 )
 {
     DimensionedField<TypeR, GeoMesh>& df1 =
-        const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+        const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
 
     if (tdf1.isTmp())
     {
@@ -115,7 +115,7 @@ public:
     )
     {
         DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
 
         if (tdf1.isTmp())
         {
@@ -192,7 +192,7 @@ public:
     {
         const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
         DimensionedField<TypeR, GeoMesh>& df2 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf2());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf2());
 
         if (tdf2.isTmp())
         {
@@ -235,7 +235,7 @@ public:
     )
     {
         DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
 
         if (tdf1.isTmp())
         {
@@ -278,9 +278,9 @@ public:
     )
     {
         DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
         DimensionedField<TypeR, GeoMesh>& df2 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf2());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf2());
 
         if (tdf1.isTmp())
         {
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index a9c849c53a..c6fb56706d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -85,7 +85,7 @@ tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
 )
 {
     GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-        const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+        const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
 
     if (reusable(tgf1))
     {
@@ -171,7 +171,7 @@ public:
     )
     {
         GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
 
         if (reusable(tgf1))
         {
@@ -264,7 +264,7 @@ public:
     {
         const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
         GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf2());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf2());
 
         if (reusable(tgf2))
         {
@@ -313,7 +313,7 @@ public:
     )
     {
         GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
 
         if (reusable(tgf1))
         {
@@ -356,9 +356,9 @@ public:
     )
     {
         GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
         GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf2());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf2());
 
         if (reusable(tgf1))
         {
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index e111b33067..a5092d472e 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -37,7 +37,7 @@ License
 #include "sigInt.H"
 #include "sigQuit.H"
 #include "sigSegv.H"
-#include "endian.H"
+#include "foamVersion.H"
 
 #include <cctype>
 
@@ -54,22 +54,6 @@ Foam::string::size_type Foam::argList::usageMin = 20;
 Foam::string::size_type Foam::argList::usageMax = 80;
 Foam::word Foam::argList::postProcessOptionName("postProcess");
 
-// file-scope
-// Hint about machine endian, OpenFOAM label and scalar sizes
-static const std::string archHint =
-(
-#ifdef WM_LITTLE_ENDIAN
-    "LSB"
-#elif defined (WM_BIG_ENDIAN)
-    "MSB"
-#else
-    "???"
-#endif
-    ";label="  + std::to_string(8*sizeof(Foam::label))
-  + ";scalar=" + std::to_string(8*sizeof(Foam::scalar))
-);
-
-
 Foam::argList::initValidTables::initValidTables()
 {
     argList::addOption
@@ -407,11 +391,11 @@ void Foam::argList::getRootCase()
     fileName casePath;
 
     // [-case dir] specified
-    HashTable<string>::const_iterator iter = options_.find("case");
+    auto optIter = options_.cfind("case");
 
-    if (iter != options_.end())
+    if (optIter.found())
     {
-        casePath = iter();
+        casePath = optIter.object();
         casePath.clean();
 
         if (casePath.empty() || casePath == ".")
@@ -639,7 +623,7 @@ void Foam::argList::parse
         {
             IOobject::writeBanner(Info, true)
                 << "Build  : " << Foam::FOAMbuild << nl
-                << "Arch   : " << archHint << nl
+                << "Arch   : " << Foam::FOAMbuildArch << nl
                 << "Exec   : " << argListStr_.c_str() << nl
                 << "Date   : " << dateString.c_str() << nl
                 << "Time   : " << timeString.c_str() << nl
@@ -650,7 +634,7 @@ void Foam::argList::parse
         jobInfo.add("startDate", dateString);
         jobInfo.add("startTime", timeString);
         jobInfo.add("userName", userName());
-        jobInfo.add("foamVersion", word(FOAMversion));
+        jobInfo.add("foamVersion", word(Foam::FOAMversion));
         jobInfo.add("code", executable_);
         jobInfo.add("argList", argListStr_);
         jobInfo.add("currentDir", cwd());
@@ -660,10 +644,10 @@ void Foam::argList::parse
         // Add build information - only use the first word
         {
             std::string build(Foam::FOAMbuild);
-            std::string::size_type found = build.find(' ');
-            if (found != std::string::npos)
+            std::string::size_type space = build.find(' ');
+            if (space != std::string::npos)
             {
-                build.resize(found);
+                build.resize(space);
             }
             jobInfo.add("foamBuild", build);
         }
@@ -695,15 +679,12 @@ void Foam::argList::parse
                 source = options_["decomposeParDict"];
                 if (isDir(source))
                 {
-                    adjustOpt = true;
                     source = source/"decomposeParDict";
+                    adjustOpt = true;
                 }
 
-                if
-                (
-                   !source.isAbsolute()
-                && !(source.size() && source[0] == '.')
-                )
+                // Case-relative if not absolute and not "./" etc
+                if (!source.isAbsolute() && !source.startsWith("."))
                 {
                     source = rootPath_/globalCase_/source;
                     adjustOpt = true;
@@ -1185,32 +1166,26 @@ void Foam::argList::printUsage() const
 
     Info<< "\noptions:\n";
 
-    wordList opts = validOptions.sortedToc();
-    forAll(opts, optI)
+    const wordList opts = validOptions.sortedToc();
+    for (const word& optionName : opts)
     {
-        const word& optionName = opts[optI];
-
-        HashTable<string>::const_iterator iter = validOptions.find(optionName);
         Info<< "  -" << optionName;
         label len = optionName.size() + 3;  // Length includes leading '  -'
 
-        if (iter().size())
+        auto optIter = validOptions.cfind(optionName);
+
+        if (optIter().size())
         {
-            // Length includes space and between option/param and '<>'
-            len += iter().size() + 3;
-            Info<< " <" << iter().c_str() << '>';
+            // Length includes space between option/param and '<>'
+            len += optIter().size() + 3;
+            Info<< " <" << optIter().c_str() << '>';
         }
 
-        HashTable<string>::const_iterator usageIter =
-            optionUsage.find(optionName);
+        auto usageIter = optionUsage.cfind(optionName);
 
-        if (usageIter != optionUsage.end())
+        if (usageIter.found())
         {
-            printOptionUsage
-            (
-                len,
-                usageIter()
-            );
+            printOptionUsage(len, usageIter());
         }
         else
         {
@@ -1220,26 +1195,13 @@ void Foam::argList::printUsage() const
 
     // Place srcDoc/doc/help options at the end
     Info<< "  -srcDoc";
-    printOptionUsage
-    (
-        9,
-        "display source code in browser"
-    );
+    printOptionUsage(9, "display source code in browser" );
 
     Info<< "  -doc";
-    printOptionUsage
-    (
-        6,
-        "display application documentation in browser"
-    );
+    printOptionUsage(6, "display application documentation in browser");
 
     Info<< "  -help";
-    printOptionUsage
-    (
-        7,
-        "print the usage"
-    );
-
+    printOptionUsage(7, "print the usage");
 
     printNotes();
 
@@ -1247,7 +1209,7 @@ void Foam::argList::printUsage() const
         <<"Using: OpenFOAM-" << Foam::FOAMversion
         << " (see www.OpenFOAM.com)" << nl
         << "Build: " << Foam::FOAMbuild << nl
-        << "Arch:  " << archHint << nl
+        << "Arch:  " << Foam::FOAMbuildArch << nl
         << endl;
 }
 
@@ -1261,20 +1223,20 @@ void Foam::argList::displayDoc(bool source) const
     // For source code: change foo_8C.html to foo_8C_source.html
     if (source)
     {
-        forAll(docExts, extI)
+        for (fileName& ext : docExts)
         {
-            docExts[extI].replace(".", "_source.");
+            ext.replace(".", "_source.");
         }
     }
 
     fileName docFile;
     bool found = false;
 
-    forAll(docDirs, dirI)
+    for (const fileName& dir : docDirs)
     {
-        forAll(docExts, extI)
+        for (const fileName& ext : docExts)
         {
-            docFile = docDirs[dirI]/executable_ + docExts[extI];
+            docFile = dir/executable_ + ext;
             docFile.expand();
 
             if (isFile(docFile))
diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H
index bd3386e786..3b5d9fcb46 100644
--- a/src/OpenFOAM/global/foamVersion.H
+++ b/src/OpenFOAM/global/foamVersion.H
@@ -32,13 +32,20 @@ Global
     Foam::FOAMversion
 
 Description
-    OpenFOAM version number static string.
+    OpenFOAM version number as a static string.
 
 Global
     Foam::FOAMbuild
 
 Description
-    OpenFOAM version number static string with build information
+    OpenFOAM build information as a static string
+
+Global
+    Foam::FOAMbuildArch
+
+Description
+    OpenFOAM build architecture information (endian, label/scalar sizes)
+    as a static string
 
 SourceFiles
     global.Cver
@@ -48,6 +55,8 @@ SourceFiles
 #ifndef foamVersion_H
 #define foamVersion_H
 
+#include <string>
+
 // The directory name for user-resources (located in the HOME directory)
 #define WM_USER_RESOURCE_DIRNAME  ".OpenFOAM"
 
@@ -57,6 +66,7 @@ namespace Foam
 {
     extern const char* const FOAMversion;
     extern const char* const FOAMbuild;
+    extern const std::string FOAMbuildArch;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/global/global.Cver b/src/OpenFOAM/global/global.Cver
index a868495556..0c9f3fdf31 100644
--- a/src/OpenFOAM/global/global.Cver
+++ b/src/OpenFOAM/global/global.Cver
@@ -33,10 +33,30 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #include "foamVersion.H"
+#include "endian.H"
+#include "label.H"
+#include "scalar.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const char* const Foam::FOAMversion = "VERSION_STRING";
 const char* const Foam::FOAMbuild = "BUILD_STRING";
 
+// Information about machine endian, label and scalar sizes
+const std::string Foam::FOAMbuildArch =
+(
+#ifdef WM_LITTLE_ENDIAN
+    "LSB"
+#elif defined (WM_BIG_ENDIAN)
+    "MSB"
+#else
+    "???"
+#endif
+    ";label="  + std::to_string(8*sizeof(Foam::label))
+  + ";scalar=" + std::to_string(8*sizeof(Foam::scalar))
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Setup an error handler for the global new operator
 
diff --git a/src/OpenFOAM/global/unitConversion/unitConversion.H b/src/OpenFOAM/global/unitConversion/unitConversion.H
index 499ecd6aab..1308947e2d 100644
--- a/src/OpenFOAM/global/unitConversion/unitConversion.H
+++ b/src/OpenFOAM/global/unitConversion/unitConversion.H
@@ -53,6 +53,18 @@ inline constexpr scalar radToDeg(const scalar rad) noexcept
     return (rad*180.0/M_PI);
 }
 
+//- Multiplication factor for degrees to radians conversion
+inline constexpr scalar degToRad() noexcept
+{
+    return (M_PI/180.0);
+}
+
+//- Multiplication factor for radians to degrees conversion
+inline constexpr scalar radToDeg() noexcept
+{
+    return (180.0/M_PI);
+}
+
 //- Conversion from atm to Pa
 inline constexpr scalar atmToPa(const scalar atm) noexcept
 {
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
index 01c0aaa959..d4c4cca0d0 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
@@ -55,7 +55,7 @@ template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable()
 :
     List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
-    boundsHandling_(interpolation2DTable::WARN),
+    bounding_(bounds::normalBounding::WARN),
     fileName_("fileNameIsUndefined"),
     reader_(nullptr)
 {}
@@ -65,12 +65,12 @@ template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable
 (
     const List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& values,
-    const boundsHandling bounds,
+    const bounds::normalBounding bounding,
     const fileName& fName
 )
 :
     List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(values),
-    boundsHandling_(bounds),
+    bounding_(bounding),
     fileName_(fName),
     reader_(nullptr)
 {}
@@ -80,7 +80,7 @@ template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable(const fileName& fName)
 :
     List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
-    boundsHandling_(interpolation2DTable::WARN),
+    bounding_(bounds::normalBounding::WARN),
     fileName_(fName),
     reader_(new openFoamTableReader<Type>(dictionary()))
 {
@@ -92,7 +92,15 @@ template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable(const dictionary& dict)
 :
     List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
-    boundsHandling_(wordToBoundsHandling(dict.lookup("outOfBounds"))),
+    bounding_
+    (
+        bounds::normalBoundingNames.lookupOrFailsafe
+        (
+            "outOfBounds",
+            dict,
+            bounds::normalBounding::WARN
+        )
+    ),
     fileName_(dict.lookup("file")),
     reader_(tableReader<Type>::New(dict))
 {
@@ -107,7 +115,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
 )
 :
     List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(interpTable),
-    boundsHandling_(interpTable.boundsHandling_),
+    bounding_(interpTable.bounding_),
     fileName_(interpTable.fileName_),
     reader_(interpTable.reader_)    // note: steals reader. Used in write().
 {}
@@ -130,9 +138,9 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
 
     if (lookupValue < minLimit)
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolation2DTable::ERROR:
+            case bounds::normalBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << lookupValue << ") less than lower "
@@ -140,18 +148,18 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
                     << exit(FatalError);
                 break;
             }
-            case interpolation2DTable::WARN:
+            case bounds::normalBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << lookupValue << ") less than lower "
                     << "bound (" << minLimit << ")" << nl
                     << "    Continuing with the first entry"
                     << endl;
-                // Behaviour as per 'CLAMP'
+                // Behaviour as per CLAMP
                 return data.first().second();
                 break;
             }
-            case interpolation2DTable::CLAMP:
+            case bounds::normalBounding::CLAMP:
             {
                 return data.first().second();
                 break;
@@ -160,9 +168,9 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
     }
     else if (lookupValue >= maxLimit)
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolation2DTable::ERROR:
+            case bounds::normalBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << lookupValue << ") greater than upper "
@@ -170,18 +178,18 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
                     << exit(FatalError);
                 break;
             }
-            case interpolation2DTable::WARN:
+            case bounds::normalBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << lookupValue << ") greater than upper "
                     << "bound (" << maxLimit << ")" << nl
                     << "    Continuing with the last entry"
                     << endl;
-                // Behaviour as per 'CLAMP'
+                // Behaviour as per CLAMP
                 return data.last().second();
                 break;
             }
-            case interpolation2DTable::CLAMP:
+            case bounds::normalBounding::CLAMP:
             {
                 return data.last().second();
                 break;
@@ -241,25 +249,25 @@ Foam::label Foam::interpolation2DTable<Type>::Xi
 
     if (bop(valueX, t[limitI].first()))
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolation2DTable::ERROR:
+            case bounds::normalBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << valueX << ") out of bounds"
                     << exit(FatalError);
                 break;
             }
-            case interpolation2DTable::WARN:
+            case bounds::normalBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << valueX << ") out of bounds"
                     << endl;
-                // Behaviour as per 'CLAMP'
+                // Behaviour as per CLAMP
                 return limitI;
                 break;
             }
-            case interpolation2DTable::CLAMP:
+            case bounds::normalBounding::CLAMP:
             {
                 return limitI;
                 break;
@@ -267,7 +275,7 @@ Foam::label Foam::interpolation2DTable<Type>::Xi
             default:
             {
                 FatalErrorInFunction
-                    << "Unhandled enumeration " << boundsHandling_
+                    << "Unhandled bounding type " << int(bounding_)
                     << abort(FatalError);
             }
         }
@@ -351,79 +359,6 @@ Type Foam::interpolation2DTable<Type>::operator()
 }
 
 
-template<class Type>
-Foam::word Foam::interpolation2DTable<Type>::boundsHandlingToWord
-(
-     const boundsHandling& bound
-) const
-{
-    word enumName("warn");
-
-    switch (bound)
-    {
-        case interpolation2DTable::ERROR:
-        {
-            enumName = "error";
-            break;
-        }
-        case interpolation2DTable::WARN:
-        {
-            enumName = "warn";
-            break;
-        }
-        case interpolation2DTable::CLAMP:
-        {
-            enumName = "clamp";
-            break;
-        }
-    }
-
-    return enumName;
-}
-
-
-template<class Type>
-typename Foam::interpolation2DTable<Type>::boundsHandling
-Foam::interpolation2DTable<Type>::wordToBoundsHandling
-(
-    const word& bound
-) const
-{
-    if (bound == "error")
-    {
-        return interpolation2DTable::ERROR;
-    }
-    else if (bound == "warn")
-    {
-        return interpolation2DTable::WARN;
-    }
-    else if (bound == "clamp")
-    {
-        return interpolation2DTable::CLAMP;
-    }
-    else
-    {
-        WarningInFunction
-            << "bad outOfBounds specifier " << bound << " using 'warn'" << endl;
-
-        return interpolation2DTable::WARN;
-    }
-}
-
-
-template<class Type>
-typename Foam::interpolation2DTable<Type>::boundsHandling
-Foam::interpolation2DTable<Type>::outOfBounds
-(
-    const boundsHandling& bound
-)
-{
-    boundsHandling prev = boundsHandling_;
-    boundsHandling_ = bound;
-    return prev;
-}
-
-
 template<class Type>
 void Foam::interpolation2DTable<Type>::checkOrder() const
 {
@@ -453,7 +388,7 @@ template<class Type>
 void Foam::interpolation2DTable<Type>::write(Ostream& os) const
 {
     os.writeEntry("file", fileName_);
-    os.writeEntry("outOfBounds", boundsHandlingToWord(boundsHandling_));
+    os.writeEntry("outOfBounds", bounds::normalBoundingNames[bounding_]);
 
     os  << *this;
 }
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
index e38b0a979a..5c4eb31057 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
@@ -38,6 +38,7 @@ SourceFiles
 
 #include "List.H"
 #include "Tuple2.H"
+#include "tableBounds.H"
 #include "tableReader.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,14 +59,6 @@ public:
 
     // Public data types
 
-        //- Enumeration for handling out-of-bound values
-        enum boundsHandling
-        {
-            ERROR,          //!< Exit with a FatalError
-            WARN,           //!< Issue warning and clamp value (default)
-            CLAMP           //!< Clamp value to the start/end value
-        };
-
         //- Convenience typedef
         typedef List<Tuple2<scalar, List<Tuple2<scalar, Type>>>> table;
 
@@ -74,8 +67,8 @@ private:
 
     // Private data
 
-        //- Enumeration for handling out-of-bound values
-        boundsHandling boundsHandling_;
+        //- Handling for out-of-bound values
+        bounds::normalBounding bounding_;
 
         //- File name
         fileName fileName_;
@@ -117,14 +110,14 @@ public:
         interpolation2DTable
         (
             const List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& values,
-            const boundsHandling bounds,
+            const bounds::normalBounding bounding,
             const fileName& fName
         );
 
         //- Construct given the name of the file containing the table of data
         interpolation2DTable(const fileName& fName);
 
-        //- Construct by reading the fileName and boundsHandling from dictionary
+        //- Construct by reading file name and outOfBounds from dictionary
         interpolation2DTable(const dictionary& dict);
 
         //- Construct copy
@@ -133,15 +126,6 @@ public:
 
     // Member Functions
 
-        //- Return the out-of-bounds handling as a word
-        word boundsHandlingToWord(const boundsHandling& bound) const;
-
-        //- Return the out-of-bounds handling as an enumeration
-        boundsHandling wordToBoundsHandling(const word& bound) const;
-
-        //- Set the out-of-bounds handling from enum, return previous setting
-        boundsHandling outOfBounds(const boundsHandling& bound);
-
         //- Check that list is monotonically increasing
         //  Exit with a FatalError if there is a problem
         void checkOrder() const;
@@ -152,7 +136,7 @@ public:
 
     // Member Operators
 
-        //- Return an element of constant Tuple2<scalar, Type>
+        //- Return an element of constant List<Tuple2<scalar, Type>>
         const List<Tuple2<scalar, Type>>& operator[](const label) const;
 
         //- Return an interpolated value
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
index 695e13dca4..012e47d2fd 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
@@ -59,7 +59,7 @@ template<class Type>
 Foam::interpolationTable<Type>::interpolationTable()
 :
     List<Tuple2<scalar, Type>>(),
-    boundsHandling_(interpolationTable::WARN),
+    bounding_(bounds::repeatableBounding::WARN),
     fileName_("fileNameIsUndefined"),
     reader_(nullptr)
 {}
@@ -69,12 +69,12 @@ template<class Type>
 Foam::interpolationTable<Type>::interpolationTable
 (
     const List<Tuple2<scalar, Type>>& values,
-    const boundsHandling bounds,
+    const bounds::repeatableBounding bounding,
     const fileName& fName
 )
 :
     List<Tuple2<scalar, Type>>(values),
-    boundsHandling_(bounds),
+    bounding_(bounding),
     fileName_(fName),
     reader_(nullptr)
 {}
@@ -84,7 +84,7 @@ template<class Type>
 Foam::interpolationTable<Type>::interpolationTable(const fileName& fName)
 :
     List<Tuple2<scalar, Type>>(),
-    boundsHandling_(interpolationTable::WARN),
+    bounding_(bounds::repeatableBounding::WARN),
     fileName_(fName),
     reader_(new openFoamTableReader<Type>(dictionary()))
 {
@@ -96,7 +96,15 @@ template<class Type>
 Foam::interpolationTable<Type>::interpolationTable(const dictionary& dict)
 :
     List<Tuple2<scalar, Type>>(),
-    boundsHandling_(wordToBoundsHandling(dict.lookup("outOfBounds"))),
+    bounding_
+    (
+        bounds::repeatableBoundingNames.lookupOrFailsafe
+        (
+            "outOfBounds",
+            dict,
+            bounds::repeatableBounding::WARN
+        )
+    ),
     fileName_(dict.lookup("file")),
     reader_(tableReader<Type>::New(dict))
 {
@@ -111,7 +119,7 @@ Foam::interpolationTable<Type>::interpolationTable
 )
 :
     List<Tuple2<scalar, Type>>(interpTable),
-    boundsHandling_(interpTable.boundsHandling_),
+    bounding_(interpTable.bounding_),
     fileName_(interpTable.fileName_),
     reader_(interpTable.reader_)    // note: steals reader. Used in write().
 {}
@@ -120,88 +128,6 @@ Foam::interpolationTable<Type>::interpolationTable
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::word Foam::interpolationTable<Type>::boundsHandlingToWord
-(
-     const boundsHandling& bound
-) const
-{
-    word enumName("warn");
-
-    switch (bound)
-    {
-        case interpolationTable::ERROR:
-        {
-            enumName = "error";
-            break;
-        }
-        case interpolationTable::WARN:
-        {
-            enumName = "warn";
-            break;
-        }
-        case interpolationTable::CLAMP:
-        {
-            enumName = "clamp";
-            break;
-        }
-        case interpolationTable::REPEAT:
-        {
-            enumName = "repeat";
-            break;
-        }
-    }
-
-    return enumName;
-}
-
-
-template<class Type>
-typename Foam::interpolationTable<Type>::boundsHandling
-Foam::interpolationTable<Type>::wordToBoundsHandling
-(
-    const word& bound
-) const
-{
-    if (bound == "error")
-    {
-        return interpolationTable::ERROR;
-    }
-    else if (bound == "warn")
-    {
-        return interpolationTable::WARN;
-    }
-    else if (bound == "clamp")
-    {
-        return interpolationTable::CLAMP;
-    }
-    else if (bound == "repeat")
-    {
-        return interpolationTable::REPEAT;
-    }
-    else
-    {
-        WarningInFunction
-            << "bad outOfBounds specifier " << bound << " using 'warn'" << endl;
-
-        return interpolationTable::WARN;
-    }
-}
-
-
-template<class Type>
-typename Foam::interpolationTable<Type>::boundsHandling
-Foam::interpolationTable<Type>::outOfBounds
-(
-    const boundsHandling& bound
-)
-{
-    boundsHandling prev = boundsHandling_;
-    boundsHandling_ = bound;
-    return prev;
-}
-
-
 template<class Type>
 void Foam::interpolationTable<Type>::check() const
 {
@@ -230,7 +156,7 @@ template<class Type>
 void Foam::interpolationTable<Type>::write(Ostream& os) const
 {
     os.writeEntry("file", fileName_);
-    os.writeEntry("outOfBounds", boundsHandlingToWord(boundsHandling_));
+    os.writeEntry("outOfBounds", bounds::repeatableBoundingNames[bounding_]);
     if (reader_.valid())
     {
         reader_->write(os);
@@ -255,33 +181,33 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
 
     if (lookupValue < minLimit)
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolationTable::ERROR:
+            case bounds::repeatableBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << lookupValue << ") underflow" << nl
                     << exit(FatalError);
                 break;
             }
-            case interpolationTable::WARN:
+            case bounds::repeatableBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << lookupValue << ") underflow" << nl
                     << "    Zero rate of change."
                     << endl;
-                // behaviour as per 'CLAMP'
+                // Behaviour as per CLAMP
                 return 0;
                 break;
             }
-            case interpolationTable::CLAMP:
+            case bounds::repeatableBounding::CLAMP:
             {
                 return 0;
                 break;
             }
-            case interpolationTable::REPEAT:
+            case bounds::repeatableBounding::REPEAT:
             {
-                // adjust lookupValue to >= minLimit
+                // Adjust lookupValue to >= minLimit
                 scalar span = maxLimit-minLimit;
                 lookupValue = fmod(lookupValue-minLimit, span) + minLimit;
                 break;
@@ -290,33 +216,33 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
     }
     else if (lookupValue >= maxLimit)
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolationTable::ERROR:
+            case bounds::repeatableBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << lookupValue << ") overflow" << nl
                     << exit(FatalError);
                 break;
             }
-            case interpolationTable::WARN:
+            case bounds::repeatableBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << lookupValue << ") overflow" << nl
                     << "    Zero rate of change."
                     << endl;
-                // Behaviour as per 'CLAMP'
+                // Behaviour as per CLAMP
                 return 0;
                 break;
             }
-            case interpolationTable::CLAMP:
+            case bounds::repeatableBounding::CLAMP:
             {
                 return 0;
                 break;
             }
-            case interpolationTable::REPEAT:
+            case bounds::repeatableBounding::REPEAT:
             {
-                // adjust lookupValue <= maxLimit
+                // Adjust lookupValue <= maxLimit
                 scalar span = maxLimit-minLimit;
                 lookupValue = fmod(lookupValue-minLimit, span) + minLimit;
                 break;
@@ -401,16 +327,16 @@ Foam::interpolationTable<Type>::operator[](const label i) const
     }
     else if (ii < 0)
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolationTable::ERROR:
+            case bounds::repeatableBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "index (" << ii << ") underflow" << nl
                     << exit(FatalError);
                 break;
             }
-            case interpolationTable::WARN:
+            case bounds::repeatableBounding::WARN:
             {
                 WarningInFunction
                     << "index (" << ii << ") underflow" << nl
@@ -420,12 +346,12 @@ Foam::interpolationTable<Type>::operator[](const label i) const
                 ii = 0;
                 break;
             }
-            case interpolationTable::CLAMP:
+            case bounds::repeatableBounding::CLAMP:
             {
                 ii = 0;
                 break;
             }
-            case interpolationTable::REPEAT:
+            case bounds::repeatableBounding::REPEAT:
             {
                 while (ii < 0)
                 {
@@ -437,16 +363,16 @@ Foam::interpolationTable<Type>::operator[](const label i) const
     }
     else if (ii >= n)
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolationTable::ERROR:
+            case bounds::repeatableBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "index (" << ii << ") overflow" << nl
                     << exit(FatalError);
                 break;
             }
-            case interpolationTable::WARN:
+            case bounds::repeatableBounding::WARN:
             {
                 WarningInFunction
                     << "index (" << ii << ") overflow" << nl
@@ -456,12 +382,12 @@ Foam::interpolationTable<Type>::operator[](const label i) const
                 ii = n - 1;
                 break;
             }
-            case interpolationTable::CLAMP:
+            case bounds::repeatableBounding::CLAMP:
             {
                 ii = n - 1;
                 break;
             }
-            case interpolationTable::REPEAT:
+            case bounds::repeatableBounding::REPEAT:
             {
                 while (ii >= n)
                 {
@@ -492,31 +418,31 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
 
     if (lookupValue < minLimit)
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolationTable::ERROR:
+            case bounds::repeatableBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << lookupValue << ") underflow" << nl
                     << exit(FatalError);
                 break;
             }
-            case interpolationTable::WARN:
+            case bounds::repeatableBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << lookupValue << ") underflow" << nl
                     << "    Continuing with the first entry"
                     << endl;
-                // Behaviour as per 'CLAMP'
+                // Behaviour as per CLAMP
                 return this->first().second();
                 break;
             }
-            case interpolationTable::CLAMP:
+            case bounds::repeatableBounding::CLAMP:
             {
                 return this->first().second();
                 break;
             }
-            case interpolationTable::REPEAT:
+            case bounds::repeatableBounding::REPEAT:
             {
                 // adjust lookupValue to >= minLimit
                 const scalar span = maxLimit-minLimit;
@@ -527,16 +453,16 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
     }
     else if (lookupValue >= maxLimit)
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case interpolationTable::ERROR:
+            case bounds::repeatableBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << lookupValue << ") overflow" << nl
                     << exit(FatalError);
                 break;
             }
-            case interpolationTable::WARN:
+            case bounds::repeatableBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << lookupValue << ") overflow" << nl
@@ -546,12 +472,12 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
                 return this->last().second();
                 break;
             }
-            case interpolationTable::CLAMP:
+            case bounds::repeatableBounding::CLAMP:
             {
                 return this->last().second();
                 break;
             }
-            case interpolationTable::REPEAT:
+            case bounds::repeatableBounding::REPEAT:
             {
                 // adjust lookupValue <= maxLimit
                 const scalar span = maxLimit-minLimit;
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
index 09f2e74442..e75040703e 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
@@ -64,6 +64,7 @@ SourceFiles
 #include "List.H"
 #include "Tuple2.H"
 
+#include "tableBounds.H"
 #include "tableReader.H"
 #include "autoPtr.H"
 
@@ -81,26 +82,10 @@ class interpolationTable
 :
     public List<Tuple2<scalar, Type>>
 {
-public:
-
-    // Public data types
-
-        //- Enumeration for handling out-of-bound values
-        enum boundsHandling
-        {
-            ERROR,          //!< Exit with a FatalError
-            WARN,           //!< Issue warning and clamp value (default)
-            CLAMP,          //!< Clamp value to the start/end value
-            REPEAT          //!< Treat as a repeating list
-        };
-
-
-private:
-
     // Private data
 
-        //- Enumeration for handling out-of-bound values
-        boundsHandling boundsHandling_;
+        //- Handling for out-of-bound values
+        bounds::repeatableBounding bounding_;
 
         //- File name
         fileName fileName_;
@@ -108,6 +93,7 @@ private:
         //- The actual reader
         autoPtr<tableReader<Type>> reader_;
 
+
     // Private Member Functions
 
         //- Read the table of data from file
@@ -125,14 +111,14 @@ public:
         interpolationTable
         (
             const List<Tuple2<scalar, Type>>& values,
-            const boundsHandling bounds,
+            const bounds::repeatableBounding bounding,
             const fileName& fName
         );
 
         //- Construct given the name of the file containing the table of data
         interpolationTable(const fileName& fName);
 
-        //- Construct by reading the fileName and boundsHandling from dictionary
+        //- Construct by reading file name and outOfBounds from dictionary
         //  and read the table from that file.
         //  This is a specialised constructor used by patchFields
         interpolationTable(const dictionary& dict);
@@ -143,15 +129,6 @@ public:
 
     // Member Functions
 
-        //- Return the out-of-bounds handling as a word
-        word boundsHandlingToWord(const boundsHandling& bound) const;
-
-        //- Return the out-of-bounds handling as an enumeration
-        boundsHandling wordToBoundsHandling(const word& bound) const;
-
-        //- Set the out-of-bounds handling from enum, return previous setting
-        boundsHandling outOfBounds(const boundsHandling& bound);
-
         //- Check that list is monotonically increasing
         //  Exit with a FatalError if there is a problem
         void check() const;
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 9a8c7f9aea..5abac0fa3e 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -35,9 +35,9 @@ namespace Foam
 
 // List of sub-dictionaries to rewrite
 static const Foam::List<Foam::word> subDictNames
-(
-    Foam::IStringStream("(preconditioner smoother)")()
-);
+{
+    "preconditioner", "smoother"
+};
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
index 82d03af310..7e58126c4d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -1276,7 +1276,7 @@ void Foam::mapDistributeBase::distribute
 {
     fld.shrink();
 
-    List<T>& fldList = static_cast<List<T>& >(fld);
+    List<T>& fldList = static_cast<List<T>&>(fld);
 
     distribute(fldList, tag);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 4f3133a038..e3cc9d68ff 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -167,7 +167,7 @@ void Foam::mapDistribute::distribute
 {
     fld.shrink();
 
-    List<T>& fldList = static_cast<List<T>& >(fld);
+    List<T>& fldList = static_cast<List<T>&>(fld);
 
     distribute(fldList, dummyTransform, tag);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index 343461da42..4090f6eafa 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -35,22 +35,23 @@ namespace Foam
     defineTypeNameAndDebug(coupledPolyPatch, 0);
 
     const scalar coupledPolyPatch::defaultMatchTol_ = 1e-4;
-
-    template<>
-    const char* NamedEnum<coupledPolyPatch::transformType, 5>::names[] =
-    {
-        "unknown",
-        "rotational",
-        "translational",
-        "coincidentFullMatch",
-        "noOrdering"
-    };
-
-    const NamedEnum<coupledPolyPatch::transformType, 5>
-        coupledPolyPatch::transformTypeNames;
 }
 
 
+const Foam::Enum
+<
+    Foam::coupledPolyPatch::transformType
+>
+Foam::coupledPolyPatch::transformTypeNames
+{
+    { transformType::UNKNOWN, "unknown" },
+    { transformType::ROTATIONAL, "rotational" },
+    { transformType::TRANSLATIONAL, "translational" },
+    { transformType::COINCIDENTFULLMATCH, "coincidentFullMatch" },
+    { transformType::NOORDERING, "noOrdering" },
+};
+
+
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::coupledPolyPatch::writeOBJ(Ostream& os, const point& pt)
@@ -500,9 +501,12 @@ Foam::coupledPolyPatch::coupledPolyPatch
     matchTolerance_(dict.lookupOrDefault("matchTolerance", defaultMatchTol_)),
     transform_
     (
-        dict.found("transform")
-      ? transformTypeNames.read(dict.lookup("transform"))
-      : UNKNOWN
+        transformTypeNames.lookupOrDefault
+        (
+            "transform",
+            dict,
+            transformType::UNKNOWN
+        )
     )
 {}
 
@@ -562,10 +566,8 @@ void Foam::coupledPolyPatch::write(Ostream& os) const
     polyPatch::write(os);
     //if (matchTolerance_ != defaultMatchTol_)
     {
-        os.writeKeyword("matchTolerance") << matchTolerance_
-            << token::END_STATEMENT << nl;
-        os.writeKeyword("transform") << transformTypeNames[transform_]
-            << token::END_STATEMENT << nl;
+        os.writeEntry("matchTolerance", matchTolerance_);
+        os.writeEntry("transform", transformTypeNames[transform_]);
     }
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index 9c761907af..0be8978f73 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -65,7 +65,7 @@ public:
         NOORDERING          // unspecified, no automatic ordering
     };
 
-    static const NamedEnum<transformType, 5> transformTypeNames;
+    static const Enum<transformType> transformTypeNames;
 
 
 private:
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
index ffc7dd49f1..11392de2dd 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
@@ -29,37 +29,27 @@ License
 
 Foam::scalar Foam::intersection::planarTol_ = 0.2;
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::intersection::direction
+>
+Foam::intersection::directionNames_
 {
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::intersection::direction,
-        2
-    >::names[] =
-    {
-        "vector",
-        "contactSphere"
-    };
+    { intersection::direction::VECTOR, "vector" },
+    { intersection::direction::CONTACT_SPHERE, "contactSphere" },
+};
 
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::intersection::algorithm,
-        3
-    >::names[] =
-    {
-        "fullRay",
-        "halfRay",
-        "visible"
-    };
-}
 
-const Foam::NamedEnum<Foam::intersection::direction, 2>
-Foam::intersection::directionNames_;
-
-const Foam::NamedEnum<Foam::intersection::algorithm, 3>
-Foam::intersection::algorithmNames_;
+const Foam::Enum
+<
+    Foam::intersection::algorithm
+>
+Foam::intersection::algorithmNames_
+{
+    { intersection::algorithm::FULL_RAY, "fullRay" },
+    { intersection::algorithm::HALF_RAY, "halfRay" },
+    { intersection::algorithm::VISIBLE, "visible" },
+};
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
index 6051b36c42..330a985b01 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,7 @@ Description
     Foam::intersection
 
 SourceFiles
-   intersection.C
+    intersection.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -36,7 +36,7 @@ SourceFiles
 #define intersection_H
 
 #include "scalar.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,10 +77,10 @@ public:
     // Static Member Functions
 
         //- Direction names
-        static const NamedEnum<direction, 2> directionNames_;
+        static const Enum<direction> directionNames_;
 
         //- Projection algorithm names
-        static const NamedEnum<algorithm, 3> algorithmNames_;
+        static const Enum<algorithm> algorithmNames_;
 
         //- Return planar tolerance
         static scalar planarTol()
diff --git a/src/OpenFOAM/orientedType/orientedType.C b/src/OpenFOAM/orientedType/orientedType.C
index 4a04453ac0..eac0f9527d 100644
--- a/src/OpenFOAM/orientedType/orientedType.C
+++ b/src/OpenFOAM/orientedType/orientedType.C
@@ -27,23 +27,16 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::orientedType::orientedOption
+>
+Foam::orientedType::orientedOptionNames
 {
-    template<>
-    const char* NamedEnum
-    <
-        orientedType::orientedOption,
-        3
-    >::names[] =
-    {
-        "oriented",
-        "unoriented",
-        "unknown"
-    };
-}
-
-const Foam::NamedEnum<Foam::orientedType::orientedOption, 3>
-    Foam::orientedType::orientedOptionNames;
+    { orientedOption::ORIENTED, "oriented" },
+    { orientedOption::UNORIENTED, "unoriented" },
+    { orientedOption::UNKNOWN, "unknown" },
+};
 
 
 bool Foam::orientedType::checkType
@@ -118,14 +111,12 @@ void Foam::orientedType::setOriented(const bool oriented)
 
 void Foam::orientedType::read(const dictionary& dict)
 {
-    if (dict.found("oriented"))
-    {
-        oriented_ = orientedOptionNames.read(dict.lookup("oriented"));
-    }
-    else
-    {
-        oriented_ = UNKNOWN;
-    }
+    oriented_ = orientedOptionNames.lookupOrDefault
+    (
+        "oriented",
+        dict,
+        orientedOption::UNKNOWN
+    );
 }
 
 
diff --git a/src/OpenFOAM/orientedType/orientedType.H b/src/OpenFOAM/orientedType/orientedType.H
index d050f71dcb..31805f4a0d 100644
--- a/src/OpenFOAM/orientedType/orientedType.H
+++ b/src/OpenFOAM/orientedType/orientedType.H
@@ -38,7 +38,7 @@ SourceFiles
 #include "Istream.H"
 #include "Ostream.H"
 #include "dictionary.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,9 +49,9 @@ namespace Foam
 
 class orientedType;
 
-Istream& operator>>(Istream&, orientedType&);
+Istream& operator>>(Istream& is, orientedType& ot);
 
-Ostream& operator<<(Ostream&, const orientedType&);
+Ostream& operator<<(Ostream& os, const orientedType& ot);
 
 /*---------------------------------------------------------------------------*\
                         Class orientedType Declaration
@@ -71,7 +71,7 @@ public:
             UNKNOWN
         };
 
-        static const NamedEnum<orientedOption, 3> orientedOptionNames;
+        static const Enum<orientedOption> orientedOptionNames;
 
 
 private:
diff --git a/src/OpenFOAM/primitives/enums/Enum.C b/src/OpenFOAM/primitives/enums/Enum.C
index 8b4f2100f0..76f1323b8a 100644
--- a/src/OpenFOAM/primitives/enums/Enum.C
+++ b/src/OpenFOAM/primitives/enums/Enum.C
@@ -215,10 +215,37 @@ EnumType Foam::Enum<EnumType>::lookupOrDefault
     {
         return lookup(key, dict);
     }
-    else
+
+    return deflt;
+}
+
+
+template<class EnumType>
+EnumType Foam::Enum<EnumType>::lookupOrFailsafe
+(
+    const word& key,
+    const dictionary& dict,
+    const EnumType deflt
+) const
+{
+    if (dict.found(key))
     {
-        return deflt;
+        const word enumName(dict.lookup(key));
+        const label idx = getIndex(enumName);
+
+        if (idx < 0)
+        {
+            IOWarningInFunction(dict)
+                << "bad " << key <<" specifier " << enumName
+                << " using " << getName(deflt) << endl;
+        }
+        else
+        {
+            return EnumType(values_[idx]);
+        }
     }
+
+    return deflt;
 }
 
 
diff --git a/src/OpenFOAM/primitives/enums/Enum.H b/src/OpenFOAM/primitives/enums/Enum.H
index dde620fb26..b57fc9891a 100644
--- a/src/OpenFOAM/primitives/enums/Enum.H
+++ b/src/OpenFOAM/primitives/enums/Enum.H
@@ -161,6 +161,18 @@ public:
         ) const;
 
 
+        //- Find the key in the dictionary and return the corresponding
+        //  enumeration element based on its name.
+        //  Return the default value if the key was not found in the dictionary
+        //  or if the enumerated name was incorrect (emit warning)
+        EnumType lookupOrFailsafe
+        (
+            const word& key,
+            const dictionary& dict,
+            const EnumType deflt
+        ) const;
+
+
       // IO
 
         //- Read a word from Istream and return the corresponding enumeration
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 02d3b186ef..eb3bdbf0de 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -64,11 +64,13 @@ Foam::Function1Types::TableBase<Type>::TableBase
 :
     Function1<Type>(name),
     name_(name),
-    boundsHandling_
+    bounding_
     (
-        wordToBoundsHandling
+        bounds::repeatableBoundingNames.lookupOrFailsafe
         (
-            dict.lookupOrDefault<word>("outOfBounds", "clamp")
+            "outOfBounds",
+            dict,
+            bounds::repeatableBounding::CLAMP
         )
     ),
     interpolationScheme_
@@ -84,7 +86,7 @@ Foam::Function1Types::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 :
     Function1<Type>(tbl),
     name_(tbl.name_),
-    boundsHandling_(tbl.boundsHandling_),
+    bounding_(tbl.bounding_),
     interpolationScheme_(tbl.interpolationScheme_),
     table_(tbl.table_),
     tableSamplesPtr_(tbl.tableSamplesPtr_),
@@ -101,90 +103,6 @@ Foam::Function1Types::TableBase<Type>::~TableBase()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::word Foam::Function1Types::TableBase<Type>::boundsHandlingToWord
-(
-     const boundsHandling& bound
-) const
-{
-    word enumName("warn");
-
-    switch (bound)
-    {
-        case ERROR:
-        {
-            enumName = "error";
-            break;
-        }
-        case WARN:
-        {
-            enumName = "warn";
-            break;
-        }
-        case CLAMP:
-        {
-            enumName = "clamp";
-            break;
-        }
-        case REPEAT:
-        {
-            enumName = "repeat";
-            break;
-        }
-    }
-
-    return enumName;
-}
-
-
-template<class Type>
-typename Foam::Function1Types::TableBase<Type>::boundsHandling
-Foam::Function1Types::TableBase<Type>::wordToBoundsHandling
-(
-    const word& bound
-) const
-{
-    if (bound == "error")
-    {
-        return ERROR;
-    }
-    else if (bound == "warn")
-    {
-        return WARN;
-    }
-    else if (bound == "clamp")
-    {
-        return CLAMP;
-    }
-    else if (bound == "repeat")
-    {
-        return REPEAT;
-    }
-    else
-    {
-        WarningInFunction
-            << "bad outOfBounds specifier " << bound << " using 'warn'"
-            << endl;
-
-        return WARN;
-    }
-}
-
-
-template<class Type>
-typename Foam::Function1Types::TableBase<Type>::boundsHandling
-Foam::Function1Types::TableBase<Type>::outOfBounds
-(
-    const boundsHandling& bound
-)
-{
-    boundsHandling prev = boundsHandling_;
-    boundsHandling_ = bound;
-
-    return prev;
-}
-
-
 template<class Type>
 void Foam::Function1Types::TableBase<Type>::check() const
 {
@@ -223,33 +141,33 @@ bool Foam::Function1Types::TableBase<Type>::checkMinBounds
 {
     if (x < table_.first().first())
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case ERROR:
+            case bounds::repeatableBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << x << ") underflow"
                     << exit(FatalError);
                 break;
             }
-            case WARN:
+            case bounds::repeatableBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << x << ") underflow" << nl
                     << endl;
 
-                // Behaviour as per 'CLAMP'
+                // Behaviour as per CLAMP
                 xDash = table_.first().first();
                 return true;
                 break;
             }
-            case CLAMP:
+            case bounds::repeatableBounding::CLAMP:
             {
                 xDash = table_.first().first();
                 return true;
                 break;
             }
-            case REPEAT:
+            case bounds::repeatableBounding::REPEAT:
             {
                 // adjust x to >= minX
                 const scalar span =
@@ -282,33 +200,33 @@ bool Foam::Function1Types::TableBase<Type>::checkMaxBounds
 {
     if (x > table_.last().first())
     {
-        switch (boundsHandling_)
+        switch (bounding_)
         {
-            case ERROR:
+            case bounds::repeatableBounding::ERROR:
             {
                 FatalErrorInFunction
                     << "value (" << x << ") overflow"
                     << exit(FatalError);
                 break;
             }
-            case WARN:
+            case bounds::repeatableBounding::WARN:
             {
                 WarningInFunction
                     << "value (" << x << ") overflow" << nl
                     << endl;
 
-                // Behaviour as per 'CLAMP'
+                // Behaviour as per CLAMP
                 xDash = table_.last().first();
                 return true;
                 break;
             }
-            case CLAMP:
+            case bounds::repeatableBounding::CLAMP:
             {
                 xDash = table_.last().first();
                 return true;
                 break;
             }
-            case REPEAT:
+            case bounds::repeatableBounding::REPEAT:
             {
                 // adjust x to >= minX
                 const scalar span =
@@ -427,9 +345,13 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::TableBase<Type>::y() const
 template<class Type>
 void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
 {
-    if (boundsHandling_ != CLAMP)
+    if (bounding_ != bounds::repeatableBounding::CLAMP)
     {
-        os.writeEntry("outOfBounds", boundsHandlingToWord(boundsHandling_));
+        os.writeEntry
+        (
+            "outOfBounds",
+            bounds::repeatableBoundingNames[bounding_]
+        );
     }
     if (interpolationScheme_ != "linear")
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 95c6109026..f2a26907da 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -35,6 +35,7 @@ SourceFiles
 #ifndef TableBase_H
 #define TableBase_H
 
+#include "tableBounds.H"
 #include "Function1.H"
 #include "Tuple2.H"
 
@@ -57,20 +58,6 @@ class TableBase
 :
     public Function1<Type>
 {
-public:
-
-    // Public data types
-
-        //- Enumeration for handling out-of-bound values
-        enum boundsHandling
-        {
-            ERROR,          //!< Exit with a FatalError
-            WARN,           //!< Issue warning and clamp value (default)
-            CLAMP,          //!< Clamp value to the start/end value
-            REPEAT          //!< Treat as a repeating list
-        };
-
-
 protected:
 
     // Protected data
@@ -78,8 +65,8 @@ protected:
         //- Table name
         const word name_;
 
-        //- Enumeration for handling out-of-bound values
-        const boundsHandling boundsHandling_;
+        //- Handling for out-of-bound values
+        const bounds::repeatableBounding bounding_;
 
         //- Interpolation type
         const word interpolationScheme_;
@@ -108,7 +95,7 @@ protected:
 private:
 
         //- Disallow default bitwise assignment
-        void operator=(const TableBase<Type>&);
+        void operator=(const TableBase<Type>&) = delete;
 
 
 public:
@@ -128,15 +115,6 @@ public:
 
     // Member Functions
 
-        //- Return the out-of-bounds handling as a word
-        word boundsHandlingToWord(const boundsHandling& bound) const;
-
-        //- Return the out-of-bounds handling as an enumeration
-        boundsHandling wordToBoundsHandling(const word& bound) const;
-
-        //- Set the out-of-bounds handling from enum, return previous setting
-        boundsHandling outOfBounds(const boundsHandling& bound);
-
         //- Check the table for size and consistency
         void check() const;
 
@@ -164,8 +142,8 @@ public:
         //- Write all table data in dictionary format
         virtual void writeData(Ostream& os) const;
 
-        //- Write keywords only in dictionary format. Used for non-inline
-        //  table types
+        //- Write keywords only in dictionary format.
+        //  Used for non-inline table types
         virtual void writeEntries(Ostream& os) const;
 };
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C
similarity index 65%
rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H
rename to src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C
index b4ea367451..38c8115343 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H
+++ b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.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) 2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,27 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+#include "tableBounds.H"
+
+// * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * //
+
+const Foam::Enum<Foam::bounds::normalBounding>
+Foam::bounds::normalBoundingNames
+{
+    { normalBounding::ERROR, "error" },
+    { normalBounding::WARN,  "warn" },
+    { normalBounding::CLAMP, "clamp" },
+};
+
+
+const Foam::Enum<Foam::bounds::repeatableBounding>
+Foam::bounds::repeatableBoundingNames
+{
+    { repeatableBounding::ERROR, "error" },
+    { repeatableBounding::WARN,  "warn" },
+    { repeatableBounding::CLAMP, "clamp" },
+    { repeatableBounding::REPEAT, "repeat" },
+};
+
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.H b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.H
new file mode 100644
index 0000000000..ef3e49e78e
--- /dev/null
+++ b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.H
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Namespace
+    Foam::bounds
+
+Description
+    Namespace for bounding specifications.
+    At the moment, mostly for tables.
+
+SourceFiles
+    tableBounds.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef tableBounds_H
+#define tableBounds_H
+
+#include "Enum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace bounds
+{
+
+  // Enumerations
+
+    //- Enumeration for handling out-of-bound values
+    enum class normalBounding
+    {
+        ERROR,  //!< Exit with a FatalError
+        WARN,   //!< Issue warning and clamp value (this is a good default)
+        CLAMP   //!< Clamp value to the start/end value
+    };
+
+    //- Enumeration for handling out-of-bound values that are repeatable
+    enum class repeatableBounding
+    {
+        ERROR,  //!< Exit with a FatalError
+        WARN,   //!< Issue warning and clamp value (this is a good default)
+        CLAMP,  //!< Clamp value to the start/end value
+        REPEAT  //!< Treat as a repeating list
+    };
+
+
+    //- Strings corresponding to the normalBounding
+    extern const Foam::Enum<normalBounding> normalBoundingNames;
+
+    //- Strings corresponding to the repeatableBounding
+    extern const Foam::Enum<repeatableBounding> repeatableBoundingNames;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace bounds
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/strings/word/word.C b/src/OpenFOAM/primitives/strings/word/word.C
index 2f418d721d..3d829ae61e 100644
--- a/src/OpenFOAM/primitives/strings/word/word.C
+++ b/src/OpenFOAM/primitives/strings/word/word.C
@@ -35,10 +35,10 @@ const Foam::word Foam::word::null;
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::word Foam::word::validated(const std::string& s)
+Foam::word Foam::word::validated(const std::string& s, const bool prefix)
 {
     std::string::size_type count = 0;
-    bool prefix = false;
+    bool extra = false;
 
     // Count number of valid characters and detect if the first character
     // happens to be a digit, which we'd like to avoid having since this
@@ -49,10 +49,10 @@ Foam::word Foam::word::validated(const std::string& s)
 
         if (word::valid(c))
         {
-            if (!count && isdigit(c))
+            if (prefix && !count && isdigit(c))
             {
                 // First valid character was a digit - prefix with '_'
-                prefix = true;
+                extra = true;
                 ++count;
             }
 
@@ -60,7 +60,7 @@ Foam::word Foam::word::validated(const std::string& s)
         }
     }
 
-    if (count == s.size() && !prefix)
+    if (count == s.size() && !extra)
     {
         return word(s, false);  // Already checked, can just return as word
     }
@@ -70,7 +70,7 @@ Foam::word Foam::word::validated(const std::string& s)
     count = 0;
 
     // Copy valid content.
-    if (prefix)
+    if (extra)
     {
         out[count++] = '_';
     }
diff --git a/src/OpenFOAM/primitives/strings/word/word.H b/src/OpenFOAM/primitives/strings/word/word.H
index ebff4c5235..0661255341 100644
--- a/src/OpenFOAM/primitives/strings/word/word.H
+++ b/src/OpenFOAM/primitives/strings/word/word.H
@@ -113,8 +113,9 @@ public:
         inline static bool valid(char c);
 
         //- Construct a validated word, in which all invalid characters have
-        //  been stripped out and any leading digit is '_'-prefixed.
-        static word validated(const std::string& s);
+        //  been stripped out. Normally also prefix any leading digit
+        //  with '_' to have words that work nicely as dictionary keywords.
+        static word validated(const std::string& s, const bool prefix=true);
 
 
       // File-like functions
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 1f6ebca09a..9eadaf48e2 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -29,6 +29,7 @@ License
 #include "PstreamGlobals.H"
 #include "SubList.H"
 #include "allReduce.H"
+#include "int.H"
 
 #include <mpi.h>
 
@@ -42,6 +43,12 @@ License
     #define MPI_SCALAR MPI_DOUBLE
 #endif
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+// file-scope: min value and default for mpiBufferSize
+static const int minBufferSize = 20000000;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // NOTE:
@@ -87,33 +94,32 @@ bool Foam::UPstream::init(int& argc, char**& argv)
     setParRun(numprocs);
 
     #ifndef SGIMPI
-    string bufferSizeName = getEnv("MPI_BUFFER_SIZE");
-
-    if (bufferSizeName.size())
     {
-        int bufferSize = atoi(bufferSizeName.c_str());
+        // Normally use UPstream::mpiBufferSize (optimisationSwitch),
+        // but allow override with the MPI_BUFFER_SIZE env variable
+        // which has an int value
+        int bufSize = 0;
 
-        if (bufferSize)
+        const std::string str = Foam::getEnv("MPI_BUFFER_SIZE");
+        if (str.empty() || !Foam::read(str.c_str(), bufSize) || bufSize <= 0)
         {
-            MPI_Buffer_attach(new char[bufferSize], bufferSize);
+            bufSize = mpiBufferSize;
         }
-    }
-    else
-    {
-        FatalErrorInFunction
-            << "UPstream::init(int& argc, char**& argv) : "
-            << "environment variable MPI_BUFFER_SIZE not defined"
-            << Foam::abort(FatalError);
+
+        if (bufSize < minBufferSize)
+        {
+            bufSize = minBufferSize;
+        }
+
+        if (debug)
+        {
+            Pout<< "UPstream::init : mpi-buffer-size " << bufSize << endl;
+        }
+
+        MPI_Buffer_attach(new char[bufSize], bufSize);
     }
     #endif
 
-    //int processorNameLen;
-    //char processorName[MPI_MAX_PROCESSOR_NAME];
-    //
-    //MPI_Get_processor_name(processorName, &processorNameLen);
-    //processorName[processorNameLen] = '\0';
-    //Pout<< "Processor name:" << processorName << endl;
-
     return true;
 }
 
@@ -126,10 +132,12 @@ void Foam::UPstream::exit(int errnum)
     }
 
     #ifndef SGIMPI
-    int size;
-    char* buff;
-    MPI_Buffer_detach(&buff, &size);
-    delete[] buff;
+    {
+        int size;
+        char* buff;
+        MPI_Buffer_detach(&buff, &size);
+        delete[] buff;
+    }
     #endif
 
     if (PstreamGlobals::outstandingRequests_.size())
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index d1b2383286..9663cfc2f7 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -33,27 +33,16 @@ using Foam::constant::physicoChemical::sigma;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char*
-    NamedEnum
-    <
-        externalWallHeatFluxTemperatureFvPatchScalarField::operationMode,
-        3
-    >::names[] =
-    {
-        "power",
-        "flux",
-        "coefficient"
-    };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationMode,
-    3
-> Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationModeNames;
+    Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationMode
+>
+Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationModeNames
+{
+    { operationMode::fixedPower, "power" },
+    { operationMode::fixedHeatFlux, "flux" },
+    { operationMode::fixedHeatTransferCoeff, "coefficient" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -92,7 +81,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF),
     temperatureCoupledBase(patch(), dict),
-    mode_(operationModeNames.read(dict.lookup("mode"))),
+    mode_(operationModeNames.lookup("mode", dict)),
     Q_(0),
     relaxation_(dict.lookupOrDefault<scalar>("relaxation", 1)),
     emissivity_(dict.lookupOrDefault<scalar>("emissivity", 0)),
@@ -457,17 +446,14 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
 {
     fvPatchScalarField::write(os);
 
-    os.writeKeyword("mode")
-        << operationModeNames[mode_] << token::END_STATEMENT << nl;
+    os.writeEntry("mode", operationModeNames[mode_]);
     temperatureCoupledBase::write(os);
 
     switch (mode_)
     {
         case fixedPower:
         {
-            os.writeKeyword("Q")
-                << Q_ << token::END_STATEMENT << nl;
-
+            os.writeEntry("Q", Q_);
             break;
         }
         case fixedHeatFlux:
@@ -483,14 +469,12 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
 
             if (relaxation_ < 1)
             {
-                os.writeKeyword("relaxation")
-                    << relaxation_ << token::END_STATEMENT << nl;
+                os.writeEntry("relaxation", relaxation_);
             }
 
             if (emissivity_ > 0)
             {
-                os.writeKeyword("emissivity")
-                    << emissivity_ << token::END_STATEMENT << nl;
+                os.writeEntry("emissivity", emissivity_);
             }
 
             if (thicknessLayers_.size())
@@ -503,12 +487,11 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
         }
     }
 
-    os.writeKeyword("qr")<< qrName_ << token::END_STATEMENT << nl;
+    os.writeEntry("qr", qrName_);
 
     if (qrName_ != "none")
     {
-        os.writeKeyword("qrRelaxation")
-            << qrRelaxation_ << token::END_STATEMENT << nl;
+        os.writeEntry("qrRelaxation", qrRelaxation_);
 
         qrPrevious_.writeEntry("qrPrevious", os);
     }
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
index f823eb6fa7..00f30e2a60 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
@@ -127,7 +127,7 @@ public:
             fixedHeatTransferCoeff,     //!< Fixed heat transfer coefficient
         };
 
-        static const NamedEnum<operationMode, 3> operationModeNames;
+        static const Enum<operationMode> operationModeNames;
 
 
 private:
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index 50c15be701..3de675ac0d 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -31,25 +31,17 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::temperatureCoupledBase::KMethodType
+>
+Foam::temperatureCoupledBase::KMethodTypeNames_
 {
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::temperatureCoupledBase::KMethodType,
-        4
-    >::names[] =
-    {
-        "fluidThermo",
-        "solidThermo",
-        "directionalSolidThermo",
-        "lookup"
-    };
-}
-
-
-const Foam::NamedEnum<Foam::temperatureCoupledBase::KMethodType, 4>
-    Foam::temperatureCoupledBase::KMethodTypeNames_;
+    { KMethodType::mtFluidThermo, "fluidThermo" },
+    { KMethodType::mtSolidThermo, "solidThermo" },
+    { KMethodType::mtDirectionalSolidThermo, "directionalSolidThermo" },
+    { KMethodType::mtLookup, "lookup" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -76,7 +68,7 @@ Foam::temperatureCoupledBase::temperatureCoupledBase
 )
 :
     patch_(patch),
-    method_(KMethodTypeNames_.read(dict.lookup("kappaMethod"))),
+    method_(KMethodTypeNames_.lookup("kappaMethod", dict)),
     kappaName_(dict.lookupOrDefault<word>("kappa", "none")),
     alphaAniName_(dict.lookupOrDefault<word>("alphaAni","none"))
 {}
@@ -232,10 +224,9 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
 
 void Foam::temperatureCoupledBase::write(Ostream& os) const
 {
-    os.writeKeyword("kappaMethod") << KMethodTypeNames_[method_]
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappaName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("alphaAni") << alphaAniName_ << token::END_STATEMENT << nl;
+    os.writeEntry("kappaMethod", KMethodTypeNames_[method_]);
+    os.writeEntry("kappa", kappaName_);
+    os.writeEntry("alphaAni", alphaAniName_);
 }
 
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index 777f4c6d2a..96c4586798 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -66,7 +66,7 @@ SourceFiles
 #define temperatureCoupledBase_H
 
 #include "scalarField.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "fvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -98,7 +98,7 @@ protected:
 
     // Protected data
 
-        static const NamedEnum<KMethodType, 4> KMethodTypeNames_;
+        static const Enum<KMethodType> KMethodTypeNames_;
 
         //- Underlying patch
         const fvPatch& patch_;
diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C
index 64d822ee52..c4b7e0b29f 100644
--- a/src/combustionModels/EDC/EDC.C
+++ b/src/combustionModels/EDC/EDC.C
@@ -39,14 +39,12 @@ Foam::combustionModels::EDC<Type>::EDC
     laminar<Type>(modelType, mesh, combustionProperties, phaseName),
     version_
     (
-        EDCversionNames
-        [
-            this->coeffs().lookupOrDefault
-            (
-                "version",
-                word(EDCversionNames[EDCdefaultVersion])
-            )
-        ]
+        EDCversionNames.lookupOrDefault
+        (
+            "version",
+            this->coeffs(),
+            EDCdefaultVersion
+        )
     ),
     C1_(this->coeffs().lookupOrDefault("C1", 0.05774)),
     C2_(this->coeffs().lookupOrDefault("C2", 0.5)),
@@ -220,14 +218,12 @@ bool Foam::combustionModels::EDC<Type>::read()
     {
         version_ =
         (
-            EDCversionNames
-            [
-                this->coeffs().lookupOrDefault
-                (
-                    "version",
-                    word(EDCversionNames[EDCdefaultVersion])
-                )
-            ]
+            EDCversionNames.lookupOrDefault
+            (
+                "version",
+                this->coeffs(),
+                EDCdefaultVersion
+            )
         );
         C1_ = this->coeffs().lookupOrDefault("C1", 0.05774);
         C2_ = this->coeffs().lookupOrDefault("C2", 0.5);
diff --git a/src/combustionModels/EDC/EDC.H b/src/combustionModels/EDC/EDC.H
index d9ed191f99..a59fc55bcf 100644
--- a/src/combustionModels/EDC/EDC.H
+++ b/src/combustionModels/EDC/EDC.H
@@ -100,7 +100,7 @@ SourceFiles
 #define EDC_H
 
 #include "../laminar/laminar.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -118,7 +118,7 @@ enum class EDCversions
     v2016
 };
 
-extern const NamedEnum<EDCversions, 4> EDCversionNames;
+extern const Enum<EDCversions> EDCversionNames;
 extern const EDCversions EDCdefaultVersion;
 
 const scalar EDCexp1[] = {3, 2, 2, 2};
diff --git a/src/combustionModels/EDC/EDCs.C b/src/combustionModels/EDC/EDCs.C
index 280d6c3db3..bd81ae6834 100644
--- a/src/combustionModels/EDC/EDCs.C
+++ b/src/combustionModels/EDC/EDCs.C
@@ -31,31 +31,26 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::combustionModels::EDCversions,
-    4
->::names[] =
+    Foam::combustionModels::EDCversions
+>
+Foam::combustionModels::EDCversionNames
 {
-    "v1981",
-    "v1996",
-    "v2005",
-    "v2016"
+    { EDCversions::v1981, "v1981" },
+    { EDCversions::v1996, "v1996" },
+    { EDCversions::v2005, "v2005" },
+    { EDCversions::v2016, "v2016" },
 };
 
-const Foam::NamedEnum<Foam::combustionModels::EDCversions, 4>
-    Foam::combustionModels::EDCversionNames;
-
 const Foam::combustionModels::EDCversions
-Foam::combustionModels::EDCdefaultVersion
-(
-    Foam::combustionModels::EDCversions::v2005
-);
+Foam::combustionModels::EDCdefaultVersion(EDCversions::v2005);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makeCombustionTypes(EDC, psiChemistryCombustion, psiCombustionModel);
 makeCombustionTypes(EDC, rhoChemistryCombustion, rhoCombustionModel);
 
+
 // ************************************************************************* //
diff --git a/src/conversion/ccm/reader/ccmSolutionTable.H b/src/conversion/ccm/reader/ccmSolutionTable.H
index 1a58d67cc6..cf954872e5 100644
--- a/src/conversion/ccm/reader/ccmSolutionTable.H
+++ b/src/conversion/ccm/reader/ccmSolutionTable.H
@@ -414,7 +414,7 @@ public:
             const fieldTable& tbl
         )
         {
-            os  << static_cast<const namesList<fieldEntry>& >(tbl)
+            os  << static_cast<const namesList<fieldEntry>&>(tbl)
                 << nl
                 << "maxCell: "  << tbl.maxCellId()
                 << " maxFace: " << tbl.maxFaceId();
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
index 70a1347169..97f35afa23 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
@@ -43,7 +43,7 @@ namespace Foam
 }
 
 // Angle for polys to be considered splitHexes.
-const Foam::scalar Foam::topoCellLooper::featureCos = Foam::cos(degToRad(10.0));
+const Foam::scalar Foam::topoCellLooper::featureCos = Foam::cos(10.0_deg);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C
index 2097a2c578..8ee5a691cf 100644
--- a/src/dynamicMesh/meshCut/directions/directions.C
+++ b/src/dynamicMesh/meshCut/directions/directions.C
@@ -36,23 +36,16 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::directions::directionType
+>
+Foam::directions::directionTypeNames_
 {
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::directions::directionType,
-        3
-    >::names[] =
-    {
-        "tan1",
-        "tan2",
-        "normal"
-    };
-}
-
-const Foam::NamedEnum<Foam::directions::directionType, 3>
-    Foam::directions::directionTypeNames_;
+    { directionType::TAN1, "tan1" },
+    { directionType::TAN2, "tan2" },
+    { directionType::NORMAL, "normal" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -289,9 +282,9 @@ Foam::directions::directions
 
     if (coordSystem != "fieldBased")
     {
-        forAll(wantedDirs, i)
+        for (const word& wantedName : wantedDirs)
         {
-            directionType wantedDir = directionTypeNames_[wantedDirs[i]];
+            directionType wantedDir = directionTypeNames_[wantedName];
 
             if (wantedDir == NORMAL)
             {
diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H
index c81c794ae8..b667aeb7f2 100644
--- a/src/dynamicMesh/meshCut/directions/directions.H
+++ b/src/dynamicMesh/meshCut/directions/directions.H
@@ -43,7 +43,7 @@ SourceFiles
 
 #include "List.H"
 #include "vectorField.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "point.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -82,7 +82,7 @@ public:
 
 private:
 
-        static const NamedEnum<directionType, 3> directionTypeNames_;
+        static const Enum<directionType> directionTypeNames_;
 
 
     // Private Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 71623907fd..689d112f67 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -184,7 +184,7 @@ Foam::undoableMeshCutter::undoableMeshCutter
     faceRemover_
     (
         mesh,
-        Foam::cos(degToRad(30.0))
+        Foam::cos(30.0_deg)
     )
 {}
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
index 357c27678f..9ea5e44203 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
@@ -36,18 +36,19 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(tetDecomposer, 0);
-
-    template<>
-    const char* NamedEnum<tetDecomposer::decompositionType, 2>::names[] =
-    {
-        "faceCentre",
-        "faceDiagonal"
-    };
-
-    const NamedEnum<tetDecomposer::decompositionType, 2>
-        tetDecomposer::decompositionTypeNames;
 }
 
+const Foam::Enum
+<
+    Foam::tetDecomposer::decompositionType
+>
+Foam::tetDecomposer::decompositionTypeNames
+{
+    { decompositionType::FACE_CENTRE_TRIS,  "faceCentre" },
+    { decompositionType::FACE_DIAG_TRIS, "faceDiagonal" },
+};
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::tetDecomposer::modifyFace
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
index 540df2dd20..4b854fdd12 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
@@ -39,7 +39,7 @@ SourceFiles
 #include "PackedBoolList.H"
 #include "boolList.H"
 #include "typeInfo.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,7 +68,7 @@ public:
 
             FACE_DIAG_TRIS    //- Faces decomposed into triangles diagonally
         };
-        static const NamedEnum<decompositionType, 2> decompositionTypeNames;
+        static const Enum<decompositionType> decompositionTypeNames;
 
 
 private:
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 52026efb91..7048a5713a 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -45,22 +45,18 @@ namespace Foam
         slidingInterface,
         dictionary
     );
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::slidingInterface::typeOfMatch,
-        2
-    >::names[] =
-    {
-        "integral",
-        "partial"
-    };
 }
 
 
-const Foam::NamedEnum<Foam::slidingInterface::typeOfMatch, 2>
-Foam::slidingInterface::typeOfMatchNames_;
+const Foam::Enum
+<
+    Foam::slidingInterface::typeOfMatch
+>
+Foam::slidingInterface::typeOfMatchNames_
+{
+    { typeOfMatch::INTEGRAL, "integral" },
+    { typeOfMatch::PARTIAL, "partial" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -248,7 +244,7 @@ Foam::slidingInterface::slidingInterface
         dict.lookup("slavePatchName"),
         mme.mesh().boundaryMesh()
     ),
-    matchType_(typeOfMatchNames_.read((dict.lookup("typeOfMatch")))),
+    matchType_(typeOfMatchNames_.lookup("typeOfMatch", dict)),
     coupleDecouple_(dict.lookup("coupleDecouple")),
     attached_(dict.lookup("attached")),
     projectionAlgo_
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index 6474e985ed..52232d8475 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -85,7 +85,7 @@ public:
         };
 
         //- Direction names
-        static const NamedEnum<typeOfMatch, 2> typeOfMatchNames_;
+        static const Enum<typeOfMatch> typeOfMatchNames_;
 
 private:
 
diff --git a/src/fileFormats/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C
index c4149dc943..bb311a62ed 100644
--- a/src/fileFormats/coordSet/coordSet.C
+++ b/src/fileFormats/coordSet/coordSet.C
@@ -27,15 +27,18 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::coordSet::coordFormat>
-    Foam::coordSet::coordFormatNames_
-    {
-        { coordFormat::XYZ, "xyz" },
-        { coordFormat::X, "x" },
-        { coordFormat::Y, "y" },
-        { coordFormat::Z, "z" },
-        { coordFormat::DISTANCE, "distance" }
-    };
+const Foam::Enum
+<
+    Foam::coordSet::coordFormat
+>
+Foam::coordSet::coordFormatNames_
+{
+    { coordFormat::XYZ, "xyz" },
+    { coordFormat::X, "x" },
+    { coordFormat::Y, "y" },
+    { coordFormat::Z, "z" },
+    { coordFormat::DISTANCE, "distance" }
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/fire/FIRECore.C b/src/fileFormats/fire/FIRECore.C
index 4cf9896080..10b15fe7c8 100644
--- a/src/fileFormats/fire/FIRECore.C
+++ b/src/fileFormats/fire/FIRECore.C
@@ -27,14 +27,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::fileFormats::FIRECore::fileExt3d>
-    Foam::fileFormats::FIRECore::file3dExtensions
-    {
-        { fileExt3d::POLY_ASCII, "fpma" },
-        { fileExt3d::POLY_BINARY, "fpmb" },
-        { fileExt3d::POLY_ASCII_Z, "fpmaz" },
-        { fileExt3d::POLY_BINARY_Z, "fpmbz" }
-    };
+const Foam::Enum
+<
+    Foam::fileFormats::FIRECore::fileExt3d
+>
+Foam::fileFormats::FIRECore::file3dExtensions
+{
+    { fileExt3d::POLY_ASCII, "fpma" },
+    { fileExt3d::POLY_BINARY, "fpmb" },
+    { fileExt3d::POLY_ASCII_Z, "fpmaz" },
+    { fileExt3d::POLY_BINARY_Z, "fpmbz" }
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/starcd/STARCDCore.C b/src/fileFormats/starcd/STARCDCore.C
index 412738131e..d6ff48fc57 100644
--- a/src/fileFormats/starcd/STARCDCore.C
+++ b/src/fileFormats/starcd/STARCDCore.C
@@ -33,22 +33,30 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::fileFormats::STARCDCore::fileHeader>
-    Foam::fileFormats::STARCDCore::fileHeaders_
-    {
-        { fileHeader::HEADER_CEL, "PROSTAR_CELL" },
-        { fileHeader::HEADER_VRT, "PROSTAR_VERTEX" },
-        { fileHeader::HEADER_BND, "PROSTAR_BOUNDARY" }
-    };
+const Foam::Enum
+<
+    Foam::fileFormats::STARCDCore::fileHeader
+>
+Foam::fileFormats::STARCDCore::fileHeaders_
+{
+    { fileHeader::HEADER_CEL, "PROSTAR_CELL" },
+    { fileHeader::HEADER_VRT, "PROSTAR_VERTEX" },
+    { fileHeader::HEADER_BND, "PROSTAR_BOUNDARY" }
+};
+
+
+const Foam::Enum
+<
+    Foam::fileFormats::STARCDCore::fileExt
+>
+Foam::fileFormats::STARCDCore::fileExtensions_
+{
+    { fileExt::CEL_FILE, "cel" },
+    { fileExt::VRT_FILE, "vrt" },
+    { fileExt::BND_FILE, "bnd" },
+    { fileExt::INP_FILE, "inp" }
+};
 
-const Foam::Enum<Foam::fileFormats::STARCDCore::fileExt>
-    Foam::fileFormats::STARCDCore::fileExtensions_
-    {
-        { fileExt::CEL_FILE, "cel" },
-        { fileExt::VRT_FILE, "vrt" },
-        { fileExt::BND_FILE, "bnd" },
-        { fileExt::INP_FILE, "inp" }
-    };
 
 const char* const Foam::fileFormats::STARCDCore::defaultBoundaryName =
     "Default_Boundary_Region";
diff --git a/src/fileFormats/vtk/core/foamVtkCore.C b/src/fileFormats/vtk/core/foamVtkCore.C
index be0cffa033..62612deb57 100644
--- a/src/fileFormats/vtk/core/foamVtkCore.C
+++ b/src/fileFormats/vtk/core/foamVtkCore.C
@@ -27,7 +27,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::vtk::fileTag> Foam::vtk::fileTagNames
+const Foam::Enum
+<
+    Foam::vtk::fileTag
+>
+Foam::vtk::fileTagNames
 {
     { fileTag::VTK_FILE, "VTKFile" },
     { fileTag::DATA_ARRAY, "DataArray" },
@@ -45,7 +49,11 @@ const Foam::Enum<Foam::vtk::fileTag> Foam::vtk::fileTagNames
 };
 
 
-const Foam::Enum<Foam::vtk::fileAttr> Foam::vtk::fileAttrNames
+const Foam::Enum
+<
+    Foam::vtk::fileAttr
+>
+Foam::vtk::fileAttrNames
 {
     { fileAttr::OFFSET, "offset" },
     { fileAttr::NUMBER_OF_COMPONENTS, "NumberOfComponents" },
@@ -57,7 +65,11 @@ const Foam::Enum<Foam::vtk::fileAttr> Foam::vtk::fileAttrNames
 };
 
 
-const Foam::Enum<Foam::vtk::dataArrayAttr> Foam::vtk::dataArrayAttrNames
+const Foam::Enum
+<
+    Foam::vtk::dataArrayAttr
+>
+Foam::vtk::dataArrayAttrNames
 {
     { dataArrayAttr::POINTS, "Points" },
     { dataArrayAttr::OFFSETS, "offsets" },
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.C b/src/fileFormats/vtk/output/foamVtkOutput.C
index 7e18f72314..454f8ac3dd 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.C
+++ b/src/fileFormats/vtk/output/foamVtkOutput.C
@@ -36,18 +36,24 @@ License
 
 // * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::vtk::fileTag>
+const Foam::Enum
+<
+    Foam::vtk::fileTag
+>
 Foam::vtk::legacy::contentNames
 {
-    { vtk::fileTag::POLY_DATA,         "POLYDATA" },
+    { vtk::fileTag::POLY_DATA, "POLYDATA" },
     { vtk::fileTag::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
 };
 
 
-const Foam::Enum<Foam::vtk::fileTag>
+const Foam::Enum
+<
+    Foam::vtk::fileTag
+>
 Foam::vtk::legacy::dataTypeNames
 {
-    { vtk::fileTag::CELL_DATA,  "CELL_DATA" },
+    { vtk::fileTag::CELL_DATA, "CELL_DATA" },
     { vtk::fileTag::POINT_DATA, "POINT_DATA" }
 };
 
diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReader.C b/src/fileFormats/vtk/read/vtkUnstructuredReader.C
index f29d57995c..2510aca057 100644
--- a/src/fileFormats/vtk/read/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/read/vtkUnstructuredReader.C
@@ -37,36 +37,47 @@ namespace Foam
     defineTypeNameAndDebug(vtkUnstructuredReader, 1);
 }
 
-const Foam::Enum<Foam::vtkUnstructuredReader::vtkDataType>
-    Foam::vtkUnstructuredReader::vtkDataTypeNames
-    {
-        { vtkDataType::VTK_INT, "int" },
-        { vtkDataType::VTK_UINT, "unsigned_int" },
-        { vtkDataType::VTK_LONG, "long" },
-        { vtkDataType::VTK_ULONG, "unsigned_long" },
-        { vtkDataType::VTK_FLOAT, "float" },
-        { vtkDataType::VTK_DOUBLE, "double" },
-        { vtkDataType::VTK_STRING, "string" },
-        { vtkDataType::VTK_ID, "vtkIdType" }
-    };
+const Foam::Enum
+<
+    Foam::vtkUnstructuredReader::vtkDataType
+>
+Foam::vtkUnstructuredReader::vtkDataTypeNames
+{
+    { vtkDataType::VTK_INT, "int" },
+    { vtkDataType::VTK_UINT, "unsigned_int" },
+    { vtkDataType::VTK_LONG, "long" },
+    { vtkDataType::VTK_ULONG, "unsigned_long" },
+    { vtkDataType::VTK_FLOAT, "float" },
+    { vtkDataType::VTK_DOUBLE, "double" },
+    { vtkDataType::VTK_STRING, "string" },
+    { vtkDataType::VTK_ID, "vtkIdType" }
+};
 
-const Foam::Enum<Foam::vtkUnstructuredReader::vtkDataSetType>
-    Foam::vtkUnstructuredReader::vtkDataSetTypeNames
-    {
-        { vtkDataSetType::VTK_FIELD, "FIELD" },
-        { vtkDataSetType::VTK_SCALARS, "SCALARS" },
-        { vtkDataSetType::VTK_VECTORS, "VECTORS" }
-    };
 
-const Foam::Enum<Foam::vtkUnstructuredReader::parseMode>
-    Foam::vtkUnstructuredReader::parseModeNames
-    {
-        { parseMode::NOMODE, "NOMODE" },
-        { parseMode::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
-        { parseMode::POLYDATA, "POLYDATA" },
-        { parseMode::CELL_DATA, "CELL_DATA" },
-        { parseMode::POINT_DATA, "POINT_DATA" }
-    };
+const Foam::Enum
+<
+    Foam::vtkUnstructuredReader::vtkDataSetType
+>
+Foam::vtkUnstructuredReader::vtkDataSetTypeNames
+{
+    { vtkDataSetType::VTK_FIELD, "FIELD" },
+    { vtkDataSetType::VTK_SCALARS, "SCALARS" },
+    { vtkDataSetType::VTK_VECTORS, "VECTORS" }
+};
+
+
+const Foam::Enum
+<
+    Foam::vtkUnstructuredReader::parseMode
+>
+Foam::vtkUnstructuredReader::parseModeNames
+{
+    { parseMode::NOMODE, "NOMODE" },
+    { parseMode::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
+    { parseMode::POLYDATA, "POLYDATA" },
+    { parseMode::CELL_DATA, "CELL_DATA" },
+    { parseMode::POINT_DATA, "POINT_DATA" }
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
index 9719903efc..3ddb6408dd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
@@ -30,25 +30,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char* NamedEnum
-    <
-        fanPressureFvPatchScalarField::fanFlowDirection,
-        2
-    >::names[] =
-    {
-        "in",
-        "out"
-    };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::fanPressureFvPatchScalarField::fanFlowDirection,
-    2
-> Foam::fanPressureFvPatchScalarField::fanFlowDirectionNames_;
+    Foam::fanPressureFvPatchScalarField::fanFlowDirection
+>
+Foam::fanPressureFvPatchScalarField::fanFlowDirectionNames_
+{
+    { fanFlowDirection::ffdIn, "in" },
+    { fanFlowDirection::ffdOut, "out" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -94,7 +84,7 @@ Foam::fanPressureFvPatchScalarField::fanPressureFvPatchScalarField
 :
     totalPressureFvPatchScalarField(p, iF, dict),
     fanCurve_(dict),
-    direction_(fanFlowDirectionNames_.read(dict.lookup("direction"))),
+    direction_(fanFlowDirectionNames_.lookup("direction", dict)),
     nonDimensional_(dict.lookupOrDefault<Switch>("nonDimensional", false)),
     rpm_(dict.lookupOrDefault<scalar>("rpm", 0.0)),
     dm_(dict.lookupOrDefault<scalar>("dm", 0.0))
@@ -205,10 +195,8 @@ void Foam::fanPressureFvPatchScalarField::write(Ostream& os) const
 {
     totalPressureFvPatchScalarField::write(os);
     fanCurve_.write(os);
-    os.writeKeyword("direction")
-        << fanFlowDirectionNames_[direction_] << token::END_STATEMENT << nl;
-    os.writeKeyword("nonDimensional") << nonDimensional_
-        << token::END_STATEMENT << nl;
+    os.writeEntry("direction", fanFlowDirectionNames_[direction_]);
+    os.writeEntry("nonDimensional", nonDimensional_);
     os.writeEntry("rpm", rpm_);
     os.writeEntry("dm", dm_);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
index 60780a0cd8..fa8f07cdb0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
@@ -123,8 +123,8 @@ public:
             ffdOut
         };
 
-        //- Fan flow directions names
-        static const NamedEnum<fanFlowDirection, 2> fanFlowDirectionNames_;
+        //- Fan flow direction names
+        static const Enum<fanFlowDirection> fanFlowDirectionNames_;
 
 
 private:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 4b25603ce0..4d986bd291 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -35,27 +35,25 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char* NamedEnum
-    <
-        waveSurfacePressureFvPatchScalarField::ddtSchemeType,
-        3
-    >::names[] =
-    {
-        fv::EulerDdtScheme<scalar>::typeName_(),
-        fv::CrankNicolsonDdtScheme<scalar>::typeName_(),
-        fv::backwardDdtScheme<scalar>::typeName_()
-    };
-}
-
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeType,
-    3
->   Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeTypeNames_;
+    Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeType
+>
+Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeTypeNames_
+{
+    {
+        ddtSchemeType::tsEuler,
+        fv::EulerDdtScheme<scalar>::typeName_()
+    },
+    {
+        ddtSchemeType::tsCrankNicolson,
+        fv::CrankNicolsonDdtScheme<scalar>::typeName_()
+    },
+    {
+        ddtSchemeType::tsBackward,
+        fv::backwardDdtScheme<scalar>::typeName_()
+    },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H
index ef8214ee36..3706827143 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H
@@ -79,7 +79,7 @@ SourceFiles
 #define waveSurfacePressureFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -121,7 +121,7 @@ private:
         word rhoName_;
 
         //- Time scheme type names
-        static const NamedEnum<ddtSchemeType, 3> ddtSchemeTypeNames_;
+        static const Enum<ddtSchemeType> ddtSchemeTypeNames_;
 
 
 public:
diff --git a/src/finiteVolume/functionObjects/volRegion/volRegion.C b/src/finiteVolume/functionObjects/volRegion/volRegion.C
index ab2f65fcfb..34efa8a1e6 100644
--- a/src/finiteVolume/functionObjects/volRegion/volRegion.C
+++ b/src/finiteVolume/functionObjects/volRegion/volRegion.C
@@ -37,19 +37,16 @@ namespace functionObjects
 }
 }
 
-template<>
-const char*
-Foam::NamedEnum
-<
-    Foam::functionObjects::volRegion::regionTypes,
-    2
->::names[] = {"cellZone", "all"};
 
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::volRegion::regionTypes,
-    2
-> Foam::functionObjects::volRegion::regionTypeNames_;
+    Foam::functionObjects::volRegion::regionTypes
+>
+Foam::functionObjects::volRegion::regionTypeNames_
+{
+    { regionTypes::vrtCellZone, "cellZone" },
+    { regionTypes::vrtAll, "all" },
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -79,9 +76,12 @@ Foam::functionObjects::volRegion::volRegion
     mesh_(mesh),
     regionType_
     (
-        dict.found("regionType")
-      ? regionTypeNames_.read(dict.lookup("regionType"))
-      : vrtAll
+        regionTypeNames_.lookupOrDefault
+        (
+            "regionType",
+            dict,
+            regionTypes::vrtAll
+        )
     ),
     regionName_(polyMesh::defaultRegion),
     regionID_(-1)
@@ -144,7 +144,7 @@ bool Foam::functionObjects::volRegion::read
         {
             FatalIOErrorInFunction(dict)
                 << "Unknown region type. Valid region types are:"
-                << regionTypeNames_.toc()
+                << regionTypeNames_.sortedToc()
                 << exit(FatalIOError);
         }
     }
diff --git a/src/finiteVolume/functionObjects/volRegion/volRegion.H b/src/finiteVolume/functionObjects/volRegion/volRegion.H
index d466a13141..f95504684d 100644
--- a/src/finiteVolume/functionObjects/volRegion/volRegion.H
+++ b/src/finiteVolume/functionObjects/volRegion/volRegion.H
@@ -71,7 +71,7 @@ SourceFiles
 #define functionObjects_volRegion_H
 
 #include "writeFile.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -111,7 +111,7 @@ public:
         };
 
         //- Region type names
-        static const NamedEnum<regionTypes, 2> regionTypeNames_;
+        static const Enum<regionTypes> regionTypeNames_;
 
 
 protected:
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 8bcf452ce9..80ef9247da 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -50,13 +50,16 @@ namespace functionObjects
 }
 }
 
-const Foam::Enum<Foam::functionObjects::externalCoupled::stateEnd>
-    Foam::functionObjects::externalCoupled::stateEndNames_
-    {
-        { stateEnd::REMOVE, "remove" },
-        { stateEnd::DONE, "done" }
-        // 'IGNORE' is internal use only and thus without a name
-    };
+const Foam::Enum
+<
+    Foam::functionObjects::externalCoupled::stateEnd
+>
+Foam::functionObjects::externalCoupled::stateEndNames_
+{
+    { stateEnd::REMOVE, "remove" },
+    { stateEnd::DONE, "done" }
+    // 'IGNORE' is internal use only and thus without a name
+};
 
 
 Foam::word Foam::functionObjects::externalCoupled::lockName = "OpenFOAM";
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
index efd22faf11..f42858f1f6 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
@@ -37,18 +37,16 @@ const Foam::word Foam::functionObjects::fieldAverageItem::EXT_PRIME2MEAN
     "Prime2Mean"
 );
 
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::functionObjects::fieldAverageItem::baseType,
-    2
->::names[] = { "iteration", "time"};
 
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::fieldAverageItem::baseType,
-    2
-> Foam::functionObjects::fieldAverageItem::baseTypeNames_;
+    Foam::functionObjects::fieldAverageItem::baseType
+>
+Foam::functionObjects::fieldAverageItem::baseTypeNames_
+{
+    { baseType::ITER, "iteration" },
+    { baseType::TIME, "time" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index d0b900f0e8..d683cafea7 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -50,7 +50,7 @@ SourceFiles
 #ifndef fieldAverageItem_H
 #define fieldAverageItem_H
 
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -119,7 +119,7 @@ private:
         word prime2MeanFieldName_;
 
         //- Averaging base type names
-        static const NamedEnum<baseType, 2> baseTypeNames_;
+        static const Enum<baseType> baseTypeNames_;
 
         //- Averaging base type
         baseType base_;
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
index 65e4e21abc..a057aba576 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
@@ -47,7 +47,7 @@ Foam::functionObjects::fieldAverageItem::fieldAverageItem(Istream& is)
     fieldName_ = entry.keyword();
     mean_ = readBool(entry.lookup("mean"));
     prime2Mean_ = readBool(entry.lookup("prime2Mean"));
-    base_ = baseTypeNames_[entry.lookup("base")];
+    base_ = baseTypeNames_.lookup("base", entry);
     window_ = entry.lookupOrDefault<scalar>("window", -1.0);
     windowName_ = entry.lookupOrDefault<word>("windowName", "");
 
@@ -77,7 +77,7 @@ Foam::Istream& Foam::functionObjects::operator>>
     faItem.fieldName_ = entry.keyword();
     faItem.mean_ = readBool(entry.lookup("mean"));
     faItem.prime2Mean_ = readBool(entry.lookup("prime2Mean"));
-    faItem.base_ = faItem.baseTypeNames_[entry.lookup("base")];
+    faItem.base_ = faItem.baseTypeNames_.lookup("base", entry);
     faItem.window_ = entry.lookupOrDefault<scalar>("window", -1.0);
     faItem.windowName_ = entry.lookupOrDefault<word>("windowName", "");
 
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/functionObjects/field/fieldMinMax/fieldMinMax.C
index 491b05fb61..35d68b92f0 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -38,18 +38,15 @@ namespace functionObjects
 }
 }
 
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::fieldMinMax::modeType,
-    2
->::names[] = {"magnitude", "component"};
-
-const Foam::NamedEnum
-<
-    Foam::functionObjects::fieldMinMax::modeType,
-    2
-> Foam::functionObjects::fieldMinMax::modeTypeNames_;
+    Foam::functionObjects::fieldMinMax::modeType
+>
+Foam::functionObjects::fieldMinMax::modeTypeNames_
+{
+    { modeType::mdMag,  "magnitude" },
+    { modeType::mdCmpt, "component" },
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -126,7 +123,7 @@ bool Foam::functionObjects::fieldMinMax::read(const dictionary& dict)
 
     location_ = dict.lookupOrDefault<Switch>("location", true);
 
-    mode_ = modeTypeNames_[dict.lookupOrDefault<word>("mode", "magnitude")];
+    mode_ = modeTypeNames_.lookupOrDefault("mode", dict, modeType::mdMag);
     dict.lookup("fields") >> fieldSet_;
 
     return true;
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
index 1871fdbfe9..588dc5c7fd 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -78,7 +78,7 @@ SourceFiles
 #define functionObjects_fieldMinMax_H
 
 #include "Switch.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "fvMeshFunctionObject.H"
 #include "writeFile.H"
 #include "vector.H"
@@ -115,7 +115,7 @@ protected:
     // Protected data
 
         //- Mode type names
-        static const NamedEnum<modeType, 2> modeTypeNames_;
+        static const Enum<modeType> modeTypeNames_;
 
         //- Switch to write location of min/max values
         Switch location_;
diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index ca24bdad36..68291255d1 100644
--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,24 +40,19 @@ namespace fieldValues
 }
 }
 
-template<>
-const char* Foam::NamedEnum
+
+const Foam::Enum
 <
-    Foam::functionObjects::fieldValues::fieldValueDelta::operationType,
-    5
->::names[] =
+    Foam::functionObjects::fieldValues::fieldValueDelta::operationType
+>
+Foam::functionObjects::fieldValues::fieldValueDelta::operationTypeNames_
 {
-    "add",
-    "subtract",
-    "min",
-    "max",
-    "average"
+    { operationType::opAdd, "add" },
+    { operationType::opSubtract, "subtract" },
+    { operationType::opMin, "min" },
+    { operationType::opMax, "max" },
+    { operationType::opAverage, "average" },
 };
-const Foam::NamedEnum
-<
-    Foam::functionObjects::fieldValues::fieldValueDelta::operationType,
-    5
-> Foam::functionObjects::fieldValues::fieldValueDelta::operationTypeNames_;
 
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
@@ -151,7 +146,7 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::read
         ).ptr()
     );
 
-    operation_ = operationTypeNames_.read(dict.lookup("operation"));
+    operation_ = operationTypeNames_.lookup("operation", dict);
 
     return true;
 }
diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index 038ef142fc..b4701247c7 100644
--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,6 +85,7 @@ SourceFiles
 #include "stateFunctionObject.H"
 #include "writeFile.H"
 #include "fieldValue.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -116,7 +117,7 @@ public:
         };
 
         //- Operation type names
-        static const NamedEnum<operationType, 5> operationTypeNames_;
+        static const Enum<operationType> operationTypeNames_;
 
 
 private:
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
index 3d39aa4655..f0eb481dd7 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@@ -49,75 +49,54 @@ namespace fieldValues
 }
 }
 
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes,
-    4
->::names[] =
-{
-    "faceZone",
-    "patch",
-    "surface",
-    "sampledSurface"
-};
 
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::fieldValues::surfaceFieldValue::operationType,
-    17
->::names[] =
-{
-    "none",
-    "sum",
-    "weightedSum",
-    "sumMag",
-    "sumDirection",
-    "sumDirectionBalance",
-    "average",
-    "weightedAverage",
-    "areaAverage",
-    "weightedAreaAverage",
-    "areaIntegrate",
-    "weightedAreaIntegrate",
-    "min",
-    "max",
-    "CoV",
-    "areaNormalAverage",
-    "areaNormalIntegrate"
-};
-
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationType,
-    2
->::names[] =
-{
-    "none",
-    "sqrt"
-};
-
-
-const Foam::NamedEnum
-<
-    Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes,
-    4
-> Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypeNames_;
-
-const Foam::NamedEnum
-<
-    Foam::functionObjects::fieldValues::surfaceFieldValue::operationType,
-    17
-> Foam::functionObjects::fieldValues::surfaceFieldValue::operationTypeNames_;
-
-const Foam::NamedEnum
-<
-    Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationType,
-    2
+    Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes
 >
-Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationTypeNames_;
+Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypeNames_
+{
+    { regionTypes::stFaceZone, "faceZone" },
+    { regionTypes::stPatch, "patch" },
+    { regionTypes::stSurface, "surface" },
+    { regionTypes::stSampledSurface, "sampledSurface" },
+};
+
+
+const Foam::Enum
+<
+    Foam::functionObjects::fieldValues::surfaceFieldValue::operationType
+>
+Foam::functionObjects::fieldValues::surfaceFieldValue::operationTypeNames_
+{
+    { operationType::opNone, "none" },
+    { operationType::opSum, "sum" },
+    { operationType::opWeightedSum, "weightedSum" },
+    { operationType::opSumMag, "sumMag" },
+    { operationType::opSumDirection, "sumDirection" },
+    { operationType::opSumDirectionBalance, "sumDirectionBalance" },
+    { operationType::opAverage, "average" },
+    { operationType::opWeightedAverage, "weightedAverage" },
+    { operationType::opAreaAverage, "areaAverage" },
+    { operationType::opWeightedAreaAverage, "weightedAreaAverage" },
+    { operationType::opAreaIntegrate, "areaIntegrate" },
+    { operationType::opWeightedAreaIntegrate, "weightedAreaIntegrate" },
+    { operationType::opMin, "min" },
+    { operationType::opMax, "max" },
+    { operationType::opCoV, "CoV" },
+    { operationType::opAreaNormalAverage, "areaNormalAverage" },
+    { operationType::opAreaNormalIntegrate, "areaNormalIntegrate" },
+};
+
+const Foam::Enum
+<
+    Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationType
+>
+Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationTypeNames_
+{
+    { postOperationType::postOpNone, "none" },
+    { postOperationType::postOpSqrt, "sqrt" },
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -832,12 +811,16 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::surfaceFieldValue
 )
 :
     fieldValue(name, runTime, dict, typeName),
-    regionType_(regionTypeNames_.read(dict.lookup("regionType"))),
-    operation_(operationTypeNames_.read(dict.lookup("operation"))),
+    regionType_(regionTypeNames_.lookup("regionType", dict)),
+    operation_(operationTypeNames_.lookup("operation", dict)),
     postOperation_
     (
-        postOperationTypeNames_
-        [dict.lookupOrDefault<word>("postOperation", "none")]
+        postOperationTypeNames_.lookupOrDefault
+        (
+            "postOperation",
+            dict,
+            postOperationType::postOpNone
+        )
     ),
     weightFieldName_("none"),
     writeArea_(dict.lookupOrDefault("writeArea", false)),
@@ -859,12 +842,16 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::surfaceFieldValue
 )
 :
     fieldValue(name, obr, dict, typeName),
-    regionType_(regionTypeNames_.read(dict.lookup("regionType"))),
-    operation_(operationTypeNames_.read(dict.lookup("operation"))),
+    regionType_(regionTypeNames_.lookup("regionType", dict)),
+    operation_(operationTypeNames_.lookup("operation", dict)),
     postOperation_
     (
-        postOperationTypeNames_
-        [dict.lookupOrDefault<word>("postOperation", "none")]
+        postOperationTypeNames_.lookupOrDefault
+        (
+            "postOperation",
+            dict,
+            postOperationType::postOpNone
+        )
     ),
     weightFieldName_("none"),
     writeArea_(dict.lookupOrDefault("writeArea", false)),
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
index a58b27b8a0..4cf6b7c515 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
@@ -156,7 +156,7 @@ SourceFiles
 #define functionObjects_surfaceFieldValue_H
 
 #include "fieldValue.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "meshedSurf.H"
 #include "surfaceMesh.H"
 #include "fvsPatchField.H"
@@ -198,7 +198,7 @@ public:
         };
 
         //- Region type names
-        static const NamedEnum<regionTypes, 4> regionTypeNames_;
+        static const Enum<regionTypes> regionTypeNames_;
 
 
         //- Operation type enumeration
@@ -224,7 +224,7 @@ public:
         };
 
         //- Operation type names
-        static const NamedEnum<operationType, 17> operationTypeNames_;
+        static const Enum<operationType> operationTypeNames_;
 
 
         //- Post-operation type enumeration
@@ -235,7 +235,7 @@ public:
         };
 
         //- Operation type names
-        static const NamedEnum<postOperationType, 2> postOperationTypeNames_;
+        static const Enum<postOperationType> postOperationTypeNames_;
 
 
 private:
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
index fa77d962b0..912b6459bb 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
@@ -43,35 +43,27 @@ namespace fieldValues
 }
 }
 
-template<>
-const char*
-Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::fieldValues::volFieldValue::operationType,
-    13
->::names[] =
+    Foam::functionObjects::fieldValues::volFieldValue::operationType
+>
+Foam::functionObjects::fieldValues::volFieldValue::operationTypeNames_
 {
-    "none",
-    "sum",
-    "weightedSum",
-    "sumMag",
-    "average",
-    "weightedAverage",
-    "volAverage",
-    "weightedVolAverage",
-    "volIntegrate",
-    "weightedVolIntegrate",
-    "min",
-    "max",
-    "CoV"
+    { operationType::opNone, "none" },
+    { operationType::opSum, "sum" },
+    { operationType::opWeightedSum, "weightedSum" },
+    { operationType::opSumMag, "sumMag" },
+    { operationType::opAverage, "average" },
+    { operationType::opWeightedAverage, "weightedAverage" },
+    { operationType::opVolAverage, "volAverage" },
+    { operationType::opWeightedVolAverage, "weightedVolAverage" },
+    { operationType::opVolIntegrate, "volIntegrate" },
+    { operationType::opWeightedVolIntegrate, "weightedVolIntegrate" },
+    { operationType::opMin, "min" },
+    { operationType::opMax, "max" },
+    { operationType::opCoV, "CoV" },
 };
 
-const Foam::NamedEnum
-<
-    Foam::functionObjects::fieldValues::volFieldValue::operationType,
-    13
-> Foam::functionObjects::fieldValues::volFieldValue::operationTypeNames_;
-
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
@@ -198,7 +190,7 @@ Foam::functionObjects::fieldValues::volFieldValue::volFieldValue
 :
     fieldValue(name, runTime, dict, typeName),
     volRegion(fieldValue::mesh_, dict),
-    operation_(operationTypeNames_.read(dict.lookup("operation"))),
+    operation_(operationTypeNames_.lookup("operation", dict)),
     weightFieldName_("none")
 {
     read(dict);
@@ -215,7 +207,7 @@ Foam::functionObjects::fieldValues::volFieldValue::volFieldValue
 :
     fieldValue(name, obr, dict, typeName),
     volRegion(fieldValue::mesh_, dict),
-    operation_(operationTypeNames_.read(dict.lookup("operation"))),
+    operation_(operationTypeNames_.lookup("operation", dict)),
     weightFieldName_("none")
 {
     read(dict);
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
index db9b34bc1e..f2730c526f 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
@@ -153,7 +153,7 @@ public:
         };
 
         //- Operation type names
-        static const NamedEnum<operationType, 13> operationTypeNames_;
+        static const Enum<operationType> operationTypeNames_;
 
 
 protected:
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 462aa40557..cac7ab686a 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -52,24 +52,20 @@ namespace functionObjects
         dictionary
     );
 }
-template<>
-const char* NamedEnum
-<
-    functionObjects::fluxSummary::modeType,
-    5
->::names[] =
-{
-    "faceZone",
-    "faceZoneAndDirection",
-    "cellZoneAndDirection",
-    "surface",
-    "surfaceAndDirection"
-};
 }
 
-
-const Foam::NamedEnum<Foam::functionObjects::fluxSummary::modeType, 5>
-Foam::functionObjects::fluxSummary::modeTypeNames_;
+const Foam::Enum
+<
+    Foam::functionObjects::fluxSummary::modeType
+>
+Foam::functionObjects::fluxSummary::modeTypeNames_
+{
+    { modeType::mdFaceZone , "faceZone" },
+    { modeType::mdFaceZoneAndDirection, "faceZoneAndDirection" },
+    { modeType::mdCellZoneAndDirection, "cellZoneAndDirection" },
+    { modeType::mdSurface, "surface" },
+    { modeType::mdSurfaceAndDirection, "surfaceAndDirection" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -823,7 +819,7 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict)
     fvMeshFunctionObject::read(dict);
     writeFile::read(dict);
 
-    mode_ = modeTypeNames_.read(dict.lookup("mode"));
+    mode_ = modeTypeNames_.lookup("mode", dict);
     phiName_ = dict.lookupOrDefault<word>("phi", "phi");
     scaleFactor_ = dict.lookupOrDefault<scalar>("scaleFactor", 1.0);
     tolerance_   = dict.lookupOrDefault<scalar>("tolerance", 0.8);
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.H b/src/functionObjects/field/fluxSummary/fluxSummary.H
index 287c6a3782..8c5a3a5a75 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.H
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.H
@@ -124,7 +124,7 @@ public:
         };
 
         //- Mode type names
-        static const NamedEnum<modeType, 5> modeTypeNames_;
+        static const Enum<modeType> modeTypeNames_;
 
 
 protected:
diff --git a/src/functionObjects/field/setFlow/setFlow.C b/src/functionObjects/field/setFlow/setFlow.C
index 0d61bbff3f..7d3353ab64 100644
--- a/src/functionObjects/field/setFlow/setFlow.C
+++ b/src/functionObjects/field/setFlow/setFlow.C
@@ -48,7 +48,10 @@ namespace functionObjects
 }
 
 
-const Foam::Enum<Foam::functionObjects::setFlow::modeType>
+const Foam::Enum
+<
+    Foam::functionObjects::setFlow::modeType
+>
 Foam::functionObjects::setFlow::modeTypeNames
 {
     { functionObjects::setFlow::modeType::FUNCTION, "function" },
diff --git a/src/functionObjects/field/setFlow/setFlow.H b/src/functionObjects/field/setFlow/setFlow.H
index 26425d8092..1a96940bb1 100644
--- a/src/functionObjects/field/setFlow/setFlow.H
+++ b/src/functionObjects/field/setFlow/setFlow.H
@@ -110,7 +110,7 @@ class setFlow
         VORTEX3D
     };
 
-   static const Foam::Enum<modeType> modeTypeNames;
+   static const Enum<modeType> modeTypeNames;
 
 
    // Private Data
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
index b09c20ad5f..214aa9896a 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,51 +45,39 @@ namespace functionObjects
 }
 }
 
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::turbulenceFields::compressibleField,
-    9
->::names[] =
+    Foam::functionObjects::turbulenceFields::compressibleField
+>
+Foam::functionObjects::turbulenceFields::compressibleFieldNames_
 {
-    "k",
-    "epsilon",
-    "omega",
-    "mut",
-    "muEff",
-    "alphat",
-    "alphaEff",
-    "R",
-    "devRhoReff"
+    { compressibleField::cfK, "k" },
+    { compressibleField::cfEpsilon, "epsilon" },
+    { compressibleField::cfOmega, "omega" },
+    { compressibleField::cfMut, "mut" },
+    { compressibleField::cfMuEff, "muEff" },
+    { compressibleField::cfAlphat, "alphat" },
+    { compressibleField::cfAlphaEff, "alphaEff" },
+    { compressibleField::cfR, "R" },
+    { compressibleField::cfDevRhoReff, "devRhoReff" },
 };
 
-const Foam::NamedEnum
-<
-    Foam::functionObjects::turbulenceFields::compressibleField,
-    9
-> Foam::functionObjects::turbulenceFields::compressibleFieldNames_;
 
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::turbulenceFields::incompressibleField,
-    7
->::names[] =
+    Foam::functionObjects::turbulenceFields::incompressibleField
+>
+Foam::functionObjects::turbulenceFields::incompressibleFieldNames_
 {
-    "k",
-    "epsilon",
-    "omega",
-    "nut",
-    "nuEff",
-    "R",
-    "devReff"
+    { incompressibleField::ifK, "k" },
+    { incompressibleField::ifEpsilon, "epsilon" },
+    { incompressibleField::ifOmega, "omega" },
+    { incompressibleField::ifNut, "nut" },
+    { incompressibleField::ifNuEff, "nuEff" },
+    { incompressibleField::ifR, "R" },
+    { incompressibleField::ifDevReff, "devReff" },
 };
 
-const Foam::NamedEnum
-<
-    Foam::functionObjects::turbulenceFields::incompressibleField,
-    7
-> Foam::functionObjects::turbulenceFields::incompressibleFieldNames_;
 
 const Foam::word Foam::functionObjects::turbulenceFields::modelName
 (
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
index 5798fc3f75..dc6e168abd 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.H
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,7 +90,7 @@ SourceFiles
 
 #include "fvMeshFunctionObject.H"
 #include "HashSet.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "volFieldsFwd.H"
 #include "Switch.H"
 
@@ -123,7 +123,7 @@ public:
         cfR,
         cfDevRhoReff
     };
-    static const NamedEnum<compressibleField, 9> compressibleFieldNames_;
+    static const Enum<compressibleField> compressibleFieldNames_;
 
     enum incompressibleField
     {
@@ -135,7 +135,7 @@ public:
         ifR,
         ifDevReff
     };
-    static const NamedEnum<incompressibleField, 7> incompressibleFieldNames_;
+    static const Enum<incompressibleField> incompressibleFieldNames_;
 
     static const word modelName;
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
index 1bd8614b68..68818625dc 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
@@ -47,46 +47,27 @@ License
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::functionObjects::fieldVisualisationBase::colourByType
+>
+Foam::functionObjects::fieldVisualisationBase::colourByTypeNames
 {
-    template<>
-    const char* NamedEnum
-    <
-        functionObjects::fieldVisualisationBase::colourByType,
-        2
-    >::names[] =
-    {
-        "colour",
-        "field"
-    };
+    { colourByType::cbColour, "colour" },
+    { colourByType::cbField, "field" },
+};
 
-    template<>
-    const char* NamedEnum
-    <
-        functionObjects::fieldVisualisationBase::colourMapType,
-        4
-    >::names[] =
-    {
-        "rainbow",
-        "blueWhiteRed",
-        "fire",
-        "greyscale"
-    };
-}
-
-const Foam::NamedEnum
-    <
-        Foam::functionObjects::fieldVisualisationBase::colourByType,
-        2
-    >
-    Foam::functionObjects::fieldVisualisationBase::colourByTypeNames;
-
-const Foam::NamedEnum
-    <
-        Foam::functionObjects::fieldVisualisationBase::colourMapType,
-        4
-    >
-    Foam::functionObjects::fieldVisualisationBase::colourMapTypeNames;
+const Foam::Enum
+<
+    Foam::functionObjects::fieldVisualisationBase::colourMapType
+>
+Foam::functionObjects::fieldVisualisationBase::colourMapTypeNames
+{
+    { colourMapType::cmRainbow, "rainbow" },
+    { colourMapType::cmBlueWhiteRed, "blueWhiteRed" },
+    { colourMapType::cmFire, "fire" },
+    { colourMapType::cmGreyscale, "greyscale" },
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -100,8 +81,7 @@ void Foam::functionObjects::fieldVisualisationBase::setColourMap
 
     lut->SetNumberOfColors(nColours);
 
-    vtkSmartPointer<vtkColorTransferFunction> ctf =
-        vtkSmartPointer<vtkColorTransferFunction>::New();
+    auto ctf = vtkSmartPointer<vtkColorTransferFunction>::New();
 
     switch (colourMap_)
     {
@@ -163,8 +143,7 @@ void Foam::functionObjects::fieldVisualisationBase::addScalarBar
         return;
     }
 
-    vtkSmartPointer<vtkScalarBarActor> sbar =
-        vtkSmartPointer<vtkScalarBarActor>::New();
+    auto sbar = vtkSmartPointer<vtkScalarBarActor>::New();
     sbar->SetLookupTable(lut);
     sbar->SetNumberOfLabels(scalarBar_.numberOfLabels_);
 
@@ -174,8 +153,7 @@ void Foam::functionObjects::fieldVisualisationBase::addScalarBar
     // - Default scalar bar title text is scales by the scalar bar box
     //   dimensions so if the title is a long string, the text is shrunk to fit
     //   Instead, suppress title and set the title using a vtkTextActor
-    vtkSmartPointer<vtkTextActor> titleActor =
-        vtkSmartPointer<vtkTextActor>::New();
+    auto titleActor = vtkSmartPointer<vtkTextActor>::New();
     sbar->SetTitle(" ");
     titleActor->SetInput(scalarBar_.title_.c_str());
     titleActor->GetTextProperty()->SetFontFamilyToArial();
@@ -282,8 +260,7 @@ void Foam::functionObjects::fieldVisualisationBase::setField
         case cbField:
         {
             // Create look-up table for colours
-            vtkSmartPointer<vtkLookupTable> lut =
-                vtkSmartPointer<vtkLookupTable>::New();
+            auto lut = vtkSmartPointer<vtkLookupTable>::New();
             setColourMap(lut);
             lut->SetVectorMode(vtkScalarsToColors::MAGNITUDE);
 
@@ -337,9 +314,8 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
     vtkRenderer* renderer
 ) const
 {
-    vtkSmartPointer<vtkGlyph3D> glyph = vtkSmartPointer<vtkGlyph3D>::New();
-    vtkSmartPointer<vtkPolyDataMapper> glyphMapper =
-        vtkSmartPointer<vtkPolyDataMapper>::New();
+    auto glyph = vtkSmartPointer<vtkGlyph3D>::New();
+    auto glyphMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
     glyphMapper->SetInputConnection(glyph->GetOutputPort());
 
     glyph->SetInputData(data);
@@ -358,8 +334,7 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
     else if (data->GetCellData()->HasArray(scaleFieldNameChar) == 1)
     {
         // Need to convert cell data to point data
-        vtkSmartPointer<vtkCellDataToPointData> cellToPoint =
-            vtkSmartPointer<vtkCellDataToPointData>::New();
+        auto cellToPoint = vtkSmartPointer<vtkCellDataToPointData>::New();
         cellToPoint->SetInputData(data);
         cellToPoint->Update();
         vtkDataSet* pds = cellToPoint->GetOutput();
@@ -380,8 +355,7 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
 
     if (nComponents == 1)
     {
-        vtkSmartPointer<vtkSphereSource> sphere =
-            vtkSmartPointer<vtkSphereSource>::New();
+        auto sphere = vtkSmartPointer<vtkSphereSource>::New();
         sphere->SetCenter(0, 0, 0);
         sphere->SetRadius(0.5);
 
@@ -428,8 +402,7 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
     }
     else if (nComponents == 3)
     {
-        vtkSmartPointer<vtkArrowSource> arrow =
-            vtkSmartPointer<vtkArrowSource>::New();
+        auto arrow = vtkSmartPointer<vtkArrowSource>::New();
         arrow->SetTipResolution(10);
         arrow->SetTipRadius(0.1);
         arrow->SetTipLength(0.35);
@@ -516,7 +489,7 @@ Foam::functionObjects::fieldVisualisationBase::fieldVisualisationBase
     colourMap_(cmRainbow),
     range_()
 {
-    colourBy_ = colourByTypeNames.read(dict.lookup("colourBy"));
+    colourBy_ = colourByTypeNames.lookup("colourBy", dict);
 
     switch (colourBy_)
     {
@@ -531,7 +504,7 @@ Foam::functionObjects::fieldVisualisationBase::fieldVisualisationBase
 
             if (dict.found("colourMap"))
             {
-                colourMap_ = colourMapTypeNames.read(dict.lookup("colourMap"));
+                colourMap_ = colourMapTypeNames.lookup("colourMap", dict);
             }
 
             const dictionary& sbarDict = dict.subDict("scalarBar");
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
index 0ae8c6a608..3df00661a1 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
@@ -37,7 +37,7 @@ SourceFiles
 
 #include "dictionary.H"
 #include "Tuple2.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "vector.H"
 #include "HashPtrTable.H"
 #include "Function1.H"
@@ -78,7 +78,7 @@ public:
             cbField
         };
 
-        static const NamedEnum<colourByType, 2> colourByTypeNames;
+        static const Enum<colourByType> colourByTypeNames;
 
         enum colourMapType
         {
@@ -88,7 +88,7 @@ public:
             cmGreyscale
         };
 
-        static const NamedEnum<colourMapType, 4> colourMapTypeNames;
+        static const Enum<colourMapType> colourMapTypeNames;
 
 
 private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
index 357997df25..f4fe22be99 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
@@ -120,13 +120,11 @@ addGeometryToScene
 
     if (fName.ext() == "vtk")
     {
-        vtkSmartPointer<vtkPolyDataReader> points =
-            vtkSmartPointer<vtkPolyDataReader>::New();
+        auto points = vtkSmartPointer<vtkPolyDataReader>::New();
         points->SetFileName(fName.c_str());
         points->Update();
 
-        vtkSmartPointer<vtkPolyDataMapper> mapper =
-            vtkSmartPointer<vtkPolyDataMapper>::New();
+        auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
 
         actor_->SetMapper(mapper);
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
index b1a9093f63..2d7fc46940 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
@@ -101,13 +101,11 @@ addGeometryToScene
 
     if (fName.ext() == "vtk")
     {
-        vtkSmartPointer<vtkPolyDataReader> lines =
-            vtkSmartPointer<vtkPolyDataReader>::New();
+        auto lines = vtkSmartPointer<vtkPolyDataReader>::New();
         lines->SetFileName(fName.c_str());
         lines->Update();
 
-        vtkSmartPointer<vtkPolyDataMapper> mapper =
-            vtkSmartPointer<vtkPolyDataMapper>::New();
+        auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
         setField(position, fieldName_, mapper, renderer, lines->GetOutput());
 
         actor_->SetMapper(mapper);
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
index 343985afa2..22b9c7570e 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
@@ -101,8 +101,7 @@ addGeometryToScene
 
     if (representation_ == rtGlyph)
     {
-        vtkSmartPointer<vtkPolyDataReader> surf =
-            vtkSmartPointer<vtkPolyDataReader>::New();
+        auto surf = vtkSmartPointer<vtkPolyDataReader>::New();
         surf->SetFileName(fName.c_str());
         surf->Update();
 
@@ -121,15 +120,13 @@ addGeometryToScene
     {
         if (fName.ext() == "vtk")
         {
-            vtkSmartPointer<vtkPolyDataReader> surf =
-                vtkSmartPointer<vtkPolyDataReader>::New();
+            auto surf = vtkSmartPointer<vtkPolyDataReader>::New();
             surf->SetFileName(fName.c_str());
             surf->Update();
 
             addFeatureEdges(renderer, surf->GetOutput());
 
-            vtkSmartPointer<vtkPolyDataMapper> mapper =
-                vtkSmartPointer<vtkPolyDataMapper>::New();
+            auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
             mapper->SetInputConnection(surf->GetOutputPort());
 
             setField(position, fieldName_, mapper, renderer, surf->GetOutput());
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
index 2e9ac28b65..2bc15a840d 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
@@ -32,27 +32,16 @@ License
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char* NamedEnum
-    <
-        functionObjects::runTimePostPro::geometryBase::renderModeType,
-        3
-    >::names[] =
-    {
-        "flat",
-        "gouraud",
-        "phong"
-    };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::runTimePostPro::geometryBase::renderModeType,
-    3
+    Foam::functionObjects::runTimePostPro::geometryBase::renderModeType
 >
-    Foam::functionObjects::runTimePostPro::geometryBase::renderModeTypeNames;
+Foam::functionObjects::runTimePostPro::geometryBase::renderModeTypeNames
+{
+    { renderModeType::rmFlat, "flat" },
+    { renderModeType::rmGouraud, "gouraud" },
+    { renderModeType::rmPhong, "phong" },
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -104,7 +93,7 @@ Foam::functionObjects::runTimePostPro::geometryBase::geometryBase
 {
     if (dict.found("renderMode"))
     {
-        renderMode_ = renderModeTypeNames.read(dict.lookup("renderMode"));
+        renderMode_ = renderModeTypeNames.lookup("renderMode", dict);
     }
 
     if (dict.found("opacity"))
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
index 714c5de0df..bf27d3cb0f 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
@@ -39,7 +39,7 @@ SourceFiles
 #include "vector.H"
 #include "Function1.H"
 #include "HashPtrTable.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -75,7 +75,7 @@ public:
             rmPhong             //!< Phong shading
         };
 
-        static const NamedEnum<renderModeType, 3> renderModeTypeNames;
+        static const Enum<renderModeType> renderModeTypeNames;
 
 
 private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.C b/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.C
index 19be822aa7..7c68893222 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.C
@@ -79,11 +79,9 @@ void Foam::functionObjects::runTimePostPro::geometrySurface::addGeometryToScene
     const Field<point>& surfPoints = surf.points();
     const Field<vector>& surfFaceNormals = surf.faceNormals();
 
-    vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
-    vtkSmartPointer<vtkCellArray> triangles =
-        vtkSmartPointer<vtkCellArray>::New();
-    vtkSmartPointer<vtkDoubleArray> faceNormals =
-        vtkSmartPointer<vtkDoubleArray>::New();
+    auto points = vtkSmartPointer<vtkPoints>::New();
+    auto triangles = vtkSmartPointer<vtkCellArray>::New();
+    auto faceNormals = vtkSmartPointer<vtkDoubleArray>::New();
 
     faceNormals->SetNumberOfComponents(3);
 
@@ -97,8 +95,7 @@ void Foam::functionObjects::runTimePostPro::geometrySurface::addGeometryToScene
     {
         const Foam::face& f = surf[i];
 
-        vtkSmartPointer<vtkTriangle> triangle =
-            vtkSmartPointer<vtkTriangle>::New();
+        auto triangle = vtkSmartPointer<vtkTriangle>::New();
         triangle->GetPointIds()->SetId(0, f[0]);
         triangle->GetPointIds()->SetId(1, f[1]);
         triangle->GetPointIds()->SetId(2, f[2]);
@@ -114,14 +111,12 @@ void Foam::functionObjects::runTimePostPro::geometrySurface::addGeometryToScene
 
     surf.clearOut();
 
-    vtkSmartPointer<vtkPolyData> polyData =
-        vtkSmartPointer<vtkPolyData>::New();
+    auto polyData = vtkSmartPointer<vtkPolyData>::New();
     polyData->SetPoints(points);
     polyData->SetPolys(triangles);
     polyData->GetCellData()->SetNormals(faceNormals);
 
-    vtkSmartPointer<vtkPolyDataMapper> mapper =
-        vtkSmartPointer<vtkPolyDataMapper>::New();
+    auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
     mapper->ScalarVisibilityOff();
     mapper->SetInputData(polyData);
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.C b/src/functionObjects/graphics/runTimePostProcessing/pathline.C
index aedd860827..717125fdc9 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pathline.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.C
@@ -48,27 +48,19 @@ namespace runTimePostPro
     defineRunTimeSelectionTable(pathline, dictionary);
 }
 }
-
-template<>
-const char* NamedEnum
-<
-    functionObjects::runTimePostPro::pathline::representationType,
-    4
->::names[] =
-{
-    "none",
-    "line",
-    "tube",
-    "vector"
-};
 }
 
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::runTimePostPro::pathline::representationType,
-    4
+    Foam::functionObjects::runTimePostPro::pathline::representationType
 >
-    Foam::functionObjects::runTimePostPro::pathline::representationTypeNames;
+Foam::functionObjects::runTimePostPro::pathline::representationTypeNames
+{
+    { representationType::rtNone, "none" },
+    { representationType::rtLine, "line" },
+    { representationType::rtTube, "tube" },
+    { representationType::rtVector, "vector" },
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -104,8 +96,7 @@ void Foam::functionObjects::runTimePostPro::pathline::addLines
         }
         case rtTube:
         {
-            vtkSmartPointer<vtkTubeFilter> tubes =
-                vtkSmartPointer<vtkTubeFilter>::New();
+            auto tubes = vtkSmartPointer<vtkTubeFilter>::New();
             tubes->SetInputData(data);
             tubes->SetRadius(tubeRadius_);
             tubes->SetNumberOfSides(20);
@@ -138,7 +129,7 @@ Foam::functionObjects::runTimePostPro::pathline::pathline
     geometryBase(parent, dict, colours),
     representation_
     (
-        representationTypeNames.read(dict.lookup("representation"))
+        representationTypeNames.lookup("representation", dict)
     ),
     tubeRadius_(0.0),
     lineColour_(nullptr)
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.H b/src/functionObjects/graphics/runTimePostProcessing/pathline.H
index 209a2887cd..fb4893cb7e 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pathline.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.H
@@ -35,7 +35,7 @@ SourceFiles
 #define functionObjects_runTimePostPro_pathline_H
 
 #include "geometryBase.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,7 +71,7 @@ public:
             rtVector
         };
 
-        static const NamedEnum<representationType, 4> representationTypeNames;
+        static const Enum<representationType> representationTypeNames;
 
 
 private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.C b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
index 94c289d1f7..e9c8afacce 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
@@ -48,24 +48,17 @@ namespace runTimePostPro
     defineRunTimeSelectionTable(pointData, dictionary);
 }
 }
-template<>
-const char* NamedEnum
-<
-    functionObjects::runTimePostPro::pointData::representationType,
-    2
->::names[] =
-{
-    "sphere",
-    "vector"
-};
 }
 
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::runTimePostPro::pointData::representationType,
-    2
+    Foam::functionObjects::runTimePostPro::pointData::representationType
 >
-    Foam::functionObjects::runTimePostPro::pointData::representationTypeNames;
+Foam::functionObjects::runTimePostPro::pointData::representationTypeNames
+{
+    { representationType::rtSphere, "sphere" },
+    { representationType::rtVector, "vector" },
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -106,7 +99,7 @@ Foam::functionObjects::runTimePostPro::pointData::pointData
     geometryBase(parent, dict, colours),
     representation_
     (
-        representationTypeNames.read(dict.lookup("representation"))
+        representationTypeNames.lookup("representation", dict)
     ),
     maxGlyphLength_(readScalar(dict.lookup("maxGlyphLength"))),
     pointColour_(nullptr)
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.H b/src/functionObjects/graphics/runTimePostProcessing/pointData.H
index 41c425e4aa..73f7b5f61d 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.H
@@ -35,7 +35,7 @@ SourceFiles
 #define functionObjects_runTimePostPro_pointData_H
 
 #include "geometryBase.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,7 +69,7 @@ public:
             rtVector                //!< Vector
         };
 
-        static const NamedEnum<representationType, 2> representationTypeNames;
+        static const Enum<representationType> representationTypeNames;
 
 
 private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C b/src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C
index fe97eba4b3..1a2e917101 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C
@@ -150,8 +150,7 @@ bool Foam::functionObjects::runTimePostProcessing::write()
     sigFpe::unset(false);
 
     // Initialise render window
-    vtkSmartPointer<vtkRenderWindow> renderWindow =
-        vtkSmartPointer<vtkRenderWindow>::New();
+    auto renderWindow = vtkSmartPointer<vtkRenderWindow>::New();
     renderWindow->OffScreenRenderingOn();
     renderWindow->SetSize(output_.width_, output_.height_);
     renderWindow->SetAAFrames(10);
@@ -159,7 +158,7 @@ bool Foam::functionObjects::runTimePostProcessing::write()
     renderWindow->SetMultiSamples(0);
 //    renderWindow->PolygonSmoothingOn();
 
-    vtkSmartPointer<vtkRenderer> renderer = vtkSmartPointer<vtkRenderer>::New();
+    auto renderer = vtkSmartPointer<vtkRenderer>::New();
     scene_.initialise(renderer, output_.name_);
 
     renderWindow->AddRenderer(renderer);
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.C b/src/functionObjects/graphics/runTimePostProcessing/scene.C
index cd74326a16..d984e9f03b 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.C
@@ -186,20 +186,19 @@ void Foam::functionObjects::runTimePostPro::scene::initialise
     renderer->SetOcclusionRatio(0);
 
     // Set the camera
-    vtkSmartPointer<vtkCamera> camera = vtkSmartPointer<vtkCamera>::New();
+    auto camera = vtkSmartPointer<vtkCamera>::New();
     camera->SetParallelProjection(parallelProjection_);
     renderer->SetActiveCamera(camera);
 
     // Add the lights
-    vtkSmartPointer<vtkLightKit> lightKit = vtkSmartPointer<vtkLightKit>::New();
+    auto lightKit = vtkSmartPointer<vtkLightKit>::New();
     lightKit->AddLightsToRenderer(renderer);
 
     if (!clipBox_.empty())
     {
         const point& min = clipBox_.min();
         const point& max = clipBox_.max();
-        vtkSmartPointer<vtkCubeSource> clipBox =
-            vtkSmartPointer<vtkCubeSource>::New();
+        auto clipBox = vtkSmartPointer<vtkCubeSource>::New();
         clipBox->SetXLength(max.x() - min.x());
         clipBox->SetYLength(max.y() - min.y());
         clipBox->SetZLength(max.z() - min.z());
@@ -209,8 +208,7 @@ void Foam::functionObjects::runTimePostPro::scene::initialise
             min.y() + 0.5*(max.y() - min.y()),
             min.z() + 0.5*(max.z() - min.z())
         );
-        vtkSmartPointer<vtkPolyDataMapper> clipMapper =
-            vtkSmartPointer<vtkPolyDataMapper>::New();
+        auto clipMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
         clipMapper->SetInputConnection(clipBox->GetOutputPort());
 
         clipBoxActor_ = vtkSmartPointer<vtkActor>::New();
@@ -401,8 +399,7 @@ void Foam::functionObjects::runTimePostPro::scene::saveImage
     renderWindow->Render();
 
     // Set up off-screen rendering
-    vtkSmartPointer<vtkWindowToImageFilter> windowToImageFilter =
-        vtkSmartPointer<vtkWindowToImageFilter>::New();
+    auto windowToImageFilter = vtkSmartPointer<vtkWindowToImageFilter>::New();
 
     windowToImageFilter->SetInput(renderWindow);
 
@@ -414,7 +411,7 @@ void Foam::functionObjects::runTimePostPro::scene::saveImage
     windowToImageFilter->Update();
 
     // Save the image
-    vtkSmartPointer<vtkPNGWriter> writer = vtkSmartPointer<vtkPNGWriter>::New();
+    auto writer = vtkSmartPointer<vtkPNGWriter>::New();
     fileName fName(prefix/outputName_ + '.' + frameIndexStr() + ".png");
     writer->SetFileName(fName.c_str());
     writer->SetInputConnection(windowToImageFilter->GetOutputPort());
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.H b/src/functionObjects/graphics/runTimePostProcessing/scene.H
index 127fcb6db6..407896dc4c 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.H
@@ -62,7 +62,7 @@ SourceFiles
 #include "vector.H"
 #include "point.H"
 #include "boundBox.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "HashPtrTable.H"
 #include "vector.H"
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/surface.C b/src/functionObjects/graphics/runTimePostProcessing/surface.C
index 5c0383c4ab..809b8294ad 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/surface.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/surface.C
@@ -48,27 +48,21 @@ namespace runTimePostPro
     defineRunTimeSelectionTable(surface, dictionary);
 }
 }
-template<>
-const char* NamedEnum
-<
-    functionObjects::runTimePostPro::surface::representationType,
-    5
->::names[] =
-{
-    "none",
-    "wireframe",
-    "surface",
-    "surfaceWithEdges",
-    "glyph"
-};
 }
 
-const Foam::NamedEnum
+
+const Foam::Enum
 <
-    Foam::functionObjects::runTimePostPro::surface::representationType,
-    5
+    Foam::functionObjects::runTimePostPro::surface::representationType
 >
-    Foam::functionObjects::runTimePostPro::surface::representationTypeNames;
+Foam::functionObjects::runTimePostPro::surface::representationTypeNames
+{
+    { representationType::rtNone, "none" },
+    { representationType::rtWireframe, "wireframe" },
+    { representationType::rtSurface, "surface" },
+    { representationType::rtSurfaceWithEdges, "surfaceWithEdges" },
+    { representationType::rtGlyph, "glyph" },
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -120,8 +114,7 @@ void Foam::functionObjects::runTimePostPro::surface::addFeatureEdges
         return;
     }
 
-    vtkSmartPointer<vtkFeatureEdges> featureEdges =
-        vtkSmartPointer<vtkFeatureEdges>::New();
+    auto featureEdges = vtkSmartPointer<vtkFeatureEdges>::New();
     featureEdges->SetInputData(data);
     featureEdges->BoundaryEdgesOn();
     featureEdges->FeatureEdgesOn();
@@ -131,8 +124,7 @@ void Foam::functionObjects::runTimePostPro::surface::addFeatureEdges
     featureEdges->ColoringOff();
     featureEdges->Update();
 
-    vtkSmartPointer<vtkPolyDataMapper> mapper =
-        vtkSmartPointer<vtkPolyDataMapper>::New();
+    auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
     mapper->SetInputConnection(featureEdges->GetOutputPort());
     mapper->ScalarVisibilityOff();
 
@@ -157,7 +149,7 @@ Foam::functionObjects::runTimePostPro::surface::surface
     geometryBase(parent, dict, colours),
     representation_
     (
-        representationTypeNames.read(dict.lookup("representation"))
+        representationTypeNames.lookup("representation", dict)
     ),
     featureEdges_(false),
     surfaceColour_(nullptr),
diff --git a/src/functionObjects/graphics/runTimePostProcessing/surface.H b/src/functionObjects/graphics/runTimePostProcessing/surface.H
index e1510cab89..3913087aa8 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/surface.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/surface.H
@@ -35,7 +35,7 @@ SourceFiles
 #define functionObjects_runTimePostPro_surface_H
 
 #include "geometryBase.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "runTimeSelectionTables.H"
 
 #include "vtkSmartPointer.h"
@@ -74,7 +74,7 @@ public:
             rtGlyph
         };
 
-        static const NamedEnum<representationType, 5> representationTypeNames;
+        static const Enum<representationType> representationTypeNames;
 
 
 private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/text.C b/src/functionObjects/graphics/runTimePostProcessing/text.C
index fc395f5717..f83d31118f 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/text.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/text.C
@@ -81,7 +81,7 @@ void Foam::functionObjects::runTimePostPro::text::addGeometryToScene
         return;
     }
 
-    vtkSmartPointer<vtkTextActor> actor = vtkSmartPointer<vtkTextActor>::New();
+    auto actor = vtkSmartPointer<vtkTextActor>::New();
 
     // Concatenate string with timeStamp if true
     string textAndTime = string_;
diff --git a/src/functionObjects/utilities/abort/abort.C b/src/functionObjects/utilities/abort/abort.C
index ef2b3cbf39..93055ef551 100644
--- a/src/functionObjects/utilities/abort/abort.C
+++ b/src/functionObjects/utilities/abort/abort.C
@@ -48,23 +48,17 @@ namespace functionObjects
 }
 }
 
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::functionObjects::abort::actionType,
-    3
->::names[] =
-{
-    "noWriteNow",
-    "writeNow",
-    "nextWrite"
-};
 
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::abort::actionType,
-    3
-> Foam::functionObjects::abort::actionTypeNames_;
+    Foam::Time::stopAtControls
+>
+Foam::functionObjects::abort::actionNames_
+{
+    { Time::stopAtControls::saNoWriteNow, "noWriteNow" },
+    { Time::stopAtControls::saWriteNow, "writeNow" },
+    { Time::stopAtControls::saNextWrite, "nextWrite" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -94,7 +88,7 @@ Foam::functionObjects::abort::abort
     functionObject(name),
     time_(runTime),
     abortFile_("$FOAM_CASE/" + name),
-    action_(nextWrite)
+    action_(Time::stopAtControls::saNextWrite)
 {
     abortFile_.expand();
     read(dict);
@@ -116,14 +110,12 @@ bool Foam::functionObjects::abort::read(const dictionary& dict)
 {
     functionObject::read(dict);
 
-    if (dict.found("action"))
-    {
-        action_ = actionTypeNames_.read(dict.lookup("action"));
-    }
-    else
-    {
-        action_ = nextWrite;
-    }
+    action_ = actionNames_.lookupOrDefault
+    (
+        "action",
+        dict,
+        Time::stopAtControls::saNextWrite
+    );
 
     if (dict.readIfPresent("file", abortFile_))
     {
@@ -143,9 +135,9 @@ bool Foam::functionObjects::abort::execute()
     {
         switch (action_)
         {
-            case noWriteNow :
+            case Time::saNoWriteNow :
             {
-                if (time_.stopAt(Time::saNoWriteNow))
+                if (time_.stopAt(action_))
                 {
                     Info<< "USER REQUESTED ABORT (timeIndex="
                         << time_.timeIndex()
@@ -155,9 +147,9 @@ bool Foam::functionObjects::abort::execute()
                 break;
             }
 
-            case writeNow :
+            case Time::saWriteNow :
             {
-                if (time_.stopAt(Time::saWriteNow))
+                if (time_.stopAt(action_))
                 {
                     Info<< "USER REQUESTED ABORT (timeIndex="
                         << time_.timeIndex()
@@ -167,9 +159,9 @@ bool Foam::functionObjects::abort::execute()
                 break;
             }
 
-            case nextWrite :
+            case Time::saNextWrite :
             {
-                if (time_.stopAt(Time::saNextWrite))
+                if (time_.stopAt(action_))
                 {
                     Info<< "USER REQUESTED ABORT (timeIndex="
                         << time_.timeIndex()
@@ -178,6 +170,11 @@ bool Foam::functionObjects::abort::execute()
                 }
                 break;
             }
+
+            default:
+            {
+                // Invalid choices already filtered out by Enum
+            }
         }
     }
 
diff --git a/src/functionObjects/utilities/abort/abort.H b/src/functionObjects/utilities/abort/abort.H
index d9c16c8a23..3106f857cc 100644
--- a/src/functionObjects/utilities/abort/abort.H
+++ b/src/functionObjects/utilities/abort/abort.H
@@ -45,7 +45,7 @@ SourceFiles
 #define functionObjects_abort_H
 
 #include "functionObject.H"
-#include "NamedEnum.H"
+#include "Time.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,33 +62,19 @@ class abort
 :
     public functionObject
 {
-public:
-
-    // Public data
-
-        //- Enumeration defining the type of action
-        enum actionType
-        {
-            noWriteNow,    //!< stop immediately without writing data
-            writeNow,      //!< write data and stop immediately
-            nextWrite      //!< stop the next time data are written
-        };
-
-private:
-
     // Private data
 
+        //- A subset of Time stopAtControls
+        static const Enum<Time::stopAtControls> actionNames_;
+
         //- Reference to the Time
         const Time& time_;
 
         //- The fully-qualified name of the abort file
         fileName abortFile_;
 
-        //- Action type names
-        static const NamedEnum<actionType, 3> actionTypeNames_;
-
         //- The type of action
-        actionType action_;
+        Time::stopAtControls action_;
 
 
     // Private Member Functions
@@ -97,10 +83,10 @@ private:
         void removeFile() const;
 
         //- Disallow default bitwise copy construct
-        abort(const abort&);
+        abort(const abort&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const abort&);
+        void operator=(const abort&) = delete;
 
 
 public:
@@ -127,7 +113,7 @@ public:
     // Member Functions
 
         //- Read the dictionary settings
-        virtual bool read(const dictionary&);
+        virtual bool read(const dictionary& dict);
 
         //- Execute, check existence of abort file and take action
         virtual bool execute();
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
index 4967d50143..8bc3ac5e46 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
@@ -47,32 +47,21 @@ namespace runTimeControls
 }
 }
 }
-template<>
-const char* Foam::NamedEnum
-<
-    Foam
-  ::functionObjects
-  ::runTimeControls
-  ::equationInitialResidualCondition
-  ::operatingMode,
-    2
->::names[] =
-{
-    "minimum",
-    "maximum"
-};
 
-const Foam::NamedEnum
+const Foam::Enum
 <
     Foam
   ::functionObjects
   ::runTimeControls
   ::equationInitialResidualCondition
-  ::operatingMode,
-    2
+  ::operatingMode
 >
 Foam::functionObjects::runTimeControls::equationInitialResidualCondition::
-    operatingModeNames;
+operatingModeNames
+{
+    { operatingMode::omMin, "minimum" },
+    { operatingMode::omMax, "maximum" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -90,7 +79,7 @@ equationInitialResidualCondition
     fieldNames_(dict.lookup("fields")),
     value_(readScalar(dict.lookup("value"))),
     timeStart_(dict.lookupOrDefault("timeStart", -GREAT)),
-    mode_(operatingModeNames.read(dict.lookup("mode")))
+    mode_(operatingModeNames.lookup("mode", dict))
 {
     if (fieldNames_.size())
     {
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H
index 85dc192476..849342ad55 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H
@@ -37,7 +37,7 @@ SourceFiles
 #define functionObjects_runTimeControls_equationInitialResidualCondition_H
 
 #include "runTimeCondition.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,7 +64,7 @@ public:
         omMax           //!< Maximum
     };
 
-    static const NamedEnum<operatingMode, 2> operatingModeNames;
+    static const Enum<operatingMode> operatingModeNames;
 
 
 protected:
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
index e848a31087..e7b2062fb5 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
@@ -57,27 +57,19 @@ namespace runTimeControls
 }
 }
 
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::functionObjects::runTimeControls::minMaxCondition::modeType,
-    2
->::names[] =
-{
-    "minimum",
-    "maximum"
-};
-
-const Foam::NamedEnum
+const Foam::Enum
 <
     Foam
   ::functionObjects
   ::runTimeControls
   ::minMaxCondition
-  ::modeType,
-   2
+  ::modeType
 >
-    Foam::functionObjects::runTimeControls::minMaxCondition::modeTypeNames_;
+Foam::functionObjects::runTimeControls::minMaxCondition::modeTypeNames_
+{
+    { modeType::mdMin, "minimum" },
+    { modeType::mdMax, "maximum" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -92,7 +84,7 @@ Foam::functionObjects::runTimeControls::minMaxCondition::minMaxCondition
 :
     runTimeCondition(name, obr, dict, state),
     functionObjectName_(dict.lookup("functionObject")),
-    mode_(modeTypeNames_.read(dict.lookup("mode"))),
+    mode_(modeTypeNames_.lookup("mode", dict)),
     fieldNames_(dict.lookup("fields")),
     value_(readScalar(dict.lookup("value")))
 {}
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H
index 27cbe4356d..ef95f935cd 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H
@@ -38,7 +38,7 @@ SourceFiles
 #define functionObjects_runTimeControls_minMaxCondition_H
 
 #include "runTimeCondition.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,7 +68,7 @@ public:
             mdMax           //!< Maximum
         };
 
-        static const NamedEnum<modeType, 2> modeTypeNames_;
+        static const Enum<modeType> modeTypeNames_;
 
 
 protected:
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
index a207a8a49e..c68069e468 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
@@ -37,7 +37,6 @@ SourceFiles
 #define functionObjects_runTimeConditions_minTimeStepCondition_H
 
 #include "runTimeCondition.H"
-#include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.C b/src/functionObjects/utilities/writeObjects/writeObjects.C
index eade946402..de38050552 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.C
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.C
@@ -45,24 +45,17 @@ namespace functionObjects
 }
 }
 
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::functionObjects::writeObjects::writeOption,
-    3
->::names[] =
+    Foam::functionObjects::writeObjects::writeOption
+>
+Foam::functionObjects::writeObjects::writeOptionNames_
 {
-    "autoWrite",
-    "noWrite",
-    "anyWrite"
+    { writeOption::AUTO_WRITE, "autoWrite" },
+    { writeOption::NO_WRITE, "noWrite" },
+    { writeOption::ANY_WRITE, "anyWrite" },
 };
 
-const Foam::NamedEnum
-<
-    Foam::functionObjects::writeObjects::writeOption,
-    3
-> Foam::functionObjects::writeObjects::writeOptionNames_;
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -114,14 +107,12 @@ bool Foam::functionObjects::writeObjects::read(const dictionary& dict)
         dict.lookup("objects") >> objectNames_;
     }
 
-    if (dict.found("writeOption"))
-    {
-        writeOption_ = writeOptionNames_.read(dict.lookup("writeOption"));
-    }
-    else
-    {
-        writeOption_ = ANY_WRITE;
-    }
+    writeOption_ = writeOptionNames_.lookupOrDefault
+    (
+        "writeOption",
+        dict,
+        writeOption::ANY_WRITE
+    );
 
     return true;
 }
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.H b/src/functionObjects/utilities/writeObjects/writeObjects.H
index 0858772e1f..f86364a1b7 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.H
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.H
@@ -84,8 +84,8 @@ SourceFiles
 #define functionObjects_writeObjects_H
 
 #include "functionObject.H"
-#include "wordReList.H"
-#include "NamedEnum.H"
+#include "wordRes.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -119,7 +119,7 @@ public:
             ANY_WRITE
         };
 
-        static const NamedEnum<writeOption, 3> writeOptionNames_;
+        static const Enum<writeOption> writeOptionNames_;
 
 private:
 
@@ -138,10 +138,10 @@ private:
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        writeObjects(const writeObjects&);
+        writeObjects(const writeObjects&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const writeObjects&);
+        void operator=(const writeObjects&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 52d68a6fb6..85d3cd19fd 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -30,31 +30,23 @@ License
 #include "fvMesh.H"
 #include "displacementMotionSolver.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char*
-NamedEnum<surfaceDisplacementPointPatchVectorField::projectMode, 3>::
-names[] =
+const Foam::Enum
+<
+    Foam::surfaceDisplacementPointPatchVectorField::projectMode
+>
+Foam::surfaceDisplacementPointPatchVectorField::projectModeNames_
 {
-    "nearest",
-    "pointNormal",
-    "fixedNormal"
+    { projectMode::NEAREST, "nearest" },
+    { projectMode::POINTNORMAL, "pointNormal" },
+    { projectMode::FIXEDNORMAL, "fixedNormal" },
 };
 
-const NamedEnum<surfaceDisplacementPointPatchVectorField::projectMode, 3>
-    surfaceDisplacementPointPatchVectorField::projectModeNames_;
-
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void surfaceDisplacementPointPatchVectorField::calcProjection
+void Foam::surfaceDisplacementPointPatchVectorField::calcProjection
 (
     vectorField& displacement
 ) const
@@ -300,7 +292,7 @@ void surfaceDisplacementPointPatchVectorField::calcProjection
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
 surfaceDisplacementPointPatchVectorField
 (
     const pointPatch& p,
@@ -315,7 +307,7 @@ surfaceDisplacementPointPatchVectorField
 {}
 
 
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
 surfaceDisplacementPointPatchVectorField
 (
     const pointPatch& p,
@@ -326,7 +318,7 @@ surfaceDisplacementPointPatchVectorField
     fixedValuePointPatchVectorField(p, iF, dict),
     velocity_(dict.lookup("velocity")),
     surfacesDict_(dict.subDict("geometry")),
-    projectMode_(projectModeNames_.read(dict.lookup("projectMode"))),
+    projectMode_(projectModeNames_.lookup("projectMode", dict)),
     projectDir_(dict.lookup("projectDirection")),
     wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
     frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
@@ -342,7 +334,7 @@ surfaceDisplacementPointPatchVectorField
 }
 
 
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
 surfaceDisplacementPointPatchVectorField
 (
     const surfaceDisplacementPointPatchVectorField& ppf,
@@ -361,7 +353,7 @@ surfaceDisplacementPointPatchVectorField
 {}
 
 
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
 surfaceDisplacementPointPatchVectorField
 (
     const surfaceDisplacementPointPatchVectorField& ppf
@@ -377,7 +369,7 @@ surfaceDisplacementPointPatchVectorField
 {}
 
 
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
 surfaceDisplacementPointPatchVectorField
 (
     const surfaceDisplacementPointPatchVectorField& ppf,
@@ -396,8 +388,8 @@ surfaceDisplacementPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const searchableSurfaces&
-surfaceDisplacementPointPatchVectorField::surfaces() const
+const Foam::searchableSurfaces&
+Foam::surfaceDisplacementPointPatchVectorField::surfaces() const
 {
     if (surfacesPtr_.empty())
     {
@@ -423,7 +415,7 @@ surfaceDisplacementPointPatchVectorField::surfaces() const
 }
 
 
-void surfaceDisplacementPointPatchVectorField::updateCoeffs()
+void Foam::surfaceDisplacementPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
     {
@@ -469,38 +461,33 @@ void surfaceDisplacementPointPatchVectorField::updateCoeffs()
 }
 
 
-void surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
+void Foam::surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
 {
     fixedValuePointPatchVectorField::write(os);
-    os.writeKeyword("velocity") << velocity_
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("geometry") << surfacesDict_
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("projectMode") << projectModeNames_[projectMode_]
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("projectDirection") << projectDir_
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("wedgePlane") << wedgePlane_
-        << token::END_STATEMENT << nl;
+    os.writeEntry("velocity", velocity_);
+    os.writeEntry("geometry", surfacesDict_);
+    os.writeEntry("projectMode", projectModeNames_[projectMode_]);
+    os.writeEntry("projectDirection", projectDir_);
+    os.writeEntry("wedgePlane", wedgePlane_);
+
     if (frozenPointsZone_ != word::null)
     {
-        os.writeKeyword("frozenPointsZone") << frozenPointsZone_
-            << token::END_STATEMENT << nl;
+        os.writeEntry("frozenPointsZone", frozenPointsZone_);
     }
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+namespace Foam
+{
+
 makePointPatchTypeField
 (
     fixedValuePointPatchVectorField,
     surfaceDisplacementPointPatchVectorField
 );
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
index c5db3f0c6a..652794efa7 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
@@ -60,6 +60,7 @@ SourceFiles
 #include "pointPatchFields.H"
 #include "fixedValuePointPatchFields.H"
 #include "searchableSurfaces.H"
+#include "Enum.H"
 #include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -92,7 +93,7 @@ private:
     // Private data
 
         //- Project mode names
-        static const NamedEnum<projectMode, 3> projectModeNames_;
+        static const Enum<projectMode> projectModeNames_;
 
         //- Maximum velocity
         const vector velocity_;
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 6eee20eb32..a85df2a863 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -30,30 +30,23 @@ License
 #include "fvMesh.H"
 #include "displacementMotionSolver.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
-const char*
-NamedEnum<surfaceSlipDisplacementPointPatchVectorField::projectMode, 3>::
-names[] =
+const Foam::Enum
+<
+    Foam::surfaceSlipDisplacementPointPatchVectorField::projectMode
+>
+Foam::surfaceSlipDisplacementPointPatchVectorField::projectModeNames_
 {
-    "nearest",
-    "pointNormal",
-    "fixedNormal"
+    { projectMode::NEAREST, "nearest" },
+    { projectMode::POINTNORMAL, "pointNormal" },
+    { projectMode::FIXEDNORMAL, "fixedNormal" },
 };
 
-const NamedEnum<surfaceSlipDisplacementPointPatchVectorField::projectMode, 3>
-    surfaceSlipDisplacementPointPatchVectorField::projectModeNames_;
-
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void surfaceSlipDisplacementPointPatchVectorField::calcProjection
+void Foam::surfaceSlipDisplacementPointPatchVectorField::calcProjection
 (
     vectorField& displacement
 ) const
@@ -299,7 +292,7 @@ void surfaceSlipDisplacementPointPatchVectorField::calcProjection
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
 surfaceSlipDisplacementPointPatchVectorField
 (
     const pointPatch& p,
@@ -313,7 +306,7 @@ surfaceSlipDisplacementPointPatchVectorField
 {}
 
 
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
 surfaceSlipDisplacementPointPatchVectorField
 (
     const pointPatch& p,
@@ -323,14 +316,14 @@ surfaceSlipDisplacementPointPatchVectorField
 :
     pointPatchVectorField(p, iF, dict),
     surfacesDict_(dict.subDict("geometry")),
-    projectMode_(projectModeNames_.read(dict.lookup("projectMode"))),
+    projectMode_(projectModeNames_.lookup("projectMode", dict)),
     projectDir_(dict.lookup("projectDirection")),
     wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
     frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
 {}
 
 
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
 surfaceSlipDisplacementPointPatchVectorField
 (
     const surfaceSlipDisplacementPointPatchVectorField& ppf,
@@ -348,7 +341,7 @@ surfaceSlipDisplacementPointPatchVectorField
 {}
 
 
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
 surfaceSlipDisplacementPointPatchVectorField
 (
     const surfaceSlipDisplacementPointPatchVectorField& ppf
@@ -363,7 +356,7 @@ surfaceSlipDisplacementPointPatchVectorField
 {}
 
 
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
 surfaceSlipDisplacementPointPatchVectorField
 (
     const surfaceSlipDisplacementPointPatchVectorField& ppf,
@@ -381,8 +374,8 @@ surfaceSlipDisplacementPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const searchableSurfaces&
-surfaceSlipDisplacementPointPatchVectorField::surfaces() const
+const Foam::searchableSurfaces&
+Foam::surfaceSlipDisplacementPointPatchVectorField::surfaces() const
 {
     if (surfacesPtr_.empty())
     {
@@ -408,7 +401,7 @@ surfaceSlipDisplacementPointPatchVectorField::surfaces() const
 }
 
 
-void surfaceSlipDisplacementPointPatchVectorField::evaluate
+void Foam::surfaceSlipDisplacementPointPatchVectorField::evaluate
 (
     const Pstream::commsTypes commsType
 )
@@ -428,36 +421,34 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
 }
 
 
-void surfaceSlipDisplacementPointPatchVectorField::write(Ostream& os) const
+void Foam::surfaceSlipDisplacementPointPatchVectorField::write
+(
+    Ostream& os
+) const
 {
     pointPatchVectorField::write(os);
-    os.writeKeyword("geometry") << surfacesDict_
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("projectMode") << projectModeNames_[projectMode_]
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("projectDirection") << projectDir_
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("wedgePlane") << wedgePlane_
-        << token::END_STATEMENT << nl;
+    os.writeEntry("geometry", surfacesDict_);
+    os.writeEntry("projectMode", projectModeNames_[projectMode_]);
+    os.writeEntry("projectDirection", projectDir_);
+    os.writeEntry("wedgePlane", wedgePlane_);
     if (frozenPointsZone_ != word::null)
     {
-        os.writeKeyword("frozenPointsZone") << frozenPointsZone_
-            << token::END_STATEMENT << nl;
+        os.writeEntry("frozenPointsZone", frozenPointsZone_);
     }
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+namespace Foam
+{
+
 makePointPatchTypeField
 (
     pointPatchVectorField,
     surfaceSlipDisplacementPointPatchVectorField
 );
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
index 1e1cc4838e..d6de719e54 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
@@ -86,7 +86,7 @@ private:
     // Private data
 
         //- Project mode names
-        static const NamedEnum<projectMode, 3> projectModeNames_;
+        static const Enum<projectMode> projectModeNames_;
 
         //- Names of surfaces
         const dictionary surfacesDict_;
diff --git a/src/fvOptions/cellSetOption/cellSetOption.C b/src/fvOptions/cellSetOption/cellSetOption.C
index 929b457a7e..28d0586221 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.C
+++ b/src/fvOptions/cellSetOption/cellSetOption.C
@@ -34,24 +34,22 @@ namespace Foam
     {
         defineTypeNameAndDebug(cellSetOption, 0);
     }
-
-    template<> const char* NamedEnum
-    <
-        fv::cellSetOption::selectionModeType,
-        4
-        >::names[] =
-    {
-        "points",
-        "cellSet",
-        "cellZone",
-        "all"
-    };
-
-    const NamedEnum<fv::cellSetOption::selectionModeType, 4>
-        fv::cellSetOption::selectionModeTypeNames_;
 }
 
 
+const Foam::Enum
+<
+    Foam::fv::cellSetOption::selectionModeType
+>
+Foam::fv::cellSetOption::selectionModeTypeNames_
+{
+    { selectionModeType::smPoints, "points" },
+    { selectionModeType::smCellSet, "cellSet" },
+    { selectionModeType::smCellZone, "cellZone" },
+    { selectionModeType::smAll, "all" },
+};
+
+
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::fv::cellSetOption::setSelection(const dictionary& dict)
@@ -82,7 +80,7 @@ void Foam::fv::cellSetOption::setSelection(const dictionary& dict)
             FatalErrorInFunction
                 << "Unknown selectionMode "
                 << selectionModeTypeNames_[selectionMode_]
-                << ". Valid selectionMode types are "
+                << ". Valid selectionMode types : "
                 << selectionModeTypeNames_
                 << exit(FatalError);
         }
@@ -210,7 +208,7 @@ Foam::fv::cellSetOption::cellSetOption
     duration_(0.0),
     selectionMode_
     (
-        selectionModeTypeNames_.read(coeffs_.lookup("selectionMode"))
+        selectionModeTypeNames_.lookup("selectionMode", coeffs_)
     ),
     cellSetName_("none"),
     V_(0.0)
diff --git a/src/fvOptions/cellSetOption/cellSetOption.H b/src/fvOptions/cellSetOption/cellSetOption.H
index 6dd94847c7..312768a0f4 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.H
+++ b/src/fvOptions/cellSetOption/cellSetOption.H
@@ -84,9 +84,8 @@ public:
             smAll
         };
 
-        //- Word list of selection mode type names
-        static const NamedEnum<selectionModeType, 4>
-            selectionModeTypeNames_;
+        //- List of selection mode type names
+        static const Enum<selectionModeType> selectionModeTypeNames_;
 
 
 protected:
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 2fdfeddd13..32446b4fb2 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -43,18 +43,17 @@ namespace Foam
             dictionary
         );
     }
-
-    template<>
-    const char* NamedEnum<fv::fixedTemperatureConstraint::temperatureMode, 2>::
-    names[] =
-    {
-        "uniform",
-        "lookup"
-    };
 }
 
-const Foam::NamedEnum<Foam::fv::fixedTemperatureConstraint::temperatureMode, 2>
-    Foam::fv::fixedTemperatureConstraint::temperatureModeNames_;
+const Foam::Enum
+<
+    Foam::fv::fixedTemperatureConstraint::temperatureMode
+>
+Foam::fv::fixedTemperatureConstraint::temperatureModeNames_
+{
+    { temperatureMode::tmUniform, "uniform" },
+    { temperatureMode::tmLookup, "lookup" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -68,7 +67,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
 )
 :
     cellSetOption(name, modelType, dict, mesh),
-    mode_(temperatureModeNames_.read(coeffs_.lookup("mode"))),
+    mode_(temperatureModeNames_.lookup("mode", coeffs_)),
     Tuniform_(nullptr),
     TName_("T")
 {
@@ -89,7 +88,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
         }
         default:
         {
-            // error handling done by NamedEnum
+            // Error handling already done by Enum
         }
     }
 
@@ -139,7 +138,7 @@ void Foam::fv::fixedTemperatureConstraint::constrain
         }
         default:
         {
-            // error handling done by NamedEnum
+            // Error handling already done by Enum
         }
     }
 }
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index a7c702944b..00c83396eb 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -60,7 +60,7 @@ SourceFiles
 #define fixedTemperatureConstraint_H
 
 #include "cellSetOption.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -90,7 +90,7 @@ public:
 
 
     //- String representation of temperatureMode enums
-    static const NamedEnum<temperatureMode, 2> temperatureModeNames_;
+    static const Enum<temperatureMode> temperatureModeNames_;
 
 
 protected:
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index 5456019055..e25aa741c9 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -65,9 +65,10 @@ void Foam::fv::interRegionOption::setMapper()
                 (
                     mesh_,
                     nbrMesh,
-                    meshToMesh::interpolationMethodNames_.read
+                    meshToMesh::interpolationMethodNames_.lookup
                     (
-                        coeffs_.lookup("interpolationMethod")
+                        "interpolationMethod",
+                        coeffs_
                     ),
                     false // not interpolating patches
                 )
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index 0bc5217e98..c05736e3c6 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -57,28 +57,16 @@ namespace fv
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::fv::
-        directionalPressureGradientExplicitSource::
-        pressureDropModel,
-        3
-    >::names[] =
-    {
-        "volumetricFlowRateTable",
-        "constant",
-        "DarcyForchheimer"
-    };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::fv::directionalPressureGradientExplicitSource::pressureDropModel,
-    3
-> Foam::fv::directionalPressureGradientExplicitSource::PressureDropModelNames_;
+    Foam::fv::directionalPressureGradientExplicitSource::pressureDropModel
+>
+Foam::fv::directionalPressureGradientExplicitSource::pressureDropModelNames_
+{
+    { pressureDropModel::pVolumetricFlowRateTable, "volumetricFlowRateTable" },
+    { pressureDropModel::pConstant, "constant" },
+    { pressureDropModel::pDarcyForchheimer, "DarcyForchheimer" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -178,7 +166,7 @@ directionalPressureGradientExplicitSource
 )
 :
     cellSetOption(sourceName, modelType, dict, mesh),
-    model_(PressureDropModelNames_.read(coeffs_.lookup("model"))),
+    model_(pressureDropModelNames_.lookup("model", coeffs_)),
     gradP0_(cells_.size(), Zero),
     dGradP_(cells_.size(), Zero),
     gradPporous_(cells_.size(), Zero),
@@ -236,7 +224,7 @@ directionalPressureGradientExplicitSource
             << "Did not find mode " << model_
             << nl
             << "Please set 'model' to one of "
-            << PressureDropModelNames_
+            << pressureDropModelNames_
             << exit(FatalError);
     }
 
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
index d53f1dc76c..d4cfaf63a8 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
@@ -126,9 +126,9 @@ private:
 
     // Private data
 
-        static const NamedEnum<pressureDropModel, 3> PressureDropModelNames_;
+        static const Enum<pressureDropModel> pressureDropModelNames_;
 
-         //- Pressure drop model
+        //- Pressure drop model
         pressureDropModel model_;
 
         //- Pressure gradient before correction
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index bf8594073b..c36123833a 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -41,30 +41,32 @@ namespace Foam
         defineTypeNameAndDebug(rotorDiskSource, 0);
         addToRunTimeSelectionTable(option, rotorDiskSource, dictionary);
     }
-
-    template<> const char* NamedEnum<fv::rotorDiskSource::geometryModeType, 2>::
-        names[] =
-    {
-        "auto",
-        "specified"
-    };
-
-    const NamedEnum<fv::rotorDiskSource::geometryModeType, 2>
-        fv::rotorDiskSource::geometryModeTypeNames_;
-
-    template<> const char* NamedEnum<fv::rotorDiskSource::inletFlowType, 3>::
-        names[] =
-    {
-        "fixed",
-        "surfaceNormal",
-        "local"
-    };
-
-    const NamedEnum<fv::rotorDiskSource::inletFlowType, 3>
-        fv::rotorDiskSource::inletFlowTypeNames_;
 }
 
 
+const Foam::Enum
+<
+    Foam::fv::rotorDiskSource::geometryModeType
+>
+Foam::fv::rotorDiskSource::geometryModeTypeNames_
+{
+    { geometryModeType::gmAuto, "auto" },
+    { geometryModeType::gmSpecified, "specified" },
+};
+
+
+const Foam::Enum
+<
+    Foam::fv::rotorDiskSource::inletFlowType
+>
+Foam::fv::rotorDiskSource::inletFlowTypeNames_
+{
+    { inletFlowType::ifFixed, "fixed" },
+    { inletFlowType::ifSurfaceNormal, "surfaceNormal" },
+    { inletFlowType::ifLocal, "local" },
+};
+
+
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::fv::rotorDiskSource::checkData()
@@ -267,7 +269,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
     vector refDir(Zero);
 
     geometryModeType gm =
-        geometryModeTypeNames_.read(coeffs_.lookup("geometryMode"));
+        geometryModeTypeNames_.lookup("geometryMode", coeffs_);
 
     switch (gm)
     {
@@ -596,7 +598,7 @@ bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
 
         coeffs_.lookup("nBlades") >> nBlades_;
 
-        inletFlow_ = inletFlowTypeNames_.read(coeffs_.lookup("inletFlowType"));
+        inletFlow_ = inletFlowTypeNames_.lookup("inletFlowType", coeffs_);
 
         coeffs_.lookup("tipEffect") >> tipEffect_;
 
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index 2ff034676a..ea8b3be22a 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -103,7 +103,7 @@ SourceFiles
 #include "cellSetOption.H"
 #include "cylindricalCS.H"
 #include "cylindrical.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "bladeModel.H"
 #include "profileModelList.H"
 #include "volFieldsFwd.H"
@@ -134,7 +134,7 @@ public:
         gmAuto,
         gmSpecified
     };
-    static const NamedEnum<geometryModeType, 2> geometryModeTypeNames_;
+    static const Enum<geometryModeType> geometryModeTypeNames_;
 
     enum inletFlowType
     {
@@ -142,7 +142,7 @@ public:
         ifSurfaceNormal,
         ifLocal
     };
-    static const NamedEnum<inletFlowType, 3> inletFlowTypeNames_;
+    static const Enum<inletFlowType> inletFlowTypeNames_;
 
 
 protected:
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
index 683e356b23..a8c5d41858 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@@ -204,7 +204,7 @@ Foam::targetCoeffTrim::targetCoeffTrim
     nIter_(50),
     tol_(1e-8),
     relax_(1.0),
-    dTheta_(degToRad(0.1)),
+    dTheta_(0.1_deg),
     alpha_(1.0)
 {
     read(dict);
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 7867633b8d..057614e094 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -36,17 +36,6 @@ License
 
 namespace Foam
 {
-    template<>
-    const char* NamedEnum
-    <
-        fv::solidificationMeltingSource::thermoMode,
-        2
-    >::names[] =
-    {
-        "thermo",
-        "lookup"
-    };
-
     namespace fv
     {
         defineTypeNameAndDebug(solidificationMeltingSource, 0);
@@ -60,8 +49,15 @@ namespace Foam
     }
 }
 
-const Foam::NamedEnum<Foam::fv::solidificationMeltingSource::thermoMode, 2>
-    Foam::fv::solidificationMeltingSource::thermoModeTypeNames_;
+const Foam::Enum
+<
+    Foam::fv::solidificationMeltingSource::thermoMode
+>
+Foam::fv::solidificationMeltingSource::thermoModeTypeNames_
+{
+    { thermoMode::mdThermo, "thermo" },
+    { thermoMode::mdLookup, "lookup" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -191,7 +187,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
     Tmelt_(readScalar(coeffs_.lookup("Tmelt"))),
     L_(readScalar(coeffs_.lookup("L"))),
     relax_(coeffs_.lookupOrDefault("relax", 0.9)),
-    mode_(thermoModeTypeNames_.read(coeffs_.lookup("thermoMode"))),
+    mode_(thermoModeTypeNames_.lookup("thermoMode", coeffs_)),
     rhoRef_(readScalar(coeffs_.lookup("rhoRef"))),
     TName_(coeffs_.lookupOrDefault<word>("T", "T")),
     CpName_(coeffs_.lookupOrDefault<word>("Cp", "Cp")),
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index d1ea36c07c..7c3b576a30 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -97,7 +97,7 @@ SourceFiles
 #include "fvMesh.H"
 #include "volFields.H"
 #include "cellSetOption.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -122,7 +122,7 @@ public:
         mdLookup
     };
 
-    static const NamedEnum<thermoMode, 2> thermoModeTypeNames_;
+    static const Enum<thermoMode> thermoModeTypeNames_;
 
 
 private:
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
index d1e924d36f..baaec14568 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
@@ -36,7 +36,7 @@ bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict)
 
         coeffs_.readIfPresent("relax", relax_);
 
-        mode_ = thermoModeTypeNames_.read(coeffs_.lookup("thermoMode"));
+        mode_ = thermoModeTypeNames_.lookup("thermoMode", coeffs_);
 
         coeffs_.lookup("rhoRef") >> rhoRef_;
         coeffs_.readIfPresent("T", TName_);
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index c48eccb11e..3cf82a868c 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -32,9 +32,9 @@ License
 
 template<class Type>
 const Foam::wordList Foam::fv::SemiImplicitSource<Type>::volumeModeTypeNames_
-(
-    IStringStream("(absolute specific)")()
-);
+{
+    "absolute", "specific"
+};
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index af0894d4f4..fe7fa6a32a 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -41,21 +41,17 @@ namespace Foam
             dictionary
         );
     }
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::fv::tabulatedNTUHeatTransfer::geometryModeType,
-        2
-    >::names[] =
-    {
-        "calculated",
-        "user"
-    };
 }
 
-const Foam::NamedEnum<Foam::fv::tabulatedNTUHeatTransfer::geometryModeType, 2>
-Foam::fv::tabulatedNTUHeatTransfer::geometryModelNames_;
+const Foam::Enum
+<
+    Foam::fv::tabulatedNTUHeatTransfer::geometryModeType
+>
+Foam::fv::tabulatedNTUHeatTransfer::geometryModelNames_
+{
+    { geometryModeType::gmCalculated, "calculated" },
+    { geometryModeType::gmUser, "user" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -93,8 +89,7 @@ void Foam::fv::tabulatedNTUHeatTransfer::initialiseGeometry()
 {
     if (Ain_ < 0)
     {
-        geometryMode_ =
-            geometryModelNames_.read(coeffs_.lookup("geometryMode"));
+        geometryMode_ = geometryModelNames_.lookup("geometryMode", coeffs_);
 
         Info<< "Region " << mesh_.name() << " " << type() << " " << name_ << " "
             << geometryModelNames_[geometryMode_] << " geometry:" << nl;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
index 0f087fd328..a0fd559193 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
@@ -107,7 +107,7 @@ SeeAlso
 #include "interRegionHeatTransferModel.H"
 #include "autoPtr.H"
 #include "interpolation2DTable.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "basicThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -135,7 +135,7 @@ public:
             gmUser
         };
 
-        static const NamedEnum<geometryModeType, 2> geometryModelNames_;
+        static const Enum<geometryModeType> geometryModelNames_;
 
 
 private:
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 3041ab5c54..27f74158e2 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -27,24 +27,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::phaseProperties::phaseType
+>
+Foam::phaseProperties::phaseTypeNames
 {
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::phaseProperties::phaseType,
-        4
-    >::names[] =
-    {
-        "gas",
-        "liquid",
-        "solid",
-        "unknown"
-    };
-}
-
-const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
-    Foam::phaseProperties::phaseTypeNames;
+    { phaseType::GAS, "gas" },
+    { phaseType::LIQUID, "liquid" },
+    { phaseType::SOLID, "solid" },
+    { phaseType::UNKNOWN, "unknown" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 2d775a7415..87b6882d6c 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef phaseProperties_H
 #define phaseProperties_H
 
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "Tuple2.H"
 #include "PtrList.H"
 #include "volFields.H"
@@ -74,7 +74,7 @@ public:
         };
 
         //- Corresponding word representations for phase type enumerations
-        static const NamedEnum<phaseType, 4> phaseTypeNames;
+        static const Enum<phaseType> phaseTypeNames;
 
 
 private:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
index 7c04d40d98..c6af1d2378 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -32,12 +32,10 @@ License
 
 template<class CloudType>
 Foam::wordList Foam::PatchInteractionModel<CloudType>::interactionTypeNames_
-(
-    IStringStream
-    (
-        "(rebound stick escape)"
-    )()
-);
+{
+    "rebound", "stick", "escape"
+};
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 425236a295..1a037fe3c7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -30,15 +30,9 @@ License
 template<class CloudType>
 const Foam::wordList Foam::PhaseChangeModel<CloudType>::
 enthalpyTransferTypeNames
-(
-    IStringStream
-    (
-        "("
-            "latentHeat "
-            "enthalpyDifference"
-        ")"
-    )()
-);
+{
+    "latentHeat", "enthalpyDifference"
+};
 
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index c8adea407c..6f9ccfe51e 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -34,12 +34,9 @@ using namespace Foam::constant::mathematical;
 
 template<class CloudType>
 Foam::wordList Foam::ThermoSurfaceFilm<CloudType>::interactionTypeNames_
-(
-    IStringStream
-    (
-        "(absorb bounce splashBai)"
-    )()
-);
+{
+    "absorb", "bounce", "splashBai"
+};
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index b12a3ef941..1f61bc1c36 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -38,12 +38,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::lumpedPointMovement::outputFormatType>
-    Foam::lumpedPointMovement::formatNames
-    {
-        { outputFormatType::PLAIN, "plain" },
-        { outputFormatType::DICTIONARY, "dictionary" }
-    };
+const Foam::Enum
+<
+    Foam::lumpedPointMovement::outputFormatType
+>
+Foam::lumpedPointMovement::formatNames
+{
+    { outputFormatType::PLAIN, "plain" },
+    { outputFormatType::DICTIONARY, "dictionary" }
+};
 
 
 const Foam::word
diff --git a/src/lumpedPointMotion/lumpedPointState.C b/src/lumpedPointMotion/lumpedPointState.C
index 511c756697..0ef9f5a48f 100644
--- a/src/lumpedPointMotion/lumpedPointState.C
+++ b/src/lumpedPointMotion/lumpedPointState.C
@@ -33,12 +33,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::lumpedPointState::inputFormatType>
-    Foam::lumpedPointState::formatNames
-    {
-        { inputFormatType::PLAIN, "plain" },
-        { inputFormatType::DICTIONARY, "dictionary" }
-    };
+const Foam::Enum
+<
+    Foam::lumpedPointState::inputFormatType
+>
+Foam::lumpedPointState::formatNames
+{
+    { inputFormatType::PLAIN, "plain" },
+    { inputFormatType::DICTIONARY, "dictionary" }
+};
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
@@ -175,12 +178,12 @@ void Foam::lumpedPointState::relax
         if (prev.degrees_)
         {
             // Was degrees, now radians
-            convert = degToRad(1);
+            convert = degToRad();
         }
         else
         {
             // Was radians, now degrees
-            convert = radToDeg(1);
+            convert = radToDeg();
         }
     }
 
diff --git a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
index 439707ddff..0fbd199b7b 100644
--- a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
+++ b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
@@ -70,7 +70,7 @@ Foam::Istream& Foam::operator>>(Istream& is, gradingDescriptors& gds)
         is.putBack(t);
 
         // Read the list for gradingDescriptors
-        is >> static_cast<List<gradingDescriptor>& >(gds);
+        is >> static_cast<List<gradingDescriptor>&>(gds);
 
         // Check state of Istream
         is.check(FUNCTION_NAME);
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index d09b9a95df..92eedd79ab 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,55 +63,45 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(meshRefinement, 0);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::meshRefinement::IOdebugType,
-        5
-    >::names[] =
-    {
-        "mesh",
-        "intersections",
-        "featureSeeds",
-        "attraction",
-        "layerInfo"
-    };
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::meshRefinement::IOoutputType,
-        1
-    >::names[] =
-    {
-        "layerInfo"
-    };
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::meshRefinement::IOwriteType,
-        5
-    >::names[] =
-    {
-        "mesh",
-        "noRefinement",
-        "scalarLevels",
-        "layerSets",
-        "layerFields"
-    };
-
 }
 
-const Foam::NamedEnum<Foam::meshRefinement::IOdebugType, 5>
-Foam::meshRefinement::IOdebugTypeNames;
 
-const Foam::NamedEnum<Foam::meshRefinement::IOoutputType, 1>
-Foam::meshRefinement::IOoutputTypeNames;
+const Foam::Enum
+<
+    Foam::meshRefinement::debugType
+>
+Foam::meshRefinement::debugTypeNames
+{
+    { debugType::MESH, "mesh" },
+    { debugType::OBJINTERSECTIONS, "intersections" },
+    { debugType::FEATURESEEDS, "featureSeeds" },
+    { debugType::ATTRACTION, "attraction" },
+    { debugType::LAYERINFO, "layerInfo" },
+};
 
-const Foam::NamedEnum<Foam::meshRefinement::IOwriteType, 5>
-Foam::meshRefinement::IOwriteTypeNames;
+
+const Foam::Enum
+<
+    Foam::meshRefinement::outputType
+>
+Foam::meshRefinement::outputTypeNames
+{
+    { outputType::OUTPUTLAYERINFO, "layerInfo" }
+};
+
+
+const Foam::Enum
+<
+    Foam::meshRefinement::writeType
+>
+Foam::meshRefinement::writeTypeNames
+{
+    { writeType::WRITEMESH, "mesh" },
+    { writeType::NOWRITEREFINEMENT, "noRefinement" },
+    { writeType::WRITELEVELS, "scalarLevels" },
+    { writeType::WRITELAYERSETS, "layerSets" },
+    { writeType::WRITELAYERFIELDS, "layerFields" },
+};
 
 
 Foam::meshRefinement::writeType Foam::meshRefinement::writeLevel_;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index 3500a3aef1..f0a9af23d1 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -82,64 +82,43 @@ class snapParameters;
 
 class meshRefinement
 {
-
 public:
 
     // Public data types
 
-        //- Enumeration for what to debug
-        enum IOdebugType
-        {
-            IOMESH,
-            IOOBJINTERSECTIONS,
-            IOFEATURESEEDS,
-            IOATTRACTION,
-            IOLAYERINFO
-        };
-
-        static const NamedEnum<IOdebugType, 5> IOdebugTypeNames;
+        //- Enumeration for what to debug. Used as a bit-pattern.
         enum debugType
         {
-            MESH = 1<<IOMESH,
-            OBJINTERSECTIONS = 1<<IOOBJINTERSECTIONS,
-            FEATURESEEDS = 1<<IOFEATURESEEDS,
-            ATTRACTION = 1<< IOATTRACTION,
-            LAYERINFO = 1<<IOLAYERINFO
+            MESH = (1 << 0),
+            OBJINTERSECTIONS = (1 << 1),
+            FEATURESEEDS = (1 << 2),
+            ATTRACTION = (1 << 3),
+            LAYERINFO = (1 << 4)
         };
 
-        //- Enumeration for what to output
-        enum IOoutputType
-        {
-            IOOUTPUTLAYERINFO
-        };
+        static const Enum<debugType> debugTypeNames;
 
-        static const NamedEnum<IOoutputType, 1> IOoutputTypeNames;
+        //- Enumeration for what to output. Used as a bit-pattern.
         enum outputType
         {
-            OUTPUTLAYERINFO = 1<<IOOUTPUTLAYERINFO
+            OUTPUTLAYERINFO = (1 << 0)
         };
 
-        //- Enumeration for what to write
-        enum IOwriteType
-        {
-            IOWRITEMESH,
-            IONOWRITEREFINEMENT,
-            IOWRITELEVELS,
-            IOWRITELAYERSETS,
-            IOWRITELAYERFIELDS
-        };
+        static const Enum<outputType> outputTypeNames;
 
-        static const NamedEnum<IOwriteType, 5> IOwriteTypeNames;
+        //- Enumeration for what to write. Used as a bit-pattern.
         enum writeType
         {
-            WRITEMESH = 1<<IOWRITEMESH,
-            NOWRITEREFINEMENT = 1<<IONOWRITEREFINEMENT,
-            WRITELEVELS = 1<<IOWRITELEVELS,
-            WRITELAYERSETS = 1<<IOWRITELAYERSETS,
-            WRITELAYERFIELDS = 1<<IOWRITELAYERFIELDS
+            WRITEMESH = (1 << 0),
+            NOWRITEREFINEMENT = (1 << 1),
+            WRITELEVELS = (1 << 2),
+            WRITELAYERSETS = (1 << 3),
+            WRITELAYERFIELDS = (1 << 4)
         };
 
-        //- Enumeration for how the userdata is to be mapped upon refinement.
+        static const Enum<writeType> writeTypeNames;
+
+        //- Enumeration for how userdata is to be mapped upon refinement.
         enum mapType
         {
             MASTERONLY = 1, //!< maintain master only
@@ -1476,10 +1455,13 @@ public:
             static void outputLevel(const outputType);
 
 
-            //- Helper: convert wordList into bit pattern using provided
-            //  NamedEnum
-            template<class Enum>
-            static int readFlags(const Enum& namedEnum, const wordList&);
+            //- Helper: convert wordList into bit pattern using provided Enum
+            template<class EnumContainer>
+            static int readFlags
+            (
+                const EnumContainer& namedEnum,
+                const wordList& words
+            );
 };
 
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index cae319df79..931501b342 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -148,14 +148,14 @@ Foam::label Foam::meshRefinement::createBaffle
 //    {
 //        return true;
 //    }
-//    else if (mag(n1&n2) > cos(degToRad(30)))
+//    else if (mag(n1&n2) > cos(30.0_deg))
 //    {
 //        // Both normals aligned. Check that test vector perpendicularish to
 //        // surface normal
 //        scalar magTestDir = mag(testDir);
 //        if (magTestDir > VSMALL)
 //        {
-//            if (mag(n1&(testDir/magTestDir)) < cos(degToRad(45)))
+//            if (mag(n1&(testDir/magTestDir)) < cos(45.0_deg))
 //            {
 //                //Pout<< "** disabling baffling face "
 //                //    << mesh_.faceCentres()[faceI] << endl;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
index d7b175703b..6b301662ee 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
@@ -526,7 +526,7 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
 //    const indexedOctree<treeDataTriSurface>& tree = s.tree();
 //
 //
-//    const scalar searchCos(Foam::cos(degToRad(30)));
+//    const scalar searchCos = Foam::cos(30.0_deg);
 //
 //    // Normals for ray shooting and inside/outside detection
 //    vectorField nearNormal;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index c9dba90ec0..f46eaf6ca8 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -1632,7 +1632,7 @@ bool Foam::meshRefinement::isNormalGap
             d /= magD;
 
             // Check average normal with respect to intersection locations
-            if (mag(avg&d) > Foam::cos(degToRad(45)))
+            if (mag(avg&d) > Foam::cos(45.0_deg))
             {
                 return true;
             }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
index 64a59adea4..ceaf09f50c 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -252,21 +252,20 @@ void Foam::meshRefinement::reorderPatchFields
 }
 
 
-template<class Enum>
+template<class EnumContainer>
 int Foam::meshRefinement::readFlags
 (
-    const Enum& namedEnum,
+    const EnumContainer& namedEnum,
     const wordList& words
 )
 {
     int flags = 0;
 
-    forAll(words, i)
+    for (const word& w : words)
     {
-        int index = namedEnum[words[i]];
-        int val = 1<<index;
-        flags |= val;
+        flags |= namedEnum[w];
     }
+
     return flags;
 }
 
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
index 2e1fb95411..d65d7e0eac 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
@@ -31,41 +31,29 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::surfaceZonesInfo::areaSelectionAlgo
+>
+Foam::surfaceZonesInfo::areaSelectionAlgoNames
 {
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::surfaceZonesInfo::areaSelectionAlgo,
-        4
-    >::names[] =
-    {
-        "inside",
-        "outside",
-        "insidePoint",
-        "none"
-    };
-}
-const Foam::NamedEnum<Foam::surfaceZonesInfo::areaSelectionAlgo, 4>
-    Foam::surfaceZonesInfo::areaSelectionAlgoNames;
+    { areaSelectionAlgo::INSIDE, "inside" },
+    { areaSelectionAlgo::OUTSIDE, "outside" },
+    { areaSelectionAlgo::INSIDEPOINT, "insidePoint" },
+    { areaSelectionAlgo::NONE, "none" },
+};
 
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::surfaceZonesInfo::faceZoneType
+>
+Foam::surfaceZonesInfo::faceZoneTypeNames
 {
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::surfaceZonesInfo::faceZoneType,
-        3
-    >::names[] =
-    {
-        "internal",
-        "baffle",
-        "boundary"
-    };
-}
-const Foam::NamedEnum<Foam::surfaceZonesInfo::faceZoneType, 3>
-    Foam::surfaceZonesInfo::faceZoneTypeNames;
+    { faceZoneType::INTERNAL, "internal" },
+    { faceZoneType::BAFFLE, "baffle" },
+    { faceZoneType::BOUNDARY, "boundary" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
index a6af0f2411..c99c7251ed 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
@@ -34,7 +34,7 @@ SourceFiles
 #ifndef surfaceZonesInfo_H
 #define surfaceZonesInfo_H
 
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "point.H"
 #include "word.H"
 #include "PtrList.H"
@@ -68,7 +68,7 @@ public:
         NONE
     };
 
-    static const NamedEnum<areaSelectionAlgo, 4> areaSelectionAlgoNames;
+    static const Enum<areaSelectionAlgo> areaSelectionAlgoNames;
 
     //- What to do with faceZone faces
     enum faceZoneType
@@ -78,7 +78,7 @@ public:
         BOUNDARY
     };
 
-    static const NamedEnum<faceZoneType, 3> faceZoneTypeNames;
+    static const Enum<faceZoneType> faceZoneTypeNames;
 
 
 private:
diff --git a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
index 768618bf5e..1e2999a155 100644
--- a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
+++ b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
@@ -35,25 +35,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-
-namespace Foam
+const Foam::Enum
+<
+    Foam::shellSurfaces::refineMode
+>
+Foam::shellSurfaces::refineModeNames_
 {
-
-template<>
-const char*
-NamedEnum<shellSurfaces::refineMode, 3>::
-names[] =
-{
-    "inside",
-    "outside",
-    "distance"
+    { refineMode::INSIDE, "inside" },
+    { refineMode::OUTSIDE, "outside" },
+    { refineMode::DISTANCE, "distance" },
 };
 
-const NamedEnum<shellSurfaces::refineMode, 3> shellSurfaces::refineModeNames_;
-
-} // End namespace Foam
-
-
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -617,7 +609,7 @@ Foam::shellSurfaces::shellSurfaces
             unmatchedKeys.erase(ePtr->keyword());
 
             shells_[shellI] = geomI;
-            modes_[shellI] = refineModeNames_.read(dict.lookup("mode"));
+            modes_[shellI] = refineModeNames_.lookup("mode", dict);
 
             // Read pairs of distance+level
             setAndCheckLevels(shellI, dict.lookup("levels"));
diff --git a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
index 2b3c5b3df6..93ff45b52e 100644
--- a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
+++ b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
@@ -37,6 +37,7 @@ SourceFiles
 #define shellSurfaces_H
 
 #include "searchableSurface.H"
+#include "Enum.H"
 #include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -97,7 +98,7 @@ private:
     // Private data
 
         //- refineMode names
-        static const NamedEnum<refineMode, 3> refineModeNames_;
+        static const Enum<refineMode> refineModeNames_;
 
 
     // Private Member Functions
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 05adb3e125..140b4f0c2d 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -1134,7 +1134,7 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
                 //    }
                 //}
 
-                const scalar oppositeCos = Foam::cos(Foam::degToRad(135));
+                const scalar oppositeCos = Foam::cos(135.0_deg);
 
                 forAllConstIter(cellSet, transitionCells, iter)
                 {
@@ -1861,8 +1861,8 @@ void Foam::snappyRefineDriver::mergePatchFaces
     {
         meshRefiner_.mergePatchFacesUndo
         (
-            Foam::cos(degToRad(45.0)),
-            Foam::cos(degToRad(45.0)),
+            Foam::cos(45.0_deg),
+            Foam::cos(45.0_deg),
             meshRefiner_.meshedPatches(),
             motionDict,
             labelList(mesh.nFaces(), -1)
@@ -1873,8 +1873,8 @@ void Foam::snappyRefineDriver::mergePatchFaces
         // Still merge refined boundary faces if all four are on same patch
         meshRefiner_.mergePatchFaces
         (
-            Foam::cos(degToRad(45.0)),
-            Foam::cos(degToRad(45.0)),
+            Foam::cos(45.0_deg),
+            Foam::cos(45.0_deg),
             4,          // only merge faces split into 4
             meshRefiner_.meshedPatches()
         );
@@ -1885,7 +1885,7 @@ void Foam::snappyRefineDriver::mergePatchFaces
         meshRefiner_.checkData();
     }
 
-    meshRefiner_.mergeEdgesUndo(Foam::cos(degToRad(45.0)), motionDict);
+    meshRefiner_.mergeEdgesUndo(Foam::cos(45.0_deg), motionDict);
 
     if (debug)
     {
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 1e5552f4d1..39a637d84c 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -1117,7 +1117,7 @@ void Foam::snappySnapDriver::detectNearSurfaces
     //// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     //
     //{
-    //    const scalar cos45 = Foam::cos(degToRad(45));
+    //    const scalar cos45 = Foam::cos(45.0_deg);
     //    vector n(cos45, cos45, cos45);
     //    n /= mag(n);
     //
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 2846704f80..8f9ec62cc7 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -2839,7 +2839,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
     // Detect baffle edges. Assume initial mesh will have 0,90 or 180
     // (baffle) degree angles so smoothing should make 0,90
     // to be less than 90. Choose reasonable value
-    const scalar baffleFeatureCos = Foam::cos(degToRad(110));
+    const scalar baffleFeatureCos = Foam::cos(110.0_deg);
 
 
     autoPtr<OBJstream> baffleEdgeStr;
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index ad1df28154..6253c95f9b 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -83,18 +83,13 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::wordTointerpolationMethod
 {
     interpolationMethod method = imDirect;
 
-    wordList methods
-    (
-        IStringStream
-        (
-            "("
-                "directAMI "
-                "mapNearestAMI "
-                "faceAreaWeightAMI "
-                "partialFaceAreaWeightAMI"
-            ")"
-        )()
-    );
+    const wordList methods
+    {
+        "directAMI",
+        "mapNearestAMI",
+        "faceAreaWeightAMI",
+        "partialFaceAreaWeightAMI"
+    };
 
     if (im == "directAMI")
     {
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
index 76b39fa700..9511881b8a 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
@@ -301,7 +301,7 @@ void Foam::AMIMethod<SourcePatch, TargetPatch>::appendNbrFaces
 
             scalar cosI = n1 & n2;
 
-            if (cosI > Foam::cos(degToRad(89.0)))
+            if (cosI > Foam::cos(89.0_deg))
             {
                 faceIDs.append(nbrFacei);
             }
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
index 617a85a0a0..4d215af6de 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
@@ -27,21 +27,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+const Foam::Enum
+<
+    Foam::faceAreaIntersect::triangulationMode
+>
+Foam::faceAreaIntersect::triangulationModeNames_
 {
-    template<>
-    const char* NamedEnum<faceAreaIntersect::triangulationMode, 2>::names[] =
-    {
-        "fan",
-        "mesh"
-    };
-}
-
-const Foam::NamedEnum<Foam::faceAreaIntersect::triangulationMode, 2>
-    Foam::faceAreaIntersect::triangulationModeNames_;
+    { triangulationMode::tmFan, "fan" },
+    { triangulationMode::tmMesh, "mesh" },
+};
 
 Foam::scalar Foam::faceAreaIntersect::tol = 1e-6;
 
+
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
 void Foam::faceAreaIntersect::triSliceWithPlane
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
index 8b44fd5c82..450d343d64 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
@@ -42,7 +42,7 @@ SourceFiles
 #include "plane.H"
 #include "face.H"
 #include "triPoints.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,7 +63,7 @@ public:
         tmMesh
     };
 
-    static const NamedEnum<triangulationMode, 2> triangulationModeNames_;
+    static const Enum<triangulationMode> triangulationModeNames_;
 
 
 private:
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index 24c13c3559..43adc8695d 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -40,60 +40,52 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(extendedEdgeMesh, 0);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::extendedEdgeMesh::pointStatus,
-        4
-    >::names[] =
-    {
-        "convex",
-        "concave",
-        "mixed",
-        "nonFeature"
-    };
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::extendedEdgeMesh::edgeStatus,
-        6
-    >::names[] =
-    {
-        "external",
-        "internal",
-        "flat",
-        "open",
-        "multiple",
-        "none"
-    };
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::extendedEdgeMesh::sideVolumeType,
-        4
-    >::names[] =
-    {
-        "inside",
-        "outside",
-        "both",
-        "neither"
-    };
 }
 
-const Foam::NamedEnum<Foam::extendedEdgeMesh::pointStatus, 4>
-    Foam::extendedEdgeMesh::pointStatusNames_;
 
-const Foam::NamedEnum<Foam::extendedEdgeMesh::edgeStatus, 6>
-    Foam::extendedEdgeMesh::edgeStatusNames_;
+const Foam::Enum
+<
+    Foam::extendedEdgeMesh::pointStatus
+>
+Foam::extendedEdgeMesh::pointStatusNames_
+{
+    { pointStatus::CONVEX, "convex" },
+    { pointStatus::CONCAVE, "concave" },
+    { pointStatus::MIXED, "mixed" },
+    { pointStatus::NONFEATURE, "nonFeature" },
+};
 
-const Foam::NamedEnum<Foam::extendedEdgeMesh::sideVolumeType, 4>
-    Foam::extendedEdgeMesh::sideVolumeTypeNames_;
 
-Foam::scalar Foam::extendedEdgeMesh::cosNormalAngleTol_ =
-    Foam::cos(degToRad(0.1));
+const Foam::Enum
+<
+    Foam::extendedEdgeMesh::edgeStatus
+>
+Foam::extendedEdgeMesh::edgeStatusNames_
+{
+    { edgeStatus::EXTERNAL, "external" },
+    { edgeStatus::INTERNAL, "internal" },
+    { edgeStatus::FLAT, "flat" },
+    { edgeStatus::OPEN, "open" },
+    { edgeStatus::MULTIPLE, "multiple" },
+    { edgeStatus::NONE, "none" },
+
+};
+
+
+const Foam::Enum
+<
+    Foam::extendedEdgeMesh::sideVolumeType
+>
+Foam::extendedEdgeMesh::sideVolumeTypeNames_
+{
+    { sideVolumeType::INSIDE, "inside" },
+    { sideVolumeType::OUTSIDE, "outside" },
+    { sideVolumeType::BOTH, "both" },
+    { sideVolumeType::NEITHER, "neither" },
+};
+
+
+Foam::scalar Foam::extendedEdgeMesh::cosNormalAngleTol_ = Foam::cos(0.1_deg);
 
 
 Foam::label Foam::extendedEdgeMesh::convexStart_ = 0;
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 71a4b81779..649d7d6b13 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -100,7 +100,7 @@ public:
         NONFEATURE  //!< Not a feature point
     };
 
-    static const Foam::NamedEnum<pointStatus, 4> pointStatusNames_;
+    static const Enum<pointStatus> pointStatusNames_;
 
     enum edgeStatus
     {
@@ -112,7 +112,7 @@ public:
         NONE        //!< Unclassified (consistency with surfaceFeatures)
     };
 
-    static const Foam::NamedEnum<edgeStatus, 6> edgeStatusNames_;
+    static const Enum<edgeStatus> edgeStatusNames_;
 
     //- Normals point to the outside
     enum sideVolumeType
@@ -123,7 +123,7 @@ public:
         NEITHER = 3   //!< not sure when this may be used
     };
 
-    static const Foam::NamedEnum<sideVolumeType, 4> sideVolumeTypeNames_;
+    static const Enum<sideVolumeType> sideVolumeTypeNames_;
 
     //- Angular closeness tolerance for treating normals as the same
     static scalar cosNormalAngleTol_;
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index ac6be7983d..6f114e545b 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -48,41 +48,34 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(mappedPatchBase, 0);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::mappedPatchBase::sampleMode,
-        6
-    >::names[] =
-    {
-        "nearestCell",
-        "nearestPatchFace",
-        "nearestPatchFaceAMI",
-        "nearestPatchPoint",
-        "nearestFace",
-        "nearestOnlyCell"
-    };
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::mappedPatchBase::offsetMode,
-        3
-    >::names[] =
-    {
-        "uniform",
-        "nonuniform",
-        "normal"
-    };
 }
 
 
-const Foam::NamedEnum<Foam::mappedPatchBase::sampleMode, 6>
-    Foam::mappedPatchBase::sampleModeNames_;
+const Foam::Enum
+<
+    Foam::mappedPatchBase::sampleMode
+>
+Foam::mappedPatchBase::sampleModeNames_
+{
+    { sampleMode::NEARESTCELL, "nearestCell" },
+    { sampleMode::NEARESTPATCHFACE, "nearestPatchFace" },
+    { sampleMode::NEARESTPATCHFACEAMI, "nearestPatchFaceAMI" },
+    { sampleMode::NEARESTPATCHPOINT, "nearestPatchPoint" },
+    { sampleMode::NEARESTFACE, "nearestFace" },
+    { sampleMode::NEARESTONLYCELL, "nearestOnlyCell" },
+};
 
-const Foam::NamedEnum<Foam::mappedPatchBase::offsetMode, 3>
-    Foam::mappedPatchBase::offsetModeNames_;
+
+const Foam::Enum
+<
+    Foam::mappedPatchBase::offsetMode
+>
+Foam::mappedPatchBase::offsetModeNames_
+{
+    { offsetMode::UNIFORM, "uniform" },
+    { offsetMode::NONUNIFORM, "nonuniform" },
+    { offsetMode::NORMAL, "normal" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -1042,7 +1035,7 @@ Foam::mappedPatchBase::mappedPatchBase
 :
     patch_(pp),
     sampleRegion_(dict.lookupOrDefault<word>("sampleRegion", "")),
-    mode_(sampleModeNames_.read(dict.lookup("sampleMode"))),
+    mode_(sampleModeNames_.lookup("sampleMode", dict)),
     samplePatch_(dict.lookupOrDefault<word>("samplePatch", "")),
     coupleGroup_(dict),
     offsetMode_(UNIFORM),
@@ -1068,7 +1061,7 @@ Foam::mappedPatchBase::mappedPatchBase
 
     if (dict.found("offsetMode"))
     {
-        offsetMode_ = offsetModeNames_.read(dict.lookup("offsetMode"));
+        offsetMode_ = offsetModeNames_.lookup("offsetMode", dict);
 
         switch (offsetMode_)
         {
@@ -1387,17 +1380,14 @@ Foam::pointIndexHit Foam::mappedPatchBase::facePoint
 
 void Foam::mappedPatchBase::write(Ostream& os) const
 {
-    os.writeKeyword("sampleMode") << sampleModeNames_[mode_]
-        << token::END_STATEMENT << nl;
+    os.writeEntry("sampleMode", sampleModeNames_[mode_]);
     if (!sampleRegion_.empty())
     {
-        os.writeKeyword("sampleRegion") << sampleRegion_
-            << token::END_STATEMENT << nl;
+        os.writeEntry("sampleRegion", sampleRegion_);
     }
     if (!samplePatch_.empty())
     {
-        os.writeKeyword("samplePatch") << samplePatch_
-            << token::END_STATEMENT << nl;
+        os.writeEntry("samplePatch", samplePatch_);
     }
     coupleGroup_.write(os);
 
@@ -1412,15 +1402,13 @@ void Foam::mappedPatchBase::write(Ostream& os) const
     }
     else
     {
-        os.writeKeyword("offsetMode") << offsetModeNames_[offsetMode_]
-            << token::END_STATEMENT << nl;
+        os.writeEntry("offsetMode", offsetModeNames_[offsetMode_]);
 
         switch (offsetMode_)
         {
             case UNIFORM:
             {
-                os.writeKeyword("offset") << offset_ << token::END_STATEMENT
-                    << nl;
+                os.writeEntry("offset", offset_);
                 break;
             }
             case NONUNIFORM:
@@ -1430,8 +1418,7 @@ void Foam::mappedPatchBase::write(Ostream& os) const
             }
             case NORMAL:
             {
-                os.writeKeyword("distance") << distance_ << token::END_STATEMENT
-                    << nl;
+                os.writeEntry("distance", distance_);
                 break;
             }
         }
@@ -1440,8 +1427,7 @@ void Foam::mappedPatchBase::write(Ostream& os) const
         {
             if (AMIReverse_)
             {
-                os.writeKeyword("flipNormals") << AMIReverse_
-                    << token::END_STATEMENT << nl;
+                os.writeEntry("flipNormals", AMIReverse_);
             }
 
             if (!surfDict_.empty())
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
index 1fe40bfc35..3539832918 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
@@ -111,25 +111,25 @@ public:
         //- Mesh items to sample
         enum sampleMode
         {
-            NEARESTCELL,         // nearest cell containing sample
-            NEARESTPATCHFACE,    // nearest face on selected patch
-            NEARESTPATCHFACEAMI, // nearest patch face + AMI interpolation
-            NEARESTPATCHPOINT,   // nearest point on selected patch
-            NEARESTFACE,         // nearest face
-            NEARESTONLYCELL      // nearest cell (even if not containing cell)
+            NEARESTCELL,         //!< nearest cell containing sample
+            NEARESTPATCHFACE,    //!< nearest face on selected patch
+            NEARESTPATCHFACEAMI, //!< nearest patch face + AMI interpolation
+            NEARESTPATCHPOINT,   //!< nearest point on selected patch
+            NEARESTFACE,         //!< nearest face
+            NEARESTONLYCELL      //!< nearest cell (even if not containing cell)
         };
 
         //- How to project face centres
         enum offsetMode
         {
-            UNIFORM,            // single offset vector
-            NONUNIFORM,         // per-face offset vector
-            NORMAL              // use face normal + distance
+            UNIFORM,            //!< single offset vector
+            NONUNIFORM,         //!< per-face offset vector
+            NORMAL              //!< use face normal + distance
         };
 
-        static const NamedEnum<sampleMode, 6> sampleModeNames_;
+        static const Enum<sampleMode> sampleModeNames_;
 
-        static const NamedEnum<offsetMode, 3> offsetModeNames_;
+        static const Enum<offsetMode> offsetModeNames_;
 
 
     //- Helper class for finding nearest
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index 4fdb93b1b8..5a9b3a3f63 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -36,19 +36,6 @@ namespace Foam
     defineTypeNameAndDebug(faceToCell, 0);
     addToRunTimeSelectionTable(topoSetSource, faceToCell, word);
     addToRunTimeSelectionTable(topoSetSource, faceToCell, istream);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::faceToCell::faceAction,
-        4
-    >::names[] =
-    {
-        "neighbour",
-        "owner",
-        "any",
-        "all"
-    };
 }
 
 
@@ -60,8 +47,17 @@ Foam::topoSetSource::addToUsageTable Foam::faceToCell::usage_
     " of the faces in the faceSet or where all faces are in the faceSet\n\n"
 );
 
-const Foam::NamedEnum<Foam::faceToCell::faceAction, 4>
-    Foam::faceToCell::faceActionNames_;
+const Foam::Enum
+<
+    Foam::faceToCell::faceAction
+>
+Foam::faceToCell::faceActionNames_
+{
+    { faceAction::NEIGHBOUR, "neighbour" },
+    { faceAction::OWNER, "owner" },
+    { faceAction::ANY, "any" },
+    { faceAction::ALL, "all" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -175,7 +171,7 @@ Foam::faceToCell::faceToCell
 :
     topoSetSource(mesh),
     setName_(dict.lookup("set")),
-    option_(faceActionNames_.read(dict.lookup("option")))
+    option_(faceActionNames_.lookup("option", dict))
 {}
 
 
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
index 95d856d88a..59564ac2a1 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
@@ -36,7 +36,7 @@ SourceFiles
 #define faceToCell_H
 
 #include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,7 +63,7 @@ public:
 
 private:
 
-        static const NamedEnum<faceAction, 4> faceActionNames_;
+        static const Enum<faceAction> faceActionNames_;
 
 
         //- Add usage string
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
index a9c9158af3..7640e05192 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
@@ -35,17 +35,6 @@ namespace Foam
     defineTypeNameAndDebug(faceZoneToCell, 0);
     addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, word);
     addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, istream);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::faceZoneToCell::faceAction,
-        2
-    >::names[] =
-    {
-        "master",
-        "slave"
-    };
 }
 
 
@@ -58,8 +47,15 @@ Foam::topoSetSource::addToUsageTable Foam::faceZoneToCell::usage_
 );
 
 
-const Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>
-    Foam::faceZoneToCell::faceActionNames_;
+const Foam::Enum
+<
+    Foam::faceZoneToCell::faceAction
+>
+Foam::faceZoneToCell::faceActionNames_
+{
+    { faceAction::MASTER, "master" },
+    { faceAction::SLAVE, "slave" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -132,7 +128,7 @@ Foam::faceZoneToCell::faceZoneToCell
 :
     topoSetSource(mesh),
     zoneName_(dict.lookup("name")),
-    option_(faceActionNames_.read(dict.lookup("option")))
+    option_(faceActionNames_.lookup("option", dict))
 {}
 
 
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
index 50172717a6..5c8dcb61a5 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
@@ -63,7 +63,7 @@ private:
 
     // Private data
 
-        static const NamedEnum<faceAction, 2> faceActionNames_;
+        static const Enum<faceAction> faceActionNames_;
 
         //- Add usage string
         static addToUsageTable usage_;
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 467e894f8c..cfafa4d2e7 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -36,17 +36,6 @@ namespace Foam
     defineTypeNameAndDebug(pointToCell, 0);
     addToRunTimeSelectionTable(topoSetSource, pointToCell, word);
     addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::pointToCell::pointAction,
-        2
-    >::names[] =
-    {
-        "any",
-        "edge"
-    };
 }
 
 
@@ -58,8 +47,15 @@ Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_
     " in the pointSet\n\n"
 );
 
-const Foam::NamedEnum<Foam::pointToCell::pointAction, 2>
-    Foam::pointToCell::pointActionNames_;
+const Foam::Enum
+<
+    Foam::pointToCell::pointAction
+>
+Foam::pointToCell::pointActionNames_
+{
+    { pointAction::ANY, "any" },
+    { pointAction::EDGE, "edge" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -132,7 +128,7 @@ Foam::pointToCell::pointToCell
 :
     topoSetSource(mesh),
     setName_(dict.lookup("set")),
-    option_(pointActionNames_.read(dict.lookup("option")))
+    option_(pointActionNames_.lookup("option", dict))
 {}
 
 
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
index 96f02f18bf..4be629c5d7 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
@@ -36,7 +36,7 @@ SourceFiles
 #define pointToCell_H
 
 #include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,7 +65,7 @@ private:
         //- Add usage string
         static addToUsageTable usage_;
 
-        static const NamedEnum<pointAction, 2> pointActionNames_;
+        static const Enum<pointAction> pointActionNames_;
 
         //- Name of set to use
         word setName_;
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
index a6c033a84d..1c1b4bf174 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
@@ -55,7 +55,7 @@ Foam::topoSetSource::addToUsageTable Foam::shapeToCell::usage_
 
 
 // Angle for polys to be considered splitHexes.
-Foam::scalar Foam::shapeToCell::featureCos = Foam::cos(degToRad(10.0));
+Foam::scalar Foam::shapeToCell::featureCos = Foam::cos(10.0_deg);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
index 64e04fe756..cd5e68520f 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
@@ -37,17 +37,6 @@ namespace Foam
     defineTypeNameAndDebug(cellToFace, 0);
     addToRunTimeSelectionTable(topoSetSource, cellToFace, word);
     addToRunTimeSelectionTable(topoSetSource, cellToFace, istream);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::cellToFace::cellAction,
-        2
-    >::names[] =
-    {
-        "all",
-        "both"
-    };
 }
 
 
@@ -59,8 +48,15 @@ Foam::topoSetSource::addToUsageTable Foam::cellToFace::usage_
     "           -both: faces where both neighbours are in the cellSet\n\n"
 );
 
-const Foam::NamedEnum<Foam::cellToFace::cellAction, 2>
-    Foam::cellToFace::cellActionNames_;
+const Foam::Enum
+<
+    Foam::cellToFace::cellAction
+>
+Foam::cellToFace::cellActionNames_
+{
+    { cellAction::ALL, "all" },
+    { cellAction::BOTH, "both" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -177,7 +173,7 @@ Foam::cellToFace::cellToFace
 :
     topoSetSource(mesh),
     setName_(dict.lookup("set")),
-    option_(cellActionNames_.read(dict.lookup("option")))
+    option_(cellActionNames_.lookup("option", dict))
 {}
 
 
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
index d49917a63c..f0fcca37bf 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
@@ -40,7 +40,7 @@ SourceFiles
 #define cellToFace_H
 
 #include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,7 +69,7 @@ private:
         //- Add usage string
         static addToUsageTable usage_;
 
-        static const NamedEnum<cellAction, 2> cellActionNames_;
+        static const Enum<cellAction> cellActionNames_;
 
         //- Name of set to use
         word setName_;
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
index ff2f99c253..9891680204 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
@@ -36,7 +36,6 @@ SourceFiles
 #define normalToFace_H
 
 #include "topoSetSource.H"
-#include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index e85becdabb..31e5322a39 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -36,18 +36,6 @@ namespace Foam
     defineTypeNameAndDebug(pointToFace, 0);
     addToRunTimeSelectionTable(topoSetSource, pointToFace, word);
     addToRunTimeSelectionTable(topoSetSource, pointToFace, istream);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::pointToFace::pointAction,
-        3
-    >::names[] =
-    {
-        "any",
-        "all",
-        "edge"
-    };
 }
 
 
@@ -61,8 +49,16 @@ Foam::topoSetSource::addToUsageTable Foam::pointToFace::usage_
     "    -two consecutive points (an edge) in the pointSet\n\n"
 );
 
-const Foam::NamedEnum<Foam::pointToFace::pointAction, 3>
-    Foam::pointToFace::pointActionNames_;
+const Foam::Enum
+<
+    Foam::pointToFace::pointAction
+>
+Foam::pointToFace::pointActionNames_
+{
+    { pointAction::ANY, "any" },
+    { pointAction::ALL, "all" },
+    { pointAction::EDGE, "edge" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -173,7 +169,7 @@ Foam::pointToFace::pointToFace
 :
     topoSetSource(mesh),
     setName_(dict.lookup("set")),
-    option_(pointActionNames_.read(dict.lookup("option")))
+    option_(pointActionNames_.lookup("option", dict))
 {}
 
 
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
index e31bc65086..03e09a25dd 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
@@ -36,7 +36,7 @@ SourceFiles
 #define pointToFace_H
 
 #include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,7 +68,7 @@ private:
         //- Add usage string
         static addToUsageTable usage_;
 
-        static const NamedEnum<pointAction, 3> pointActionNames_;
+        static const Enum<pointAction> pointActionNames_;
 
         //- Name of set to use
         word setName_;
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index 27d55c7813..244dc1bba1 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -36,16 +36,6 @@ namespace Foam
     defineTypeNameAndDebug(cellToPoint, 0);
     addToRunTimeSelectionTable(topoSetSource, cellToPoint, word);
     addToRunTimeSelectionTable(topoSetSource, cellToPoint, istream);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::cellToPoint::cellAction,
-        1
-    >::names[] =
-    {
-        "all"
-    };
 }
 
 
@@ -56,8 +46,14 @@ Foam::topoSetSource::addToUsageTable Foam::cellToPoint::usage_
     "    Select all points of cells in the cellSet\n\n"
 );
 
-const Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>
-    Foam::cellToPoint::cellActionNames_;
+const Foam::Enum
+<
+    Foam::cellToPoint::cellAction
+>
+Foam::cellToPoint::cellActionNames_
+{
+    { cellAction::ALL, "all" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -111,7 +107,7 @@ Foam::cellToPoint::cellToPoint
 :
     topoSetSource(mesh),
     setName_(dict.lookup("set")),
-    option_(cellActionNames_.read(dict.lookup("option")))
+    option_(cellActionNames_.lookup("option", dict))
 {}
 
 
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
index 5b0e75eb3d..d19be4f194 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
@@ -36,7 +36,7 @@ SourceFiles
 #define cellToPoint_H
 
 #include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,7 +64,7 @@ private:
         //- Add usage string
         static addToUsageTable usage_;
 
-        static const NamedEnum<cellAction, 1> cellActionNames_;
+        static const Enum<cellAction> cellActionNames_;
 
         //- Name of set to use
         word setName_;
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index 7b17632b66..6e8392f885 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -36,19 +36,8 @@ namespace Foam
     defineTypeNameAndDebug(faceToPoint, 0);
     addToRunTimeSelectionTable(topoSetSource, faceToPoint, word);
     addToRunTimeSelectionTable(topoSetSource, faceToPoint, istream);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::faceToPoint::faceAction,
-        1
-    >::names[] =
-    {
-        "all"
-    };
 }
 
-
 Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_
 (
     faceToPoint::typeName,
@@ -56,8 +45,14 @@ Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_
     "    Select all points of faces in the faceSet\n\n"
 );
 
-const Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>
-    Foam::faceToPoint::faceActionNames_;
+const Foam::Enum
+<
+    Foam::faceToPoint::faceAction
+>
+Foam::faceToPoint::faceActionNames_
+{
+    { faceAction::ALL, "all" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -105,7 +100,7 @@ Foam::faceToPoint::faceToPoint
 :
     topoSetSource(mesh),
     setName_(dict.lookup("set")),
-    option_(faceActionNames_.read(dict.lookup("option")))
+    option_(faceActionNames_.lookup("option", dict))
 {}
 
 
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
index 6ab5e86b72..99c598e150 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
@@ -36,7 +36,7 @@ SourceFiles
 #define faceToPoint_H
 
 #include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,7 +64,7 @@ private:
         //- Add usage string
         static addToUsageTable usage_;
 
-        static const NamedEnum<faceAction, 1> faceActionNames_;
+        static const Enum<faceAction> faceActionNames_;
 
         //- Name of set to use
         word setName_;
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C
index b20ddfbd49..acf6238b38 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -34,31 +34,27 @@ namespace Foam
     defineTypeNameAndDebug(topoSetSource, 0);
     defineRunTimeSelectionTable(topoSetSource, word);
     defineRunTimeSelectionTable(topoSetSource, istream);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::topoSetSource::setAction,
-        8
-    >::names[] =
-    {
-        "clear",
-        "new",
-        "invert",
-        "add",
-        "delete",
-        "subset",
-        "list",
-        "remove"
-    };
 }
 
 
 Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = nullptr;
 
 
-const Foam::NamedEnum<Foam::topoSetSource::setAction, 8>
-    Foam::topoSetSource::actionNames_;
+const Foam::Enum
+<
+    Foam::topoSetSource::setAction
+>
+Foam::topoSetSource::actionNames_
+{
+    { setAction::CLEAR, "clear" },
+    { setAction::NEW, "new" },
+    { setAction::INVERT, "invert" },
+    { setAction::ADD, "add" },
+    { setAction::DELETE, "delete" },
+    { setAction::SUBSET, "subset" },
+    { setAction::LIST, "list" },
+    { setAction::REMOVE, "remove" },
+};
 
 
 const Foam::string Foam::topoSetSource::illegalSource_
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H
index 5bef215819..0957df277d 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@@ -45,7 +45,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "runTimeSelectionTables.H"
 #include "autoPtr.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "HashTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -132,7 +132,7 @@ protected:
 
 private:
 
-        static const NamedEnum<setAction, 8> actionNames_;
+        static const Enum<setAction> actionNames_;
 
         static const string illegalSource_;
 
@@ -140,10 +140,10 @@ private:
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        topoSetSource(const topoSetSource&);
+        topoSetSource(const topoSetSource&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const topoSetSource&);
+        void operator=(const topoSetSource&) = delete;
 
 
 public:
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 07e5b5cd51..b8cc183424 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -36,23 +36,19 @@ License
 namespace Foam
 {
 defineTypeNameAndDebug(booleanSurface, 0);
-
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::booleanSurface::booleanOpType,
-    4
->::names[] =
-{
-    "union",
-    "intersection",
-    "difference",
-    "all"
-};
 }
 
-const Foam::NamedEnum<Foam::booleanSurface::booleanOpType, 4>
-Foam::booleanSurface::booleanOpTypeNames;
+const Foam::Enum
+<
+    Foam::booleanSurface::booleanOpType
+>
+Foam::booleanSurface::booleanOpTypeNames
+{
+    { booleanOpType::UNION, "union" },
+    { booleanOpType::INTERSECTION, "intersection" },
+    { booleanOpType::DIFFERENCE, "difference" },
+    { booleanOpType::ALL, "all" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
index 1bc0d0f059..6b044bacb7 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
@@ -172,7 +172,7 @@ public:
 
     // Static data
 
-        static const NamedEnum<booleanOpType, 4> booleanOpTypeNames;
+        static const Enum<booleanOpType> booleanOpTypeNames;
 
 
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 851898de7e..cc77026b92 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -41,10 +41,10 @@ License
 namespace Foam
 {
 defineTypeNameAndDebug(edgeIntersections, 0);
-
-scalar edgeIntersections::alignedCos_ = cos(degToRad(89.0));
 }
 
+Foam::scalar Foam::edgeIntersections::alignedCos_ = Foam::cos(89.0_deg);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 8c552335d4..c38da917f0 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -41,7 +41,10 @@ namespace Foam
 defineTypeNameAndDebug(surfaceIntersection, 0);
 }
 
-const Foam::Enum<Foam::surfaceIntersection::intersectionType>
+const Foam::Enum
+<
+    Foam::surfaceIntersection::intersectionType
+>
 Foam::surfaceIntersection::selfIntersectionNames
 {
     { intersectionType::SELF, "self" },
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index c727121a60..a251d856a3 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -41,7 +41,7 @@ namespace Foam
 {
     defineTypeNameAndDebug(surfaceFeatures, 0);
 
-    const scalar surfaceFeatures::parallelTolerance = sin(degToRad(1.0));
+    const scalar surfaceFeatures::parallelTolerance = sin(1.0_deg);
 
 
 //! \cond fileScope
diff --git a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
index d40c008776..a653f53bae 100644
--- a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
+++ b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
@@ -30,11 +30,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::Enum<Foam::triSurfaceLoader::loadingOption>
+const Foam::Enum
+<
+    Foam::triSurfaceLoader::loadingOption
+>
 Foam::triSurfaceLoader::loadingOptionNames
-(
-    SINGLE_REGION, { "single", "file", "offset", "merge" }
-);
+{
+    { loadingOption::SINGLE_REGION, "single" },
+    { loadingOption::FILE_REGION, "file" },
+    { loadingOption::OFFSET_REGION, "offset" },
+    { loadingOption::MERGE_REGION, "merge" }
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
index 9ef72576fa..c6327181dc 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
@@ -35,22 +35,19 @@ namespace Foam
 {
     defineTypeNameAndDebug(cellCellStencil, 0);
     defineRunTimeSelectionTable(cellCellStencil, mesh);
-
-    template<>
-    const char* NamedEnum
-    <
-        cellCellStencil::cellType,
-        3
-    >::names[] =
-    {
-        "calculated",
-        "interpolated",
-        "hole"
-    };
 }
 
-const Foam::NamedEnum<Foam::cellCellStencil::cellType, 3>
-Foam::cellCellStencil::cellTypeNames_;
+const Foam::Enum
+<
+    Foam::cellCellStencil::cellType
+>
+Foam::cellCellStencil::cellTypeNames_
+{
+    { cellType::CALCULATED, "calculated" },
+    { cellType::INTERPOLATED, "interpolated" },
+    { cellType::HOLE, "hole" },
+};
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
index 327bce87cf..b46f533993 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
@@ -81,7 +81,7 @@ protected:
     // Protected data
 
         //- Mode type names
-        static const NamedEnum<cellType, 3> cellTypeNames_;
+        static const Enum<cellType> cellTypeNames_;
 
         //- Reference to the mesh
         const fvMesh& mesh_;
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index ae6f0b8c7a..8ceb27f37c 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -51,23 +51,19 @@ namespace Foam
         distributedTriSurfaceMesh,
         dict
     );
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::distributedTriSurfaceMesh::distributionType,
-        3
-    >::names[] =
-    {
-        "follow",
-        "independent",
-        "frozen"
-    };
 }
 
 
-const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>
-    Foam::distributedTriSurfaceMesh::distributionTypeNames_;
+const Foam::Enum
+<
+    Foam::distributedTriSurfaceMesh::distributionType
+>
+Foam::distributedTriSurfaceMesh::distributionTypeNames_
+{
+    { distributionType::FOLLOW, "follow" },
+    { distributionType::INDEPENDENT, "independent" },
+    { distributionType::FROZEN, "frozen" },
+};
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -83,7 +79,7 @@ bool Foam::distributedTriSurfaceMesh::read()
     Pstream::scatterList(procBb_);
 
     // Distribution type
-    distType_ = distributionTypeNames_.read(dict_.lookup("distributionType"));
+    distType_ = distributionTypeNames_.lookup("distributionType", dict_);
 
     // Merge distance
     mergeDist_ = readScalar(dict_.lookup("mergeDistance"));
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index 03451e72e2..8294da4a0c 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
@@ -87,7 +87,7 @@ public:
             FROZEN = 2
         };
 
-        static const NamedEnum<distributionType, 3> distributionTypeNames_;
+        static const Enum<distributionType> distributionTypeNames_;
 
 private:
 
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 1fcabf5243..b372995659 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -30,27 +30,16 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::energyRegionCoupledFvPatchScalarField::kappaMethodType,
-        3
-    >::names[] =
-    {
-        "solid",
-        "fluid",
-        "undefined"
-    };
-}
-
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::energyRegionCoupledFvPatchScalarField::kappaMethodType,
-    3
-> Foam::energyRegionCoupledFvPatchScalarField::methodTypeNames_;
+    Foam::energyRegionCoupledFvPatchScalarField::kappaMethodType
+>
+Foam::energyRegionCoupledFvPatchScalarField::methodTypeNames_
+{
+    { kappaMethodType::SOLID, "solid" },
+    { kappaMethodType::FLUID, "fluid" },
+    { kappaMethodType::UNDEFINED, "undefined" },
+};
 
 
 // * * * * * * * * * * * * * * * * Private members  * * * * * * * * * * * * *//
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
index 877d40583d..0aed50e6b7 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
@@ -41,7 +41,7 @@ SourceFiles
 #include "regionCoupledBaseFvPatch.H"
 #include "LduInterfaceField.H"
 #include "fvPatchField.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "basicThermo.H"
 #include "coupledFvPatchField.H"
 
@@ -77,16 +77,16 @@ private:
         //- Local reference to region couple patch
         const regionCoupledBaseFvPatch& regionCoupledPatch_;
 
-        //- Methof to extract kappa
-        static const NamedEnum<kappaMethodType, 3> methodTypeNames_;
+        //- Method to extract kappa
+        static const Enum<kappaMethodType> methodTypeNames_;
 
         //- How to get K
         mutable kappaMethodType method_;
 
-        //- AutoPtr to nbr thermo
+        //- An autoPtr to nbr thermo
         mutable const basicThermo* nbrThermoPtr_;
 
-        //- AutoPtr to my thermo
+        //- An autoPtr to my thermo
         mutable const basicThermo* thermoPtr_;
 
 
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
index 9d4360d8ce..94628ee465 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
@@ -44,7 +44,6 @@ SourceFiles
 #include "volFieldsFwd.H"
 #include "DimensionedField.H"
 #include "labelList.H"
-#include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/sampling/meshToMesh/meshToMesh.C b/src/sampling/meshToMesh/meshToMesh.C
index 3ac9607fff..0e39240d43 100644
--- a/src/sampling/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMesh/meshToMesh.C
@@ -33,25 +33,25 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(meshToMesh, 0);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::meshToMesh::interpolationMethod,
-        4
-    >::names[] =
-    {
-        "direct",
-        "mapNearest",
-        "cellVolumeWeight",
-        "correctedCellVolumeWeight"
-    };
-
-    const NamedEnum<meshToMesh::interpolationMethod, 4>
-        meshToMesh::interpolationMethodNames_;
 }
 
 
+const Foam::Enum
+<
+    Foam::meshToMesh::interpolationMethod
+>
+Foam::meshToMesh::interpolationMethodNames_
+{
+    { interpolationMethod::imDirect, "direct" },
+    { interpolationMethod::imMapNearest, "mapNearest" },
+    { interpolationMethod::imCellVolumeWeight, "cellVolumeWeight" },
+    {
+        interpolationMethod::imCorrectedCellVolumeWeight,
+        "correctedCellVolumeWeight"
+    },
+};
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<>
diff --git a/src/sampling/meshToMesh/meshToMesh.H b/src/sampling/meshToMesh/meshToMesh.H
index 62b5781979..fb5b4c0d49 100644
--- a/src/sampling/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMesh/meshToMesh.H
@@ -46,7 +46,7 @@ SourceFiles
 #include "treeBoundBox.H"
 #include "mapDistribute.H"
 #include "volFieldsFwd.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "AMIPatchToPatchInterpolation.H"
 #include "pointList.H"
 
@@ -74,8 +74,7 @@ public:
             imCorrectedCellVolumeWeight
         };
 
-        static const NamedEnum<interpolationMethod, 4>
-            interpolationMethodNames_;
+        static const Enum<interpolationMethod> interpolationMethodNames_;
 
 private:
 
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index f79bdf3a68..50fe214cbe 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -35,6 +35,18 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+const Foam::Enum
+<
+    Foam::sampledTriSurfaceMesh::samplingSource
+>
+Foam::sampledTriSurfaceMesh::samplingSourceNames_
+{
+    { samplingSource::cells, "cells" },
+    { samplingSource::insideCells, "insideCells" },
+    { samplingSource::boundaryFaces, "boundaryFaces" },
+};
+
+
 namespace Foam
 {
     defineTypeNameAndDebug(sampledTriSurfaceMesh, 0);
@@ -45,18 +57,6 @@ namespace Foam
         word
     );
 
-    template<>
-    const char* NamedEnum<sampledTriSurfaceMesh::samplingSource, 3>::names[] =
-    {
-        "cells",
-        "insideCells",
-        "boundaryFaces"
-    };
-
-    const NamedEnum<sampledTriSurfaceMesh::samplingSource, 3>
-    sampledTriSurfaceMesh::samplingSourceNames_;
-
-
     //- Private class for finding nearest
     //  Comprising:
     //  - global index
@@ -685,7 +685,7 @@ Foam::sampledTriSurfaceMesh::sampledTriSurfaceMesh
             false
         )
     ),
-    sampleSource_(samplingSourceNames_[dict.lookup("source")]),
+    sampleSource_(samplingSourceNames_.lookup("source", dict)),
     needsUpdate_(true),
     keepIds_(dict.lookupOrDefault<Switch>("keepIds", false)),
     originalIds_(),
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index b46d7649f6..c94f90cd3f 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -108,7 +108,7 @@ private:
 
     // Private data
 
-        static const NamedEnum<samplingSource, 3> samplingSourceNames_;
+        static const Enum<samplingSource> samplingSourceNames_;
 
         //- Surface to sample on
         const triSurfaceMesh surface_;
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
index 384192756d..3ecb1836b6 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
@@ -38,31 +38,32 @@ namespace Foam
 
     // Create write methods
     defineSurfaceWriterWriteFields(nastranSurfaceWriter);
-
-    template<>
-    const char* NamedEnum<nastranSurfaceWriter::writeFormat, 3>::names[] =
-    {
-        "short",
-        "long",
-        "free"
-    };
-
-
-    const NamedEnum<nastranSurfaceWriter::writeFormat, 3>
-        nastranSurfaceWriter::writeFormatNames_;
-
-    template<>
-    const char* NamedEnum<nastranSurfaceWriter::dataFormat, 2>::names[] =
-    {
-        "PLOAD2",
-        "PLOAD4"
-    };
-
-    const NamedEnum<nastranSurfaceWriter::dataFormat, 2>
-        nastranSurfaceWriter::dataFormatNames_;
 }
 
 
+const Foam::Enum
+<
+    Foam::nastranSurfaceWriter::writeFormat
+>
+Foam::nastranSurfaceWriter::writeFormatNames_
+{
+    { writeFormat::wfShort, "short" },
+    { writeFormat::wfLong, "long" },
+    { writeFormat::wfFree, "free" },
+};
+
+
+const Foam::Enum
+<
+    Foam::nastranSurfaceWriter::dataFormat
+>
+Foam::nastranSurfaceWriter::dataFormatNames_
+{
+    { dataFormat::dfPLOAD2, "PLOAD2" },
+    { dataFormat::dfPLOAD4, "PLOAD4" },
+};
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::nastranSurfaceWriter::formatOS(Ostream& os) const
@@ -405,18 +406,17 @@ Foam::nastranSurfaceWriter::nastranSurfaceWriter()
 Foam::nastranSurfaceWriter::nastranSurfaceWriter(const dictionary& options)
 :
     surfaceWriter(),
-    writeFormat_(wfLong),
+    writeFormat_(writeFormat::wfLong),
     fieldMap_(),
     scale_(options.lookupOrDefault("scale", 1.0)),
     separator_("")
 {
-    if (options.found("format"))
-    {
-        writeFormat_ = writeFormatNames_.read
-        (
-            options.lookup("format")
-        );
-    }
+    writeFormat_ = writeFormatNames_.lookupOrDefault
+    (
+        "format",
+        options,
+        writeFormat::wfLong
+    );
 
     if (writeFormat_ == wfFree)
     {
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
index 921182af98..2106dc1b4c 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
@@ -56,7 +56,7 @@ SourceFiles
 #define nastranSurfaceWriter_H
 
 #include "surfaceWriter.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "OFstream.H"
 #include "HashTable.H"
 
@@ -93,8 +93,8 @@ private:
 
     // Private data
 
-        static const NamedEnum<writeFormat, 3> writeFormatNames_;
-        static const NamedEnum<dataFormat,  2> dataFormatNames_;
+        static const Enum<writeFormat> writeFormatNames_;
+        static const Enum<dataFormat> dataFormatNames_;
 
         //- Write option
         writeFormat writeFormat_;
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurface.C b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
index b6bc9d87d8..ef95c86318 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurface.C
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
@@ -35,22 +35,22 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+const Foam::Enum
+<
+    Foam::discreteSurface::samplingSource
+>
+Foam::discreteSurface::samplingSourceNames_
+{
+    { samplingSource::cells, "cells" },
+    { samplingSource::insideCells, "insideCells" },
+    { samplingSource::boundaryFaces, "boundaryFaces" },
+};
+
+
 namespace Foam
 {
     defineTypeNameAndDebug(discreteSurface, 0);
 
-    template<>
-    const char* NamedEnum<discreteSurface::samplingSource, 3>::names[] =
-    {
-        "cells",
-        "insideCells",
-        "boundaryFaces"
-    };
-
-    const NamedEnum<discreteSurface::samplingSource, 3>
-    discreteSurface::samplingSourceNames_;
-
-
     //- Private class for finding nearest
     //  Comprising:
     //  - global index
@@ -686,7 +686,7 @@ Foam::discreteSurface::discreteSurface
             false
         )
     ),
-    sampleSource_(samplingSourceNames_[dict.lookup("source")]),
+    sampleSource_(samplingSourceNames_.lookup("source", dict)),
     needsUpdate_(true),
     keepIds_(dict.lookupOrDefault<Switch>("keepIds", false)),
     originalIds_(),
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurface.H b/src/sampling/surface/triSurfaceMesh/discreteSurface.H
index 5114a0974d..9f59550b53 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurface.H
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.H
@@ -107,7 +107,7 @@ private:
 
     // Private data
 
-        static const NamedEnum<samplingSource, 3> samplingSourceNames_;
+        static const Enum<samplingSource> samplingSourceNames_;
 
         //- Reference to mesh
         const polyMesh& mesh_;
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
index b926f96802..71b3751c8c 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
@@ -26,7 +26,7 @@ License
 #include "STARCDsurfaceFormatCore.H"
 #include "clock.H"
 #include "regExp.H"
-#include "IStringStream.H"
+#include "IFstream.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -47,7 +47,7 @@ Foam::fileFormats::STARCDsurfaceFormatCore::readInpCellTable
         return lookup;
     }
 
-    regExp ctnameRE
+    const regExp ctnameRE
     (
         " *CTNA[^ ]*"        // keyword - min 4 chars
         "[[:space:]]+"       // space delimited
@@ -64,13 +64,11 @@ Foam::fileFormats::STARCDsurfaceFormatCore::readInpCellTable
         if (ctnameRE.match(line, groups))
         {
             const label tableId = atoi(groups[0].c_str());
+            const word tableName = word::validated(groups[1]);
 
-            // strip bad chars
-            string::stripInvalid<word>(groups[1]);
-
-            if (!groups[1].empty())
+            if (!tableName.empty())
             {
-                lookup.insert(tableId, groups[1]);
+                lookup.insert(tableId, tableName);
             }
         }
     }
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
index b2fdb85d16..46491be971 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
@@ -32,110 +32,105 @@ using namespace Foam::constant;
 
 const Foam::List<Foam::Tuple2<Foam::scalar, Foam::scalar>>
 Foam::radiation::blackBodyEmission::emissivePowerTable
-(
-    IStringStream
-    (
-        "("
-        "( 1000 0.00032)"
-        "( 1100 0.00091)"
-        "( 1200 0.00213)"
-        "( 1300 0.00432)"
-        "( 1400 0.00779)"
-        "( 1500 0.01280)"
-        "( 1600 0.01972)"
-        "( 1700 0.02853)"
-        "( 1800 0.03934)"
-        "( 1900 0.05210)"
-        "( 2000 0.06672)"
-        "( 2100 0.08305)"
-        "( 2200 0.10088)"
-        "( 2300 0.12002)"
-        "( 2400 0.14025)"
-        "( 2500 0.16135)"
-        "( 2600 0.18311)"
-        "( 2700 0.20535)"
-        "( 2800 0.22788)"
-        "( 2900 0.25055)"
-        "( 3000 0.27322)"
-        "( 3100 0.29576)"
-        "( 3200 0.31809)"
-        "( 3300 0.34009)"
-        "( 3400 0.36172)"
-        "( 3500 0.38290)"
-        "( 3600 0.40359)"
-        "( 3700 0.42375)"
-        "( 3800 0.44336)"
-        "( 3900 0.46240)"
-        "( 4000 0.48085)"
-        "( 4100 0.49872)"
-        "( 4200 0.51599)"
-        "( 4300 0.53267)"
-        "( 4400 0.54877)"
-        "( 4500 0.56429)"
-        "( 4600 0.57925)"
-        "( 4700 0.59366)"
-        "( 4800 0.60753)"
-        "( 4900 0.62088)"
-        "( 5000 0.63372)"
-        "( 5100 0.64606)"
-        "( 5200 0.65794)"
-        "( 5300 0.66935)"
-        "( 5400 0.68033)"
-        "( 5500 0.69087)"
-        "( 5600 0.70101)"
-        "( 5700 0.71076)"
-        "( 5800 0.72012)"
-        "( 5900 0.72913)"
-        "( 6000 0.73778)"
-        "( 6100 0.74610)"
-        "( 6200 0.75410)"
-        "( 6300 0.76180)"
-        "( 6400 0.76920)"
-        "( 6500 0.77631)"
-        "( 6600 0.78316)"
-        "( 6700 0.78975)"
-        "( 6800 0.79609)"
-        "( 6900 0.80219)"
-        "( 7000 0.80807)"
-        "( 7100 0.81373)"
-        "( 7200 0.81918)"
-        "( 7300 0.82443)"
-        "( 7400 0.82949)"
-        "( 7500 0.83436)"
-        "( 7600 0.83906)"
-        "( 7700 0.84359)"
-        "( 7800 0.84796)"
-        "( 7900 0.85218)"
-        "( 8000 0.85625)"
-        "( 8100 0.86017)"
-        "( 8200 0.86396)"
-        "( 8300 0.86762)"
-        "( 8400 0.87115)"
-        "( 8500 0.87456)"
-        "( 8600 0.87786)"
-        "( 8700 0.88105)"
-        "( 8800 0.88413)"
-        "( 8900 0.88711)"
-        "( 9000 0.88999)"
-        "( 9100 0.89277)"
-        "( 9200 0.89547)"
-        "( 9300 0.89807)"
-        "( 9400 0.90060)"
-        "( 9500 0.90304)"
-        "( 9600 0.90541)"
-        "( 9700 0.90770)"
-        "( 9800 0.90992)"
-        "( 9900 0.91207)"
-        "(10000 0.91415)"
-        "(12000 0.94505)"
-        "(15000 0.96893)"
-        "(20000 0.98555)"
-        "(30000 0.99529)"
-        "(40000 0.99792)"
-        "(50000 0.99890)"
-        ")"
-    )()
-);
+{
+    {  1000, 0.00032 },
+    {  1100, 0.00091 },
+    {  1200, 0.00213 },
+    {  1300, 0.00432 },
+    {  1400, 0.00779 },
+    {  1500, 0.01280 },
+    {  1600, 0.01972 },
+    {  1700, 0.02853 },
+    {  1800, 0.03934 },
+    {  1900, 0.05210 },
+    {  2000, 0.06672 },
+    {  2100, 0.08305 },
+    {  2200, 0.10088 },
+    {  2300, 0.12002 },
+    {  2400, 0.14025 },
+    {  2500, 0.16135 },
+    {  2600, 0.18311 },
+    {  2700, 0.20535 },
+    {  2800, 0.22788 },
+    {  2900, 0.25055 },
+    {  3000, 0.27322 },
+    {  3100, 0.29576 },
+    {  3200, 0.31809 },
+    {  3300, 0.34009 },
+    {  3400, 0.36172 },
+    {  3500, 0.38290 },
+    {  3600, 0.40359 },
+    {  3700, 0.42375 },
+    {  3800, 0.44336 },
+    {  3900, 0.46240 },
+    {  4000, 0.48085 },
+    {  4100, 0.49872 },
+    {  4200, 0.51599 },
+    {  4300, 0.53267 },
+    {  4400, 0.54877 },
+    {  4500, 0.56429 },
+    {  4600, 0.57925 },
+    {  4700, 0.59366 },
+    {  4800, 0.60753 },
+    {  4900, 0.62088 },
+    {  5000, 0.63372 },
+    {  5100, 0.64606 },
+    {  5200, 0.65794 },
+    {  5300, 0.66935 },
+    {  5400, 0.68033 },
+    {  5500, 0.69087 },
+    {  5600, 0.70101 },
+    {  5700, 0.71076 },
+    {  5800, 0.72012 },
+    {  5900, 0.72913 },
+    {  6000, 0.73778 },
+    {  6100, 0.74610 },
+    {  6200, 0.75410 },
+    {  6300, 0.76180 },
+    {  6400, 0.76920 },
+    {  6500, 0.77631 },
+    {  6600, 0.78316 },
+    {  6700, 0.78975 },
+    {  6800, 0.79609 },
+    {  6900, 0.80219 },
+    {  7000, 0.80807 },
+    {  7100, 0.81373 },
+    {  7200, 0.81918 },
+    {  7300, 0.82443 },
+    {  7400, 0.82949 },
+    {  7500, 0.83436 },
+    {  7600, 0.83906 },
+    {  7700, 0.84359 },
+    {  7800, 0.84796 },
+    {  7900, 0.85218 },
+    {  8000, 0.85625 },
+    {  8100, 0.86017 },
+    {  8200, 0.86396 },
+    {  8300, 0.86762 },
+    {  8400, 0.87115 },
+    {  8500, 0.87456 },
+    {  8600, 0.87786 },
+    {  8700, 0.88105 },
+    {  8800, 0.88413 },
+    {  8900, 0.88711 },
+    {  9000, 0.88999 },
+    {  9100, 0.89277 },
+    {  9200, 0.89547 },
+    {  9300, 0.89807 },
+    {  9400, 0.90060 },
+    {  9500, 0.90304 },
+    {  9600, 0.90541 },
+    {  9700, 0.90770 },
+    {  9800, 0.90992 },
+    {  9900, 0.91207 },
+    { 10000, 0.91415 },
+    { 12000, 0.94505 },
+    { 15000, 0.96893 },
+    { 20000, 0.98555 },
+    { 30000, 0.99529 },
+    { 40000, 0.99792 },
+    { 50000, 0.99890 }
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -149,7 +144,7 @@ Foam::radiation::blackBodyEmission::blackBodyEmission
     table_
     (
         emissivePowerTable,
-        interpolationTable<scalar>::CLAMP,
+        bounds::repeatableBounding::CLAMP,
         "blackBodyEmissivePower"
     ),
     C1_("C1", dimensionSet(1, 4, 3, 0, 0, 0, 0), 3.7419e-16),
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
index 369c9788a2..12569bda35 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
@@ -30,26 +30,16 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::radiation::boundaryRadiationPropertiesPatch::methodType,
-        3
-    >::names[] =
-    {
-        "solidRadiation",
-        "lookup",
-        "model"
-    };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::radiation::boundaryRadiationPropertiesPatch::methodType,
-    3
-> Foam::radiation::boundaryRadiationPropertiesPatch::methodTypeNames_;
+    Foam::radiation::boundaryRadiationPropertiesPatch::methodType
+>
+Foam::radiation::boundaryRadiationPropertiesPatch::methodTypeNames_
+{
+    { methodType::SOLIDRADIATION, "solidRadiation" },
+    { methodType::LOOKUP, "lookup" },
+    { methodType::MODEL, "model" }
+};
 
 
 // * * * * * * * * * * * * * * * * Private functions * * * * * * * * * * * * //
@@ -84,7 +74,7 @@ boundaryRadiationPropertiesPatch
     const dictionary& dict
 )
 :
-    method_(methodTypeNames_.read(dict.lookup("mode"))),
+    method_(methodTypeNames_.lookup("mode", dict)),
     dict_(dict),
     absorptionEmission_(nullptr),
     transmissivity_(nullptr),
@@ -411,20 +401,15 @@ void Foam::radiation::boundaryRadiationPropertiesPatch::write
     Ostream& os
 ) const
 {
-    os.writeKeyword("mode") << methodTypeNames_[method_]
-        << token::END_STATEMENT << nl;
+    os.writeEntry("mode", methodTypeNames_[method_]);
 
     switch (method_)
     {
         case MODEL:
         {
-            word modelType
-            (
-                word(dict_.lookup("absorptionEmissionModel"))
-            );
+            word modelType(dict_.lookup("absorptionEmissionModel"));
 
-            os.writeKeyword("absorptionEmissionModel") << modelType
-                << token::END_STATEMENT << nl;
+            os.writeEntry("absorptionEmissionModel", modelType);
 
             word modelCoeffs(modelType + word("Coeffs"));
             os.writeKeyword(modelCoeffs);
@@ -433,8 +418,7 @@ void Foam::radiation::boundaryRadiationPropertiesPatch::write
 
             modelType = word(dict_.lookup("transmissivityModel"));
 
-            os.writeKeyword("transmissivityModel") << modelType
-                << token::END_STATEMENT << nl;
+            os.writeEntry("transmissivityModel", modelType);
 
             modelCoeffs = modelType + word("Coeffs");
 
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
index 59ad9a4415..a663b253d3 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
@@ -41,7 +41,7 @@ SourceFiles
 #define boundaryRadiationPropertiesPatch_H
 
 #include "scalarField.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 #include "fvPatch.H"
 #include "calculatedFvPatchFields.H"
 #include "transmissivityModel.H"
@@ -74,7 +74,7 @@ private:
 
     // Private data
 
-        static const NamedEnum<methodType, 3> methodTypeNames_;
+        static const Enum<methodType> methodTypeNames_;
 
         //- How to get property
         const methodType method_;
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index dea53edd91..7c720f5ab0 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -35,36 +35,34 @@ using namespace Foam::constant;
 namespace Foam
 {
     defineTypeNameAndDebug(solarCalculator, 0);
-
-    template<>
-    const char* NamedEnum
-    <
-        solarCalculator::sunDirModel,
-        2
-    >::names[] =
-    {
-        "sunDirConstant",
-        "sunDirTracking"
-    };
-
-    template<>
-    const char* NamedEnum
-    <
-        solarCalculator::sunLModel,
-        3
-    >::names[] =
-    {
-        "sunLoadConstant",
-        "sunLoadFairWeatherConditions",
-        "sunLoadTheoreticalMaximum"
-    };
 }
 
-const Foam::NamedEnum<Foam::solarCalculator::sunDirModel, 2>
-  Foam::solarCalculator::sunDirectionModelTypeNames_;
 
-const Foam::NamedEnum<Foam::solarCalculator::sunLModel, 3>
-   Foam::solarCalculator::sunLoadModelTypeNames_;
+const Foam::Enum
+<
+    Foam::solarCalculator::sunDirModel
+>
+Foam::solarCalculator::sunDirectionModelTypeNames_
+{
+    { sunDirModel::mSunDirConstant, "sunDirConstant" },
+    { sunDirModel::mSunDirTracking, "sunDirTracking" },
+};
+
+
+const Foam::Enum
+<
+    Foam::solarCalculator::sunLModel
+>
+Foam::solarCalculator::sunLoadModelTypeNames_
+{
+    { sunLModel::mSunLoadConstant, "sunLoadConstant" },
+    {
+        sunLModel::mSunLoadFairWeatherConditions,
+        "sunLoadFairWeatherConditions"
+    },
+    { sunLModel::mSunLoadTheoreticalMaximum, "sunLoadTheoreticalMaximum" },
+};
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -271,11 +269,11 @@ Foam::solarCalculator::solarCalculator
     C_(readScalar(dict.lookup("C"))),
     sunDirectionModel_
     (
-        sunDirectionModelTypeNames_.read(dict.lookup("sunDirectionModel"))
+        sunDirectionModelTypeNames_.lookup("sunDirectionModel", dict)
     ),
     sunLoadModel_
     (
-        sunLoadModelTypeNames_.read(dict.lookup("sunLoadModel"))
+        sunLoadModelTypeNames_.lookup("sunLoadModel", dict)
     ),
     coord_()
 {
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
index 9eeb5bfc4d..fb9b8eb6a7 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
@@ -126,10 +126,10 @@ public:
 protected:
 
          //- Sun direction models
-        static const NamedEnum<sunDirModel, 2> sunDirectionModelTypeNames_;
+        static const Enum<sunDirModel> sunDirectionModelTypeNames_;
 
         //- Sun load models
-        static const NamedEnum<sunLModel, 3> sunLoadModelTypeNames_;
+        static const Enum<sunLModel> sunLoadModelTypeNames_;
 
 private:
 
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
index 763a6b4886..aa12edffee 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@@ -38,7 +38,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::checkThermo
 {
     if (isA<singleStepReactingMixture<ThermoType>>(thermo))
     {
-        return dynamic_cast<const singleStepReactingMixture<ThermoType>& >
+        return dynamic_cast<const singleStepReactingMixture<ThermoType>&>
         (
             thermo
         );
@@ -50,7 +50,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::checkThermo
             << "Please select a thermo package based on "
             << "singleStepReactingMixture" << exit(FatalError);
 
-        return dynamic_cast<const singleStepReactingMixture<ThermoType>& >
+        return dynamic_cast<const singleStepReactingMixture<ThermoType>&>
         (
             thermo
         );
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index a389e33b08..12fd3462b4 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -157,7 +157,7 @@ pyrolysisChemistryModel
     Info<< indent << "Number of gases = " << nGases_ << nl;
     forAll(this->reactions_, i)
     {
-        Info<< dynamic_cast<const solidReaction<SolidThermo>& >
+        Info<< dynamic_cast<const solidReaction<SolidThermo>&>
         (
             this->reactions_[i]
         ) << nl;
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index 47664c4fc9..4a8d094133 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -41,14 +41,14 @@ solidChemistryModel
     Ys_(this->solidThermo().composition().Y()),
     reactions_
     (
-        dynamic_cast<const reactingMixture<SolidThermo>& >
+        dynamic_cast<const reactingMixture<SolidThermo>&>
         (
             this->solidThermo()
         )
     ),
     solidThermo_
     (
-        dynamic_cast<const reactingMixture<SolidThermo>& >
+        dynamic_cast<const reactingMixture<SolidThermo>&>
         (
             this->solidThermo()
         ).speciesData()
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index b8d21877b0..e12b63b725 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -33,29 +33,20 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::
-        humidityTemperatureCoupledMixedFvPatchScalarField::
-        massTransferMode,
-        4
-    >::names[] =
-    {
-        "constantMass",
-        "condensation",
-        "evaporation",
-        "condensationAndEvaporation"
-    };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massTransferMode,
-    4
-> Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massModeTypeNames_;
+    Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massTransferMode
+>
+Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massModeTypeNames_
+{
+    { massTransferMode::mtConstantMass, "constantMass" },
+    { massTransferMode::mtCondensation, "condensation" },
+    { massTransferMode::mtEvaporation, "evaporation" },
+    {
+        massTransferMode::mtCondensationAndEvaporation,
+        "condensationAndEvaporation"
+    },
+};
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
@@ -256,7 +247,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
 
     if (dict.found("mode"))
     {
-        mode_ = massModeTypeNames_.read(dict.lookup("mode"));
+        mode_ = massModeTypeNames_.lookup("mode", dict);
         fluid_ = true;
     }
 
@@ -492,7 +483,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::updateCoeffs()
             scalarField liquidRho(patch().size(), 0.0);
 
             fixedGradientFvPatchField<scalar>& Yp =
-                const_cast<fixedGradientFvPatchField<scalar>& >
+                const_cast<fixedGradientFvPatchField<scalar>&>
                 (
                     refCast
                     <
@@ -746,17 +737,15 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
 
     if (fluid_)
     {
-        os.writeKeyword("mode")<< massModeTypeNames_[mode_]
-            << token::END_STATEMENT <<nl;
+        os.writeEntry("mode", massModeTypeNames_[mode_]);
 
         writeEntryIfDifferent<word>(os, "specie", "none", specieName_);
 
-        os.writeKeyword("carrierMolWeight")<< Mcomp_
-            << token::END_STATEMENT <<nl;
+        os.writeEntry("carrierMolWeight", Mcomp_);
 
-        os.writeKeyword("L")<< L_ << token::END_STATEMENT << nl;
-        os.writeKeyword("Tvap")<< Tvap_ << token::END_STATEMENT << nl;
-        os.writeKeyword("fluid")<< fluid_ << token::END_STATEMENT << nl;
+        os.writeEntry("L", L_);
+        os.writeEntry("Tvap", Tvap_);
+        os.writeEntry("fluid", fluid_);
         mass_.writeEntry("mass", os);
 
         if (mode_ == mtConstantMass)
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
index 3f5b1c0eea..258af191cc 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
@@ -188,7 +188,7 @@ private:
 
     // Private data
 
-        static const NamedEnum<massTransferMode, 4> massModeTypeNames_;
+        static const Enum<massTransferMode> massModeTypeNames_;
 
         //- Operating mode
         massTransferMode mode_;
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C
index f017fccca8..7fcc2629e9 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.C
+++ b/src/transportModels/interfaceProperties/interfaceProperties.C
@@ -30,12 +30,7 @@ License
 #include "fvcDiv.H"
 #include "fvcGrad.H"
 #include "fvcSnGrad.H"
-
-// * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
-
-const Foam::scalar Foam::interfaceProperties::convertToRad =
-    Foam::constant::mathematical::pi/180.0;
-
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -72,7 +67,7 @@ void Foam::interfaceProperties::correctContactAngle
             fvsPatchVectorField& nHatp = nHatb[patchi];
             const scalarField theta
             (
-                convertToRad*acap.theta(U_.boundaryField()[patchi], nHatp)
+                degToRad() * acap.theta(U_.boundaryField()[patchi], nHatp)
             );
 
             const vectorField nf
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.H b/src/transportModels/interfaceProperties/interfaceProperties.H
index 81c08948ca..88d0f82361 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.H
+++ b/src/transportModels/interfaceProperties/interfaceProperties.H
@@ -96,10 +96,6 @@ class interfaceProperties
 
 public:
 
-    //- Conversion factor for degrees into radians
-    static const scalar convertToRad;
-
-
     // Constructors
 
         //- Construct from volume fraction field gamma and IOdictionary
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 78bd011527..75763c8301 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -33,27 +33,19 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0);
-
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::alphaContactAngleFvPatchScalarField::limitControls,
-        4
-    >::names[] =
-    {
-        "none",
-        "gradient",
-        "zeroGradient",
-        "alpha"
-    };
 }
 
-
-const Foam::NamedEnum
+const Foam::Enum
 <
-    Foam::alphaContactAngleFvPatchScalarField::limitControls,
-    4
-> Foam::alphaContactAngleFvPatchScalarField::limitControlNames_;
+    Foam::alphaContactAngleFvPatchScalarField::limitControls
+>
+Foam::alphaContactAngleFvPatchScalarField::limitControlNames_
+{
+    { limitControls::lcNone, "none" },
+    { limitControls::lcGradient, "gradient" },
+    { limitControls::lcZeroGradient, "zeroGradient" },
+    { limitControls::lcAlpha, "alpha" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -77,7 +69,7 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(p, iF),
-    limit_(limitControlNames_.read(dict.lookup("limit")))
+    limit_(limitControlNames_.lookup("limit", dict))
 {
     if (dict.found("gradient"))
     {
@@ -166,8 +158,7 @@ void Foam::alphaContactAngleFvPatchScalarField::write
 ) const
 {
     fixedGradientFvPatchScalarField::write(os);
-    os.writeKeyword("limit")
-        << limitControlNames_[limit_] << token::END_STATEMENT << nl;
+    os.writeEntry("limit", limitControlNames_[limit_]);
 }
 
 
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
index fdc46b9e0f..d07f107c08 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
@@ -92,7 +92,7 @@ public:
         lcAlpha
     };
 
-    static const NamedEnum<limitControls, 4> limitControlNames_;
+    static const Enum<limitControls> limitControlNames_;
     limitControls limit_;
 
     // Constructors
diff --git a/tutorials/combustion/chemFoam/gri/validation/createGraph b/tutorials/combustion/chemFoam/gri/validation/createGraph
index d0fb9cc013..1ef428f28d 100755
--- a/tutorials/combustion/chemFoam/gri/validation/createGraph
+++ b/tutorials/combustion/chemFoam/gri/validation/createGraph
@@ -1,10 +1,9 @@
 #!/bin/sh
 
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 gnuplot<<EOF
     set terminal postscript eps color enhanced "Helveicta,20"
diff --git a/tutorials/combustion/chemFoam/h2/validation/createGraph b/tutorials/combustion/chemFoam/h2/validation/createGraph
index bbb36218fa..29c39828f3 100755
--- a/tutorials/combustion/chemFoam/h2/validation/createGraph
+++ b/tutorials/combustion/chemFoam/h2/validation/createGraph
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 gnuplot<<EOF
     set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/combustion/chemFoam/ic8h18/validation/createGraph b/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
index 4606eac7d3..0c6d9b3d3d 100755
--- a/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
+++ b/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 gnuplot<<EOF
     set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
index d406960eff..43e3c36e10 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 gnuplot<<EOF
     set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/combustion/chemFoam/nc7h16/validation/createGraph b/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
index b2f8a4d945..5564fffd7b 100755
--- a/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
+++ b/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 gnuplot<<EOF
     set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4 b/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
index cbae27d840..c1f1b64998 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
@@ -53,12 +53,11 @@ EOF
 }
 
 
-# test if gnuplot exists on the system
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 SETSDIRT="../postProcessing/thermoCouple"
 
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
index 79c100551c..a4395abc9d 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
@@ -16,10 +16,8 @@ FoamFile
 
 extractionMethod    extractFromSurface;
 
-extractFromSurfaceCoeffs
-{
-    includedAngle   150;  // Identifes a feature when angle
-}                         // between faces < includedAngle
+includedAngle       150;  // Identifes a feature when angle
+                          // between faces < includedAngle
 
 trimFeatures
 {
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0/p b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0/p
old mode 100755
new mode 100644
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
index e3aa1a2c22..5490c672cb 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ walls.stl
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ walls.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
index 693c8dbfdf..7016a3610a 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
@@ -85,20 +85,18 @@ EOF
 
 echo "createGraphs:"
 
-# test if gnuplot exists on the system
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 SETSDIR="../postProcessing/sample"
 
-if [ ! -d $SETSDIR ]
-then
-    echo "FOAM FATAL ERROR: result sets not available in directory $SETSDIR" >&2
+[ -d "$SETSDIR" ] || {
+    echo "FOAM FATAL ERROR: result sets not available in directory $SETSDIR" 1>&2
     exit 1
-fi
+}
 
 # paths to data
 LATESTTIME=$(ls $SETSDIR)
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index e5001e5946..50f950de25 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -18,17 +18,15 @@ geom.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
+
     // Write features to obj format for postprocessing
     writeObj                yes;
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs
index 04bbc57ea0..1c39ff49a9 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs
@@ -30,28 +30,25 @@
 #     Joule heating case
 #
 #------------------------------------------------------------------------------
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Stop on first error
 set -e
 
-# test if gnuplot exists on the system
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 
 echo "Creating graph"
 OFDATA='postProcessing/sample1/solid/20000/centreLine_T_jouleHeatingSource:V_jouleHeatingSource:sigma.xy'
 
-if [ ! -f "$OFDATA" ]
-then
-    echo "FOAM FATAL ERROR: OpenFOAM results not available in $OFDATA" >&2
+[ -f "$OFDATA" ] || {
+    echo "FOAM FATAL ERROR: OpenFOAM results not available in $OFDATA" 1>&2
     exit 1
-fi
+}
 
 gnuplot<<EOF
 set terminal postscript eps color enhanced
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
index ae838574d9..7f68f70913 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@@ -36,12 +36,11 @@ done
 
 
 # create validation plot
-# test if gnuplot exists on the system
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 graphName="OF_vs_ANALYTICAL.eps"
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
index 52258ae692..459fbbdc8f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@@ -1,14 +1,12 @@
 // How to obtain raw features (extractFromFile || extractFromSurface)
 extractionMethod    extractFromSurface;
 
-extractFromSurfaceCoeffs
-{
-    // Mark edges whose adjacent surface normals are at an angle less
-    // than includedAngle as features
-    // - 0  : selects no edges
-    // - 180: selects all edges
-    includedAngle   150;
-}
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0  : selects no edges
+// - 180: selects all edges
+includedAngle       150;
+
 
 trimFeatures
 {
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
index a30402600e..d6402c1b4d 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
@@ -3,11 +3,11 @@
 tail -n +4 ../postProcessing/probes/0/U  | \
     tr -s " " | tr -d '(' | cut -d " " -f2-3 > ../Numerical.dat
 
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 gnuplot<<EOF
     set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
index 7c81e11aa4..49ee29f401 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
@@ -18,16 +18,13 @@ boundaryAndFaceZones.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     baffles (porosityFaces);
 
     // Write options
 
-        writeObj        no; //yes;
+    writeObj            no; //yes;
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs b/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
index 20e1699f3d..40bb778403 100755
--- a/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
+++ b/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-if ! which gnuplot > /dev/null 2>&1
-then
-    echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+    echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
-fi
+}
 
 gnuplot<<EOF
     set term post enhanced color solid linewidth 2.0 20
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa..5f2fcf6160 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ motorBike.obj
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ motorBike.obj
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
index 81c52e08cb..ef114df007 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ shaftRotating.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   100;
-    }
+    includedAngle       100;
 
     subsetFeatures
     {
@@ -30,19 +27,15 @@ shaftRotating.stl
     }
 
     // Write options
-
-        writeObj        yes;
+    writeObj            yes;
 }
 
 
 vessel.stl
 {
-    extractionMethod        extractFromSurface;
+    extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle       120;
-    }
+    includedAngle       120;
 
     subsetFeatures
     {
@@ -55,8 +48,7 @@ vessel.stl
     }
 
     // Write options
-
-        writeObj            no;
+    writeObj            no;
 }
 
 
@@ -64,14 +56,10 @@ spargerInlet.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     // Write options
-
-        writeObj        no;
+    writeObj            no;
 }
 
 
@@ -79,14 +67,10 @@ stirrer.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     // Write options
-
-        writeObj        no;
+    writeObj            no;
 }
 
 
@@ -94,16 +78,12 @@ stirrer_baffles.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     baffles (stirrer);
 
     // Write options
-
-        writeObj        no;
+    writeObj            no;
 }
 
 
@@ -111,16 +91,12 @@ rotating.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     baffles (MRF);
 
     // Write options
-
-        writeObj        yes;
+    writeObj            yes;
 }
 
 
@@ -128,16 +104,12 @@ baffles.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     baffles (baffles);
 
     // Write options
-
-        writeObj        no;
+    writeObj            no;
 }
 
 
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
index 3de3952127..1adbed4d42 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
@@ -14,18 +14,17 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0  : selects no edges
+// - 180: selects all edges
+
 opencfd_text.stl
 {
-    extractionMethod        extractFromSurface;
+    extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle       120;
-    }
+    includedAngle       120;
 
     subsetFeatures
     {
@@ -44,23 +43,16 @@ opencfd_text.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj            no;
+    // Write features to obj format for postprocessing
+    writeObj            no;
 }
 
 
 opencfd_box.stl
 {
-    extractionMethod        extractFromSurface;
+    extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle       120;
-    }
+    includedAngle       120;
 
     subsetFeatures
     {
@@ -79,8 +71,8 @@ opencfd_box.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj            no;
+    // Write features to obj format for postprocessing
+    writeObj            no;
 }
 
 
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
index 92e26dfb6a..dbc8c8c914 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
@@ -18,14 +18,11 @@ jaggedBoundary.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   175;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       175;
 
     subsetFeatures
     {
@@ -44,8 +41,8 @@ jaggedBoundary.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                no;
+    // Write features to obj format for postprocessing
+    writeObj            no;
 }
 
 
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
index c8ef75f519..08e6cceabd 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
@@ -18,14 +18,11 @@ unit_cube.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   175;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       175;
 
     subsetFeatures
     {
@@ -44,8 +41,8 @@ unit_cube.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
index e8e85fa128..3a51068dd6 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
@@ -19,19 +19,16 @@ flange.stl
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement
old mode 100755
new mode 100644
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
index 0ae80247da..af90271ddd 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ DTC-scaled.stl
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ DTC-scaled.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
index ec1a7aa4e5..55ed0f7aec 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
@@ -14,24 +14,23 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0  : selects no edges
+// - 180: selects all edges
+
 vessel.stl
 {
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                no;
+    // Write features to obj format for postprocessing
+    writeObj            no;
 }
 
 gasInlet.stl
@@ -39,36 +38,27 @@ gasInlet.stl
 
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 stirrer.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 outlet.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 /*
@@ -76,36 +66,27 @@ baffles.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 rotating.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 sparger.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 */
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
index d22cdd2cc4..af3c3b444d 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
@@ -8,8 +8,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runParallel $(getApplication)
 
-unset FOAM_SIGFPE
-runParallel -s reconstruct redistributePar -reconstruct
+# Disable trapping of floating-point exceptions
+FOAM_SIGFPE=false runParallel -s reconstruct redistributePar -reconstruct
 
 # A bit more testing of decomposing
 \cp system/controlDict_nextWrite system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa..5f2fcf6160 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ motorBike.obj
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ motorBike.obj
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
index 0ae80247da..af90271ddd 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ DTC-scaled.stl
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ DTC-scaled.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
index 52258ae692..0f429323e0 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@@ -1,14 +1,12 @@
 // How to obtain raw features (extractFromFile || extractFromSurface)
 extractionMethod    extractFromSurface;
 
-extractFromSurfaceCoeffs
-{
-    // Mark edges whose adjacent surface normals are at an angle less
-    // than includedAngle as features
-    // - 0  : selects no edges
-    // - 180: selects all edges
-    includedAngle   150;
-}
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0  : selects no edges
+// - 180: selects all edges
+includedAngle       150;
 
 trimFeatures
 {
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa..dc2ea8b234 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,12 @@ motorBike.obj
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0   : selects no edges
+    // - 180 : selects all edges
+
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +38,8 @@ motorBike.obj
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index ffeafc363f..b0aef956f7 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -14,18 +14,17 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0   : selects no edges
+// - 180 : selects all edges
+
 bottomAir.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
@@ -34,14 +33,7 @@ heater.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
@@ -50,14 +42,7 @@ leftSolid.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
@@ -66,14 +51,7 @@ rightSolid.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
@@ -82,14 +60,7 @@ topAir.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;