diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index c23d85bfe8583c466793b02b7c8a3995a49de2b9..85bba58da3fb9cb468140847eb7157cfd65235a8 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 {
     argList::addOption
     (
-        "cloudName",
+        "cloud",
         "name",
         "specify alternative cloud name. default is 'kinematicCloud'"
     );
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index 26467976f5ea855bd82f24b057582cc073486f7c..49f280e428cde8cd74a1fcf64ddfaca2c25b8979 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@@ -11,7 +11,7 @@ word continuousPhaseName
             mesh,
             IOobject::MUST_READ
         )
-    ).lookup("continuousPhaseName")
+    ).lookup("continuousPhase")
 );
 
 Info<< "Reading field U\n" << endl;
@@ -123,7 +123,7 @@ volScalarField alphac
 );
 
 word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloudName", kinematicCloudName);
+args.optionReadIfPresent("cloud", kinematicCloudName);
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
 basicKinematicTypeCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 77287eed8762add0ddab922cc4a1f68124078298..76c70fffd956a200f85eae6478cfce2aba769cf0 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -58,7 +58,7 @@ volScalarField mu
 );
 
 word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloudName", kinematicCloudName);
+args.optionReadIfPresent("cloud", kinematicCloudName);
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
 basicKinematicCollidingCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
index d672386e50f80522a9dccd099d2c1699b17274fb..be0905796ba3c19f8b98aefd7ddcc8802cfb7cc1 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 {
     argList::addOption
     (
-        "cloudName",
+        "cloud",
         "name",
         "specify alternative cloud name. default is 'kinematicCloud'"
     );
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index c21100b0be8a548695a23e40b65a8a35a2ae2cce..6b64ce99f3ec5c85dec29edff53244b5a5615d54 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 {
     argList::addOption
     (
-        "cloudName",
+        "cloud",
         "name",
         "specify alternative cloud name. default is 'kinematicCloud'"
     );
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
index 9f728049f9b6885398601cfd83e36ba49fc95b58..9aa648ce5f922b0fc3f4a210bb8c1a0d34cbab7f 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
 
 const word kinematicCloudName
 (
-    args.optionLookupOrDefault<word>("cloudName", "kinematicCloud")
+    args.optionLookupOrDefault<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index d3a1f829fdfb4726ef559d8e2760753d4690d2f1..006c98b7a8894a65879af2fc732cfe7c31075b63 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 {
     argList::addOption
     (
-        "cloudName",
+        "cloud",
         "name",
         "specify alternative cloud name. default is 'kinematicCloud'"
     );
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
index 2f7abc70151a85dc9a972983b0dcf34e002030f3..63c85938cfdd90dafbc7e0eb13c01229d9e6542f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -49,7 +49,7 @@ Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    sourceFieldName_(dict.lookup("sourceFieldName"))
+    sourceFieldName_(dict.lookup("sourceField"))
 {}
 
 
@@ -109,7 +109,7 @@ void Foam::copiedFixedValueFvPatchScalarField::updateCoeffs()
 void Foam::copiedFixedValueFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
-    os.writeKeyword("sourceFieldName")
+    os.writeKeyword("sourceField")
         << sourceFieldName_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
index b2af2f1c4a8003f59546485d7d33e4d65104d3b4..f0f224d3535c71ede737227893f4f107bc19957e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
@@ -62,6 +62,7 @@ protected:
 
         word sourceFieldName_;
 
+
 public:
 
     //- Runtime type information
diff --git a/applications/test/passiveParticle/Test-passiveParticle.C b/applications/test/passiveParticle/Test-passiveParticle.C
index 68bea7b8efa18ec762d7e1e9a214ba105fa70f5e..96fcc35282763998eb81537b3cfd167eb8f2882b 100644
--- a/applications/test/passiveParticle/Test-passiveParticle.C
+++ b/applications/test/passiveParticle/Test-passiveParticle.C
@@ -36,7 +36,7 @@ Description
 
 int main(int argc, char *argv[])
 {
-    argList::validArgs.append("cloudName");
+    argList::validArgs.append("cloud");
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 25c536e10324d176ee0025f40c0d40ae9d57447f..7385fd502936689b5ad5f9cdcffcb311161c50a3 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -602,8 +602,8 @@ int main(int argc, char *argv[])
         const word& key = iter().keyword();
 
         const dictionary& dict = iter().dict();
-        const word cyclicName = dict.lookup("cyclicMasterPatchName");
-        const word wallName = dict.lookup("wallPatchName");
+        const word cyclicName = dict.lookup("cyclicMasterPatch");
+        const word wallName = dict.lookup("wallPatch");
         FixedList<word, 3> nameAndType;
         nameAndType[0] = key;
         nameAndType[1] = wallName;
diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options
index 84027a1c28ddddee75f045cd41a1f2b96fa9f73a..18d4dfeb9fa278a50edc2f208210e42c83e1e8b6 100644
--- a/applications/utilities/miscellaneous/foamList/Make/options
+++ b/applications/utilities/miscellaneous/foamList/Make/options
@@ -15,10 +15,12 @@ EXE_LIBS = \
     -lchemistryModel \
     -lcoalCombustion \
     -lcombustionModels \
-    -lcompressibleTransportModels \
+    -lcompressibleEulerianInterfacialModels \
+    -lcompressibleMultiphaseEulerianInterfacialModels \
     -lcompressibleTurbulenceModels \
-    -lconversion \
-    -ldecompose \
+    -lCompressibleTwoPhaseMixtureTurbulenceModels \
+    -lcompressibleTwoPhaseSystem \
+    -lconformalVoronoiMesh \
     -ldecompositionMethods \
     -ldistributed \
     -ldistributionModels \
@@ -35,29 +37,32 @@ EXE_LIBS = \
     -lfileFormats \
     -lfiniteVolume \
     -lfluidThermophysicalModels \
+    -lfoamToVTK \
     -lforces \
     -lfvMotionSolvers \
     -lfvOptions \
     -lgenericPatchFields \
-    -limmiscibleIncompressibleTwoPhaseMixture \
+    -lhelpTypes \
     -lincompressibleTransportModels \
     -lincompressibleTurbulenceModels \
     -linterfaceProperties \
     -llagrangianFunctionObjects \
     -llagrangianIntermediate \
-    -llagrangian \
     -llagrangianSpray \
     -llagrangianTurbulence \
     -llaminarFlameSpeedModels \
-    -lliquidMixtureProperties \
+    -lliquidPropertiesFvPatchFields \
     -lliquidProperties \
     -lmeshTools \
-    -lmolecularMeasurements \
-    -lmolecule \
+    -lmultiphaseInterFoam \
+    -lmultiphaseMixtureThermo \
+    -lmultiphaseReactingTurbulenceModels \
+    -lmultiphaseSystem \
     -lODE \
     -lOpenFOAM \
-    -lpairPatchAgglomeration \
     -lphaseChangeTwoPhaseMixtures \
+    -lphaseCompressibleTurbulenceModels \
+    -lphaseTemperatureChangeTwoPhaseMixtures \
     -lpotential \
     -lpyrolysisModels \
     -lradiationModels \
@@ -68,7 +73,6 @@ EXE_LIBS = \
     -lreactingPhaseSystem \
     -lreactingTwoPhaseSystem \
     -lreactionThermophysicalModels \
-    -lreconstruct \
     -lregionCoupled \
     -lregionCoupling \
     -lregionModels \
@@ -79,11 +83,9 @@ EXE_LIBS = \
     -lsampling \
     -lscotchDecomp \
     -lsixDoFRigidBodyMotion \
-    -lSLGThermo \
+    -lSloanRenumber \
     -lsnappyHexMesh \
     -lsolidChemistryModel \
-    -lsolidMixtureProperties \
-    -lsolidParticle \
     -lsolidProperties \
     -lsolidSpecie \
     -lsolidThermo \
@@ -92,13 +94,12 @@ EXE_LIBS = \
     -lsurfaceFilmDerivedFvPatchFields \
     -lsurfaceFilmModels \
     -lsurfMesh \
+    -ltabulatedWallFunctions \
     -lthermalBaffleModels \
     -lthermophysicalFunctions \
     -ltopoChangerFvMesh \
-    -ltriSurface \
+    -lturbulenceModelSchemes \
     -lturbulenceModels \
-    -ltwoPhaseMixture \
-    -ltwoPhaseMixtureThermo \
     -ltwoPhaseProperties \
     -ltwoPhaseReactingTurbulenceModels \
     -lutilityFunctionObjects
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index 78738e321d8a945e01e7d5cff5ef5ea432d6bd13..267d0959a8df3ee48720a9cae30207d1e63e1a47 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -9,7 +9,7 @@ IOdictionary propsDict
     )
 );
 
-const word cloudName(propsDict.lookup("cloudName"));
+const word cloudName(propsDict.lookup("cloud"));
 
 label sampleFrequency(readLabel(propsDict.lookup("sampleFrequency")));
 
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
index 309d7718f6682283ce980002cf146e94c49c5d3a..67699d3c0ab6703ad83d1341f127c40b0a1e0e2d 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
@@ -4,6 +4,6 @@ const word dictName("particleTrackDict");
 
 IOdictionary propsDict(dictIO);
 
-word cloudName(propsDict.lookup("cloudName"));
+word cloudName(propsDict.lookup("cloud"));
 
 List<word> userFields(propsDict.lookup("fields"));
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index 1522f6583880ac45aa7e2e8b652ec85498abe525..55a81ea6ecdf488cce355e281e2238e6725d611f 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -74,7 +74,7 @@ outletMappedUniformInletHeatAdditionFvPatchField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    outletPatchName_(dict.lookup("outletPatchName")),
+    outletPatchName_(dict.lookup("outletPatch")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     Q_(readScalar(dict.lookup("Q"))),
     minTempLimit_(dict.lookupOrDefault<scalar>("minTempLimit", 0)),
@@ -167,8 +167,7 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::updateCoeffs()
         scalar averageOutletField =
             gSum(outletPatchPhi*outletPatchField)/sumOutletPatchPhi;
 
-        const scalarField Cpf =
-            thermo.Cp()().boundaryField()[outletPatchID];
+        const scalarField Cpf(thermo.Cp()().boundaryField()[outletPatchID]);
 
         scalar totalPhiCp = gSum(outletPatchPhi)*gAverage(Cpf);
 
@@ -198,11 +197,13 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::updateCoeffs()
 }
 
 
-void Foam::outletMappedUniformInletHeatAdditionFvPatchField::
-write(Ostream& os) const
+void Foam::outletMappedUniformInletHeatAdditionFvPatchField::write
+(
+    Ostream& os
+) const
 {
     fvPatchScalarField::write(os);
-    os.writeKeyword("outletPatchName")
+    os.writeKeyword("outletPatch")
         << outletPatchName_ << token::END_STATEMENT << nl;
 
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
@@ -216,6 +217,7 @@ write(Ostream& os) const
     this->writeEntry("value", os);
 }
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
index ee61b6933790c76c9c045e474e192fa1c8bfdf79..4dcd68855558e700609db1481f81b92f74c171fb 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
@@ -29,7 +29,7 @@ Group
 
 Description
     This temperature boundary conditon averages the temperature over the
-    "outlet" patch specified by name "outletPatchName" and applies an extra
+    "outlet" patch specified by name "outletPatch" and applies an extra
     heat source. This is set as a uniform temperature value on this patch.
     Additionally minTempLimit/maxTempLimit limits can be applied
 
@@ -37,7 +37,7 @@ Description
 
     \table
         Property        | Description             | Required    | Default value
-        outletPatchName | name of outlet patch    | yes         |
+        outletPatch     | name of outlet patch    | yes         |
         Q               | Heat addition           | yes
         phi             | flux field name         | no          | phi
         minTempLimit    | min temperature limit   | no          | 0.0
@@ -49,7 +49,7 @@ Description
     myPatch
     {
         type            outletMappedUniformInletHeatAddition;
-        outletPatchName aPatch;
+        outletPatch     aPatch;
         Q               10;     // Heat addition in W
         phi             phi;
         value           uniform 0;
@@ -100,6 +100,7 @@ class outletMappedUniformInletHeatAdditionFvPatchField
         //- Maxmum Temperature Limit
         scalar maxTempLimit_;
 
+
 public:
 
     //- Runtime type information
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
index c777ff623a45ed590d39b8f1c5751eb4b2a7904c..dd367ca3f8b616254b30c7661723bd6d444174e4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
@@ -29,13 +29,13 @@ Group
 
 Description
     This boundary conditon averages the field over the "outlet" patch specified
-    by name "outletPatchName" and applies this as the uniform value of the
+    by name "outletPatch" and applies this as the uniform value of the
     field over this patch.
 
 Usage
     \table
         Property        | Description             | Required    | Default value
-        outletPatchName | name of outlet patch    | yes         |
+        outletPatch     | name of outlet patch    | yes         |
         phi             | flux field name         | no          | phi
     \endtable
 
@@ -44,7 +44,7 @@ Usage
     <patchName>
     {
         type            outletMappedUniformInlet;
-        outletPatchName aPatch;
+        outletPatch     aPatch;
         phi             phi;
         value           uniform 0;
     }
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.C b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
index 360af5136c96772e9940329f47b0d1cd8a5d0e04..bb94a127677f96eb0000dc6c600151abfdb1e180 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.C
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
@@ -113,7 +113,7 @@ bool Foam::functionObjects::DESModelRegions::read(const dictionary& dict)
     fvMeshFunctionObject::read(dict);
     writeFile::read(dict);
 
-    dict.readIfPresent("resultName", resultName_);
+    dict.readIfPresent("result", resultName_);
 
     return true;
 }
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 7a27f185272e0a30c783392827006f3726ba3107..cfe7a3e18c2beefe6e6b7192ba7d57b80bc02b85 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -623,7 +623,7 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict)
     writeFile::read(dict);
 
     mode_ = modeTypeNames_.read(dict.lookup("mode"));
-    phiName_= dict.lookupOrDefault<word>("phiName", "phi");
+    phiName_= dict.lookupOrDefault<word>("phi", "phi");
     dict.readIfPresent("scaleFactor", scaleFactor_);
     dict.readIfPresent("tolerance", tolerance_);
 
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 2a489fdc78ae8e6d2d245e93647011cd02704551..9b6daeee12c484a59d2d46a8b9b86e9115748915 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -558,7 +558,7 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
 
     //Info<< "    using interpolation " << interpolationScheme_ << endl;
 
-    cloudName_ = dict.lookupOrDefault<word>("cloudName", type());
+    cloudName_ = dict.lookupOrDefault<word>("cloud", type());
     dict.lookup("seedSampleSet") >> seedSet_;
 
     const dictionary& coeffsDict = dict.subDict(seedSet_ + "Coeffs");
diff --git a/src/functionObjects/field/valueAverage/valueAverage.C b/src/functionObjects/field/valueAverage/valueAverage.C
index a5a7100aed61c3f3352784f6ac3ca4842bbf7c17..7b26468a4fb865e7155b189b5bfd3d15feb86558 100644
--- a/src/functionObjects/field/valueAverage/valueAverage.C
+++ b/src/functionObjects/field/valueAverage/valueAverage.C
@@ -70,7 +70,7 @@ Foam::functionObjects::valueAverage::valueAverage
 :
     regionFunctionObject(name, runTime, dict),
     writeFile(obr_, name, typeName, dict),
-    functionObjectName_("unknown-functionObjectName"),
+    functionObjectName_("unknown-functionObject"),
     fieldNames_(),
     window_(-1),
     totalTime_(),
@@ -109,7 +109,7 @@ bool Foam::functionObjects::valueAverage::read(const dictionary& dict)
     regionFunctionObject::read(dict);
     writeFile::read(dict);
 
-    dict.lookup("functionObjectName") >> functionObjectName_;
+    dict.lookup("functionObject") >> functionObjectName_;
     dict.lookup("fields") >> fieldNames_;
     window_ = dict.lookupOrDefault<scalar>("window", -1);
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
index e88d6a7eb74d6f9107c6a67e0152bba9e6ae6f6f..f43b60c172d4d4fb0826f1ef1001ad8a4e6bc166 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
@@ -514,7 +514,7 @@ Foam::functionObjects::fieldVisualisationBase::fieldVisualisationBase
 :
     parent_(parent),
     colours_(colours),
-    fieldName_(dict.lookup("fieldName")),
+    fieldName_(dict.lookup("field")),
     colourBy_(cbColour),
     colourMap_(cmRainbow),
     range_()
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
index 044ed7b51ea7ab724d18975ac260cb73935c6c32..a414f269c9ec130feb6e505b2d32cd142ad00850 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
@@ -63,9 +63,9 @@ Foam::functionObjects::runTimePostPro::functionObjectCloud::functionObjectCloud
 :
     pointData(parent, dict, colours),
     fieldVisualisationBase(parent, dict, colours),
-    cloudName_(dict.lookup("cloudName")),
+    cloudName_(dict.lookup("cloud")),
     functionObject_(dict.lookup("functionObject")),
-    colourFieldName_(dict.lookup("colourFieldName")),
+    colourFieldName_(dict.lookup("colourField")),
     actor_()
 {
     actor_ = vtkSmartPointer<vtkActor>::New();
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
index 8f0c5d72afafc0303b731cf7fe28b29a46fa8763..37e19ce07e77ef42f0cbd47f65337fb185962b1a 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
@@ -53,7 +53,7 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
 )
 :
     runTimeCondition(name, obr, dict, state),
-    functionObjectName_(dict.lookup("functionObjectName")),
+    functionObjectName_(dict.lookup("functionObject")),
     fieldNames_(dict.lookup("fields")),
     tolerance_(readScalar(dict.lookup("tolerance"))),
     window_(dict.lookupOrDefault<scalar>("window", -1)),
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index cb848dc4d888d800abbbc6ca60e134f2526d9ec3..545601905589ac45075fc4ecbd3b0efa1880391f 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -102,7 +102,7 @@ Foam::fv::interRegionOption::interRegionOption
         mesh
     ),
     master_(coeffs_.lookupOrDefault<bool>("master", true)),
-    nbrRegionName_(coeffs_.lookup("nbrRegionName")),
+    nbrRegionName_(coeffs_.lookup("nbrRegion")),
     meshInterpPtr_()
 {
     if (active())
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
index 767f0224897946f812938474c9aa211cb623782b..b6c2be4abc6e7963f7a92e7d60a838618a863cf7 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
@@ -106,7 +106,7 @@ Foam::fv::acousticDampingSource::acousticDampingSource
             zeroGradientFvPatchField<vector>::typeName
         )
     ),
-    URefName_("unknown-URefName"),
+    URefName_("unknown-URef"),
     x0_(Zero),
     r1_(0),
     r2_(0),
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index b0ecd8c43dd30cb0474b19253b4fb3f7deb75256..89de057f5d062c8f8a8f9ede39850f7b0de9ac7d 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -304,9 +304,9 @@ bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
     {
-        UName_ = coeffs_.lookupOrDefault<word>("UName", "U");
-        TName_ = coeffs_.lookupOrDefault<word>("TName", "T");
-        phiName_ = coeffs_.lookupOrDefault<word>("phiName", "phi");
+        UName_ = coeffs_.lookupOrDefault<word>("U", "U");
+        TName_ = coeffs_.lookupOrDefault<word>("T", "T");
+        phiName_ = coeffs_.lookupOrDefault<word>("phi", "phi");
         coeffs_.lookup("faceZone") >> faceZoneName_;
 
         coeffs_.lookup("secondaryMassFlowRate") >> secondaryMassFlowRate_;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index 4190a1deb2be83a21ce312d78fa3fb6054a46ef0..af0894d4f496ffa035a30e3b8dd3e120506aae7a 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -207,10 +207,10 @@ Foam::fv::tabulatedNTUHeatTransfer::tabulatedNTUHeatTransfer
 )
 :
     interRegionHeatTransferModel(name, modelType, dict, mesh),
-    UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
-    UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")),
-    rhoName_(coeffs_.lookupOrDefault<word>("rhoName", "rho")),
-    rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbrName", "rho")),
+    UName_(coeffs_.lookupOrDefault<word>("U", "U")),
+    UNbrName_(coeffs_.lookupOrDefault<word>("UNbr", "U")),
+    rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
+    rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbr", "rho")),
     ntuTable_(),
     geometryMode_(gmCalculated),
     Ain_(-1),
@@ -275,10 +275,10 @@ bool Foam::fv::tabulatedNTUHeatTransfer::read(const dictionary& dict)
 {
     if (option::read(dict))
     {
-        coeffs_.readIfPresent("UName", UName_);
-        coeffs_.readIfPresent("UNbrName", UNbrName_);
-        coeffs_.readIfPresent("rhoName", rhoName_);
-        coeffs_.readIfPresent("rhoNbrName", rhoNbrName_);
+        coeffs_.readIfPresent("U", UName_);
+        coeffs_.readIfPresent("UNbr", UNbrName_);
+        coeffs_.readIfPresent("rho", rhoName_);
+        coeffs_.readIfPresent("rhoNbr", rhoNbrName_);
 
         // Force geometry re-initialisation
         Ain_ = -1;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
index fb488418d4f885a49826d02c936231b88d6f679e..4e0e0170ce8494fac1f11594d2f6aaf20164dc23 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
@@ -68,13 +68,13 @@ Description
         tabulatedNTUHeatTransferCoeffs
         {
             interpolationMethod cellVolumeWeight;
-            nbrRegionName   air;
+            nbrRegion       air;
             master          true;
 
             fieldNames      (h);
             outOfBounds     clamp;
             fileName        "ntuTable";
-            nbrModelName    airToCooler;
+            nbrModel        airToCooler;
             semiImplicit    no;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index 41b1555d383f1c7e9c1f7eaeae3a13809420f65e..c1fd0f678e0cb64ecc6c7333ebde0fe4ba3619f0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -40,7 +40,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
 )
 :
     InjectionModel<CloudType>(dict, owner, modelName,typeName),
-    patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")),
+    patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
     phiName_(this->coeffDict().template lookupOrDefault<word>("phi", "phi")),
     rhoName_(this->coeffDict().template lookupOrDefault<word>("rho", "rho")),
     duration_(readScalar(this->coeffDict().lookup("duration"))),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 58d67c726bd366f6f22703f96883c9f46e5f3157..13227e34ef4875770e6848976951da7a7fd3b2c9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -38,7 +38,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
 )
 :
     InjectionModel<CloudType>(dict, owner, modelName, typeName),
-    patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")),
+    patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
     duration_(readScalar(this->coeffDict().lookup("duration"))),
     parcelsPerSecond_
     (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index edff573a0fe5106af218eca9bf1fffc5b977db20..5d1077cef3a1082d41c191f28be0f65ea91322ac 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -37,23 +37,14 @@ Foam::InterfaceForce<CloudType>::InterfaceForce
 )
 :
     ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
-    alpaName_
-    (
-        this->coeffs().template lookup("alphaName")
-    ),
-    C_
-    (
-        readScalar(this->coeffs().lookup("C"))
-    ),
+    alpaName_(this->coeffs().lookup("alpha")),
+    C_(readScalar(this->coeffs().lookup("C"))),
     gradInterForceInterpPtr_(nullptr)
 {}
 
 
 template<class CloudType>
-Foam::InterfaceForce<CloudType>::InterfaceForce
-(
-    const InterfaceForce& pf
-)
+Foam::InterfaceForce<CloudType>::InterfaceForce(const InterfaceForce& pf)
 :
     ParticleForce<CloudType>(pf),
     alpaName_(pf.alpaName_),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
index 9630f242b28d292dff2e60addf237e663f1868b6..e023c1d0ea47ad93f6ae66ec7b4a4b021326931c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
@@ -41,7 +41,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
     (
         this->coeffs().template lookupOrDefault<word>
         (
-            "linearAccelerationName",
+            "linearAcceleration",
             "linearAcceleration"
         )
     ),
@@ -50,7 +50,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
     (
         this->coeffs().template lookupOrDefault<word>
         (
-            "angularVelocityName",
+            "angularVelocity",
             "angularVelocity"
         )
     ),
@@ -59,7 +59,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
     (
         this->coeffs().template lookupOrDefault<word>
         (
-            "angularAccelerationName",
+            "angularAcceleration",
             "angularAcceleration"
         )
     ),
@@ -68,7 +68,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
     (
         this->coeffs().template lookupOrDefault<word>
         (
-            "centreOfRotationName",
+            "centreOfRotation",
             "centreOfRotation"
         )
     ),
diff --git a/src/meshTools/coordinateSystems/cartesianCS.H b/src/meshTools/coordinateSystems/cartesianCS.H
index cdfafc52e4b81e3185a900a09f195f07e9705255..d499f790b4700626f68421a78c60a496fed6fe83 100644
--- a/src/meshTools/coordinateSystems/cartesianCS.H
+++ b/src/meshTools/coordinateSystems/cartesianCS.H
@@ -25,7 +25,7 @@ Class
     Foam::cartesianCS
 
 Description
-    Cylindrical coordinate system
+    Cartesian coordinate system
 
 SourceFiles
     cartesianCS.C
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 048bacd25c9c30b9c5be8e5f01d74e85273f80d4..97e4575fc3787b80159902ad6bf16303f819ccd3 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -431,7 +431,7 @@ Foam::regionModels::regionModel::regionModel
     outputPropertiesPtr_(nullptr),
     primaryPatchIDs_(),
     intCoupledPatchIDs_(),
-    regionName_(lookup("regionName")),
+    regionName_(lookup("region")),
     functions_(*this, subOrEmptyDict("functions"))
 {
     if (active_)
@@ -479,7 +479,7 @@ Foam::regionModels::regionModel::regionModel
     outputPropertiesPtr_(nullptr),
     primaryPatchIDs_(),
     intCoupledPatchIDs_(),
-    regionName_(dict.lookup("regionName")),
+    regionName_(dict.lookup("region")),
     functions_(*this, subOrEmptyDict("functions"))
 {
     if (active_)
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index 70a3a0f2c1824b35519b7d771e8eb778acb9cb7b..34bdfe2f85fb546ac3b8b92dcfe9e6e7892171a0 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -38,8 +38,7 @@ namespace compressible
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -53,8 +52,7 @@ thermalBaffleFvPatchScalarField
 {}
 
 
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
 (
     const thermalBaffleFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -76,8 +74,7 @@ thermalBaffleFvPatchScalarField
 {}
 
 
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -97,8 +94,7 @@ thermalBaffleFvPatchScalarField
 
     if (thisMesh.name() == polyMesh::defaultRegion)
     {
-        const word regionName =
-            dict_.lookupOrDefault<word>("regionName", "none");
+        const word regionName = dict_.lookupOrDefault<word>("region", "none");
 
         const word baffleName("3DBaffle" + regionName);
 
@@ -121,8 +117,7 @@ thermalBaffleFvPatchScalarField
 }
 
 
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
 (
     const thermalBaffleFvPatchScalarField& ptf,
     const DimensionedField<scalar, volMesh>& iF
@@ -160,10 +155,9 @@ void thermalBaffleFvPatchScalarField::rmap
 
 void thermalBaffleFvPatchScalarField::createPatchMesh()
 {
-
     const fvMesh& thisMesh = patch().boundaryMesh().mesh();
 
-    word regionName = dict_.lookup("regionName");
+    word regionName = dict_.lookup("region");
 
     List<polyPatch*> regionPatches(3);
     List<word> patchNames(regionPatches.size());
@@ -270,9 +264,8 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
 
     const fvMesh& thisMesh = patch().boundaryMesh().mesh();
 
-    if (thisMesh.name() == polyMesh::defaultRegion && owner_)
+    if (owner_ && (thisMesh.name() == polyMesh::defaultRegion))
     {
-
         os.writeKeyword("extrudeModel");
         os << word(dict_.lookup("extrudeModel"))
            << token::END_STATEMENT << nl;
@@ -293,9 +286,8 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
         os.writeKeyword(extrudeModel);
         os << dict_.subDict(extrudeModel) << nl;
 
-        word regionName = dict_.lookup("regionName");
-        os.writeKeyword("regionName") << regionName
-            << token::END_STATEMENT << nl;
+        word regionName = dict_.lookup("region");
+        os.writeKeyword("region") << regionName << token::END_STATEMENT << nl;
 
         bool active = readBool(dict_.lookup("active"));
         os.writeKeyword("active") <<  active
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index 225ee132d39513f702b18312e3fb9016f6468635..80694beb77409fdfc84456cddb85178048efbc69 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -263,7 +263,7 @@ bool Foam::patchProbes::read(const dictionary& dict)
 {
     if (!dict.readIfPresent("patches", patchNames_))
     {
-        word patchName(dict.lookup("patchName"));
+        word patchName(dict.lookup("patch"));
         patchNames_ = wordReList(1, wordRe(patchName));
     }
     return probes::read(dict);
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
index f092944850f4008b29d9968e8ea32286ff37ab4e..3eeb9c32952a65e16878ec137784714d4411c871 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
@@ -47,56 +47,40 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
     HO2Id_(-1),
     H2OId_(-1),
     NOId_(-1),
-    automaticSIS_(true),
-    phiTol_(this->tolerance()),
-    NOxThreshold_(1800),
-    CO2Name_
+    automaticSIS_
     (
-        dict.subDict("reduction").lookupOrDefault<word>
-        (
-            "CO2Name","CO2"
-        )
-    ),
-    COName_
-    (
-        dict.subDict("reduction").lookupOrDefault<word>
-        (
-            "COName","CO"
-        )
+        this->coeffsDict_.lookupOrDefault<Switch>("automaticSIS", true)
     ),
-    HO2Name_
+    phiTol_
     (
-        dict.subDict("reduction").lookupOrDefault<word>
-        (
-            "HO2Name","HO2"
-        )
+        this->coeffsDict_.lookupOrDefault<scalar>("phiTol", this->tolerance())
     ),
-    H2OName_
+    NOxThreshold_
     (
-        dict.subDict("reduction").lookupOrDefault<word>
-        (
-            "H2OName","H2O"
-        )
+        this->coeffsDict_.lookupOrDefault<scalar>("NOxThreshold", 1800)
     ),
-    NOName_
+    CO2Name_(dict.subDict("reduction").lookupOrDefault<word>("CO2","CO2")),
+    COName_(dict.subDict("reduction").lookupOrDefault<word>("CO","CO")),
+    HO2Name_(dict.subDict("reduction").lookupOrDefault<word>("HO2","HO2")),
+    H2OName_(dict.subDict("reduction").lookupOrDefault<word>("H2O","H2O")),
+    NOName_(dict.subDict("reduction").lookupOrDefault<word>("NO","NO")),
+    forceFuelInclusion_
     (
-        dict.subDict("reduction").lookupOrDefault<word>
-        (
-            "NOName","NO"
-        )
-    ),
-    forceFuelInclusion_(false)
+        this->coeffsDict_.lookupOrDefault<Switch>("forceFuelInclusion", false)
+    )
 {
-    label j=0;
+    label j = 0;
     dictionary initSet = this->coeffsDict_.subDict("initialSet");
-    for (label i=0; i<chemistry.nSpecie(); i++)
+
+    for (label i = 0; i < chemistry.nSpecie(); i++)
     {
         if (initSet.found(chemistry.Y()[i].name()))
         {
             searchInitSet_[j++] = i;
         }
     }
-    if (j<searchInitSet_.size())
+
+    if (j < searchInitSet_.size())
     {
         FatalErrorInFunction
             << searchInitSet_.size()-j
@@ -105,28 +89,7 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
             << exit(FatalError);
     }
 
-    if (this->coeffsDict_.found("automaticSIS"))
-    {
-        automaticSIS_.readIfPresent("automaticSIS", this->coeffsDict_);
-    }
 
-    if (this->coeffsDict_.found("forceFuelInclusion"))
-    {
-        forceFuelInclusion_.readIfPresent
-        (
-            "forceFuelInclusion",this->coeffsDict_
-        );
-    }
-
-    if (this->coeffsDict_.found("phiTol"))
-    {
-        phiTol_ = readScalar(this->coeffsDict_.lookup("phiTol"));
-    }
-
-    if (this->coeffsDict_.found("NOxThreshold"))
-    {
-        NOxThreshold_ = readScalar(this->coeffsDict_.lookup("NOxThreshold"));
-    }
     const List<List<specieElement>>& specieComposition =
         chemistry.specieComp();
 
@@ -134,11 +97,12 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
     {
         const List<specieElement>& curSpecieComposition =
             specieComposition[i];
+
         // For all elements in the current species
         forAll(curSpecieComposition, j)
         {
-            const specieElement& curElement =
-                curSpecieComposition[j];
+            const specieElement& curElement = curSpecieComposition[j];
+
             if (curElement.name() == "C")
             {
                 sC_[i] = curElement.nAtoms();
@@ -157,7 +121,7 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
             }
             else
             {
-                Info<< "element not considered"<<endl;
+                Info<< "element not considered" <<endl;
             }
         }
         if (this->chemistry_.Y()[i].name() == CO2Name_)
@@ -287,7 +251,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
     c1[this->nSpecie_+1] = p;
 
     // Compute the rAB matrix
-    RectangularMatrix<scalar> rABNum(this->nSpecie_,this->nSpecie_,0.0);
+    RectangularMatrix<scalar> rABNum(this->nSpecie_, this->nSpecie_,0.0);
     scalarField PA(this->nSpecie_,0.0);
     scalarField CA(this->nSpecie_,0.0);
 
@@ -319,8 +283,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
         // of the species. It stores the species encountered in the reaction but
         // use another list to see if this species has already been used
 
-        DynamicList<scalar> wA(R.lhs().size()+R.rhs().size());
-        DynamicList<label> wAID(R.lhs().size()+R.rhs().size());
+        DynamicList<scalar> wA(R.lhs().size() + R.rhs().size());
+        DynamicList<label> wAID(R.lhs().size() + R.rhs().size());
 
         forAll(R.lhs(), s) // Compute rAB for all species in the left hand side
         {
@@ -344,7 +308,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
             // Disable for self reference (by definition rAA=0)
             deltaBi[ss] = false;
 
-            while(!usedIndex.empty())
+            while (!usedIndex.empty())
             {
                 label curIndex = usedIndex.pop();
                 if (deltaBi[curIndex])
@@ -352,7 +316,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
                     // Disable to avoid counting it more than once
                     deltaBi[curIndex] = false;
                     // Test if this rAB is not initialized
-                    if (rABPos(ss, curIndex)==-1)
+                    if (rABPos(ss, curIndex) == -1)
                     {
                         // It starts at rABPos(ss, sj)=0
                         rABPos(ss, curIndex) = NbrABInit[ss];
@@ -372,7 +336,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
             bool found(false);
             forAll(wAID, id)
             {
-                if (ss==wAID[id])
+                if (ss == wAID[id])
                 {
                     wA[id] += sl*omegai;
                     found = true;
@@ -385,7 +349,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
             }
         }
 
-        forAll(R.rhs(), s) // Compute rAB for all species in the right hand side
+        // Compute rAB for all species in the right hand side
+        forAll(R.rhs(), s)
         {
             label ss = R.rhs()[s].index;
             scalar sl = R.rhs()[s].stoichCoeff; // vAi = v''-v' => here v''
@@ -488,8 +453,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
         label nElements = 4; // 4 main elements (C, H, O, N)
 
         // Total number of C, H and O (in this order)
-        scalarList Na(nElements,0.0);
-        scalarList Nal(nElements,0.0); // for large hydrocarbons
+        scalarList Na(nElements, 0.0);
+        scalarList Nal(nElements, 0.0); // for large hydrocarbons
 
         for (label i=0; i<this->nSpecie_; i++)
         {
@@ -502,6 +467,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
             {
                 continue;
             }
+
             Na[0] += sC_[i]*c[i];
             Na[1] += sH_[i]*c[i];
             Na[2] += sO_[i]*c[i];
@@ -523,12 +489,12 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
         //                                           2Cl + Hl/2
         // Equivalence ratio for fuel decomposition = ----------
         //                                            Ol(+O2)
-        phiLarge = (2*Nal[0]+Nal[1]/2)/Nal[2];
+        phiLarge = (2*Nal[0] + Nal[1]/2)/Nal[2];
     }
 
     // Using the rAB matrix (numerator and denominator separated)
     // compute the R value according to the search initiating set
-    scalarField Rvalue(this->nSpecie_,0.0);
+    scalarField Rvalue(this->nSpecie_, 0.0);
     label speciesNumber = 0;
 
     // Set all species to inactive and activate them according
@@ -583,7 +549,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
 
             if (forceFuelInclusion_)
             {
-                forAll(fuelSpeciesID_,i)
+                forAll(fuelSpeciesID_, i)
                 {
                     Q.push(fuelSpeciesID_[i]);
                     speciesNumber++;
@@ -607,7 +573,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
             Rvalue[H2OId_] = 1.0;
             if (forceFuelInclusion_)
             {
-                forAll(fuelSpeciesID_,i)
+                forAll(fuelSpeciesID_, i)
                 {
                     Q.push(fuelSpeciesID_[i]);
                     speciesNumber++;
@@ -641,7 +607,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
     while (!Q.empty())
     {
         label u = Q.pop();
-        scalar Den = max(PA[u],CA[u]);
+        scalar Den = max(PA[u], CA[u]);
         if (Den!=0.0)
         {
             for (label v=0; v<NbrABInit[u]; v++)
@@ -709,7 +675,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
 
     this->NsSimp_ = speciesNumber;
     scalarField& simplifiedC(this->chemistry_.simplifiedC());
-    simplifiedC.setSize(this->NsSimp_+2);
+    simplifiedC.setSize(this->NsSimp_ + 2);
     DynamicList<label>& s2c(this->chemistry_.simplifiedToCompleteIndex());
     s2c.setSize(this->NsSimp_);
     Field<label>& c2s(this->chemistry_.completeToSimplifiedIndex());
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
index fc0f36a9a5a6e711e2c2cd6de4981edb3c4a7645..d42c830febf97890d3cfaa2b3b0edf1a65cd5dba 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
@@ -25,7 +25,7 @@ Class
     Foam::chemistryReductionMethods::DAC
 
 Description
-    The Dynamic Adaptive Chemistry (DAC) method [1] simplify the chemistry
+    The Dynamic Adaptive Chemistry (DAC) method [1] simplifies the chemistry
     using the matrix rAB defined by (DRGEP algorithm [2])
 
             |sum_i=1->Nr vAi wi dBi|
@@ -40,13 +40,14 @@ Description
     stoechiometric coefficient of species A in the ith reaction (vAi = v''-v')
     , wi is the progress variable of reaction i and dBi equals 1 if reaction i
     involves B and O otherwise.
-    rAB show the error introduced to the production rates of A when B and all
+
+    rAB shows the error introduced to the production rates of A when B and all
     the reactions including it are removed. It is computed as in [3] so that
     the algorithm is O(Nr).
 
-    DAC uses a initial set of species that represents the major parts of the
+    DAC uses an initial set of species that represent the major parts of the
     combustion mechanism, i.e. H2/O2, fuel decomposition and CO2 production.
-    Usualy, it includes the fuel, HO2 and CO. Then it computes the dependance
+    Usually, it includes the fuel, HO2 and CO. Then it computes the dependance
     of these set to the other species. This is done by introducing R-value
     defined by
 
@@ -122,6 +123,7 @@ class DAC
         word CO2Name_, COName_, HO2Name_, H2OName_, NOName_;
         Switch forceFuelInclusion_;
 
+
 public:
 
     //- Runtime type information
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 440c41e9f90c301bde8a789557f14018fefcbde2..f0c36d21ea2b41bf1dce15e916d98422af1942ee 100644
--- a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -226,7 +226,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
     TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
     QrNbrName_(dict.lookupOrDefault<word>("QrNbr", "none")),
     QrName_(dict.lookupOrDefault<word>("Qr", "none")),
-    specieName_(dict.lookupOrDefault<word>("specieName", "none")),
+    specieName_(dict.lookupOrDefault<word>("specie", "none")),
     liquid_(nullptr),
     liquidDict_(),
     mass_(patch().size(), 0.0),
@@ -749,7 +749,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
         os.writeKeyword("mode")<< massModeTypeNames_[mode_]
             << token::END_STATEMENT <<nl;
 
-        writeEntryIfDifferent<word>(os, "specieName", "none", specieName_);
+        writeEntryIfDifferent<word>(os, "specie", "none", specieName_);
 
         os.writeKeyword("carrierMolWeight")<< Mcomp_
             << token::END_STATEMENT <<nl;
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
index b393b43b53655e47f3265027256c4afd96d330b5..c8dba9d60a05f8599a70746c1949cf96b977e8eb 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
@@ -23,8 +23,8 @@ coupledFaces
 
     coupledFacesSet
     {
-        wallPatchName               baffleWall;
-        cyclicMasterPatchName       baffleCyclic_half0;
+        wallPatch                   baffleWall;
+        cyclicMasterPatch           baffleCyclic_half0;
     }
 }
 
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
index d6badd923f8777ca26aa447704b12f569cd29c96..7f7395413b968e116eca7ced698e67bc3116af51 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
@@ -44,7 +44,7 @@ boundaryField
     "region0_to_.*"
     {
         type                compressible::turbulentTemperatureRadCoupledMixed;
-        neighbourFieldName  T;
+        neighbourField      T;
         kappaMethod         solidThermo;
         QrNbr               Qr;
         Qr                  none;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
index 3092ba2020d4995a6195f93c9f68204f451ec534..5faa7ba0c3ea8834da2e93a348437be3a1f16d7b 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
@@ -20,7 +20,7 @@ FoamFile
 
         pyrolysisModel  thermo;
 
-        regionName      panelRegion;
+        region          panelRegion;
 
         noPyrolysisCoeffs
         {
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
index 86de22e33ce32fc37dd60eb6cdae3b24a812a098..6efe72eb274eb6fd2c0729b00715edca67ba8f20 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaceFilmModel none;
 
-regionName      none;
+region           none;
 
 active          false;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
index 5fef5019a69588fb342b3e47d2e47145b40193aa..a3010f4c5504e25bc2e317cc1eabd7eff2b74d60 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
@@ -77,7 +77,7 @@ functions
         writeControl        timeStep;
         writeInterval       200;
         log                 true;
-        patchName           region0_to_panelRegion_wallPanel;
+        patch               region0_to_panelRegion_wallPanel;
         probeLocations
         (
             (0.15 0.0 0.01)  // HF2
@@ -94,7 +94,7 @@ functions
         writeControl        timeStep;
         writeInterval       200;
         log                 true;
-        patchName           inlet;
+        patch               inlet;
         probeLocations
         (
             ( 0.0  0.0  0.0 ) // HF1
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
index eb0432c914aea3a9fe5bdd31d10fe0ebbd0e6e25..11f9c8cee2bc4a11e469d3f8bdd62b1854943fe2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
 
     pyrolysisModel  reactingOneDim;
 
-    regionName pyrolysisRegion;
+    region          pyrolysisRegion;
 
     reactingOneDimCoeffs
     {
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
index 533b5c022e432c29efe6b3e66adeadb50e833015..9b3c6deeae2b1cc0032af3a91a90684d3333a8d3 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -19,7 +19,7 @@ active          true;
 
 surfaceFilmModel thermoSingleLayer;
 
-regionName      filmRegion;
+region          filmRegion;
 
 thermoSingleLayerCoeffs
 {
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
index 9741bf6aa2a24d99677473eacaa7d0910382d3f9..5de2a6e8162ff56635bb3abcd4df7a2ef110d209 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
 
     pyrolysisModel  reactingOneDim;
 
-    regionName      panelRegion;
+    region          panelRegion;
 
     reactingOneDimCoeffs
     {
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..3dfc5162953ba3597cae2ebba4a241ce533ffbe7 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaceFilmModel none;
 
-regionName      none;
+region           none;
 
 active          false;
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
index 4074c3e862c3b603674372d333eeafd50589947b..a099495670d023da0a3f793e0de0533b8203f3a4 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
@@ -21,7 +21,7 @@ FoamFile
 
         pyrolysisModel  reactingOneDim;
 
-        regionName      panelRegion;
+        region          panelRegion;
 
         reactingOneDimCoeffs
         {
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
index 5d869e9a24ba1cbae88bc26e34362d77584dd5cc..b4ae8c3b340e0e23c6460ffe2ec15c81641000e6 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -19,5 +19,5 @@ active           false;
 
 surfaceFilmModel none;
 
-regionName       none;
+region           none;
 
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
index d0661cb34022a2e4ab06440101ed024549cbacd7..641f34fa0fd6543f9e450c7260b127e43eb191dd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
 
     pyrolysisModel  none;
 
-    regionName      panelRegion;
+    region          panelRegion;
 
     reactingOneDimCoeffs
     {
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..3dfc5162953ba3597cae2ebba4a241ce533ffbe7 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaceFilmModel none;
 
-regionName      none;
+region           none;
 
 active          false;
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
index d0661cb34022a2e4ab06440101ed024549cbacd7..641f34fa0fd6543f9e450c7260b127e43eb191dd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
 
     pyrolysisModel  none;
 
-    regionName      panelRegion;
+    region          panelRegion;
 
     reactingOneDimCoeffs
     {
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..e833ca17355621962b672ebd55514061599b3367 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaceFilmModel none;
 
-regionName      none;
+region          none;
 
 active          false;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
index 6536b870ee198ae4cd2fe889263f7381accf6831..bac87c7272f72946f8b15c02ad1c2b9a91ee8b70 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
@@ -8,17 +8,17 @@
 
 T
 {
-        type                compressible::thermalBaffle;
-        kappaMethod         fluidThermo;
-        value               uniform 300;
+    type            compressible::thermalBaffle;
+    kappaMethod     fluidThermo;
+    value           uniform 300;
 
-        regionName          ${baffleRegionName};
-        active              yes;
+    region          ${baffleRegion};
+    active          yes;
 
-        # include "3DbaffleSolidThermo"
+    # include "3DbaffleSolidThermo"
 
-        // New fvMesh (region) information
-        # include "extrudeModel"
+    // New fvMesh (region) information
+    # include "extrudeModel"
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
index 346318d87f38e5d1bcc50f5d6a182e631b97b284..b3e07455bb7d5407a0e4554a1a1d2e35aec5f204 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
@@ -6,22 +6,22 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-baffleRegionName    baffle3DRegion;
+baffleRegion    baffle3DRegion;
 
-masterPatchName     baffle3DRegionMaster;
+masterPatch     baffle3DRegionMaster;
 
-slavePatchName      baffle3DRegionSlave;
+slavePatch      baffle3DRegionSlave;
 
-oneD                false;
+oneD            false;
 
-nLayers             50;
+nLayers         50;
 
-thickness           0.02;
+thickness       0.02;
 
-Kappa               0.01;
+Kappa           0.01;
 
-Cp                  15;
+Cp              15;
 
-rho                 80;
+rho             80;
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
index e1f36abd656a66e30f63dee1502802e76b361bea..2cfabccf8b10e2be3001e5e9a295542417ef5b79 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
@@ -55,7 +55,7 @@ boundaryField
         // Mode of operation: inert, condensation, vaporization,
         // condensationAndEvaporation
         mode            condensationAndEvaporation;
-        specieName      H2O;
+        specie          H2O;
         carrierMolWeight  28.9 ;//Air from thermophysicalProperties
         L               0.1;
         Tvap            273;    //Minimum temperature for evaporation
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
index c7695aeec0f0984768d5543e006109ca8795ab0b..76ab4c70bd50377c8cacdc7e6c25226acf74faea 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
@@ -47,6 +47,7 @@ laplacianSchemes
     laplacian(rhorAUf,p_rgh) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(((rho*nut)+thermo:mu),H2O) Gauss linear corrected;
+    laplacian(DH2O,H2O) Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
index 760323fa2a2d6bc1c7dc855f1d5c4bb2b1c618f6..065a7b8ed962eba3753bd9988f9410ee42273d8a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
@@ -23,7 +23,7 @@ airToporous
     constantHeatTransferCoeffs
     {
         interpolationMethod cellVolumeWeight;
-        nbrRegionName   porous;
+        nbrRegion       porous;
         master          false;
 
         nbrModel        porousToair;
@@ -40,7 +40,7 @@ porosityBlockage
     interRegionExplicitPorositySourceCoeffs
     {
         interpolationMethod cellVolumeWeight;
-        nbrRegionName   porous;
+        nbrRegion       porous;
 
         type            DarcyForchheimer;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
index 7d8917bec1e949577037967bca7b92217d51d599..fffed7d171842ffa4ead7151242c0ff1969d1c8b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
@@ -23,7 +23,7 @@ porousToair
     constantHeatTransferCoeffs
     {
         interpolationMethod cellVolumeWeight;
-        nbrRegionName   air;
+        nbrRegion       air;
         master          true;
 
         nbrModel        airToporous;
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
index e93b8f3939f3be6e114862908bcd4517340a464f..c6ac48a1bb32bd36602b7a757b6e5293bf64db06 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
@@ -48,5 +48,19 @@ runTimeModifiable yes;
 adjustTimeStep  yes;
 
 maxCo           5;
+functions
+{
+    mag(U)
+    {
+        type            mag;
+        libs            ( "libfieldFunctionObjects.so" );
+        field           U;
+        executeControl  writeTime;
+        writeControl    writeTime;
+        fields          1 ( U );
+        result          myMagU;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
index 4251bfa4faa6720fa1b0d7110fbb8f71a17d12b4..3cc5de831dd3605bd0b4cd765a8bb01fa37dad98 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
@@ -58,7 +58,7 @@ functions
         fields          (p U);
         lifeTime        10000;
         nSubCycle       5;
-        cloudName       particleTracks;
+        cloud           particleTracks;
         seedSampleSet   uniform;
         uniformCoeffs
         {
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
index 8ba9bf34dae55b76848e2029516cc3ccc4d4ea47..d7bc5d2289d4d645463aba5c64e72417123be7f3 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
@@ -57,7 +57,7 @@ postPro1
             visible         yes;
             tubeRadius      0.01;
             colourBy        field;
-            fieldName       U;
+            field           U;
             range           (0 20);
             opacity         1;
             scalarBar
@@ -97,7 +97,7 @@ postPro1
             visible         yes;
             featureEdges    no;
             colourBy        field;
-            fieldName       U;
+            field           U;
             range           (0 30);
             opacity         1;
             scalarBar
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
index 83ec2e4018a95f2cfe10187654278a0170a84ba9..47fc1a305d50de34219267894b565b0fba1a532a 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
@@ -32,7 +32,7 @@ streamLines
     nSubCycle       5;
 
     // Cloud name to use
-    cloudName       particleTracks;
+    cloud           particleTracks;
 
     // Seeding method.
     seedSampleSet   uniform;  //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6 b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
index 1f9924aa37b073084371f32b3edbe75f0f0cb1aa..82f0a4e81a972b7b9a398d5c3693750d6c0447cb 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
@@ -15,7 +15,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 6;
+numberOfSubdomains 4;
 
 method          hierarchical;
 // method          ptscotch;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index 9578c6e11eeeb966b6bce06d7d3dfe8059d9c968..1e671e71b89ca2004af58765e532a4f1c04bfa1a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -39,7 +39,7 @@ streamLines
 
 
     // Cloud name to use
-    cloudName       particleTracks;
+    cloud           particleTracks;
 
     // Seeding method.
     seedSampleSet   uniform;  //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index 467839631355e5ca224d386c6f1843997344ae97..9e6bfda88cc2304c2447afefa0d45f7761495a76 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -18,7 +18,7 @@ near
     writeControl    writeTime;
 
     // Calculate every
-    executeControl   writeTime;
+    executeControl  writeTime;
 
     // Fields to be sampled. Per field original name and mapped field to
     // create.
@@ -29,10 +29,10 @@ near
     );
 
     // Patches/groups to sample (regular expressions)
-    patches (motorBikeGroup);
+    patches         (motorBikeGroup);
 
     // Distance to sample
-    distance 0.001;
+    distance        0.001;
 }
 
 // Use UNear to track along wall
@@ -48,7 +48,7 @@ wallBoundedStreamLines
     setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
 
     // Velocity field to use for tracking.
-    U     UNear;
+    U               UNear;
 
     // Interpolation method. Default is cellPoint.
     // interpolationScheme pointMVC;
@@ -65,7 +65,7 @@ wallBoundedStreamLines
     lifeTime        100;
 
     // Cloud name to use
-    cloudName       wallBoundedParticleTracks;
+    cloud           wallBoundedParticleTracks;
 
     // Seeding method.
     seedSampleSet   patchSeed;    //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 46492576ed5db7966e3fa9fffc61be35711d7a96..498774b1087f2ccdb1f37a8357de7a5d16a41234 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -64,16 +64,16 @@ functions
         trackForward    true;
 
         // Names of fields to sample. Should contain above velocity field!
-        fields (p k U);
+        fields          (p k U);
 
         // Steps particles can travel before being removed
         lifeTime        10000;
 
         // Number of steps per cell (estimate). Set to 1 to disable subcycling.
-        nSubCycle 5;
+        nSubCycle       5;
 
         // Cloud name to use
-        cloudName       particleTracks;
+        cloud           particleTracks;
 
         // Seeding method.
         seedSampleSet   uniform;  //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-continuousPhaseName air;
+continuousPhase air;
 
 rho.air         1.2;
 
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
index 7a8b38884665d9944b888ad6f778422dc362055c..7d479f3caa7505c4aaf545433f536689198b6f9c 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-continuousPhaseName air;
+continuousPhase air;
 
 rho.air         1.2;
 
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-continuousPhaseName air;
+continuousPhase air;
 
 rho.air         1.2;
 
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index 3a685fa3552ca4d20342ef222bb101ad1fd79100..ef6d5c15f830e3a61cbb4a33d8f5dce7929af12a 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -72,7 +72,7 @@ subModels
             massTotal       40;
             SOI             1;
             parcelBasisType mass;
-            patchName       inlet;
+            patch           inlet;
             duration        4;
             parcelsPerSecond 100644;
             U0              (-10 0 0);
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
index 7a8b38884665d9944b888ad6f778422dc362055c..7d479f3caa7505c4aaf545433f536689198b6f9c 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-continuousPhaseName air;
+continuousPhase air;
 
 rho.air         1.2;
 
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index 67943e71f16dc1ae32b4c4ef755c8ba8d6492b78..aa34863b9b7a8791a035ceadc85e6b099a35a894 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -80,7 +80,7 @@ subModels
         {
             type            patchInjection;
             parcelBasisType fixed;
-            patchName       lowerInlet;
+            patch           lowerInlet;
             U0              (18.7939 6.8404 0);
             nParticle       1;
             parcelsPerSecond 1390885;
@@ -105,7 +105,7 @@ subModels
         {
             type            patchInjection;
             parcelBasisType fixed;
-            patchName       upperInlet;
+            patch           upperInlet;
             U0              (18.7939 -6.8404 0);
             nParticle       1;
             parcelsPerSecond 1390885;
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-continuousPhaseName air;
+continuousPhase air;
 
 rho.air         1.2;
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
index af4915a63be30ad2490aefbbf7bfdc4cdd2eb306..13a5320893a59f48b67ef07b3a8f563814e10c50 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaceFilmModel thermoSingleLayer;
 
-regionName      wallFilmRegion;
+region          wallFilmRegion;
 
 active          true;
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
index efb2938c8199c8e69e94a9bcc52003de7b6c075d..7cf97c650497e854bb2d99cc3a2b63d64e1b012e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaceFilmModel thermoSingleLayer;
 
-regionName      wallFilmRegion;
+region          wallFilmRegion;
 
 active          true;
 
@@ -108,7 +108,7 @@ thermoSingleLayerCoeffs
 
     drippingInjectionCoeffs
     {
-        cloudName    reactingCloud1;
+        cloud        reactingCloud1;
         deltaStable  0;
 
         particlesPerParcel 100.0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
index ef488bebdd83c2d9880de3c8f619b07863e03e3b..f51e31b47edfc84b722dc51a0792f4461a143a49 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaceFilmModel kinematicSingleLayer;
 
-regionName      wallFilmRegion;
+region          wallFilmRegion;
 
 active          true;
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
index 0a3d88057d64fd5b278aa4db514bd1e6a23f59a5..b26b2d3c9aef69340154a48b11df8e40940eca7c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      SurfaceFilmProperties;
+    object      surfaceFilmProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaceFilmModel thermoSingleLayer;
 
-regionName      wallFilmRegion;
+region          wallFilmRegion;
 
 active          true;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-cloudName       reactingCloud1;
+cloud           reactingCloud1;
 
 sampleFrequency 1;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-cloudName       reactingCloud1;
+cloud           reactingCloud1;
 
 sampleFrequency 1;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 2fa5343300f5be12c15e5330e50c50096eb5f268..d20347dc74d5b99ea5d47ff6ae1245f93970680c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -80,7 +80,7 @@ subModels
             SOI             0.01;
             massTotal       8;
             parcelBasisType mass;
-            patchName       inletCentral;
+            patch           inletCentral;
             duration        10000;
             parcelsPerSecond 1e5;
             U0              (40 0 0);
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
index d05adc58c130573b4d278360456f659cbed19b7d..07257081e177989166ae566beee85bc2b8f05c7d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-cloudName       reactingCloud1Tracks;
+cloud           reactingCloud1Tracks;
 
 fields
 (
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
index 1ff58d619cd61d9d914ada36d10519f9e267d805..e6e16bed97283ecbd750cb1b0ec27d34a4e87322 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
@@ -84,7 +84,7 @@ subModels
             type            patchInjection;
             massFlowRate    0.8e-03;
             parcelBasisType mass;
-            patchName       inletCentral;
+            patch           inletCentral;
             parcelsPerSecond 100;
             duration        1; // NOTE: set to 1 for steady state
             U0              (0 40 0);
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
index d05adc58c130573b4d278360456f659cbed19b7d..07257081e177989166ae566beee85bc2b8f05c7d 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-cloudName       reactingCloud1Tracks;
+cloud           reactingCloud1Tracks;
 
 fields
 (
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 1ff58d619cd61d9d914ada36d10519f9e267d805..e6e16bed97283ecbd750cb1b0ec27d34a4e87322 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -84,7 +84,7 @@ subModels
             type            patchInjection;
             massFlowRate    0.8e-03;
             parcelBasisType mass;
-            patchName       inletCentral;
+            patch           inletCentral;
             parcelsPerSecond 100;
             duration        1; // NOTE: set to 1 for steady state
             U0              (0 40 0);
diff --git a/tutorials/mesh/parallel/filter/constant/particleTrackProperties b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/mesh/parallel/filter/constant/particleTrackProperties
+++ b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-cloudName       reactingCloud1;
+cloud           reactingCloud1;
 
 sampleFrequency 1;
 
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
index 8372cf2fbdbf665c575f9d6e4a8cb8af8a1ccb7d..2a4fcbf4fb0e2d44f8db0a15a8474649280bd20e 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
@@ -66,7 +66,7 @@ subModels
         interface
         {
             C            -10;
-            alphaName    alpha.water;
+            alpha        alpha.water;
         }
     }
 
@@ -79,7 +79,7 @@ subModels
             SOI             0;
             parcelBasisType fixed;//mass;
             nParticle       1;
-            patchName       inlet;
+            patch           inlet;
             duration        1;
             parcelsPerSecond 1e5;
             U0              (0 0 0.1);