diff --git a/applications/solvers/basic/potentialFoam/createControls.H b/applications/solvers/basic/potentialFoam/createControls.H
new file mode 100644
index 0000000000..7015cae02e
--- /dev/null
+++ b/applications/solvers/basic/potentialFoam/createControls.H
@@ -0,0 +1,9 @@
+const dictionary& potentialFlow
+(
+    mesh.solutionDict().subDict("potentialFlow")
+);
+
+const int nNonOrthCorr
+(
+    potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0)
+);
diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index 2682bf6833..eda7cbc0c2 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -119,3 +119,5 @@ setRefCell
     PhiRefValue
 );
 mesh.setFluxRequired(Phi.name());
+
+#include "createMRF.H"
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index f0c04eadb4..dfc80be425 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -132,7 +132,6 @@ int main(int argc, char *argv[])
     pisoControl potentialFlow(mesh, "potentialFlow");
 
     #include "createFields.H"
-    #include "createMRF.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
index 82dc875847..dd129047dc 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
@@ -1,32 +1,32 @@
     scalar CoNum = -GREAT;
 
-    forAll(fluidRegions, regionI)
+    forAll(fluidRegions, regioni)
     {
         CoNum = max
         (
             compressibleCourantNo
             (
-                fluidRegions[regionI],
+                fluidRegions[regioni],
                 runTime,
-                rhoFluid[regionI],
-                phiFluid[regionI]
+                rhoFluid[regioni],
+                phiFluid[regioni]
             ),
             CoNum
         );
     }
 /*
-    forAll(porousFluidRegions, porousI)
+    forAll(porousFluidRegions, porousi)
     {
         CoNum = max
         (
             compressibleCourantNo
             (
-                porousFluidRegions[porousI],
+                porousFluidRegions[porousi],
                 runTime,
-                rhoPorous[porousI],
-                phiPorous[porousI]
+                rhoPorous[porousi],
+                phiPorous[porousi]
             ),
             CoNum
         );
     }
-*/
\ No newline at end of file
+*/
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
index e8ae64ce1d..0c443f2c14 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
@@ -204,13 +204,13 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::he
 (
     const scalarField& p,
     const scalarField& T,
-    const label patchI
+    const label patchi
 ) const
 {
-    const scalarField& alpha1p = alpha1().boundaryField()[patchI];
-    const scalarField& alpha2p = alpha2().boundaryField()[patchI];
+    const scalarField& alpha1p = alpha1().boundaryField()[patchi];
+    const scalarField& alpha2p = alpha2().boundaryField()[patchi];
 
-    const scalarField& Tp = T_.boundaryField()[patchI];
+    const scalarField& Tp = T_.boundaryField()[patchi];
 
     return
     (
@@ -429,11 +429,11 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::Cpv
 (
     const scalarField& p,
     const scalarField& T,
-    const label patchI
+    const label patchi
 ) const
 {
     // This is a e thermo (Cpv = Cv)
-    return Cv(p, T, patchI);
+    return Cv(p, T, patchi);
 }
 
 
diff --git a/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C b/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
index 4e4f7e0263..6b5e74c71f 100644
--- a/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
+++ b/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
@@ -127,9 +127,9 @@ scalar getEdgeStats(const primitiveMesh& mesh, const direction excludeCmpt)
 
     const edgeList& edges = mesh.edges();
 
-    forAll(edges, edgeI)
+    forAll(edges, edgei)
     {
-        const edge& e = edges[edgeI];
+        const edge& e = edges[edgei];
 
         vector eVec(e.vec(mesh.points()));
 
@@ -196,24 +196,24 @@ scalar getEdgeStats(const primitiveMesh& mesh, const direction excludeCmpt)
 // Adds empty patch if not yet there. Returns patchID.
 label addPatch(polyMesh& mesh, const word& patchName)
 {
-    label patchI = mesh.boundaryMesh().findPatchID(patchName);
+    label patchi = mesh.boundaryMesh().findPatchID(patchName);
 
-    if (patchI == -1)
+    if (patchi == -1)
     {
         const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
         List<polyPatch*> newPatches(patches.size() + 1);
 
         // Add empty patch as 0th entry (Note: only since subsetMesh wants this)
-        patchI = 0;
+        patchi = 0;
 
-        newPatches[patchI] =
+        newPatches[patchi] =
             new emptyPolyPatch
             (
                 Foam::word(patchName),
                 0,
                 mesh.nInternalFaces(),
-                patchI,
+                patchi,
                 patches,
                 emptyPolyPatch::typeName
             );
@@ -235,15 +235,15 @@ label addPatch(polyMesh& mesh, const word& patchName)
         mesh.removeBoundary();
         mesh.addPatches(newPatches);
 
-        Info<< "Created patch oldInternalFaces at " << patchI << endl;
+        Info<< "Created patch oldInternalFaces at " << patchi << endl;
     }
     else
     {
-        Info<< "Reusing patch oldInternalFaces at " << patchI << endl;
+        Info<< "Reusing patch oldInternalFaces at " << patchi << endl;
     }
 
 
-    return patchI;
+    return patchi;
 }
 
 
@@ -302,20 +302,20 @@ void addCutNeighbours
 
     forAllConstIter(labelHashSet, cutCells, iter)
     {
-        const label cellI = iter.key();
-        const labelList& cFaces = mesh.cells()[cellI];
+        const label celli = iter.key();
+        const labelList& cFaces = mesh.cells()[celli];
 
         forAll(cFaces, i)
         {
-            const label faceI = cFaces[i];
+            const label facei = cFaces[i];
 
-            if (mesh.isInternalFace(faceI))
+            if (mesh.isInternalFace(facei))
             {
-                label nbr = mesh.faceOwner()[faceI];
+                label nbr = mesh.faceOwner()[facei];
 
-                if (nbr == cellI)
+                if (nbr == celli)
                 {
-                    nbr = mesh.faceNeighbour()[faceI];
+                    nbr = mesh.faceNeighbour()[facei];
                 }
 
                 if (selectInside && inside.found(nbr))
@@ -354,11 +354,11 @@ bool limitRefinementLevel
 )
 {
     // Do simple check on validity of refinement level.
-    forAll(refLevel, cellI)
+    forAll(refLevel, celli)
     {
-        if (!excludeCells.found(cellI))
+        if (!excludeCells.found(celli))
         {
-            const labelList& cCells = mesh.cellCells()[cellI];
+            const labelList& cCells = mesh.cellCells()[celli];
 
             forAll(cCells, i)
             {
@@ -366,13 +366,13 @@ bool limitRefinementLevel
 
                 if (!excludeCells.found(nbr))
                 {
-                    if (refLevel[cellI] - refLevel[nbr] >= limitDiff)
+                    if (refLevel[celli] - refLevel[nbr] >= limitDiff)
                     {
                         FatalErrorInFunction
                             << "Level difference between neighbouring cells "
-                            << cellI << " and " << nbr
+                            << celli << " and " << nbr
                             << " greater than or equal to " << limitDiff << endl
-                            << "refLevels:" << refLevel[cellI] << ' '
+                            << "refLevels:" << refLevel[celli] << ' '
                             <<  refLevel[nbr] << abort(FatalError);
                     }
                 }
@@ -386,8 +386,8 @@ bool limitRefinementLevel
     forAllConstIter(labelHashSet, cutCells, iter)
     {
         // cellI will be refined.
-        const label cellI = iter.key();
-        const labelList& cCells = mesh.cellCells()[cellI];
+        const label celli = iter.key();
+        const labelList& cCells = mesh.cellCells()[celli];
 
         forAll(cCells, i)
         {
@@ -395,7 +395,7 @@ bool limitRefinementLevel
 
             if (!excludeCells.found(nbr) && !cutCells.found(nbr))
             {
-                if (refLevel[cellI] + 1 - refLevel[nbr] >= limitDiff)
+                if (refLevel[celli] + 1 - refLevel[nbr] >= limitDiff)
                 {
                     addCutCells.insert(nbr);
                 }
@@ -454,22 +454,22 @@ void doRefinement
 
     refLevel.setSize(mesh.nCells());
 
-    for (label cellI = oldCells; cellI < mesh.nCells(); cellI++)
+    for (label celli = oldCells; celli < mesh.nCells(); celli++)
     {
-        refLevel[cellI] = 0;
+        refLevel[celli] = 0;
     }
 
     const labelListList& addedCells = multiRef.addedCells();
 
-    forAll(addedCells, oldCellI)
+    forAll(addedCells, oldCelli)
     {
-        const labelList& added = addedCells[oldCellI];
+        const labelList& added = addedCells[oldCelli];
 
         if (added.size())
         {
             // Give all cells resulting from split the refinement level
             // of the master.
-            label masterLevel = ++refLevel[oldCellI];
+            label masterLevel = ++refLevel[oldCelli];
 
             forAll(added, i)
             {
@@ -485,7 +485,7 @@ void subsetMesh
 (
     polyMesh& mesh,
     const label writeMesh,
-    const label patchI,                 // patchID for exposed faces
+    const label patchi,                 // patchID for exposed faces
     const labelHashSet& cellsToRemove,
     cellSet& cutCells,
     labelIOList& refLevel
@@ -506,7 +506,7 @@ void subsetMesh
     (
         cellLabels,
         exposedFaces,
-        labelList(exposedFaces.size(), patchI),
+        labelList(exposedFaces.size(), patchi),
         meshMod
     );
 
@@ -632,7 +632,7 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
 
     // If nessecary add oldInternalFaces patch
-    label newPatchI = addPatch(mesh, "oldInternalFaces");
+    label newPatchi = addPatch(mesh, "oldInternalFaces");
 
 
     //
@@ -725,9 +725,9 @@ int main(int argc, char *argv[])
     meshSearch queryMesh(mesh, polyMesh::FACE_PLANES);
 
     // Check all 'outside' points
-    forAll(outsidePts, outsideI)
+    forAll(outsidePts, outsidei)
     {
-        const point& outsidePoint = outsidePts[outsideI];
+        const point& outsidePoint = outsidePts[outsidei];
 
         if (queryMesh.findCell(outsidePoint, -1, false) == -1)
         {
@@ -857,7 +857,7 @@ int main(int argc, char *argv[])
         {
             // Subset mesh to remove inside cells altogether. Updates cutCells,
             // refLevel.
-            subsetMesh(mesh, writeMesh, newPatchI, inside, cutCells, refLevel);
+            subsetMesh(mesh, writeMesh, newPatchi, inside, cutCells, refLevel);
         }
 
 
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 235f81db47..1f4414fcbd 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -91,39 +91,39 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
     autoPtr<refinementSurfaces> surfacePtr;
 
     // Count number of surfaces.
-    label surfI = 0;
-    forAll(allGeometry.names(), geomI)
+    label surfi = 0;
+    forAll(allGeometry.names(), geomi)
     {
-        const word& geomName = allGeometry.names()[geomI];
+        const word& geomName = allGeometry.names()[geomi];
 
         if (surfacesDict.found(geomName))
         {
-            surfI++;
+            surfi++;
         }
     }
 
-    labelList surfaces(surfI);
-    wordList names(surfI);
-    PtrList<surfaceZonesInfo> surfZones(surfI);
+    labelList surfaces(surfi);
+    wordList names(surfi);
+    PtrList<surfaceZonesInfo> surfZones(surfi);
 
-    labelList regionOffset(surfI);
+    labelList regionOffset(surfi);
 
-    labelList globalMinLevel(surfI, 0);
-    labelList globalMaxLevel(surfI, 0);
-    labelList globalLevelIncr(surfI, 0);
-    PtrList<dictionary> globalPatchInfo(surfI);
-    List<Map<label>> regionMinLevel(surfI);
-    List<Map<label>> regionMaxLevel(surfI);
-    List<Map<label>> regionLevelIncr(surfI);
-    List<Map<scalar>> regionAngle(surfI);
-    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
+    labelList globalMinLevel(surfi, 0);
+    labelList globalMaxLevel(surfi, 0);
+    labelList globalLevelIncr(surfi, 0);
+    PtrList<dictionary> globalPatchInfo(surfi);
+    List<Map<label>> regionMinLevel(surfi);
+    List<Map<label>> regionMaxLevel(surfi);
+    List<Map<label>> regionLevelIncr(surfi);
+    List<Map<scalar>> regionAngle(surfi);
+    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfi);
 
     HashSet<word> unmatchedKeys(surfacesDict.toc());
 
-    surfI = 0;
-    forAll(allGeometry.names(), geomI)
+    surfi = 0;
+    forAll(allGeometry.names(), geomi)
     {
-        const word& geomName = allGeometry.names()[geomI];
+        const word& geomName = allGeometry.names()[geomi];
 
         const entry* ePtr = surfacesDict.lookupEntryPtr(geomName, false, true);
 
@@ -132,10 +132,10 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
             const dictionary& shapeDict = ePtr->dict();
             unmatchedKeys.erase(ePtr->keyword());
 
-            names[surfI] = geomName;
-            surfaces[surfI] = geomI;
+            names[surfi] = geomName;
+            surfaces[surfi] = geomi;
 
-            const searchableSurface& surface = allGeometry[geomI];
+            const searchableSurface& surface = allGeometry[geomi];
 
             // Find the index in shapeControlDict
             // Invert surfaceCellSize to get the refinementLevel
@@ -154,12 +154,12 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
                 surfaceCellSize
             );
 
-            globalMinLevel[surfI] = refLevel;
-            globalMaxLevel[surfI] = refLevel;
-            globalLevelIncr[surfI] = gapLevelIncrement;
+            globalMinLevel[surfi] = refLevel;
+            globalMaxLevel[surfi] = refLevel;
+            globalLevelIncr[surfi] = gapLevelIncrement;
 
             // Surface zones
-            surfZones.set(surfI, new surfaceZonesInfo(surface, shapeDict));
+            surfZones.set(surfi, new surfaceZonesInfo(surface, shapeDict));
 
 
             // Global perpendicular angle
@@ -167,7 +167,7 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
             {
                 globalPatchInfo.set
                 (
-                    surfI,
+                    surfi,
                     shapeDict.subDict("patchInfo").clone()
                 );
             }
@@ -179,23 +179,23 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
             {
                 const dictionary& regionsDict = shapeDict.subDict("regions");
                 const wordList& regionNames =
-                    allGeometry[surfaces[surfI]].regions();
+                    allGeometry[surfaces[surfi]].regions();
 
-                forAll(regionNames, regionI)
+                forAll(regionNames, regioni)
                 {
-                    if (regionsDict.found(regionNames[regionI]))
+                    if (regionsDict.found(regionNames[regioni]))
                     {
                         // Get the dictionary for region
                         const dictionary& regionDict = regionsDict.subDict
                         (
-                            regionNames[regionI]
+                            regionNames[regioni]
                         );
 
                         if (regionDict.found("patchInfo"))
                         {
-                            regionPatchInfo[surfI].insert
+                            regionPatchInfo[surfi].insert
                             (
-                                regionI,
+                                regioni,
                                 regionDict.subDict("patchInfo").clone()
                             );
                         }
@@ -209,16 +209,16 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
                 const dictionary& shapeControlRegionsDict =
                     shapeDict.subDict("regions");
                 const wordList& regionNames =
-                    allGeometry[surfaces[surfI]].regions();
+                    allGeometry[surfaces[surfi]].regions();
 
-                forAll(regionNames, regionI)
+                forAll(regionNames, regioni)
                 {
-                    if (shapeControlRegionsDict.found(regionNames[regionI]))
+                    if (shapeControlRegionsDict.found(regionNames[regioni]))
                     {
                         const dictionary& shapeControlRegionDict =
                             shapeControlRegionsDict.subDict
                             (
-                                regionNames[regionI]
+                                regionNames[regioni]
                             );
 
                         const word scsFuncName =
@@ -244,24 +244,24 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
                             surfaceCellSize
                         );
 
-                        regionMinLevel[surfI].insert(regionI, refLevel);
-                        regionMaxLevel[surfI].insert(regionI, refLevel);
-                        regionLevelIncr[surfI].insert(regionI, 0);
+                        regionMinLevel[surfi].insert(regioni, refLevel);
+                        regionMaxLevel[surfi].insert(regioni, refLevel);
+                        regionLevelIncr[surfi].insert(regioni, 0);
                     }
                 }
             }
 
-            surfI++;
+            surfi++;
         }
     }
 
     // Calculate local to global region offset
     label nRegions = 0;
 
-    forAll(surfaces, surfI)
+    forAll(surfaces, surfi)
     {
-        regionOffset[surfI] = nRegions;
-        nRegions += allGeometry[surfaces[surfI]].regions().size();
+        regionOffset[surfi] = nRegions;
+        nRegions += allGeometry[surfaces[surfi]].regions().size();
     }
 
     // Rework surface specific information into information per global region
@@ -270,47 +270,47 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
     labelList gapLevel(nRegions, -1);
     PtrList<dictionary> patchInfo(nRegions);
 
-    forAll(globalMinLevel, surfI)
+    forAll(globalMinLevel, surfi)
     {
-        label nRegions = allGeometry[surfaces[surfI]].regions().size();
+        label nRegions = allGeometry[surfaces[surfi]].regions().size();
 
         // Initialise to global (i.e. per surface)
         for (label i = 0; i < nRegions; i++)
         {
-            label globalRegionI = regionOffset[surfI] + i;
-            minLevel[globalRegionI] = globalMinLevel[surfI];
-            maxLevel[globalRegionI] = globalMaxLevel[surfI];
-            gapLevel[globalRegionI] =
-                maxLevel[globalRegionI]
-              + globalLevelIncr[surfI];
+            label globalRegioni = regionOffset[surfi] + i;
+            minLevel[globalRegioni] = globalMinLevel[surfi];
+            maxLevel[globalRegioni] = globalMaxLevel[surfi];
+            gapLevel[globalRegioni] =
+                maxLevel[globalRegioni]
+              + globalLevelIncr[surfi];
 
-            if (globalPatchInfo.set(surfI))
+            if (globalPatchInfo.set(surfi))
             {
                 patchInfo.set
                 (
-                    globalRegionI,
-                    globalPatchInfo[surfI].clone()
+                    globalRegioni,
+                    globalPatchInfo[surfi].clone()
                 );
             }
         }
 
         // Overwrite with region specific information
-        forAllConstIter(Map<label>, regionMinLevel[surfI], iter)
+        forAllConstIter(Map<label>, regionMinLevel[surfi], iter)
         {
-            label globalRegionI = regionOffset[surfI] + iter.key();
+            label globalRegioni = regionOffset[surfi] + iter.key();
 
-            minLevel[globalRegionI] = iter();
-            maxLevel[globalRegionI] = regionMaxLevel[surfI][iter.key()];
-            gapLevel[globalRegionI] =
-                maxLevel[globalRegionI]
-              + regionLevelIncr[surfI][iter.key()];
+            minLevel[globalRegioni] = iter();
+            maxLevel[globalRegioni] = regionMaxLevel[surfi][iter.key()];
+            gapLevel[globalRegioni] =
+                maxLevel[globalRegioni]
+              + regionLevelIncr[surfi][iter.key()];
         }
 
-        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
+        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfi];
         forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
         {
-            label globalRegionI = regionOffset[surfI] + iter.key();
-            patchInfo.set(globalRegionI, iter()().clone());
+            label globalRegioni = regionOffset[surfi] + iter.key();
+            patchInfo.set(globalRegioni, iter()().clone());
         }
     }
 
@@ -336,13 +336,13 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
 
     // Determine maximum region name length
     label maxLen = 0;
-    forAll(rf.surfaces(), surfI)
+    forAll(rf.surfaces(), surfi)
     {
-        label geomI = rf.surfaces()[surfI];
-        const wordList& regionNames = allGeometry.regionNames()[geomI];
-        forAll(regionNames, regionI)
+        label geomi = rf.surfaces()[surfi];
+        const wordList& regionNames = allGeometry.regionNames()[geomi];
+        forAll(regionNames, regioni)
         {
-            maxLen = Foam::max(maxLen, label(regionNames[regionI].size()));
+            maxLen = Foam::max(maxLen, label(regionNames[regioni].size()));
         }
     }
 
@@ -356,22 +356,22 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
         << setw(10) << "---------"
         << setw(10) << "---------" << endl;
 
-    forAll(rf.surfaces(), surfI)
+    forAll(rf.surfaces(), surfi)
     {
-        label geomI = rf.surfaces()[surfI];
+        label geomi = rf.surfaces()[surfi];
 
-        Info<< rf.names()[surfI] << ':' << nl;
+        Info<< rf.names()[surfi] << ':' << nl;
 
-        const wordList& regionNames = allGeometry.regionNames()[geomI];
+        const wordList& regionNames = allGeometry.regionNames()[geomi];
 
-        forAll(regionNames, regionI)
+        forAll(regionNames, regioni)
         {
-            label globalI = rf.globalRegion(surfI, regionI);
+            label globali = rf.globalRegion(surfi, regioni);
 
-            Info<< setw(maxLen) << regionNames[regionI]
-                << setw(10) << rf.minLevel()[globalI]
-                << setw(10) << rf.maxLevel()[globalI]
-                << setw(10) << rf.gapLevel()[globalI] << endl;
+            Info<< setw(maxLen) << regionNames[regioni]
+                << setw(10) << rf.minLevel()[globali]
+                << setw(10) << rf.maxLevel()[globali]
+                << setw(10) << rf.gapLevel()[globali] << endl;
         }
     }
 
@@ -796,7 +796,7 @@ int main(int argc, char *argv[])
 //        {
 //            hexRef8 meshCutter(meshPtr(), false);
 //
-//            for (label refineI = 0; refineI < initialRefLevels; ++refineI)
+//            for (label refinei = 0; refinei < initialRefLevels; ++refinei)
 //            {
 //                // Mesh changing engine.
 //                polyTopoChange meshMod(meshPtr(), true);
@@ -818,7 +818,7 @@ int main(int argc, char *argv[])
 //                // Delete mesh volumes.
 //                meshPtr().clearOut();
 //
-//                Info<< "Refinement Iteration " << refineI + 1
+//                Info<< "Refinement Iteration " << refinei + 1
 //                    << ", Mesh size = " << meshPtr().nCells() << endl;
 //            }
 //        }
@@ -1117,24 +1117,24 @@ int main(int argc, char *argv[])
 
         const PtrList<dictionary>& patchInfo = surfaces.patchInfo();
         const labelList& surfaceGeometry = surfaces.surfaces();
-        forAll(surfaceGeometry, surfI)
+        forAll(surfaceGeometry, surfi)
         {
-            label geomI = surfaceGeometry[surfI];
-            const wordList& regNames = allGeometry.regionNames()[geomI];
+            label geomi = surfaceGeometry[surfi];
+            const wordList& regNames = allGeometry.regionNames()[geomi];
 
-            patchTypes[geomI].setSize(regNames.size());
-            forAll(regNames, regionI)
+            patchTypes[geomi].setSize(regNames.size());
+            forAll(regNames, regioni)
             {
-                label globalRegionI = surfaces.globalRegion(surfI, regionI);
+                label globalRegioni = surfaces.globalRegion(surfi, regioni);
 
-                if (patchInfo.set(globalRegionI))
+                if (patchInfo.set(globalRegioni))
                 {
-                    patchTypes[geomI][regionI] =
-                        word(patchInfo[globalRegionI].lookup("type"));
+                    patchTypes[geomi][regioni] =
+                        word(patchInfo[globalRegioni].lookup("type"));
                 }
                 else
                 {
-                    patchTypes[geomI][regionI] = wallPolyPatch::typeName;
+                    patchTypes[geomi][regioni] = wallPolyPatch::typeName;
                 }
             }
         }
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
index 6c27cc1e10..c50c6ebb11 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,7 +46,7 @@ namespace searchableSurfaceModifiers
 {
 
 /*---------------------------------------------------------------------------*\
-                     Class autoPatch Declaration
+                          Class autoPatch Declaration
 \*---------------------------------------------------------------------------*/
 
 class autoPatch
@@ -76,7 +76,7 @@ public:
         autoPtr<searchableSurfaceModifier> clone() const
         {
             NotImplemented;
-            return autoPtr<searchableSurfaceModifier>(NULL);
+            return autoPtr<searchableSurfaceModifier>(nullptr);
         }
 
 
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
index f794d5e87b..8bc1643681 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,7 @@ namespace searchableSurfaceModifiers
 {
 
 /*---------------------------------------------------------------------------*\
-                     Class cut Declaration
+                             Class cut Declaration
 \*---------------------------------------------------------------------------*/
 
 class cut
@@ -100,7 +100,7 @@ public:
         autoPtr<searchableSurfaceModifier> clone() const
         {
             NotImplemented;
-            return autoPtr<searchableSurfaceModifier>(NULL);
+            return autoPtr<searchableSurfaceModifier>(nullptr);
         }
 
 
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
index effe81d2a8..b8329f366c 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,7 +52,7 @@ class searchableSurface;
 class searchableSurfaces;
 
 /*---------------------------------------------------------------------------*\
-                     Class searchableSurfaceModifier Declaration
+                  Class searchableSurfaceModifier Declaration
 \*---------------------------------------------------------------------------*/
 
 class searchableSurfaceModifier
@@ -96,7 +96,7 @@ public:
         autoPtr<searchableSurfaceModifier> clone() const
         {
             NotImplemented;
-            return autoPtr<searchableSurfaceModifier>(NULL);
+            return autoPtr<searchableSurfaceModifier>(nullptr);
         }
 
 
diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 93850c7b88..0c08a7eb7a 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -125,7 +125,7 @@ cleanCase()
     rm -rf constant/tetDualMesh > /dev/null 2>&1
 
     rm -rf VTK > /dev/null 2>&1
-    rm -f 0/cellDist constant/cellDecomposition
+    rm -f 0/cellLevel 0/pointLevel 0/cellDist constant/cellDecomposition
 
     if [ -e system/blockMeshDict.m4 ]
     then
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 12fea6a8a7..5d7b66cbd9 100755
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -176,28 +176,28 @@ cloneCase()
     fi
 }
 
-# Overwrite 0/ with the contents of 0.org/ if it exists.
+# Overwrite 0/ with the contents of 0.orig/ if it exists.
 # The -processor option to do the processor directories instead
 #
 restore0Dir()
 {
     if [ "$1" = "-processor" ]
     then
-        echo "Restore 0/ from 0.org/ for processor directories"
-        [ -d 0.org ] || echo "    Warning: no 0.org/ found"
+        echo "Restore 0/ from 0.orig/ for processor directories"
+        [ -d 0.orig ] || echo "    Warning: no 0.orig/ found"
 
         # do nonetheless
         \ls -d processor* | xargs -I {} \rm -rf ./{}/0
-        \ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0 > /dev/null 2>&1
+        \ls -d processor* | xargs -I {} \cp -r 0.orig ./{}/0 > /dev/null 2>&1
 
     else
-        echo "Restore 0/ from 0.org/"
-        if [ -d 0.org ]
+        echo "Restore 0/ from 0.orig/"
+        if [ -d 0.orig ]
         then
             \rm -rf 0
-            \cp -r 0.org 0 > /dev/null 2>&1
+            \cp -r 0.orig 0 > /dev/null 2>&1
         else
-            echo "    Warning: no 0.org/ found"
+            echo "    Warning: no 0.orig/ found"
         fi
     fi
 }
diff --git a/src/OpenFOAM/primitives/strings/lists/CStringListTemplates.C b/src/OpenFOAM/primitives/strings/lists/CStringListTemplates.C
index db0bb2e2ff..8a5d383dbf 100644
--- a/src/OpenFOAM/primitives/strings/lists/CStringListTemplates.C
+++ b/src/OpenFOAM/primitives/strings/lists/CStringListTemplates.C
@@ -58,7 +58,7 @@ void Foam::CStringList::reset
     }
 
     argv_ = new char*[argc_+1];
-    argv_[argc_] = NULL; // extra terminator
+    argv_[argc_] = nullptr; // extra terminator
 
     if (argc_ > 0)
     {
diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
index ae0bb72a92..8d90432566 100644
--- a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
+++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
@@ -407,7 +407,7 @@ public:
                     << "Unable to retrieve turbulence model from the mesh "
                     << "database" << exit(FatalError);
 
-                return tmp<surfaceScalarField>(NULL);
+                return tmp<surfaceScalarField>(nullptr);
             }
         }
 
@@ -488,7 +488,7 @@ public:
             {
                 return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
                 (
-                    NULL
+                    nullptr
                 );
             }
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index d2a5ac3665..e2bf45527f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -726,7 +726,7 @@ turbulentDFSEMInletFvPatchVectorField
 
     perturb_(1e-5),
     mapMethod_("planarInterpolation"),
-    mapperPtr_(NULL),
+    mapperPtr_(nullptr),
     interpolateR_(false),
     R_(),
     interpolateL_(false),
@@ -772,7 +772,7 @@ turbulentDFSEMInletFvPatchVectorField
 
     perturb_(ptf.perturb_),
     mapMethod_(ptf.mapMethod_),
-    mapperPtr_(NULL),
+    mapperPtr_(nullptr),
     interpolateR_(ptf.interpolateR_),
     R_(ptf.R_, mapper),
     interpolateL_(ptf.interpolateL_),
@@ -817,7 +817,7 @@ turbulentDFSEMInletFvPatchVectorField
 
     perturb_(dict.lookupOrDefault<scalar>("perturb", 1e-5)),
     mapMethod_(dict.lookup("mapMethod")),
-    mapperPtr_(NULL),
+    mapperPtr_(nullptr),
     interpolateR_(false),
     R_(interpolateOrRead<symmTensor>("R", dict, interpolateR_)),
     interpolateL_(false),
@@ -865,7 +865,7 @@ turbulentDFSEMInletFvPatchVectorField
 
     perturb_(ptf.perturb_),
     mapMethod_(ptf.mapMethod_),
-    mapperPtr_(NULL),
+    mapperPtr_(nullptr),
     interpolateR_(ptf.interpolateR_),
     R_(ptf.R_),
     interpolateL_(ptf.interpolateL_),
@@ -909,7 +909,7 @@ turbulentDFSEMInletFvPatchVectorField
 
     perturb_(ptf.perturb_),
     mapMethod_(ptf.mapMethod_),
-    mapperPtr_(NULL),
+    mapperPtr_(nullptr),
     interpolateR_(ptf.interpolateR_),
     R_(ptf.R_),
     interpolateL_(ptf.interpolateL_),
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
index 14b8c11d33..2e9ac28b65 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
@@ -99,7 +99,7 @@ Foam::functionObjects::runTimePostPro::geometryBase::geometryBase
     name_(dict.dictName()),
     visible_(readBool(dict.lookup("visible"))),
     renderMode_(rmGouraud),
-    opacity_(NULL),
+    opacity_(nullptr),
     colours_(colours)
 {
     if (dict.found("renderMode"))
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.C b/src/functionObjects/graphics/runTimePostProcessing/pathline.C
index 494d92d9bc..7cba153645 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pathline.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.C
@@ -141,7 +141,7 @@ Foam::functionObjects::runTimePostPro::pathline::pathline
         representationTypeNames.read(dict.lookup("representation"))
     ),
     tubeRadius_(0.0),
-    lineColour_(NULL)
+    lineColour_(nullptr)
 {
     if (dict.found("lineColour"))
     {
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.C b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
index 04a103d740..cfda633b91 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
@@ -109,7 +109,7 @@ Foam::functionObjects::runTimePostPro::pointData::pointData
         representationTypeNames.read(dict.lookup("representation"))
     ),
     maxGlyphLength_(readScalar(dict.lookup("maxGlyphLength"))),
-    pointColour_(NULL)
+    pointColour_(nullptr)
 {
     if (dict.found("pointColour"))
     {
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.C b/src/functionObjects/graphics/runTimePostProcessing/scene.C
index c9b282be42..43cd38be48 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.C
@@ -324,10 +324,10 @@ Foam::functionObjects::runTimePostPro::scene::scene
     name_(name),
     colours_(),
     mode_(mtStatic),
-    cameraPosition_(NULL),
-    cameraFocalPoint_(NULL),
-    cameraUp_(NULL),
-    cameraViewAngle_(NULL),
+    cameraPosition_(nullptr),
+    cameraFocalPoint_(nullptr),
+    cameraUp_(nullptr),
+    cameraViewAngle_(nullptr),
     clipBox_(),
     parallelProjection_(true),
     nFrameTotal_(1),
diff --git a/src/functionObjects/graphics/runTimePostProcessing/surface.C b/src/functionObjects/graphics/runTimePostProcessing/surface.C
index d43b2bd10f..903f0c24b6 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/surface.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/surface.C
@@ -160,8 +160,8 @@ Foam::functionObjects::runTimePostPro::surface::surface
         representationTypeNames.read(dict.lookup("representation"))
     ),
     featureEdges_(false),
-    surfaceColour_(NULL),
-    edgeColour_(NULL),
+    surfaceColour_(nullptr),
+    edgeColour_(nullptr),
     surfaceActor_(),
     edgeActor_(),
     maxGlyphLength_(0.0)
diff --git a/src/functionObjects/graphics/runTimePostProcessing/text.C b/src/functionObjects/graphics/runTimePostProcessing/text.C
index 67856fa42c..e36d8ca864 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/text.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/text.C
@@ -47,7 +47,7 @@ Foam::functionObjects::runTimePostPro::text::text
     string_(dict.lookup("string")),
     position_(dict.lookup("position")),
     size_(readScalar(dict.lookup("size"))),
-    colour_(NULL),
+    colour_(nullptr),
     bold_(readBool(dict.lookup("bold"))),
     timeStamp_(dict.lookupOrDefault<bool>("timeStamp", false))
 {
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index f0e827db01..f4e78392cf 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -173,7 +173,7 @@ displacementLaplacianFvMotionSolver
         ),
         cellMotionBoundaryTypes<vector>(pointDisplacement_.boundaryField())
     ),
-    pointLocation_(NULL),
+    pointLocation_(nullptr),
     interpolationPtr_
     (
         coeffDict().found("interpolation")
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index 2c170d976b..7a393161be 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -183,7 +183,7 @@ directionalPressureGradientExplicitSource
     dGradP_(cells_.size(), Zero),
     gradPporous_(cells_.size(), Zero),
     flowDir_(coeffs_.lookup("flowDir")),
-    invAPtr_(NULL),
+    invAPtr_(nullptr),
     D_(0),
     I_(0),
     length_(0),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index 74b85bce92..edff573a0f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -45,7 +45,7 @@ Foam::InterfaceForce<CloudType>::InterfaceForce
     (
         readScalar(this->coeffs().lookup("C"))
     ),
-    gradInterForceInterpPtr_(NULL)
+    gradInterForceInterpPtr_(nullptr)
 {}
 
 
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index b3f56f621a..59d772a569 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -507,7 +507,7 @@ Foam::refinementSurfaces::refinementSurfaces
     {
         if (patchInfo.set(pI))
         {
-            patchInfo_.set(pI, patchInfo.set(pI, NULL));
+            patchInfo_.set(pI, patchInfo.set(pI, nullptr));
         }
     }
 }
diff --git a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
index f90d05b85d..1639084714 100644
--- a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
+++ b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
@@ -257,7 +257,7 @@ Foam::ensightSurfaceReader::ensightSurfaceReader(const fileName& fName)
     timeStartIndex_(0),
     timeIncrement_(1),
     timeValues_(),
-    surfPtr_(NULL)
+    surfPtr_(nullptr)
 {
     IFstream is(fName);
     readCase(is);
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 758e837d6e..440c41e9f9 100644
--- a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -152,8 +152,8 @@ humidityTemperatureCoupledMixedFvPatchScalarField
     QrNbrName_("none"),
     QrName_("none"),
     specieName_("none"),
-    liquid_(NULL),
-    liquidDict_(NULL),
+    liquid_(nullptr),
+    liquidDict_(nullptr),
     mass_(patch().size(), 0.0),
     Tvap_(0.0),
     myKDelta_(patch().size(), 0.0),
@@ -227,7 +227,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
     QrNbrName_(dict.lookupOrDefault<word>("QrNbr", "none")),
     QrName_(dict.lookupOrDefault<word>("Qr", "none")),
     specieName_(dict.lookupOrDefault<word>("specieName", "none")),
-    liquid_(NULL),
+    liquid_(nullptr),
     liquidDict_(),
     mass_(patch().size(), 0.0),
     Tvap_(0.0),
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index d7899338d0..e51e8228c9 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -142,7 +142,6 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
 }
 
 
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::radiation::wideBandAbsorptionEmission::~wideBandAbsorptionEmission()
@@ -152,7 +151,7 @@ Foam::radiation::wideBandAbsorptionEmission::~wideBandAbsorptionEmission()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandI) const
+Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandi) const
 {
     const volScalarField& T = thermo_.T();
     const volScalarField& p = thermo_.p();
@@ -202,9 +201,9 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandI) const
             scalar Ti = T[i];
 
             const absorptionCoeffs::coeffArray& b =
-                coeffs_[n][bandI].coeffs(T[i]);
+                coeffs_[n][bandi].coeffs(T[i]);
 
-            if (coeffs_[n][bandI].invTemp())
+            if (coeffs_[n][bandi].invTemp())
             {
                 Ti = 1.0/T[i];
             }
@@ -223,14 +222,14 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandI) const
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::wideBandAbsorptionEmission::eCont(const label bandI) const
+Foam::radiation::wideBandAbsorptionEmission::eCont(const label bandi) const
 {
-    return aCont(bandI);
+    return aCont(bandi);
 }
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandI) const
+Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandi) const
 {
     tmp<volScalarField> E
     (
@@ -256,18 +255,18 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandI) const
         if (dQ.dimensions() == dimEnergy/dimTime)
         {
             E.ref().primitiveFieldRef() =
-                iEhrrCoeffs_[bandI]
+                iEhrrCoeffs_[bandi]
                *dQ.primitiveField()
-               *(iBands_[bandI][1] - iBands_[bandI][0])
+               *(iBands_[bandi][1] - iBands_[bandi][0])
                /totalWaveLength_
                /mesh_.V();
         }
         else if (dQ.dimensions() == dimEnergy/dimTime/dimVolume)
         {
             E.ref().primitiveFieldRef() =
-                iEhrrCoeffs_[bandI]
+                iEhrrCoeffs_[bandi]
                *dQ.primitiveField()
-               *(iBands_[bandI][1] - iBands_[bandI][0])
+               *(iBands_[bandi][1] - iBands_[bandi][0])
                /totalWaveLength_;
         }
         else
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
index 2a1e196945..cabed49005 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
@@ -65,7 +65,7 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties
     {
         const IOdictionary radiationDict(boundaryIO);
 
-        forAll (mesh.boundary(), patchi)
+        forAll(mesh.boundary(), patchi)
         {
             const polyPatch& pp = mesh.boundaryMesh()[patchi];
 
@@ -88,18 +88,18 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties
 Foam::tmp<Foam::scalarField>
 Foam::radiation::boundaryRadiationProperties::emissivity
 (
-    const label patchI,
-    const label bandI
+    const label patchi,
+    const label bandi
 ) const
 {
-    if (!radBoundaryPropertiesPtrList_[patchI].empty())
+    if (!radBoundaryPropertiesPtrList_[patchi].empty())
     {
-        return radBoundaryPropertiesPtrList_[patchI]->emissivity(bandI);
+        return radBoundaryPropertiesPtrList_[patchi]->emissivity(bandi);
     }
     else
     {
         FatalErrorInFunction
-            << "Patch : " << mesh().boundaryMesh()[patchI].name()
+            << "Patch : " << mesh().boundaryMesh()[patchi].name()
             << " is not found in the boundaryRadiationProperties. "
             << "Please add it"
             << exit(FatalError);
@@ -112,18 +112,18 @@ Foam::radiation::boundaryRadiationProperties::emissivity
 Foam::tmp<Foam::scalarField>
 Foam::radiation::boundaryRadiationProperties::absorptivity
 (
-    const label patchI,
-    const label bandI
+    const label patchi,
+    const label bandi
 ) const
 {
-    if (!radBoundaryPropertiesPtrList_[patchI].empty())
+    if (!radBoundaryPropertiesPtrList_[patchi].empty())
     {
-        return radBoundaryPropertiesPtrList_[patchI]->absorptivity(bandI);
+        return radBoundaryPropertiesPtrList_[patchi]->absorptivity(bandi);
     }
     else
     {
         FatalErrorInFunction
-            << "Patch : " << mesh().boundaryMesh()[patchI].name()
+            << "Patch : " << mesh().boundaryMesh()[patchi].name()
             << " is not found in the boundaryRadiationProperties. "
             << "Please add it"
             << exit(FatalError);
@@ -136,18 +136,18 @@ Foam::radiation::boundaryRadiationProperties::absorptivity
 Foam::tmp<Foam::scalarField>
 Foam::radiation::boundaryRadiationProperties::transmissivity
 (
-    const label patchI,
-    const label bandI
+    const label patchi,
+    const label bandi
 ) const
 {
-    if (!radBoundaryPropertiesPtrList_[patchI].empty())
+    if (!radBoundaryPropertiesPtrList_[patchi].empty())
     {
-        return radBoundaryPropertiesPtrList_[patchI]->transmissivity(bandI);
+        return radBoundaryPropertiesPtrList_[patchi]->transmissivity(bandi);
     }
     else
     {
         FatalErrorInFunction
-            << "Patch : " << mesh().boundaryMesh()[patchI].name()
+            << "Patch : " << mesh().boundaryMesh()[patchi].name()
             << " is not found in the boundaryRadiationProperties. "
             << "Please add it"
             << exit(FatalError);
@@ -160,18 +160,18 @@ Foam::radiation::boundaryRadiationProperties::transmissivity
 Foam::tmp<Foam::scalarField>
 Foam::radiation::boundaryRadiationProperties::reflectivity
 (
-    const label patchI,
-    const label bandI
+    const label patchi,
+    const label bandi
 ) const
 {
-    if (!radBoundaryPropertiesPtrList_[patchI].empty())
+    if (!radBoundaryPropertiesPtrList_[patchi].empty())
     {
-        return radBoundaryPropertiesPtrList_[patchI]->reflectivity(bandI);
+        return radBoundaryPropertiesPtrList_[patchi]->reflectivity(bandi);
     }
     else
     {
         FatalErrorInFunction
-            << "Patch : " << mesh().boundaryMesh()[patchI].name()
+            << "Patch : " << mesh().boundaryMesh()[patchi].name()
             << " is not found in the boundaryRadiationProperties. "
             << "Please add it"
             << exit(FatalError);
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
index 52be72529c..d5785cbbd9 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
@@ -86,8 +86,8 @@ boundaryRadiationPropertiesPatch
 :
     method_(methodTypeNames_.read(dict.lookup("mode"))),
     dict_(dict),
-    absorptionEmission_(NULL),
-    transmissivity_(NULL),
+    absorptionEmission_(nullptr),
+    transmissivity_(nullptr),
     patch_(p)
 {
     switch (method_)
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Su b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Su
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/T b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/T
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Tu b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Tu
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/U b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/U
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Xi b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Xi
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/alphat b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/alphat
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/b b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/b
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/ft b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/ft
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/k b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/k
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/nut b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/nut
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/p b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/p
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/pPotential b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/pPotential
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/T
similarity index 100%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/T
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/T
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/U
similarity index 100%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/U
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/U
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/alphat
similarity index 100%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/alphat
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/alphat
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/epsilon
similarity index 100%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/epsilon
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/epsilon
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/k
similarity index 100%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/k
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/k
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/nut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/nut
similarity index 100%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/nut
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/nut
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/p
similarity index 100%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/p
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/p
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun
index 749a4c91c5..f7891cd4f8 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
 \rm -rf 0 constant
-\cp -r ../common/0.org 0
+\cp -r ../common/0.orig 0
 \cp -r ../common/constant constant
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun
index 749a4c91c5..f7891cd4f8 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
 \rm -rf 0 constant
-\cp -r ../common/0.org 0
+\cp -r ../common/0.orig 0
 \cp -r ../common/constant constant
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/H2O b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/H2O
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/H2O
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/H2O
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/U
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/U
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/alphat
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/alphat
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/alphat
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/k b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/k
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/k
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/k
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/nut b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/nut
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/nut
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/nut
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/omega b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/omega
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/omega
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/omega
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p_rgh
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p_rgh
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/p
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/p
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/U
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/U
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/alphat
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/alphat
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/alphat
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/k b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/k
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/k
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/k
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/mut b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/mut
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/nut b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/nut
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/nut
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/nut
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/omega b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/omega
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/omega
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/omega
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/cabin/p_rgh
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/U
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/U
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/alphat
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/alphat
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/alphat
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/k b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/k
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/k
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/k
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/nut b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/nut
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/nut
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/nut
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/omega b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/omega
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/omega
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/omega
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/exterior/p_rgh
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/ice/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/ice/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/ice/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/U
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/ice/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/U
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/ice/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/ice/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/ice/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.org/ice/p_rgh
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p_rgh
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/controlDict b/tutorials/incompressible/icoFoam/cavityMappingTest/system/controlDict
index ba55911fb4..9f131da9d8 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/controlDict
@@ -17,19 +17,19 @@ FoamFile
 
 application     icoFoam;
 
-startFrom       startTime;
+startFrom        latestTime;
 
 startTime       0;
 
-stopAt          endTime;
+stopAt           nextWrite;
 
 endTime         0.5;
 
 deltaT          0.005;
 
-writeControl    timeStep;
+writeControl     timeStep;
 
-writeInterval   20;
+writeInterval    1;
 
 purgeWrite      0;
 
@@ -49,10 +49,10 @@ functions
 {
     meshInterp1
     {
-        type            mapFieldsFO;
-        functionObjectLibs ("libutilityFunctionObjects.so");
-        outputControl   timeStep;
-        outputInterval  1;
+        type            mapFields;
+        libs            ("libfieldFunctionObjects.so");
+        writeControl    timeStep;
+        writeInterval   1;
 
         mapRegion       coarseMesh;
         mapMethod       cellVolumeWeight;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/T b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/T
similarity index 100%
rename from tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/T
rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/T
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/U b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/U
similarity index 100%
rename from tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/U
rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/U
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/epsilon b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/epsilon
similarity index 100%
rename from tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/epsilon
rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/epsilon
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/k b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/k
similarity index 100%
rename from tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/k
rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/k
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/nut b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/nut
similarity index 100%
rename from tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/nut
rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/nut
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/p b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/p
similarity index 100%
rename from tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/p
rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/p
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun
index 749a4c91c5..f7891cd4f8 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
 \rm -rf 0 constant
-\cp -r ../common/0.org 0
+\cp -r ../common/0.orig 0
 \cp -r ../common/constant constant
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun
index 749a4c91c5..f7891cd4f8 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
 \rm -rf 0 constant
-\cp -r ../common/0.org 0
+\cp -r ../common/0.orig 0
 \cp -r ../common/constant constant
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
diff --git a/tutorials/mesh/parallel/filter/0.org/G b/tutorials/mesh/parallel/filter/0.orig/G
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/G
rename to tutorials/mesh/parallel/filter/0.orig/G
diff --git a/tutorials/mesh/parallel/filter/0.org/H2O b/tutorials/mesh/parallel/filter/0.orig/H2O
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/H2O
rename to tutorials/mesh/parallel/filter/0.orig/H2O
diff --git a/tutorials/mesh/parallel/filter/0.org/N2 b/tutorials/mesh/parallel/filter/0.orig/N2
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/N2
rename to tutorials/mesh/parallel/filter/0.orig/N2
diff --git a/tutorials/mesh/parallel/filter/0.org/O2 b/tutorials/mesh/parallel/filter/0.orig/O2
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/O2
rename to tutorials/mesh/parallel/filter/0.orig/O2
diff --git a/tutorials/mesh/parallel/filter/0.org/T b/tutorials/mesh/parallel/filter/0.orig/T
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/T
rename to tutorials/mesh/parallel/filter/0.orig/T
diff --git a/tutorials/mesh/parallel/filter/0.org/U b/tutorials/mesh/parallel/filter/0.orig/U
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/U
rename to tutorials/mesh/parallel/filter/0.orig/U
diff --git a/tutorials/mesh/parallel/filter/0.org/alphat b/tutorials/mesh/parallel/filter/0.orig/alphat
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/alphat
rename to tutorials/mesh/parallel/filter/0.orig/alphat
diff --git a/tutorials/mesh/parallel/filter/0.org/epsilon b/tutorials/mesh/parallel/filter/0.orig/epsilon
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/epsilon
rename to tutorials/mesh/parallel/filter/0.orig/epsilon
diff --git a/tutorials/mesh/parallel/filter/0.org/k b/tutorials/mesh/parallel/filter/0.orig/k
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/k
rename to tutorials/mesh/parallel/filter/0.orig/k
diff --git a/tutorials/mesh/parallel/filter/0.org/nut b/tutorials/mesh/parallel/filter/0.orig/nut
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/nut
rename to tutorials/mesh/parallel/filter/0.orig/nut
diff --git a/tutorials/mesh/parallel/filter/0.org/p b/tutorials/mesh/parallel/filter/0.orig/p
similarity index 100%
rename from tutorials/mesh/parallel/filter/0.org/p
rename to tutorials/mesh/parallel/filter/0.orig/p
diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/U b/tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/U
rename to tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/alpha.water b/tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/alpha.water
rename to tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/alpha.water
diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/k b/tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/k
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/k
rename to tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/k
diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/nut b/tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/nut
rename to tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/nut
diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/omega b/tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/omega
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/omega
rename to tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/omega
diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/motorBike/0.org/p_rgh
rename to tutorials/multiphase/interDyMFoam/ras/motorBike/0.orig/p_rgh