diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
index 8d730c39e1..897830f585 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
@@ -60,7 +60,7 @@ Foam::functionObjects::fieldAverageItem::fieldAverageItem()
     meanFieldName_("unknown"),
     prime2Mean_(0),
     prime2MeanFieldName_("unknown"),
-    base_(ITER),
+    base_(baseType::iter),
     window_(-1.0),
     windowName_("")
 {}
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index 2054583139..d72d28249a 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -89,10 +89,10 @@ public:
             static const word EXT_PRIME2MEAN;
 
         //- Enumeration defining the averaging base type
-        enum baseType
+        enum class baseType
         {
-            ITER,
-            TIME
+            iter,
+            time
         };
 
 
@@ -198,16 +198,16 @@ public:
                 return baseTypeNames_[base_];
             }
 
-            //- Return true if base is ITER
+            //- Return true if base is iter
             Switch iterBase() const
             {
-                return base_ == ITER;
+                return base_ == baseType::iter;
             }
 
             //- Return true if base is time
             Switch timeBase() const
             {
-                return base_ == TIME;
+                return base_ == baseType::time;
             }
 
             scalar window() const
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
index 8a1ab4d034..4d7ddcc4a5 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
@@ -36,7 +36,7 @@ Foam::functionObjects::fieldAverageItem::fieldAverageItem(Istream& is)
     meanFieldName_("unknown"),
     prime2Mean_(0),
     prime2MeanFieldName_("unknown"),
-    base_(ITER),
+    base_(baseType::iter),
     window_(-1.0)
 {
     is.check
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/functionObjects/field/fieldMinMax/fieldMinMax.C
index 22795ae401..019a183c4a 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -106,7 +106,7 @@ Foam::functionObjects::fieldMinMax::fieldMinMax
     fvMeshFunctionObject(name, runTime, dict),
     logFiles(obr_, name),
     location_(true),
-    mode_(mdMag),
+    mode_(modeType::mag),
     fieldSet_()
 {
     read(dict);
@@ -150,7 +150,7 @@ bool Foam::functionObjects::fieldMinMax::write()
 
     forAll(fieldSet_, fieldi)
     {
-        calcMinMaxFields<scalar>(fieldSet_[fieldi], mdCmpt);
+        calcMinMaxFields<scalar>(fieldSet_[fieldi], modeType::cmpt);
         calcMinMaxFields<vector>(fieldSet_[fieldi], mode_);
         calcMinMaxFields<sphericalTensor>(fieldSet_[fieldi], mode_);
         calcMinMaxFields<symmTensor>(fieldSet_[fieldi], mode_);
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
index 95667a4251..4cc2cbfcf9 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -97,10 +97,10 @@ class fieldMinMax
 {
 public:
 
-    enum modeType
+    enum class modeType
     {
-        mdMag,
-        mdCmpt
+        mag,
+        cmpt
     };
 
 protected:
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
index a62f4244f2..bbb07f6a7a 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@@ -119,7 +119,7 @@ void Foam::functionObjects::fieldMinMax::calcMinMaxFields
 
         switch (mode)
         {
-            case mdMag:
+            case modeType::mag:
             {
                 const volScalarField magField(mag(field));
                 const volScalarField::Boundary& magFieldBoundary =
@@ -205,7 +205,7 @@ void Foam::functionObjects::fieldMinMax::calcMinMaxFields
                 }
                 break;
             }
-            case mdCmpt:
+            case modeType::cmpt:
             {
                 const typename fieldType::Boundary&
                     fieldBoundary = field.boundaryField();
diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index 212501a21f..e9ef925d69 100644
--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -108,7 +108,7 @@ Foam::functionObjects::fieldValues::fieldValueDelta::fieldValueDelta
 :
     regionFunctionObject(name, runTime, dict),
     logFiles(obr_, name),
-    operation_(opSubtract),
+    operation_(operationType::subtract),
     region1Ptr_(nullptr),
     region2Ptr_(nullptr)
 {
diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index 610c9dd76b..12bff2221e 100644
--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
@@ -100,13 +100,13 @@ class fieldValueDelta
 {
 public:
         //- Operation type enumeration
-        enum operationType
+        enum class operationType
         {
-            opAdd,
-            opSubtract,
-            opMin,
-            opMax,
-            opAverage
+            add,
+            subtract,
+            min,
+            max,
+            average
         };
 
         //- Operation type names
diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
index c1930a22bb..31a0e62efb 100644
--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
@@ -40,27 +40,27 @@ Type Foam::functionObjects::fieldValues::fieldValueDelta::applyOperation
 
     switch (operation_)
     {
-        case opAdd:
+        case operationType::add:
         {
             result = value1 + value2;
             break;
         }
-        case opSubtract:
+        case operationType::subtract:
         {
             result = value1 - value2;
             break;
         }
-        case opMin:
+        case operationType::min:
         {
             result = min(value1, value2);
             break;
         }
-        case opMax:
+        case operationType::max:
         {
             result = max(value1, value2);
             break;
         }
-        case opAverage:
+        case operationType::average:
         {
             result = 0.5*(value1 + value2);
             break;
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
index 428828b052..b8dd67c08e 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@@ -430,17 +430,17 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::initialise
 
     switch (regionType_)
     {
-        case stFaceZone:
+        case regionTypes::faceZone:
         {
             setFaceZoneFaces();
             break;
         }
-        case stPatch:
+        case regionTypes::patch:
         {
             setPatchFaces();
             break;
         }
-        case stSampledSurface:
+        case regionTypes::sampledSurface:
         {
             sampledSurfaceFaces(dict);
             break;
@@ -480,7 +480,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::initialise
     {
         Info<< "    weight field = " << weightFieldName_ << nl;
 
-        if (regionType_ == stSampledSurface)
+        if (regionType_ == regionTypes::sampledSurface)
         {
             FatalIOErrorInFunction(dict)
                 << "Cannot use weightField for a sampledSurface"
@@ -541,7 +541,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::writeFileHeader
     const label i
 )
 {
-    if (operation_ != opNone)
+    if (operation_ != operationType::none)
     {
         writeCommented(file(), "Region type : ");
         file() << regionTypeNames_[regionType_] << " " << regionName_ << endl;
@@ -579,12 +579,12 @@ processValues
 {
     switch (operation_)
     {
-        case opSumDirection:
+        case operationType::sumDirection:
         {
             vector n(dict_.lookup("direction"));
             return sum(pos0(values*(Sf & n))*mag(values));
         }
-        case opSumDirectionBalance:
+        case operationType::sumDirectionBalance:
         {
             vector n(dict_.lookup("direction"));
             const scalarField nv(values*(Sf & n));
@@ -611,7 +611,7 @@ processValues
 {
     switch (operation_)
     {
-        case opSumDirection:
+        case operationType::sumDirection:
         {
             vector n(dict_.lookup("direction"));
             n /= mag(n) + rootVSmall;
@@ -619,7 +619,7 @@ processValues
 
             return sum(pos0(nv)*n*(nv));
         }
-        case opSumDirectionBalance:
+        case operationType::sumDirectionBalance:
         {
             vector n(dict_.lookup("direction"));
             n /= mag(n) + rootVSmall;
@@ -627,12 +627,12 @@ processValues
 
             return sum(pos0(nv)*n*(nv));
         }
-        case opAreaNormalAverage:
+        case operationType::areaNormalAverage:
         {
             scalar result = sum(values & Sf)/sum(mag(Sf));
             return vector(result, 0.0, 0.0);
         }
-        case opAreaNormalIntegrate:
+        case operationType::areaNormalIntegrate:
         {
             scalar result = sum(values & Sf);
             return vector(result, 0.0, 0.0);
@@ -719,7 +719,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::read
 
 bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
 {
-    if (operation_ != opNone)
+    if (operation_ != operationType::none)
     {
         fieldValue::write();
     }
@@ -729,7 +729,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
         surfacePtr_().update();
     }
 
-    if (operation_ != opNone && Pstream::master())
+    if (operation_ != operationType::none && Pstream::master())
     {
         writeTime(file());
     }
@@ -737,7 +737,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
     if (writeArea_)
     {
         totalArea_ = totalArea();
-        if (operation_ != opNone && Pstream::master())
+        if (operation_ != operationType::none && Pstream::master())
         {
             file() << tab << totalArea_;
         }
@@ -811,7 +811,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
         }
     }
 
-    if (operation_ != opNone && Pstream::master())
+    if (operation_ != operationType::none && Pstream::master())
     {
         file() << endl;
     }
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
index 23fda72d10..730a968016 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
@@ -192,11 +192,11 @@ public:
     // Public data types
 
         //- region type enumeration
-        enum regionTypes
+        enum class regionTypes
         {
-            stFaceZone,
-            stPatch,
-            stSampledSurface
+            faceZone,
+            patch,
+            sampledSurface
         };
 
         //- region type names
@@ -204,25 +204,25 @@ public:
 
 
         //- Operation type enumeration
-        enum operationType
+        enum class operationType
         {
-            opNone,
-            opSum,
-            opWeightedSum,
-            opSumMag,
-            opSumDirection,
-            opSumDirectionBalance,
-            opAverage,
-            opWeightedAverage,
-            opAreaAverage,
-            opWeightedAreaAverage,
-            opAreaIntegrate,
-            opWeightedAreaIntegrate,
-            opMin,
-            opMax,
-            opCoV,
-            opAreaNormalAverage,
-            opAreaNormalIntegrate
+            none,
+            sum,
+            weightedSum,
+            sumMag,
+            sumDirection,
+            sumDirectionBalance,
+            average,
+            weightedAverage,
+            areaAverage,
+            weightedAreaAverage,
+            areaIntegrate,
+            weightedAreaIntegrate,
+            min,
+            max,
+            CoV,
+            areaNormalAverage,
+            areaNormalIntegrate
         };
 
         //- Operation type names
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
index fbac7237d8..1300e6e8b8 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
@@ -41,7 +41,11 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::validField
     typedef GeometricField<Type, fvsPatchField, surfaceMesh> sf;
     typedef GeometricField<Type, fvPatchField, volMesh> vf;
 
-    if (regionType_ != stSampledSurface && obr_.foundObject<sf>(fieldName))
+    if
+    (
+        regionType_ != regionTypes::sampledSurface
+     && obr_.foundObject<sf>(fieldName)
+    )
     {
         return true;
     }
@@ -66,7 +70,11 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::getFieldValues
     typedef GeometricField<Type, fvsPatchField, surfaceMesh> sf;
     typedef GeometricField<Type, fvPatchField, volMesh> vf;
 
-    if (regionType_ != stSampledSurface && obr_.foundObject<sf>(fieldName))
+    if
+    (
+        regionType_ != regionTypes::sampledSurface
+     && obr_.foundObject<sf>(fieldName)
+    )
     {
         return filterField(obr_.lookupObject<sf>(fieldName), applyOrientation);
     }
@@ -136,12 +144,12 @@ processSameTypeValues
     Type result = Zero;
     switch (operation_)
     {
-        case opSum:
+        case operationType::sum:
         {
             result = sum(values);
             break;
         }
-        case opWeightedSum:
+        case operationType::weightedSum:
         {
             if (weightField.size())
             {
@@ -153,12 +161,12 @@ processSameTypeValues
             }
             break;
         }
-        case opSumMag:
+        case operationType::sumMag:
         {
             result = sum(cmptMag(values));
             break;
         }
-        case opSumDirection:
+        case operationType::sumDirection:
         {
             FatalErrorInFunction
                 << "Operation " << operationTypeNames_[operation_]
@@ -169,7 +177,7 @@ processSameTypeValues
             result = Zero;
             break;
         }
-        case opSumDirectionBalance:
+        case operationType::sumDirectionBalance:
         {
             FatalErrorInFunction
                 << "Operation " << operationTypeNames_[operation_]
@@ -180,12 +188,12 @@ processSameTypeValues
             result = Zero;
             break;
         }
-        case opAverage:
+        case operationType::average:
         {
             result = sum(values)/values.size();
             break;
         }
-        case opWeightedAverage:
+        case operationType::weightedAverage:
         {
             if (weightField.size())
             {
@@ -197,14 +205,14 @@ processSameTypeValues
             }
             break;
         }
-        case opAreaAverage:
+        case operationType::areaAverage:
         {
             const scalarField magSf(mag(Sf));
 
             result = sum(magSf*values)/sum(magSf);
             break;
         }
-        case opWeightedAreaAverage:
+        case operationType::weightedAreaAverage:
         {
             const scalarField magSf(mag(Sf));
 
@@ -218,14 +226,14 @@ processSameTypeValues
             }
             break;
         }
-        case opAreaIntegrate:
+        case operationType::areaIntegrate:
         {
             const scalarField magSf(mag(Sf));
 
             result = sum(magSf*values);
             break;
         }
-        case opWeightedAreaIntegrate:
+        case operationType::weightedAreaIntegrate:
         {
             const scalarField magSf(mag(Sf));
 
@@ -239,17 +247,17 @@ processSameTypeValues
             }
             break;
         }
-        case opMin:
+        case operationType::min:
         {
             result = min(values);
             break;
         }
-        case opMax:
+        case operationType::max:
         {
             result = max(values);
             break;
         }
-        case opCoV:
+        case operationType::CoV:
         {
             const scalarField magSf(mag(Sf));
 
@@ -268,11 +276,11 @@ processSameTypeValues
 
             break;
         }
-        case opAreaNormalAverage:
+        case operationType::areaNormalAverage:
         {}
-        case opAreaNormalIntegrate:
+        case operationType::areaNormalIntegrate:
         {}
-        case opNone:
+        case operationType::none:
         {}
     }
 
@@ -355,7 +363,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues
             }
         }
 
-        if (operation_ != opNone)
+        if (operation_ != operationType::none)
         {
             // Apply scale factor
             values *= scaleFactor_;
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
index 815a225207..cc22044bb8 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
@@ -131,21 +131,21 @@ public:
     // Public data types
 
         //- Operation type enumeration
-        enum operationType
+        enum class operationType
         {
-            opNone,
-            opSum,
-            opWeightedSum,
-            opSumMag,
-            opAverage,
-            opWeightedAverage,
-            opVolAverage,
-            opWeightedVolAverage,
-            opVolIntegrate,
-            opWeightedVolIntegrate,
-            opMin,
-            opMax,
-            opCoV
+            none,
+            sum,
+            weightedSum,
+            sumMag,
+            average,
+            weightedAverage,
+            volAverage,
+            weightedVolAverage,
+            volIntegrate,
+            weightedVolIntegrate,
+            min,
+            max,
+            CoV
         };
 
         //- Operation type names
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
index 19dbc2a698..dcedeadab2 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
@@ -82,62 +82,62 @@ Type Foam::functionObjects::fieldValues::volFieldValue::processValues
     Type result = Zero;
     switch (operation_)
     {
-        case opSum:
+        case operationType::sum:
         {
             result = gSum(values);
             break;
         }
-        case opWeightedSum:
+        case operationType::weightedSum:
         {
             result = gSum(weightField*values);
             break;
         }
-        case opSumMag:
+        case operationType::sumMag:
         {
             result = gSum(cmptMag(values));
             break;
         }
-        case opAverage:
+        case operationType::average:
         {
             result = gSum(values)/nCells();
             break;
         }
-        case opWeightedAverage:
+        case operationType::weightedAverage:
         {
             result = gSum(weightField*values)/gSum(weightField);
             break;
         }
-        case opVolAverage:
+        case operationType::volAverage:
         {
             result = gSum(V*values)/this->V();
             break;
         }
-        case opWeightedVolAverage:
+        case operationType::weightedVolAverage:
         {
             result = gSum(weightField*V*values)/gSum(weightField*V);
             break;
         }
-        case opVolIntegrate:
+        case operationType::volIntegrate:
         {
             result = gSum(V*values);
             break;
         }
-        case opWeightedVolIntegrate:
+        case operationType::weightedVolIntegrate:
         {
             result = gSum(weightField*V*values);
             break;
         }
-        case opMin:
+        case operationType::min:
         {
             result = gMin(values);
             break;
         }
-        case opMax:
+        case operationType::max:
         {
             result = gMax(values);
             break;
         }
-        case opCoV:
+        case operationType::CoV:
         {
             Type meanValue = gSum(values*V)/this->V();
 
@@ -154,7 +154,7 @@ Type Foam::functionObjects::fieldValues::volFieldValue::processValues
 
             break;
         }
-        case opNone:
+        case operationType::none:
         {}
     }
 
diff --git a/src/functionObjects/field/interfaceHeight/interfaceHeight.C b/src/functionObjects/field/interfaceHeight/interfaceHeight.C
index 8ae548874e..6805905896 100644
--- a/src/functionObjects/field/interfaceHeight/interfaceHeight.C
+++ b/src/functionObjects/field/interfaceHeight/interfaceHeight.C
@@ -65,8 +65,8 @@ void Foam::functionObjects::interfaceHeight::writePositions()
 
     if (Pstream::master())
     {
-        writeTime(file(HEIGHT_FILE));
-        writeTime(file(POSITION_FILE));
+        writeTime(file(fileID::heightFile));
+        writeTime(file(fileID::positionFile));
     }
 
     forAll(locations_, li)
@@ -124,16 +124,16 @@ void Foam::functionObjects::interfaceHeight::writePositions()
 
             const Foam::Omanip<int> w = valueWidth(1);
 
-            file(HEIGHT_FILE) << w << hIB << w << hIL;
-            file(POSITION_FILE) << '(' << w << p.x() << w << p.y()
+            file(fileID::heightFile) << w << hIB << w << hIL;
+            file(fileID::positionFile) << '(' << w << p.x() << w << p.y()
                 << valueWidth() << p.z() << ") ";
         }
     }
 
     if (Pstream::master())
     {
-        file(HEIGHT_FILE).endl();
-        file(POSITION_FILE).endl();
+        file(fileID::heightFile).endl();
+        file(fileID::positionFile).endl();
     }
 }
 
@@ -154,7 +154,7 @@ void Foam::functionObjects::interfaceHeight::writeFileHeader(const label i)
 
     switch (fileID(i))
     {
-        case HEIGHT_FILE:
+        case fileID::heightFile:
             writeHeaderValue
             (
                 file(i),
@@ -168,7 +168,7 @@ void Foam::functionObjects::interfaceHeight::writeFileHeader(const label i)
                 "Interface height above the location"
             );
             break;
-        case POSITION_FILE:
+        case fileID::positionFile:
             writeHeaderValue(file(i), "p", "Interface position");
             break;
     }
@@ -180,10 +180,10 @@ void Foam::functionObjects::interfaceHeight::writeFileHeader(const label i)
     {
         switch (fileID(i))
         {
-            case HEIGHT_FILE:
+            case fileID::heightFile:
                 file(i) << w << li << w << ' ';
                 break;
-            case POSITION_FILE:
+            case fileID::positionFile:
                 file(i) << w << li << w << ' ' << w << ' ' << "  ";
                 break;
         }
@@ -195,10 +195,10 @@ void Foam::functionObjects::interfaceHeight::writeFileHeader(const label i)
     {
         switch (fileID(i))
         {
-            case HEIGHT_FILE:
+            case fileID::heightFile:
                 file(i) << w << "hB" << w << "hL";
                 break;
-            case POSITION_FILE:
+            case fileID::positionFile:
                 file(i) << w << "p" << w << ' ' << w << ' ' << "  ";
                 break;
         }
@@ -224,12 +224,7 @@ Foam::functionObjects::interfaceHeight::interfaceHeight
     interpolationScheme_("cellPoint")
 {
     read(dict);
-
-    wordList names(2);
-    names[HEIGHT_FILE] = "height";
-    names[POSITION_FILE] = "position";
-
-    resetNames(wordList(names));
+    resetNames({"height", "position"});
 }
 
 
diff --git a/src/functionObjects/field/interfaceHeight/interfaceHeight.H b/src/functionObjects/field/interfaceHeight/interfaceHeight.H
index 3544cb55c2..65c0b8817d 100644
--- a/src/functionObjects/field/interfaceHeight/interfaceHeight.H
+++ b/src/functionObjects/field/interfaceHeight/interfaceHeight.H
@@ -104,12 +104,19 @@ class interfaceHeight
     // Private Enumerations
 
         //- File enumeration
-        enum fileID
+        enum class fileID
         {
-            HEIGHT_FILE = 0,
-            POSITION_FILE = 1
+            heightFile = 0,
+            positionFile = 1
         };
 
+        using logFiles::file;
+
+        Ostream& file(const fileID fid)
+        {
+            return logFiles::file(label(fid));
+        }
+
 
 protected:
 
diff --git a/src/functionObjects/field/streamLine/streamLine.C b/src/functionObjects/field/streamLine/streamLine.C
index bcc4995b9f..358418e4f0 100644
--- a/src/functionObjects/field/streamLine/streamLine.C
+++ b/src/functionObjects/field/streamLine/streamLine.C
@@ -266,7 +266,7 @@ void Foam::functionObjects::streamLine::track()
         vvInterp,
         UIndex,         // index of U in vvInterp
 
-        trackDirection_ == trackDirection::FORWARD,
+        trackDirection_ == trackDirection::forward,
 
         nSubCycle_,     // automatic track control:step through cells in steps?
         trackLength_,   // fixed track length
@@ -281,14 +281,14 @@ void Foam::functionObjects::streamLine::track()
     const scalar trackTime = Foam::sqrt(great);
 
     // Track
-    if (trackDirection_ == trackDirection::BOTH)
+    if (trackDirection_ == trackDirection::both)
     {
         initialParticles = particles;
     }
 
     particles.move(particles, td, trackTime);
 
-    if (trackDirection_ == trackDirection::BOTH)
+    if (trackDirection_ == trackDirection::both)
     {
         particles.IDLList<streamLineParticle>::operator=(initialParticles);
         td.trackForward_ = !td.trackForward_;
@@ -347,8 +347,8 @@ bool Foam::functionObjects::streamLine::read(const dictionary& dict)
     {
         trackDirection_ =
             dict.lookupType<bool>("trackForward")
-          ? trackDirection::FORWARD
-          : trackDirection::BACKWARD;
+          ? trackDirection::forward
+          : trackDirection::backward;
     }
     else
     {
diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H
index 86fcea892e..11a846d097 100644
--- a/src/functionObjects/field/streamLine/streamLine.H
+++ b/src/functionObjects/field/streamLine/streamLine.H
@@ -136,11 +136,11 @@ public:
     // Public data types
 
         //- Track direction enumerations
-        enum trackDirection
+        enum class trackDirection
         {
-            FORWARD,
-            BACKWARD,
-            BOTH
+            forward,
+            backward,
+            both
         };
 
         //- Track direction enumeration names
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
index 1a1fc3f6ea..a311f683ac 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -91,34 +91,6 @@ const Foam::NamedEnum
     7
 > Foam::functionObjects::turbulenceFields::incompressibleFieldNames_;
 
-const Foam::word Foam::functionObjects::turbulenceFields::modelName
-(
-    Foam::turbulenceModel::propertiesName
-);
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-bool Foam::functionObjects::turbulenceFields::compressible()
-{
-    if (obr_.foundObject<compressible::turbulenceModel>(modelName))
-    {
-        return true;
-    }
-    else if (obr_.foundObject<incompressible::turbulenceModel>(modelName))
-    {
-        return false;
-    }
-    else
-    {
-        FatalErrorInFunction
-            << "Turbulence model not found in database, deactivating"
-            << exit(FatalError);
-    }
-
-    return false;
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -144,6 +116,12 @@ Foam::functionObjects::turbulenceFields::~turbulenceFields()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+const Foam::word& Foam::functionObjects::turbulenceFields::modelName()
+{
+    return Foam::turbulenceModel::propertiesName;
+}
+
+
 bool Foam::functionObjects::turbulenceFields::read(const dictionary& dict)
 {
     if (dict.found("field"))
@@ -161,7 +139,7 @@ bool Foam::functionObjects::turbulenceFields::read(const dictionary& dict)
         Info<< "storing fields:" << nl;
         forAllConstIter(wordHashSet, fieldSet_, iter)
         {
-            Info<< "    " << modelName << ':' << iter.key() << nl;
+            Info<< "    " << modelName() << ':' << iter.key() << nl;
         }
         Info<< endl;
     }
@@ -176,59 +154,57 @@ bool Foam::functionObjects::turbulenceFields::read(const dictionary& dict)
 
 bool Foam::functionObjects::turbulenceFields::execute()
 {
-    bool comp = compressible();
-
-    if (comp)
+    if (obr_.foundObject<compressible::turbulenceModel>(modelName()))
     {
         const compressible::turbulenceModel& model =
-            obr_.lookupObject<compressible::turbulenceModel>(modelName);
+            obr_.lookupObject<compressible::turbulenceModel>(modelName());
 
         forAllConstIter(wordHashSet, fieldSet_, iter)
         {
             const word& f = iter.key();
             switch (compressibleFieldNames_[f])
             {
-                case cfK:
+                case compressibleField::k:
                 {
                     processField<scalar>(f, model.k());
                     break;
                 }
-                case cfEpsilon:
+                case compressibleField::epsilon:
                 {
                     processField<scalar>(f, model.epsilon());
                     break;
                 }
-                case cfOmega:
+                case compressibleField::omega:
                 {
                     processField<scalar>(f, omega(model));
                     break;
                 }
-                case cfMut:
+                case compressibleField::mut:
                 {
                     processField<scalar>(f, model.mut());
                     break;
                 }
-                case cfMuEff:
+                case compressibleField::muEff:
                 {
                     processField<scalar>(f, model.muEff());
                     break;
                 }
-                case cfAlphat:
+                case compressibleField::alphat:
                 {
                     processField<scalar>(f, model.alphat());
                     break;
                 }
-                case cfAlphaEff:
+                case compressibleField::alphaEff:
                 {
                     processField<scalar>(f, model.alphaEff());
                     break;
                 }
-                case cfR:
+                case compressibleField::R:
                 {
                     processField<symmTensor>(f, model.R());
                     break;
                 }
-                case cfDevRhoReff:
+                case compressibleField::devRhoReff:
                 {
                     processField<symmTensor>(f, model.devRhoReff());
                     break;
@@ -236,52 +212,52 @@ bool Foam::functionObjects::turbulenceFields::execute()
                 default:
                 {
                     FatalErrorInFunction
-                        << "Invalid field selection" << abort(FatalError);
+                        << "Invalid field selection" << exit(FatalError);
                 }
             }
         }
     }
-    else
+    else if (obr_.foundObject<incompressible::turbulenceModel>(modelName()))
     {
         const incompressible::turbulenceModel& model =
-            obr_.lookupObject<incompressible::turbulenceModel>(modelName);
+            obr_.lookupObject<incompressible::turbulenceModel>(modelName());
 
         forAllConstIter(wordHashSet, fieldSet_, iter)
         {
             const word& f = iter.key();
             switch (incompressibleFieldNames_[f])
             {
-                case ifK:
+                case incompressibleField::k:
                 {
                     processField<scalar>(f, model.k());
                     break;
                 }
-                case ifEpsilon:
+                case incompressibleField::epsilon:
                 {
                     processField<scalar>(f, model.epsilon());
                     break;
                 }
-                case ifOmega:
+                case incompressibleField::omega:
                 {
                     processField<scalar>(f, omega(model));
                     break;
                 }
-                case ifNut:
+                case incompressibleField::nut:
                 {
                     processField<scalar>(f, model.nut());
                     break;
                 }
-                case ifNuEff:
+                case incompressibleField::nuEff:
                 {
                     processField<scalar>(f, model.nuEff());
                     break;
                 }
-                case ifR:
+                case incompressibleField::R:
                 {
                     processField<symmTensor>(f, model.R());
                     break;
                 }
-                case ifDevReff:
+                case incompressibleField::devReff:
                 {
                     processField<symmTensor>(f, model.devReff());
                     break;
@@ -289,11 +265,17 @@ bool Foam::functionObjects::turbulenceFields::execute()
                 default:
                 {
                     FatalErrorInFunction
-                        << "Invalid field selection" << abort(FatalError);
+                        << "Invalid field selection" << exit(FatalError);
                 }
             }
         }
     }
+    else
+    {
+        FatalErrorInFunction
+            << "Turbulence model not found in database, deactivating"
+            << exit(FatalError);
+    }
 
     return true;
 }
@@ -303,7 +285,7 @@ bool Foam::functionObjects::turbulenceFields::write()
 {
     forAllConstIter(wordHashSet, fieldSet_, iter)
     {
-        const word fieldName = modelName + ':' + iter.key();
+        const word fieldName = modelName() + ':' + iter.key();
         writeObject(fieldName);
     }
 
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
index 2cc07c5921..9732691be7 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.H
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
@@ -106,34 +106,32 @@ class turbulenceFields
 {
 public:
 
-    enum compressibleField
+    enum class compressibleField
     {
-        cfK,
-        cfEpsilon,
-        cfOmega,
-        cfMut,
-        cfMuEff,
-        cfAlphat,
-        cfAlphaEff,
-        cfR,
-        cfDevRhoReff
+        k,
+        epsilon,
+        omega,
+        mut,
+        muEff,
+        alphat,
+        alphaEff,
+        R,
+        devRhoReff
     };
     static const NamedEnum<compressibleField, 9> compressibleFieldNames_;
 
-    enum incompressibleField
+    enum class incompressibleField
     {
-        ifK,
-        ifEpsilon,
-        ifOmega,
-        ifNut,
-        ifNuEff,
-        ifR,
-        ifDevReff
+        k,
+        epsilon,
+        omega,
+        nut,
+        nuEff,
+        R,
+        devReff
     };
     static const NamedEnum<incompressibleField, 7> incompressibleFieldNames_;
 
-    static const word modelName;
-
 
 protected:
 
@@ -145,8 +143,7 @@ protected:
 
     // Protected Member Functions
 
-        //- Return true if compressible turbulence model is identified
-        bool compressible();
+        static const word& modelName();
 
         //- Process the turbulence field
         template<class Type>
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
index 72bae77860..735c1bc04e 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
@@ -36,7 +36,7 @@ void Foam::functionObjects::turbulenceFields::processField
 {
     typedef GeometricField<Type, fvPatchField, volMesh> FieldType;
 
-    const word scopedName = modelName + ':' + fieldName;
+    const word scopedName = modelName() + ':' + fieldName;
 
     if (obr_.foundObject<FieldType>(scopedName))
     {
diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 283b5682d3..2f5f67fc11 100644
--- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -44,7 +44,7 @@ void Foam::functionObjects::forceCoeffs::writeFileHeader(const label i)
 {
     switch (fileID(i))
     {
-        case MAIN_FILE:
+        case fileID::mainFile:
         {
             // force coeff data
 
@@ -65,7 +65,7 @@ void Foam::functionObjects::forceCoeffs::writeFileHeader(const label i)
 
             break;
         }
-        case BINS_FILE:
+        case fileID::binsFile:
         {
             // bin coeff data
 
@@ -217,8 +217,8 @@ bool Foam::functionObjects::forceCoeffs::write()
         scalar Clf = Cl/2.0 + Cm;
         scalar Clr = Cl/2.0 - Cm;
 
-        writeTime(file(MAIN_FILE));
-        file(MAIN_FILE)
+        writeTime(file(fileID::mainFile));
+        file(fileID::mainFile)
             << tab << Cm << tab  << Cd
             << tab << Cl << tab << Clf << tab << Clr << endl;
 
@@ -241,17 +241,17 @@ bool Foam::functionObjects::forceCoeffs::write()
                 }
             }
 
-            writeTime(file(BINS_FILE));
+            writeTime(file(fileID::binsFile));
 
             forAll(coeffs[0], i)
             {
-                file(BINS_FILE)
+                file(fileID::binsFile)
                     << tab << coeffs[2][i]
                     << tab << coeffs[1][i]
                     << tab << coeffs[0][i];
             }
 
-            file(BINS_FILE) << endl;
+            file(fileID::binsFile) << endl;
         }
 
         Log << endl;
diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index 0b085abd02..910e0a269e 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -54,7 +54,7 @@ Foam::wordList Foam::functionObjects::forces::createFileNames
 
     const word forceType(dict.lookup("type"));
 
-    // Name for file(MAIN_FILE=0)
+    // Name for file(fileID::mainFile=0)
     names.append(forceType);
 
     if (dict.found("binData"))
@@ -63,7 +63,7 @@ Foam::wordList Foam::functionObjects::forces::createFileNames
         label nb = readLabel(binDict.lookup("nBin"));
         if (nb > 0)
         {
-            // Name for file(BINS_FILE=1)
+            // Name for file(fileID::binsFile=1)
             names.append(forceType + "_bins");
         }
     }
@@ -76,7 +76,7 @@ void Foam::functionObjects::forces::writeFileHeader(const label i)
 {
     switch (fileID(i))
     {
-        case MAIN_FILE:
+        case fileID::mainFile:
         {
             // force data
 
@@ -99,7 +99,7 @@ void Foam::functionObjects::forces::writeFileHeader(const label i)
 
             break;
         }
-        case BINS_FILE:
+        case fileID::binsFile:
         {
             // bin data
 
@@ -423,9 +423,9 @@ void Foam::functionObjects::forces::writeForces()
         << "        porous   : " << sum(moment_[2])
         << endl;
 
-    writeTime(file(MAIN_FILE));
+    writeTime(file(fileID::mainFile));
 
-    file(MAIN_FILE) << tab << setw(1) << '('
+    file(fileID::mainFile) << tab << setw(1) << '('
         << sum(force_[0]) << setw(1) << ' '
         << sum(force_[1]) << setw(1) << ' '
         << sum(force_[2]) << setw(3) << ") ("
@@ -442,7 +442,7 @@ void Foam::functionObjects::forces::writeForces()
         vectorField localMomentT(coordSys_.localVector(moment_[1]));
         vectorField localMomentP(coordSys_.localVector(moment_[2]));
 
-        file(MAIN_FILE) << tab << setw(1) << '('
+        file(fileID::mainFile) << tab << setw(1) << '('
             << sum(localForceN) << setw(1) << ' '
             << sum(localForceT) << setw(1) << ' '
             << sum(localForceP) << setw(3) << ") ("
@@ -451,7 +451,7 @@ void Foam::functionObjects::forces::writeForces()
             << sum(localMomentP) << setw(1) << ')';
     }
 
-    file(MAIN_FILE) << endl;
+    file(fileID::mainFile) << endl;
 }
 
 
@@ -479,11 +479,11 @@ void Foam::functionObjects::forces::writeBins()
         }
     }
 
-    writeTime(file(BINS_FILE));
+    writeTime(file(fileID::binsFile));
 
     forAll(f[0], i)
     {
-        file(BINS_FILE)
+        file(fileID::binsFile)
             << tab << setw(1) << '('
             << f[0][i] << setw(1) << ' '
             << f[1][i] << setw(1) << ' '
@@ -519,7 +519,7 @@ void Foam::functionObjects::forces::writeBins()
 
         forAll(lf[0], i)
         {
-            file(BINS_FILE)
+            file(fileID::binsFile)
                 << tab << setw(1) << '('
                 << lf[0][i] << setw(1) << ' '
                 << lf[1][i] << setw(1) << ' '
@@ -530,7 +530,7 @@ void Foam::functionObjects::forces::writeBins()
         }
     }
 
-    file(BINS_FILE) << endl;
+    file(fileID::binsFile) << endl;
 }
 
 
diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H
index db9de76cf8..72621d445b 100644
--- a/src/functionObjects/forces/forces/forces.H
+++ b/src/functionObjects/forces/forces/forces.H
@@ -139,10 +139,10 @@ protected:
     // Protected data
 
         //- Enumeration for ensuring the right file is accessed
-        enum fileID
+        enum class fileID
         {
-            MAIN_FILE = 0,
-            BINS_FILE = 1
+            mainFile = 0,
+            binsFile = 1
         };
 
         //- Pressure, viscous and porous force per bin
@@ -215,6 +215,13 @@ protected:
 
     // Protected Member Functions
 
+        using logFiles::file;
+
+        Ostream& file(const fileID fid)
+        {
+            return logFiles::file(label(fid));
+        }
+
         //- Create file names for forces and bins
         wordList createFileNames(const dictionary& dict) const;
 
diff --git a/src/functionObjects/utilities/abort/abort.C b/src/functionObjects/utilities/abort/abort.C
index 88285b344c..0a1f16b8d6 100644
--- a/src/functionObjects/utilities/abort/abort.C
+++ b/src/functionObjects/utilities/abort/abort.C
@@ -94,7 +94,7 @@ Foam::functionObjects::abort::abort
     functionObject(name),
     time_(runTime),
     abortFile_("$FOAM_CASE/" + name),
-    action_(nextWrite)
+    action_(actionType::nextWrite)
 {
     abortFile_.expand();
     read(dict);
@@ -120,7 +120,7 @@ bool Foam::functionObjects::abort::read(const dictionary& dict)
     }
     else
     {
-        action_ = nextWrite;
+        action_ = actionType::nextWrite;
     }
 
     if (dict.readIfPresent("file", abortFile_))
@@ -141,7 +141,7 @@ bool Foam::functionObjects::abort::execute()
     {
         switch (action_)
         {
-            case noWriteNow :
+            case actionType::noWriteNow :
             {
                 if (time_.stopAt(Time::saNoWriteNow))
                 {
@@ -153,7 +153,7 @@ bool Foam::functionObjects::abort::execute()
                 break;
             }
 
-            case writeNow :
+            case actionType::writeNow :
             {
                 if (time_.stopAt(Time::saWriteNow))
                 {
@@ -165,7 +165,7 @@ bool Foam::functionObjects::abort::execute()
                 break;
             }
 
-            case nextWrite :
+            case actionType::nextWrite :
             {
                 if (time_.stopAt(Time::saNextWrite))
                 {
diff --git a/src/functionObjects/utilities/abort/abort.H b/src/functionObjects/utilities/abort/abort.H
index 3d78a5891b..51d184d5a9 100644
--- a/src/functionObjects/utilities/abort/abort.H
+++ b/src/functionObjects/utilities/abort/abort.H
@@ -64,7 +64,7 @@ public:
     // Public data
 
         //- Enumeration defining the type of action
-        enum actionType
+        enum class actionType
         {
             noWriteNow,    //!< stop immediately without writing data
             writeNow,      //!< write data and stop immediately
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.C b/src/functionObjects/utilities/writeObjects/writeObjects.C
index 039e2ec441..679411f8dd 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.C
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.C
@@ -73,7 +73,7 @@ void Foam::functionObjects::writeObjects::writeObject
 {
     switch (writeOption_)
     {
-        case AUTO_WRITE:
+        case writeOption::AUTO_WRITE:
         {
             if(obj.writeOpt() != IOobject::AUTO_WRITE)
             {
@@ -82,7 +82,7 @@ void Foam::functionObjects::writeObjects::writeObject
 
             break;
         }
-        case NO_WRITE:
+        case writeOption::NO_WRITE:
         {
             if(obj.writeOpt() != IOobject::NO_WRITE)
             {
@@ -91,7 +91,7 @@ void Foam::functionObjects::writeObjects::writeObject
 
             break;
         }
-        case ANY_WRITE:
+        case writeOption::ANY_WRITE:
         {
             break;
         }
@@ -138,7 +138,7 @@ Foam::functionObjects::writeObjects::writeObjects
         ),
         log
     ),
-    writeOption_(ANY_WRITE)
+    writeOption_(writeOption::ANY_WRITE)
 {
     read(dict);
 }
@@ -174,7 +174,7 @@ bool Foam::functionObjects::writeObjects::read(const dictionary& dict)
     }
     else
     {
-        writeOption_ = ANY_WRITE;
+        writeOption_ = writeOption::ANY_WRITE;
     }
 
     return functionObject::read(dict);
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.H b/src/functionObjects/utilities/writeObjects/writeObjects.H
index 5ede1ba699..87584c514f 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.H
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.H
@@ -107,7 +107,7 @@ public:
 
         //- Re-enumeration defining the write options, based on the original
         //  ones at IOobject::writeOption
-        enum writeOption
+        enum class writeOption
         {
             AUTO_WRITE,
             NO_WRITE,