diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index 65ba973620..6300b86ab3 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@@ -89,16 +89,16 @@ using namespace Foam;
 //    {
 //        const vectorField& faceAreas = mesh.faceAreas();
 //
-//        forAll(meshPoints, patchPointI)
+//        forAll(meshPoints, patchPointi)
 //        {
-//            label meshPointI = meshPoints[patchPointI];
-//            Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointI);
+//            label meshPointi = meshPoints[patchPointi];
+//            Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointi);
 //            if (fnd != coupledPatchMP.end())
 //            {
-//                label coupledPointI = fnd();
+//                label coupledPointi = fnd();
 //
-//                List<point>& pNormals = pointFaceNormals[coupledPointI];
-//                const labelList& pFaces = p.pointFaces()[patchPointI];
+//                List<point>& pNormals = pointFaceNormals[coupledPointi];
+//                const labelList& pFaces = p.pointFaces()[patchPointi];
 //                pNormals.setSize(pFaces.size());
 //                forAll(pFaces, i)
 //                {
@@ -125,24 +125,24 @@ using namespace Foam;
 //
 //    pointField coupledPointNormals(map.constructSize(), Zero);
 //
-//    forAll(meshPoints, patchPointI)
+//    forAll(meshPoints, patchPointi)
 //    {
-//        label meshPointI = meshPoints[patchPointI];
-//        Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointI);
+//        label meshPointi = meshPoints[patchPointi];
+//        Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointi);
 //        if (fnd != coupledPatchMP.end())
 //        {
-//            label coupledPointI = fnd();
-//            const labelList& slaveSlots = slaves[coupledPointI];
+//            label coupledPointi = fnd();
+//            const labelList& slaveSlots = slaves[coupledPointi];
 //            const labelList& transformedSlaveSlots =
-//                transformedSlaves[coupledPointI];
+//                transformedSlaves[coupledPointi];
 //
 //            label nFaces = slaveSlots.size()+transformedSlaveSlots.size();
 //            if (nFaces > 0)
 //            {
 //                // Combine
-//                point& n = coupledPointNormals[coupledPointI];
+//                point& n = coupledPointNormals[coupledPointi];
 //
-//                n += sum(pointFaceNormals[coupledPointI]);
+//                n += sum(pointFaceNormals[coupledPointi]);
 //
 //                forAll(slaveSlots, i)
 //                {
@@ -178,14 +178,14 @@ using namespace Foam;
 //
 //
 //    // Override patch normals
-//    forAll(meshPoints, patchPointI)
+//    forAll(meshPoints, patchPointi)
 //    {
-//        label meshPointI = meshPoints[patchPointI];
-//        Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointI);
+//        label meshPointi = meshPoints[patchPointi];
+//        Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointi);
 //        if (fnd != coupledPatchMP.end())
 //        {
-//            label coupledPointI = fnd();
-//            extrudeN[patchPointI] = coupledPointNormals[coupledPointI];
+//            label coupledPointi = fnd();
+//            extrudeN[patchPointi] = coupledPointNormals[coupledPointi];
 //        }
 //    }
 //
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
         forAll(en, patchEdgeI)
         {
             const edge& patchE = pp.edges()[patchEdgeI];
-            //str.write(pp.localPoints()[pointI], en[pointI]);
+            //str.write(pp.localPoints()[pointi], en[pointi]);
             const point pt = patchE.centre(pp.localPoints());
             str.write(linePointRef(pt, pt + 0.1*en[patchEdgeI]));
         }
@@ -264,9 +264,9 @@ int main(int argc, char *argv[])
 //                identity(pp.size())+pp.start()
 //            )
 //        );
-//        forAll(pn, pointI)
+//        forAll(pn, pointi)
 //        {
-//            str.write(linePointRef(pp.localPoints()[pointI], pn[pointI]));
+//            str.write(linePointRef(pp.localPoints()[pointi], pn[pointi]));
 //        }
 //    }
 //    {
@@ -281,9 +281,9 @@ int main(int argc, char *argv[])
 //                identity(pp.size())+pp.start()
 //            )
 //        );
-//        forAll(pn, pointI)
+//        forAll(pn, pointi)
 //        {
-//            str.write(linePointRef(pp.localPoints()[pointI], pn[pointI]));
+//            str.write(linePointRef(pp.localPoints()[pointi], pn[pointi]));
 //        }
 //    }
 
diff --git a/applications/test/PointEdgeWave/Test-PointEdgeWave.C b/applications/test/PointEdgeWave/Test-PointEdgeWave.C
index 1e0695e547..e0dcea8a2a 100644
--- a/applications/test/PointEdgeWave/Test-PointEdgeWave.C
+++ b/applications/test/PointEdgeWave/Test-PointEdgeWave.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,9 @@ int main(int argc, char *argv[])
 
         forAll(pp.meshPoints(), ppI)
         {
-            label meshPointI = pp.meshPoints()[ppI];
-            wallPoints[nPoints] = meshPointI;
-            wallInfo[nPoints] = pointEdgePoint(mesh.points()[meshPointI], 0.0);
+            label meshPointi = pp.meshPoints()[ppI];
+            wallPoints[nPoints] = meshPointi;
+            wallInfo[nPoints] = pointEdgePoint(mesh.points()[meshPointi], 0.0);
             nPoints++;
         }
     }
@@ -120,9 +120,9 @@ int main(int argc, char *argv[])
         dimensionedScalar("wallDist", dimLength, 0.0)
     );
 
-    forAll(allPointInfo, pointI)
+    forAll(allPointInfo, pointi)
     {
-        psf[pointI] = Foam::sqrt(allPointInfo[pointI].distSqr());
+        psf[pointi] = Foam::sqrt(allPointInfo[pointi].distSqr());
     }
 
     Info<< "Writing wallDist pointScalarField to " << runTime.value()
diff --git a/applications/test/globalMeshData/Test-globalMeshData.C b/applications/test/globalMeshData/Test-globalMeshData.C
index eab4500ebe..56a285ae02 100644
--- a/applications/test/globalMeshData/Test-globalMeshData.C
+++ b/applications/test/globalMeshData/Test-globalMeshData.C
@@ -76,14 +76,14 @@ int main(int argc, char *argv[])
         );
 
         // Print
-        forAll(slaves, pointI)
+        forAll(slaves, pointi)
         {
-            const labelList& slavePoints = slaves[pointI];
+            const labelList& slavePoints = slaves[pointi];
 
             if (slavePoints.size() > 0)
             {
-                Pout<< "Master point:" << pointI
-                    << " coord:" << coords[pointI]
+                Pout<< "Master point:" << pointi
+                    << " coord:" << coords[pointi]
                     << " connected to untransformed slave points:" << endl;
 
                 forAll(slavePoints, i)
@@ -92,12 +92,12 @@ int main(int argc, char *argv[])
                 }
             }
 
-            const labelList& transformedSlavePoints = transformedSlaves[pointI];
+            const labelList& transformedSlavePoints = transformedSlaves[pointi];
 
             if (transformedSlavePoints.size() > 0)
             {
-                Pout<< "Master point:" << pointI
-                    << " coord:" << coords[pointI]
+                Pout<< "Master point:" << pointi
+                    << " coord:" << coords[pointi]
                     << " connected to transformed slave points:" << endl;
 
                 forAll(transformedSlavePoints, i)
@@ -204,14 +204,14 @@ int main(int argc, char *argv[])
         );
 
         // Print
-        forAll(slaves, pointI)
+        forAll(slaves, pointi)
         {
-            const labelList& slaveFaces = slaves[pointI];
+            const labelList& slaveFaces = slaves[pointi];
 
             if (slaveFaces.size() > 0)
             {
-                Pout<< "Master point:" << pointI
-                    << " at:" << coupledPatch.localPoints()[pointI]
+                Pout<< "Master point:" << pointi
+                    << " at:" << coupledPatch.localPoints()[pointi]
                     << " connected to " << slaveFaces.size()
                     << " untransformed faces:" << endl;
 
@@ -221,11 +221,11 @@ int main(int argc, char *argv[])
                 }
             }
 
-            const labelList& transformedSlaveFaces = transformedSlaves[pointI];
+            const labelList& transformedSlaveFaces = transformedSlaves[pointi];
 
             if (transformedSlaveFaces.size() > 0)
             {
-                Pout<< "Master point:" << pointI
+                Pout<< "Master point:" << pointi
                     << " connected to " << transformedSlaveFaces.size()
                     << " transformed faces:" << endl;
 
@@ -262,14 +262,14 @@ int main(int argc, char *argv[])
         );
 
         // Print
-        forAll(slaves, pointI)
+        forAll(slaves, pointi)
         {
-            const labelList& pointCells = slaves[pointI];
+            const labelList& pointCells = slaves[pointi];
 
             if (pointCells.size() > 0)
             {
-                Pout<< "Master point:" << pointI
-                    << " at:" << coupledPatch.localPoints()[pointI]
+                Pout<< "Master point:" << pointi
+                    << " at:" << coupledPatch.localPoints()[pointi]
                     << " connected to " << pointCells.size()
                     << " untransformed boundaryCells:" << endl;
 
@@ -279,11 +279,11 @@ int main(int argc, char *argv[])
                 }
             }
 
-            const labelList& transformPointCells = transformedSlaves[pointI];
+            const labelList& transformPointCells = transformedSlaves[pointi];
 
             if (transformPointCells.size() > 0)
             {
-                Pout<< "Master point:" << pointI
+                Pout<< "Master point:" << pointi
                     << " connected to " << transformPointCells.size()
                     << " transformed boundaryCells:" << endl;
 
diff --git a/applications/test/patchRegion/Test-patchRegion.C b/applications/test/patchRegion/Test-patchRegion.C
index cc56487c12..1b8153ac86 100644
--- a/applications/test/patchRegion/Test-patchRegion.C
+++ b/applications/test/patchRegion/Test-patchRegion.C
@@ -125,22 +125,22 @@ int main(int argc, char *argv[])
             {
                 label faceRegion = allFaceInfo[facei].regions()[fp];
 
-                label pointI = f[fp];
+                label pointi = f[fp];
 
-                if (currentRegion[pointI] == -1)
+                if (currentRegion[pointi] == -1)
                 {
-                    currentRegion[pointI] = faceRegion;
+                    currentRegion[pointi] = faceRegion;
                 }
-                else if (currentRegion[pointI] != faceRegion)
+                else if (currentRegion[pointi] != faceRegion)
                 {
-                    if (duplicateRegion[pointI] == -1)
+                    if (duplicateRegion[pointi] == -1)
                     {
                         Pout<< "Multi region point:"
-                            << patch.localPoints()[pointI]
-                            << " with region:" << currentRegion[pointI]
+                            << patch.localPoints()[pointi]
+                            << " with region:" << currentRegion[pointi]
                             << " and region:" << faceRegion
                             << endl;
-                        duplicateRegion[pointI] = currentRegion[pointI];
+                        duplicateRegion[pointi] = currentRegion[pointi];
                     }
                 }
             }
diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C
index 549dbbabab..97b3c0cc93 100644
--- a/applications/test/primitivePatch/Test-PrimitivePatch.C
+++ b/applications/test/primitivePatch/Test-PrimitivePatch.C
@@ -43,9 +43,9 @@ typedef PrimitivePatch<face, List, const pointField&> myPrimitivePatch;
 
 void writeObj(Ostream& os,const pointField& points)
 {
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         os  << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
     }
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index b5984a5215..a94ff5217d 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -215,10 +215,10 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
         {
             const point pt = localPoints[i] + 1e-4*rndGen.vector01();
 
-            label meshPointI = allBoundary.meshPoints()[i];
+            label meshPointi = allBoundary.meshPoints()[i];
 
-            sparseData.insert(meshPointI, pt);
-            fullData[meshPointI] = pt;
+            sparseData.insert(meshPointi, pt);
+            fullData[meshPointi] = pt;
         }
 
         //Pout<< "sparseData:" << sparseData << endl;
@@ -241,18 +241,18 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 
         // Compare.
         // 1. Is all fullData also present in sparseData and same value
-        forAll(fullData, meshPointI)
+        forAll(fullData, meshPointi)
         {
-            const point& fullPt = fullData[meshPointI];
+            const point& fullPt = fullData[meshPointi];
 
             if (fullPt != point(GREAT, GREAT, GREAT))
             {
-                const point& sparsePt = sparseData[meshPointI];
+                const point& sparsePt = sparseData[meshPointi];
 
                 if (fullPt != sparsePt)
                 {
                     FatalErrorInFunction
-                        << "point:" << meshPointI
+                        << "point:" << meshPointi
                         << " full:" << fullPt
                         << " sparse:" << sparsePt
                         << exit(FatalError);
@@ -264,13 +264,13 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
         forAllConstIter(Map<point>, sparseData, iter)
         {
             const point& sparsePt = iter();
-            label meshPointI = iter.key();
-            const point& fullPt = fullData[meshPointI];
+            label meshPointi = iter.key();
+            const point& fullPt = fullData[meshPointi];
 
             if (fullPt != sparsePt)
             {
                 FatalErrorInFunction
-                    << "point:" << meshPointI
+                    << "point:" << meshPointi
                     << " full:" << fullPt
                     << " sparse:" << sparsePt
                     << exit(FatalError);
@@ -387,14 +387,14 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
             point(GREAT, GREAT, GREAT)
         );
 
-        forAll(syncedPoints, pointI)
+        forAll(syncedPoints, pointi)
         {
-            if (mag(syncedPoints[pointI] - mesh.points()[pointI]) > SMALL)
+            if (mag(syncedPoints[pointi] - mesh.points()[pointi]) > SMALL)
             {
                 FatalErrorInFunction
-                    << "Point " << pointI
-                    << " original location " << mesh.points()[pointI]
-                    << " synced location " << syncedPoints[pointI]
+                    << "Point " << pointi
+                    << " original location " << mesh.points()[pointi]
+                    << " synced location " << syncedPoints[pointi]
                     << exit(FatalError);
             }
         }
@@ -407,11 +407,11 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
 
         PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
 
-        forAll(isMasterPoint, pointI)
+        forAll(isMasterPoint, pointi)
         {
-            if (isMasterPoint[pointI])
+            if (isMasterPoint[pointi])
             {
-                nMasters[pointI] = 1;
+                nMasters[pointi] = 1;
             }
         }
 
@@ -423,14 +423,14 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
             0
         );
 
-        forAll(nMasters, pointI)
+        forAll(nMasters, pointi)
         {
-            if (nMasters[pointI] != 1)
+            if (nMasters[pointi] != 1)
             {
                 WarningInFunction
-                    << "Point " << pointI
-                    << " original location " << mesh.points()[pointI]
-                    << " has " << nMasters[pointI]
+                    << "Point " << pointi
+                    << " original location " << mesh.points()[pointi]
+                    << " has " << nMasters[pointi]
                     << " masters."
                     << endl;
             }
diff --git a/applications/test/wallDist/Test-wallDist.C b/applications/test/wallDist/Test-wallDist.C
index 39d273d290..7a2d4f5cdf 100644
--- a/applications/test/wallDist/Test-wallDist.C
+++ b/applications/test/wallDist/Test-wallDist.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,9 +68,9 @@ int main(int argc, char *argv[])
 
     const point half(0.5*(meshBb.min() + meshBb.max()));
 
-    forAll(newPoints, pointI)
+    forAll(newPoints, pointi)
     {
-        point& pt = newPoints[pointI];
+        point& pt = newPoints[pointi];
 
         // expand around half
         pt.y() +=  pt.y() - half.y();
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
index 95af972536..0a2434e987 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
@@ -168,7 +168,7 @@ void Foam::cellSplitter::setRefinement
 
         label anchorPoint = mesh_.cellPoints()[celli][0];
 
-        label addedPointI =
+        label addedPointi =
             meshMod.setAction
             (
                 polyAddPoint
@@ -179,9 +179,9 @@ void Foam::cellSplitter::setRefinement
                     true            // supports a cell
                 )
             );
-        addedPoints_.insert(celli, addedPointI);
+        addedPoints_.insert(celli, addedPointi);
 
-        //Pout<< "Added point " << addedPointI
+        //Pout<< "Added point " << addedPointi
         //    << iter() << " in cell " << celli << " with centre "
         //    << mesh_.cellCentres()[celli] << endl;
     }
@@ -242,7 +242,7 @@ void Foam::cellSplitter::setRefinement
     {
         label celli = iter.key();
 
-        label midPointI = addedPoints_[celli];
+        label midPointi = addedPoints_[celli];
 
         const cell& cFaces = mesh_.cells()[celli];
 
@@ -283,13 +283,13 @@ void Foam::cellSplitter::setRefinement
                     // edge used in face order.
                     newF[0] = e[1];
                     newF[1] = e[0];
-                    newF[2] = midPointI;
+                    newF[2] = midPointi;
                 }
                 else
                 {
                     newF[0] = e[0];
                     newF[1] = e[1];
-                    newF[2] = midPointI;
+                    newF[2] = midPointi;
                 }
 
                 // Now newF points away from cell0
@@ -329,13 +329,13 @@ void Foam::cellSplitter::setRefinement
                     // edge used in face order.
                     newF[0] = e[1];
                     newF[1] = e[0];
-                    newF[2] = midPointI;
+                    newF[2] = midPointi;
                 }
                 else
                 {
                     newF[0] = e[0];
                     newF[1] = e[1];
-                    newF[2] = midPointI;
+                    newF[2] = midPointi;
                 }
 
                 // Now newF points away from cell1
@@ -473,13 +473,13 @@ void Foam::cellSplitter::updateMesh(const mapPolyMesh& morphMap)
 
         label newCelli = morphMap.reverseCellMap()[oldCelli];
 
-        label oldPointI = iter();
+        label oldPointi = iter();
 
-        label newPointI = morphMap.reversePointMap()[oldPointI];
+        label newPointi = morphMap.reversePointMap()[oldPointi];
 
-        if (newCelli >= 0 && newPointI >= 0)
+        if (newCelli >= 0 && newPointi >= 0)
         {
-            newAddedPoints.insert(newCelli, newPointI);
+            newAddedPoints.insert(newCelli, newPointi);
         }
     }
 
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 1fc2063b4b..5277498eea 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -79,9 +79,9 @@ label findPoint(const primitivePatch& pp, const point& nearPoint)
 
     forAll(meshPoints, i)
     {
-        label pointI = meshPoints[i];
+        label pointi = meshPoints[i];
 
-        scalar distSqr = magSqr(nearPoint - points[pointI]);
+        scalar distSqr = magSqr(nearPoint - points[pointi]);
 
         if (distSqr < minDistSqr)
         {
@@ -89,12 +89,12 @@ label findPoint(const primitivePatch& pp, const point& nearPoint)
             almostMinI = minI;
 
             minDistSqr = distSqr;
-            minI = pointI;
+            minI = pointi;
         }
         else if (distSqr < almostMinDistSqr)
         {
             almostMinDistSqr = distSqr;
-            almostMinI = pointI;
+            almostMinI = pointi;
         }
     }
 
@@ -292,14 +292,14 @@ label findCell(const primitiveMesh& mesh, const point& nearPoint)
 
         forAll(cPoints, i)
         {
-            label pointI = cPoints[i];
+            label pointi = cPoints[i];
 
-            scalar distSqr = magSqr(nearPoint - mesh.points()[pointI]);
+            scalar distSqr = magSqr(nearPoint - mesh.points()[pointi]);
 
             if (distSqr < minDistSqr)
             {
                 minDistSqr = distSqr;
-                minI = pointI;
+                minI = pointi;
             }
         }
 
@@ -429,11 +429,11 @@ int main(int argc, char *argv[])
     {
         const Pair<point>& pts = pointsToMove[i];
 
-        label pointI = findPoint(allBoundary, pts.first());
+        label pointi = findPoint(allBoundary, pts.first());
 
-        if (pointI == -1 || !pointToPos.insert(pointI, pts.second()))
+        if (pointi == -1 || !pointToPos.insert(pointi, pts.second()))
         {
-            Info<< "Could not insert mesh point " << pointI
+            Info<< "Could not insert mesh point " << pointi
                 << " for input point " << pts.first() << nl
                 << "Perhaps the point is already marked for moving?" << endl;
             validInputs = false;
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index ee2ffdcfa6..59735ed04f 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -114,11 +114,11 @@ int main(int argc, char *argv[])
         const polyPatch& pp = mesh.boundaryMesh()[iter.key()];
         const labelList& meshPoints = pp.meshPoints();
 
-        forAll(meshPoints, pointI)
+        forAll(meshPoints, pointi)
         {
-            label meshPointI = meshPoints[pointI];
+            label meshPointi = meshPoints[pointi];
 
-            const labelList& pCells = mesh.pointCells()[meshPointI];
+            const labelList& pCells = mesh.pointCells()[meshPointi];
 
             forAll(pCells, pCelli)
             {
@@ -156,9 +156,9 @@ int main(int argc, char *argv[])
         const polyPatch& pp = mesh.boundaryMesh()[iter.key()];
         const labelList& meshPoints = pp.meshPoints();
 
-        forAll(meshPoints, pointI)
+        forAll(meshPoints, pointi)
         {
-            vertOnPatch[meshPoints[pointI]] = true;
+            vertOnPatch[meshPoints[pointi]] = true;
         }
     }
 
@@ -167,24 +167,24 @@ int main(int argc, char *argv[])
         const polyPatch& pp = mesh.boundaryMesh()[iter.key()];
         const labelList& meshPoints = pp.meshPoints();
 
-        forAll(meshPoints, pointI)
+        forAll(meshPoints, pointi)
         {
-            label meshPointI = meshPoints[pointI];
+            label meshPointi = meshPoints[pointi];
 
-            const labelList& pEdges = mesh.pointEdges()[meshPointI];
+            const labelList& pEdges = mesh.pointEdges()[meshPointi];
 
             forAll(pEdges, pEdgeI)
             {
                 const label edgeI = pEdges[pEdgeI];
                 const edge& e = mesh.edges()[edgeI];
 
-                label otherPointI = e.otherVertex(meshPointI);
+                label otherPointi = e.otherVertex(meshPointi);
 
-                if (!vertOnPatch[otherPointI])
+                if (!vertOnPatch[otherPointi])
                 {
                     allCutEdges.append(edgeI);
 
-                    if (e.start() == meshPointI)
+                    if (e.start() == meshPointi)
                     {
                         allCutEdgeWeights.append(weight);
                     }
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C
index 695da9c1f4..176cb966b8 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCells.C
+++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C
@@ -192,15 +192,15 @@ void cutBySurface
 
         label nRemoved = 0;
 
-        forAll(pts, pointI)
+        forAll(pts, pointi)
         {
-            const point& pt = pts[pointI];
+            const point& pt = pts[pointi];
 
             pointIndexHit hitInfo = tree.findNearest(pt, sqr(nearDist));
 
             if (hitInfo.hit())
             {
-                const labelList& pCells = mesh.pointCells()[pointI];
+                const labelList& pCells = mesh.pointCells()[pointi];
 
                 forAll(pCells, i)
                 {
@@ -218,11 +218,11 @@ void cutBySurface
 //
 //        label nRemoved = 0;
 //
-//        forAll(nearest, pointI)
+//        forAll(nearest, pointi)
 //        {
-//            if (mag(nearest[pointI] - pts[pointI]) < nearDist)
+//            if (mag(nearest[pointi] - pts[pointi]) < nearDist)
 //            {
-//                const labelList& pCells = mesh.pointCells()[pointI];
+//                const labelList& pCells = mesh.pointCells()[pointi];
 //
 //                forAll(pCells, i)
 //                {
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 9f58c3bcce..d45222b50d 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -801,8 +801,8 @@ int main(int argc, char *argv[])
 
     // Renumber vertex labels to Foam point labels
     {
-        label maxCCMPointI = max(foamPointMap);
-        labelList toFoamPoints(invert(maxCCMPointI+1, foamPointMap));
+        label maxCCMPointi = max(foamPointMap);
+        labelList toFoamPoints(invert(maxCCMPointi+1, foamPointMap));
 
         forAll(foamFaces, facei)
         {
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index f78d63906a..c243107bec 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -254,11 +254,11 @@ int main(int argc, char *argv[])
             const labelList& blockPFacePoints =
                 blockPFaces[blockPFaceLabel];
 
-            forAll(blockPFacePoints, blockPFacePointI)
+            forAll(blockPFacePoints, blockPFacePointi)
             {
-                forAll(blockPFacePoints, blockPFacePointI2)
+                forAll(blockPFacePoints, blockPFacePointi2)
                 {
-                    if (blockPFacePointI != blockPFacePointI2)
+                    if (blockPFacePointi != blockPFacePointi2)
                     {
                         sqrMergeTol =
                             min
@@ -267,9 +267,9 @@ int main(int argc, char *argv[])
                                 magSqr
                                 (
                                     blockPpoints
-                                        [blockPFacePoints[blockPFacePointI]]
+                                        [blockPFacePoints[blockPFacePointi]]
                                   - blockPpoints
-                                        [blockPFacePoints[blockPFacePointI2]]
+                                        [blockPFacePoints[blockPFacePointi2]]
                                 )
                             );
                     }
@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
             labelList& cp = curPairs[blockPFaceLabel];
             cp.setSize(blockPFacePoints.size());
 
-        forAll(blockPFacePoints, blockPFacePointI)
+        forAll(blockPFacePoints, blockPFacePointi)
         {
             found = false;
 
@@ -300,16 +300,16 @@ int main(int argc, char *argv[])
                 const labelList& blockNFacePoints =
                     blockNFaces[blockNFaceLabel];
 
-            forAll(blockNFacePoints, blockNFacePointI)
+            forAll(blockNFacePoints, blockNFacePointi)
             {
                 if
                 (
                     magSqr
                     (
                         blockPpoints
-                            [blockPFacePoints[blockPFacePointI]]
+                            [blockPFacePoints[blockPFacePointi]]
                       - blockNpoints
-                            [blockNFacePoints[blockNFacePointI]]
+                            [blockNFacePoints[blockNFacePointi]]
                     )
                   < sqrMergeTol
                 )
@@ -317,15 +317,15 @@ int main(int argc, char *argv[])
                     // Found a new pair
                     found = true;
 
-                    cp[blockPFacePointI] =
-                        blockNFacePoints[blockNFacePointI];
+                    cp[blockPFacePointi] =
+                        blockNFacePoints[blockNFacePointi];
 
                     label PpointLabel =
-                        blockPFacePoints[blockPFacePointI]
+                        blockPFacePoints[blockPFacePointi]
                       + blockOffsets[blockPlabel];
 
                     label NpointLabel =
-                        blockNFacePoints[blockNFacePointI]
+                        blockNFacePoints[blockNFacePointi]
                       + blockOffsets[blockNlabel];
 
                     label minPN = min(PpointLabel, NpointLabel);
@@ -381,14 +381,14 @@ int main(int argc, char *argv[])
 
                 const labelList& cp = curPairs[blockPFaceLabel];
 
-                forAll(cp, blockPFacePointI)
+                forAll(cp, blockPFacePointi)
                 {
                     label PpointLabel =
-                        blockPFacePoints[blockPFacePointI]
+                        blockPFacePoints[blockPFacePointi]
                       + blockOffsets[blockPlabel];
 
                     label NpointLabel =
-                        cp[blockPFacePointI]
+                        cp[blockPFacePointi]
                       + blockOffsets[blockNlabel];
 
                     if
@@ -440,16 +440,16 @@ int main(int argc, char *argv[])
             const labelList& blockPFacePoints
                 = blockPFaces[blockPFaceLabel];
 
-            forAll(blockPFacePoints, blockPFacePointI)
+            forAll(blockPFacePoints, blockPFacePointi)
             {
                 label PpointLabel =
-                    blockPFacePoints[blockPFacePointI]
+                    blockPFacePoints[blockPFacePointi]
                   + blockOffsets[blockPlabel];
 
                 if (pointMergeList[PpointLabel] == -1)
                 {
                     FatalErrorInFunction
-                        << "Unable to merge point " << blockPFacePointI
+                        << "Unable to merge point " << blockPFacePointi
                         << " of face " << blockPFaceLabel
                         << " of block " << blockPlabel
                         << abort(FatalError);
@@ -462,16 +462,16 @@ int main(int argc, char *argv[])
             const labelList& blockNFacePoints
                 = blockNFaces[blockNFaceLabel];
 
-            forAll(blockNFacePoints, blockNFacePointI)
+            forAll(blockNFacePoints, blockNFacePointi)
             {
                 label NpointLabel =
-                    blockNFacePoints[blockNFacePointI]
+                    blockNFacePoints[blockNFacePointi]
                   + blockOffsets[blockNlabel];
 
                 if (pointMergeList[NpointLabel] == -1)
                 {
                     FatalErrorInFunction
-                        << "Unable to merge point " << blockNFacePointI
+                        << "Unable to merge point " << blockNFacePointi
                         << " of face " << blockNFaceLabel
                         << " of block " << blockNlabel
                         << abort(FatalError);
@@ -554,12 +554,12 @@ int main(int argc, char *argv[])
         {
             labelList cellPoints(curBlockCells[blockCelli].size());
 
-            forAll(cellPoints, pointI)
+            forAll(cellPoints, pointi)
             {
-                cellPoints[pointI] =
+                cellPoints[pointi] =
                     pointMergeList
                     [
-                        curBlockCells[blockCelli][pointI]
+                        curBlockCells[blockCelli][pointi]
                       + blockOffsets[blockI]
                     ];
             }
@@ -618,12 +618,12 @@ int main(int argc, char *argv[])
                     face& newFace = renumberedPatch[oldSize + facei];
                     newFace.setSize(oldFace.size());
 
-                    forAll(oldFace, pointI)
+                    forAll(oldFace, pointi)
                     {
-                        newFace[pointI] =
+                        newFace[pointi] =
                             pointMergeList
                             [
-                                oldFace[pointI]
+                                oldFace[pointi]
                               + blockOffsets[curBlock]
                             ];
                     }
@@ -642,12 +642,12 @@ int main(int argc, char *argv[])
                     face& newFace = renumberedPatch[facei];
                     newFace.setSize(oldFace.size());
 
-                    forAll(oldFace, pointI)
+                    forAll(oldFace, pointi)
                     {
-                        newFace[pointI] =
+                        newFace[pointi] =
                             pointMergeList
                             [
-                                oldFace[pointI]
+                                oldFace[pointi]
                               + blockOffsets[curBlock]
                             ];
                     }
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
index 95073724f1..d585725346 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
@@ -155,9 +155,9 @@ cellShape create3DCellShape
 
             meshFaceUsed[meshFacei] = true;
 
-            forAll(curMeshFace, pointI)
+            forAll(curMeshFace, pointi)
             {
-                pointLabels[firstModelFace[pointI]] = curMeshFace[pointI];
+                pointLabels[firstModelFace[pointi]] = curMeshFace[pointi];
             }
 
             break;
@@ -204,12 +204,12 @@ cellShape create3DCellShape
                     // try matching the face
                     label nMatchedLabels = 0;
 
-                    forAll(meshFaceLabels, pointI)
+                    forAll(meshFaceLabels, pointi)
                     {
                         if
                         (
-                            pointLabels[curModelFace[pointI]]
-                         == meshFaceLabels[pointI]
+                            pointLabels[curModelFace[pointi]]
+                         == meshFaceLabels[pointi]
                         )
                         {
                             nMatchedLabels++;
@@ -225,10 +225,10 @@ cellShape create3DCellShape
                     if (found)
                     {
                         // match found. Insert mesh face
-                        forAll(meshFaceLabels, pointI)
+                        forAll(meshFaceLabels, pointi)
                         {
-                            pointLabels[curModelFace[pointI]] =
-                                meshFaceLabels[pointI];
+                            pointLabels[curModelFace[pointi]] =
+                                meshFaceLabels[pointi];
                         }
 
                         meshFaceUsed[meshFacei] = true;
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index b134b3de24..c7ed9ca401 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -237,7 +237,7 @@ endOfSection               {space}")"{space}
 %{
     // Point data
     label pointGroupNumberOfComponents = 3;
-    label pointI = 0; // index used for reading points
+    label pointi = 0; // index used for reading points
 
     // Face data
     label faceGroupElementType = -1;
@@ -343,7 +343,7 @@ endOfSection               {space}")"{space}
         readHexLabel(pointGroupDataStream);
 
         // In FOAM, indices start from zero - adjust
-        pointI = pointGroupStartIndex.last() - 1;
+        pointi = pointGroupStartIndex.last() - 1;
 
         // reset number of components to default
         pointGroupNumberOfComponents = 3;
@@ -381,8 +381,8 @@ endOfSection               {space}")"{space}
         scalar x = readScalar(vertexXyzStream);
         scalar y = readScalar(vertexXyzStream);
 
-        points[pointI] = point(x, y, 0);
-        pointI++;
+        points[pointi] = point(x, y, 0);
+        pointi++;
     }
 
 <readPoints3D>{spaceNl}{scalarList} {
@@ -394,19 +394,19 @@ endOfSection               {space}")"{space}
         scalar y = readScalar(vertexXyzStream);
         scalar z = readScalar(vertexXyzStream);
 
-        points[pointI] = convertToMeters*point(x, y, z);
-        pointI++;
+        points[pointi] = convertToMeters*point(x, y, z);
+        pointi++;
     }
 
 <readPoints2D,readPoints3D>{spaceNl}{endOfSection} {
 
         // check read of points
-        if (pointI != pointGroupEndIndex.last())
+        if (pointi != pointGroupEndIndex.last())
         {
             Info<< "problem with reading points: "
                 << "start index: " << pointGroupStartIndex.last()
                 << " end index: " << pointGroupEndIndex.last()
-                << " last points read: " << pointI << endl;
+                << " last points read: " << pointi << endl;
         }
 
         yy_pop_state();
@@ -986,18 +986,18 @@ int main(int argc, char *argv[])
         // points given by Fluent need to represent the FRONT plane of the
         // geometry. Therefore, the extrusion will be in -z direction
         //
-        forAll(oldPoints, pointI)
+        forAll(oldPoints, pointi)
         {
-            points[nNewPoints] = oldPoints[pointI];
+            points[nNewPoints] = oldPoints[pointi];
 
             points[nNewPoints].z() = zOffset;
 
             nNewPoints++;
         }
 
-        forAll(oldPoints, pointI)
+        forAll(oldPoints, pointi)
         {
-            points[nNewPoints] = oldPoints[pointI];
+            points[nNewPoints] = oldPoints[pointi];
 
             points[nNewPoints].z() = -zOffset;
 
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
index 3a140878ef..e86ba6c417 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
@@ -113,13 +113,13 @@ void Foam::fluentFvMesh::writeFluentMesh() const
 
     const pointField& p = points();
 
-    forAll(p, pointI)
+    forAll(p, pointi)
     {
         fluentMeshFile
             << "    "
-            << p[pointI].x() << " "
-            << p[pointI].y()
-            << " " << p[pointI].z() << std::endl;
+            << p[pointi].x() << " "
+            << p[pointi].y()
+            << " " << p[pointi].z() << std::endl;
     }
 
     fluentMeshFile
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 52c7f3485d..1180f549ba 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -663,20 +663,20 @@ int main(int argc, char *argv[])
     // make a point mapping array
     label maxPointIndex = 0;
 
-    forAll(pointMap, pointI)
+    forAll(pointMap, pointi)
     {
-        if (pointMap[pointI] > maxPointIndex)
+        if (pointMap[pointi] > maxPointIndex)
         {
-            maxPointIndex = pointMap[pointI];
+            maxPointIndex = pointMap[pointi];
         }
     }
 
 
     labelList pointLookup(maxPointIndex + 1, -1);
 
-    forAll(pointMap, pointI)
+    forAll(pointMap, pointi)
     {
-        pointLookup[pointMap[pointI] ] = pointI;
+        pointLookup[pointMap[pointi] ] = pointi;
     }
 
     // make a cell mapping array
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index be76eb4861..ba2ce7a7dc 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -295,7 +295,7 @@ void readPoints(IFstream& inFile, pointField& points, Map<label>& mshToFoam)
     points.setSize(nVerts);
     mshToFoam.resize(2*nVerts);
 
-    for (label pointI = 0; pointI < nVerts; pointI++)
+    for (label pointi = 0; pointi < nVerts; pointi++)
     {
         label mshLabel;
         scalar xVal, yVal, zVal;
@@ -306,13 +306,13 @@ void readPoints(IFstream& inFile, pointField& points, Map<label>& mshToFoam)
 
         lineStr >> mshLabel >> xVal >> yVal >> zVal;
 
-        point& pt = points[pointI];
+        point& pt = points[pointi];
 
         pt.x() = xVal;
         pt.y() = yVal;
         pt.z() = zVal;
 
-        mshToFoam.insert(mshLabel, pointI);
+        mshToFoam.insert(mshLabel, pointi);
     }
 
     Info<< "Vertices read:" << mshToFoam.size() << endl;
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 73eb8f00be..2b2f9ed02b 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -212,20 +212,20 @@ void readPoints
         string line;
         is.getLine(line);
 
-        label pointI = readLabel(IStringStream(line.substr(0, 10))());
+        label pointi = readLabel(IStringStream(line.substr(0, 10))());
 
-        if (pointI == -1)
+        if (pointi == -1)
         {
             break;
         }
-        else if (pointI != points.size()+1 && !hasWarned)
+        else if (pointi != points.size()+1 && !hasWarned)
         {
             hasWarned = true;
 
             IOWarningInFunction
             (
                 is
-            )   << "Points not in order starting at point " << pointI
+            )   << "Points not in order starting at point " << pointi
                 //<< " at line " << is.lineNumber()
                 //<< abort(FatalError);
                 << endl;
@@ -237,7 +237,7 @@ void readPoints
         pt[1] = readUnvScalar(line.substr(25, 25));
         pt[2] = readUnvScalar(line.substr(50, 25));
 
-        unvPointID.append(pointI);
+        unvPointID.append(pointi);
         points.append(pt);
     }
 
@@ -279,9 +279,9 @@ void readCells
 
     // Invert point numbering.
     label maxUnvPoint = 0;
-    forAll(unvPointID, pointI)
+    forAll(unvPointID, pointi)
     {
-        maxUnvPoint = max(maxUnvPoint, unvPointID[pointI]);
+        maxUnvPoint = max(maxUnvPoint, unvPointID[pointi]);
     }
     labelList unvToFoam(invert(maxUnvPoint+1, unvPointID));
 
@@ -605,10 +605,10 @@ void readDOFS
         }
 
         IStringStream lineStr(line);
-        label pointI;
-        lineStr >> pointI;
+        label pointi;
+        lineStr >> pointi;
 
-        vertices.append(pointI);
+        vertices.append(pointi);
     }
 
     Info<< "For DOF set " << group
@@ -781,9 +781,9 @@ int main(int argc, char *argv[])
 
     // Invert point numbering.
     label maxUnvPoint = 0;
-    forAll(unvPointID, pointI)
+    forAll(unvPointID, pointi)
     {
-        maxUnvPoint = max(maxUnvPoint, unvPointID[pointI]);
+        maxUnvPoint = max(maxUnvPoint, unvPointID[pointi]);
     }
     labelList unvToFoam(invert(maxUnvPoint+1, unvPointID));
 
diff --git a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
index 4e6127dae4..5469cc4055 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
+++ b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
@@ -123,13 +123,13 @@ int main(int argc, char *argv[])
     pointField points(nPoints);
 
 
-    for (label pointI = 0; pointI < nPoints; pointI++)
+    for (label pointi = 0; pointi < nPoints; pointi++)
     {
         scalar x, y, z;
 
         mshStream >> x >> y >> z;
 
-        points[pointI] = point(x, y, z);
+        points[pointi] = point(x, y, z);
     }
 
 
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 2f3f320c72..4f8cb7b988 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -105,13 +105,13 @@ int main(int argc, char *argv[])
 
     pointField points(nNodes);
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
         scalar x,y,z;
 
         str >> x >> y >> z;
 
-        points[pointI] = point(x, y, z);
+        points[pointi] = point(x, y, z);
     }
 
 
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index e32ebfa6ca..e473bba96d 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -211,12 +211,12 @@ int main(int argc, char *argv[])
         {
             labelList cellPoints(curBlockCells[blockCelli].size());
 
-            forAll(cellPoints, pointI)
+            forAll(cellPoints, pointi)
             {
-                cellPoints[pointI] =
+                cellPoints[pointi] =
                     oldToNew
                     [
-                        curBlockCells[blockCelli][pointI]
+                        curBlockCells[blockCelli][pointi]
                       + blockOffsets[blockI]
                     ];
             }
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
index 9e05ffdf00..e3d3ed1f44 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
@@ -83,10 +83,10 @@ void Foam::sammMesh::createBoundaryFaces()
             face& curFace = patchFaces[facei];
             const labelList& facePoints = curFace;
 
-            forAll(facePoints, pointI)
+            forAll(facePoints, pointi)
             {
                 const labelList& facePointCells =
-                    PointCells[facePoints[pointI]];
+                    PointCells[facePoints[pointi]];
 
                 forAll(facePointCells, celli)
                 {
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
index 96f1236b13..3bdafa60d8 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
@@ -59,10 +59,10 @@ void Foam::sammMesh::createPolyBoundary()
             // mark it in the cellPolys_
             const labelList& facePoints = curFace;
 
-            forAll(facePoints, pointI)
+            forAll(facePoints, pointi)
             {
                 const labelList& facePointCells =
-                    PointCells[facePoints[pointI]];
+                    PointCells[facePoints[pointi]];
 
                 forAll(facePointCells, celli)
                 {
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
index 8a83fb620b..8ae1dafe01 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
@@ -97,10 +97,10 @@ void Foam::sammMesh::createPolyCells()
             const labelList& curPoints = curFace;
 
             // For all points
-            forAll(curPoints, pointI)
+            forAll(curPoints, pointi)
             {
                 // get the list of cells sharing this point
-                const labelList& curNeighbours = PointCells[curPoints[pointI]];
+                const labelList& curNeighbours = PointCells[curPoints[pointi]];
 
                 // For all neighbours
                 forAll(curNeighbours, neiI)
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
index ea7e2f5645..0bff685546 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
@@ -117,10 +117,10 @@ void Foam::starMesh::markBoundaryFaces()
             const face& curFace = patchFaces[facei];
             const labelList& facePoints = curFace;
 
-            forAll(facePoints, pointI)
+            forAll(facePoints, pointi)
             {
                 const labelList& facePointCells =
-                    PointCells[facePoints[pointI]];
+                    PointCells[facePoints[pointi]];
 
                 forAll(facePointCells, celli)
                 {
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index b1058ec08d..cfb77ef050 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
@@ -1311,17 +1311,17 @@ void Foam::starMesh::createCoupleMatches()
             // onto the master face to ensure closedness
             vector pointProjectionNormal = -masterFace.normal(points_);
 
-            forAll(intersectedFace, intPointI)
+            forAll(intersectedFace, intPointi)
             {
                 #ifdef DEBUG_COUPLE_PROJECTION
                 Info<< "Proj: old point: "
-                    << points_[intersectedFace[intPointI]] << endl;
+                    << points_[intersectedFace[intPointi]] << endl;
                 #endif
 
                 pointHit projHit =
                     masterFace.ray
                     (
-                        points_[intersectedFace[intPointI]],
+                        points_[intersectedFace[intPointi]],
                         pointProjectionNormal,
                         points_,
                         intersection::FULL_RAY
@@ -1329,12 +1329,12 @@ void Foam::starMesh::createCoupleMatches()
 
                 if (projHit.hit())
                 {
-                    points_[intersectedFace[intPointI]] =
+                    points_[intersectedFace[intPointi]] =
                         projHit.hitPoint();
 
                     #ifdef DEBUG_COUPLE_PROJECTION
                     Info<< "      new point: "
-                        << points_[intersectedFace[intPointI]] << endl;
+                        << points_[intersectedFace[intPointi]] << endl;
                     #endif
                 }
             }
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
index 9eff237ea5..198fbe5236 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
@@ -59,10 +59,10 @@ void Foam::starMesh::createPolyBoundary()
             // mark it in the cellPolys_
             const labelList& facePoints = curFace;
 
-            forAll(facePoints, pointI)
+            forAll(facePoints, pointi)
             {
                 const labelList& facePointCells =
-                    PointCells[facePoints[pointI]];
+                    PointCells[facePoints[pointi]];
 
                 forAll(facePointCells, celli)
                 {
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
index 246896047d..0c7ba86a8e 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
@@ -97,10 +97,10 @@ void Foam::starMesh::createPolyCells()
             const labelList& curPoints = curFace;
 
             // For all points
-            forAll(curPoints, pointI)
+            forAll(curPoints, pointi)
             {
                 // get the list of cells sharing this point
-                const labelList& curNeighbours = PointCells[curPoints[pointI]];
+                const labelList& curNeighbours = PointCells[curPoints[pointi]];
 
                 // For all neighbours
                 forAll(curNeighbours, neiI)
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
index e109deec52..7addc9c688 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
@@ -234,16 +234,16 @@ void Foam::starMesh::mergeCoupleFacePoints()
 
     // Insert the primary point renumbering into the list
     // Take care of possibly unused points in the list
-    forAll(renumberPoints, pointI)
+    forAll(renumberPoints, pointi)
     {
-        if (renumberPoints[pointI] < 0)
+        if (renumberPoints[pointi] < 0)
         {
             // point not merged
-            renumberPoints[pointI] = pointI;
+            renumberPoints[pointi] = pointi;
         }
         else
         {
-            renumberPoints[pointI] = mergeSetID[renumberPoints[pointI]];
+            renumberPoints[pointi] = mergeSetID[renumberPoints[pointi]];
         }
     }
 
@@ -262,9 +262,9 @@ void Foam::starMesh::mergeCoupleFacePoints()
 
             face& prelimFacePoints = prelimFaces[facei];
 
-            forAll(prelimFacePoints, pointI)
+            forAll(prelimFacePoints, pointi)
             {
-                if (renumberPoints[oldFacePoints[pointI]] < 0)
+                if (renumberPoints[oldFacePoints[pointi]] < 0)
                 {
                     FatalErrorInFunction
                         << "Error in point renumbering. Old face: "
@@ -273,8 +273,8 @@ void Foam::starMesh::mergeCoupleFacePoints()
                         << abort(FatalError);
                 }
 
-                prelimFacePoints[pointI] =
-                    renumberPoints[oldFacePoints[pointI]];
+                prelimFacePoints[pointi] =
+                    renumberPoints[oldFacePoints[pointi]];
             }
         }
     }
@@ -291,9 +291,9 @@ void Foam::starMesh::mergeCoupleFacePoints()
         {
             const face& curFacePoints = curFaces[facei];
 
-            forAll(curFacePoints, pointI)
+            forAll(curFacePoints, pointi)
             {
-                renumberPoints[curFacePoints[pointI]]++;
+                renumberPoints[curFacePoints[pointi]]++;
             }
         }
     }
@@ -302,16 +302,16 @@ void Foam::starMesh::mergeCoupleFacePoints()
     {
         const labelList& curLabels = cellShapes_[celli];
 
-        forAll(curLabels, pointI)
+        forAll(curLabels, pointi)
         {
-            if (renumberPoints[curLabels[pointI]] == 0)
+            if (renumberPoints[curLabels[pointi]] == 0)
             {
                 FatalErrorInFunction
                     << "Error in point merging for cell "
                     << celli << ". STAR index: " << starCellID_[celli]
                     << ". " << endl
-                    << "Point index: " << curLabels[pointI] << " STAR index "
-                    << starPointID_[curLabels[pointI]] << endl
+                    << "Point index: " << curLabels[pointi] << " STAR index "
+                    << starPointID_[curLabels[pointi]] << endl
                     << "Please check the geometry for the cell." << endl;
             }
         }
@@ -319,22 +319,22 @@ void Foam::starMesh::mergeCoupleFacePoints()
 
     label nUsedPoints = 0;
 
-    forAll(renumberPoints, pointI)
+    forAll(renumberPoints, pointi)
     {
-        if (renumberPoints[pointI] > 0)
+        if (renumberPoints[pointi] > 0)
         {
             // This should be OK as the compressed points list will always
             // have less points that the original lists.  Even if there is
             // no points removed, this will copy the list back onto itself
             //
-            renumberPoints[pointI] = nUsedPoints;
-            points_[nUsedPoints] = points_[pointI];
+            renumberPoints[pointi] = nUsedPoints;
+            points_[nUsedPoints] = points_[pointi];
 
             nUsedPoints++;
         }
         else
         {
-            renumberPoints[pointI] = -1;
+            renumberPoints[pointi] = -1;
         }
     }
 
@@ -356,19 +356,19 @@ void Foam::starMesh::mergeCoupleFacePoints()
 
             face& newFacePoints = newFaces[facei];
 
-            forAll(newFacePoints, pointI)
+            forAll(newFacePoints, pointi)
             {
-                if (renumberPoints[oldFacePoints[pointI]] < 0)
+                if (renumberPoints[oldFacePoints[pointi]] < 0)
                 {
                     FatalErrorInFunction
                         << "Error in point renumbering for point "
-                        << oldFacePoints[pointI]
+                        << oldFacePoints[pointi]
                         << ". Renumbering index is -1." << endl
                         << "Old face: " << oldFacePoints << endl
                         << "New face: " << newFacePoints << abort(FatalError);
                 }
 
-                newFacePoints[pointI] = renumberPoints[oldFacePoints[pointI]];
+                newFacePoints[pointi] = renumberPoints[oldFacePoints[pointi]];
             }
         }
     }
@@ -381,23 +381,23 @@ void Foam::starMesh::mergeCoupleFacePoints()
 
         labelList& curLabels = cellShapes_[celli];
 
-        forAll(curLabels, pointI)
+        forAll(curLabels, pointi)
         {
-            if (renumberPoints[curLabels[pointI]] < 0)
+            if (renumberPoints[curLabels[pointi]] < 0)
             {
                 FatalErrorInFunction
                     << "Error in point renumbering for cell "
                     << celli << ". STAR index: " << starCellID_[celli]
                     << ". " << endl
-                    << "Point index: " << curLabels[pointI] << " STAR index "
-                    << starPointID_[curLabels[pointI]] << " returns invalid "
+                    << "Point index: " << curLabels[pointi] << " STAR index "
+                    << starPointID_[curLabels[pointi]] << " returns invalid "
                     << "renumbering index: "
-                    << renumberPoints[curLabels[pointI]] << "." << endl
+                    << renumberPoints[curLabels[pointi]] << "." << endl
                     << "Old cellShape:  " << oldLabels << endl
                     << "New cell shape: " << curLabels << abort(FatalError);
                 }
 
-            curLabels[pointI] = renumberPoints[oldLabels[pointI]];
+            curLabels[pointi] = renumberPoints[oldLabels[pointi]];
         }
     }
 
@@ -407,11 +407,11 @@ void Foam::starMesh::mergeCoupleFacePoints()
 
     starPointID_ = -1;
 
-    forAll(starPointID_, pointI)
+    forAll(starPointID_, pointi)
     {
-        if (renumberPoints[pointI] > -1)
+        if (renumberPoints[pointi] > -1)
         {
-            starPointID_[renumberPoints[pointI]] = oldStarPointID[pointI];
+            starPointID_[renumberPoints[pointi]] = oldStarPointID[pointi];
         }
     }
 
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 37843d6c94..c19f780f1d 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
     {
         labelList pointIndex(nNodes);
 
-        label pointI = 0;
+        label pointi = 0;
 
         while (nodeStream.good())
         {
@@ -218,15 +218,15 @@ int main(int argc, char *argv[])
                 }
 
                 // Store point and node number.
-                points[pointI] = point(x, y, z);
-                nodeToPoint.insert(nodeI, pointI);
-                pointI++;
+                points[pointi] = point(x, y, z);
+                nodeToPoint.insert(nodeI, pointi);
+                pointi++;
             }
         }
-        if (pointI != nNodes)
+        if (pointi != nNodes)
         {
             FatalIOErrorIn(args.executable().c_str(), nodeStream)
-                << "Only " << pointI << " nodes present instead of " << nNodes
+                << "Only " << pointi << " nodes present instead of " << nNodes
                 << " from header." << exit(FatalIOError);
         }
     }
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index 231c93468f..ae578bf14f 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -69,9 +69,9 @@ void writePoints(const polyMesh& mesh, const fileName& timeName)
 
     OFstream pointStream(pointFile);
 
-    forAll(mesh.points(), pointI)
+    forAll(mesh.points(), pointi)
     {
-        writeOBJ(mesh.points()[pointI], pointStream);
+        writeOBJ(mesh.points()[pointi], pointStream);
         vertI++;
     }
 
@@ -265,9 +265,9 @@ void writePatchFaces
 
         OFstream patchFaceStream(faceFile);
 
-        forAll(pp.localPoints(), pointI)
+        forAll(pp.localPoints(), pointi)
         {
-            writeOBJ(pp.localPoints()[pointI], patchFaceStream);
+            writeOBJ(pp.localPoints()[pointi], patchFaceStream);
         }
 
         forAll(pp.localFaces(), facei)
@@ -308,9 +308,9 @@ void writePatchBoundaryEdges
 
         OFstream patchEdgeStream(edgeFile);
 
-        forAll(pp.localPoints(), pointI)
+        forAll(pp.localPoints(), pointi)
         {
-            writeOBJ(pp.localPoints()[pointI], patchEdgeStream);
+            writeOBJ(pp.localPoints()[pointi], patchEdgeStream);
         }
 
         for (label edgeI = pp.nInternalEdges(); edgeI < pp.nEdges(); edgeI++)
@@ -329,11 +329,11 @@ void writePatchBoundaryEdges
 void writePointCells
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const fileName& timeName
 )
 {
-    const labelList& pCells = mesh.pointCells()[pointI];
+    const labelList& pCells = mesh.pointCells()[pointi];
 
     labelHashSet allEdges(6*pCells.size());
 
@@ -351,7 +351,7 @@ void writePointCells
     fileName pFile
     (
         mesh.time().path()
-      / "pointEdges_" + timeName + '_' + name(pointI) + ".obj"
+      / "pointEdges_" + timeName + '_' + name(pointi) + ".obj"
     );
 
     Info<< "Writing pointEdges to " << pFile << endl;
@@ -470,9 +470,9 @@ int main(int argc, char *argv[])
             }
             if (doPoint)
             {
-                label pointI = args.optionRead<label>("point");
+                label pointi = args.optionRead<label>("point");
 
-                writePointCells(mesh, pointI, runTime.timeName());
+                writePointCells(mesh, pointi, runTime.timeName());
             }
             if (doFace)
             {
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index f3e6d75dd7..2d2d68c8d4 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -581,25 +581,25 @@ int main(int argc, char *argv[])
         // Determine points and extrusion
         pointField layer0Points(extrudePatch.nPoints());
         pointField displacement(extrudePatch.nPoints());
-        forAll(displacement, pointI)
+        forAll(displacement, pointi)
         {
-            const vector& patchNormal = extrudePatchPointNormals[pointI];
+            const vector& patchNormal = extrudePatchPointNormals[pointi];
 
             // layer0 point
-            layer0Points[pointI] = model()
+            layer0Points[pointi] = model()
             (
-                extrudePatch.localPoints()[pointI],
+                extrudePatch.localPoints()[pointi],
                 patchNormal,
                 0
             );
             // layerN point
             point extrudePt = model()
             (
-                extrudePatch.localPoints()[pointI],
+                extrudePatch.localPoints()[pointi],
                 patchNormal,
                 model().nLayers()
             );
-            displacement[pointI] = extrudePt - layer0Points[pointI];
+            displacement[pointi] = extrudePt - layer0Points[pointi];
         }
 
 
@@ -659,27 +659,27 @@ int main(int argc, char *argv[])
         );
 
         // Reset points according to extrusion model
-        forAll(layerExtrude.addedPoints(), pointI)
+        forAll(layerExtrude.addedPoints(), pointi)
         {
-            const labelList& pPoints = layerExtrude.addedPoints()[pointI];
-            forAll(pPoints, pPointI)
+            const labelList& pPoints = layerExtrude.addedPoints()[pointi];
+            forAll(pPoints, pPointi)
             {
-                label meshPointI = pPoints[pPointI];
+                label meshPointi = pPoints[pPointi];
 
                 point modelPt
                 (
                     model()
                     (
-                        extrudePatch.localPoints()[pointI],
-                        extrudePatchPointNormals[pointI],
-                        pPointI+1       // layer
+                        extrudePatch.localPoints()[pointi],
+                        extrudePatchPointNormals[pointi],
+                        pPointi+1       // layer
                     )
                 );
 
                 const_cast<DynamicList<point>&>
                 (
                     meshMod().points()
-                )[meshPointI] = modelPt;
+                )[meshPointi] = modelPt;
             }
         }
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index ab406ee1e3..a1f8fecf13 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2440,16 +2440,16 @@ int main(int argc, char *argv[])
         (
             meshMod.points()
         );
-        label meshPointI = extrudePatch.localPoints().size();
+        label meshPointi = extrudePatch.localPoints().size();
         forAll(localRegionPoints, regionI)
         {
-            label pointI = localRegionPoints[regionI];
-            point pt = extrudePatch.localPoints()[pointI];
+            label pointi = localRegionPoints[regionI];
+            point pt = extrudePatch.localPoints()[pointi];
             const vector& n = localRegionNormals[regionI];
 
             for (label layerI = 1; layerI <= model().nLayers(); layerI++)
             {
-                newPoints[meshPointI++] = model()(pt, n, layerI);
+                newPoints[meshPointi++] = model()(pt, n, layerI);
             }
         }
 
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
index cc8c117357..7a6ae09e33 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
@@ -226,13 +226,13 @@ void Foam::extrude2DMesh::setRefinement
     {
         label offset = layer * points.size();
 
-        forAll(points, pointI)
+        forAll(points, pointi)
         {
             // Don't need the surface normal for either linearDirection or
             // wedge. Will need to add to be able to use others.
             point newPoint = model_
             (
-                points[pointI],
+                points[pointi],
                 vector(),
                 layer
             );
@@ -240,7 +240,7 @@ void Foam::extrude2DMesh::setRefinement
             meshMod.addPoint
             (
                 newPoint,
-                pointI + offset,
+                pointi + offset,
                 -1,             // zoneID
                 true            // inCell
             );
@@ -390,24 +390,24 @@ void Foam::extrude2DMesh::setRefinement
 
         const face& f = faces[nextFacei];
 
-        label nextPointI;
+        label nextPointi;
         if (mesh_.faceOwner()[nextFacei] == celli)
         {
             frontFace[0] = f[0];
-            nextPointI = f[1];
+            nextPointi = f[1];
         }
         else
         {
             frontFace[0] = f[1];
-            nextPointI = f[0];
+            nextPointi = f[0];
         }
 
 
         for (label i = 1; i < frontFace.size(); i++)
         {
-            frontFace[i] = nextPointI;
+            frontFace[i] = nextPointi;
 
-            // Find face containing pointI
+            // Find face containing pointi
             forAll(cFaces, cFacei)
             {
                 label facei = cFaces[cFacei];
@@ -415,15 +415,15 @@ void Foam::extrude2DMesh::setRefinement
                 {
                     const face& f = faces[facei];
 
-                    if (f[0] == nextPointI)
+                    if (f[0] == nextPointi)
                     {
-                        nextPointI = f[1];
+                        nextPointi = f[1];
                         nextFacei = facei;
                         break;
                     }
-                    else if (f[1] == nextPointI)
+                    else if (f[1] == nextPointi)
                     {
-                        nextPointI = f[0];
+                        nextPointi = f[0];
                         nextFacei = facei;
                         break;
                     }
@@ -486,24 +486,24 @@ void Foam::extrude2DMesh::setRefinement
 
         const face& f = faces[nextFacei];
 
-        label nextPointI;
+        label nextPointi;
         if (mesh_.faceOwner()[nextFacei] == celli)
         {
             frontFace[0] = f[0];
-            nextPointI = f[1];
+            nextPointi = f[1];
         }
         else
         {
             frontFace[0] = f[1];
-            nextPointI = f[0];
+            nextPointi = f[0];
         }
 
 
         for (label i = 1; i < frontFace.size(); i++)
         {
-            frontFace[i] = nextPointI;
+            frontFace[i] = nextPointi;
 
-            // Find face containing pointI
+            // Find face containing pointi
             forAll(cFaces, cFacei)
             {
                 label facei = cFaces[cFacei];
@@ -511,15 +511,15 @@ void Foam::extrude2DMesh::setRefinement
                 {
                     const face& f = faces[facei];
 
-                    if (f[0] == nextPointI)
+                    if (f[0] == nextPointi)
                     {
-                        nextPointI = f[1];
+                        nextPointi = f[1];
                         nextFacei = facei;
                         break;
                     }
-                    else if (f[1] == nextPointI)
+                    else if (f[1] == nextPointi)
                     {
-                        nextPointI = f[0];
+                        nextPointi = f[0];
                         nextFacei = facei;
                         break;
                     }
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index ef9bfb7704..7a349cc38c 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -78,28 +78,28 @@ static const NamedEnum<ExtrudeMode, 2> ExtrudeModeNames;
 //    pointField layer1Points(fMesh.nPoints());
 //    pointField displacement(fMesh.nPoints());
 
-//    forAll(layer0Points, pointI)
+//    forAll(layer0Points, pointi)
 //    {
 //        const labelList& meshPoints = fMesh.meshPoints();
-//        label meshPointI = meshPoints[pointI];
+//        label meshPointi = meshPoints[pointi];
 
-//        layer0Points[meshPointI] = model
+//        layer0Points[meshPointi] = model
 //        (
-//            fMesh.points()[meshPointI],
-//            fMesh.pointNormals()[pointI],
+//            fMesh.points()[meshPointi],
+//            fMesh.pointNormals()[pointi],
 //            0
 //        );
 
-//        layer1Points[meshPointI] = model
+//        layer1Points[meshPointi] = model
 //        (
-//            fMesh.points()[meshPointI],
-//            fMesh.pointNormals()[pointI],
+//            fMesh.points()[meshPointi],
+//            fMesh.pointNormals()[pointi],
 //            1
 //        );
 
-//        displacement[pointI] =
-//            layer1Points[meshPointI]
-//          - layer0Points[meshPointI];
+//        displacement[pointi] =
+//            layer1Points[meshPointi]
+//          - layer0Points[meshPointi];
 //    }
 
 //    fMesh.movePoints(layer0Points);
diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
index 779b682649..a9026a5156 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
@@ -537,9 +537,9 @@ int main(int argc, char *argv[])
             // Enforce the boundary conditions
             const triad& fixedAlignment = fixedAlignments[pI];
 
-            forAll(pPoints, adjPointI)
+            forAll(pPoints, adjPointi)
             {
-                const label adjPointIndex = pPoints[adjPointI];
+                const label adjPointIndex = pPoints[adjPointi];
 
                 scalar dist = mag(points[pI] - points[adjPointIndex]);
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index 566298a651..42ff66646b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -91,9 +91,9 @@ void Foam::DelaunayMesh<Triangulation>::addPatches
     label nPatches = patchFaces.size();
 
     patchDicts.setSize(nPatches);
-    forAll(patchDicts, patchI)
+    forAll(patchDicts, patchi)
     {
-        patchDicts.set(patchI, new dictionary());
+        patchDicts.set(patchi, new dictionary());
     }
 
     label nBoundaryFaces = 0;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
index af208c587b..e975f6d4f2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
@@ -364,9 +364,9 @@ void Foam::smoothAlignmentSolver::smoothAlignments
 
             triad& newTriad = triadAv[pI];
 
-            forAll(pPoints, adjPointI)
+            forAll(pPoints, adjPointi)
             {
-                const label adjPointIndex = pPoints[adjPointI];
+                const label adjPointIndex = pPoints[adjPointi];
 
                 scalar dist = mag(points[pI] - points[adjPointIndex]);
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index b99b4c3252..50553ec4c6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -2566,7 +2566,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
         }
     }
 
-    label pointI = 0;
+    label pointi = 0;
 
     labelList oldToNew(pts.size(), label(-1));
 
@@ -2577,7 +2577,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
     {
         if (ptUsed[ptUI] == true)
         {
-            oldToNew[ptUI] = pointI++;
+            oldToNew[ptUI] = pointi++;
         }
     }
 
@@ -2585,12 +2585,12 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
     inplaceReorder(oldToNew, boundaryPts);
 
     Info<< "    Removing "
-        << returnReduce(pts.size() - pointI, sumOp<label>())
+        << returnReduce(pts.size() - pointi, sumOp<label>())
         << " unused points"
         << endl;
 
-    pts.setSize(pointI);
-    boundaryPts.setSize(pointI);
+    pts.setSize(pointi);
+    boundaryPts.setSize(pointi);
 
     // Renumber the faces to use the new point numbers
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 894652dc9d..ae550bd8a3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -1831,10 +1831,10 @@ Foam::conformalVoronoiMesh::nearestFeatureEdgeLocations
     {
         label index = elems[elemI];
 
-        const Foam::point& pointI
+        const Foam::point& pointi
             = edgeLocationTreePtr_().shapes().shapePoints()[index];
 
-        pointIndexHit nearHit(true, pointI, index);
+        pointIndexHit nearHit(true, pointi, index);
 
         dynPointHit.append(nearHit);
     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 39beaedd2d..c61a0b1d59 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -307,11 +307,11 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 //            )()
 //        );
 //
-//        label pointI = findIndex(pointDualAddressing, -1);
-//        if (pointI != -1)
+//        label pointi = findIndex(pointDualAddressing, -1);
+//        if (pointi != -1)
 //        {
 //            WarningInFunction
-//                << "Delaunay vertex " << pointI
+//                << "Delaunay vertex " << pointi
 //                << " does not have a corresponding dual cell." << endl;
 //        }
 //
@@ -350,21 +350,21 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 //                points
 //            );
 //
-//            forAll(pointDualAddressing, pointI)
+//            forAll(pointDualAddressing, pointi)
 //            {
-//                label index = pointDualAddressing[pointI];
+//                label index = pointDualAddressing[pointi];
 //
 //                if (index > 0)
 //                {
 //                    label celli = index-1;
-//                    dualPoints[pointI] = mesh.cellCentres()[celli];
+//                    dualPoints[pointi] = mesh.cellCentres()[celli];
 //                }
 //                else if (index < 0)
 //                {
 //                    label facei = -index-1;
 //                    if (facei >= mesh.nInternalFaces())
 //                    {
-//                        dualPoints[pointI] = mesh.faceCentres()[facei];
+//                        dualPoints[pointi] = mesh.faceCentres()[facei];
 //                    }
 //                }
 //            }
@@ -1388,8 +1388,8 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
 
     forAllConstIter(labelHashSet, protrudingBoundaryPoints, iter)
     {
-        const label pointI = iter.key();
-        const labelList& pCells = mesh.pointCells()[pointI];
+        const label pointi = iter.key();
+        const labelList& pCells = mesh.pointCells()[pointi];
 
         forAll(pCells, pCI)
         {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
index 997c94c157..99f2871298 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
@@ -276,23 +276,23 @@ Foam::labelList Foam::conformalVoronoiMesh::calcCellZones
                 selectInside = false;
             }
 
-            forAll(volType, pointI)
+            forAll(volType, pointi)
             {
-                if (cellToSurface[pointI] == -1)
+                if (cellToSurface[pointi] == -1)
                 {
                     if
                     (
                         (
-                            volType[pointI] == volumeType::INSIDE
+                            volType[pointi] == volumeType::INSIDE
                          && selectInside
                         )
                      || (
-                            volType[pointI] == volumeType::OUTSIDE
+                            volType[pointi] == volumeType::OUTSIDE
                          && !selectInside
                         )
                     )
                     {
-                        cellToSurface[pointI] = surfI;
+                        cellToSurface[pointi] = surfI;
                     }
                 }
             }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 47efc0e8fa..d453a0f4ed 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -1112,17 +1112,17 @@ void Foam::conformationSurfaces::findEdgeNearest
         );
 
         // Update minDistSqr and arguments
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            if (hitInfo[pointI].hit())
+            if (hitInfo[pointi].hit())
             {
-                minDistSqr[pointI] = magSqr
+                minDistSqr[pointi] = magSqr
                 (
-                    hitInfo[pointI].hitPoint()
-                  - samples[pointI]
+                    hitInfo[pointi].hitPoint()
+                  - samples[pointi]
                 );
-                edgeHits[pointI] = hitInfo[pointI];
-                featuresHit[pointI] = testI;
+                edgeHits[pointi] = hitInfo[pointi];
+                featuresHit[pointi] = testI;
             }
         }
     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index bd02554c88..a7ed55b723 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -352,14 +352,14 @@ tmp<scalarField> signedDistance
         // Push back to original
         forAll(volType, i)
         {
-            label pointI = surfIndices[i];
-            scalar dist = mag(points[pointI] - nearest[pointI].hitPoint());
+            label pointi = surfIndices[i];
+            scalar dist = mag(points[pointi] - nearest[pointi].hitPoint());
 
             volumeType vT = volType[i];
 
             if (vT == volumeType::OUTSIDE)
             {
-                fld[pointI] = dist;
+                fld[pointi] = dist;
             }
             else if (vT == volumeType::INSIDE)
             {
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
index bffad658bb..ca9d18953d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
@@ -206,9 +206,9 @@ public:
             //    return true;
             //}
             //const pointField points(bb.points());
-            //forAll(points, pointI)
+            //forAll(points, pointi)
             //{
-            //    scalar pointVal = signedDistance(points[pointI]) - _iso_val;
+            //    scalar pointVal = signedDistance(points[pointi]) - _iso_val;
             //    if (ccVal*pointVal < 0)
             //    {
             //        return true;
@@ -518,10 +518,10 @@ int main(int argc, char *argv[])
 
         Point* vertices = mc.vertices();
         pointField points(mc.nverts());
-        forAll(points, pointI)
+        forAll(points, pointi)
         {
-            const Point& v = vertices[pointI];
-            points[pointI] = converter.toGlobal(v);
+            const Point& v = vertices[pointi];
+            points[pointi] = converter.toGlobal(v);
         }
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
index ca04a70165..d26bd0eaa6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2012-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2012-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
 
     // Generate points
     pointField points(mc.size_x()*mc.size_y()*mc.size_z());
-    label pointI = 0;
+    label pointi = 0;
 
     point pt;
     for( int k = 0 ; k < mc.size_z() ; k++ )
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
             for( int i = 0 ; i < mc.size_x() ; i++ )
             {
                 pt.x() = bb.min().x() + i*d.x();
-                points[pointI++] = pt;
+                points[pointi++] = pt;
             }
         }
     }
@@ -181,14 +181,14 @@ int main(int argc, char *argv[])
     );
 
     // Fill elements
-    pointI = 0;
+    pointi = 0;
     for( int k = 0 ; k < mc.size_z() ; k++ )
     {
         for( int j = 0 ; j < mc.size_y() ; j++ )
         {
             for( int i = 0 ; i < mc.size_x() ; i++ )
             {
-                mc.set_data(float(signedDist[pointI++]), i, j, k);
+                mc.set_data(float(signedDist[pointi++]), i, j, k);
             }
         }
     }
@@ -226,10 +226,10 @@ int main(int argc, char *argv[])
 
         Vertex* vertices = mc.vertices();
         pointField points(mc.nverts());
-        forAll(points, pointI)
+        forAll(points, pointi)
         {
-            Vertex& v = vertices[pointI];
-            points[pointI] = point
+            Vertex& v = vertices[pointi];
+            points[pointi] = point
             (
                 bb.min().x() + v.x*span.x()/mc.size_x(),
                 bb.min().y() + v.y*span.y()/mc.size_y(),
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
index 9a56358064..92d08f29d6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
@@ -938,7 +938,7 @@ void Foam::CV2D::newPoints()
 /*
 void Foam::CV2D::moveInternalPoints(const point2DField& newPoints)
 {
-    label pointI = 0;
+    label pointi = 0;
 
     for
     (
@@ -949,7 +949,7 @@ void Foam::CV2D::moveInternalPoints(const point2DField& newPoints)
     {
         if (vit->internalPoint())
         {
-            movePoint(vit, newPoints[pointI++]);
+            movePoint(vit, newPoints[pointi++]);
         }
     }
 }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
index 70319d5088..e2720cc5ed 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,9 +130,9 @@ inline const Foam::point2D& Foam::CV2D::toPoint2D(const point& p) const
 inline const Foam::point2DField Foam::CV2D::toPoint2D(const pointField& p) const
 {
     point2DField temp(p.size());
-    forAll(temp, pointI)
+    forAll(temp, pointi)
     {
-        temp[pointI] = point2D(p[pointI].x(), p[pointI].y());
+        temp[pointi] = point2D(p[pointi].x(), p[pointi].y());
     }
     return temp;
 }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index e5bca4dd69..fc2c048d7d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
@@ -433,14 +433,14 @@ Foam::shortEdgeFilter2D::filter()
     // Maintain addressing from new to old point field
     labelList newPtToOldPt(totalNewPoints, -1);
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
         // If the point is NOT going to be removed.
-        if (pointsToRemove[pointI] == -1)
+        if (pointsToRemove[pointi] == -1)
         {
-            newPoints[pointI - numberRemoved] = points[pointI];
-            newPointNumbers[pointI] =  pointI - numberRemoved;
-            newPtToOldPt[pointI - numberRemoved] = pointI;
+            newPoints[pointi - numberRemoved] = points[pointi];
+            newPointNumbers[pointi] =  pointi - numberRemoved;
+            newPtToOldPt[pointi - numberRemoved] = pointi;
         }
         else
         {
@@ -466,31 +466,31 @@ Foam::shortEdgeFilter2D::filter()
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
+            label pointi = f[fp];
             // If not removing the point, then add it to the new face.
-            if (pointsToRemove[pointI] == -1)
+            if (pointsToRemove[pointi] == -1)
             {
-                newFace[newFaceSize++] = newPointNumbers[pointI];
+                newFace[newFaceSize++] = newPointNumbers[pointi];
             }
             else
             {
-                label newPointI = pointsToRemove[pointI];
+                label newPointi = pointsToRemove[pointi];
                 // Replace deleted point with point that it is being
                 // collapsed to.
                 if
                 (
-                    f.nextLabel(fp) != newPointI
-                 && f.prevLabel(fp) != newPointI
+                    f.nextLabel(fp) != newPointi
+                 && f.prevLabel(fp) != newPointi
                 )
                 {
-                    label pChain = newPointI;
+                    label pChain = newPointi;
                     label totalChain = 0;
                     for (label nChain = 0; nChain <= totalChain; ++nChain)
                     {
                         if (newPointNumbers[pChain] != -1)
                         {
                             newFace[newFaceSize++] = newPointNumbers[pChain];
-                            newPointNumbers[pointI] = newPointNumbers[pChain];
+                            newPointNumbers[pointi] = newPointNumbers[pChain];
                             maxChain = max(totalChain, maxChain);
                         }
                         else
@@ -498,7 +498,7 @@ Foam::shortEdgeFilter2D::filter()
                             WarningInFunction
                                 << "Point " << pChain
                                 << " marked for deletion as well as point "
-                                << pointI << nl
+                                << pointi << nl
                                 << "    Incrementing maxChain by 1 from "
                                 << totalChain << " to " << totalChain + 1
                                 << endl;
@@ -509,9 +509,9 @@ Foam::shortEdgeFilter2D::filter()
                 }
                 else
                 {
-                    if (newPointNumbers[newPointI] != -1)
+                    if (newPointNumbers[newPointi] != -1)
                     {
-                        newPointNumbers[pointI] = newPointNumbers[newPointI];
+                        newPointNumbers[pointi] = newPointNumbers[newPointi];
                     }
                 }
             }
@@ -549,12 +549,12 @@ Foam::shortEdgeFilter2D::filter()
         patchSizes_
     );
 
-    forAll(newPointNumbers, pointI)
+    forAll(newPointNumbers, pointi)
     {
-        if (newPointNumbers[pointI] == -1)
+        if (newPointNumbers[pointi] == -1)
         {
             WarningInFunction
-                << pointI << " will be deleted and " << newPointNumbers[pointI]
+                << pointi << " will be deleted and " << newPointNumbers[pointi]
                 << ", so it will not be replaced. "
                 << "This will cause edges to be deleted." << endl;
         }
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 72dca889f6..fd63da0cdb 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -339,12 +339,12 @@ void syncPoints
                 const labelList& meshPts = procPatch.meshPoints();
                 const labelList& nbrPts = procPatch.neighbPoints();
 
-                forAll(nbrPts, pointI)
+                forAll(nbrPts, pointi)
                 {
-                    label nbrPointI = nbrPts[pointI];
-                    if (nbrPointI >= 0 && nbrPointI < patchInfo.size())
+                    label nbrPointi = nbrPts[pointi];
+                    if (nbrPointi >= 0 && nbrPointi < patchInfo.size())
                     {
-                        patchInfo[nbrPointI] = points[meshPts[pointI]];
+                        patchInfo[nbrPointi] = points[meshPts[pointi]];
                     }
                 }
 
@@ -397,10 +397,10 @@ void syncPoints
 
                 const labelList& meshPts = procPatch.meshPoints();
 
-                forAll(meshPts, pointI)
+                forAll(meshPts, pointi)
                 {
-                    label meshPointI = meshPts[pointI];
-                    points[meshPointI] = nbrPatchInfo[pointI];
+                    label meshPointi = meshPts[pointi];
+                    points[meshPointi] = nbrPatchInfo[pointi];
                 }
             }
         }
@@ -478,9 +478,9 @@ void syncPoints
 
         forAll(pd.sharedPointLabels(), i)
         {
-            label meshPointI = pd.sharedPointLabels()[i];
+            label meshPointi = pd.sharedPointLabels()[i];
             // Fill my entries in the shared points
-            sharedPts[pd.sharedPointAddr()[i]] = points[meshPointI];
+            sharedPts[pd.sharedPointAddr()[i]] = points[meshPointi];
         }
 
         // Combine on master.
@@ -491,8 +491,8 @@ void syncPoints
         // my local information.
         forAll(pd.sharedPointLabels(), i)
         {
-            label meshPointI = pd.sharedPointLabels()[i];
-            points[meshPointI] = sharedPts[pd.sharedPointAddr()[i]];
+            label meshPointi = pd.sharedPointLabels()[i];
+            points[meshPointi] = sharedPts[pd.sharedPointAddr()[i]];
         }
     }
 }
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 6265e135db..5eb83795ee 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -76,15 +76,15 @@ int main(int argc, char *argv[])
     scalar minCmptVal = bb.min()[planeNormalCmpt];
     scalar maxCmptVal = bb.max()[planeNormalCmpt];
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        if (points[pointI][planeNormalCmpt] < midCmptVal)
+        if (points[pointi][planeNormalCmpt] < midCmptVal)
         {
-            points[pointI][planeNormalCmpt] = minCmptVal;
+            points[pointi][planeNormalCmpt] = minCmptVal;
         }
         else
         {
-            points[pointI][planeNormalCmpt] = maxCmptVal;
+            points[pointi][planeNormalCmpt] = maxCmptVal;
         }
     }
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index 5ac528fe0f..563979e14a 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -207,10 +207,10 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
         pointZoneIndices[zoneI] = zoneIndex(pointZoneNames_, pz[zoneI].name());
     }
 
-    forAll(p, pointI)
+    forAll(p, pointi)
     {
         // Grab zone ID.  If a point is not in a zone, it will return -1
-        zoneID = pz.whichZone(pointI);
+        zoneID = pz.whichZone(pointi);
 
         if (zoneID >= 0)
         {
@@ -218,15 +218,15 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
             zoneID = pointZoneIndices[zoneID];
         }
 
-        renumberPoints[pointI] =
+        renumberPoints[pointi] =
             meshMod_.setAction
             (
                 polyAddPoint
                 (
-                    p[pointI],            // Point to add
+                    p[pointi],            // Point to add
                     -1,                   // Master point (straight addition)
                     zoneID,               // Zone for point
-                    pointI < m.nPoints()  // Is in cell?
+                    pointi < m.nPoints()  // Is in cell?
                 )
             );
     }
@@ -309,9 +309,9 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
 
         face newFace(curFace.size());
 
-        forAll(curFace, pointI)
+        forAll(curFace, pointi)
         {
-            newFace[pointI] = renumberPoints[curFace[pointI]];
+            newFace[pointi] = renumberPoints[curFace[pointi]];
         }
 
         if (debug)
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index e94d12b9ac..33fffd8515 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -369,16 +369,16 @@ int main(int argc, char *argv[])
 
         pointSet dupPoints(mesh, "duplicatedPoints", 100);
 
-        forAll(pointMap, pointI)
+        forAll(pointMap, pointi)
         {
-            label oldPointI = pointMap[pointI];
+            label oldPointi = pointMap[pointi];
 
-            nDupPerPoint[oldPointI]++;
+            nDupPerPoint[oldPointi]++;
 
-            if (nDupPerPoint[oldPointI] > 1)
+            if (nDupPerPoint[oldPointi] > 1)
             {
-                dupPoints.insert(map().reversePointMap()[oldPointI]);
-                dupPoints.insert(pointI);
+                dupPoints.insert(map().reversePointMap()[oldPointi]);
+                dupPoints.insert(pointi);
             }
         }
 
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index f5a5ba0d74..cfe65a5589 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -67,18 +67,18 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     labelList mirrorPointLookup(oldPoints.size(), -1);
 
     // Grab the old points
-    forAll(oldPoints, pointI)
+    forAll(oldPoints, pointi)
     {
-        newPoints[nNewPoints] = oldPoints[pointI];
+        newPoints[nNewPoints] = oldPoints[pointi];
         nNewPoints++;
     }
 
-    forAll(oldPoints, pointI)
+    forAll(oldPoints, pointi)
     {
         scalar alpha =
             mirrorPlane.normalIntersect
             (
-                oldPoints[pointI],
+                oldPoints[pointi],
                 mirrorPlane.normal()
             );
 
@@ -87,10 +87,10 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
         {
             // The point gets mirrored
             newPoints[nNewPoints] =
-                oldPoints[pointI] + 2.0*alpha*mirrorPlane.normal();
+                oldPoints[pointi] + 2.0*alpha*mirrorPlane.normal();
 
             // remember the point correspondence
-            mirrorPointLookup[pointI] = nNewPoints;
+            mirrorPointLookup[pointi] = nNewPoints;
             nNewPoints++;
         }
         else
@@ -98,9 +98,9 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
             // The point is on the plane and does not get mirrored
             // Adjust plane location
             newPoints[nNewPoints] =
-                oldPoints[pointI] + alpha*mirrorPlane.normal();
+                oldPoints[pointi] + alpha*mirrorPlane.normal();
 
-            mirrorPointLookup[pointI] = pointI;
+            mirrorPointLookup[pointi] = pointi;
         }
     }
 
@@ -179,9 +179,9 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
             const face& origFace = curPatch[facei];
 
             face mirrorFace(origFace.size());
-            forAll(mirrorFace, pointI)
+            forAll(mirrorFace, pointi)
             {
-                mirrorFace[pointI] = mirrorPointLookup[origFace[pointI]];
+                mirrorFace[pointi] = mirrorPointLookup[origFace[pointi]];
             }
 
             if (origFace == mirrorFace)
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index 9104b092c1..01c5f5b3f1 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -94,10 +94,10 @@ void Foam::meshDualiser::dumpPolyTopoChange
 
     const DynamicList<point>& points = meshMod.points();
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        meshTools::writeOBJ(str1, points[pointI]);
-        meshTools::writeOBJ(str2, points[pointI]);
+        meshTools::writeOBJ(str1, points[pointi]);
+        meshTools::writeOBJ(str2, points[pointi]);
     }
 
     const DynamicList<face>& faces = meshMod.faces();
@@ -126,10 +126,10 @@ void Foam::meshDualiser::dumpPolyTopoChange
 Foam::label Foam::meshDualiser::findDualCell
 (
     const label celli,
-    const label pointI
+    const label pointi
 ) const
 {
-    const labelList& dualCells = pointToDualCells_[pointI];
+    const labelList& dualCells = pointToDualCells_[pointi];
 
     if (dualCells.size() == 1)
     {
@@ -137,7 +137,7 @@ Foam::label Foam::meshDualiser::findDualCell
     }
     else
     {
-        label index = findIndex(mesh_.pointCells()[pointI], celli);
+        label index = findIndex(mesh_.pointCells()[pointi], celli);
 
         return dualCells[index];
     }
@@ -147,11 +147,11 @@ Foam::label Foam::meshDualiser::findDualCell
 void Foam::meshDualiser::generateDualBoundaryEdges
 (
     const PackedBoolList& isBoundaryEdge,
-    const label pointI,
+    const label pointi,
     polyTopoChange& meshMod
 )
 {
-    const labelList& pEdges = mesh_.pointEdges()[pointI];
+    const labelList& pEdges = mesh_.pointEdges()[pointi];
 
     forAll(pEdges, pEdgeI)
     {
@@ -164,7 +164,7 @@ void Foam::meshDualiser::generateDualBoundaryEdges
             edgeToDualPoint_[edgeI] = meshMod.addPoint
             (
                 e.centre(mesh_.points()),
-                pointI, // masterPoint
+                pointi, // masterPoint
                 -1,     // zoneID
                 true    // inCell
             );
@@ -178,7 +178,7 @@ void Foam::meshDualiser::generateDualBoundaryEdges
 bool Foam::meshDualiser::sameDualCell
 (
     const label facei,
-    const label pointI
+    const label pointi
 ) const
 {
     if (!mesh_.isInternalFace(facei))
@@ -191,13 +191,13 @@ bool Foam::meshDualiser::sameDualCell
     label own = mesh_.faceOwner()[facei];
     label nei = mesh_.faceNeighbour()[facei];
 
-    return findDualCell(own, pointI) == findDualCell(nei, pointI);
+    return findDualCell(own, pointi) == findDualCell(nei, pointi);
 }
 
 
 Foam::label Foam::meshDualiser::addInternalFace
 (
-    const label masterPointI,
+    const label masterPointi,
     const label masterEdgeI,
     const label masterFacei,
 
@@ -261,7 +261,7 @@ Foam::label Foam::meshDualiser::addInternalFace
             newFace,
             dualCell0,      // own
             dualCell1,      // nei
-            masterPointI,   // masterPointID
+            masterPointi,   // masterPointID
             masterEdgeI,    // masterEdgeID
             masterFacei,    // masterFaceID
             false,          // flipFaceFlux
@@ -288,7 +288,7 @@ Foam::label Foam::meshDualiser::addInternalFace
             newFace,
             dualCell1,      // own
             dualCell0,      // nei
-            masterPointI,   // masterPointID
+            masterPointi,   // masterPointID
             masterEdgeI,    // masterEdgeID
             masterFacei,    // masterFaceID
             false,          // flipFaceFlux
@@ -314,7 +314,7 @@ Foam::label Foam::meshDualiser::addInternalFace
 
 Foam::label Foam::meshDualiser::addBoundaryFace
 (
-    const label masterPointI,
+    const label masterPointi,
     const label masterEdgeI,
     const label masterFacei,
 
@@ -345,7 +345,7 @@ Foam::label Foam::meshDualiser::addBoundaryFace
         newFace,
         dualCelli,      // own
         -1,             // nei
-        masterPointI,   // masterPointID
+        masterPointi,   // masterPointID
         masterEdgeI,    // masterEdgeID
         masterFacei,    // masterFaceID
         false,          // flipFaceFlux
@@ -473,7 +473,7 @@ void Foam::meshDualiser::createFacesAroundEdge
             // Close current face.
             addInternalFace
             (
-                -1,         // masterPointI
+                -1,         // masterPointi
                 edgeI,      // masterEdgeI
                 -1,         // masterFacei
                 edgeOrder,
@@ -525,7 +525,7 @@ void Foam::meshDualiser::createFacesAroundEdge
     verts.shrink();
     addInternalFace
     (
-        -1,         // masterPointI
+        -1,         // masterPointi
         edgeI,      // masterEdgeI
         -1,         // masterFacei
         edgeOrder,
@@ -619,7 +619,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
             verts.shrink();
             addInternalFace
             (
-                -1,         // masterPointI
+                -1,         // masterPointi
                 -1,         // masterEdgeI
                 facei,      // masterFacei
                 true,       // edgeOrder,
@@ -641,7 +641,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
 void Foam::meshDualiser::createFacesAroundBoundaryPoint
 (
     const label patchi,
-    const label patchPointI,
+    const label patchPointi,
     const label startFacei,
     polyTopoChange& meshMod,
     boolList& donePFaces            // pFaces visited
@@ -649,12 +649,12 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
 {
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
     const polyPatch& pp = patches[patchi];
-    const labelList& pFaces = pp.pointFaces()[patchPointI];
+    const labelList& pFaces = pp.pointFaces()[patchPointi];
     const labelList& own = mesh_.faceOwner();
 
-    label pointI = pp.meshPoints()[patchPointI];
+    label pointi = pp.meshPoints()[patchPointi];
 
-    if (pointToDualPoint_[pointI] == -1)
+    if (pointToDualPoint_[pointi] == -1)
     {
         // Not a feature point. Loop over all connected
         // pointFaces.
@@ -678,11 +678,11 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
             // Insert face centre
             verts.append(faceToDualPoint_[facei]);
 
-            label dualCelli = findDualCell(own[facei], pointI);
+            label dualCelli = findDualCell(own[facei], pointi);
 
-            // Get the edge before the patchPointI
+            // Get the edge before the patchPointi
             const face& f = mesh_.faces()[facei];
-            label fp = findIndex(f, pointI);
+            label fp = findIndex(f, pointi);
             label prevFp = f.rcIndex(fp);
             label edgeI = mesh_.faceEdges()[facei][prevFp];
 
@@ -721,19 +721,19 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
             }
 
             // Check if different cell.
-            if (dualCelli != findDualCell(own[facei], pointI))
+            if (dualCelli != findDualCell(own[facei], pointi))
             {
                 FatalErrorInFunction
                     << "Different dual cells but no feature edge"
-                    << " inbetween point:" << pointI
-                    << " coord:" << mesh_.points()[pointI]
+                    << " inbetween point:" << pointi
+                    << " coord:" << mesh_.points()[pointi]
                     << abort(FatalError);
             }
         }
 
         verts.shrink();
 
-        label dualCelli = findDualCell(own[facei], pointI);
+        label dualCelli = findDualCell(own[facei], pointi);
 
         //Bit dodgy: create dualface from the last face (instead of from
         // the central point). This will also use the original faceZone to
@@ -741,8 +741,8 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
 
         addBoundaryFace
         (
-            //pointI,     // masterPointI
-            -1,         // masterPointI
+            //pointi,     // masterPointi
+            -1,         // masterPointi
             -1,         // masterEdgeI
             facei,      // masterFacei
             dualCelli,
@@ -759,11 +759,11 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
         DynamicList<label> verts(mesh_.faces()[facei].size());
 
         // Starting point.
-        verts.append(pointToDualPoint_[pointI]);
+        verts.append(pointToDualPoint_[pointi]);
 
-        // Find edge between pointI and next point on face.
+        // Find edge between pointi and next point on face.
         const labelList& fEdges = mesh_.faceEdges()[facei];
-        label nextEdgeI = fEdges[findIndex(mesh_.faces()[facei], pointI)];
+        label nextEdgeI = fEdges[findIndex(mesh_.faces()[facei], pointi)];
         if (edgeToDualPoint_[nextEdgeI] != -1)
         {
             verts.append(edgeToDualPoint_[nextEdgeI]);
@@ -783,30 +783,30 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
             // Face centre
             verts.append(faceToDualPoint_[facei]);
 
-            // Find edge before pointI on facei
+            // Find edge before pointi on facei
             const labelList& fEdges = mesh_.faceEdges()[facei];
             const face& f = mesh_.faces()[facei];
-            label prevFp = f.rcIndex(findIndex(f, pointI));
+            label prevFp = f.rcIndex(findIndex(f, pointi));
             label edgeI = fEdges[prevFp];
 
             if (edgeToDualPoint_[edgeI] != -1)
             {
                 // Feature edge. Close any face so far. Note: uses face to
-                // create dualFace from. Could use pointI instead.
+                // create dualFace from. Could use pointi instead.
                 verts.append(edgeToDualPoint_[edgeI]);
                 addBoundaryFace
                 (
-                    -1,     // masterPointI
+                    -1,     // masterPointi
                     -1,     // masterEdgeI
                     facei,  // masterFacei
-                    findDualCell(own[facei], pointI),
+                    findDualCell(own[facei], pointi),
                     patchi,
                     verts.shrink(),
                     meshMod
                 );
                 verts.clear();
 
-                verts.append(pointToDualPoint_[pointI]);
+                verts.append(pointToDualPoint_[pointi]);
                 verts.append(edgeToDualPoint_[edgeI]);
             }
 
@@ -838,13 +838,13 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
 
         if (verts.size() > 2)
         {
-            // Note: face created from face, not from pointI
+            // Note: face created from face, not from pointi
             addBoundaryFace
             (
-                -1,             // masterPointI
+                -1,             // masterPointi
                 -1,             // masterEdgeI
                 startFacei,     // masterFacei
-                findDualCell(own[facei], pointI),
+                findDualCell(own[facei], pointi),
                 patchi,
                 verts.shrink(),
                 meshMod
@@ -1007,7 +1007,7 @@ void Foam::meshDualiser::setRefinement
     // Dual cells (from points)
     // ~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // pointToDualCells_[pointI]
+    // pointToDualCells_[pointi]
     // - single entry : all cells surrounding point all become the same
     //                  cell.
     // - multiple entries: in order of pointCells.
@@ -1016,21 +1016,21 @@ void Foam::meshDualiser::setRefinement
     // feature points that become single cell
     forAll(singleCellFeaturePoints, i)
     {
-        label pointI = singleCellFeaturePoints[i];
+        label pointi = singleCellFeaturePoints[i];
 
-        pointToDualPoint_[pointI] = meshMod.addPoint
+        pointToDualPoint_[pointi] = meshMod.addPoint
         (
-            mesh_.points()[pointI],
-            pointI,                                 // masterPoint
-            mesh_.pointZones().whichZone(pointI),   // zoneID
+            mesh_.points()[pointi],
+            pointi,                                 // masterPoint
+            mesh_.pointZones().whichZone(pointi),   // zoneID
             true                                    // inCell
         );
 
         // Generate single cell
-        pointToDualCells_[pointI].setSize(1);
-        pointToDualCells_[pointI][0] = meshMod.addCell
+        pointToDualCells_[pointi].setSize(1);
+        pointToDualCells_[pointi][0] = meshMod.addCell
         (
-            pointI, //masterPointID,
+            pointi, //masterPointID,
             -1,     //masterEdgeID,
             -1,     //masterFaceID,
             -1,     //masterCellID,
@@ -1038,43 +1038,43 @@ void Foam::meshDualiser::setRefinement
         );
         if (dualCcStr.valid())
         {
-            meshTools::writeOBJ(dualCcStr(), mesh_.points()[pointI]);
+            meshTools::writeOBJ(dualCcStr(), mesh_.points()[pointi]);
         }
     }
 
     // feature points that become multiple cells
     forAll(multiCellFeaturePoints, i)
     {
-        label pointI = multiCellFeaturePoints[i];
+        label pointi = multiCellFeaturePoints[i];
 
-        if (pointToDualCells_[pointI].size() > 0)
+        if (pointToDualCells_[pointi].size() > 0)
         {
             FatalErrorInFunction
-                << "Point " << pointI << " at:" << mesh_.points()[pointI]
+                << "Point " << pointi << " at:" << mesh_.points()[pointi]
                 << " is both in singleCellFeaturePoints"
                 << " and multiCellFeaturePoints."
                 << abort(FatalError);
         }
 
-        pointToDualPoint_[pointI] = meshMod.addPoint
+        pointToDualPoint_[pointi] = meshMod.addPoint
         (
-            mesh_.points()[pointI],
-            pointI,                                 // masterPoint
-            mesh_.pointZones().whichZone(pointI),   // zoneID
+            mesh_.points()[pointi],
+            pointi,                                 // masterPoint
+            mesh_.pointZones().whichZone(pointi),   // zoneID
             true                                    // inCell
         );
 
         // Create dualcell for every cell connected to dual point
 
-        const labelList& pCells = mesh_.pointCells()[pointI];
+        const labelList& pCells = mesh_.pointCells()[pointi];
 
-        pointToDualCells_[pointI].setSize(pCells.size());
+        pointToDualCells_[pointi].setSize(pCells.size());
 
         forAll(pCells, pCelli)
         {
-            pointToDualCells_[pointI][pCelli] = meshMod.addCell
+            pointToDualCells_[pointi][pCelli] = meshMod.addCell
             (
-                pointI,                                     //masterPointID
+                pointi,                                     //masterPointID
                 -1,                                         //masterEdgeID
                 -1,                                         //masterFaceID
                 -1,                                         //masterCellID
@@ -1085,20 +1085,20 @@ void Foam::meshDualiser::setRefinement
                 meshTools::writeOBJ
                 (
                     dualCcStr(),
-                    0.5*(mesh_.points()[pointI]+cellCentres[pCells[pCelli]])
+                    0.5*(mesh_.points()[pointi]+cellCentres[pCells[pCelli]])
                 );
             }
         }
     }
     // Normal points
-    forAll(mesh_.points(), pointI)
+    forAll(mesh_.points(), pointi)
     {
-        if (pointToDualCells_[pointI].empty())
+        if (pointToDualCells_[pointi].empty())
         {
-            pointToDualCells_[pointI].setSize(1);
-            pointToDualCells_[pointI][0] = meshMod.addCell
+            pointToDualCells_[pointi].setSize(1);
+            pointToDualCells_[pointi][0] = meshMod.addCell
             (
-                pointI, //masterPointID,
+                pointi, //masterPointID,
                 -1,     //masterEdgeID,
                 -1,     //masterFaceID,
                 -1,     //masterCellID,
@@ -1107,7 +1107,7 @@ void Foam::meshDualiser::setRefinement
 
             if (dualCcStr.valid())
             {
-                meshTools::writeOBJ(dualCcStr(), mesh_.points()[pointI]);
+                meshTools::writeOBJ(dualCcStr(), mesh_.points()[pointi]);
             }
         }
     }
@@ -1396,9 +1396,9 @@ void Foam::meshDualiser::setRefinement
 
         const labelListList& pointFaces = pp.pointFaces();
 
-        forAll(pointFaces, patchPointI)
+        forAll(pointFaces, patchPointi)
         {
-            const labelList& pFaces = pointFaces[patchPointI];
+            const labelList& pFaces = pointFaces[patchPointi];
 
             boolList donePFaces(pFaces.size(), false);
 
@@ -1409,8 +1409,8 @@ void Foam::meshDualiser::setRefinement
                     // Starting face
                     label startFacei = pp.start()+pFaces[i];
 
-                    //Pout<< "Walking around point:" << pointI
-                    //    << " coord:" << mesh_.points()[pointI]
+                    //Pout<< "Walking around point:" << pointi
+                    //    << " coord:" << mesh_.points()[pointi]
                     //    << " on patch:" << patchi
                     //    << " startFace:" << startFacei
                     //    << " at:" << mesh_.faceCentres()[startFacei]
@@ -1419,7 +1419,7 @@ void Foam::meshDualiser::setRefinement
                     createFacesAroundBoundaryPoint
                     (
                         patchi,
-                        patchPointI,
+                        patchPointi,
                         startFacei,
                         meshMod,
                         donePFaces            // pFaces visited
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
index 85946671ea..f6d93de2c8 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
@@ -94,14 +94,14 @@ class meshDualiser
         static void dumpPolyTopoChange(const polyTopoChange&, const fileName&);
 
         //- Find dual cell given point and cell
-        label findDualCell(const label celli, const label pointI) const;
+        label findDualCell(const label celli, const label pointi) const;
 
         //- Helper function to generate dualpoints on all boundary edges
         //  emanating from (boundary & feature) point
         void generateDualBoundaryEdges
         (
             const PackedBoolList&,
-            const label pointI,
+            const label pointi,
             polyTopoChange&
         );
 
@@ -109,13 +109,13 @@ class meshDualiser
         bool sameDualCell
         (
             const label facei,
-            const label pointI
+            const label pointi
         ) const;
 
         //- Add internal face
         label addInternalFace
         (
-            const label masterPointI,
+            const label masterPointi,
             const label masterEdgeI,
             const label masterFacei,
 
@@ -129,12 +129,12 @@ class meshDualiser
         //- Add boundary face
         label addBoundaryFace
         (
-            const label masterPointI,
+            const label masterPointi,
             const label masterEdgeI,
             const label masterFacei,
 
             const label dualCelli,
-            const label patchI,
+            const label patchi,
             const DynamicList<label>& verts,
             polyTopoChange& meshMod
         ) const;
@@ -158,11 +158,11 @@ class meshDualiser
             polyTopoChange&
         ) const;
 
-        //- Creates boundary faces walking around point on patchI.
+        //- Creates boundary faces walking around point on patchi.
         void createFacesAroundBoundaryPoint
         (
-            const label patchI,
-            const label patchPointI,
+            const label patchi,
+            const label patchPointi,
             const label startFacei,
             polyTopoChange&,
             boolList& donePFaces            // pFaces visited
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
index 62ac9fda1d..23456aaa0b 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
@@ -69,13 +69,13 @@ Foam::label Foam::regionSide::otherEdge
     const primitiveMesh& mesh,
     const label facei,
     const label edgeI,
-    const label pointI
+    const label pointi
 )
 {
     const edge& e = mesh.edges()[edgeI];
 
     // Get other point on edge.
-    label freePointI = e.otherVertex(pointI);
+    label freePointi = e.otherVertex(pointi);
 
     const labelList& fEdges = mesh.faceEdges()[facei];
 
@@ -87,12 +87,12 @@ Foam::label Foam::regionSide::otherEdge
         if
         (
             (
-                otherE.start() == pointI
-             && otherE.end() != freePointI
+                otherE.start() == pointi
+             && otherE.end() != freePointi
             )
          || (
-                otherE.end() == pointI
-             && otherE.start() != freePointI
+                otherE.end() == pointi
+             && otherE.start() != freePointi
             )
         )
         {
@@ -103,7 +103,7 @@ Foam::label Foam::regionSide::otherEdge
 
     FatalErrorInFunction
         << "Cannot find other edge on face " << facei << " that uses point "
-        << pointI << " but not point " << freePointI << endl
+        << pointi << " but not point " << freePointi << endl
         << "Edges on face:" << fEdges
         << " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)()
         << " Vertices on face:"
@@ -214,7 +214,7 @@ void Foam::regionSide::visitConnectedFaces
 }
 
 
-// From edge on face connected to point on region (regionPointI) cross
+// From edge on face connected to point on region (regionPointi) cross
 // to all other edges using this point by walking across faces
 // Does not cross regionEdges so stays on one side
 // of region
@@ -222,7 +222,7 @@ void Foam::regionSide::walkPointConnectedFaces
 (
     const primitiveMesh& mesh,
     const labelHashSet& regionEdges,
-    const label regionPointI,
+    const label regionPointi,
     const label startFacei,
     const label startEdgeI,
     labelHashSet& visitedEdges
@@ -233,15 +233,15 @@ void Foam::regionSide::walkPointConnectedFaces
 
     if (debug)
     {
-        Info<< "walkPointConnectedFaces : regionPointI:" << regionPointI
+        Info<< "walkPointConnectedFaces : regionPointi:" << regionPointi
             << " facei:" << startFacei
             << " edgeI:" << startEdgeI << " verts:"
             << mesh.edges()[startEdgeI]
             << endl;
     }
 
-    // Cross facei i.e. get edge not startEdgeI which uses regionPointI
-    label edgeI = otherEdge(mesh, startFacei, startEdgeI, regionPointI);
+    // Cross facei i.e. get edge not startEdgeI which uses regionPointi
+    label edgeI = otherEdge(mesh, startFacei, startEdgeI, regionPointi);
 
     if (!regionEdges.found(edgeI))
     {
@@ -271,7 +271,7 @@ void Foam::regionSide::walkPointConnectedFaces
                 (
                     mesh,
                     regionEdges,
-                    regionPointI,
+                    regionPointi,
                     facei,
                     edgeI,
                     visitedEdges
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.H b/applications/utilities/mesh/manipulation/splitMesh/regionSide.H
index 376db67951..b2be88a0ba 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.H
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.H
@@ -79,7 +79,7 @@ class regionSide
             const primitiveMesh& mesh,
             const label facei,
             const label edgeI,
-            const label pointI
+            const label pointi
         );
 
         //- From facei, side celli, cross to other faces/cells by
@@ -94,14 +94,14 @@ class regionSide
             labelHashSet& visitedFace
         );
 
-        //- From edge on face connected to point on region (regionPointI) cross
+        //- From edge on face connected to point on region (regionPointi) cross
         //  to all other edges using this point by walking across faces
         //  Does not cross regionEdges so stays on one side of region
         void walkPointConnectedFaces
         (
             const primitiveMesh& mesh,
             const labelHashSet& regionEdges,
-            const label regionPointI,
+            const label regionPointi,
             const label startFacei,
             const label startEdgeI,
             labelHashSet& visitedEdges
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index adebc93d38..a5964037e7 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -241,15 +241,15 @@ int main(int argc, char *argv[])
     // Create mesh subsetting engine
     fvMeshSubset subsetter(mesh);
 
-    label patchI = -1;
+    label patchi = -1;
 
     if (args.optionFound("patch"))
     {
         const word patchName = args["patch"];
 
-        patchI = mesh.boundaryMesh().findPatchID(patchName);
+        patchi = mesh.boundaryMesh().findPatchID(patchName);
 
-        if (patchI == -1)
+        if (patchi == -1)
         {
             FatalErrorInFunction
                 << nl << "Valid patches are " << mesh.boundaryMesh().names()
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
 
     cellSet currentSet(mesh, setName);
 
-    subsetter.setLargeCellSubset(currentSet, patchI, true);
+    subsetter.setLargeCellSubset(currentSet, patchi, true);
 
     IOobjectList objects(mesh, runTime.timeName());
 
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H
index f47d6e8dda..cf95e7db0e 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H
@@ -46,14 +46,14 @@ namespace Foam
     void outputFieldList
     (
         const PtrList<GeoField>& fieldList,
-        const label patchI
+        const label patchi
     );
 
     template<class GeoField>
     void collectFieldList
     (
         const PtrList<GeoField>& fieldList,
-        const label patchI,
+        const label patchi,
         HashTable<word>& fieldToType
     );
 } // End namespace Foam
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 1c57cd3274..fb3a22b74c 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -250,24 +250,24 @@ autoPtr<mapPolyMesh> mergeSharedPoints
 
         forAll(constructMap, i)
         {
-            label oldPointI = constructMap[i];
+            label oldPointi = constructMap[i];
 
             // New label of point after changeMesh.
-            label newPointI = map().reversePointMap()[oldPointI];
+            label newPointi = map().reversePointMap()[oldPointi];
 
-            if (newPointI < -1)
+            if (newPointi < -1)
             {
-                constructMap[i] = -newPointI-2;
+                constructMap[i] = -newPointi-2;
             }
-            else if (newPointI >= 0)
+            else if (newPointi >= 0)
             {
-                constructMap[i] = newPointI;
+                constructMap[i] = newPointi;
             }
             else
             {
                 FatalErrorInFunction
-                    << "Problem. oldPointI:" << oldPointI
-                    << " newPointI:" << newPointI << abort(FatalError);
+                    << "Problem. oldPointi:" << oldPointi
+                    << " newPointi:" << newPointi << abort(FatalError);
             }
         }
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index b10b72e006..198c1d319c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -529,9 +529,9 @@ void Foam::ensightMesh::writePrims
 
                 List<int> temp(cellPoints.size());
 
-                forAll(cellPoints, pointI)
+                forAll(cellPoints, pointi)
                 {
-                    temp[pointI] = cellPoints[pointI] + 1;
+                    temp[pointi] = cellPoints[pointi] + 1;
                 }
                 ensightGeometryFile.write(temp);
             }
@@ -548,9 +548,9 @@ void Foam::ensightMesh::writePrims
             {
                 const cellShape& cellPoints = cellShapes[i];
 
-                forAll(cellPoints, pointI)
+                forAll(cellPoints, pointi)
                 {
-                    temp[n] = cellPoints[pointI] + 1;
+                    temp[n] = cellPoints[pointi] + 1;
                     n++;
                 }
             }
@@ -639,15 +639,15 @@ void Foam::ensightMesh::writePolysPoints
             // EnSight prefers to have all the faces of an nfaced cell
             // oriented in the same way.
             List<int> temp(np);
-            forAll(f, pointI)
+            forAll(f, pointi)
             {
                 if (reverseOrder)
                 {
-                    temp[np-1-pointI] = f[pointI] + 1;
+                    temp[np-1-pointi] = f[pointi] + 1;
                 }
                 else
                 {
-                    temp[pointI] = f[pointI] + 1;
+                    temp[pointi] = f[pointi] + 1;
                 }
             }
             ensightGeometryFile.write(temp);
@@ -833,9 +833,9 @@ void Foam::ensightMesh::writeFacePrims
         const face& patchFace = patchFaces[i];
 
         List<int> temp(patchFace.size());
-        forAll(patchFace, pointI)
+        forAll(patchFace, pointi)
         {
-            temp[pointI] = patchFace[pointI] + 1;
+            temp[pointi] = patchFace[pointi] + 1;
         }
 
         ensightGeometryFile.write(temp);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
index 1bd38ec892..d00bec3557 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
@@ -124,7 +124,7 @@ public:
         (
             const bool nearCellValue,
             const GeometricField<Type, fvPatchField, volMesh>& vfld,
-            const label patchI
+            const label patchi
         ) const;
 
         //- Get mixed field: fvsPatchField for boundary faces and
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
index 19f2097efb..86088e4d25 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
@@ -95,14 +95,14 @@ void ReadAndMapFields
 
         // Map from read field. Set unmapped entries to nullValue.
         fld.setSize(map.size(), nullValue);
-        forAll(map, pointI)
+        forAll(map, pointi)
         {
-            label index = map[pointI];
+            label index = map[pointi];
 
             if (index > 0)
             {
                 label celli = index-1;
-                fld[pointI] = readField[celli];
+                fld[pointi] = readField[celli];
             }
             else if (index < 0)
             {
@@ -115,7 +115,7 @@ void ReadAndMapFields
                     (
                         facei
                     );
-                    fld[pointI] = readField.boundaryField()[patchi][localFacei];
+                    fld[pointi] = readField.boundaryField()[patchi][localFacei];
                 }
                 //else
                 //{
@@ -128,8 +128,8 @@ void ReadAndMapFields
             //else
             //{
             //    WarningInFunction
-            //        << "Point " << pointI << " at "
-            //        << tetDualMesh.points()[pointI]
+            //        << "Point " << pointi << " at "
+            //        << tetDualMesh.points()[pointi]
             //        << " has no dual correspondence." << endl;
             //}
         }
@@ -200,9 +200,9 @@ int main(int argc, char *argv[])
     label nCells = 0;
     label nPatchFaces = 0;
     label nUnmapped = 0;
-    forAll(pointDualAddressing, pointI)
+    forAll(pointDualAddressing, pointi)
     {
-        label index = pointDualAddressing[pointI];
+        label index = pointDualAddressing[pointi];
 
         if (index > 0)
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C
index a9b6418750..f537b10b44 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C
@@ -120,7 +120,7 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
     cellTypes_.setSize(cellShapes.size() + nAddCells);
 
     // Set counters for additional points and additional cells
-    label addPointI = 0, addCelli = 0;
+    label addPointi = 0, addCelli = 0;
 
     forAll(cellShapes, celli)
     {
@@ -191,10 +191,10 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
             // Polyhedral cell. Decompose into tets + pyramids.
 
             // Mapping from additional point to cell
-            addPointCellLabels_[addPointI] = celli;
+            addPointCellLabels_[addPointi] = celli;
 
             // The new vertex from the cell-centre
-            const label newVertexLabel = mesh_.nPoints() + addPointI;
+            const label newVertexLabel = mesh_.nPoints() + addPointi;
 
             // Whether to insert cell in place of original or not.
             bool substituteCell = true;
@@ -305,7 +305,7 @@ Foam::vtkTopo::vtkTopo(const polyMesh& mesh)
                 }
             }
 
-            addPointI++;
+            addPointi++;
         }
         else
         {
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
index 3347be70ca..7e6e843293 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
@@ -158,7 +158,7 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
     vtkmesh->Allocate(mesh.nCells() + nAddCells);
 
     // Set counters for additional points and additional cells
-    label addPointI = 0, addCelli = 0;
+    label addPointi = 0, addCelli = 0;
 
     // Create storage for points - needed for mapping from OpenFOAM to VTK
     // data types - max 'order' = hex = 8 points
@@ -353,10 +353,10 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
             // Polyhedral cell. Decompose into tets + prisms.
 
             // Mapping from additional point to cell
-            addPointCellLabels[addPointI] = celli;
+            addPointCellLabels[addPointi] = celli;
 
             // The new vertex from the cell-centre
-            const label newVertexLabel = mesh.nPoints() + addPointI;
+            const label newVertexLabel = mesh.nPoints() + addPointi;
             vtkInsertNextOpenFOAMPoint(vtkpoints, mesh.C()[celli]);
 
             // Whether to insert cell in place of original or not.
@@ -460,7 +460,7 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
                 }
             }
 
-            addPointI++;
+            addPointi++;
         }
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
index bfa3e1acc9..437c6be9ca 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,9 +54,9 @@ vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
     vtkPoints* vtkpoints = vtkPoints::New();
     vtkpoints->Allocate(pointLabels.size());
 
-    forAll(pointLabels, pointI)
+    forAll(pointLabels, pointi)
     {
-        vtkInsertNextOpenFOAMPoint(vtkpoints, meshPoints[pointLabels[pointI]]);
+        vtkInsertNextOpenFOAMPoint(vtkpoints, meshPoints[pointLabels[pointi]]);
     }
 
     vtkmesh->SetPoints(vtkpoints);
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
index bd4c3de3da..2401acc1cd 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -252,9 +252,9 @@ Foam::vtkPV3blockMesh::~vtkPV3blockMesh()
 
     // Hmm. pointNumberTextActors are not getting removed
     //
-    forAll(pointNumberTextActorsPtrs_, pointI)
+    forAll(pointNumberTextActorsPtrs_, pointi)
     {
-        pointNumberTextActorsPtrs_[pointI]->Delete();
+        pointNumberTextActorsPtrs_[pointi]->Delete();
     }
     pointNumberTextActorsPtrs_.clear();
 
@@ -420,10 +420,10 @@ void Foam::vtkPV3blockMesh::renderPointNumbers
 {
     // always remove old actors first
 
-    forAll(pointNumberTextActorsPtrs_, pointI)
+    forAll(pointNumberTextActorsPtrs_, pointi)
     {
-        renderer->RemoveViewProp(pointNumberTextActorsPtrs_[pointI]);
-        pointNumberTextActorsPtrs_[pointI]->Delete();
+        renderer->RemoveViewProp(pointNumberTextActorsPtrs_[pointi]);
+        pointNumberTextActorsPtrs_[pointi]->Delete();
     }
     pointNumberTextActorsPtrs_.clear();
 
@@ -433,11 +433,11 @@ void Foam::vtkPV3blockMesh::renderPointNumbers
         const scalar scaleFactor = meshPtr_->scaleFactor();
 
         pointNumberTextActorsPtrs_.setSize(cornerPts.size());
-        forAll(cornerPts, pointI)
+        forAll(cornerPts, pointi)
         {
             vtkTextActor* txt = vtkTextActor::New();
 
-            txt->SetInput(Foam::name(pointI).c_str());
+            txt->SetInput(Foam::name(pointi).c_str());
 
             // Set text properties
             vtkTextProperty* tprop = txt->GetTextProperty();
@@ -454,9 +454,9 @@ void Foam::vtkPV3blockMesh::renderPointNumbers
 
             txt->GetPositionCoordinate()->SetValue
             (
-                cornerPts[pointI].x()*scaleFactor,
-                cornerPts[pointI].y()*scaleFactor,
-                cornerPts[pointI].z()*scaleFactor
+                cornerPts[pointi].x()*scaleFactor,
+                cornerPts[pointi].y()*scaleFactor,
+                cornerPts[pointi].z()*scaleFactor
             );
 
             // Add text to each renderer
@@ -464,7 +464,7 @@ void Foam::vtkPV3blockMesh::renderPointNumbers
 
             // Maintain a list of text labels added so that they can be
             // removed later
-            pointNumberTextActorsPtrs_[pointI] = txt;
+            pointNumberTextActorsPtrs_[pointi] = txt;
         }
     }
 }
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
index d34656d3d7..073e24bd8a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshVolume.C
@@ -158,7 +158,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
     vtkmesh->Allocate(mesh.nCells() + nAddCells);
 
     // Set counters for additional points and additional cells
-    label addPointI = 0, addCelli = 0;
+    label addPointi = 0, addCelli = 0;
 
     // Create storage for points - needed for mapping from OpenFOAM to VTK
     // data types - max 'order' = hex = 8 points
@@ -353,10 +353,10 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
             // Polyhedral cell. Decompose into tets + prisms.
 
             // Mapping from additional point to cell
-            addPointCellLabels[addPointI] = celli;
+            addPointCellLabels[addPointi] = celli;
 
             // The new vertex from the cell-centre
-            const label newVertexLabel = mesh.nPoints() + addPointI;
+            const label newVertexLabel = mesh.nPoints() + addPointi;
             vtkInsertNextOpenFOAMPoint(vtkpoints, mesh.C()[celli]);
 
             // Whether to insert cell in place of original or not.
@@ -460,7 +460,7 @@ vtkUnstructuredGrid* Foam::vtkPVFoam::volumeVTKMesh
                 }
             }
 
-            addPointI++;
+            addPointi++;
         }
     }
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
index fbeaf966a0..e60a8aea4a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamMeshZone.C
@@ -54,9 +54,9 @@ vtkPolyData* Foam::vtkPVFoam::pointZoneVTKMesh
     vtkPoints* vtkpoints = vtkPoints::New();
     vtkpoints->Allocate(pointLabels.size());
 
-    forAll(pointLabels, pointI)
+    forAll(pointLabels, pointi)
     {
-        vtkInsertNextOpenFOAMPoint(vtkpoints, meshPoints[pointLabels[pointI]]);
+        vtkInsertNextOpenFOAMPoint(vtkpoints, meshPoints[pointLabels[pointi]]);
     }
 
     vtkmesh->SetPoints(vtkpoints);
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index 8737cc8f1b..4b3608cece 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -252,9 +252,9 @@ Foam::vtkPVblockMesh::~vtkPVblockMesh()
 
     // Hmm. pointNumberTextActors are not getting removed
     //
-    forAll(pointNumberTextActorsPtrs_, pointI)
+    forAll(pointNumberTextActorsPtrs_, pointi)
     {
-        pointNumberTextActorsPtrs_[pointI]->Delete();
+        pointNumberTextActorsPtrs_[pointi]->Delete();
     }
     pointNumberTextActorsPtrs_.clear();
 
@@ -420,10 +420,10 @@ void Foam::vtkPVblockMesh::renderPointNumbers
 {
     // always remove old actors first
 
-    forAll(pointNumberTextActorsPtrs_, pointI)
+    forAll(pointNumberTextActorsPtrs_, pointi)
     {
-        renderer->RemoveViewProp(pointNumberTextActorsPtrs_[pointI]);
-        pointNumberTextActorsPtrs_[pointI]->Delete();
+        renderer->RemoveViewProp(pointNumberTextActorsPtrs_[pointi]);
+        pointNumberTextActorsPtrs_[pointi]->Delete();
     }
     pointNumberTextActorsPtrs_.clear();
 
@@ -433,11 +433,11 @@ void Foam::vtkPVblockMesh::renderPointNumbers
         const scalar scaleFactor = meshPtr_->scaleFactor();
 
         pointNumberTextActorsPtrs_.setSize(cornerPts.size());
-        forAll(cornerPts, pointI)
+        forAll(cornerPts, pointi)
         {
             vtkTextActor* txt = vtkTextActor::New();
 
-            txt->SetInput(Foam::name(pointI).c_str());
+            txt->SetInput(Foam::name(pointi).c_str());
 
             // Set text properties
             vtkTextProperty* tprop = txt->GetTextProperty();
@@ -454,9 +454,9 @@ void Foam::vtkPVblockMesh::renderPointNumbers
 
             txt->GetPositionCoordinate()->SetValue
             (
-                cornerPts[pointI].x()*scaleFactor,
-                cornerPts[pointI].y()*scaleFactor,
-                cornerPts[pointI].z()*scaleFactor
+                cornerPts[pointi].x()*scaleFactor,
+                cornerPts[pointi].y()*scaleFactor,
+                cornerPts[pointi].z()*scaleFactor
             );
 
             // Add text to each renderer
@@ -464,7 +464,7 @@ void Foam::vtkPVblockMesh::renderPointNumbers
 
             // Maintain a list of text labels added so that they can be
             // removed later
-            pointNumberTextActorsPtrs_[pointI] = txt;
+            pointNumberTextActorsPtrs_[pointi] = txt;
         }
     }
 }
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
index 62b2cdf1c3..bff8a9856a 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
@@ -120,9 +120,9 @@ int main(int argc, char *argv[])
             );
 
             labelList visitedPoint(mesh.nPoints());
-            forAll(visitedPoint, pointI)
+            forAll(visitedPoint, pointi)
             {
-                visitedPoint[pointI] = 0;
+                visitedPoint[pointi] = 0;
             }
             label nVisited = 0;
             label nVisitedOld = 0;
@@ -166,9 +166,9 @@ int main(int argc, char *argv[])
                                 // Zero flux face found
                                 found = true;
 
-                                forAll(zeroPoints, pointI)
+                                forAll(zeroPoints, pointi)
                                 {
-                                    if (visitedPoint[zeroPoints[pointI]] == 1)
+                                    if (visitedPoint[zeroPoints[pointi]] == 1)
                                     {
                                         found = false;
                                         break;
@@ -180,10 +180,10 @@ int main(int argc, char *argv[])
                                     Info<< "Zero face: patch: " << patchi
                                         << "    face: " << facei << endl;
 
-                                    forAll(zeroPoints, pointI)
+                                    forAll(zeroPoints, pointi)
                                     {
-                                        streamFunction[zeroPoints[pointI]] = 0;
-                                        visitedPoint[zeroPoints[pointI]] = 1;
+                                        streamFunction[zeroPoints[pointi]] = 0;
+                                        visitedPoint[zeroPoints[pointi]] = 1;
                                         nVisited++;
                                     }
 
@@ -210,9 +210,9 @@ int main(int argc, char *argv[])
 
                         bool found = true;
 
-                        forAll(zeroPoints, pointI)
+                        forAll(zeroPoints, pointi)
                         {
-                            if (visitedPoint[zeroPoints[pointI]] == 1)
+                            if (visitedPoint[zeroPoints[pointi]] == 1)
                             {
                                 found = false;
                                 break;
@@ -221,10 +221,10 @@ int main(int argc, char *argv[])
 
                         if (found)
                         {
-                            forAll(zeroPoints, pointI)
+                            forAll(zeroPoints, pointi)
                             {
-                                streamFunction[zeroPoints[pointI]] = 0.0;
-                                visitedPoint[zeroPoints[pointI]] = 1;
+                                streamFunction[zeroPoints[pointi]] = 0.0;
+                                visitedPoint[zeroPoints[pointi]] = 1;
                                 nVisited++;
                             }
 
@@ -261,16 +261,16 @@ int main(int argc, char *argv[])
                          scalar currentBStream = 0.0;
                          vector currentBStreamPoint(0, 0, 0);
 
-                         forAll(curBPoints, pointI)
+                         forAll(curBPoints, pointi)
                          {
                              // Check if the point has been visited
-                             if (visitedPoint[curBPoints[pointI]] == 1)
+                             if (visitedPoint[curBPoints[pointi]] == 1)
                              {
                                  // The point has been visited
                                  currentBStream =
-                                     streamFunction[curBPoints[pointI]];
+                                     streamFunction[curBPoints[pointi]];
                                  currentBStreamPoint =
-                                     points[curBPoints[pointI]];
+                                     points[curBPoints[pointi]];
 
                                  bPointFound = true;
 
@@ -281,10 +281,10 @@ int main(int argc, char *argv[])
                          if (bPointFound)
                          {
                              // Sort out other points on the face
-                             forAll(curBPoints, pointI)
+                             forAll(curBPoints, pointi)
                              {
                                  // Check if the point has been visited
-                                 if (visitedPoint[curBPoints[pointI]] == 0)
+                                 if (visitedPoint[curBPoints[pointi]] == 0)
                                  {
                                      label patchNo =
                                          mesh.boundaryMesh().whichPatch(facei);
@@ -306,7 +306,7 @@ int main(int argc, char *argv[])
                                              .whichFace(facei);
 
                                          vector edgeHat =
-                                             points[curBPoints[pointI]]
+                                             points[curBPoints[pointi]]
                                              - currentBStreamPoint;
                                          edgeHat.replace(slabDir, 0);
                                          edgeHat /= mag(edgeHat);
@@ -315,11 +315,11 @@ int main(int argc, char *argv[])
 
                                          if (edgeHat.y() > VSMALL)
                                          {
-                                             visitedPoint[curBPoints[pointI]] =
+                                             visitedPoint[curBPoints[pointi]] =
                                                  1;
                                              nVisited++;
 
-                                             streamFunction[curBPoints[pointI]]
+                                             streamFunction[curBPoints[pointi]]
                                                  =
                                                  currentBStream
                                                + phi.boundaryField()
@@ -328,11 +328,11 @@ int main(int argc, char *argv[])
                                          }
                                          else if (edgeHat.y() < -VSMALL)
                                          {
-                                             visitedPoint[curBPoints[pointI]] =
+                                             visitedPoint[curBPoints[pointi]] =
                                                  1;
                                              nVisited++;
 
-                                             streamFunction[curBPoints[pointI]]
+                                             streamFunction[curBPoints[pointi]]
                                                  =
                                                  currentBStream
                                                - phi.boundaryField()
@@ -344,11 +344,11 @@ int main(int argc, char *argv[])
                                              if (edgeHat.x() > VSMALL)
                                              {
                                                  visitedPoint
-                                                     [curBPoints[pointI]] = 1;
+                                                     [curBPoints[pointi]] = 1;
                                                  nVisited++;
 
                                                  streamFunction
-                                                     [curBPoints[pointI]] =
+                                                     [curBPoints[pointi]] =
                                                      currentBStream
                                                    + phi.boundaryField()
                                                      [patchNo][faceNo]
@@ -357,11 +357,11 @@ int main(int argc, char *argv[])
                                              else if (edgeHat.x() < -VSMALL)
                                              {
                                                  visitedPoint
-                                                     [curBPoints[pointI]] = 1;
+                                                     [curBPoints[pointi]] = 1;
                                                  nVisited++;
 
                                                  streamFunction
-                                                     [curBPoints[pointI]] =
+                                                     [curBPoints[pointi]] =
                                                      currentBStream
                                                    - phi.boundaryField()
                                                      [patchNo][faceNo]
@@ -388,16 +388,16 @@ int main(int argc, char *argv[])
                          scalar currentStream = 0.0;
                          point currentStreamPoint(0, 0, 0);
 
-                         forAll(curPoints, pointI)
+                         forAll(curPoints, pointi)
                          {
                              // Check if the point has been visited
-                             if (visitedPoint[curPoints[pointI]] == 1)
+                             if (visitedPoint[curPoints[pointi]] == 1)
                              {
                                  // The point has been visited
                                  currentStream =
-                                     streamFunction[curPoints[pointI]];
+                                     streamFunction[curPoints[pointi]];
                                  currentStreamPoint =
-                                     points[curPoints[pointI]];
+                                     points[curPoints[pointi]];
                                  pointFound = true;
 
                                  break;
@@ -407,13 +407,13 @@ int main(int argc, char *argv[])
                          if (pointFound)
                          {
                              // Sort out other points on the face
-                             forAll(curPoints, pointI)
+                             forAll(curPoints, pointi)
                              {
                                  // Check if the point has been visited
-                                 if (visitedPoint[curPoints[pointI]] == 0)
+                                 if (visitedPoint[curPoints[pointi]] == 0)
                                  {
                                      vector edgeHat =
-                                         points[curPoints[pointI]]
+                                         points[curPoints[pointi]]
                                        - currentStreamPoint;
 
                                      edgeHat.replace(slabDir, 0);
@@ -423,19 +423,19 @@ int main(int argc, char *argv[])
 
                                      if (edgeHat.y() > VSMALL)
                                      {
-                                         visitedPoint[curPoints[pointI]] = 1;
+                                         visitedPoint[curPoints[pointi]] = 1;
                                          nVisited++;
 
-                                         streamFunction[curPoints[pointI]] =
+                                         streamFunction[curPoints[pointi]] =
                                              currentStream
                                            + phi[facei]*sign(nHat.x());
                                      }
                                      else if (edgeHat.y() < -VSMALL)
                                      {
-                                         visitedPoint[curPoints[pointI]] = 1;
+                                         visitedPoint[curPoints[pointi]] = 1;
                                          nVisited++;
 
-                                         streamFunction[curPoints[pointI]] =
+                                         streamFunction[curPoints[pointi]] =
                                              currentStream
                                            - phi[facei]*sign(nHat.x());
                                      }
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index 9628d48fea..fedb288394 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -133,12 +133,12 @@ int main(int argc, char *argv[])
         Info<< "Additional Points:" << extraPoints.size() << endl;
 
         vectorField pointsAll(points1);
-        label pointI = pointsAll.size();
+        label pointi = pointsAll.size();
         pointsAll.setSize(pointsAll.size() + extraPoints.size());
 
         forAll(extraPoints, i)
         {
-            pointsAll[pointI++] = extraPoints[i];
+            pointsAll[pointi++] = extraPoints[i];
         }
 
         combinedSurf = triSurface(surface1, surface1.patches(), pointsAll);
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index e763402fc9..6ca0010b68 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -766,9 +766,9 @@ int main(int argc, char *argv[])
         //    Info<< "Writing edges of intersection to selfInter.obj" << endl;
         //
         //    OFstream intStream("selfInter.obj");
-        //    forAll(inter.cutPoints(), cutPointI)
+        //    forAll(inter.cutPoints(), cutPointi)
         //    {
-        //        const point& pt = inter.cutPoints()[cutPointI];
+        //        const point& pt = inter.cutPoints()[cutPointi];
         //
         //        intStream << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z()
         //            << endl;
diff --git a/applications/utilities/surface/surfaceFind/surfaceFind.C b/applications/utilities/surface/surfaceFind/surfaceFind.C
index f9bdc6426d..0bc555b1f8 100644
--- a/applications/utilities/surface/surfaceFind/surfaceFind.C
+++ b/applications/utilities/surface/surfaceFind/surfaceFind.C
@@ -70,13 +70,13 @@ int main(int argc, char *argv[])
     label minIndex = -1;
     scalar minDist = GREAT;
 
-    forAll(localPoints, pointI)
+    forAll(localPoints, pointi)
     {
-        const scalar dist = mag(localPoints[pointI] - samplePt);
+        const scalar dist = mag(localPoints[pointi] - samplePt);
         if (dist < minDist)
         {
             minDist = dist;
-            minIndex = pointI;
+            minIndex = pointi;
         }
     }
 
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 0f46efa880..099b15e5d8 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -44,13 +44,13 @@ Usage
 
 using namespace Foam;
 
-// Split facei along edgeI at position newPointI
+// Split facei along edgeI at position newPointi
 void greenRefine
 (
     const triSurface& surf,
     const label facei,
     const label edgeI,
-    const label newPointI,
+    const label newPointi,
     DynamicList<labelledTri>& newFaces
 )
 {
@@ -71,7 +71,7 @@ void greenRefine
             labelledTri
             (
                 f[fp0],
-                newPointI,
+                newPointi,
                 f[fp2],
                 f.region()
             )
@@ -80,7 +80,7 @@ void greenRefine
         (
             labelledTri
             (
-                newPointI,
+                newPointi,
                 f[fp1],
                 f[fp2],
                 f.region()
@@ -94,7 +94,7 @@ void greenRefine
             labelledTri
             (
                 f[fp2],
-                newPointI,
+                newPointi,
                 f[fp1],
                 f.region()
             )
@@ -103,7 +103,7 @@ void greenRefine
         (
             labelledTri
             (
-                newPointI,
+                newPointi,
                 f[fp0],
                 f[fp1],
                 f.region()
@@ -383,14 +383,14 @@ int main(int argc, char *argv[])
 
             const labelListList& pointEdges = surf.pointEdges();
 
-            forAll(bPointsTobEdges, bPointI)
+            forAll(bPointsTobEdges, bPointi)
             {
-                pointIndexHit& nearestHit = bPointsTobEdges[bPointI];
+                pointIndexHit& nearestHit = bPointsTobEdges[bPointi];
 
-                const label pointI = surf.boundaryPoints()[bPointI];
-                const point& samplePt = surf.localPoints()[pointI];
+                const label pointi = surf.boundaryPoints()[bPointi];
+                const point& samplePt = surf.localPoints()[pointi];
 
-                const labelList& pEdges = pointEdges[pointI];
+                const labelList& pEdges = pointEdges[pointi];
 
                 // Add edges connected to the edge to the shapeMask
                 DynamicList<label> shapeMask;
@@ -428,7 +428,7 @@ int main(int argc, char *argv[])
                     )
                     {
                         nearestHit = currentHit;
-                        bPointsHitTree[bPointI] = treeI;
+                        bPointsHitTree[bPointi] = treeI;
                     }
                 }
 
@@ -441,7 +441,7 @@ int main(int argc, char *argv[])
     //                    (
     //                        surf,
     //                        nearestHit.index(),
-    //                        pointI,
+    //                        pointi,
     //                        30
     //                    );
 
@@ -452,20 +452,20 @@ int main(int argc, char *argv[])
                 }
             }
 
-            forAll(bPointsTobEdges, bPointI)
+            forAll(bPointsTobEdges, bPointi)
             {
-                const pointIndexHit& eHit = bPointsTobEdges[bPointI];
+                const pointIndexHit& eHit = bPointsTobEdges[bPointi];
 
                 if (eHit.hit())
                 {
-                    const label hitSurfI = bPointsHitTree[bPointI];
+                    const label hitSurfI = bPointsHitTree[bPointi];
                     const triSurface& hitSurf = newSurfaces[hitSurfI];
 
                     const label eIndex =
                         treeBoundaryEdges[hitSurfI][eHit.index()];
                     const edge& e = hitSurf.edges()[eIndex];
 
-                    const label pointI = surf.boundaryPoints()[bPointI];
+                    const label pointi = surf.boundaryPoints()[bPointi];
 
                     const labelList& eFaces = hitSurf.edgeFaces()[eIndex];
 
@@ -487,7 +487,7 @@ int main(int argc, char *argv[])
 
                     DynamicList<labelledTri> newFacesFromSplit(2);
 
-                    const point& pt = surf.localPoints()[pointI];
+                    const point& pt = surf.localPoints()[pointi];
 
                     if
                     (
@@ -506,17 +506,17 @@ int main(int argc, char *argv[])
 
                     nChanged++;
 
-                    label newPointI = -1;
+                    label newPointi = -1;
 
                     // Keep the points in the same place and move the edge
                     if (hitSurfI == surfI)
                     {
-                        newPointI = pointI;
+                        newPointi = pointi;
                     }
                     else
                     {
-                        newPoints[hitSurfI].append(newPoints[surfI][pointI]);
-                        newPointI = newPoints[hitSurfI].size() - 1;
+                        newPoints[hitSurfI].append(newPoints[surfI][pointi]);
+                        newPointi = newPoints[hitSurfI].size() - 1;
                     }
 
                     // Split the other face.
@@ -525,7 +525,7 @@ int main(int argc, char *argv[])
                         hitSurf,
                         facei,
                         eIndex,
-                        newPointI,
+                        newPointi,
                         newFacesFromSplit
                     );
 
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index 3162b2a120..5a23bb3dc4 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -82,11 +82,11 @@ void dumpPoints(const triSurface& surf, const labelList& borderPoint)
 
     OFstream os(fName);
 
-    forAll(borderPoint, pointI)
+    forAll(borderPoint, pointi)
     {
-        if (borderPoint[pointI] != -1)
+        if (borderPoint[pointi] != -1)
         {
-            const point& pt = surf.localPoints()[pointI];
+            const point& pt = surf.localPoints()[pointi];
 
             os  << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
         }
@@ -211,9 +211,9 @@ label markBorderPoints
 
     const labelListList& pointEdges = surf.pointEdges();
 
-    forAll(pointEdges, pointI)
+    forAll(pointEdges, pointi)
     {
-        const labelList& pEdges = pointEdges[pointI];
+        const labelList& pEdges = pointEdges[pointi];
 
         label nBorderEdges = 0;
 
@@ -225,9 +225,9 @@ label markBorderPoints
             }
         }
 
-        if (nBorderEdges == 2 && borderPoint[pointI] == -1)
+        if (nBorderEdges == 2 && borderPoint[pointi] == -1)
         {
-            borderPoint[pointI] = nPoints++;
+            borderPoint[pointi] = nPoints++;
         }
     }
 
@@ -242,13 +242,13 @@ label markBorderPoints
 }
 
 
-// Get minumum length of edges connected to pointI
+// Get minumum length of edges connected to pointi
 // Serves to get some local length scale.
-scalar minEdgeLen(const triSurface& surf, const label pointI)
+scalar minEdgeLen(const triSurface& surf, const label pointi)
 {
     const pointField& points = surf.localPoints();
 
-    const labelList& pEdges = surf.pointEdges()[pointI];
+    const labelList& pEdges = surf.pointEdges()[pointi];
 
     scalar minLen = GREAT;
 
@@ -308,13 +308,13 @@ label findEdge
 }
 
 
-// Get the other edge connected to pointI on facei.
+// Get the other edge connected to pointi on facei.
 label otherEdge
 (
     const triSurface& surf,
     const label facei,
     const label otherEdgeI,
-    const label pointI
+    const label pointi
 )
 {
     const labelList& fEdges = surf.faceEdges()[facei];
@@ -329,8 +329,8 @@ label otherEdge
         (
             edgeI != otherEdgeI
          && (
-                e.start() == pointI
-             || e.end() == pointI
+                e.start() == pointi
+             || e.end() == pointi
             )
         )
         {
@@ -340,7 +340,7 @@ label otherEdge
 
     FatalErrorInFunction
         << " verts:" << surf.localPoints()[facei]
-        << " connected to point " << pointI
+        << " connected to point " << pointi
         << " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)()
         << abort(FatalError);
 
@@ -359,7 +359,7 @@ void walkSplitLine
 
     const label startFacei,
     const label startEdgeI,     // is border edge
-    const label startPointI,    // is border point
+    const label startPointi,    // is border point
 
     Map<label>& faceToEdge,
     Map<label>& faceToPoint
@@ -367,18 +367,18 @@ void walkSplitLine
 {
     label facei = startFacei;
     label edgeI = startEdgeI;
-    label pointI = startPointI;
+    label pointi = startPointi;
 
     do
     {
         //
-        // Stick to pointI and walk face-edge-face until back on border edge.
+        // Stick to pointi and walk face-edge-face until back on border edge.
         //
 
         do
         {
             // Cross face to next edge.
-            edgeI = otherEdge(surf, facei, edgeI, pointI);
+            edgeI = otherEdge(surf, facei, edgeI, pointi);
 
             if (borderEdge[edgeI])
             {
@@ -393,7 +393,7 @@ void walkSplitLine
                     break;
                 }
             }
-            else if (!faceToPoint.insert(facei, pointI))
+            else if (!faceToPoint.insert(facei, pointi))
             {
                 // Was already visited.
                 return;
@@ -429,9 +429,9 @@ void walkSplitLine
         // Back on border edge. Cross to other point on edge.
         //
 
-        pointI = surf.edges()[edgeI].otherVertex(pointI);
+        pointi = surf.edges()[edgeI].otherVertex(pointi);
 
-        if (borderPoint[pointI] == -1)
+        if (borderPoint[pointi] == -1)
         {
             return;
         }
@@ -773,7 +773,7 @@ int main(int argc, char *argv[])
         //
 
         label startEdgeI = -1;
-        label startPointI = -1;
+        label startPointi = -1;
 
         forAll(borderEdge, edgeI)
         {
@@ -784,14 +784,14 @@ int main(int argc, char *argv[])
                 if ((borderPoint[e[0]] != -1) && (borderPoint[e[1]] == -1))
                 {
                     startEdgeI = edgeI;
-                    startPointI = e[0];
+                    startPointi = e[0];
 
                     break;
                 }
                 else if ((borderPoint[e[0]] == -1) && (borderPoint[e[1]] != -1))
                 {
                     startEdgeI = edgeI;
-                    startPointI = e[1];
+                    startPointi = e[1];
 
                     break;
                 }
@@ -816,7 +816,7 @@ int main(int argc, char *argv[])
 
         Info<< "Starting local walk from:" << endl
             << "    edge :" << startEdgeI << endl
-            << "    point:" << startPointI << endl
+            << "    point:" << startPointi << endl
             << "    face0:" << firstFacei << endl
             << "    face1:" << secondFacei << endl
             << endl;
@@ -836,7 +836,7 @@ int main(int argc, char *argv[])
 
             firstFacei,
             startEdgeI,
-            startPointI,
+            startPointi,
 
             faceToEdge,
             faceToPoint
@@ -852,7 +852,7 @@ int main(int argc, char *argv[])
 
             secondFacei,
             startEdgeI,
-            startPointI,
+            startPointi,
 
             faceToEdge,
             faceToPoint
@@ -885,18 +885,18 @@ int main(int argc, char *argv[])
         pointField newPoints(surf.localPoints());
         newPoints.setSize(newPoints.size() + nBorderPoints);
 
-        forAll(borderPoint, pointI)
+        forAll(borderPoint, pointi)
         {
-            label newPointI = borderPoint[pointI];
+            label newPointi = borderPoint[pointi];
 
-            if (newPointI != -1)
+            if (newPointi != -1)
             {
-                scalar minLen = minEdgeLen(surf, pointI);
+                scalar minLen = minEdgeLen(surf, pointi);
 
-                vector n = borderPointVec[pointI];
+                vector n = borderPointVec[pointi];
                 n /= mag(n);
 
-                newPoints[newPointI] = newPoints[pointI] + 0.1 * minLen * n;
+                newPoints[newPointi] = newPoints[pointi] + 0.1 * minLen * n;
             }
         }
 
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index c45d25e4b7..03266edd28 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -124,16 +124,16 @@ int main(int argc, char *argv[])
 
         // pick up cells sharing the point
 
-        forAll(markedPoints, pointI)
+        forAll(markedPoints, pointi)
         {
             if
             (
-                markedPoints[pointI] < 0
-             || markedPoints[pointI] >= surf1.nPoints()
+                markedPoints[pointi] < 0
+             || markedPoints[pointi] >= surf1.nPoints()
             )
             {
                 FatalErrorInFunction
-                    << "localPoint label " << markedPoints[pointI]
+                    << "localPoint label " << markedPoints[pointi]
                     << "out of range."
                     << " The mesh has got "
                     << surf1.nPoints() << " localPoints."
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
             }
 
             const labelList& curFaces =
-                surf1.pointFaces()[markedPoints[pointI]];
+                surf1.pointFaces()[markedPoints[pointi]];
 
             forAll(curFaces, i)
             {
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index ba9343a767..fa25fa6fc7 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -435,7 +435,7 @@
 
         Within the implementation, a loop over all patches is done:
         \code
-            forAll(patches, patchI)
+            forAll(patches, patchi)
             {
                 ...  // some operation
             }
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index bb20707a77..ee8d4150ed 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -422,9 +422,9 @@ void Foam::invertManyToMany
     // Number of points per edge
     labelList nPointsPerEdge(nEdges, 0);
 
-    forAll(pointEdges, pointI)
+    forAll(pointEdges, pointi)
     {
-        const InList& pEdges = pointEdges[pointI];
+        const InList& pEdges = pointEdges[pointi];
 
         forAll(pEdges, j)
         {
@@ -442,15 +442,15 @@ void Foam::invertManyToMany
     nPointsPerEdge = 0;
 
     // Fill edges
-    forAll(pointEdges, pointI)
+    forAll(pointEdges, pointi)
     {
-        const InList& pEdges = pointEdges[pointI];
+        const InList& pEdges = pointEdges[pointi];
 
         forAll(pEdges, j)
         {
             label edgeI = pEdges[j];
 
-            edges[edgeI][nPointsPerEdge[edgeI]++] = pointI;
+            edges[edgeI][nPointsPerEdge[edgeI]++] = pointi;
         }
     }
 }
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index aef8c59c99..d66f2c7633 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -196,9 +196,9 @@ void Foam::pointPatchField<Type>::addToInternalField
     // Get the addressing
     const labelList& mp = patch().meshPoints();
 
-    forAll(mp, pointI)
+    forAll(mp, pointi)
     {
-        iF[mp[pointI]] += pF[pointI];
+        iF[mp[pointi]] += pF[pointi];
     }
 }
 
@@ -236,8 +236,8 @@ void Foam::pointPatchField<Type>::addToInternalField
 
     forAll(points, i)
     {
-        label pointI = points[i];
-        iF[mp[pointI]] += pF[pointI];
+        label pointi = points[i];
+        iF[mp[pointi]] += pF[pointi];
     }
 }
 
@@ -270,9 +270,9 @@ void Foam::pointPatchField<Type>::setInInternalField
             << abort(FatalError);
     }
 
-    forAll(meshPoints, pointI)
+    forAll(meshPoints, pointi)
     {
-        iF[meshPoints[pointI]] = pF[pointI];
+        iF[meshPoints[pointi]] = pF[pointi];
     }
 }
 
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index c23f5ac128..7dea7b0578 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
@@ -73,27 +73,27 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
 
     bool doWeights = false;
 
-    forAll(pointAddressing, pointI)
+    forAll(pointAddressing, pointi)
     {
         doWeights = false;
 
         const typename FromPatch::FaceType& hitFace =
-            fromPatchFaces[proj[pointI].hitObject()];
+            fromPatchFaces[proj[pointi].hitObject()];
 
         point hitPoint = Zero;
 
-        if (proj[pointI].hit())
+        if (proj[pointi].hit())
         {
             // A hit exists
             doWeights = true;
 
-            pointAddressing[pointI] = proj[pointI].hitObject();
+            pointAddressing[pointi] = proj[pointi].hitObject();
 
             pointHit curHit =
                 hitFace.ray
                 (
-                    toPatchPoints[pointI],
-                    projectionDirection[pointI],
+                    toPatchPoints[pointi],
+                    projectionDirection[pointi],
                     fromPatchPoints,
                     alg_,
                     dir_
@@ -102,17 +102,17 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
             // Grab distance to target
             if (dir_ == intersection::CONTACT_SPHERE)
             {
-                pointDistance[pointI] =
+                pointDistance[pointi] =
                     hitFace.contactSphereDiameter
                     (
-                        toPatchPoints[pointI],
-                        projectionDirection[pointI],
+                        toPatchPoints[pointi],
+                        projectionDirection[pointi],
                         fromPatchPoints
                     );
             }
             else
             {
-                pointDistance[pointI] = curHit.distance();
+                pointDistance[pointi] = curHit.distance();
             }
 
             // Grab hit point
@@ -124,8 +124,8 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
             pointHit ph =
                 hitFace.ray
                 (
-                    toPatchPoints[pointI],
-                    projectionDirection[pointI],
+                    toPatchPoints[pointi],
+                    projectionDirection[pointi],
                     fromPatchPoints,
                     alg_,
                     dir_
@@ -134,8 +134,8 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
             scalar dist =
                 Foam::mag
                 (
-                    toPatchPoints[pointI]
-                  + projectionDirection[pointI]*ph.distance()
+                    toPatchPoints[pointi]
+                  + projectionDirection[pointi]*ph.distance()
                   - ph.missPoint()
                 );
 
@@ -144,7 +144,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
 
             // Do shortest edge of hit object
             edgeList hitFaceEdges =
-                fromPatchFaces[proj[pointI].hitObject()].edges();
+                fromPatchFaces[proj[pointi].hitObject()].edges();
 
             forAll(hitFaceEdges, edgeI)
             {
@@ -156,7 +156,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
                     );
             }
 
-            const labelList& curEdges = toPatchPointEdges[pointI];
+            const labelList& curEdges = toPatchPointEdges[pointi];
 
             forAll(curEdges, edgeI)
             {
@@ -173,7 +173,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
                 // This point is being corrected
                 doWeights = true;
 
-                pointAddressing[pointI] = proj[pointI].hitObject();
+                pointAddressing[pointi] = proj[pointi].hitObject();
 
                 // Grab nearest point on face as hit point
                 hitPoint = ph.missPoint();
@@ -181,22 +181,22 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
                 // Grab distance to target
                 if (dir_ == intersection::CONTACT_SPHERE)
                 {
-                    pointDistance[pointI] =
+                    pointDistance[pointi] =
                         hitFace.contactSphereDiameter
                         (
-                            toPatchPoints[pointI],
-                            projectionDirection[pointI],
+                            toPatchPoints[pointi],
+                            projectionDirection[pointi],
                             fromPatchPoints
                         );
                 }
                 else
                 {
-                    pointDistance[pointI] =
+                    pointDistance[pointi] =
                         (
-                            projectionDirection[pointI]
-                            /mag(projectionDirection[pointI])
+                            projectionDirection[pointi]
+                            /mag(projectionDirection[pointi])
                         )
-                      & (hitPoint - toPatchPoints[pointI]);
+                      & (hitPoint - toPatchPoints[pointi]);
                 }
             }
         }
@@ -204,29 +204,29 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
         if (doWeights)
         {
             // Set interpolation pointWeights
-            pointWeights.set(pointI, new scalarField(hitFace.size()));
+            pointWeights.set(pointi, new scalarField(hitFace.size()));
 
             pointField hitFacePoints = hitFace.points(fromPatchPoints);
 
-            forAll(hitFacePoints, masterPointI)
+            forAll(hitFacePoints, masterPointi)
             {
-                pointWeights[pointI][masterPointI] =
+                pointWeights[pointi][masterPointi] =
                     1.0/
                     (
                         mag
                         (
-                            hitFacePoints[masterPointI]
+                            hitFacePoints[masterPointi]
                           - hitPoint
                         )
                       + VSMALL
                     );
             }
 
-            pointWeights[pointI] /= sum(pointWeights[pointI]);
+            pointWeights[pointi] /= sum(pointWeights[pointi]);
         }
         else
         {
-            pointWeights.set(pointI, new scalarField(0));
+            pointWeights.set(pointi, new scalarField(0));
         }
     }
 }
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index d43414b428..5ce595791e 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -63,18 +63,18 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 
     const labelList& addr = pointAddr();
 
-    forAll(result, pointI)
+    forAll(result, pointi)
     {
-        const scalarField& curWeights = weights[pointI];
+        const scalarField& curWeights = weights[pointi];
 
-        if (addr[pointI] > -1)
+        if (addr[pointi] > -1)
         {
             const labelList& hitFacePoints =
-                fromPatchLocalFaces[addr[pointI]];
+                fromPatchLocalFaces[addr[pointi]];
 
             forAll(curWeights, wI)
             {
-                result[pointI] += curWeights[wI]*pf[hitFacePoints[wI]];
+                result[pointi] += curWeights[wI]*pf[hitFacePoints[wI]];
             }
         }
     }
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
index f8857a6b5c..d7f298bafb 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
+++ b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
@@ -63,8 +63,8 @@ private:
 
     // Private data
 
-        //- Local map from neighbour proc to patchI. Different per processor!
-        //  -1 or patchI for connection to procID
+        //- Local map from neighbour proc to patchi. Different per processor!
+        //  -1 or patchi for connection to procID
         labelList procPatchMap_;
 
         //- Order in which the patches should be initialised/evaluated
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.C b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
index 198cd3762b..9eaa7294a9 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
@@ -52,9 +52,9 @@ Foam::labelList Foam::cell::labels(const faceUList& f) const
     // in the first face there is no duplicates
     const labelList& first = f[faces[0]];
 
-    forAll(first, pointI)
+    forAll(first, pointi)
     {
-        p[pointI] = first[pointI];
+        p[pointi] = first[pointi];
     }
 
     // re-use maxVert to count the real vertices
@@ -67,9 +67,9 @@ Foam::labelList Foam::cell::labels(const faceUList& f) const
     {
         const labelList& curFace = f[faces[facei]];
 
-        forAll(curFace, pointI)
+        forAll(curFace, pointi)
         {
-            const label curPoint = curFace[pointI];
+            const label curPoint = curFace[pointi];
 
             bool found = false;
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
index 2cb46ef3a7..23686e1361 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
@@ -70,13 +70,13 @@ Foam::label Foam::cell::opposingFaceLabel
 
             // Compare every vertex of the current face agains the
             // vertices of the master face
-            forAll(curFace, pointI)
+            forAll(curFace, pointi)
             {
-                const label l = curFace[pointI];
+                const label l = curFace[pointi];
 
-                forAll(masterFace, masterPointI)
+                forAll(masterFace, masterPointi)
                 {
-                    if (masterFace[masterPointI] == l)
+                    if (masterFace[masterPointi] == l)
                     {
                         sharedPoint = true;
                         break;
@@ -149,7 +149,7 @@ Foam::oppositeFace Foam::cell::opposingFace
             oppFaceLabel
         );
 
-        forAll(masterFace, pointI)
+        forAll(masterFace, pointi)
         {
             // Go through the list of edges and find the edge from this vertex
             // to the slave face
@@ -159,19 +159,19 @@ Foam::oppositeFace Foam::cell::opposingFace
                 {
                     // Get the other vertex
                     label otherVertex =
-                        e[edgeI].otherVertex(masterFace[pointI]);
+                        e[edgeI].otherVertex(masterFace[pointi]);
 
                     if (otherVertex != -1)
                     {
                         // Found an edge coming from this vertex.
                         // Check all vertices of the slave to find out
                         // if it exists.
-                        forAll(slaveFace, slavePointI)
+                        forAll(slaveFace, slavePointi)
                         {
-                            if (slaveFace[slavePointI] == otherVertex)
+                            if (slaveFace[slavePointi] == otherVertex)
                             {
                                 usedEdges[edgeI] = true;
-                                oppFace[pointI] = otherVertex;
+                                oppFace[pointi] = otherVertex;
 
                                 break;
                             }
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 6c65137162..b1ed2f65df 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -618,9 +618,9 @@ Foam::face Foam::face::reverseFace() const
 
     newList[0] = f[0];
 
-    for (label pointI = 1; pointI < newList.size(); pointI++)
+    for (label pointi = 1; pointi < newList.size(); pointi++)
     {
-        newList[pointI] = f[size() - pointI];
+        newList[pointi] = f[size() - pointi];
     }
 
     return face(xferMove(newList));
@@ -764,9 +764,9 @@ Foam::edgeList Foam::face::edges() const
 
     edgeList e(points.size());
 
-    for (label pointI = 0; pointI < points.size() - 1; ++pointI)
+    for (label pointi = 0; pointi < points.size() - 1; ++pointi)
     {
-        e[pointI] = edge(points[pointI], points[pointI + 1]);
+        e[pointi] = edge(points[pointi], points[pointi + 1]);
     }
 
     // Add last edge
diff --git a/src/OpenFOAM/meshes/meshTools/mergePoints.C b/src/OpenFOAM/meshes/meshTools/mergePoints.C
index 04d3462197..b1d954c9ab 100644
--- a/src/OpenFOAM/meshes/meshTools/mergePoints.C
+++ b/src/OpenFOAM/meshes/meshTools/mergePoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,9 +73,9 @@ Foam::label Foam::mergePoints
     const Field<Type> d(points - compareOrigin);
 
     List<scalar> magSqrD(d.size());
-    forAll(d, pointI)
+    forAll(d, pointi)
     {
-        magSqrD[pointI] = magSqr(d[pointI]);
+        magSqrD[pointi] = magSqr(d[pointi]);
     }
     labelList order;
     sortedOrder(magSqrD, order);
@@ -84,42 +84,42 @@ Foam::label Foam::mergePoints
     Field<scalar> sortedTol(points.size());
     forAll(order, sortI)
     {
-        label pointI = order[sortI];
+        label pointi = order[sortI];
 
         // Convert to scalar precision
         const point pt
         (
-            scalar(d[pointI].x()),
-            scalar(d[pointI].y()),
-            scalar(d[pointI].z())
+            scalar(d[pointi].x()),
+            scalar(d[pointi].y()),
+            scalar(d[pointi].z())
         );
         sortedTol[sortI] = 2*mergeTol*(mag(pt.x())+mag(pt.y())+mag(pt.z()));
     }
 
-    label newPointI = 0;
+    label newPointi = 0;
 
 
     // Handle 0th point separately (is always unique)
-    label pointI = order[0];
-    pointMap[pointI] = newPointI++;
+    label pointi = order[0];
+    pointMap[pointi] = newPointi++;
 
 
     for (label sortI = 1; sortI < order.size(); sortI++)
     {
         // Get original point index
-        label pointI = order[sortI];
+        label pointi = order[sortI];
         const scalar mag2 = magSqrD[order[sortI]];
         // Convert to scalar precision
         const point pt
         (
-            scalar(points[pointI].x()),
-            scalar(points[pointI].y()),
-            scalar(points[pointI].z())
+            scalar(points[pointi].x()),
+            scalar(points[pointi].y()),
+            scalar(points[pointi].z())
         );
 
 
         // Compare to previous points to find equal one.
-        label equalPointI = -1;
+        label equalPointi = -1;
 
         for
         (
@@ -129,46 +129,46 @@ Foam::label Foam::mergePoints
             prevSortI--
         )
         {
-            label prevPointI = order[prevSortI];
+            label prevPointi = order[prevSortI];
             const point prevPt
             (
-                scalar(points[prevPointI].x()),
-                scalar(points[prevPointI].y()),
-                scalar(points[prevPointI].z())
+                scalar(points[prevPointi].x()),
+                scalar(points[prevPointi].y()),
+                scalar(points[prevPointi].z())
             );
 
             if (magSqr(pt - prevPt) <= mergeTolSqr)
             {
                 // Found match.
-                equalPointI = prevPointI;
+                equalPointi = prevPointi;
 
                 break;
             }
         }
 
 
-        if (equalPointI != -1)
+        if (equalPointi != -1)
         {
-            // Same coordinate as equalPointI. Map to same new point.
-            pointMap[pointI] = pointMap[equalPointI];
+            // Same coordinate as equalPointi. Map to same new point.
+            pointMap[pointi] = pointMap[equalPointi];
 
             if (verbose)
             {
                 Pout<< "Foam::mergePoints : Merging points "
-                    << pointI << " and " << equalPointI
-                    << " with coordinates:" << points[pointI]
-                    << " and " << points[equalPointI]
+                    << pointi << " and " << equalPointi
+                    << " with coordinates:" << points[pointi]
+                    << " and " << points[equalPointi]
                     << endl;
             }
         }
         else
         {
             // Differs. Store new point.
-            pointMap[pointI] = newPointI++;
+            pointMap[pointi] = newPointi++;
         }
     }
 
-    return newPointI;
+    return newPointi;
 }
 
 
@@ -193,9 +193,9 @@ bool Foam::mergePoints
     );
 
     newPoints.setSize(nUnique);
-    forAll(pointMap, pointI)
+    forAll(pointMap, pointi)
     {
-        newPoints[pointMap[pointI]] = points[pointI];
+        newPoints[pointMap[pointi]] = points[pointi];
     }
 
     return (nUnique != points.size());
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index 2610376a34..a6d06903e5 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -60,13 +60,13 @@ void Foam::pointMapper::calcAddressing() const
 
         label nInsertedPoints = 0;
 
-        forAll(directAddr, pointI)
+        forAll(directAddr, pointi)
         {
-            if (directAddr[pointI] < 0)
+            if (directAddr[pointi] < 0)
             {
                 // Found inserted point
-                directAddr[pointI] = 0;
-                insertedPoints[nInsertedPoints] = pointI;
+                directAddr[pointi] = 0;
+                insertedPoints[nInsertedPoints] = pointi;
                 nInsertedPoints++;
             }
         }
@@ -91,19 +91,19 @@ void Foam::pointMapper::calcAddressing() const
             // Get addressing
             const labelList& mo = cfc[cfcI].masterObjects();
 
-            label pointI = cfc[cfcI].index();
+            label pointi = cfc[cfcI].index();
 
-            if (addr[pointI].size())
+            if (addr[pointi].size())
             {
                 FatalErrorInFunction
-                    << "Master point " << pointI
+                    << "Master point " << pointi
                     << " mapped from points " << mo
                     << " already destination of mapping." << abort(FatalError);
             }
 
             // Map from masters, uniform weights
-            addr[pointI] = mo;
-            w[pointI] = scalarList(mo.size(), 1.0/mo.size());
+            addr[pointi] = mo;
+            w[pointi] = scalarList(mo.size(), 1.0/mo.size());
         }
 
 
@@ -112,13 +112,13 @@ void Foam::pointMapper::calcAddressing() const
 
         const labelList& cm = mpm_.pointMap();
 
-        forAll(cm, pointI)
+        forAll(cm, pointi)
         {
-            if (cm[pointI] > -1 && addr[pointI].empty())
+            if (cm[pointi] > -1 && addr[pointi].empty())
             {
                 // Mapped from a single point
-                addr[pointI] = labelList(1, cm[pointI]);
-                w[pointI] = scalarList(1, 1.0);
+                addr[pointi] = labelList(1, cm[pointi]);
+                w[pointi] = scalarList(1, 1.0);
             }
         }
 
@@ -129,15 +129,15 @@ void Foam::pointMapper::calcAddressing() const
 
         label nInsertedPoints = 0;
 
-        forAll(addr, pointI)
+        forAll(addr, pointi)
         {
-            if (addr[pointI].empty())
+            if (addr[pointi].empty())
             {
                 // Mapped from a dummy point. Take point 0 with weight 1.
-                addr[pointI] = labelList(1, label(0));
-                w[pointI] = scalarList(1, 1.0);
+                addr[pointi] = labelList(1, label(0));
+                w[pointi] = scalarList(1, 1.0);
 
-                insertedPoints[nInsertedPoints] = pointI;
+                insertedPoints[nInsertedPoints] = pointi;
                 nInsertedPoints++;
             }
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 4ed4b14472..bd0e7eac1a 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -575,12 +575,12 @@ void Foam::globalMeshData::calcPointConnectivity
 
     // Create field with my local data
     labelPairList myData(globalPointSlavesMap().constructSize());
-    forAll(slaves, pointI)
+    forAll(slaves, pointi)
     {
-        myData[pointI] = globalIndexAndTransform::encode
+        myData[pointi] = globalIndexAndTransform::encode
         (
             Pstream::myProcNo(),
-            pointI,
+            pointi,
             transforms.nullTransformIndex()
         );
     }
@@ -594,21 +594,21 @@ void Foam::globalMeshData::calcPointConnectivity
 
     // Pass1: do the master points since these also update local slaves
     //        (e.g. from local cyclics)
-    forAll(slaves, pointI)
+    forAll(slaves, pointi)
     {
         // Reconstruct string of connected points
-        const labelList& pSlaves = slaves[pointI];
-        const labelList& pTransformSlaves = transformedSlaves[pointI];
+        const labelList& pSlaves = slaves[pointi];
+        const labelList& pTransformSlaves = transformedSlaves[pointi];
 
         if (pSlaves.size()+pTransformSlaves.size())
         {
-            labelPairList& pConnectivity = allPointConnectivity[pointI];
+            labelPairList& pConnectivity = allPointConnectivity[pointi];
 
             pConnectivity.setSize(1+pSlaves.size()+pTransformSlaves.size());
             label connI = 0;
 
             // Add myself
-            pConnectivity[connI++] = myData[pointI];
+            pConnectivity[connI++] = myData[pointi];
             // Add untransformed points
             forAll(pSlaves, i)
             {
@@ -648,13 +648,13 @@ void Foam::globalMeshData::calcPointConnectivity
 
 
     // Pass2: see if anything is still unset (should not be the case)
-    forAll(slaves, pointI)
+    forAll(slaves, pointi)
     {
-        labelPairList& pConnectivity = allPointConnectivity[pointI];
+        labelPairList& pConnectivity = allPointConnectivity[pointi];
 
         if (pConnectivity.size() == 0)
         {
-            pConnectivity.setSize(1, myData[pointI]);
+            pConnectivity.setSize(1, myData[pointi]);
         }
     }
 
@@ -682,25 +682,25 @@ void Foam::globalMeshData::calcGlobalPointEdges
     // Create local version
     globalPointEdges.setSize(globalPointSlavesMap().constructSize());
     globalPointPoints.setSize(globalPointSlavesMap().constructSize());
-    forAll(pointEdges, pointI)
+    forAll(pointEdges, pointi)
     {
-        const labelList& pEdges = pointEdges[pointI];
-        labelList& globalPEdges = globalPointEdges[pointI];
+        const labelList& pEdges = pointEdges[pointi];
+        labelList& globalPEdges = globalPointEdges[pointi];
         globalPEdges.setSize(pEdges.size());
         forAll(pEdges, i)
         {
             globalPEdges[i] = globalEdgeNumbers.toGlobal(pEdges[i]);
         }
 
-        labelPairList& globalPPoints = globalPointPoints[pointI];
+        labelPairList& globalPPoints = globalPointPoints[pointi];
         globalPPoints.setSize(pEdges.size());
         forAll(pEdges, i)
         {
-            label otherPointI = edges[pEdges[i]].otherVertex(pointI);
+            label otherPointi = edges[pEdges[i]].otherVertex(pointi);
             globalPPoints[i] = globalIndexAndTransform::encode
             (
                 Pstream::myProcNo(),
-                otherPointI,
+                otherPointi,
                 globalTransforms().nullTransformIndex()
             );
         }
@@ -710,10 +710,10 @@ void Foam::globalMeshData::calcGlobalPointEdges
     globalPointSlavesMap().distribute(globalPointEdges);
     globalPointSlavesMap().distribute(globalPointPoints);
     // Add all pointEdges
-    forAll(slaves, pointI)
+    forAll(slaves, pointi)
     {
-        const labelList& pSlaves = slaves[pointI];
-        const labelList& pTransformSlaves = transformedSlaves[pointI];
+        const labelList& pSlaves = slaves[pointi];
+        const labelList& pTransformSlaves = transformedSlaves[pointi];
 
         label n = 0;
         forAll(pSlaves, i)
@@ -727,7 +727,7 @@ void Foam::globalMeshData::calcGlobalPointEdges
 
         // Add all the point edges of the slaves to those of the (master) point
         {
-            labelList& globalPEdges = globalPointEdges[pointI];
+            labelList& globalPEdges = globalPointEdges[pointi];
             label sz = globalPEdges.size();
             globalPEdges.setSize(sz+n);
             forAll(pSlaves, i)
@@ -762,7 +762,7 @@ void Foam::globalMeshData::calcGlobalPointEdges
 
         // Same for corresponding pointPoints
         {
-            labelPairList& globalPPoints = globalPointPoints[pointI];
+            labelPairList& globalPPoints = globalPointPoints[pointi];
             label sz = globalPPoints.size();
             globalPPoints.setSize(sz + n);
 
@@ -842,17 +842,17 @@ Foam::label Foam::globalMeshData::findTransform
     forAll(info, i)
     {
         label proci = globalIndexAndTransform::processor(info[i]);
-        label pointI = globalIndexAndTransform::index(info[i]);
+        label pointi = globalIndexAndTransform::index(info[i]);
         label transformI = globalIndexAndTransform::transformIndex(info[i]);
 
-        if (proci == Pstream::myProcNo() && pointI == localPoint)
+        if (proci == Pstream::myProcNo() && pointi == localPoint)
         {
             localTransformI = transformI;
             //Pout<< "For local :" << localPoint
             //    << " found transform:" << localTransformI
             //    << endl;
         }
-        if (proci == remoteProci && pointI == remoteIndex)
+        if (proci == remoteProci && pointi == remoteIndex)
         {
             remoteTransformI = transformI;
             //Pout<< "For remote:" << remotePoint
@@ -1116,9 +1116,9 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
         masterPoint.setSize(map.constructSize());
         masterPoint = labelMax;
 
-        for (label pointI = 0; pointI < coupledPatch().nPoints(); pointI++)
+        for (label pointi = 0; pointi < coupledPatch().nPoints(); pointi++)
         {
-            masterPoint[pointI] = globalPoints.toGlobal(pointI);
+            masterPoint[pointi] = globalPoints.toGlobal(pointi);
         }
         syncData
         (
@@ -1259,9 +1259,9 @@ void Foam::globalMeshData::calcPointBoundaryFaces
     // 2. Size
 
     pointBoundaryFaces.setSize(coupledPatch().nPoints());
-    forAll(nPointFaces, pointI)
+    forAll(nPointFaces, pointi)
     {
-        pointBoundaryFaces[pointI].setSize(nPointFaces[pointI]);
+        pointBoundaryFaces[pointi].setSize(nPointFaces[pointi]);
     }
     nPointFaces = 0;
 
@@ -1326,10 +1326,10 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
     );
     labelListList& globalPointBoundaryFaces = globalPointBoundaryFacesPtr_();
 
-    forAll(pointBoundaryFaces, pointI)
+    forAll(pointBoundaryFaces, pointi)
     {
-        const labelList& bFaces = pointBoundaryFaces[pointI];
-        labelList& globalFaces = globalPointBoundaryFaces[pointI];
+        const labelList& bFaces = pointBoundaryFaces[pointi];
+        labelList& globalFaces = globalPointBoundaryFaces[pointi];
         globalFaces.setSize(bFaces.size());
         forAll(bFaces, i)
         {
@@ -1357,14 +1357,14 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
     List<labelPairList> transformedFaces(pointSlaves.size());
 
 
-    forAll(pointSlaves, pointI)
+    forAll(pointSlaves, pointi)
     {
-        const labelList& slaves = pointSlaves[pointI];
-        const labelList& transformedSlaves = pointTransformSlaves[pointI];
+        const labelList& slaves = pointSlaves[pointi];
+        const labelList& transformedSlaves = pointTransformSlaves[pointi];
 
         if (slaves.size() > 0)
         {
-            labelList& myBFaces = globalPointBoundaryFaces[pointI];
+            labelList& myBFaces = globalPointBoundaryFaces[pointi];
             label sz = myBFaces.size();
 
             // Count
@@ -1399,9 +1399,9 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
 
         if (transformedSlaves.size() > 0)
         {
-            const labelList& untrafoFaces = globalPointBoundaryFaces[pointI];
+            const labelList& untrafoFaces = globalPointBoundaryFaces[pointi];
 
-            labelPairList& myBFaces = transformedFaces[pointI];
+            labelPairList& myBFaces = transformedFaces[pointi];
             label sz = myBFaces.size();
 
             // Count
@@ -1447,7 +1447,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
 
         if (slaves.size() + transformedSlaves.size() == 0)
         {
-             globalPointBoundaryFaces[pointI].clear();
+             globalPointBoundaryFaces[pointi].clear();
         }
     }
 
@@ -1508,12 +1508,12 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
     // Create addressing for point to boundary cells (local)
     labelListList pointBoundaryCells(coupledPatch().nPoints());
 
-    forAll(coupledPatch().meshPoints(), pointI)
+    forAll(coupledPatch().meshPoints(), pointi)
     {
-        label meshPointI = coupledPatch().meshPoints()[pointI];
-        const labelList& pCells = mesh_.pointCells(meshPointI);
+        label meshPointi = coupledPatch().meshPoints()[pointi];
+        const labelList& pCells = mesh_.pointCells(meshPointi);
 
-        labelList& bCells = pointBoundaryCells[pointI];
+        labelList& bCells = pointBoundaryCells[pointi];
         bCells.setSize(pCells.size());
 
         forAll(pCells, i)
@@ -1557,10 +1557,10 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
     );
     labelListList& globalPointBoundaryCells = globalPointBoundaryCellsPtr_();
 
-    forAll(pointBoundaryCells, pointI)
+    forAll(pointBoundaryCells, pointi)
     {
-        const labelList& pCells = pointBoundaryCells[pointI];
-        labelList& globalCells = globalPointBoundaryCells[pointI];
+        const labelList& pCells = pointBoundaryCells[pointi];
+        labelList& globalCells = globalPointBoundaryCells[pointi];
         globalCells.setSize(pCells.size());
         forAll(pCells, i)
         {
@@ -1585,14 +1585,14 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
     List<labelPairList> transformedCells(pointSlaves.size());
 
 
-    forAll(pointSlaves, pointI)
+    forAll(pointSlaves, pointi)
     {
-        const labelList& slaves = pointSlaves[pointI];
-        const labelList& transformedSlaves = pointTransformSlaves[pointI];
+        const labelList& slaves = pointSlaves[pointi];
+        const labelList& transformedSlaves = pointTransformSlaves[pointi];
 
         if (slaves.size() > 0)
         {
-            labelList& myBCells = globalPointBoundaryCells[pointI];
+            labelList& myBCells = globalPointBoundaryCells[pointi];
             label sz = myBCells.size();
 
             // Count
@@ -1627,9 +1627,9 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
 
         if (transformedSlaves.size() > 0)
         {
-            const labelList& untrafoCells = globalPointBoundaryCells[pointI];
+            const labelList& untrafoCells = globalPointBoundaryCells[pointi];
 
-            labelPairList& myBCells = transformedCells[pointI];
+            labelPairList& myBCells = transformedCells[pointi];
             label sz = myBCells.size();
 
             // Count
@@ -1674,7 +1674,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
 
         if (slaves.size() + transformedSlaves.size() == 0)
         {
-             globalPointBoundaryCells[pointI].clear();
+             globalPointBoundaryCells[pointi].clear();
         }
     }
 
@@ -1868,10 +1868,10 @@ const Foam::labelList& Foam::globalMeshData::sharedPointGlobalLabels() const
             forAll(pointLabels, i)
             {
                 // Get my mesh point
-                label pointI = pointLabels[i];
+                label pointi = pointLabels[i];
 
                 // Map to mesh point of original mesh
-                sharedPointGlobalLabels[i] = pointProcAddressing[pointI];
+                sharedPointGlobalLabels[i] = pointProcAddressing[pointi];
             }
         }
         else
@@ -1901,9 +1901,9 @@ Foam::pointField Foam::globalMeshData::sharedPoints() const
         // insert my own data first
         forAll(pointLabels, i)
         {
-            label sharedPointI = pointAddr[i];
+            label sharedPointi = pointAddr[i];
 
-            sharedPoints[sharedPointI] = mesh_.points()[pointLabels[i]];
+            sharedPoints[sharedPointi] = mesh_.points()[pointLabels[i]];
         }
 
         // Receive data from slaves and insert
@@ -1922,9 +1922,9 @@ Foam::pointField Foam::globalMeshData::sharedPoints() const
 
             forAll(nbrSharedPointAddr, i)
             {
-                label sharedPointI = nbrSharedPointAddr[i];
+                label sharedPointi = nbrSharedPointAddr[i];
 
-                sharedPoints[sharedPointI] = nbrSharedPoints[i];
+                sharedPoints[sharedPointi] = nbrSharedPoints[i];
             }
         }
 
@@ -2402,12 +2402,12 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     // - other (since e.g. non-collocated cyclics not connected)
 
     labelList masterGlobalPoint(cpp.nPoints(), -1);
-    forAll(masterGlobalPoint, pointI)
+    forAll(masterGlobalPoint, pointi)
     {
-        const labelList& slavePoints = pointSlaves[pointI];
+        const labelList& slavePoints = pointSlaves[pointi];
         if (slavePoints.size() > 0)
         {
-            masterGlobalPoint[pointI] = globalCoupledPoints.toGlobal(pointI);
+            masterGlobalPoint[pointi] = globalCoupledPoints.toGlobal(pointi);
         }
     }
 
@@ -2425,17 +2425,17 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     // 1. Count number of masters on my processor.
     label nMaster = 0;
     PackedBoolList isMaster(mesh_.nPoints(), 1);
-    forAll(pointSlaves, pointI)
+    forAll(pointSlaves, pointi)
     {
-        if (masterGlobalPoint[pointI] == -1)
+        if (masterGlobalPoint[pointi] == -1)
         {
             // unconnected point (e.g. from separated cyclic)
             nMaster++;
         }
         else if
         (
-            masterGlobalPoint[pointI]
-         == globalCoupledPoints.toGlobal(pointI)
+            masterGlobalPoint[pointi]
+         == globalCoupledPoints.toGlobal(pointi)
         )
         {
             // connected master
@@ -2444,7 +2444,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
         else
         {
             // connected slave point
-            isMaster[cpp.meshPoints()[pointI]] = 0;
+            isMaster[cpp.meshPoints()[pointi]] = 0;
         }
     }
 
@@ -2467,12 +2467,12 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     uniquePoints.setSize(myUniquePoints);
     nMaster = 0;
 
-    forAll(isMaster, meshPointI)
+    forAll(isMaster, meshPointi)
     {
-        if (isMaster[meshPointI])
+        if (isMaster[meshPointi])
         {
-            pointToGlobal[meshPointI] = globalPointsPtr().toGlobal(nMaster);
-            uniquePoints[nMaster] = meshPointI;
+            pointToGlobal[meshPointi] = globalPointsPtr().toGlobal(nMaster);
+            uniquePoints[nMaster] = meshPointi;
             nMaster++;
         }
     }
@@ -2482,18 +2482,18 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     {
         labelList masterToGlobal(pointSlavesMap.constructSize(), -1);
 
-        forAll(pointSlaves, pointI)
+        forAll(pointSlaves, pointi)
         {
-            const labelList& slaves = pointSlaves[pointI];
+            const labelList& slaves = pointSlaves[pointi];
 
             if (slaves.size() > 0)
             {
                 // Duplicate master globalpoint into slave slots
-                label meshPointI = cpp.meshPoints()[pointI];
-                masterToGlobal[pointI] = pointToGlobal[meshPointI];
+                label meshPointi = cpp.meshPoints()[pointi];
+                masterToGlobal[pointi] = pointToGlobal[meshPointi];
                 forAll(slaves, i)
                 {
-                    masterToGlobal[slaves[i]] = masterToGlobal[pointI];
+                    masterToGlobal[slaves[i]] = masterToGlobal[pointi];
                 }
             }
         }
@@ -2502,13 +2502,13 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
         pointSlavesMap.reverseDistribute(cpp.nPoints(), masterToGlobal);
 
         // On slave copy master index into overal map.
-        forAll(pointSlaves, pointI)
+        forAll(pointSlaves, pointi)
         {
-            label meshPointI = cpp.meshPoints()[pointI];
+            label meshPointi = cpp.meshPoints()[pointi];
 
-            if (!isMaster[meshPointI])
+            if (!isMaster[meshPointi])
             {
-                pointToGlobal[meshPointI] = masterToGlobal[pointI];
+                pointToGlobal[meshPointi] = masterToGlobal[pointi];
             }
         }
     }
@@ -2552,16 +2552,16 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     labelList coupledToGlobalPatch(pointSlavesMap.constructSize(), -1);
 
     // Note: loop over patch since usually smaller
-    forAll(meshPoints, patchPointI)
+    forAll(meshPoints, patchPointi)
     {
-        label meshPointI = meshPoints[patchPointI];
+        label meshPointi = meshPoints[patchPointi];
 
-        Map<label>::const_iterator iter = cpp.meshPointMap().find(meshPointI);
+        Map<label>::const_iterator iter = cpp.meshPointMap().find(meshPointi);
 
         if (iter != cpp.meshPointMap().end())
         {
-            patchToCoupled[patchPointI] = iter();
-            coupledToGlobalPatch[iter()] = globalPPoints.toGlobal(patchPointI);
+            patchToCoupled[patchPointi] = iter();
+            coupledToGlobalPatch[iter()] = globalPPoints.toGlobal(patchPointi);
             nCoupled++;
         }
     }
@@ -2580,18 +2580,18 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
 
     // Get all data on master
     pointSlavesMap.distribute(coupledToGlobalPatch);
-    forAll(pointSlaves, coupledPointI)
+    forAll(pointSlaves, coupledPointi)
     {
-        const labelList& slaves = pointSlaves[coupledPointI];
+        const labelList& slaves = pointSlaves[coupledPointi];
 
         if (slaves.size() > 0)
         {
             // I am master. What is the best candidate for patch-point master
             label masterI = labelMax;
-            if (coupledToGlobalPatch[coupledPointI] != -1)
+            if (coupledToGlobalPatch[coupledPointi] != -1)
             {
                 // I am master and on the coupled patch. Use me.
-                masterI = coupledToGlobalPatch[coupledPointI];
+                masterI = coupledToGlobalPatch[coupledPointi];
             }
             else
             {
@@ -2609,7 +2609,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
             if (masterI != labelMax)
             {
                 // Push back
-                coupledToGlobalPatch[coupledPointI] = masterI;
+                coupledToGlobalPatch[coupledPointi] = masterI;
                 forAll(slaves, i)
                 {
                     coupledToGlobalPatch[slaves[i]] = masterI;
@@ -2627,19 +2627,19 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     // compact numbering.
 
     label nMasters = 0;
-    forAll(meshPoints, patchPointI)
+    forAll(meshPoints, patchPointi)
     {
-        if (patchToCoupled[patchPointI] == -1)
+        if (patchToCoupled[patchPointi] == -1)
         {
             nMasters++;
         }
         else
         {
-            label coupledPointI = patchToCoupled[patchPointI];
+            label coupledPointi = patchToCoupled[patchPointi];
             if
             (
-                globalPPoints.toGlobal(patchPointI)
-             == coupledToGlobalPatch[coupledPointI]
+                globalPPoints.toGlobal(patchPointi)
+             == coupledToGlobalPatch[coupledPointi]
             )
             {
                 // I am the master
@@ -2669,24 +2669,24 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     labelList globalMaster(cpp.nPoints(), -1);
 
     nMasters = 0;
-    forAll(meshPoints, patchPointI)
+    forAll(meshPoints, patchPointi)
     {
-        if (patchToCoupled[patchPointI] == -1)
+        if (patchToCoupled[patchPointi] == -1)
         {
-            uniqueMeshPoints[nMasters++] = meshPoints[patchPointI];
+            uniqueMeshPoints[nMasters++] = meshPoints[patchPointi];
         }
         else
         {
-            label coupledPointI = patchToCoupled[patchPointI];
+            label coupledPointi = patchToCoupled[patchPointi];
             if
             (
-                globalPPoints.toGlobal(patchPointI)
-             == coupledToGlobalPatch[coupledPointI]
+                globalPPoints.toGlobal(patchPointi)
+             == coupledToGlobalPatch[coupledPointi]
             )
             {
-                globalMaster[coupledPointI] =
+                globalMaster[coupledPointi] =
                     globalPointsPtr().toGlobal(nMasters);
-                uniqueMeshPoints[nMasters++] = meshPoints[patchPointI];
+                uniqueMeshPoints[nMasters++] = meshPoints[patchPointi];
             }
         }
     }
@@ -2706,21 +2706,21 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     // Now everyone has the master point in globalPointsPtr numbering. Fill
     // in the pointToGlobal map.
     nMasters = 0;
-    forAll(meshPoints, patchPointI)
+    forAll(meshPoints, patchPointi)
     {
-        if (patchToCoupled[patchPointI] == -1)
+        if (patchToCoupled[patchPointi] == -1)
         {
-            pointToGlobal[patchPointI] = globalPointsPtr().toGlobal(nMasters++);
+            pointToGlobal[patchPointi] = globalPointsPtr().toGlobal(nMasters++);
         }
         else
         {
-            label coupledPointI = patchToCoupled[patchPointI];
-            pointToGlobal[patchPointI] = globalMaster[coupledPointI];
+            label coupledPointi = patchToCoupled[patchPointi];
+            pointToGlobal[patchPointi] = globalMaster[coupledPointi];
 
             if
             (
-                globalPPoints.toGlobal(patchPointI)
-             == coupledToGlobalPatch[coupledPointI]
+                globalPPoints.toGlobal(patchPointi)
+             == coupledToGlobalPatch[coupledPointi]
             )
             {
                 nMasters++;
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index caf5113ec6..524eb52abe 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -126,7 +126,7 @@ Foam::labelPairList Foam::globalPoints::addSendTransform
 void Foam::globalPoints::addToSend
 (
     const polyPatch& pp,
-    const label patchPointI,
+    const label patchPointi,
     const labelPairList& knownInfo,
 
     DynamicList<label>& patchFaces,
@@ -138,11 +138,11 @@ void Foam::globalPoints::addToSend
     // information is the patch faces using the point and the relative position
     // of the point in the face)
 
-    label meshPointI = pp.meshPoints()[patchPointI];
+    label meshPointi = pp.meshPoints()[patchPointi];
 
     // Add all faces using the point so we are sure we find it on the
     // other side.
-    const labelList& pFaces = pp.pointFaces()[patchPointI];
+    const labelList& pFaces = pp.pointFaces()[patchPointi];
 
     forAll(pFaces, i)
     {
@@ -151,7 +151,7 @@ void Foam::globalPoints::addToSend
         const face& f = pp[patchFacei];
 
         patchFaces.append(patchFacei);
-        indexInFace.append(findIndex(f, meshPointI));
+        indexInFace.append(findIndex(f, meshPointi));
 
         // Add patch transformation
         allInfo.append(addSendTransform(pp.index(), knownInfo));
@@ -162,7 +162,7 @@ void Foam::globalPoints::addToSend
 bool Foam::globalPoints::mergeInfo
 (
     const labelPairList& nbrInfo,
-    const label localPointI,
+    const label localPointi,
     labelPairList& myInfo
 ) const
 {
@@ -194,7 +194,7 @@ bool Foam::globalPoints::mergeInfo
         }
         else
         {
-            // Same point. So we already have a connection between localPointI
+            // Same point. So we already have a connection between localPointi
             // and the nbrIndex. Two situations:
             // - same transform
             // - one transform takes two steps, the other just a single.
@@ -240,14 +240,14 @@ bool Foam::globalPoints::mergeInfo
 Foam::label Foam::globalPoints::meshToLocalPoint
 (
     const Map<label>& meshToPatchPoint, // from mesh point to local numbering
-    const label meshPointI
+    const label meshPointi
 )
 {
     return
     (
         meshToPatchPoint.size() == 0
-      ? meshPointI
-      : meshToPatchPoint[meshPointI]
+      ? meshPointi
+      : meshToPatchPoint[meshPointi]
     );
 }
 
@@ -255,14 +255,14 @@ Foam::label Foam::globalPoints::meshToLocalPoint
 Foam::label Foam::globalPoints::localToMeshPoint
 (
     const labelList& patchToMeshPoint,
-    const label localPointI
+    const label localPointi
 )
 {
     return
     (
         patchToMeshPoint.size() == 0
-      ? localPointI
-      : patchToMeshPoint[localPointI]
+      ? localPointi
+      : patchToMeshPoint[localPointi]
     );
 }
 
@@ -270,20 +270,20 @@ Foam::label Foam::globalPoints::localToMeshPoint
 bool Foam::globalPoints::mergeInfo
 (
     const labelPairList& nbrInfo,
-    const label localPointI
+    const label localPointi
 )
 {
     // Updates database of current information on meshpoints with nbrInfo.  Uses
-    // mergeInfo above. Returns true if data kept for meshPointI changed.
+    // mergeInfo above. Returns true if data kept for meshPointi changed.
 
     label infoChanged = false;
 
     // Get the index into the procPoints list.
-    Map<label>::iterator iter = meshToProcPoint_.find(localPointI);
+    Map<label>::iterator iter = meshToProcPoint_.find(localPointi);
 
     if (iter != meshToProcPoint_.end())
     {
-        if (mergeInfo(nbrInfo, localPointI, procPoints_[iter()]))
+        if (mergeInfo(nbrInfo, localPointi, procPoints_[iter()]))
         {
             infoChanged = true;
         }
@@ -297,15 +297,15 @@ bool Foam::globalPoints::mergeInfo
             globalIndexAndTransform::encode
             (
                 Pstream::myProcNo(),
-                localPointI,
+                localPointi,
                 globalTransforms_.nullTransformIndex()
             )
         );
 
-        if (mergeInfo(nbrInfo, localPointI, knownInfo))
+        if (mergeInfo(nbrInfo, localPointi, knownInfo))
         {
             // Update addressing from into procPoints
-            meshToProcPoint_.insert(localPointI, procPoints_.size());
+            meshToProcPoint_.insert(localPointi, procPoints_.size());
             // Insert into list of equivalences.
             procPoints_.append(knownInfo);
 
@@ -319,20 +319,20 @@ bool Foam::globalPoints::mergeInfo
 bool Foam::globalPoints::storeInitialInfo
 (
     const labelPairList& nbrInfo,
-    const label localPointI
+    const label localPointi
 )
 {
     // Updates database of current information on meshpoints with nbrInfo.  Uses
-    // mergeInfo above. Returns true if data kept for meshPointI changed.
+    // mergeInfo above. Returns true if data kept for meshPointi changed.
 
     label infoChanged = false;
 
     // Get the index into the procPoints list.
-    Map<label>::iterator iter = meshToProcPoint_.find(localPointI);
+    Map<label>::iterator iter = meshToProcPoint_.find(localPointi);
 
     if (iter != meshToProcPoint_.end())
     {
-        if (mergeInfo(nbrInfo, localPointI, procPoints_[iter()]))
+        if (mergeInfo(nbrInfo, localPointi, procPoints_[iter()]))
         {
             infoChanged = true;
         }
@@ -340,7 +340,7 @@ bool Foam::globalPoints::storeInitialInfo
     else
     {
         // Update addressing into procPoints
-        meshToProcPoint_.insert(localPointI, procPoints_.size());
+        meshToProcPoint_.insert(localPointi, procPoints_.size());
         // Insert into list of equivalences.
         procPoints_.append(nbrInfo);
 
@@ -369,8 +369,8 @@ void Foam::globalPoints::printProcPoint
 
     if (proci == Pstream::myProcNo())
     {
-        label meshPointI = localToMeshPoint(patchToMeshPoint, index);
-        Pout<< " at:" <<  mesh_.points()[meshPointI];
+        label meshPointi = localToMeshPoint(patchToMeshPoint, index);
+        Pout<< " at:" <<  mesh_.points()[meshPointi];
     }
 }
 
@@ -409,13 +409,13 @@ void Foam::globalPoints::initOwnPoints
             if (allPoints)
             {
                 // All points on patch
-                forAll(meshPoints, patchPointI)
+                forAll(meshPoints, patchPointi)
                 {
-                    label meshPointI = meshPoints[patchPointI];
-                    label localPointI = meshToLocalPoint
+                    label meshPointi = meshPoints[patchPointi];
+                    label localPointi = meshToLocalPoint
                     (
                         meshToPatchPoint,
-                        meshPointI
+                        meshPointi
                     );
 
                     labelPairList knownInfo
@@ -424,19 +424,19 @@ void Foam::globalPoints::initOwnPoints
                         globalIndexAndTransform::encode
                         (
                             Pstream::myProcNo(),
-                            localPointI,
+                            localPointi,
                             globalTransforms_.nullTransformIndex()
                         )
                     );
 
-                    //Pout<< "For point "<< pp.points()[meshPointI]
+                    //Pout<< "For point "<< pp.points()[meshPointi]
                     //    << " inserting info " << knownInfo
                     //    << endl;
 
                     // Update changedpoints info.
-                    if (storeInitialInfo(knownInfo, localPointI))
+                    if (storeInitialInfo(knownInfo, localPointi))
                     {
-                        changedPoints.insert(localPointI);
+                        changedPoints.insert(localPointi);
                     }
                 }
             }
@@ -447,11 +447,11 @@ void Foam::globalPoints::initOwnPoints
 
                 forAll(boundaryPoints, i)
                 {
-                    label meshPointI = meshPoints[boundaryPoints[i]];
-                    label localPointI = meshToLocalPoint
+                    label meshPointi = meshPoints[boundaryPoints[i]];
+                    label localPointi = meshToLocalPoint
                     (
                         meshToPatchPoint,
-                        meshPointI
+                        meshPointi
                     );
 
                     labelPairList knownInfo
@@ -460,14 +460,14 @@ void Foam::globalPoints::initOwnPoints
                         globalIndexAndTransform::encode
                         (
                             Pstream::myProcNo(),
-                            localPointI,
+                            localPointi,
                             globalTransforms_.nullTransformIndex()
                         )
                     );
 
-                    if (storeInitialInfo(knownInfo, localPointI))
+                    if (storeInitialInfo(knownInfo, localPointi))
                     {
-                        changedPoints.insert(localPointI);
+                        changedPoints.insert(localPointi);
                     }
                 }
             }
@@ -518,27 +518,27 @@ void Foam::globalPoints::sendPatchPoints
 
             const labelList& meshPoints = pp.meshPoints();
 
-            forAll(meshPoints, patchPointI)
+            forAll(meshPoints, patchPointi)
             {
-                label meshPointI = meshPoints[patchPointI];
-                label localPointI = meshToLocalPoint
+                label meshPointi = meshPoints[patchPointi];
+                label localPointi = meshToLocalPoint
                 (
                     meshToPatchPoint,
-                    meshPointI
+                    meshPointi
                 );
 
-                if (changedPoints.found(localPointI))
+                if (changedPoints.found(localPointi))
                 {
-                    label index = meshToProcPoint_[localPointI];
+                    label index = meshToProcPoint_[localPointi];
 
                     const labelPairList& knownInfo = procPoints_[index];
 
-                    // Add my information about localPointI to the
+                    // Add my information about localPointi to the
                     // send buffers. Encode the transformation
                     addToSend
                     (
                         pp,
-                        patchPointI,
+                        patchPointi,
                         knownInfo,
 
                         patchFaces,
@@ -622,17 +622,17 @@ void Foam::globalPoints::receivePatchPoints
                 label index = (f.size() - indexInFace[i]) % f.size();
 
                 // Get the meshpoint on my side
-                label meshPointI = f[index];
+                label meshPointi = f[index];
 
-                label localPointI = meshToLocalPoint
+                label localPointi = meshToLocalPoint
                 (
                     meshToPatchPoint,
-                    meshPointI
+                    meshPointi
                 );
 
-                if (mergeInfo(nbrInfo[i], localPointI))
+                if (mergeInfo(nbrInfo[i], localPointi))
                 {
-                    changedPoints.insert(localPointI);
+                    changedPoints.insert(localPointi);
                 }
             }
         }
@@ -740,7 +740,7 @@ void Foam::globalPoints::remove
     // Go through all equivalences
     forAllConstIter(Map<label>, oldMeshToProcPoint, iter)
     {
-        label localPointI = iter.key();
+        label localPointi = iter.key();
         const labelPairList& pointInfo = oldProcPoints[iter()];
 
         if (pointInfo.size() == 2)
@@ -801,7 +801,7 @@ void Foam::globalPoints::remove
                 // be found if the two domains are face connected at all
                 // (not shown in the picture)
 
-                meshToProcPoint_.insert(localPointI, procPoints_.size());
+                meshToProcPoint_.insert(localPointi, procPoints_.size());
                 procPoints_.append(pointInfo);
             }
         }
@@ -820,13 +820,13 @@ void Foam::globalPoints::remove
                 )
             )
             {
-                meshToProcPoint_.insert(localPointI, procPoints_.size());
+                meshToProcPoint_.insert(localPointi, procPoints_.size());
                 procPoints_.append(pointInfo);
             }
         }
         else
         {
-            meshToProcPoint_.insert(localPointI, procPoints_.size());
+            meshToProcPoint_.insert(localPointi, procPoints_.size());
             procPoints_.append(pointInfo);
         }
     }
@@ -972,7 +972,7 @@ void Foam::globalPoints::calculateSharedPoints
     //{
     //    label localI = iter.key();
     //    const labelPairList& pointInfo = procPoints_[iter()];
-    //    Pout<< "pointI:" << localI << " index:" << iter()
+    //    Pout<< "pointi:" << localI << " index:" << iter()
     //        << " coord:"
     //        << mesh_.points()[localToMeshPoint(patchToMeshPoint, localI)]
     //        << endl;
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
index de7a6b88d0..20dbd3bc1c 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,16 +152,16 @@ class globalPoints
 
         labelPairList addSendTransform
         (
-            const label patchI,
+            const label patchi,
             const labelPairList& info
         ) const;
 
-        //- Add information about patchPointI in relative indices to send
+        //- Add information about patchPointi in relative indices to send
         //  buffers (patchFaces, indexInFace etc.)
         void addToSend
         (
             const polyPatch&,
-            const label patchPointI,
+            const label patchPointi,
             const labelPairList&,
             DynamicList<label>& patchFaces,
             DynamicList<label>& indexInFace,
@@ -172,7 +172,7 @@ class globalPoints
         bool mergeInfo
         (
             const labelPairList& nbrInfo,
-            const label localPointI,
+            const label localPointi,
             labelPairList& myInfo
         ) const;
 
@@ -181,28 +181,28 @@ class globalPoints
         static label meshToLocalPoint
         (
             const Map<label>& meshToPatchPoint,
-            const label meshPointI
+            const label meshPointi
         );
 
         //- Opposite of meshToLocalPoint.
         static label localToMeshPoint
         (
             const labelList& patchToMeshPoint,
-            const label localPointI
+            const label localPointi
         );
 
-        //- Store (and merge) info for meshPointI
+        //- Store (and merge) info for meshPointi
         bool storeInitialInfo
         (
             const labelPairList& nbrInfo,
-            const label localPointI
+            const label localPointi
         );
 
-        //- Store (and merge) info for meshPointI
+        //- Store (and merge) info for meshPointi
         bool mergeInfo
         (
             const labelPairList& nbrInfo,
-            const label localPointI
+            const label localPointi
         );
 
         //- Debug printing
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index cf20684fc4..03f1c8a55d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -52,19 +52,19 @@ Description
     \par points
 
     - unchanged:
-        - pointMap[pointI] contains old point label
-        - reversePointMap[oldPointI] contains new point label
+        - pointMap[pointi] contains old point label
+        - reversePointMap[oldPointi] contains new point label
     - removed:
-        - reversePointMap[oldPointI] contains -1
+        - reversePointMap[oldPointi] contains -1
     - merged into point:
-        - reversePointMap[oldPointI] contains <-1 : -newPointI-2
-        - pointMap[pointI] contains the old master point label
-        - pointsFromPoints gives for pointI all the old point labels
+        - reversePointMap[oldPointi] contains <-1 : -newPointi-2
+        - pointMap[pointi] contains the old master point label
+        - pointsFromPoints gives for pointi all the old point labels
           (including the old master point!)
     - added-from-same:
-        - pointMap[pointI] contains the old master point label
+        - pointMap[pointi] contains the old master point label
     - appended:
-        - pointMap[pointI] contains -1
+        - pointMap[pointi] contains -1
 
     \par faces
 
@@ -468,9 +468,9 @@ public:
 
                 //- If point is removed return point (on new mesh) it merged
                 //  into
-                label mergedPoint(const label oldPointI) const
+                label mergedPoint(const label oldPointi) const
                 {
-                    label i = reversePointMap_[oldPointI];
+                    label i = reversePointMap_[oldPointi];
 
                     if (i == -1)
                     {
@@ -483,7 +483,7 @@ public:
                     else
                     {
                         FatalErrorInFunction
-                            << "old point label " << oldPointI
+                            << "old point label " << oldPointi
                             << " has reverseMap " << i << endl
                             << "Only call mergedPoint for removed points."
                             << abort(FatalError);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 96f81efa0c..f15e2b2b6a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -1315,24 +1315,24 @@ bool Foam::polyMesh::pointInCell
 
                 forAll(f, fp)
                 {
-                    label pointI;
-                    label nextPointI;
+                    label pointi;
+                    label nextPointi;
 
                     if (isOwn)
                     {
-                        pointI = f[fp];
-                        nextPointI = f.nextLabel(fp);
+                        pointi = f[fp];
+                        nextPointi = f.nextLabel(fp);
                     }
                     else
                     {
-                        pointI = f.nextLabel(fp);
-                        nextPointI = f[fp];
+                        pointi = f.nextLabel(fp);
+                        nextPointi = f[fp];
                     }
 
                     triPointRef faceTri
                     (
-                        points()[pointI],
-                        points()[nextPointI],
+                        points()[pointi],
+                        points()[nextPointi],
                         fc
                     );
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 0348bf64ec..51277de647 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -61,9 +61,9 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
 
     labelListList pointCellAddr(pc.size());
 
-    forAll(pc, pointI)
+    forAll(pc, pointi)
     {
-        pointCellAddr[pointI].transfer(pc[pointI]);
+        pointCellAddr[pointi].transfer(pc[pointi]);
     }
 
     return pointCellAddr;
@@ -89,9 +89,9 @@ Foam::labelList Foam::polyMesh::facePatchFaceCells
         const face& curFace = patchFaces[fI];
         const labelList& facePoints = patchFaces[fI];
 
-        forAll(facePoints, pointI)
+        forAll(facePoints, pointi)
         {
-            const labelList& facePointCells = pointCells[facePoints[pointI]];
+            const labelList& facePointCells = pointCells[facePoints[pointi]];
 
             forAll(facePointCells, celli)
             {
@@ -203,11 +203,11 @@ void Foam::polyMesh::setTopology
             const labelList& curPoints = curFace;
 
             // For all points
-            forAll(curPoints, pointI)
+            forAll(curPoints, pointi)
             {
                 // dGget the list of cells sharing this point
                 const labelList& curNeighbours =
-                    PointCells[curPoints[pointI]];
+                    PointCells[curPoints[pointi]];
 
                 // For all neighbours
                 forAll(curNeighbours, neiI)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index 6e13ab57ee..cc6ccfce0d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
@@ -82,11 +82,11 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
 
         // Any points created out-of-nothing get set to the current coordinate
         // for lack of anything better.
-        forAll(mpm.pointMap(), newPointI)
+        forAll(mpm.pointMap(), newPointi)
         {
-            if (mpm.pointMap()[newPointI] == -1)
+            if (mpm.pointMap()[newPointi] == -1)
             {
-                newMotionPoints[newPointI] = points_[newPointI];
+                newMotionPoints[newPointi] = points_[newPointi];
             }
         }
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 2b43b31ce3..3fe355bfd7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -354,15 +354,15 @@ void Foam::processorPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
         labelList pointFace(nPoints());
         labelList pointIndex(nPoints());
 
-        for (label patchPointI = 0; patchPointI < nPoints(); patchPointI++)
+        for (label patchPointi = 0; patchPointi < nPoints(); patchPointi++)
         {
-            label facei = pointFaces()[patchPointI][0];
+            label facei = pointFaces()[patchPointi][0];
 
-            pointFace[patchPointI] = facei;
+            pointFace[patchPointi] = facei;
 
             const face& f = localFaces()[facei];
 
-            pointIndex[patchPointI] = findIndex(f, patchPointI);
+            pointIndex[patchPointi] = findIndex(f, patchPointi);
         }
 
         // Express all edges as patch face and index in face.
@@ -433,32 +433,32 @@ void Foam::processorPolyPatch::updateMesh(PstreamBuffers& pBufs)
         neighbPointsPtr_.reset(new labelList(nPoints(), -1));
         labelList& neighbPoints = neighbPointsPtr_();
 
-        forAll(nbrPointFace, nbrPointI)
+        forAll(nbrPointFace, nbrPointi)
         {
             // Find face and index in face on this side.
-            const face& f = localFaces()[nbrPointFace[nbrPointI]];
+            const face& f = localFaces()[nbrPointFace[nbrPointi]];
 
-            label index = (f.size() - nbrPointIndex[nbrPointI]) % f.size();
-            label patchPointI = f[index];
+            label index = (f.size() - nbrPointIndex[nbrPointi]) % f.size();
+            label patchPointi = f[index];
 
-            if (neighbPoints[patchPointI] == -1)
+            if (neighbPoints[patchPointi] == -1)
             {
                 // First reference of point
-                neighbPoints[patchPointI] = nbrPointI;
+                neighbPoints[patchPointi] = nbrPointi;
             }
-            else if (neighbPoints[patchPointI] >= 0)
+            else if (neighbPoints[patchPointi] >= 0)
             {
                 // Point already visited. Mark as duplicate.
-                neighbPoints[patchPointI] = -2;
+                neighbPoints[patchPointi] = -2;
             }
         }
 
         // Reset all duplicate entries to -1.
-        forAll(neighbPoints, patchPointI)
+        forAll(neighbPoints, patchPointi)
         {
-            if (neighbPoints[patchPointI] == -2)
+            if (neighbPoints[patchPointi] == -2)
             {
-                neighbPoints[patchPointI] = -1;
+                neighbPoints[patchPointi] = -1;
             }
         }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
index 6cf22e3001..828f4f82e0 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
@@ -73,32 +73,32 @@ Foam::PackedBoolList Foam::syncTools::getMasterPoints(const polyMesh& mesh)
     const labelListList& transformedSlaves =
             globalData.globalPointTransformedSlaves();
 
-    forAll(meshPoints, coupledPointI)
+    forAll(meshPoints, coupledPointi)
     {
-        label meshPointI = meshPoints[coupledPointI];
+        label meshPointi = meshPoints[coupledPointi];
         if
         (
             (
-                slaves[coupledPointI].size()
-              + transformedSlaves[coupledPointI].size()
+                slaves[coupledPointi].size()
+              + transformedSlaves[coupledPointi].size()
             )
           > 0
         )
         {
-            isMasterPoint[meshPointI] = true;
+            isMasterPoint[meshPointi] = true;
         }
-        donePoint[meshPointI] = true;
+        donePoint[meshPointi] = true;
     }
 
 
     // Do all other points
     // ~~~~~~~~~~~~~~~~~~~
 
-    forAll(donePoint, pointI)
+    forAll(donePoint, pointi)
     {
-        if (!donePoint[pointI])
+        if (!donePoint[pointi])
         {
-            isMasterPoint[pointI] = true;
+            isMasterPoint[pointi] = true;
         }
     }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 8646a5e939..627bbc2fd6 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -108,10 +108,10 @@ void Foam::syncTools::syncPointMap
         // Fill my entries in the shared points
         forAll(sharedPtLabels, i)
         {
-            label meshPointI = sharedPtLabels[i];
+            label meshPointi = sharedPtLabels[i];
 
             typename Map<T>::const_iterator fnd =
-                pointValues.find(meshPointI);
+                pointValues.find(meshPointi);
 
             if (fnd != pointValues.end())
             {
@@ -791,9 +791,9 @@ void Foam::syncTools::syncEdgeMap
 //
 //        forAll(pd.sharedPointLabels(), i)
 //        {
-//            label meshPointI = pd.sharedPointLabels()[i];
+//            label meshPointi = pd.sharedPointLabels()[i];
 //            // Fill my entries in the shared points
-//            sharedPts[pd.sharedPointAddr()[i]] = pointValues[meshPointI];
+//            sharedPts[pd.sharedPointAddr()[i]] = pointValues[meshPointi];
 //        }
 //    }
 //
@@ -820,10 +820,10 @@ void Foam::syncTools::syncEdgeMap
 //                const labelList& meshPts = procPatch.meshPoints();
 //                const labelList& nbrPts = procPatch.neighbPoints();
 //
-//                forAll(nbrPts, pointI)
+//                forAll(nbrPts, pointi)
 //                {
-//                    label nbrPointI = nbrPts[pointI];
-//                    patchInfo[nbrPointI] = pointValues[meshPts[pointI]];
+//                    label nbrPointi = nbrPts[pointi];
+//                    patchInfo[nbrPointi] = pointValues[meshPts[pointi]];
 //                }
 //
 //                UOPstream toNbr(procPatch.neighbProcNo(), pBufs);
@@ -857,10 +857,10 @@ void Foam::syncTools::syncEdgeMap
 //
 //                const labelList& meshPts = procPatch.meshPoints();
 //
-//                forAll(meshPts, pointI)
+//                forAll(meshPts, pointi)
 //                {
-//                    label meshPointI = meshPts[pointI];
-//                    cop(pointValues[meshPointI], nbrPatchInfo[pointI]);
+//                    label meshPointi = meshPts[pointi];
+//                    cop(pointValues[meshPointi], nbrPatchInfo[pointi]);
 //                }
 //            }
 //        }
@@ -924,8 +924,8 @@ void Foam::syncTools::syncEdgeMap
 //        // my local information.
 //        forAll(pd.sharedPointLabels(), i)
 //        {
-//            label meshPointI = pd.sharedPointLabels()[i];
-//            pointValues[meshPointI] = sharedPts[pd.sharedPointAddr()[i]];
+//            label meshPointi = pd.sharedPointLabels()[i];
+//            pointValues[meshPointi] = sharedPts[pd.sharedPointAddr()[i]];
 //        }
 //    }
 //}
@@ -1046,8 +1046,8 @@ void Foam::syncTools::syncPointList
 
     forAll(meshPoints, i)
     {
-        label pointI = meshPoints[i];
-        Map<label>::const_iterator iter = mpm.find(pointI);
+        label pointi = meshPoints[i];
+        Map<label>::const_iterator iter = mpm.find(pointi);
         if (iter != mpm.end())
         {
             cppFld[iter()] = pointValues[i];
@@ -1067,8 +1067,8 @@ void Foam::syncTools::syncPointList
 
     forAll(meshPoints, i)
     {
-        label pointI = meshPoints[i];
-        Map<label>::const_iterator iter = mpm.find(pointI);
+        label pointi = meshPoints[i];
+        Map<label>::const_iterator iter = mpm.find(pointi);
         if (iter != mpm.end())
         {
             pointValues[i] = cppFld[iter()];
@@ -1102,8 +1102,8 @@ void Foam::syncTools::syncPointList
 //
 //    forAll(meshPoints, i)
 //    {
-//        label pointI = meshPoints[i];
-//        Map<label>::const_iterator iter = mpm.find(pointI);
+//        label pointi = meshPoints[i];
+//        Map<label>::const_iterator iter = mpm.find(pointi);
 //        if (iter != mpm.end())
 //        {
 //            cppFld[iter()] = pointValues[i];
@@ -1124,8 +1124,8 @@ void Foam::syncTools::syncPointList
 //
 //    forAll(meshPoints, i)
 //    {
-//        label pointI = meshPoints[i];
-//        Map<label>::const_iterator iter = mpm.find(pointI);
+//        label pointi = meshPoints[i];
+//        Map<label>::const_iterator iter = mpm.find(pointi);
 //        if (iter != mpm.end())
 //        {
 //            pointValues[i] = cppFld[iter()];
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index 30d1161bb7..ccb109025d 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,37 +143,37 @@ bool Foam::pointZone::checkParallelSync(const bool report) const
     labelList minZone(mesh.nPoints(), labelMax);
     forAll(*this, i)
     {
-        label pointI = operator[](i);
-        maxZone[pointI] = index();
-        minZone[pointI] = index();
+        label pointi = operator[](i);
+        maxZone[pointi] = index();
+        minZone[pointi] = index();
     }
     syncTools::syncPointList(mesh, maxZone, maxEqOp<label>(), label(-1));
     syncTools::syncPointList(mesh, minZone, minEqOp<label>(), labelMax);
 
     bool error = false;
 
-    forAll(maxZone, pointI)
+    forAll(maxZone, pointi)
     {
         // Check point in same (or no) zone on all processors
         if
         (
             (
-                maxZone[pointI] != -1
-             || minZone[pointI] != labelMax
+                maxZone[pointi] != -1
+             || minZone[pointi] != labelMax
             )
-         && (maxZone[pointI] != minZone[pointI])
+         && (maxZone[pointi] != minZone[pointi])
         )
         {
             if (report && !error)
             {
                 Info<< " ***Problem with pointZone " << index()
                     << " named " << name()
-                    << ". Point " << pointI
-                    << " at " << mesh.points()[pointI]
+                    << ". Point " << pointi
+                    << " at " << mesh.points()[pointi]
                     << " is in zone "
-                    << (minZone[pointI] == labelMax ? -1 : minZone[pointI])
+                    << (minZone[pointi] == labelMax ? -1 : minZone[pointi])
                     << " on some processors and in zone "
-                    << maxZone[pointI]
+                    << maxZone[pointi]
                     << " on some other processors." << nl
                     << "(suppressing further warnings)"
                     << endl;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
index 1af68e8991..a3c9427ec5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,18 +52,18 @@ void Foam::PatchTools::matchPoints
 
     label nMatches = 0;
 
-    forAll(p1.meshPoints(), pointI)
+    forAll(p1.meshPoints(), pointi)
     {
-        label meshPointI = p1.meshPoints()[pointI];
+        label meshPointi = p1.meshPoints()[pointi];
 
         Map<label>::const_iterator iter = p2.meshPointMap().find
         (
-            meshPointI
+            meshPointi
         );
 
         if (iter != p2.meshPointMap().end())
         {
-            p1PointLabels[nMatches] = pointI;
+            p1PointLabels[nMatches] = pointi;
             p2PointLabels[nMatches] = iter();
             nMatches++;
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
index a6708015a1..080ae52105 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
@@ -64,16 +64,16 @@ Foam::PatchTools::pointNormals
     {
         // Collect local pointFaces (sized on patch points only)
         List<List<point>> pointFaceNormals(map.constructSize());
-        forAll(p.meshPoints(), patchPointI)
+        forAll(p.meshPoints(), patchPointi)
         {
-            label meshPointI = p.meshPoints()[patchPointI];
-            Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointI);
+            label meshPointi = p.meshPoints()[patchPointi];
+            Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointi);
             if (fnd != coupledPatchMP.end())
             {
-                label coupledPointI = fnd();
+                label coupledPointi = fnd();
 
-                List<point>& pNormals = pointFaceNormals[coupledPointI];
-                const labelList& pFaces = p.pointFaces()[patchPointI];
+                List<point>& pNormals = pointFaceNormals[coupledPointi];
+                const labelList& pFaces = p.pointFaces()[patchPointi];
                 pNormals.setSize(pFaces.size());
                 forAll(pFaces, i)
                 {
@@ -99,16 +99,16 @@ Foam::PatchTools::pointNormals
         const labelListList& transformedSlaves =
             globalData.globalPointTransformedSlaves();
 
-        forAll(slaves, coupledPointI)
+        forAll(slaves, coupledPointi)
         {
-            const labelList& slaveSlots = slaves[coupledPointI];
+            const labelList& slaveSlots = slaves[coupledPointi];
             const labelList& transformedSlaveSlots =
-                transformedSlaves[coupledPointI];
+                transformedSlaves[coupledPointi];
 
-            point& n = coupledPointNormals[coupledPointI];
+            point& n = coupledPointNormals[coupledPointi];
 
             // Local entries
-            const List<point>& local = pointFaceNormals[coupledPointI];
+            const List<point>& local = pointFaceNormals[coupledPointi];
 
             label nFaces =
                 local.size()
@@ -178,14 +178,14 @@ Foam::PatchTools::pointNormals
 
 
     // 2. Override patch normals on coupled points
-    forAll(p.meshPoints(), patchPointI)
+    forAll(p.meshPoints(), patchPointi)
     {
-        label meshPointI = p.meshPoints()[patchPointI];
-        Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointI);
+        label meshPointi = p.meshPoints()[patchPointi];
+        Map<label>::const_iterator fnd = coupledPatchMP.find(meshPointi);
         if (fnd != coupledPatchMP.end())
         {
-            label coupledPointI = fnd();
-            extrudeN[patchPointI] = coupledPointNormals[coupledPointI];
+            label coupledPointi = fnd();
+            extrudeN[patchPointi] = coupledPointNormals[coupledPointi];
         }
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
index c2acf75f23..d621df5ca3 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
@@ -167,7 +167,7 @@ Foam::PatchTools::subsetMap
 )
 {
     label facei  = 0;
-    label pointI = 0;
+    label pointi = 0;
 
     const List<Face>& localFaces = p.localFaces();
 
@@ -192,7 +192,7 @@ Foam::PatchTools::subsetMap
                 if (!pointHad[ptLabel])
                 {
                     pointHad[ptLabel]  = true;
-                    pointMap[pointI++] = ptLabel;
+                    pointMap[pointi++] = ptLabel;
                 }
             }
         }
@@ -200,7 +200,7 @@ Foam::PatchTools::subsetMap
 
     // Trim
     faceMap.setSize(facei);
-    pointMap.setSize(pointI);
+    pointMap.setSize(pointi);
 }
 
 
@@ -233,11 +233,11 @@ void Foam::PatchTools::calcBounds
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
-            if (pointIsUsed.set(pointI, 1u))
+            label pointi = f[fp];
+            if (pointIsUsed.set(pointi, 1u))
             {
-                bb.min() = ::Foam::min(bb.min(), points[pointI]);
-                bb.max() = ::Foam::max(bb.max(), points[pointI]);
+                bb.min() = ::Foam::min(bb.min(), points[pointi]);
+                bb.max() = ::Foam::max(bb.max(), points[pointi]);
                 nPoints++;
             }
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C
index 165d98f325..784b78bb44 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C
@@ -53,9 +53,9 @@ Foam::PatchTools::sortedPointEdges
 
     DynamicList<label> newEdgeList;
 
-    forAll(pointEdges, pointI)
+    forAll(pointEdges, pointi)
     {
-        const labelList& pEdges = pointEdges[pointI];
+        const labelList& pEdges = pointEdges[pointi];
 
         label nPointEdges = pEdges.size();
 
@@ -97,7 +97,7 @@ Foam::PatchTools::sortedPointEdges
                 if
                 (
                     nextEdgeI != edgeI
-                 && (nextEdge.start() == pointI || nextEdge.end() == pointI)
+                 && (nextEdge.start() == pointi || nextEdge.end() == pointi)
                 )
                 {
                     edgeI = nextEdgeI;
@@ -143,7 +143,7 @@ Foam::PatchTools::sortedPointEdges
                 }
             }
 
-            sortedPointEdges[pointI] = newEdgeList;
+            sortedPointEdges[pointi] = newEdgeList;
         }
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index d2a5b4d0de..f1721d8e1a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -224,7 +224,7 @@ private:
         //  Used to determine if surface multiply connected through point.
         void visitPointRegion
         (
-            const label pointI,
+            const label pointi,
             const labelList& pFaces,
             const label startFacei,
             const label startEdgeI,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
index ba320a6db8..80cc44a370 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
@@ -43,7 +43,7 @@ void
 Foam::PrimitivePatch<Face, FaceList, PointField, PointType>::
 visitPointRegion
 (
-    const label pointI,
+    const label pointi,
     const labelList& pFaces,
     const label startFacei,
     const label startEdgeI,
@@ -57,7 +57,7 @@ visitPointRegion
         // Mark face as been visited.
         pFacesHad[index] = true;
 
-        // Step to next edge on face which is still using pointI
+        // Step to next edge on face which is still using pointi
         const labelList& fEdges = faceEdges()[startFacei];
 
         label nextEdgeI = -1;
@@ -68,7 +68,7 @@ visitPointRegion
 
             const edge& e = edges()[edgeI];
 
-            if (edgeI != startEdgeI && (e[0] == pointI || e[1] == pointI))
+            if (edgeI != startEdgeI && (e[0] == pointi || e[1] == pointi))
             {
                 nextEdgeI = edgeI;
 
@@ -80,7 +80,7 @@ visitPointRegion
         {
             FatalErrorInFunction
                 << "Problem: cannot find edge out of " << fEdges
-                << "on face " << startFacei << " that uses point " << pointI
+                << "on face " << startFacei << " that uses point " << pointi
                 << " and is not edge " << startEdgeI << abort(FatalError);
         }
 
@@ -93,7 +93,7 @@ visitPointRegion
             {
                 visitPointRegion
                 (
-                    pointI,
+                    pointi,
                     pFaces,
                     eFaces[i],
                     nextEdgeI,
@@ -237,26 +237,26 @@ checkPointManifold
 
     bool foundError = false;
 
-    forAll(pf, pointI)
+    forAll(pf, pointi)
     {
-        const labelList& pFaces = pf[pointI];
+        const labelList& pFaces = pf[pointi];
 
         // Visited faces (as indices into pFaces)
         boolList pFacesHad(pFaces.size(), false);
 
         // Starting edge
-        const labelList& pEdges = pe[pointI];
+        const labelList& pEdges = pe[pointi];
         label startEdgeI = pEdges[0];
 
         const labelList& eFaces = ef[startEdgeI];
 
         forAll(eFaces, i)
         {
-            // Visit all faces using pointI, starting from eFaces[i] and
+            // Visit all faces using pointi, starting from eFaces[i] and
             // startEdgeI. Mark off all faces visited in pFacesHad.
             this->visitPointRegion
             (
-                pointI,
+                pointi,
                 pFaces,
                 eFaces[i],  // starting face for walk
                 startEdgeI, // starting edge for walk
@@ -264,7 +264,7 @@ checkPointManifold
             );
         }
 
-        // After this all faces using pointI should have been visited and
+        // After this all faces using pointi should have been visited and
         // marked off in pFacesHad.
 
         label unset = findIndex(pFacesHad, false);
@@ -273,16 +273,16 @@ checkPointManifold
         {
             foundError = true;
 
-            label meshPointI = mp[pointI];
+            label meshPointi = mp[pointi];
 
             if (setPtr)
             {
-                setPtr->insert(meshPointI);
+                setPtr->insert(meshPointi);
             }
 
             if (report)
             {
-                Info<< "Point " << meshPointI
+                Info<< "Point " << meshPointi
                     << " uses faces which are not connected through an edge"
                     << nl
                     << "This means that the surface formed by this patched"
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
index b74ea9048f..2a6ab9621a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
@@ -96,13 +96,13 @@ calcLocalPointOrder() const
                     const labelList& curPoints = lf[curFace];
 
                     // mark points
-                    forAll(curPoints, pointI)
+                    forAll(curPoints, pointi)
                     {
-                        if (!visitedPoint[curPoints[pointI]])
+                        if (!visitedPoint[curPoints[pointi]])
                         {
-                            visitedPoint[curPoints[pointI]] = true;
+                            visitedPoint[curPoints[pointi]] = true;
 
-                            pointOrder[nPoints] = curPoints[pointI];
+                            pointOrder[nPoints] = curPoints[pointi];
 
                             nPoints++;
                         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
index 678de0e20f..d78baba97a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
@@ -141,10 +141,10 @@ meshEdges
     // local-to-global point label translation is necessary
     forAll(PatchEdges, edgeI)
     {
-        const label globalPointI = pp[PatchEdges[edgeI].start()];
-        const edge curEdge(globalPointI, pp[PatchEdges[edgeI].end()]);
+        const label globalPointi = pp[PatchEdges[edgeI].start()];
+        const edge curEdge(globalPointi, pp[PatchEdges[edgeI].end()]);
 
-        const labelList& pe = pointEdges[globalPointI];
+        const labelList& pe = pointEdges[globalPointi];
 
         forAll(pe, i)
         {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index b58fd053f0..212396e419 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -105,9 +105,9 @@ calcPointFaces() const
     {
         const Face& curPoints = f[facei];
 
-        forAll(curPoints, pointI)
+        forAll(curPoints, pointi)
         {
-            pointFcs[curPoints[pointI]].append(facei);
+            pointFcs[curPoints[pointi]].append(facei);
         }
     }
 
@@ -116,14 +116,14 @@ calcPointFaces() const
 
     labelListList& pf = *pointFacesPtr_;
 
-    forAll(pointFcs, pointI)
+    forAll(pointFcs, pointi)
     {
-        pf[pointI].setSize(pointFcs[pointI].size());
+        pf[pointi].setSize(pointFcs[pointi].size());
 
         label i = 0;
-        forAllIter(SLList<label>, pointFcs[pointI], curFacesIter)
+        forAllIter(SLList<label>, pointFcs[pointi], curFacesIter)
         {
-            pf[pointI][i++] = curFacesIter();
+            pf[pointi][i++] = curFacesIter();
         }
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
index 407773a3ac..4e7cb4c717 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
@@ -97,10 +97,10 @@ projectPoints
     label curFace = 0;
     label nNSquaredSearches = 0;
 
-    forAll(slavePointOrder, pointI)
+    forAll(slavePointOrder, pointi)
     {
         // Pick up slave point and direction
-        const label curLocalPointLabel = slavePointOrder[pointI];
+        const label curLocalPointLabel = slavePointOrder[pointi];
 
         const PointType& curPoint =
             points_[slaveMeshPoints[curLocalPointLabel]];
@@ -119,7 +119,7 @@ projectPoints
 
         // Force the full search for the first point to ensure good
         // starting face
-        if (pointI == 0)
+        if (pointi == 0)
         {
             doNSquaredSearch = true;
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index 78e6ce36ff..e514f7b432 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -149,11 +149,11 @@ bool Foam::primitiveMesh::calcPointOrder
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
+            label pointi = f[fp];
 
-            if (oldToNew[pointI] == -1)
+            if (oldToNew[pointi] == -1)
             {
-                oldToNew[pointI] = nBoundaryPoints++;
+                oldToNew[pointi] = nBoundaryPoints++;
             }
         }
     }
@@ -163,11 +163,11 @@ bool Foam::primitiveMesh::calcPointOrder
     nInternalPoints = nPoints - nBoundaryPoints;
 
     // Move the boundary addressing up
-    forAll(oldToNew, pointI)
+    forAll(oldToNew, pointi)
     {
-        if (oldToNew[pointI] != -1)
+        if (oldToNew[pointi] != -1)
         {
-            oldToNew[pointI] += nInternalPoints;
+            oldToNew[pointi] += nInternalPoints;
         }
     }
 
@@ -175,7 +175,7 @@ bool Foam::primitiveMesh::calcPointOrder
     // 2. Compact the internal points. Detect whether internal and boundary
     // points are mixed.
 
-    label internalPointI = 0;
+    label internalPointi = 0;
 
     bool ordered = true;
 
@@ -185,15 +185,15 @@ bool Foam::primitiveMesh::calcPointOrder
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
+            label pointi = f[fp];
 
-            if (oldToNew[pointI] == -1)
+            if (oldToNew[pointi] == -1)
             {
-                if (pointI >= nInternalPoints)
+                if (pointi >= nInternalPoints)
                 {
                     ordered = false;
                 }
-                oldToNew[pointI] = internalPointI++;
+                oldToNew[pointi] = internalPointi++;
             }
         }
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index ede3d58ceb..233b982326 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -830,20 +830,20 @@ public:
             //- pointCells using pointFaces
             const labelList& pointCells
             (
-                const label pointI,
+                const label pointi,
                 DynamicList<label>&
             ) const;
 
-            const labelList& pointCells(const label pointI) const;
+            const labelList& pointCells(const label pointi) const;
 
             //- pointPoints using edges, pointEdges
             const labelList& pointPoints
             (
-                const label pointI,
+                const label pointi,
                 DynamicList<label>&
             ) const;
 
-            const labelList& pointPoints(const label pointI) const;
+            const labelList& pointPoints(const label pointi) const;
 
             //- faceEdges using pointFaces, edges, pointEdges
             const labelList& faceEdges
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 913423c74e..681024b48c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -1312,13 +1312,13 @@ bool Foam::primitiveMesh::checkPoints
 
     const labelListList& pf = pointFaces();
 
-    forAll(pf, pointI)
+    forAll(pf, pointi)
     {
-        if (pf[pointI].empty())
+        if (pf[pointi].empty())
         {
             if (setPtr)
             {
-                setPtr->insert(pointI);
+                setPtr->insert(pointi);
             }
 
             nFaceErrors++;
@@ -1326,15 +1326,15 @@ bool Foam::primitiveMesh::checkPoints
     }
 
 
-    forAll(pf, pointI)
+    forAll(pf, pointi)
     {
-        const labelList& pc = pointCells(pointI);
+        const labelList& pc = pointCells(pointi);
 
         if (pc.empty())
         {
             if (setPtr)
             {
-                setPtr->insert(pointI);
+                setPtr->insert(pointi);
             }
 
             nCellErrors++;
@@ -1598,9 +1598,9 @@ bool Foam::primitiveMesh::checkFaceFaces
 
         forAll(curFace, fp)
         {
-            label pointI = curFace[fp];
+            label pointi = curFace[fp];
 
-            const labelList& nbs = pf[pointI];
+            const labelList& nbs = pf[pointi];
 
             forAll(nbs, nbI)
             {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index 2240905946..72a27c7bc3 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -36,18 +36,18 @@ Foam::label Foam::primitiveMesh::getEdge
     List<DynamicList<label>>& pe,
     DynamicList<edge>& es,
 
-    const label pointI,
-    const label nextPointI
+    const label pointi,
+    const label nextPointi
 )
 {
-    // Find connection between pointI and nextPointI
-    forAll(pe[pointI], ppI)
+    // Find connection between pointi and nextPointi
+    forAll(pe[pointi], ppI)
     {
-        label eI = pe[pointI][ppI];
+        label eI = pe[pointi][ppI];
 
         const edge& e = es[eI];
 
-        if (e.start() == nextPointI || e.end() == nextPointI)
+        if (e.start() == nextPointi || e.end() == nextPointi)
         {
             return eI;
         }
@@ -55,15 +55,15 @@ Foam::label Foam::primitiveMesh::getEdge
 
     // Make new edge.
     label edgeI = es.size();
-    pe[pointI].append(edgeI);
-    pe[nextPointI].append(edgeI);
-    if (pointI < nextPointI)
+    pe[pointi].append(edgeI);
+    pe[nextPointi].append(edgeI);
+    if (pointi < nextPointi)
     {
-        es.append(edge(pointI, nextPointI));
+        es.append(edge(pointi, nextPointi));
     }
     else
     {
-        es.append(edge(nextPointI, pointI));
+        es.append(edge(nextPointi, pointi));
     }
     return edgeI;
 }
@@ -104,9 +104,9 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
 
         // Estimate pointEdges storage
         List<DynamicList<label>> pe(nPoints());
-        forAll(pe, pointI)
+        forAll(pe, pointi)
         {
-            pe[pointI].setCapacity(primitiveMesh::edgesPerPoint_);
+            pe[pointi].setCapacity(primitiveMesh::edgesPerPoint_);
         }
 
         // Estimate edges storage
@@ -146,10 +146,10 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
-                    label nextPointI = f[f.fcIndex(fp)];
+                    label pointi = f[fp];
+                    label nextPointi = f[f.fcIndex(fp)];
 
-                    label edgeI = getEdge(pe, es, pointI, nextPointI);
+                    label edgeI = getEdge(pe, es, pointi, nextPointi);
 
                     if (doFaceEdges)
                     {
@@ -171,11 +171,11 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
-                    label nextPointI = f[f.fcIndex(fp)];
+                    label pointi = f[fp];
+                    label nextPointi = f[f.fcIndex(fp)];
 
                     label oldNEdges = es.size();
-                    label edgeI = getEdge(pe, es, pointI, nextPointI);
+                    label edgeI = getEdge(pe, es, pointi, nextPointi);
 
                     if (es.size() > oldNEdges)
                     {
@@ -195,17 +195,17 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
-                    label nextPointI = f[f.fcIndex(fp)];
+                    label pointi = f[fp];
+                    label nextPointi = f[f.fcIndex(fp)];
 
                     label oldNEdges = es.size();
-                    label edgeI = getEdge(pe, es, pointI, nextPointI);
+                    label edgeI = getEdge(pe, es, pointi, nextPointi);
 
                     if (es.size() > oldNEdges)
                     {
-                        if (pointI < nInternalPoints_)
+                        if (pointi < nInternalPoints_)
                         {
-                            if (nextPointI < nInternalPoints_)
+                            if (nextPointi < nInternalPoints_)
                             {
                                 nInternal0Edges_++;
                             }
@@ -216,7 +216,7 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
                         }
                         else
                         {
-                            if (nextPointI < nInternalPoints_)
+                            if (nextPointi < nInternalPoints_)
                             {
                                 nInt1Edges++;
                             }
@@ -295,9 +295,9 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
         // no reallocations
         SortableList<label> nbrPoints(primitiveMesh::edgesPerPoint_);
 
-        forAll(pe, pointI)
+        forAll(pe, pointi)
         {
-            const DynamicList<label>& pEdges = pe[pointI];
+            const DynamicList<label>& pEdges = pe[pointi];
 
             nbrPoints.setSize(pEdges.size());
 
@@ -305,15 +305,15 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
             {
                 const edge& e = es[pEdges[i]];
 
-                label nbrPointI = e.otherVertex(pointI);
+                label nbrPointi = e.otherVertex(pointi);
 
-                if (nbrPointI < pointI)
+                if (nbrPointi < pointi)
                 {
                     nbrPoints[i] = -1;
                 }
                 else
                 {
-                    nbrPoints[i] = nbrPointI;
+                    nbrPoints[i] = nbrPointi;
                 }
             }
             nbrPoints.sort();
@@ -334,22 +334,22 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
             }
             else
             {
-                if (pointI < nInternalPoints_)
+                if (pointi < nInternalPoints_)
                 {
                     forAll(nbrPoints, i)
                     {
-                        label nbrPointI = nbrPoints[i];
+                        label nbrPointi = nbrPoints[i];
 
                         label edgeI = pEdges[nbrPoints.indices()[i]];
 
-                        if (nbrPointI != -1)
+                        if (nbrPointi != -1)
                         {
                             if (edgeI < nExtEdges)
                             {
                                 // External edge
                                 oldToNew[edgeI] = externalEdgeI++;
                             }
-                            else if (nbrPointI < nInternalPoints_)
+                            else if (nbrPointi < nInternalPoints_)
                             {
                                 // Both points inside
                                 oldToNew[edgeI] = internal0EdgeI++;
@@ -366,18 +366,18 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
                 {
                     forAll(nbrPoints, i)
                     {
-                        label nbrPointI = nbrPoints[i];
+                        label nbrPointi = nbrPoints[i];
 
                         label edgeI = pEdges[nbrPoints.indices()[i]];
 
-                        if (nbrPointI != -1)
+                        if (nbrPointi != -1)
                         {
                             if (edgeI < nExtEdges)
                             {
                                 // External edge
                                 oldToNew[edgeI] = externalEdgeI++;
                             }
-                            else if (nbrPointI < nInternalPoints_)
+                            else if (nbrPointi < nInternalPoints_)
                             {
                                 // Not possible!
                                 FatalErrorInFunction
@@ -431,13 +431,13 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
         // pointEdges
         pePtr_ = new labelListList(nPoints());
         labelListList& pointEdges = *pePtr_;
-        forAll(pe, pointI)
+        forAll(pe, pointi)
         {
-            DynamicList<label>& pEdges = pe[pointI];
+            DynamicList<label>& pEdges = pe[pointi];
             pEdges.shrink();
             inplaceRenumber(oldToNew, pEdges);
-            pointEdges[pointI].transfer(pEdges);
-            Foam::sort(pointEdges[pointI]);
+            pointEdges[pointi].transfer(pEdges);
+            Foam::sort(pointEdges[pointi]);
         }
 
         // faceEdges
@@ -542,17 +542,17 @@ const Foam::labelListList& Foam::primitiveMesh::faceEdges() const
 
             forAll(f, fp)
             {
-                label pointI = f[fp];
-                label nextPointI = f[f.fcIndex(fp)];
+                label pointi = f[fp];
+                label nextPointi = f[f.fcIndex(fp)];
 
-                // Find edge between pointI, nextPontI
-                const labelList& pEdges = pe[pointI];
+                // Find edge between pointi, nextPontI
+                const labelList& pEdges = pe[pointi];
 
                 forAll(pEdges, i)
                 {
                     label edgeI = pEdges[i];
 
-                    if (es[edgeI].otherVertex(pointI) == nextPointI)
+                    if (es[edgeI].otherVertex(pointi) == nextPointi)
                     {
                         fEdges[fp] = edgeI;
                         break;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
index fc8d581c6f..79d442522f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
@@ -67,9 +67,9 @@ void Foam::primitiveMesh::calcPointCells() const
         {
             const labelList curPoints = cf[celli].labels(faces());
 
-            forAll(curPoints, pointI)
+            forAll(curPoints, pointi)
             {
-                label ptI = curPoints[pointI];
+                label ptI = curPoints[pointi];
 
                 npc[ptI]++;
             }
@@ -81,9 +81,9 @@ void Foam::primitiveMesh::calcPointCells() const
         pcPtr_ = new labelListList(npc.size());
         labelListList& pointCellAddr = *pcPtr_;
 
-        forAll(pointCellAddr, pointI)
+        forAll(pointCellAddr, pointi)
         {
-            pointCellAddr[pointI].setSize(npc[pointI]);
+            pointCellAddr[pointi].setSize(npc[pointi]);
         }
         npc = 0;
 
@@ -92,9 +92,9 @@ void Foam::primitiveMesh::calcPointCells() const
         {
             const labelList curPoints = cf[celli].labels(faces());
 
-            forAll(curPoints, pointI)
+            forAll(curPoints, pointi)
             {
-                label ptI = curPoints[pointI];
+                label ptI = curPoints[pointi];
 
                 pointCellAddr[ptI][npc[ptI]++] = celli;
             }
@@ -118,19 +118,19 @@ const Foam::labelListList& Foam::primitiveMesh::pointCells() const
 
 const Foam::labelList& Foam::primitiveMesh::pointCells
 (
-    const label pointI,
+    const label pointi,
     DynamicList<label>& storage
 ) const
 {
     if (hasPointCells())
     {
-        return pointCells()[pointI];
+        return pointCells()[pointi];
     }
     else
     {
         const labelList& own = faceOwner();
         const labelList& nei = faceNeighbour();
-        const labelList& pFaces = pointFaces()[pointI];
+        const labelList& pFaces = pointFaces()[pointi];
 
         storage.clear();
 
@@ -171,9 +171,9 @@ const Foam::labelList& Foam::primitiveMesh::pointCells
 }
 
 
-const Foam::labelList& Foam::primitiveMesh::pointCells(const label pointI) const
+const Foam::labelList& Foam::primitiveMesh::pointCells(const label pointi) const
 {
-    return pointCells(pointI, labels_);
+    return pointCells(pointi, labels_);
 }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
index cb6fa58490..2f1350b154 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,19 +60,19 @@ void Foam::primitiveMesh::calcPointPoints() const
         ppPtr_ = new labelListList(pe.size());
         labelListList& pp = *ppPtr_;
 
-        forAll(pe, pointI)
+        forAll(pe, pointi)
         {
-            pp[pointI].setSize(pe[pointI].size());
+            pp[pointi].setSize(pe[pointi].size());
 
-            forAll(pe[pointI], ppi)
+            forAll(pe[pointi], ppi)
             {
-                if (e[pe[pointI][ppi]].start() == pointI)
+                if (e[pe[pointi][ppi]].start() == pointi)
                 {
-                    pp[pointI][ppi] = e[pe[pointI][ppi]].end();
+                    pp[pointi][ppi] = e[pe[pointi][ppi]].end();
                 }
-                else if (e[pe[pointI][ppi]].end() == pointI)
+                else if (e[pe[pointi][ppi]].end() == pointi)
                 {
-                    pp[pointI][ppi] = e[pe[pointI][ppi]].start();
+                    pp[pointi][ppi] = e[pe[pointi][ppi]].start();
                 }
                 else
                 {
@@ -101,18 +101,18 @@ const Foam::labelListList& Foam::primitiveMesh::pointPoints() const
 
 const Foam::labelList& Foam::primitiveMesh::pointPoints
 (
-    const label pointI,
+    const label pointi,
     DynamicList<label>& storage
 ) const
 {
     if (hasPointPoints())
     {
-        return pointPoints()[pointI];
+        return pointPoints()[pointi];
     }
     else
     {
         const edgeList& edges = this->edges();
-        const labelList& pEdges = pointEdges()[pointI];
+        const labelList& pEdges = pointEdges()[pointi];
 
         storage.clear();
 
@@ -123,7 +123,7 @@ const Foam::labelList& Foam::primitiveMesh::pointPoints
 
         forAll(pEdges, i)
         {
-            storage.append(edges[pEdges[i]].otherVertex(pointI));
+            storage.append(edges[pEdges[i]].otherVertex(pointi));
         }
 
         return storage;
@@ -133,10 +133,10 @@ const Foam::labelList& Foam::primitiveMesh::pointPoints
 
 const Foam::labelList& Foam::primitiveMesh::pointPoints
 (
-    const label pointI
+    const label pointi
 ) const
 {
-    return pointPoints(pointI, labels_);
+    return pointPoints(pointi, labels_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
index b274ff1302..41274d7ab1 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
@@ -194,7 +194,7 @@ public:
         inline label addToTransformIndex
         (
             const label transformIndex,
-            const label patchI,
+            const label patchi,
             const bool isSendingSide = true,
             const scalar tol = SMALL
         ) const;
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index 9a265c87ab..f870ed2aba 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -152,7 +152,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
     const LESModel<EddyDiffusivity<compressible::turbulenceModel>>& turbModel =
         db().lookupObject
@@ -170,7 +170,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
     const fvsPatchField<scalar>& phip =
         patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
 
-    const scalarField alphap(turbModel.alphaEff(patchI));
+    const scalarField alphap(turbModel.alphaEff(patchi));
 
     refValue() = massFluxFraction_;
     refGrad() = 0.0;
diff --git a/src/conversion/meshReader/calcPointCells.C b/src/conversion/meshReader/calcPointCells.C
index 7f37f30327..83753bc6f8 100644
--- a/src/conversion/meshReader/calcPointCells.C
+++ b/src/conversion/meshReader/calcPointCells.C
@@ -113,7 +113,7 @@ void Foam::meshReader::calcPointCells() const
 
     // report and remove unused points
     // - adjust points, pointCells, and cellFaces accordingly
-    label pointI = 0;
+    label pointi = 0;
     labelList oldToNew(nPoints, -1);
 
     forAll(ptCells, i)
@@ -121,16 +121,16 @@ void Foam::meshReader::calcPointCells() const
         ptCells[i].setSize(cellCount[i]);
         if (cellCount[i] > 0)
         {
-            oldToNew[i] = pointI++;
+            oldToNew[i] = pointi++;
         }
     }
 
     // report unused points
-    if (nPoints > pointI)
+    if (nPoints > pointi)
     {
-        Info<< "removing " << (nPoints - pointI) << " unused points" << endl;
+        Info<< "removing " << (nPoints - pointi) << " unused points" << endl;
 
-        nPoints = pointI;
+        nPoints = pointi;
 
         // adjust points and truncate - bend const-ness
         pointField& adjustedPoints = const_cast<pointField&>(points_);
diff --git a/src/conversion/meshReader/createPolyCells.C b/src/conversion/meshReader/createPolyCells.C
index 9da2efeee1..d9f731ed55 100644
--- a/src/conversion/meshReader/createPolyCells.C
+++ b/src/conversion/meshReader/createPolyCells.C
@@ -229,10 +229,10 @@ void Foam::meshReader::createPolyCells()
             const labelList& curPoints = curFace;
 
             // For all points
-            forAll(curPoints, pointI)
+            forAll(curPoints, pointi)
             {
                 // get the list of cells sharing this point
-                const labelList& curNeighbours = ptCells[curPoints[pointI]];
+                const labelList& curNeighbours = ptCells[curPoints[pointi]];
 
                 // For all neighbours
                 forAll(curNeighbours, neiI)
@@ -257,7 +257,7 @@ void Foam::meshReader::createPolyCells()
 #ifdef DEBUG_FACE_ORDERING
                                 Info<< " cell " << celli
                                     << " face " << facei
-                                    << " point " << pointI
+                                    << " point " << pointi
                                     << " nei " << curNei
                                     << " neiFace " << neiFacei
                                     << endl;
diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.C b/src/conversion/meshReader/starcd/STARCDMeshReader.C
index 3903749103..100d161ab8 100644
--- a/src/conversion/meshReader/starcd/STARCDMeshReader.C
+++ b/src/conversion/meshReader/starcd/STARCDMeshReader.C
@@ -165,22 +165,22 @@ void Foam::meshReaders::STARCD::readPoints
 
         label lineLabel;
 
-        label pointI = 0;
+        label pointi = 0;
         while ((is >> lineLabel).good())
         {
-            is  >> points_[pointI].x()
-                >> points_[pointI].y()
-                >> points_[pointI].z();
+            is  >> points_[pointi].x()
+                >> points_[pointi].y()
+                >> points_[pointi].z();
 
             // might need again in the future
-            ////  origPointId[pointI] = lineLabel;
-            mapToFoamPointId_[lineLabel] = pointI;
-            pointI++;
+            ////  origPointId[pointi] = lineLabel;
+            mapToFoamPointId_[lineLabel] = pointi;
+            pointi++;
         }
 
-        if (nPoints > pointI)
+        if (nPoints > pointi)
         {
-            nPoints = pointI;
+            nPoints = pointi;
             points_.setSize(nPoints);
             // might need again in the future
             //// origPointId.setSize(nPoints);
@@ -999,20 +999,20 @@ void Foam::meshReaders::STARCD::cullPoints()
     }
 
     // the new ordering and the count of unused points
-    label pointI = 0;
+    label pointi = 0;
     forAll(oldToNew, i)
     {
         if (oldToNew[i] >= 0)
         {
-            oldToNew[i] = pointI++;
+            oldToNew[i] = pointi++;
         }
     }
 
     // report unused points
-    if (nPoints > pointI)
+    if (nPoints > pointi)
     {
-        Info<< "Unused    points  = " << (nPoints - pointI) << endl;
-        nPoints = pointI;
+        Info<< "Unused    points  = " << (nPoints - pointi) << endl;
+        nPoints = pointi;
 
         // adjust points and truncate
         inplaceReorder(oldToNew, points_);
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index 5eb90bd862..8102547c4f 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -136,16 +136,16 @@ Foam::labelList Foam::polyDualMesh::getFaceOrder
 }
 
 
-// Get the two edges on facei using pointI. Returns them such that the order
+// Get the two edges on facei using pointi. Returns them such that the order
 // - otherVertex of e0
-// - pointI
-// - otherVertex(pointI) of e1
+// - pointi
+// - otherVertex(pointi) of e1
 // is in face order
 void Foam::polyDualMesh::getPointEdges
 (
     const primitivePatch& patch,
     const label facei,
-    const label pointI,
+    const label pointi,
     label& e0,
     label& e1
 )
@@ -162,10 +162,10 @@ void Foam::polyDualMesh::getPointEdges
 
         const edge& e = patch.edges()[edgeI];
 
-        if (e[0] == pointI)
+        if (e[0] == pointi)
         {
-            // One of the edges using pointI. Check which one.
-            label index = findIndex(f, pointI);
+            // One of the edges using pointi. Check which one.
+            label index = findIndex(f, pointi);
 
             if (f.nextLabel(index) == e[1])
             {
@@ -181,10 +181,10 @@ void Foam::polyDualMesh::getPointEdges
                 return;
             }
         }
-        else if (e[1] == pointI)
+        else if (e[1] == pointi)
         {
-            // One of the edges using pointI. Check which one.
-            label index = findIndex(f, pointI);
+            // One of the edges using pointi. Check which one.
+            label index = findIndex(f, pointi);
 
             if (f.nextLabel(index) == e[0])
             {
@@ -204,7 +204,7 @@ void Foam::polyDualMesh::getPointEdges
 
     FatalErrorInFunction
         << " vertices:" << patch.localFaces()[facei]
-        << " that uses point:" << pointI
+        << " that uses point:" << pointi
         << abort(FatalError);
 }
 
@@ -216,7 +216,7 @@ Foam::labelList Foam::polyDualMesh::collectPatchSideFace
     const label patchToDualOffset,
     const labelList& edgeToDualPoint,
     const labelList& pointToDualPoint,
-    const label pointI,
+    const label pointi,
 
     label& edgeI
 )
@@ -224,17 +224,17 @@ Foam::labelList Foam::polyDualMesh::collectPatchSideFace
     // Construct face by walking around e[eI] starting from
     // patchEdgeI
 
-    label meshPointI = patch.meshPoints()[pointI];
-    const labelList& pFaces = patch.pointFaces()[pointI];
+    label meshPointi = patch.meshPoints()[pointi];
+    const labelList& pFaces = patch.pointFaces()[pointi];
 
     DynamicList<label> dualFace;
 
-    if (pointToDualPoint[meshPointI] >= 0)
+    if (pointToDualPoint[meshPointi] >= 0)
     {
         // Number of pFaces + 2 boundary edge + feature point
         dualFace.setCapacity(pFaces.size()+2+1);
         // Store dualVertex for feature edge
-        dualFace.append(pointToDualPoint[meshPointI]);
+        dualFace.append(pointToDualPoint[meshPointi]);
     }
     else
     {
@@ -256,7 +256,7 @@ Foam::labelList Foam::polyDualMesh::collectPatchSideFace
     bool reverseFace;
 
     label e0, e1;
-    getPointEdges(patch, facei, pointI, e0, e1);
+    getPointEdges(patch, facei, pointi, e0, e1);
 
     if (e0 == edgeI)
     {
@@ -272,9 +272,9 @@ Foam::labelList Foam::polyDualMesh::collectPatchSideFace
         // Store dual vertex for facei.
         dualFace.append(facei + patchToDualOffset);
 
-        // Cross face to other edge on pointI
+        // Cross face to other edge on pointi
         label e0, e1;
-        getPointEdges(patch, facei, pointI, e0, e1);
+        getPointEdges(patch, facei, pointi, e0, e1);
 
         if (e0 == edgeI)
         {
@@ -321,7 +321,7 @@ Foam::labelList Foam::polyDualMesh::collectPatchSideFace
 }
 
 
-// Collect face around pointI which is not on the outside of the patch.
+// Collect face around pointi which is not on the outside of the patch.
 // Returns the vertices of the face and the indices in these vertices of
 // any points which are on feature edges.
 void Foam::polyDualMesh::collectPatchInternalFace
@@ -330,16 +330,16 @@ void Foam::polyDualMesh::collectPatchInternalFace
     const label patchToDualOffset,
     const labelList& edgeToDualPoint,
 
-    const label pointI,
+    const label pointi,
     const label startEdgeI,
 
     labelList& dualFace2,
     labelList& featEdgeIndices2
 )
 {
-    // Construct face by walking around pointI starting from startEdgeI
+    // Construct face by walking around pointi starting from startEdgeI
     const labelList& meshEdges = patch.meshEdges();
-    const labelList& pFaces = patch.pointFaces()[pointI];
+    const labelList& pFaces = patch.pointFaces()[pointi];
 
     // Vertices of dualFace
     DynamicList<label> dualFace(pFaces.size());
@@ -354,7 +354,7 @@ void Foam::polyDualMesh::collectPatchInternalFace
     bool reverseFace;
 
     label e0, e1;
-    getPointEdges(patch, facei, pointI, e0, e1);
+    getPointEdges(patch, facei, pointi, e0, e1);
 
     if (e0 == edgeI)
     {
@@ -370,9 +370,9 @@ void Foam::polyDualMesh::collectPatchInternalFace
         // Insert dual vertex for face
         dualFace.append(facei + patchToDualOffset);
 
-        // Cross face to other edge on pointI
+        // Cross face to other edge on pointi
         label e0, e1;
-        getPointEdges(patch, facei, pointI, e0, e1);
+        getPointEdges(patch, facei, pointi, e0, e1);
 
         if (e0 == edgeI)
         {
@@ -432,7 +432,7 @@ void Foam::polyDualMesh::splitFace
     const polyPatch& patch,
     const labelList& pointToDualPoint,
 
-    const label pointI,
+    const label pointi,
     const labelList& dualFace,
     const labelList& featEdgeIndices,
 
@@ -445,9 +445,9 @@ void Foam::polyDualMesh::splitFace
 
     // Split face because of feature edges/points
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    label meshPointI = patch.meshPoints()[pointI];
+    label meshPointi = patch.meshPoints()[pointi];
 
-    if (pointToDualPoint[meshPointI] >= 0)
+    if (pointToDualPoint[meshPointi] >= 0)
     {
         // Feature point. Do face-centre decomposition.
 
@@ -455,7 +455,7 @@ void Foam::polyDualMesh::splitFace
         {
             // Feature point but no feature edges. Not handled at the moment
             dualFaces.append(face(dualFace));
-            dualOwner.append(meshPointI);
+            dualOwner.append(meshPointi);
             dualNeighbour.append(-1);
             dualRegion.append(patch.index());
         }
@@ -484,7 +484,7 @@ void Foam::polyDualMesh::splitFace
                 face subFace(sz);
 
                 // feature point becomes face centre.
-                subFace[0] = pointToDualPoint[patch.meshPoints()[pointI]];
+                subFace[0] = pointToDualPoint[patch.meshPoints()[pointi]];
 
                 // Copy from startFp up to endFp.
                 for (label subFp = 1; subFp < subFace.size(); subFp++)
@@ -495,7 +495,7 @@ void Foam::polyDualMesh::splitFace
                 }
 
                 dualFaces.append(face(subFace));
-                dualOwner.append(meshPointI);
+                dualOwner.append(meshPointi);
                 dualNeighbour.append(-1);
                 dualRegion.append(patch.index());
             }
@@ -508,7 +508,7 @@ void Foam::polyDualMesh::splitFace
         {
             // Not enough feature edges. No split.
             dualFaces.append(face(dualFace));
-            dualOwner.append(meshPointI);
+            dualOwner.append(meshPointi);
             dualNeighbour.append(-1);
             dualRegion.append(patch.index());
         }
@@ -548,7 +548,7 @@ void Foam::polyDualMesh::splitFace
                     subFace.shrink();
 
                     dualFaces.append(face(subFace));
-                    dualOwner.append(meshPointI);
+                    dualOwner.append(meshPointi);
                     dualNeighbour.append(-1);
                     dualRegion.append(patch.index());
 
@@ -562,7 +562,7 @@ void Foam::polyDualMesh::splitFace
                 subFace.shrink();
 
                 dualFaces.append(face(subFace));
-                dualOwner.append(meshPointI);
+                dualOwner.append(meshPointi);
                 dualNeighbour.append(-1);
                 dualRegion.append(patch.index());
 
@@ -621,7 +621,7 @@ void Foam::polyDualMesh::dualPatch
                     // Construct face by walking around e[eI] starting from
                     // patchEdgeI
 
-                    label pointI = e[eI];
+                    label pointi = e[eI];
 
                     label edgeI = patchEdgeI;
                     labelList dualFace
@@ -633,13 +633,13 @@ void Foam::polyDualMesh::dualPatch
                             edgeToDualPoint,
                             pointToDualPoint,
 
-                            pointI,
+                            pointi,
                             edgeI
                         )
                     );
 
                     // Now edgeI is end edge. Mark as visited
-                    if (patch.edges()[edgeI][0] == pointI)
+                    if (patch.edges()[edgeI][0] == pointi)
                     {
                         doneEdgeSide[edgeI] |= 1;
                     }
@@ -649,12 +649,12 @@ void Foam::polyDualMesh::dualPatch
                     }
 
                     dualFaces.append(face(dualFace));
-                    dualOwner.append(patch.meshPoints()[pointI]);
+                    dualOwner.append(patch.meshPoints()[pointi]);
                     dualNeighbour.append(-1);
                     dualRegion.append(patch.index());
 
                     doneEdgeSide[patchEdgeI] |= bitMask;
-                    donePoint[pointI] = true;
+                    donePoint[pointi] = true;
                 }
             }
         }
@@ -665,9 +665,9 @@ void Foam::polyDualMesh::dualPatch
     // Do patch-internal points
     // ~~~~~~~~~~~~~~~~~~~~~~~~
 
-    forAll(donePoint, pointI)
+    forAll(donePoint, pointi)
     {
-        if (!donePoint[pointI])
+        if (!donePoint[pointi])
         {
             labelList dualFace, featEdgeIndices;
 
@@ -676,8 +676,8 @@ void Foam::polyDualMesh::dualPatch
                 patch,
                 patchToDualOffset,
                 edgeToDualPoint,
-                pointI,
-                patch.pointEdges()[pointI][0],  // Arbitrary starting edge
+                pointi,
+                patch.pointEdges()[pointi][0],  // Arbitrary starting edge
 
                 dualFace,
                 featEdgeIndices
@@ -687,7 +687,7 @@ void Foam::polyDualMesh::dualPatch
 
             //// Keep face in one piece.
             //dualFaces.append(face(dualFace));
-            //dualOwner.append(patch.meshPoints()[pointI]);
+            //dualOwner.append(patch.meshPoints()[pointi]);
             //dualNeighbour.append(-1);
             //dualRegion.append(patch.index());
 
@@ -695,7 +695,7 @@ void Foam::polyDualMesh::dualPatch
             (
                 patch,
                 pointToDualPoint,
-                pointI,
+                pointi,
                 dualFace,
                 featEdgeIndices,
 
@@ -705,7 +705,7 @@ void Foam::polyDualMesh::dualPatch
                 dualRegion
             );
 
-            donePoint[pointI] = true;
+            donePoint[pointi] = true;
         }
     }
 }
@@ -777,7 +777,7 @@ void Foam::polyDualMesh::calcDual
     // celli        celli
     // facei        nCells+facei-nIntFaces
     // featEdgeI    nCells+nFaces-nIntFaces+featEdgeI
-    // featPointI   nCells+nFaces-nIntFaces+nFeatEdges+featPointI
+    // featPointi   nCells+nFaces-nIntFaces+nFeatEdges+featPointi
 
     pointField dualPoints
     (
@@ -787,7 +787,7 @@ void Foam::polyDualMesh::calcDual
       + featurePoints.size()                    // additional boundary points
     );
 
-    label dualPointI = 0;
+    label dualPointi = 0;
 
 
     // Cell centres.
@@ -797,8 +797,8 @@ void Foam::polyDualMesh::calcDual
 
     forAll(cellCentres, celli)
     {
-        cellPoint_[celli] = dualPointI;
-        dualPoints[dualPointI++] = cellCentres[celli];
+        cellPoint_[celli] = dualPointi;
+        dualPoints[dualPointi++] = cellCentres[celli];
     }
 
     // Boundary faces centres
@@ -808,8 +808,8 @@ void Foam::polyDualMesh::calcDual
 
     for (label facei = nIntFaces; facei < mesh.nFaces(); facei++)
     {
-        boundaryFacePoint_[facei - nIntFaces] = dualPointI;
-        dualPoints[dualPointI++] = faceCentres[facei];
+        boundaryFacePoint_[facei - nIntFaces] = dualPointi;
+        dualPoints[dualPointi++] = faceCentres[facei];
     }
 
     // Edge status:
@@ -831,8 +831,8 @@ void Foam::polyDualMesh::calcDual
 
         const edge& e = mesh.edges()[edgeI];
 
-        edgeToDualPoint[edgeI] = dualPointI;
-        dualPoints[dualPointI++] = e.centre(mesh.points());
+        edgeToDualPoint[edgeI] = dualPointi;
+        dualPoints[dualPointi++] = e.centre(mesh.points());
     }
 
 
@@ -868,10 +868,10 @@ void Foam::polyDualMesh::calcDual
 
     forAll(featurePoints, i)
     {
-        label pointI = featurePoints[i];
+        label pointi = featurePoints[i];
 
-        pointToDualPoint[pointI] = dualPointI;
-        dualPoints[dualPointI++] = mesh.points()[pointI];
+        pointToDualPoint[pointi] = dualPointi;
+        dualPoints[dualPointi++] = mesh.points()[pointi];
     }
 
 
@@ -1149,9 +1149,9 @@ void Foam::polyDualMesh::calcDual
         Pout<< "polyDualMesh::calcDual : dumping internal faces to "
             << str.name() << endl;
 
-        forAll(dualPoints, dualPointI)
+        forAll(dualPoints, dualPointi)
         {
-            meshTools::writeOBJ(str, dualPoints[dualPointI]);
+            meshTools::writeOBJ(str, dualPoints[dualPointi]);
         }
         forAll(dynDualFaces, dualFacei)
         {
@@ -1215,9 +1215,9 @@ void Foam::polyDualMesh::calcDual
         Pout<< "polyDualMesh::calcDual : dumping all faces to "
             << str.name() << endl;
 
-        forAll(dualPoints, dualPointI)
+        forAll(dualPoints, dualPointi)
         {
-            meshTools::writeOBJ(str, dualPoints[dualPointI]);
+            meshTools::writeOBJ(str, dualPoints[dualPointi]);
         }
         forAll(dualFaces, dualFacei)
         {
@@ -1562,9 +1562,9 @@ void Foam::polyDualMesh::calcFeatures
 
     DynamicList<label> allFeaturePoints(pointEdges.size());
 
-    forAll(pointEdges, pointI)
+    forAll(pointEdges, pointi)
     {
-        const labelList& pEdges = pointEdges[pointI];
+        const labelList& pEdges = pointEdges[pointi];
 
         label nFeatEdges = 0;
 
@@ -1578,7 +1578,7 @@ void Foam::polyDualMesh::calcFeatures
         if (nFeatEdges > 2)
         {
             // Store in mesh vertex label
-            allFeaturePoints.append(allBoundary.meshPoints()[pointI]);
+            allFeaturePoints.append(allBoundary.meshPoints()[pointi]);
         }
     }
     featurePoints.transfer(allFeaturePoints);
@@ -1592,8 +1592,8 @@ void Foam::polyDualMesh::calcFeatures
 
         forAll(featurePoints, i)
         {
-            label pointI = featurePoints[i];
-            meshTools::writeOBJ(str, mesh.points()[pointI]);
+            label pointi = featurePoints[i];
+            meshTools::writeOBJ(str, mesh.points()[pointi]);
         }
     }
 
diff --git a/src/conversion/polyDualMesh/polyDualMesh.H b/src/conversion/polyDualMesh/polyDualMesh.H
index 2cea41b7d0..fb332f7f21 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.H
+++ b/src/conversion/polyDualMesh/polyDualMesh.H
@@ -80,7 +80,7 @@ class polyDualMesh
         (
             const primitivePatch& patch,
             const label facei,
-            const label pointI,
+            const label pointi,
             label& e0,
             label& e1
         );
@@ -91,7 +91,7 @@ class polyDualMesh
             const label patchToDualOffset,
             const labelList& edgeToDualPoint,
             const labelList& pointToDualPoint,
-            const label pointI,
+            const label pointi,
 
             label& edgeI
         );
@@ -102,7 +102,7 @@ class polyDualMesh
             const label patchToDualOffset,
             const labelList& edgeToDualPoint,
 
-            const label pointI,
+            const label pointi,
             const label startEdgeI,
 
             labelList& dualFace2,
@@ -114,7 +114,7 @@ class polyDualMesh
             const polyPatch& patch,
             const labelList& pointToDualPoint,
 
-            const label pointI,
+            const label pointi,
             const labelList& dualFace,
             const labelList& featEdgeIndices,
 
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index e647c93e85..a9022f0e58 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -488,19 +488,19 @@ Foam::dynamicRefineFvMesh::unrefine
     {
         forAll(splitPoints, i)
         {
-            label pointI = splitPoints[i];
+            label pointi = splitPoints[i];
 
-            const labelList& pEdges = pointEdges()[pointI];
+            const labelList& pEdges = pointEdges()[pointi];
 
             forAll(pEdges, j)
             {
-                label otherPointI = edges()[pEdges[j]].otherVertex(pointI);
+                label otherPointi = edges()[pEdges[j]].otherVertex(pointi);
 
-                const labelList& pFaces = pointFaces()[otherPointI];
+                const labelList& pFaces = pointFaces()[otherPointi];
 
                 forAll(pFaces, pFacei)
                 {
-                    faceToSplitPoint.insert(pFaces[pFacei], otherPointI);
+                    faceToSplitPoint.insert(pFaces[pFacei], otherPointi);
                 }
             }
         }
@@ -590,9 +590,9 @@ Foam::dynamicRefineFvMesh::unrefine
             forAllConstIter(Map<label>, faceToSplitPoint, iter)
             {
                 label oldFacei = iter.key();
-                label oldPointI = iter();
+                label oldPointi = iter();
 
-                if (reversePointMap[oldPointI] < 0)
+                if (reversePointMap[oldPointi] < 0)
                 {
                     // midpoint was removed. See if face still exists.
                     label facei = reverseFaceMap[oldFacei];
@@ -652,13 +652,13 @@ Foam::dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const
 {
     scalarField vFld(nCells(), -GREAT);
 
-    forAll(pointCells(), pointI)
+    forAll(pointCells(), pointi)
     {
-        const labelList& pCells = pointCells()[pointI];
+        const labelList& pCells = pointCells()[pointi];
 
         forAll(pCells, i)
         {
-            vFld[pCells[i]] = max(vFld[pCells[i]], pFld[pointI]);
+            vFld[pCells[i]] = max(vFld[pCells[i]], pFld[pointi]);
         }
     }
     return vFld;
@@ -671,13 +671,13 @@ Foam::dynamicRefineFvMesh::maxCellField(const volScalarField& vFld) const
 {
     scalarField pFld(nPoints(), -GREAT);
 
-    forAll(pointCells(), pointI)
+    forAll(pointCells(), pointi)
     {
-        const labelList& pCells = pointCells()[pointI];
+        const labelList& pCells = pointCells()[pointi];
 
         forAll(pCells, i)
         {
-            pFld[pointI] = max(pFld[pointI], vFld[pCells[i]]);
+            pFld[pointi] = max(pFld[pointi], vFld[pCells[i]]);
         }
     }
     return pFld;
@@ -690,16 +690,16 @@ Foam::dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const
 {
     scalarField pFld(nPoints());
 
-    forAll(pointCells(), pointI)
+    forAll(pointCells(), pointi)
     {
-        const labelList& pCells = pointCells()[pointI];
+        const labelList& pCells = pointCells()[pointi];
 
         scalar sum = 0.0;
         forAll(pCells, i)
         {
             sum += vFld[pCells[i]];
         }
-        pFld[pointI] = sum/pCells.size();
+        pFld[pointi] = sum/pCells.size();
     }
     return pFld;
 }
@@ -864,12 +864,12 @@ Foam::labelList Foam::dynamicRefineFvMesh::selectUnrefinePoints
 
     forAll(splitPoints, i)
     {
-        label pointI = splitPoints[i];
+        label pointi = splitPoints[i];
 
-        if (pFld[pointI] < unrefineLevel)
+        if (pFld[pointi] < unrefineLevel)
         {
             // Check that all cells are not marked
-            const labelList& pCells = pointCells()[pointI];
+            const labelList& pCells = pointCells()[pointi];
 
             bool hasMarked = false;
 
@@ -884,7 +884,7 @@ Foam::labelList Foam::dynamicRefineFvMesh::selectUnrefinePoints
 
             if (!hasMarked)
             {
-                newSplitPoints.append(pointI);
+                newSplitPoints.append(pointi);
             }
         }
     }
@@ -963,15 +963,15 @@ void Foam::dynamicRefineFvMesh::checkEightAnchorPoints
 
     labelList nAnchorPoints(nCells(), 0);
 
-    forAll(pointLevel, pointI)
+    forAll(pointLevel, pointi)
     {
-        const labelList& pCells = pointCells(pointI);
+        const labelList& pCells = pointCells(pointi);
 
         forAll(pCells, pCelli)
         {
             label celli = pCells[pCelli];
 
-            if (pointLevel[pointI] <= cellLevel[celli])
+            if (pointLevel[pointi] <= cellLevel[celli])
             {
                 // Check if cell has already 8 anchor points -> protect cell
                 if (nAnchorPoints[celli] == 8)
@@ -1031,9 +1031,9 @@ Foam::dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
 
     label nProtected = 0;
 
-    forAll(pointCells(), pointI)
+    forAll(pointCells(), pointi)
     {
-        const labelList& pCells = pointCells()[pointI];
+        const labelList& pCells = pointCells()[pointi];
 
         forAll(pCells, i)
         {
@@ -1041,7 +1041,7 @@ Foam::dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
 
             if (!protectedCell_.get(celli))
             {
-                if (pointLevel[pointI] <= cellLevel[celli])
+                if (pointLevel[pointi] <= cellLevel[celli])
                 {
                     nAnchors[celli]++;
 
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
index 1dc985485f..f2a06887f9 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
@@ -134,8 +134,8 @@ Foam::multiSolidBodyMotionFvMesh::multiSolidBodyMotionFvMesh(const IOobject& io)
                     const face& f = faces()[c[j]];
                     forAll(f, k)
                     {
-                        label pointI = f[k];
-                        movePts[pointI] = true;
+                        label pointi = f[k];
+                        movePts[pointi] = true;
                     }
                 }
             }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
index 64630a06c3..bc4aa09c15 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
@@ -155,8 +155,8 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
                 const face& f = faces()[c[j]];
                 forAll(f, k)
                 {
-                    label pointI = f[k];
-                    movePts[pointI] = true;
+                    label pointi = f[k];
+                    movePts[pointi] = true;
                 }
             }
         }
diff --git a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
index c6e9485b81..08c4fc0b2c 100644
--- a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
+++ b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
@@ -95,28 +95,28 @@ void Foam::attachDetach::calcPointMatchMap() const
         const face& curMasterPoints = masterLocalFaces[facei];
         const face& curSlavePoints = slaveLocalFaces[facei];
 
-        forAll(curMasterPoints, pointI)
+        forAll(curMasterPoints, pointi)
         {
             // If the master and slave point labels are the same, the
             // point remains.  Otherwise, the slave point is removed and
             // replaced by the master
             if
             (
-                masterMeshPoints[curMasterPoints[pointI]]
-             != slaveMeshPoints[curSlavePoints[pointI]]
+                masterMeshPoints[curMasterPoints[pointi]]
+             != slaveMeshPoints[curSlavePoints[pointi]]
             )
             {
                 // Pout<< "Matching slave point "
-                //     << slaveMeshPoints[curSlavePoints[pointI]]
+                //     << slaveMeshPoints[curSlavePoints[pointi]]
                 //     << " with "
-                //     << masterMeshPoints[curMasterPoints[pointI]]
+                //     << masterMeshPoints[curMasterPoints[pointi]]
                 //     << endl;
 
                 // Grab the addressing
                 removedPointMap.insert
                 (
-                    slaveMeshPoints[curSlavePoints[pointI]],
-                    masterMeshPoints[curMasterPoints[pointI]]
+                    slaveMeshPoints[curSlavePoints[pointi]],
+                    masterMeshPoints[curMasterPoints[pointi]]
                 );
             }
         }
diff --git a/src/dynamicMesh/attachDetach/attachInterface.C b/src/dynamicMesh/attachDetach/attachInterface.C
index 8272a6f464..7ed64b19f8 100644
--- a/src/dynamicMesh/attachDetach/attachInterface.C
+++ b/src/dynamicMesh/attachDetach/attachInterface.C
@@ -81,13 +81,13 @@ void Foam::attachDetach::attachInterface
 
     const labelList removedPoints = removedPointMap.toc();
 
-    forAll(removedPoints, pointI)
+    forAll(removedPoints, pointi)
     {
-        //Pout<< "Removing point:" << removedPoints[pointI]
-        //    << " currently at:" << ref.points()[removedPoints[pointI]]
+        //Pout<< "Removing point:" << removedPoints[pointi]
+        //    << " currently at:" << ref.points()[removedPoints[pointi]]
         //    << endl;
 
-        ref.setAction(polyRemovePoint(removedPoints[pointI]));
+        ref.setAction(polyRemovePoint(removedPoints[pointi]));
     }
 
 // Pout<< "Points to be mapped: " << removedPoints << endl;
@@ -167,9 +167,9 @@ void Foam::attachDetach::attachInterface
 
     // Grab all the faces off the points in the slave patch.  If the face has
     //  not been removed, add it to the map of faces to renumber
-    forAll(slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointi)
     {
-        const labelList& curFaces = pf[slaveMeshPoints[pointI]];
+        const labelList& curFaces = pf[slaveMeshPoints[pointi]];
 
         forAll(curFaces, facei)
         {
@@ -192,15 +192,15 @@ void Foam::attachDetach::attachInterface
 
         face newFace(faces[curFaceID]);
 
-        forAll(newFace, pointI)
+        forAll(newFace, pointi)
         {
             Map<label>::const_iterator rpmIter =
-                removedPointMap.find(newFace[pointI]);
+                removedPointMap.find(newFace[pointi]);
 
             if (rpmIter != removedPointMap.end())
             {
                 // Point mapped. Replace it
-                newFace[pointI] = rpmIter();
+                newFace[pointi] = rpmIter();
             }
         }
 
@@ -282,13 +282,13 @@ void Foam::attachDetach::modifyMotionPoints
         // Calculate the difference in motion point positions
         scalar pointDiff = 0;
 
-        forAll(removedPoints, pointI)
+        forAll(removedPoints, pointi)
         {
             pointDiff +=
                 mag
                 (
-                    motionPoints[removedPoints[pointI]]
-                  - motionPoints[removedPointMap.find(removedPoints[pointI])()]
+                    motionPoints[removedPoints[pointi]]
+                  - motionPoints[removedPointMap.find(removedPoints[pointi])()]
                 );
         }
 
@@ -299,10 +299,10 @@ void Foam::attachDetach::modifyMotionPoints
     }
 
     // Put the slave point on top of the master point
-    forAll(removedPoints, pointI)
+    forAll(removedPoints, pointi)
     {
-        motionPoints[removedPoints[pointI]] =
-            motionPoints[removedPointMap.find(removedPoints[pointI])()];
+        motionPoints[removedPoints[pointi]] =
+            motionPoints[removedPointMap.find(removedPoints[pointi])()];
     }
 
 }
diff --git a/src/dynamicMesh/attachDetach/detachInterface.C b/src/dynamicMesh/attachDetach/detachInterface.C
index 44eb11a25a..76ced713a0 100644
--- a/src/dynamicMesh/attachDetach/detachInterface.C
+++ b/src/dynamicMesh/attachDetach/detachInterface.C
@@ -146,25 +146,25 @@ void Foam::attachDetach::detachInterface
 // Pout<< "addedPoints before point creation: " << addedPoints << endl;
 
     // Create new points for face zone
-    forAll(addedPoints, pointI)
+    forAll(addedPoints, pointi)
     {
-        if (addedPoints[pointI] < 0)
+        if (addedPoints[pointi] < 0)
         {
-            addedPoints[pointI] =
+            addedPoints[pointi] =
                 ref.setAction
                 (
                     polyAddPoint
                     (
-                        points[mp[pointI]],        // point
-                        mp[pointI],                // master point
+                        points[mp[pointi]],        // point
+                        mp[pointi],                // master point
                         -1,                        // zone ID
                         true                       // supports a cell
                     )
                 );
-            //Pout<< "Adding point " << addedPoints[pointI]
-            //    << " coord1:" << points[mp[pointI]]
-            //    << " coord2:" << masterFaceLayer.localPoints()[pointI]
-            //    << " for original point " << mp[pointI] << endl;
+            //Pout<< "Adding point " << addedPoints[pointi]
+            //    << " coord1:" << points[mp[pointi]]
+            //    << " coord2:" << masterFaceLayer.localPoints()[pointi]
+            //    << " for original point " << mp[pointi] << endl;
         }
     }
 
@@ -187,9 +187,9 @@ void Foam::attachDetach::detachInterface
 
         face newFace(oldFace.size());
 
-        forAll(oldFace, pointI)
+        forAll(oldFace, pointi)
         {
-            newFace[pointI] = addedPoints[oldFace[pointI]];
+            newFace[pointi] = addedPoints[oldFace[pointi]];
         }
 
         if (mfFlip[facei])
@@ -378,12 +378,12 @@ void Foam::attachDetach::detachInterface
     // Create the master layer point map
     Map<label> masterLayerPointMap(2*mp.size());
 
-    forAll(mp, pointI)
+    forAll(mp, pointi)
     {
         masterLayerPointMap.insert
         (
-            mp[pointI],
-            addedPoints[pointI]
+            mp[pointi],
+            addedPoints[pointi]
         );
     }
 
@@ -403,17 +403,17 @@ void Foam::attachDetach::detachInterface
 
         bool changed = false;
 
-        forAll(oldFace, pointI)
+        forAll(oldFace, pointi)
         {
-            if (masterLayerPointMap.found(oldFace[pointI]))
+            if (masterLayerPointMap.found(oldFace[pointi]))
             {
                 changed = true;
 
-                newFace[pointI] = masterLayerPointMap.find(oldFace[pointI])();
+                newFace[pointi] = masterLayerPointMap.find(oldFace[pointi])();
             }
             else
             {
-                newFace[pointI] = oldFace[pointI];
+                newFace[pointi] = oldFace[pointi];
             }
         }
 
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index fda1cb6258..24b5f3be81 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -51,12 +51,12 @@ const scalar boundaryMesh::distanceTol_ = 1e-2;
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Returns number of feature edges connected to pointI
-Foam::label Foam::boundaryMesh::nFeatureEdges(label pointI) const
+// Returns number of feature edges connected to pointi
+Foam::label Foam::boundaryMesh::nFeatureEdges(label pointi) const
 {
     label nFeats = 0;
 
-    const labelList& pEdges = mesh().pointEdges()[pointI];
+    const labelList& pEdges = mesh().pointEdges()[pointi];
 
     forAll(pEdges, pEdgeI)
     {
@@ -71,7 +71,7 @@ Foam::label Foam::boundaryMesh::nFeatureEdges(label pointI) const
 }
 
 
-// Returns next feature edge connected to pointI
+// Returns next feature edge connected to pointi
 Foam::label Foam::boundaryMesh::nextFeatureEdge
 (
     const label edgeI,
@@ -99,7 +99,7 @@ Foam::label Foam::boundaryMesh::nextFeatureEdge
 }
 
 
-// Finds connected feature edges, starting from startPointI and returns
+// Finds connected feature edges, starting from startPointi and returns
 // feature labels (not edge labels). Marks feature edges handled in
 // featVisited.
 Foam::labelList Foam::boundaryMesh::collectSegment
@@ -575,10 +575,10 @@ void Foam::boundaryMesh::read(const polyMesh& mesh)
 
         Pout<< "** Start of Points **" << endl;
 
-        forAll(msh.points(), pointI)
+        forAll(msh.points(), pointi)
         {
-            Pout<< "    " << pointI
-                << " coord:" << msh.points()[pointI]
+            Pout<< "    " << pointi
+                << " coord:" << msh.points()[pointi]
                 << endl;
         }
 
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
index 90e09ad6dc..d63de47cb1 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
@@ -110,7 +110,7 @@ class boundaryMesh
     // Private Member Functions
 
         //- Number of connected feature edges.
-        label nFeatureEdges(label pointI) const;
+        label nFeatureEdges(label pointi) const;
 
         //- Step to next feature edge
         label nextFeatureEdge(const label edgeI, const label vertI) const;
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
index fbbea89f0d..300e7f03a3 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.C
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.C
@@ -522,21 +522,21 @@ void Foam::createShellMesh::setRefinement
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Original point numbers in local point ordering so no need to store.
-    forAll(patch_.localPoints(), pointI)
+    forAll(patch_.localPoints(), pointi)
     {
-        //label addedPointI =
+        //label addedPointi =
         meshMod.addPoint
         (
-            patch_.localPoints()[pointI],   // point
+            patch_.localPoints()[pointi],   // point
             pointToPointMap.size(),         // masterPointID
             -1,                             // zoneID
             true                            // inCell
         );
-        pointToPointMap.append(pointI);
+        pointToPointMap.append(pointi);
 
-        //Pout<< "Added bottom point " << addedPointI
-        //    << " at " << patch_.localPoints()[pointI]
-        //    << "  from point " << pointI
+        //Pout<< "Added bottom point " << addedPointi
+        //    << " at " << patch_.localPoints()[pointi]
+        //    << "  from point " << pointi
         //    << endl;
     }
 
@@ -547,9 +547,9 @@ void Foam::createShellMesh::setRefinement
     labelList addedPoints(nLayers*regionPoints_.size());
     forAll(regionPoints_, regionI)
     {
-        label pointI = regionPoints_[regionI];
+        label pointi = regionPoints_[regionI];
 
-        point pt = patch_.localPoints()[pointI];
+        point pt = patch_.localPoints()[pointi];
         point disp = firstLayerDisp[regionI];
         for (label layerI = 0; layerI < nLayers; layerI++)
         {
@@ -562,7 +562,7 @@ void Foam::createShellMesh::setRefinement
                 -1,                     // zoneID
                 true                    // inCell
             );
-            pointToPointMap.append(pointI);
+            pointToPointMap.append(pointi);
 
             disp *= expansionRatio;
         }
@@ -617,16 +617,16 @@ void Foam::createShellMesh::setRefinement
 
             label own = addedCells[facei*nLayers+layerI];
             label nei;
-            label patchI;
+            label patchi;
             if (layerI == nLayers-1)
             {
                 nei = -1;
-                patchI = topPatchID[facei];
+                patchi = topPatchID[facei];
             }
             else
             {
                 nei = addedCells[facei*nLayers+layerI+1];
-                patchI = -1;
+                patchi = -1;
             }
 
             meshMod.addFace
@@ -638,7 +638,7 @@ void Foam::createShellMesh::setRefinement
                 -1,                         // masterEdgeID
                 faceToFaceMap.size(),       // masterFaceID : current facei
                 false,                      // flipFaceFlux
-                patchI,                     // patchID
+                patchi,                     // patchID
                 -1,                         // zoneID
                 false                       // zoneFlip
             );
@@ -746,7 +746,7 @@ void Foam::createShellMesh::setRefinement
 
             label minCelli = addedCells[nLayers*eFaces[0]+layerI];
             label maxCelli;
-            label patchI;
+            label patchi;
             if (ePatches.size() == 0)
             {
                 maxCelli = addedCells[nLayers*eFaces[1]+layerI];
@@ -756,12 +756,12 @@ void Foam::createShellMesh::setRefinement
                     Swap(minCelli, maxCelli);
                     newF = newF.reverseFace();
                 }
-                patchI = -1;
+                patchi = -1;
             }
             else
             {
                 maxCelli = -1;
-                patchI = ePatches[0];
+                patchi = ePatches[0];
             }
 
             //{
@@ -789,7 +789,7 @@ void Foam::createShellMesh::setRefinement
                 -1,                     // masterEdgeID
                 faceToFaceMap.size(),   // masterFaceID
                 false,                  // flipFaceFlux
-                patchI,                 // patchID
+                patchi,                 // patchID
                 -1,                     // zoneID
                 false                   // zoneFlip
             );
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 690944fca9..d2ad4d6f5d 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -618,23 +618,23 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::mergeSharedPoints
 
         forAll(constructMap, i)
         {
-            label oldPointI = constructMap[i];
+            label oldPointi = constructMap[i];
 
-            label newPointI = map().reversePointMap()[oldPointI];
+            label newPointi = map().reversePointMap()[oldPointi];
 
-            if (newPointI < -1)
+            if (newPointi < -1)
             {
-                constructMap[i] = -newPointI-2;
+                constructMap[i] = -newPointi-2;
             }
-            else if (newPointI >= 0)
+            else if (newPointi >= 0)
             {
-                constructMap[i] = newPointI;
+                constructMap[i] = newPointi;
             }
             else
             {
                 FatalErrorInFunction
-                    << "Problem. oldPointI:" << oldPointI
-                    << " newPointI:" << newPointI << abort(FatalError);
+                    << "Problem. oldPointi:" << oldPointi
+                    << " newPointi:" << newPointi << abort(FatalError);
             }
         }
     }
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index 3a13d365f9..5c15583152 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -149,8 +149,8 @@ class fvMeshDistribute
             void correctBoundaryConditions();
 
             //- Delete all processor patches. Move any processor faces into
-            //  patchI.
-            autoPtr<mapPolyMesh> deleteProcPatches(const label patchI);
+            //  patchi.
+            autoPtr<mapPolyMesh> deleteProcPatches(const label patchi);
 
             //- Repatch the mesh. This is only necessary for the proc
             //  boundary faces. newPatchID is over all boundary faces: -1 or
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index d3eedf6e22..aefac0c95b 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -211,9 +211,9 @@ void Foam::fvMeshDistribute::mapExposedFaces
 
         // Pull from old internal field into bfld.
 
-        forAll(bfld, patchI)
+        forAll(bfld, patchi)
         {
-            fvsPatchField<T>& patchFld = bfld[patchI];
+            fvsPatchField<T>& patchFld = bfld[patchi];
 
             forAll(patchFld, i)
             {
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index e23cceea12..2818ef9c95 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -69,10 +69,10 @@ void Foam::fvMeshSubset::markPoints
     Map<label>& pointMap
 )
 {
-    forAll(curPoints, pointI)
+    forAll(curPoints, pointi)
     {
         // Note: insert will only insert if not yet there.
-        pointMap.insert(curPoints[pointI], 0);
+        pointMap.insert(curPoints[pointi], 0);
     }
 }
 
@@ -83,9 +83,9 @@ void Foam::fvMeshSubset::markPoints
     labelList& pointMap
 )
 {
-    forAll(curPoints, pointI)
+    forAll(curPoints, pointi)
     {
-        pointMap[curPoints[pointI]] = 0;
+        pointMap[curPoints[pointi]] = 0;
     }
 }
 
@@ -580,9 +580,9 @@ void Foam::fvMeshSubset::setCellSubset
     pointMap_ = globalPointMap.toc();
     sort(pointMap_);
 
-    forAll(pointMap_, pointI)
+    forAll(pointMap_, pointi)
     {
-        globalPointMap[pointMap_[pointI]] = pointI;
+        globalPointMap[pointMap_[pointi]] = pointi;
     }
 
     Pout<< "Number of cells in new mesh: " << nCellsInSet << endl;
@@ -594,9 +594,9 @@ void Foam::fvMeshSubset::setCellSubset
 
     label nNewPoints = 0;
 
-    forAll(pointMap_, pointI)
+    forAll(pointMap_, pointi)
     {
-        newPoints[nNewPoints] = oldPoints[pointMap_[pointI]];
+        newPoints[nNewPoints] = oldPoints[pointMap_[pointi]];
         nNewPoints++;
     }
 
@@ -1086,9 +1086,9 @@ void Foam::fvMeshSubset::setLargeCellSubset
     // Grab the points map
     label nPointsInSet = 0;
 
-    forAll(globalPointMap, pointI)
+    forAll(globalPointMap, pointi)
     {
-        if (globalPointMap[pointI] != -1)
+        if (globalPointMap[pointi] != -1)
         {
             nPointsInSet++;
         }
@@ -1097,12 +1097,12 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
     nPointsInSet = 0;
 
-    forAll(globalPointMap, pointI)
+    forAll(globalPointMap, pointi)
     {
-        if (globalPointMap[pointI] != -1)
+        if (globalPointMap[pointi] != -1)
         {
-            pointMap_[nPointsInSet] = pointI;
-            globalPointMap[pointI] = nPointsInSet;
+            pointMap_[nPointsInSet] = pointi;
+            globalPointMap[pointi] = nPointsInSet;
             nPointsInSet++;
         }
     }
@@ -1116,9 +1116,9 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
     label nNewPoints = 0;
 
-    forAll(pointMap_, pointI)
+    forAll(pointMap_, pointi)
     {
-        newPoints[nNewPoints] = oldPoints[pointMap_[pointI]];
+        newPoints[nNewPoints] = oldPoints[pointMap_[pointi]];
         nNewPoints++;
     }
 
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index 1188fb461c..7a0192ee06 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -461,9 +461,9 @@ fvMeshSubset::interpolate
             forAll(subMeshPoints, localI)
             {
                 // Get mesh point on original mesh.
-                label meshPointI = pointMap[subMeshPoints[localI]];
+                label meshPointi = pointMap[subMeshPoints[localI]];
 
-                Map<label>::const_iterator iter = meshPointMap.find(meshPointI);
+                Map<label>::const_iterator iter = meshPointMap.find(meshPointi);
 
                 if (iter != meshPointMap.end())
                 {
diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.H b/src/dynamicMesh/fvMeshTools/fvMeshTools.H
index 1b5f60c1c8..85987b09b5 100644
--- a/src/dynamicMesh/fvMeshTools/fvMeshTools.H
+++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.H
@@ -62,7 +62,7 @@ class fvMeshTools
     static void setPatchFields
     (
         fvMesh& mesh,
-        const label patchI,
+        const label patchi,
         const dictionary& patchFieldDict
     );
 
@@ -71,7 +71,7 @@ class fvMeshTools
     static void setPatchFields
     (
         fvMesh& mesh,
-        const label patchI,
+        const label patchi,
         const typename GeoField::value_type& value
     );
 
@@ -105,12 +105,12 @@ public:
     static void setPatchFields
     (
         fvMesh& mesh,
-        const label patchI,
+        const label patchi,
         const dictionary& patchFieldDict
     );
 
     //- Change patchField to zero on registered fields
-    static void zeroPatchFields(fvMesh& mesh, const label patchI);
+    static void zeroPatchFields(fvMesh& mesh, const label patchi);
 
     //- Reorder and remove trailing patches. If validBoundary call is parallel
     //  synced and all add the same patch with same settings
diff --git a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
index dfef7b114d..a19783e5cc 100644
--- a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
@@ -125,18 +125,18 @@ void Foam::layerAdditionRemoval::addCellLayer
     // Add the new points
     labelList addedPoints(mp.size());
 
-    forAll(mp, pointI)
+    forAll(mp, pointi)
     {
         // Add the point nominal thickness away from the master zone point
         // and grab the label
-        addedPoints[pointI] =
+        addedPoints[pointi] =
             ref.setAction
             (
                 polyAddPoint
                 (
-                    points[mp[pointI]]                  // point
-                  + addDelta_*pointOffsets[pointI],
-                    mp[pointI],                         // master point
+                    points[mp[pointi]]                  // point
+                  + addDelta_*pointOffsets[pointi],
+                    mp[pointi],                         // master point
                     -1,                                 // zone for point
                     true                                // supports a cell
                 )
@@ -200,9 +200,9 @@ void Foam::layerAdditionRemoval::addCellLayer
 
         face newFace(oldFace.size());
 
-        forAll(oldFace, pointI)
+        forAll(oldFace, pointi)
         {
-            newFace[pointI] = addedPoints[oldFace[pointI]];
+            newFace[pointi] = addedPoints[oldFace[pointi]];
         }
 
         bool flipFaceFlux = false;
@@ -509,12 +509,12 @@ void Foam::layerAdditionRemoval::addCellLayer
     // Create the master layer point map
     Map<label> masterLayerPointMap(2*mp.size());
 
-    forAll(mp, pointI)
+    forAll(mp, pointi)
     {
         masterLayerPointMap.insert
         (
-            mp[pointI],
-            addedPoints[pointI]
+            mp[pointi],
+            addedPoints[pointi]
         );
     }
 
@@ -534,17 +534,17 @@ void Foam::layerAdditionRemoval::addCellLayer
 
         bool changed = false;
 
-        forAll(oldFace, pointI)
+        forAll(oldFace, pointi)
         {
-            if (masterLayerPointMap.found(oldFace[pointI]))
+            if (masterLayerPointMap.found(oldFace[pointi]))
             {
                 changed = true;
 
-                newFace[pointI] = masterLayerPointMap.find(oldFace[pointI])();
+                newFace[pointi] = masterLayerPointMap.find(oldFace[pointi])();
             }
             else
             {
-                newFace[pointI] = oldFace[pointI];
+                newFace[pointi] = oldFace[pointi];
             }
         }
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
index f32dbfb8a0..4951c8f85a 100644
--- a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
@@ -159,9 +159,9 @@ void Foam::layerAdditionRemoval::removeCellLayer
     }
 
     // Remove all points that will be collapsed
-    forAll(ptc, pointI)
+    forAll(ptc, pointi)
     {
-        ref.setAction(polyRemovePoint(ptc[pointI]));
+        ref.setAction(polyRemovePoint(ptc[pointi]));
     }
 
     // Grab all faces coming off points to be deleted.  If the face
@@ -176,9 +176,9 @@ void Foam::layerAdditionRemoval::removeCellLayer
     const labelList& meshPoints =
         mesh.faceZones()[faceZoneID_.index()]().meshPoints();
 
-    forAll(ptc, pointI)
+    forAll(ptc, pointi)
     {
-        removedPointMap.insert(ptc[pointI], meshPoints[pointI]);
+        removedPointMap.insert(ptc[pointi], meshPoints[pointi]);
     }
 
     const labelListList& pf = mesh.pointFaces();
@@ -188,9 +188,9 @@ void Foam::layerAdditionRemoval::removeCellLayer
     // Make a list of faces to be modified using the map to avoid duplicates
     labelHashSet facesToModify(ptc.size()*primitiveMesh::facesPerPoint_);
 
-    forAll(ptc, pointI)
+    forAll(ptc, pointi)
     {
-        const labelList& curFaces = pf[ptc[pointI]];
+        const labelList& curFaces = pf[ptc[pointi]];
 
         forAll(curFaces, facei)
         {
@@ -217,15 +217,15 @@ void Foam::layerAdditionRemoval::removeCellLayer
 
         face newFace(faces[curFaceID]);
 
-        forAll(newFace, pointI)
+        forAll(newFace, pointi)
         {
             Map<label>::iterator rpmIter =
-                removedPointMap.find(newFace[pointI]);
+                removedPointMap.find(newFace[pointi]);
 
             if (rpmIter != removedPointMap.end())
             {
                 // Point mapped. Replace it
-                newFace[pointI] = rpmIter();
+                newFace[pointi] = rpmIter();
             }
         }
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index 85ec543d28..6dcd9cb5fe 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -135,19 +135,19 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
         ftc[facei] = lidFace.oppositeIndex();
 
         // Using the local face insert the points into the lid list
-        forAll(curLocalFace, pointI)
+        forAll(curLocalFace, pointi)
         {
-            const label clp = curLocalFace[pointI];
+            const label clp = curLocalFace[pointi];
 
             if (ptc[clp] == -1)
             {
                 // Point not mapped yet.  Insert the label
-                ptc[clp] = lidFace[pointI];
+                ptc[clp] = lidFace[pointi];
             }
             else
             {
                 // Point mapped from some other face.  Check the label
-                if (ptc[clp] != lidFace[pointI])
+                if (ptc[clp] != lidFace[pointi])
                 {
                     nPointErrors++;
 
@@ -159,7 +159,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
                             << "consistently.  Please check the "
                             << "face zone flip map." << nl
                             << "First index: " << ptc[clp]
-                            << " new index: " << lidFace[pointI] << endl;
+                            << " new index: " << lidFace[pointi] << endl;
                     }
                 }
             }
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 9c6b539289..b49a709009 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -145,10 +145,10 @@ void Foam::cellCuts::writeUncutOBJ
 
     forAll(cPoints, i)
     {
-        label pointI = cPoints[i];
-        if (pointIsCut_[pointI])
+        label pointi = cPoints[i];
+        if (pointIsCut_[pointi])
         {
-            meshTools::writeOBJ(cutStream, mesh().points()[pointI]);
+            meshTools::writeOBJ(cutStream, mesh().points()[pointi]);
         }
     }
 
@@ -1129,18 +1129,18 @@ void Foam::cellCuts::calcCellLoops(const labelList& cutCells)
 void Foam::cellCuts::walkEdges
 (
     const label celli,
-    const label pointI,
+    const label pointi,
     const label status,
 
     Map<label>& edgeStatus,
     Map<label>& pointStatus
 ) const
 {
-    if (pointStatus.insert(pointI, status))
+    if (pointStatus.insert(pointi, status))
     {
-        // First visit to pointI
+        // First visit to pointi
 
-        const labelList& pEdges = mesh().pointEdges()[pointI];
+        const labelList& pEdges = mesh().pointEdges()[pointi];
 
         forAll(pEdges, pEdgeI)
         {
@@ -1154,7 +1154,7 @@ void Foam::cellCuts::walkEdges
             {
                 // First visit to edgeI so recurse.
 
-                label v2 = mesh().edges()[edgeI].otherVertex(pointI);
+                label v2 = mesh().edges()[edgeI].otherVertex(pointi);
 
                 walkEdges(celli, v2, status, edgeStatus, pointStatus);
             }
@@ -1175,15 +1175,15 @@ Foam::labelList Foam::cellCuts::nonAnchorPoints
 
     forAll(cellPoints, i)
     {
-        label pointI = cellPoints[i];
+        label pointi = cellPoints[i];
 
         if
         (
-            findIndex(anchorPoints, pointI) == -1
-         && findIndex(loop, vertToEVert(pointI)) == -1
+            findIndex(anchorPoints, pointi) == -1
+         && findIndex(loop, vertToEVert(pointi)) == -1
         )
         {
-            newElems[newElemI++] = pointI;
+            newElems[newElemI++] = pointi;
         }
     }
 
@@ -1358,9 +1358,9 @@ bool Foam::cellCuts::calcAnchors
 
     forAllConstIter(Map<label>, pointStatus, iter)
     {
-        label pointI = iter.key();
+        label pointi = iter.key();
 
-        const labelList& pFaces = mesh().pointFaces()[pointI];
+        const labelList& pFaces = mesh().pointFaces()[pointi];
 
         if (iter() == 1)
         {
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
index d08669176b..7e80ce18f5 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
@@ -322,7 +322,7 @@ class cellCuts
             void walkEdges
             (
                 const label celli,
-                const label pointI,
+                const label pointi,
                 const label status,
 
                 Map<label>& edgeStatus,
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
index a7a7b4313d..711b5c8194 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ public:
             return getVertex(mesh_, eVert);
         }
 
-        //- Convert pointI to eVert
+        //- Convert pointi to eVert
         static label vertToEVert(const primitiveMesh& mesh, const label vertI)
         {
             if ((vertI < 0) || (vertI >= mesh.nPoints()))
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index 031e5be7dd..0b2da048dd 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -338,16 +338,16 @@ bool Foam::boundaryCutter::splitFace
 
         forAll(extendedFace, i)
         {
-            label pointI = extendedFace[fp];
+            label pointi = extendedFace[fp];
 
-            newFace.append(pointI);
+            newFace.append(pointi);
 
             if
             (
                 newFace.size() > 2
              && (
-                    pointI >= mesh_.nPoints()
-                 || pointToPos.found(pointI)
+                    pointi >= mesh_.nPoints()
+                 || pointToPos.found(pointi)
                 )
             )
             {
@@ -460,7 +460,7 @@ void Foam::boundaryCutter::setRefinement
             // point on feature to move to
             const point& featurePoint = cuts[cutI];
 
-            label addedPointI =
+            label addedPointi =
                 meshMod.setAction
                 (
                     polyAddPoint
@@ -480,16 +480,16 @@ void Foam::boundaryCutter::setRefinement
 
                 label sz = addedPoints.size();
                 addedPoints.setSize(sz+1);
-                addedPoints[sz] = addedPointI;
+                addedPoints[sz] = addedPointi;
             }
             else
             {
-                edgeToAddedPoints.insert(edgeI, labelList(1, addedPointI));
+                edgeToAddedPoints.insert(edgeI, labelList(1, addedPointi));
             }
 
             if (debug)
             {
-                Pout<< "Added point " << addedPointI << " for edge " << edgeI
+                Pout<< "Added point " << addedPointi << " for edge " << edgeI
                     << " with cuts:" << edgeToAddedPoints[edgeI] << endl;
             }
         }
@@ -523,7 +523,7 @@ void Foam::boundaryCutter::setRefinement
                 << abort(FatalError);
         }
 
-        label addedPointI =
+        label addedPointi =
             meshMod.setAction
             (
                 polyAddPoint
@@ -534,11 +534,11 @@ void Foam::boundaryCutter::setRefinement
                     true    // supports a cell
                 )
             );
-        faceAddedPoint_.insert(facei, addedPointI);
+        faceAddedPoint_.insert(facei, addedPointi);
 
         if (debug)
         {
-            Pout<< "Added point " << addedPointI << " for feature point "
+            Pout<< "Added point " << addedPointi << " for feature point "
                 << iter() << " on face " << facei << " with centre "
                 << mesh_.faceCentres()[facei] << endl;
         }
@@ -563,7 +563,7 @@ void Foam::boundaryCutter::setRefinement
         // Get face with new points on cut edges.
         face newFace(addEdgeCutsToFace(facei, edgeToAddedPoints));
 
-        label addedPointI = iter();
+        label addedPointi = iter();
 
         // Information about old face
         label patchID, zoneID, zoneFlip;
@@ -581,7 +581,7 @@ void Foam::boundaryCutter::setRefinement
 
             tri[0] = newFace[fp];
             tri[1] = nextV;
-            tri[2] = addedPointI;
+            tri[2] = addedPointi;
 
             if (fp == 0)
             {
@@ -847,13 +847,13 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
 
             label newFacei = morphMap.reverseFaceMap()[oldFacei];
 
-            label oldPointI = iter();
+            label oldPointi = iter();
 
-            label newPointI = morphMap.reversePointMap()[oldPointI];
+            label newPointi = morphMap.reversePointMap()[oldPointi];
 
-            if (newFacei >= 0 && newPointI >= 0)
+            if (newFacei >= 0 && newPointi >= 0)
             {
-                newAddedPoints.insert(newFacei, newPointI);
+                newAddedPoints.insert(newFacei, newPointi);
             }
         }
 
@@ -895,12 +895,12 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
 
                 forAll(addedPoints, i)
                 {
-                    label newAddedPointI =
+                    label newAddedPointi =
                         morphMap.reversePointMap()[addedPoints[i]];
 
-                    if (newAddedPointI >= 0)
+                    if (newAddedPointi >= 0)
                     {
-                        newAddedPoints[newI++] = newAddedPointI;
+                        newAddedPoints[newI++] = newAddedPointi;
                     }
                 }
                 if (newI > 0)
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index b6d34a8dbe..4ac1f6485a 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -115,9 +115,9 @@ Foam::label Foam::meshCutAndRemove::findInternalFacePoint
 {
     forAll(pointLabels, labelI)
     {
-        label pointI = pointLabels[labelI];
+        label pointi = pointLabels[labelI];
 
-        const labelList& pFaces = mesh().pointFaces()[pointI];
+        const labelList& pFaces = mesh().pointFaces()[pointi];
 
         forAll(pFaces, pFacei)
         {
@@ -125,7 +125,7 @@ Foam::label Foam::meshCutAndRemove::findInternalFacePoint
 
             if (mesh().isInternalFace(facei))
             {
-                return pointI;
+                return pointi;
             }
         }
     }
@@ -151,17 +151,17 @@ Foam::label Foam::meshCutAndRemove::findPatchFacePoint
 
     forAll(f, fp)
     {
-        label pointI = f[fp];
+        label pointi = f[fp];
 
-        if (pointI < mesh().nPoints())
+        if (pointi < mesh().nPoints())
         {
-            const labelList& pFaces = pointFaces[pointI];
+            const labelList& pFaces = pointFaces[pointi];
 
             forAll(pFaces, i)
             {
                 if (patches.whichPatch(pFaces[i]) == exposedPatchi)
                 {
-                    return pointI;
+                    return pointi;
                 }
             }
         }
@@ -239,7 +239,7 @@ void Foam::meshCutAndRemove::addFace
 (
     polyTopoChange& meshMod,
     const label facei,
-    const label masterPointI,
+    const label masterPointi,
     const face& newFace,
     const label own,
     const label nei,
@@ -260,7 +260,7 @@ void Foam::meshCutAndRemove::addFace
                 << " with new owner:" << own
                 << " with new neighbour:" << nei
                 << " patchID:" << patchID
-                << " anchor:" << masterPointI
+                << " anchor:" << masterPointi
                 << " zoneID:" << zoneID
                 << " zoneFlip:" << zoneFlip
                 << endl;
@@ -273,7 +273,7 @@ void Foam::meshCutAndRemove::addFace
                 newFace,                    // face
                 own,                        // owner
                 nei,                        // neighbour
-                masterPointI,               // master point
+                masterPointi,               // master point
                 -1,                         // master edge
                 -1,                         // master face for addition
                 false,                      // flux flip
@@ -292,7 +292,7 @@ void Foam::meshCutAndRemove::addFace
                 << " with new owner:" << nei
                 << " with new neighbour:" << own
                 << " patchID:" << patchID
-                << " anchor:" << masterPointI
+                << " anchor:" << masterPointi
                 << " zoneID:" << zoneID
                 << " zoneFlip:" << zoneFlip
                 << endl;
@@ -305,7 +305,7 @@ void Foam::meshCutAndRemove::addFace
                 newFace.reverseFace(),      // face
                 nei,                        // owner
                 own,                        // neighbour
-                masterPointI,               // master point
+                masterPointi,               // master point
                 -1,                         // master edge
                 -1,                         // master face for addition
                 false,                      // flux flip
@@ -623,7 +623,7 @@ void Foam::meshCutAndRemove::setRefinement
             }
 
             // One of the edge end points should be master point of nbCelli.
-            label masterPointI = e.start();
+            label masterPointi = e.start();
 
             const point& v0 = mesh().points()[e.start()];
             const point& v1 = mesh().points()[e.end()];
@@ -632,26 +632,26 @@ void Foam::meshCutAndRemove::setRefinement
 
             point newPt = weight*v1 + (1.0-weight)*v0;
 
-            label addedPointI =
+            label addedPointi =
                 meshMod.setAction
                 (
                     polyAddPoint
                     (
                         newPt,              // point
-                        masterPointI,       // master point
+                        masterPointi,       // master point
                         -1,                 // zone for point
                         true                // supports a cell
                     )
                 );
 
             // Store on (hash of) edge.
-            addedPoints_.insert(e, addedPointI);
+            addedPoints_.insert(e, addedPointi);
 
             if (debug & 2)
             {
-                Pout<< "Added point " << addedPointI
+                Pout<< "Added point " << addedPointi
                     << " to vertex "
-                    << masterPointI << " of edge " << edgeI
+                    << masterPointi << " of edge " << edgeI
                     << " vertices " << e << endl;
             }
         }
@@ -714,33 +714,33 @@ void Foam::meshCutAndRemove::setRefinement
 
                 if (!isEdge(cut))
                 {
-                    label pointI = getVertex(cut);
+                    label pointi = getVertex(cut);
 
-                    if (!usedPoint[pointI])
+                    if (!usedPoint[pointi])
                     {
                         FatalErrorInFunction
                             << "Problem: faceSplitCut not used by any loop"
                             << " or cell anchor point"
-                            << "face:" << iter.key() << " point:" << pointI
-                            << " coord:" << mesh().points()[pointI]
+                            << "face:" << iter.key() << " point:" << pointi
+                            << " coord:" << mesh().points()[pointi]
                             << abort(FatalError);
                     }
                 }
             }
         }
 
-        forAll(cuts.pointIsCut(), pointI)
+        forAll(cuts.pointIsCut(), pointi)
         {
-            if (cuts.pointIsCut()[pointI])
+            if (cuts.pointIsCut()[pointi])
             {
-                if (!usedPoint[pointI])
+                if (!usedPoint[pointi])
                 {
                     FatalErrorInFunction
                         << "Problem: point is marked as cut but"
                         << " not used by any loop"
                         << " or cell anchor point"
-                        << "point:" << pointI
-                        << " coord:" << mesh().points()[pointI]
+                        << "point:" << pointi
+                        << " coord:" << mesh().points()[pointi]
                         << abort(FatalError);
                 }
             }
@@ -748,15 +748,15 @@ void Foam::meshCutAndRemove::setRefinement
 
 
         // Remove unused points.
-        forAll(usedPoint, pointI)
+        forAll(usedPoint, pointi)
         {
-            if (!usedPoint[pointI])
+            if (!usedPoint[pointi])
             {
-                meshMod.setAction(polyRemovePoint(pointI));
+                meshMod.setAction(polyRemovePoint(pointi));
 
                 if (debug & 2)
                 {
-                    Pout<< "Removing unused point " << pointI << endl;
+                    Pout<< "Removing unused point " << pointi << endl;
                 }
             }
         }
@@ -790,7 +790,7 @@ void Foam::meshCutAndRemove::setRefinement
             reverse(newFace);
 
             // Pick any anchor point on cell
-            label masterPointI = findPatchFacePoint(newFace, exposedPatchi);
+            label masterPointi = findPatchFacePoint(newFace, exposedPatchi);
 
             label addedFacei =
                 meshMod.setAction
@@ -800,7 +800,7 @@ void Foam::meshCutAndRemove::setRefinement
                         newFace,                // face
                         celli,                  // owner
                         -1,                     // neighbour
-                        masterPointI,           // master point
+                        masterPointi,           // master point
                         -1,                     // master edge
                         -1,                     // master face for addition
                         false,                  // flux flip
@@ -815,7 +815,7 @@ void Foam::meshCutAndRemove::setRefinement
             if (debug & 2)
             {
                 Pout<< "Added splitting face " << newFace << " index:"
-                    << addedFacei << " from masterPoint:" << masterPointI
+                    << addedFacei << " from masterPoint:" << masterPointi
                     << " to owner " << celli << " with anchors:"
                     << anchorPts[celli]
                     << " from Loop:";
@@ -1080,13 +1080,13 @@ void Foam::meshCutAndRemove::setRefinement
                 }
                 else
                 {
-                    label masterPointI = findPatchFacePoint(f1, patchID);
+                    label masterPointi = findPatchFacePoint(f1, patchID);
 
                     addFace
                     (
                         meshMod,
                         facei,          // face for zone info
-                        masterPointI,   // inflation point
+                        masterPointi,   // inflation point
                         f1,             // vertices of face
                         f1Own,
                         f1Nei,
@@ -1107,13 +1107,13 @@ void Foam::meshCutAndRemove::setRefinement
                 }
                 else
                 {
-                    label masterPointI = findPatchFacePoint(f1, patchID);
+                    label masterPointi = findPatchFacePoint(f1, patchID);
 
                     addFace
                     (
                         meshMod,
                         facei,
-                        masterPointI,
+                        masterPointi,
                         f1,
                         f1Own,
                         f1Nei,
@@ -1131,9 +1131,9 @@ void Foam::meshCutAndRemove::setRefinement
                 }
                 else
                 {
-                    label masterPointI = findPatchFacePoint(f1, -1);
+                    label masterPointi = findPatchFacePoint(f1, -1);
 
-                    addFace(meshMod, facei, masterPointI, f1, f1Own, f1Nei, -1);
+                    addFace(meshMod, facei, masterPointi, f1, f1Own, f1Nei, -1);
                 }
             }
         }
@@ -1318,28 +1318,28 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
 
             label newEnd = map.reversePointMap()[e.end()];
 
-            label addedPointI = iter();
+            label addedPointi = iter();
 
-            label newAddedPointI = map.reversePointMap()[addedPointI];
+            label newAddedPointi = map.reversePointMap()[addedPointi];
 
-            if ((newStart >= 0) && (newEnd >= 0) && (newAddedPointI >= 0))
+            if ((newStart >= 0) && (newEnd >= 0) && (newAddedPointi >= 0))
             {
                 edge newE = edge(newStart, newEnd);
 
                 if
                 (
                     (debug & 2)
-                 && (e != newE || newAddedPointI != addedPointI)
+                 && (e != newE || newAddedPointi != addedPointi)
                 )
                 {
                     Pout<< "meshCutAndRemove::updateMesh :"
                         << " updating addedPoints for edge " << e
-                        << " from " << addedPointI
-                        << " to " << newAddedPointI
+                        << " from " << addedPointi
+                        << " to " << newAddedPointi
                         << endl;
                 }
 
-                newAddedPoints.insert(newE, newAddedPointI);
+                newAddedPoints.insert(newE, newAddedPointi);
             }
         }
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
index 1eec8b0f20..cbd569f146 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
@@ -87,14 +87,14 @@ class meshCutAndRemove
         //- Returns -1 or the cell in cellLabels that is cut.
         label findCutCell(const cellCuts&, const labelList&) const;
 
-        //- Returns first pointI in pointLabels that uses an internal
+        //- Returns first pointi in pointLabels that uses an internal
         //  face. Used to find point to inflate cell/face from (has to be
         //  connected to internal face)
         label findInternalFacePoint(const labelList& pointLabels) const;
 
         //- Find point on face that is part of original mesh and that is
         //  point connected to the patch
-        label findPatchFacePoint(const face& f, const label patchI) const;
+        label findPatchFacePoint(const face& f, const label patchi) const;
 
         //- Get new owner and neighbour of face. Checks anchor points to see if
         // need to get original or added cell.
@@ -121,7 +121,7 @@ class meshCutAndRemove
         (
             polyTopoChange& meshMod,
             const label facei,
-            const label masterPointI,
+            const label masterPointi,
             const face& newFace,
             const label owner,
             const label neighbour,
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index 46f14e3528..903e1c60a9 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -106,9 +106,9 @@ Foam::label Foam::meshCutter::findInternalFacePoint
 {
     forAll(pointLabels, labelI)
     {
-        label pointI = pointLabels[labelI];
+        label pointi = pointLabels[labelI];
 
-        const labelList& pFaces = mesh().pointFaces()[pointI];
+        const labelList& pFaces = mesh().pointFaces()[pointi];
 
         forAll(pFaces, pFacei)
         {
@@ -116,7 +116,7 @@ Foam::label Foam::meshCutter::findInternalFacePoint
 
             if (mesh().isInternalFace(facei))
             {
-                return pointI;
+                return pointi;
             }
         }
     }
@@ -564,7 +564,7 @@ void Foam::meshCutter::setRefinement
             }
 
             // One of the edge end points should be master point of nbCelli.
-            label masterPointI = e.start();
+            label masterPointi = e.start();
 
             const point& v0 = mesh().points()[e.start()];
             const point& v1 = mesh().points()[e.end()];
@@ -573,26 +573,26 @@ void Foam::meshCutter::setRefinement
 
             point newPt = weight*v1 + (1.0-weight)*v0;
 
-            label addedPointI =
+            label addedPointi =
                 meshMod.setAction
                 (
                     polyAddPoint
                     (
                         newPt,              // point
-                        masterPointI,       // master point
+                        masterPointi,       // master point
                         -1,                 // zone for point
                         true                // supports a cell
                     )
                 );
 
             // Store on (hash of) edge.
-            addedPoints_.insert(e, addedPointI);
+            addedPoints_.insert(e, addedPointi);
 
             if (debug & 2)
             {
-                Pout<< "Added point " << addedPointI
+                Pout<< "Added point " << addedPointi
                     << " to vertex "
-                    << masterPointI << " of edge " << edgeI
+                    << masterPointi << " of edge " << edgeI
                     << " vertices " << e << endl;
             }
         }
@@ -647,7 +647,7 @@ void Foam::meshCutter::setRefinement
             face newFace(loopToFace(celli, loop));
 
             // Pick any anchor point on cell
-            label masterPointI = findInternalFacePoint(anchorPts[celli]);
+            label masterPointi = findInternalFacePoint(anchorPts[celli]);
 
             label addedFacei =
                 meshMod.setAction
@@ -657,7 +657,7 @@ void Foam::meshCutter::setRefinement
                         newFace,                // face
                         celli,                  // owner
                         addedCells_[celli],     // neighbour
-                        masterPointI,           // master point
+                        masterPointi,           // master point
                         -1,                     // master edge
                         -1,                     // master face for addition
                         false,                  // flux flip
@@ -1059,28 +1059,28 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
 
             label newEnd = morphMap.reversePointMap()[e.end()];
 
-            label addedPointI = iter();
+            label addedPointi = iter();
 
-            label newAddedPointI = morphMap.reversePointMap()[addedPointI];
+            label newAddedPointi = morphMap.reversePointMap()[addedPointi];
 
-            if ((newStart >= 0) && (newEnd >= 0) && (newAddedPointI >= 0))
+            if ((newStart >= 0) && (newEnd >= 0) && (newAddedPointi >= 0))
             {
                 edge newE = edge(newStart, newEnd);
 
                 if
                 (
                     (debug & 2)
-                 && (e != newE || newAddedPointI != addedPointI)
+                 && (e != newE || newAddedPointi != addedPointi)
                 )
                 {
                     Pout<< "meshCutter::updateMesh :"
                         << " updating addedPoints for edge " << e
-                        << " from " << addedPointI
-                        << " to " << newAddedPointI
+                        << " from " << addedPointi
+                        << " to " << newAddedPointi
                         << endl;
                 }
 
-                newAddedPoints.insert(newE, newAddedPointI);
+                newAddedPoints.insert(newE, newAddedPointi);
             }
         }
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
index cec3b8d80a..b244e72367 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
@@ -165,7 +165,7 @@ class meshCutter
         //- Returns -1 or the cell in cellLabels that is cut.
         label findCutCell(const cellCuts&, const labelList&) const;
 
-        //- Returns first pointI in pointLabels that uses an internal
+        //- Returns first pointi in pointLabels that uses an internal
         //  face. Used to find point to inflate cell/face from (has to be
         //  connected to internal face)
         label findInternalFacePoint(const labelList& pointLabels) const;
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.H b/src/dynamicMesh/motionSmoother/motionSmoother.H
index 3366f01d05..580d6f18e6 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.H
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
     E.g.
     \verbatim
         // Construct iterative mesh mover.
-        motionSmoother meshMover(mesh, labelList(1, patchI));
+        motionSmoother meshMover(mesh, labelList(1, patchi));
 
         // Set desired displacement:
         meshMover.displacement() = ..
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index a3f0d7a8ed..819894dbb9 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -74,16 +74,16 @@ void Foam::motionSmootherAlgo::testSyncPositions
 
 void Foam::motionSmootherAlgo::checkFld(const pointScalarField& fld)
 {
-    forAll(fld, pointI)
+    forAll(fld, pointi)
     {
-        const scalar val = fld[pointI];
+        const scalar val = fld[pointi];
 
         if ((val > -GREAT) && (val < GREAT))
         {}
         else
         {
             FatalErrorInFunction
-                << "Problem : point:" << pointI << " value:" << val
+                << "Problem : point:" << pointi << " value:" << val
                 << abort(FatalError);
         }
     }
@@ -148,13 +148,13 @@ void Foam::motionSmootherAlgo::minSmooth
 
     forAll(meshPoints, i)
     {
-        label pointI = meshPoints[i];
-        if (isAffectedPoint.get(pointI) == 1)
+        label pointi = meshPoints[i];
+        if (isAffectedPoint.get(pointi) == 1)
         {
-            newFld[pointI] = min
+            newFld[pointi] = min
             (
-                fld[pointI],
-                0.5*fld[pointI] + 0.5*avgFld[pointI]
+                fld[pointi],
+                0.5*fld[pointi] + 0.5*avgFld[pointi]
             );
         }
     }
@@ -180,14 +180,14 @@ void Foam::motionSmootherAlgo::minSmooth
     );
     const pointScalarField& avgFld = tavgFld();
 
-    forAll(fld, pointI)
+    forAll(fld, pointi)
     {
-        if (isAffectedPoint.get(pointI) == 1 && isInternalPoint(pointI))
+        if (isAffectedPoint.get(pointi) == 1 && isInternalPoint(pointi))
         {
-            newFld[pointI] = min
+            newFld[pointi] = min
             (
-                fld[pointI],
-                0.5*fld[pointI] + 0.5*avgFld[pointI]
+                fld[pointi],
+                0.5*fld[pointi] + 0.5*avgFld[pointi]
             );
         }
     }
@@ -230,11 +230,11 @@ void Foam::motionSmootherAlgo::scaleField
 {
     forAll(meshPoints, i)
     {
-        label pointI = meshPoints[i];
+        label pointi = meshPoints[i];
 
-        if (pointLabels.found(pointI))
+        if (pointLabels.found(pointi))
         {
-            fld[pointI] *= scale;
+            fld[pointi] *= scale;
         }
     }
 }
@@ -272,19 +272,19 @@ void Foam::motionSmootherAlgo::subtractField
 {
     forAll(meshPoints, i)
     {
-        label pointI = meshPoints[i];
+        label pointi = meshPoints[i];
 
-        if (pointLabels.found(pointI))
+        if (pointLabels.found(pointi))
         {
-            fld[pointI] = max(0.0, fld[pointI]-f);
+            fld[pointi] = max(0.0, fld[pointi]-f);
         }
     }
 }
 
 
-bool Foam::motionSmootherAlgo::isInternalPoint(const label pointI) const
+bool Foam::motionSmootherAlgo::isInternalPoint(const label pointi) const
 {
-    return isInternalPoint_.get(pointI) == 1;
+    return isInternalPoint_.get(pointi) == 1;
 }
 
 
@@ -516,9 +516,9 @@ void Foam::motionSmootherAlgo::setDisplacement
     const labelList& ppMeshPoints = pp.meshPoints();
 
     // Set internal point data from displacement on combined patch points.
-    forAll(ppMeshPoints, patchPointI)
+    forAll(ppMeshPoints, patchPointi)
     {
-        displacement[ppMeshPoints[patchPointI]] = patchDisp[patchPointI];
+        displacement[ppMeshPoints[patchPointi]] = patchDisp[patchPointi];
     }
 
 
@@ -541,18 +541,18 @@ void Foam::motionSmootherAlgo::setDisplacement
     {
         OFstream str(mesh.db().path()/"changedPoints.obj");
         label nVerts = 0;
-        forAll(ppMeshPoints, patchPointI)
+        forAll(ppMeshPoints, patchPointi)
         {
-            const vector& newDisp = displacement[ppMeshPoints[patchPointI]];
+            const vector& newDisp = displacement[ppMeshPoints[patchPointi]];
 
-            if (mag(newDisp-patchDisp[patchPointI]) > SMALL)
+            if (mag(newDisp-patchDisp[patchPointi]) > SMALL)
             {
-                const point& pt = mesh.points()[ppMeshPoints[patchPointI]];
+                const point& pt = mesh.points()[ppMeshPoints[patchPointi]];
 
                 meshTools::writeOBJ(str, pt);
                 nVerts++;
                 //Pout<< "Point:" << pt
-                //    << " oldDisp:" << patchDisp[patchPointI]
+                //    << " oldDisp:" << patchDisp[patchPointi]
                 //    << " newDisp:" << newDisp << endl;
             }
         }
@@ -561,9 +561,9 @@ void Foam::motionSmootherAlgo::setDisplacement
     }
 
     // Now reset input displacement
-    forAll(ppMeshPoints, patchPointI)
+    forAll(ppMeshPoints, patchPointi)
     {
-        patchDisp[patchPointI] = displacement[ppMeshPoints[patchPointI]];
+        patchDisp[patchPointi] = displacement[ppMeshPoints[patchPointi]];
     }
 }
 
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
index 21db600776..71ac0e8989 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
@@ -35,7 +35,7 @@ Description
     E.g.
     \verbatim
         // Construct iterative mesh mover.
-        motionSmoother meshMover(mesh, labelList(1, patchI));
+        motionSmoother meshMover(mesh, labelList(1, patchi));
 
         // Set desired displacement:
         meshMover.displacement() = ..
@@ -269,7 +269,7 @@ class motionSmootherAlgo
         ) const;
 
         //- Helper function. Is point internal?
-        bool isInternalPoint(const label pointI) const;
+        bool isInternalPoint(const label pointi) const;
 
         //- Given a set of faces that cause smoothing and a number of
         //  iterations determine the maximum set of points who are affected
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
index 153b71f59f..92f9d60fef 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
@@ -211,16 +211,16 @@ Foam::motionSmootherAlgo::avg
     // Average
     // ~~~~~~~
 
-    forAll(res, pointI)
+    forAll(res, pointi)
     {
-        if (mag(sumWeight[pointI]) < VSMALL)
+        if (mag(sumWeight[pointi]) < VSMALL)
         {
             // Unconnected point. Take over original value
-            res[pointI] = fld[pointI];
+            res[pointi] = fld[pointi];
         }
         else
         {
-            res[pointI] /= sumWeight[pointI];
+            res[pointi] /= sumWeight[pointi];
         }
     }
 
@@ -242,11 +242,11 @@ void Foam::motionSmootherAlgo::smooth
     tmp<pointVectorField> tavgFld = avg(fld, edgeWeight);
     const pointVectorField& avgFld = tavgFld();
 
-    forAll(fld, pointI)
+    forAll(fld, pointi)
     {
-        if (isInternalPoint(pointI))
+        if (isInternalPoint(pointi))
         {
-            newFld[pointI] = 0.5*fld[pointI] + 0.5*avgFld[pointI];
+            newFld[pointi] = 0.5*fld[pointi] + 0.5*avgFld[pointi];
         }
     }
 
diff --git a/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C b/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
index 19742e25b9..c16ebe3a98 100644
--- a/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,32 +166,32 @@ void Foam::componentDisplacementMotionSolver::updateMesh(const mapPolyMesh& mpm)
 
     scalarField newPoints0(mpm.pointMap().size());
 
-    forAll(newPoints0, pointI)
+    forAll(newPoints0, pointi)
     {
-        label oldPointI = mpm.pointMap()[pointI];
+        label oldPointi = mpm.pointMap()[pointi];
 
-        if (oldPointI >= 0)
+        if (oldPointi >= 0)
         {
-            label masterPointI = mpm.reversePointMap()[oldPointI];
+            label masterPointi = mpm.reversePointMap()[oldPointi];
 
-            if (masterPointI == pointI)
+            if (masterPointi == pointi)
             {
-                newPoints0[pointI] = points0_[oldPointI];
+                newPoints0[pointi] = points0_[oldPointi];
             }
             else
             {
                 // New point. Assume motion is scaling.
-                newPoints0[pointI] =
-                    points0_[oldPointI]
-                  + scale*(points[pointI]-points[masterPointI]);
+                newPoints0[pointi] =
+                    points0_[oldPointi]
+                  + scale*(points[pointi]-points[masterPointi]);
             }
         }
         else
         {
             FatalErrorInFunction
                 << "Cannot work out coordinates of introduced vertices."
-                << " New vertex " << pointI << " at coordinate "
-                << points[pointI] << exit(FatalError);
+                << " New vertex " << pointi << " at coordinate "
+                << points[pointi] << exit(FatalError);
         }
     }
     points0_.transfer(newPoints0);
diff --git a/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.C b/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.C
index 4de8cf656a..b86fb855da 100644
--- a/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -190,25 +190,25 @@ void Foam::displacementMotionSolver::updateMesh(const mapPolyMesh& mpm)
 
     pointField newPoints0(mpm.pointMap().size());
 
-    forAll(newPoints0, pointI)
+    forAll(newPoints0, pointi)
     {
-        label oldPointI = mpm.pointMap()[pointI];
+        label oldPointi = mpm.pointMap()[pointi];
 
-        if (oldPointI >= 0)
+        if (oldPointi >= 0)
         {
-            label masterPointI = mpm.reversePointMap()[oldPointI];
+            label masterPointi = mpm.reversePointMap()[oldPointi];
 
-            if (masterPointI == pointI)
+            if (masterPointi == pointi)
             {
-                newPoints0[pointI] = points0_[oldPointI];
+                newPoints0[pointi] = points0_[oldPointi];
             }
             else
             {
                 // New point - assume motion is scaling
-                newPoints0[pointI] = points0_[oldPointI] + cmptMultiply
+                newPoints0[pointi] = points0_[oldPointi] + cmptMultiply
                 (
                     scaleFactors,
-                    points[pointI] - points[masterPointI]
+                    points[pointi] - points[masterPointi]
                 );
             }
         }
@@ -216,8 +216,8 @@ void Foam::displacementMotionSolver::updateMesh(const mapPolyMesh& mpm)
         {
             FatalErrorInFunction
                 << "Cannot determine co-ordinates of introduced vertices."
-                << " New vertex " << pointI << " at co-ordinate "
-                << points[pointI] << exit(FatalError);
+                << " New vertex " << pointi << " at co-ordinate "
+                << points[pointi] << exit(FatalError);
         }
     }
 
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 182296464b..5aa0b5ed99 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -258,11 +258,11 @@ void Foam::perfectInterface::setRefinement
     labelHashSet affectedFaces(2*pp1.size());
     forAll(meshPts1, i)
     {
-        label meshPointI = meshPts1[i];
+        label meshPointi = meshPts1[i];
 
-        if (meshPointI != renumberPoints[meshPointI])
+        if (meshPointi != renumberPoints[meshPointi])
         {
-            const labelList& pFaces = mesh.pointFaces()[meshPointI];
+            const labelList& pFaces = mesh.pointFaces()[meshPointi];
 
             forAll(pFaces, pFacei)
             {
@@ -307,7 +307,7 @@ void Foam::perfectInterface::setRefinement
 
         label nbr = -1;
 
-        label patchI = -1;
+        label patchi = -1;
 
         if (mesh.isInternalFace(facei))
         {
@@ -315,7 +315,7 @@ void Foam::perfectInterface::setRefinement
         }
         else
         {
-            patchI = patches.whichPatch(facei);
+            patchi = patches.whichPatch(facei);
         }
 
         label zoneID = mesh.faceZones().whichZone(facei);
@@ -338,7 +338,7 @@ void Foam::perfectInterface::setRefinement
                 mesh.faceOwner()[facei],    // owner
                 nbr,                        // neighbour
                 false,                      // face flip
-                patchI,                     // patch for face
+                patchi,                     // patch for face
                 false,                      // remove from zone
                 zoneID,                     // zone for face
                 zoneFlip                    // face flip in zone
@@ -350,11 +350,11 @@ void Foam::perfectInterface::setRefinement
     // 3. Remove patch1 points
     forAll(meshPts1, i)
     {
-        label meshPointI = meshPts1[i];
+        label meshPointi = meshPts1[i];
 
-        if (meshPointI != renumberPoints[meshPointI])
+        if (meshPointi != renumberPoints[meshPointi])
         {
-            ref.setAction(polyRemovePoint(meshPointI));
+            ref.setAction(polyRemovePoint(meshPointi));
         }
     }
 
diff --git a/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H b/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H
index cabedb0277..22482dd9c1 100644
--- a/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H
+++ b/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H
@@ -148,7 +148,7 @@ public:
             inline void leaveDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -158,7 +158,7 @@ public:
             inline void enterDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -176,7 +176,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const label edgeI,
                 const externalPointEdgePoint& edgeInfo,
                 const scalar tol,
@@ -189,7 +189,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const externalPointEdgePoint& newPointInfo,
                 const scalar tol,
                 TrackingData& td
@@ -211,7 +211,7 @@ public:
             (
                 const polyMesh& mesh,
                 const label edgeI,
-                const label pointI,
+                const label pointi,
                 const externalPointEdgePoint& pointInfo,
                 const scalar tol,
                 TrackingData& td
diff --git a/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H b/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H
index 5927de0776..e1cfd8e81c 100644
--- a/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H
+++ b/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H
@@ -197,7 +197,7 @@ template<class TrackingData>
 inline void Foam::externalPointEdgePoint::leaveDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -221,7 +221,7 @@ template<class TrackingData>
 inline void Foam::externalPointEdgePoint::enterDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -235,14 +235,14 @@ template<class TrackingData>
 inline bool Foam::externalPointEdgePoint::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const label edgeI,
     const externalPointEdgePoint& edgeInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    return update(td.points_[pointI], edgeInfo, tol, td);
+    return update(td.points_[pointi], edgeInfo, tol, td);
 }
 
 
@@ -250,13 +250,13 @@ template<class TrackingData>
 inline bool Foam::externalPointEdgePoint::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const externalPointEdgePoint& newPointInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    return update(td.points_[pointI], newPointInfo, tol, td);
+    return update(td.points_[pointi], newPointInfo, tol, td);
 }
 
 
@@ -277,7 +277,7 @@ inline bool Foam::externalPointEdgePoint::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
-    const label pointI,
+    const label pointi,
     const externalPointEdgePoint& pointInfo,
     const scalar tol,
     TrackingData& td
diff --git a/src/dynamicMesh/pointPatchDist/pointPatchDist.C b/src/dynamicMesh/pointPatchDist/pointPatchDist.C
index 6e830691d4..ad86b0c439 100644
--- a/src/dynamicMesh/pointPatchDist/pointPatchDist.C
+++ b/src/dynamicMesh/pointPatchDist/pointPatchDist.C
@@ -92,11 +92,11 @@ void Foam::pointPatchDist::correct()
 
         forAll(mp, ppI)
         {
-            label meshPointI = mp[ppI];
-            wallPoints[nPoints] = meshPointI;
+            label meshPointi = mp[ppI];
+            wallPoints[nPoints] = meshPointi;
             wallInfo[nPoints] = externalPointEdgePoint
             (
-                td.points_[meshPointI],
+                td.points_[meshPointi],
                 0.0
             );
             nPoints++;
@@ -128,11 +128,11 @@ void Foam::pointPatchDist::correct()
     pointScalarField& psf = *this;
 
 
-    forAll(allPointInfo, pointI)
+    forAll(allPointInfo, pointi)
     {
-        if (allPointInfo[pointI].valid(td))
+        if (allPointInfo[pointi].valid(td))
         {
-            psf[pointI] = Foam::sqrt(allPointInfo[pointI].distSqr());
+            psf[pointi] = Foam::sqrt(allPointInfo[pointi].distSqr());
         }
         else
         {
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 02d5871c21..a5039a4996 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -57,7 +57,7 @@ void Foam::faceCoupleInfo::writeOBJ
 
     if (compact)
     {
-        label newPointI = 0;
+        label newPointi = 0;
 
         forAll(edges, edgeI)
         {
@@ -65,22 +65,22 @@ void Foam::faceCoupleInfo::writeOBJ
 
             forAll(e, eI)
             {
-                label pointI = e[eI];
+                label pointi = e[eI];
 
-                if (pointMap[pointI] == -1)
+                if (pointMap[pointi] == -1)
                 {
-                    pointMap[pointI] = newPointI++;
+                    pointMap[pointi] = newPointi++;
 
-                    meshTools::writeOBJ(str, points[pointI]);
+                    meshTools::writeOBJ(str, points[pointi]);
                 }
             }
         }
     }
     else
     {
-        forAll(points, pointI)
+        forAll(points, pointi)
         {
-            meshTools::writeOBJ(str, points[pointI]);
+            meshTools::writeOBJ(str, points[pointi]);
         }
 
         pointMap = identity(points.size());
@@ -352,13 +352,13 @@ bool Foam::faceCoupleInfo::regionEdge
 
             label meshFacei = slavePatch().addressing()[facei];
 
-            label patchI = slaveMesh.boundaryMesh().whichPatch(meshFacei);
+            label patchi = slaveMesh.boundaryMesh().whichPatch(meshFacei);
 
             if (patch0 == -1)
             {
-                patch0 = patchI;
+                patch0 = patchi;
             }
-            else if (patchI != patch0)
+            else if (patchi != patch0)
             {
                 // Found two different patches connected to this edge.
                 return true;
@@ -376,25 +376,25 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
     const bool patchDivision,
     const labelList& cutToMasterEdges,
     const labelList& cutToSlaveEdges,
-    const label pointI,
+    const label pointi,
     const label edgeStart,
     const label edgeEnd
 ) const
 {
-    // Find edge using pointI that is most aligned with vector between master
+    // Find edge using pointi that is most aligned with vector between master
     // points. Patchdivision tells us whether or not to use patch information to
     // match edges.
 
     const pointField& localPoints = cutFaces().localPoints();
 
-    const labelList& pEdges = cutFaces().pointEdges()[pointI];
+    const labelList& pEdges = cutFaces().pointEdges()[pointi];
 
     if (report)
     {
         Pout<< "mostAlignedEdge : finding nearest edge among "
             << UIndirectList<edge>(cutFaces().edges(), pEdges)()
-            << " connected to point " << pointI
-            << " coord:" << localPoints[pointI]
+            << " connected to point " << pointi
+            << " coord:" << localPoints[pointi]
             << " running between " << edgeStart << " coord:"
             << localPoints[edgeStart]
             << " and " << edgeEnd << " coord:"
@@ -425,9 +425,9 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
         {
             const edge& e = cutFaces().edges()[edgeI];
 
-            label otherPointI = e.otherVertex(pointI);
+            label otherPointi = e.otherVertex(pointi);
 
-            if (otherPointI == edgeEnd)
+            if (otherPointi == edgeEnd)
             {
                 // Shortcut: found edge end point.
                 if (report)
@@ -440,7 +440,7 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
 
             // Get angle between edge and edge to masterEnd
 
-            vector eVec(localPoints[otherPointI] - localPoints[pointI]);
+            vector eVec(localPoints[otherPointi] - localPoints[pointi]);
 
             scalar magEVec = mag(eVec);
 
@@ -448,8 +448,8 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
             {
                 WarningInFunction
                     << "Crossing zero sized edge " << edgeI
-                    << " coords:" << localPoints[otherPointI]
-                    << localPoints[pointI]
+                    << " coords:" << localPoints[otherPointi]
+                    << localPoints[pointi]
                     << " when walking from " << localPoints[edgeStart]
                     << " to " << localPoints[edgeEnd]
                     << endl;
@@ -458,15 +458,15 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
 
             eVec /= magEVec;
 
-            vector eToEndPoint(localPoints[edgeEnd] - localPoints[otherPointI]);
+            vector eToEndPoint(localPoints[edgeEnd] - localPoints[otherPointi]);
             eToEndPoint /= mag(eToEndPoint);
 
             scalar cosAngle = eVec & eToEndPoint;
 
             if (report)
             {
-                Pout<< "    edge:" << e << " points:" << localPoints[pointI]
-                    << localPoints[otherPointI]
+                Pout<< "    edge:" << e << " points:" << localPoints[pointi]
+                    << localPoints[otherPointi]
                     << "  vec:" << eVec
                     << "  vecToEnd:" << eToEndPoint
                     << " cosAngle:" << cosAngle
@@ -751,11 +751,11 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
 
         forAll(cutF, cutFp)
         {
-            label cutPointI = cutF[cutFp];
-            label patchPointI = patchF[patchFp];
+            label cutPointi = cutF[cutFp];
+            label patchPointi = patchF[patchFp];
 
-            //const point& cutPt = cutPoints[cutPointI];
-            //const point& patchPt = patchPoints[patchPointI];
+            //const point& cutPt = cutPoints[cutPointi];
+            //const point& patchPt = patchPoints[patchPointi];
             //if (mag(cutPt - patchPt) > SMALL)
             //{
             //    FatalErrorInFunction
@@ -764,34 +764,34 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
             //    << abort(FatalError);
             //}
 
-            if (patchToCutPoints[patchPointI] == -1)
+            if (patchToCutPoints[patchPointi] == -1)
             {
-                patchToCutPoints[patchPointI] = cutPointI;
+                patchToCutPoints[patchPointi] = cutPointi;
             }
-            else if (patchToCutPoints[patchPointI] != cutPointI)
+            else if (patchToCutPoints[patchPointi] != cutPointi)
             {
                 // Multiple cut points connecting to same patch.
                 // Check if already have region & region master for this set
-                label otherCutPointI = patchToCutPoints[patchPointI];
+                label otherCutPointi = patchToCutPoints[patchPointi];
 
                 //Pout<< "PatchPoint:" << patchPt
-                //    << " matches to:" << cutPointI
-                //    << " coord:" << cutPoints[cutPointI]
-                //    << " and to:" << otherCutPointI
-                //    << " coord:" << cutPoints[otherCutPointI]
+                //    << " matches to:" << cutPointi
+                //    << " coord:" << cutPoints[cutPointi]
+                //    << " and to:" << otherCutPointi
+                //    << " coord:" << cutPoints[otherCutPointi]
                 //    << endl;
 
-                if (cutPointRegion[otherCutPointI] != -1)
+                if (cutPointRegion[otherCutPointi] != -1)
                 {
                     // Have region for this set. Copy.
-                    label region = cutPointRegion[otherCutPointI];
-                    cutPointRegion[cutPointI] = region;
+                    label region = cutPointRegion[otherCutPointi];
+                    cutPointRegion[cutPointi] = region;
 
                     // Update region master with min point label
                     cutPointRegionMaster[region] = min
                     (
                         cutPointRegionMaster[region],
-                        cutPointI
+                        cutPointi
                     );
                 }
                 else
@@ -800,10 +800,10 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
                     label region = cutPointRegionMaster.size();
                     cutPointRegionMaster.append
                     (
-                        min(cutPointI, otherCutPointI)
+                        min(cutPointi, otherCutPointi)
                     );
-                    cutPointRegion[cutPointI] = region;
-                    cutPointRegion[otherCutPointI] = region;
+                    cutPointRegion[cutPointi] = region;
+                    cutPointRegion[otherCutPointi] = region;
                 }
             }
 
@@ -822,33 +822,33 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
     compactToCut.setSize(cutPointRegion.size());
     cutToCompact.setSize(cutPointRegion.size());
     cutToCompact = -1;
-    label compactPointI = 0;
+    label compactPointi = 0;
 
     forAll(cutPointRegion, i)
     {
         if (cutPointRegion[i] == -1)
         {
             // Unduplicated point. Allocate new compacted point.
-            cutToCompact[i] = compactPointI;
-            compactToCut[compactPointI] = i;
-            compactPointI++;
+            cutToCompact[i] = compactPointi;
+            compactToCut[compactPointi] = i;
+            compactPointi++;
         }
         else
         {
             // Duplicate point. Get master.
 
-            label masterPointI = cutPointRegionMaster[cutPointRegion[i]];
+            label masterPointi = cutPointRegionMaster[cutPointRegion[i]];
 
-            if (cutToCompact[masterPointI] == -1)
+            if (cutToCompact[masterPointi] == -1)
             {
-                cutToCompact[masterPointI] = compactPointI;
-                compactToCut[compactPointI] = masterPointI;
-                compactPointI++;
+                cutToCompact[masterPointi] = compactPointi;
+                compactToCut[compactPointi] = masterPointi;
+                compactPointi++;
             }
-            cutToCompact[i] = cutToCompact[masterPointI];
+            cutToCompact[i] = cutToCompact[masterPointi];
         }
     }
-    compactToCut.setSize(compactPointI);
+    compactToCut.setSize(compactPointi);
 
     return compactToCut.size() != cutToCompact.size();
 }
@@ -1681,10 +1681,10 @@ void Foam::faceCoupleInfo::subDivisionMatch
 
         // Find edges between cutPoint0 and cutPoint1.
 
-        label cutPointI = cutPoint0;
+        label cutPointi = cutPoint0;
         do
         {
-            // Find edge (starting at pointI on cut), aligned with master
+            // Find edge (starting at pointi on cut), aligned with master
             // edge.
             label cutEdgeI =
                 mostAlignedCutEdge
@@ -1694,7 +1694,7 @@ void Foam::faceCoupleInfo::subDivisionMatch
                     patchDivision,
                     cutToMasterEdges,
                     cutToSlaveEdges,
-                    cutPointI,
+                    cutPointi,
                     cutPoint0,
                     cutPoint1
                 );
@@ -1709,7 +1709,7 @@ void Foam::faceCoupleInfo::subDivisionMatch
                     patchDivision,
                     cutToMasterEdges,
                     cutToSlaveEdges,
-                    cutPointI,
+                    cutPointi,
                     cutPoint0,
                     cutPoint1
                 );
@@ -1725,7 +1725,7 @@ void Foam::faceCoupleInfo::subDivisionMatch
                         UIndirectList<edge>
                         (
                             cutFaces().edges(),
-                            cutFaces().pointEdges()[cutPointI]
+                            cutFaces().pointEdges()[cutPointi]
                         )
                     ),
                     cutFaces().localPoints(),
@@ -1744,9 +1744,9 @@ void Foam::faceCoupleInfo::subDivisionMatch
 
             cutToMasterEdges[cutEdgeI] = masterEdgeI;
 
-            cutPointI = cutEdges[cutEdgeI].otherVertex(cutPointI);
+            cutPointi = cutEdges[cutEdgeI].otherVertex(cutPointi);
 
-        } while (cutPointI != cutPoint1);
+        } while (cutPointi != cutPoint1);
     }
 
     if (debug)
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index 90fb030b95..b5d7b1fe28 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -266,7 +266,7 @@ class faceCoupleInfo
                 const bool patchDivision,
                 const labelList& cutToMasterEdges,
                 const labelList& cutToSlaveEdges,
-                const label pointI,
+                const label pointi,
                 const label edgeStart,
                 const label edgeEnd
             ) const;
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 132eb4dc89..0c8a179b57 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -518,7 +518,7 @@ void Foam::polyMeshAdder::mergePrimitives
 
     // Storage for new points
     allPoints.setSize(mesh0.nPoints() + mesh1.nPoints());
-    label allPointI = 0;
+    label allPointi = 0;
 
     from0ToAllPoints.setSize(mesh0.nPoints());
     from0ToAllPoints = -1;
@@ -553,7 +553,7 @@ void Foam::polyMeshAdder::mergePrimitives
 
         forAll(cutPoints, i)
         {
-            allPoints[allPointI] = cutPoints[i];
+            allPoints[allPointi] = cutPoints[i];
 
             // Mark all master and slave points referring to this point.
 
@@ -561,44 +561,44 @@ void Foam::polyMeshAdder::mergePrimitives
 
             forAll(masterPoints, j)
             {
-                label mesh0PointI = masterPatch.meshPoints()[masterPoints[j]];
-                from0ToAllPoints[mesh0PointI] = allPointI;
+                label mesh0Pointi = masterPatch.meshPoints()[masterPoints[j]];
+                from0ToAllPoints[mesh0Pointi] = allPointi;
             }
 
             const labelList& slavePoints = cutToSlavePoints[i];
 
             forAll(slavePoints, j)
             {
-                label mesh1PointI = slavePatch.meshPoints()[slavePoints[j]];
-                from1ToAllPoints[mesh1PointI] = allPointI;
+                label mesh1Pointi = slavePatch.meshPoints()[slavePoints[j]];
+                from1ToAllPoints[mesh1Pointi] = allPointi;
             }
-            allPointI++;
+            allPointi++;
         }
     }
 
     // Add uncoupled mesh0 points
-    forAll(mesh0.points(), pointI)
+    forAll(mesh0.points(), pointi)
     {
-        if (from0ToAllPoints[pointI] == -1)
+        if (from0ToAllPoints[pointi] == -1)
         {
-            allPoints[allPointI] = mesh0.points()[pointI];
-            from0ToAllPoints[pointI] = allPointI;
-            allPointI++;
+            allPoints[allPointi] = mesh0.points()[pointi];
+            from0ToAllPoints[pointi] = allPointi;
+            allPointi++;
         }
     }
 
     // Add uncoupled mesh1 points
-    forAll(mesh1.points(), pointI)
+    forAll(mesh1.points(), pointi)
     {
-        if (from1ToAllPoints[pointI] == -1)
+        if (from1ToAllPoints[pointi] == -1)
         {
-            allPoints[allPointI] = mesh1.points()[pointI];
-            from1ToAllPoints[pointI] = allPointI;
-            allPointI++;
+            allPoints[allPointi] = mesh1.points()[pointi];
+            from1ToAllPoints[pointi] = allPointi;
+            allPointi++;
         }
     }
 
-    allPoints.setSize(allPointI);
+    allPoints.setSize(allPointi);
 
 
     // Faces
@@ -903,15 +903,15 @@ void Foam::polyMeshAdder::mergePointZones
         forAll(pz, i)
         {
             label point0 = pz[i];
-            label allPointI = from0ToAllPoints[point0];
+            label allPointi = from0ToAllPoints[point0];
 
-            if (pointToZone[allPointI] == -1)
+            if (pointToZone[allPointi] == -1)
             {
-                pointToZone[allPointI] = zoneI;
+                pointToZone[allPointi] = zoneI;
             }
-            else if (pointToZone[allPointI] != zoneI)
+            else if (pointToZone[allPointi] != zoneI)
             {
-                labelList& pZones = addPointToZones[allPointI];
+                labelList& pZones = addPointToZones[allPointi];
                 if (findIndex(pZones, zoneI) == -1)
                 {
                     pZones.append(zoneI);
@@ -929,15 +929,15 @@ void Foam::polyMeshAdder::mergePointZones
         forAll(pz, i)
         {
             label point1 = pz[i];
-            label allPointI = from1ToAllPoints[point1];
+            label allPointi = from1ToAllPoints[point1];
 
-            if (pointToZone[allPointI] == -1)
+            if (pointToZone[allPointi] == -1)
             {
-                pointToZone[allPointI] = allZoneI;
+                pointToZone[allPointi] = allZoneI;
             }
-            else if (pointToZone[allPointI] != allZoneI)
+            else if (pointToZone[allPointi] != allZoneI)
             {
-                labelList& pZones = addPointToZones[allPointI];
+                labelList& pZones = addPointToZones[allPointi];
                 if (findIndex(pZones, allZoneI) == -1)
                 {
                     pZones.append(allZoneI);
@@ -950,17 +950,17 @@ void Foam::polyMeshAdder::mergePointZones
 
     // 1. Count
     labelList nPoints(zoneNames.size(), 0);
-    forAll(pointToZone, allPointI)
+    forAll(pointToZone, allPointi)
     {
-        label zoneI = pointToZone[allPointI];
+        label zoneI = pointToZone[allPointi];
         if (zoneI != -1)
         {
             nPoints[zoneI]++;
         }
     }
-    forAll(addPointToZones, allPointI)
+    forAll(addPointToZones, allPointi)
     {
-        const labelList& pZones = addPointToZones[allPointI];
+        const labelList& pZones = addPointToZones[allPointi];
         forAll(pZones, i)
         {
             nPoints[pZones[i]]++;
@@ -973,20 +973,20 @@ void Foam::polyMeshAdder::mergePointZones
     {
         pzPoints[zoneI].setCapacity(nPoints[zoneI]);
     }
-    forAll(pointToZone, allPointI)
+    forAll(pointToZone, allPointi)
     {
-        label zoneI = pointToZone[allPointI];
+        label zoneI = pointToZone[allPointi];
         if (zoneI != -1)
         {
-            pzPoints[zoneI].append(allPointI);
+            pzPoints[zoneI].append(allPointi);
         }
     }
-    forAll(addPointToZones, allPointI)
+    forAll(addPointToZones, allPointi)
     {
-        const labelList& pZones = addPointToZones[allPointI];
+        const labelList& pZones = addPointToZones[allPointi];
         forAll(pZones, i)
         {
-            pzPoints[pZones[i]].append(allPointI);
+            pzPoints[pZones[i]].append(allPointi);
         }
     }
     forAll(pzPoints, i)
@@ -2018,7 +2018,7 @@ Foam::Map<Foam::label> Foam::polyMeshAdder::findSharedPoints
 
     forAll(sharedPointLabels, i)
     {
-        label pointI = sharedPointLabels[i];
+        label pointi = sharedPointLabels[i];
 
         label sharedI = sharedPointAddr[i];
 
@@ -2035,22 +2035,22 @@ Foam::Map<Foam::label> Foam::polyMeshAdder::findSharedPoints
             label sz = connectedPointLabels.size();
 
             // Check just to make sure.
-            if (findIndex(connectedPointLabels, pointI) != -1)
+            if (findIndex(connectedPointLabels, pointi) != -1)
             {
                 FatalErrorInFunction
                     << "Duplicate point in sharedPoint addressing." << endl
-                    << "When trying to add point " << pointI << " on shared "
+                    << "When trying to add point " << pointi << " on shared "
                     << sharedI  << " with connected points "
                     << connectedPointLabels
                     << abort(FatalError);
             }
 
             connectedPointLabels.setSize(sz+1);
-            connectedPointLabels[sz] = pointI;
+            connectedPointLabels[sz] = pointi;
         }
         else
         {
-            sharedToMesh.insert(sharedI, labelList(1, pointI));
+            sharedToMesh.insert(sharedI, labelList(1, pointi));
         }
     }
 
@@ -2106,27 +2106,27 @@ Foam::Map<Foam::label> Foam::polyMeshAdder::findSharedPoints
                     if (mergeSet.size() > 1)
                     {
                         // Pick lowest numbered point
-                        label masterPointI = labelMax;
+                        label masterPointi = labelMax;
 
                         forAll(mergeSet, i)
                         {
-                            label pointI = connectedPointLabels[mergeSet[i]];
+                            label pointi = connectedPointLabels[mergeSet[i]];
 
-                            masterPointI = min(masterPointI, pointI);
+                            masterPointi = min(masterPointi, pointi);
                         }
 
                         forAll(mergeSet, i)
                         {
-                            label pointI = connectedPointLabels[mergeSet[i]];
+                            label pointi = connectedPointLabels[mergeSet[i]];
 
-                            //Pout<< "Merging point " << pointI
-                            //    << " at " << mesh.points()[pointI]
+                            //Pout<< "Merging point " << pointi
+                            //    << " at " << mesh.points()[pointi]
                             //    << " into master point "
-                            //    << masterPointI
-                            //    << " at " << mesh.points()[masterPointI]
+                            //    << masterPointi
+                            //    << " at " << mesh.points()[masterPointi]
                             //    << endl;
 
-                            pointToMaster.insert(pointI, masterPointI);
+                            pointToMaster.insert(pointi, masterPointi);
                         }
                     }
                 }
@@ -2216,15 +2216,15 @@ void Foam::polyMeshAdder::mergePoints
 )
 {
     // Remove all non-master points.
-    forAll(mesh.points(), pointI)
+    forAll(mesh.points(), pointi)
     {
-        Map<label>::const_iterator iter = pointToMaster.find(pointI);
+        Map<label>::const_iterator iter = pointToMaster.find(pointi);
 
         if (iter != pointToMaster.end())
         {
-            if (iter() != pointI)
+            if (iter() != pointi)
             {
-                meshMod.removePoint(pointI, iter());
+                meshMod.removePoint(pointi, iter());
             }
         }
     }
@@ -2241,13 +2241,13 @@ void Foam::polyMeshAdder::mergePoints
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
+            label pointi = f[fp];
 
-            Map<label>::const_iterator iter = pointToMaster.find(pointI);
+            Map<label>::const_iterator iter = pointToMaster.find(pointi);
 
             if (iter != pointToMaster.end())
             {
-                if (iter() != pointI)
+                if (iter() != pointi)
                 {
                     hasMerged = true;
                     break;
@@ -2261,9 +2261,9 @@ void Foam::polyMeshAdder::mergePoints
 
             forAll(f, fp)
             {
-                label pointI = f[fp];
+                label pointi = f[fp];
 
-                Map<label>::const_iterator iter = pointToMaster.find(pointI);
+                Map<label>::const_iterator iter = pointToMaster.find(pointi);
 
                 if (iter != pointToMaster.end())
                 {
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
index 8b33c1cb57..58bc03ff1b 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
@@ -590,9 +590,9 @@ void Foam::polyMeshFilter::checkMeshEdgesAndRelaxEdges
             scalar sumMinEdgeLen = 0;
             label nEdges = 0;
 
-            forAll(e, pointI)
+            forAll(e, pointi)
             {
-                const labelList& pEdges = mesh_.pointEdges()[e[pointI]];
+                const labelList& pEdges = mesh_.pointEdges()[e[pointi]];
 
                 forAll(pEdges, pEdgeI)
                 {
@@ -862,25 +862,25 @@ void Foam::polyMeshFilter::updateOldToNewPointMap
     labelList& origToCurrentPointMap
 ) const
 {
-    forAll(origToCurrentPointMap, origPointI)
+    forAll(origToCurrentPointMap, origPointi)
     {
-        label oldPointI = origToCurrentPointMap[origPointI];
+        label oldPointi = origToCurrentPointMap[origPointi];
 
-        if (oldPointI != -1)
+        if (oldPointi != -1)
         {
-            label newPointI = currToNew[oldPointI];
+            label newPointi = currToNew[oldPointi];
 
-            if (newPointI >= 0)
+            if (newPointi >= 0)
             {
-                origToCurrentPointMap[origPointI] = newPointI;
+                origToCurrentPointMap[origPointi] = newPointi;
             }
-            else if (newPointI == -1)
+            else if (newPointi == -1)
             {
-                origToCurrentPointMap[origPointI] = -1;
+                origToCurrentPointMap[origPointi] = -1;
             }
             else
             {
-                origToCurrentPointMap[origPointI] = -newPointI-2;
+                origToCurrentPointMap[origPointi] = -newPointi-2;
             }
         }
     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 63ea55c49a..194d1a903d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -67,20 +67,20 @@ Foam::label Foam::addPatchCellLayer::nbrFace
 
 void Foam::addPatchCellLayer::addVertex
 (
-    const label pointI,
+    const label pointi,
     face& f,
     label& fp
 )
 {
     if (fp == 0)
     {
-        f[fp++] = pointI;
+        f[fp++] = pointi;
     }
     else
     {
-        if (f[fp-1] != pointI && f[0] != pointI)
+        if (f[fp-1] != pointi && f[0] != pointi)
         {
-            f[fp++] = pointI;
+            f[fp++] = pointi;
         }
     }
 }
@@ -875,16 +875,16 @@ void Foam::addPatchCellLayer::setRefinement
             // Non-synced
             forAll(meshPoints, i)
             {
-                label meshPointI = meshPoints[i];
+                label meshPointi = meshPoints[i];
 
-                if (n[meshPointI] != nPointLayers[i])
+                if (n[meshPointi] != nPointLayers[i])
                 {
                     FatalErrorInFunction
-                        << "At mesh point:" << meshPointI
-                        << " coordinate:" << mesh_.points()[meshPointI]
+                        << "At mesh point:" << meshPointi
+                        << " coordinate:" << mesh_.points()[meshPointi]
                         << " specified nLayers:" << nPointLayers[i] << endl
                         << "On coupled point a different nLayers:"
-                        << n[meshPointI] << " was specified."
+                        << n[meshPointi] << " was specified."
                         << abort(FatalError);
                 }
             }
@@ -899,9 +899,9 @@ void Foam::addPatchCellLayer::setRefinement
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
+                    label pointi = f[fp];
 
-                    nFromFace[pointI] = max(nFromFace[pointI], nFaceLayers[i]);
+                    nFromFace[pointi] = max(nFromFace[pointi], nFaceLayers[i]);
                 }
             }
             syncTools::syncPointList
@@ -914,20 +914,20 @@ void Foam::addPatchCellLayer::setRefinement
 
             forAll(nPointLayers, i)
             {
-                label meshPointI = meshPoints[i];
+                label meshPointi = meshPoints[i];
 
                 if
                 (
                     nPointLayers[i] > 0
-                 && nPointLayers[i] != nFromFace[meshPointI]
+                 && nPointLayers[i] != nFromFace[meshPointi]
                 )
                 {
                     FatalErrorInFunction
-                        << "At mesh point:" << meshPointI
-                        << " coordinate:" << mesh_.points()[meshPointI]
+                        << "At mesh point:" << meshPointi
+                        << " coordinate:" << mesh_.points()[meshPointi]
                         << " specified nLayers:" << nPointLayers[i] << endl
                         << "but the max nLayers of surrounding faces is:"
-                        << nFromFace[meshPointI]
+                        << nFromFace[meshPointi]
                         << abort(FatalError);
                 }
             }
@@ -946,17 +946,17 @@ void Foam::addPatchCellLayer::setRefinement
 
             forAll(meshPoints, i)
             {
-                label meshPointI = meshPoints[i];
+                label meshPointi = meshPoints[i];
 
-                if (mag(d[meshPointI] - firstLayerDisp[i]) > SMALL)
+                if (mag(d[meshPointi] - firstLayerDisp[i]) > SMALL)
                 {
                     FatalErrorInFunction
-                        << "At mesh point:" << meshPointI
-                        << " coordinate:" << mesh_.points()[meshPointI]
+                        << "At mesh point:" << meshPointi
+                        << " coordinate:" << mesh_.points()[meshPointi]
                         << " specified displacement:" << firstLayerDisp[i]
                         << endl
                         << "On coupled point a different displacement:"
-                        << d[meshPointI] << " was specified."
+                        << d[meshPointi] << " was specified."
                         << abort(FatalError);
                 }
             }
@@ -1057,11 +1057,11 @@ void Foam::addPatchCellLayer::setRefinement
     // Mark points that do not get extruded by setting size of addedPoints_ to 0
     label nTruncated = 0;
 
-    forAll(nPointLayers, patchPointI)
+    forAll(nPointLayers, patchPointi)
     {
-        if (nPointLayers[patchPointI] > 0)
+        if (nPointLayers[patchPointi] > 0)
         {
-            addedPoints_[patchPointI].setSize(nPointLayers[patchPointI]);
+            addedPoints_[patchPointi].setSize(nPointLayers[patchPointi]);
         }
         else
         {
@@ -1085,17 +1085,17 @@ void Foam::addPatchCellLayer::setRefinement
     if (!addToMesh_)
     {
         copiedPatchPoints.setSize(firstLayerDisp.size());
-        forAll(firstLayerDisp, patchPointI)
+        forAll(firstLayerDisp, patchPointi)
         {
-            if (addedPoints_[patchPointI].size())
+            if (addedPoints_[patchPointi].size())
             {
-                label meshPointI = meshPoints[patchPointI];
-                label zoneI = mesh_.pointZones().whichZone(meshPointI);
-                copiedPatchPoints[patchPointI] = meshMod.setAction
+                label meshPointi = meshPoints[patchPointi];
+                label zoneI = mesh_.pointZones().whichZone(meshPointi);
+                copiedPatchPoints[patchPointi] = meshMod.setAction
                 (
                     polyAddPoint
                     (
-                        mesh_.points()[meshPointI],         // point
+                        mesh_.points()[meshPointi],         // point
                         -1,         // master point
                         zoneI,      // zone for point
                         true        // supports a cell
@@ -1107,19 +1107,19 @@ void Foam::addPatchCellLayer::setRefinement
 
 
     // Create points for additional layers
-    forAll(firstLayerDisp, patchPointI)
+    forAll(firstLayerDisp, patchPointi)
     {
-        if (addedPoints_[patchPointI].size())
+        if (addedPoints_[patchPointi].size())
         {
-            label meshPointI = meshPoints[patchPointI];
+            label meshPointi = meshPoints[patchPointi];
 
-            label zoneI = mesh_.pointZones().whichZone(meshPointI);
+            label zoneI = mesh_.pointZones().whichZone(meshPointi);
 
-            point pt = mesh_.points()[meshPointI];
+            point pt = mesh_.points()[meshPointi];
 
-            vector disp = firstLayerDisp[patchPointI];
+            vector disp = firstLayerDisp[patchPointi];
 
-            forAll(addedPoints_[patchPointI], i)
+            forAll(addedPoints_[patchPointi], i)
             {
                 pt += disp;
 
@@ -1128,15 +1128,15 @@ void Foam::addPatchCellLayer::setRefinement
                     polyAddPoint
                     (
                         pt,         // point
-                        (addToMesh_ ? meshPointI : -1), // master point
+                        (addToMesh_ ? meshPointi : -1), // master point
                         zoneI,      // zone for point
                         true        // supports a cell
                     )
                 );
 
-                addedPoints_[patchPointI][i] = addedVertI;
+                addedPoints_[patchPointi][i] = addedVertI;
 
-                disp *= expansionRatio[patchPointI];
+                disp *= expansionRatio[patchPointi];
             }
         }
     }
@@ -1729,23 +1729,23 @@ void Foam::addPatchCellLayer::updateMesh
     {
         labelListList newAddedPoints(pointMap.size());
 
-        forAll(newAddedPoints, newPointI)
+        forAll(newAddedPoints, newPointi)
         {
-            label oldPointI = pointMap[newPointI];
+            label oldPointi = pointMap[newPointi];
 
-            const labelList& added = addedPoints_[oldPointI];
+            const labelList& added = addedPoints_[oldPointi];
 
-            labelList& newAdded = newAddedPoints[newPointI];
+            labelList& newAdded = newAddedPoints[newPointi];
             newAdded.setSize(added.size());
             label newI = 0;
 
             forAll(added, i)
             {
-                label newPointI = morphMap.reversePointMap()[added[i]];
+                label newPointi = morphMap.reversePointMap()[added[i]];
 
-                if (newPointI >= 0)
+                if (newPointi >= 0)
                 {
-                    newAdded[newI++] = newPointI;
+                    newAdded[newI++] = newPointi;
                 }
             }
             newAdded.setSize(newI);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index 27e1471154..4cbbc08905 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -305,7 +305,7 @@ public:
 
             //- Boundary edges get extruded into boundary faces. Determine patch
             //  for these faces. This might be a to-be-created processor patch
-            //  (patchI >= mesh.boundaryMesh().size()) in which case the
+            //  (patchi >= mesh.boundaryMesh().size()) in which case the
             //  nbrProcToPatch, patchToNbrProc give the correspondence. nPatches
             //  is the new number of patches.
             static void calcSidePatch
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 4d4b55908f..96511ebe4c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -566,9 +566,9 @@ void Foam::combineFaces::setRefinement
 
     const labelListList& pointFaces = mesh_.pointFaces();
 
-    forAll(pointFaces, pointI)
+    forAll(pointFaces, pointi)
     {
-        nPointFaces[pointI] = pointFaces[pointI].size();
+        nPointFaces[pointi] = pointFaces[pointi].size();
     }
 
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
@@ -700,11 +700,11 @@ void Foam::combineFaces::setRefinement
     // Remove all unused points. Store position if undoable.
     if (!undoable_)
     {
-        forAll(nPointFaces, pointI)
+        forAll(nPointFaces, pointi)
         {
-            if (nPointFaces[pointI] == 0)
+            if (nPointFaces[pointi] == 0)
             {
-                meshMod.setAction(polyRemovePoint(pointI));
+                meshMod.setAction(polyRemovePoint(pointi));
             }
         }
     }
@@ -712,9 +712,9 @@ void Foam::combineFaces::setRefinement
     {
         // Count removed points
         label n = 0;
-        forAll(nPointFaces, pointI)
+        forAll(nPointFaces, pointi)
         {
-            if (nPointFaces[pointI] == 0)
+            if (nPointFaces[pointi] == 0)
             {
                 n++;
             }
@@ -726,16 +726,16 @@ void Foam::combineFaces::setRefinement
 
         // Remove points and store position
         n = 0;
-        forAll(nPointFaces, pointI)
+        forAll(nPointFaces, pointi)
         {
-            if (nPointFaces[pointI] == 0)
+            if (nPointFaces[pointi] == 0)
             {
-                meshMod.setAction(polyRemovePoint(pointI));
+                meshMod.setAction(polyRemovePoint(pointi));
 
-                savedPointLabels_[n] = pointI;
-                savedPoints_[n] = mesh_.points()[pointI];
+                savedPointLabels_[n] = pointi;
+                savedPoints_[n] = mesh_.points()[pointi];
 
-                meshToSaved.insert(pointI, n);
+                meshToSaved.insert(pointi, n);
                 n++;
             }
         }
@@ -751,11 +751,11 @@ void Foam::combineFaces::setRefinement
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
+                    label pointi = f[fp];
 
-                    if (nPointFaces[pointI] == 0)
+                    if (nPointFaces[pointi] == 0)
                     {
-                        f[fp] = -meshToSaved[pointI]-1;
+                        f[fp] = -meshToSaved[pointi]-1;
                     }
                 }
             }
@@ -784,11 +784,11 @@ void Foam::combineFaces::updateMesh(const mapPolyMesh& map)
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
+                    label pointi = f[fp];
 
-                    if (pointI >= 0)
+                    if (pointi >= 0)
                     {
-                        f[fp] = map.reversePointMap()[pointI];
+                        f[fp] = map.reversePointMap()[pointi];
 
                         if (f[fp] < 0)
                         {
@@ -879,11 +879,11 @@ void Foam::combineFaces::setUnrefinement
 
             forAll(f, fp)
             {
-                label pointI = f[fp];
+                label pointi = f[fp];
 
-                if (pointI < 0)
+                if (pointi < 0)
                 {
-                    label localI = -pointI-1;
+                    label localI = -pointi-1;
 
                     if (addedPoints[localI] == -1)
                     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
index b314b61ec6..6eb125a42c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
@@ -75,24 +75,24 @@ void Foam::duplicatePoints::setRefinement
 
     forAllConstIter(Map<label>, meshPointMap, iter)
     {
-        label pointI = iter.key();
+        label pointi = iter.key();
         label localI = iter();
         const labelList& regions = pointRegions[localI];
 
         duplicates_[localI].setSize(regions.size());
-        duplicates_[localI][0] = pointI;
+        duplicates_[localI][0] = pointi;
         for (label i = 1; i < regions.size(); i++)
         {
             duplicates_[localI][i] = meshMod.addPoint
             (
-                mesh_.points()[pointI],  // point
-                pointI,                 // master point
+                mesh_.points()[pointi],  // point
+                pointi,                 // master point
                 -1,                     // zone for point
                 true                    // supports a cell
             );
         }
 
-        //Pout<< "For point:" << pointI << " coord:" << mesh_.points()[pointI]
+        //Pout<< "For point:" << pointi << " coord:" << mesh_.points()[pointi]
         //    << endl;
         //forAll(duplicates_[localI], i)
         //{
@@ -121,9 +121,9 @@ void Foam::duplicatePoints::setRefinement
         newFace.setSize(f.size());
         forAll(f, fp)
         {
-            label pointI = f[fp];
+            label pointi = f[fp];
 
-            Map<label>::const_iterator iter = meshPointMap.find(pointI);
+            Map<label>::const_iterator iter = meshPointMap.find(pointi);
 
             if (iter != meshPointMap.end())
             {
@@ -141,7 +141,7 @@ void Foam::duplicatePoints::setRefinement
             }
             else
             {
-                newFace[fp] = pointI;
+                newFace[fp] = pointi;
             }
         }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 9d4bca5e17..c0eb30678c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -192,18 +192,18 @@ void Foam::edgeCollapser::collapseToEdge
 
     forAll(facePtsNeg, fPtI)
     {
-        const label facePointI = facePtsNeg[fPtI];
-        const label facePtPriority = pointPriority[facePointI];
+        const label facePointi = facePtsNeg[fPtI];
+        const label facePtPriority = pointPriority[facePointi];
 
         if (facePtPriority > maxPriority)
         {
             maxPriority = facePtPriority;
             maxPriorityPts.clear();
-            maxPriorityPts.append(facePointI);
+            maxPriorityPts.append(facePointi);
         }
         else if (facePtPriority == maxPriority)
         {
-            maxPriorityPts.append(facePointI);
+            maxPriorityPts.append(facePointi);
         }
     }
 
@@ -242,18 +242,18 @@ void Foam::edgeCollapser::collapseToEdge
 
     forAll(facePtsPos, fPtI)
     {
-        const label facePointI = facePtsPos[fPtI];
-        const label facePtPriority = pointPriority[facePointI];
+        const label facePointi = facePtsPos[fPtI];
+        const label facePtPriority = pointPriority[facePointi];
 
         if (facePtPriority > maxPriority)
         {
             maxPriority = facePtPriority;
             maxPriorityPts.clear();
-            maxPriorityPts.append(facePointI);
+            maxPriorityPts.append(facePointi);
         }
         else if (facePtPriority == maxPriority)
         {
-            maxPriorityPts.append(facePointI);
+            maxPriorityPts.append(facePointi);
         }
     }
 
@@ -304,18 +304,18 @@ void Foam::edgeCollapser::collapseToPoint
 
     forAll(facePts, fPtI)
     {
-        const label facePointI = facePts[fPtI];
-        const label facePtPriority = pointPriority[facePointI];
+        const label facePointi = facePts[fPtI];
+        const label facePtPriority = pointPriority[facePointi];
 
         if (facePtPriority > maxPriority)
         {
             maxPriority = facePtPriority;
             maxPriorityPts.clear();
-            maxPriorityPts.append(facePointI);
+            maxPriorityPts.append(facePointi);
         }
         else if (facePtPriority == maxPriority)
         {
-            maxPriorityPts.append(facePointI);
+            maxPriorityPts.append(facePointi);
         }
     }
 
@@ -806,48 +806,48 @@ Foam::label Foam::edgeCollapser::edgeMaster
 
 void Foam::edgeCollapser::checkBoundaryPointMergeEdges
 (
-    const label pointI,
-    const label otherPointI,
+    const label pointi,
+    const label otherPointi,
     const labelList& pointPriority,
     Map<point>& collapsePointToLocation
 ) const
 {
    const pointField& points = mesh_.points();
 
-   const label e0Priority = pointPriority[pointI];
-   const label e1Priority = pointPriority[otherPointI];
+   const label e0Priority = pointPriority[pointi];
+   const label e1Priority = pointPriority[otherPointi];
 
    if (e0Priority > e1Priority)
    {
        collapsePointToLocation.set
        (
-           otherPointI,
-           points[pointI]
+           otherPointi,
+           points[pointi]
        );
    }
    else if (e0Priority < e1Priority)
    {
        collapsePointToLocation.set
        (
-           pointI,
-           points[otherPointI]
+           pointi,
+           points[otherPointi]
        );
    }
    else // e0Priority == e1Priority
    {
        collapsePointToLocation.set
        (
-           pointI,
-           points[otherPointI]
+           pointi,
+           points[otherPointi]
        );
 
 //       Foam::point averagePt
 //       (
-//           0.5*(points[otherPointI] + points[pointI])
+//           0.5*(points[otherPointi] + points[pointi])
 //       );
 //
-//       collapsePointToLocation.set(pointI, averagePt);
-//       collapsePointToLocation.set(otherPointI, averagePt);
+//       collapsePointToLocation.set(pointi, averagePt);
+//       collapsePointToLocation.set(otherPointi, averagePt);
    }
 }
 
@@ -890,10 +890,10 @@ Foam::label Foam::edgeCollapser::breakStringsAtEdges
                     {
                         const label edgeI = ptEdgesStart[ptEdgeI];
 
-                        const label nbrPointI
+                        const label nbrPointi
                             = edges[edgeI].otherVertex(e.start());
                         const label nbrIndex
-                            = allPointInfo[nbrPointI].collapseIndex();
+                            = allPointInfo[nbrPointi].collapseIndex();
 
                         if
                         (
@@ -964,20 +964,20 @@ Foam::label Foam::edgeCollapser::countEdgesOnFace
 
     forAll(f, fpI)
     {
-        const label pointI = f[fpI];
-        const label newPointI = allPointInfo[pointI].collapseIndex();
+        const label pointi = f[fpI];
+        const label newPointi = allPointInfo[pointi].collapseIndex();
 
-        if (newPointI == -2)
+        if (newPointi == -2)
         {
             nEdges++;
         }
         else
         {
-            const label prevPointI = f[f.fcIndex(fpI)];
-            const label prevNewPointI
-                = allPointInfo[prevPointI].collapseIndex();
+            const label prevPointi = f[f.fcIndex(fpI)];
+            const label prevNewPointi
+                = allPointInfo[prevPointi].collapseIndex();
 
-            if (newPointI != prevNewPointI)
+            if (newPointi != prevNewPointi)
             {
                 nEdges++;
             }
@@ -1045,38 +1045,38 @@ Foam::label Foam::edgeCollapser::syncCollapse
         {
             const edge& e = edges[edgeI];
 
-            label masterPointI = e.start();
+            label masterPointi = e.start();
 
             // Choose the point on the edge with the highest priority.
             if (pointPriority[e.end()] > pointPriority[e.start()])
             {
-                masterPointI = e.end();
+                masterPointi = e.end();
             }
 
-            label masterPointPriority = pointPriority[masterPointI];
+            label masterPointPriority = pointPriority[masterPointi];
 
-            label index = globalPoints.toGlobal(masterPointI);
+            label index = globalPoints.toGlobal(masterPointi);
 
-            if (!collapsePointToLocation.found(masterPointI))
+            if (!collapsePointToLocation.found(masterPointi))
             {
-                const label otherVertex = e.otherVertex(masterPointI);
+                const label otherVertex = e.otherVertex(masterPointi);
 
                 if (!collapsePointToLocation.found(otherVertex))
                 {
                     FatalErrorInFunction
-                        << masterPointI << " on edge " << edgeI << " " << e
+                        << masterPointi << " on edge " << edgeI << " " << e
                         << " is not marked for collapse."
                         << abort(FatalError);
                 }
                 else
                 {
-                    masterPointI = otherVertex;
-                    masterPointPriority = pointPriority[masterPointI];
-                    index = globalPoints.toGlobal(masterPointI);
+                    masterPointi = otherVertex;
+                    masterPointPriority = pointPriority[masterPointi];
+                    index = globalPoints.toGlobal(masterPointi);
                 }
             }
 
-            const point& collapsePoint = collapsePointToLocation[masterPointI];
+            const point& collapsePoint = collapsePointToLocation[masterPointi];
 
             const pointEdgeCollapse pec
             (
@@ -1131,29 +1131,29 @@ void Foam::edgeCollapser::filterFace
 
     forAll(f, fp)
     {
-        label pointI = f[fp];
+        label pointi = f[fp];
 
-        label collapseIndex = allPointInfo[pointI].collapseIndex();
+        label collapseIndex = allPointInfo[pointi].collapseIndex();
 
         // Do we have a local point for this index?
         if (collapseStrings.found(collapseIndex))
         {
-            label localPointI = collapseStrings[collapseIndex][0];
+            label localPointi = collapseStrings[collapseIndex][0];
 
-            if (findIndex(SubList<label>(f, newFp), localPointI) == -1)
+            if (findIndex(SubList<label>(f, newFp), localPointi) == -1)
             {
-                f[newFp++] = localPointI;
+                f[newFp++] = localPointi;
             }
         }
         else if (collapseIndex == -1)
         {
             WarningInFunction
-                << "Point " << pointI << " was not visited by PointEdgeWave"
+                << "Point " << pointi << " was not visited by PointEdgeWave"
                 << endl;
         }
         else
         {
-            f[newFp++] = pointI;
+            f[newFp++] = pointi;
         }
     }
 
@@ -1173,35 +1173,35 @@ void Foam::edgeCollapser::filterFace
         label fp1 = fp-1;
         label fp2 = fp-2;
 
-        label pointI = f[fp];
+        label pointi = f[fp];
 
         // Search for previous occurrence.
-        label index = findIndex(SubList<label>(f, fp), pointI);
+        label index = findIndex(SubList<label>(f, fp), pointi);
 
         if (index == fp1)
         {
             WarningInFunction
                 << "Removing consecutive duplicate vertex in face "
                 << f << endl;
-            // Don't store current pointI
+            // Don't store current pointi
         }
         else if (index == fp2)
         {
             WarningInFunction
                 << "Removing non-consecutive duplicate vertex in face "
                 << f << endl;
-            // Don't store current pointI and remove previous
+            // Don't store current pointi and remove previous
             newFp--;
         }
         else if (index != -1)
         {
             WarningInFunction
                 << "Pinched face " << f << endl;
-            f[newFp++] = pointI;
+            f[newFp++] = pointi;
         }
         else
         {
-            f[newFp++] = pointI;
+            f[newFp++] = pointi;
         }
     }
 
@@ -1321,9 +1321,9 @@ bool Foam::edgeCollapser::setRefinement
     {
         // 1. Count elements per collapseIndex
         Map<label> nPerIndex(mesh_.nPoints()/10);
-        forAll(allPointInfo, pointI)
+        forAll(allPointInfo, pointi)
         {
-            label collapseIndex = allPointInfo[pointI].collapseIndex();
+            label collapseIndex = allPointInfo[pointi].collapseIndex();
 
             if (collapseIndex != -1 && collapseIndex != -2)
             {
@@ -1347,13 +1347,13 @@ bool Foam::edgeCollapser::setRefinement
         }
 
         // 3. Fill
-        forAll(allPointInfo, pointI)
+        forAll(allPointInfo, pointi)
         {
-            const label collapseIndex = allPointInfo[pointI].collapseIndex();
+            const label collapseIndex = allPointInfo[pointi].collapseIndex();
 
             if (collapseIndex != -1 && collapseIndex != -2)
             {
-                collapseStrings[collapseIndex].append(pointI);
+                collapseStrings[collapseIndex].append(pointi);
             }
         }
     }
@@ -1532,35 +1532,35 @@ bool Foam::edgeCollapser::setRefinement
         }
 
         // Remove unused vertices that have not been marked for removal already
-        forAll(usedPoint, pointI)
+        forAll(usedPoint, pointi)
         {
-            if (!usedPoint[pointI])
+            if (!usedPoint[pointi])
             {
-                removedPoints[pointI] = true;
-                meshMod.removePoint(pointI, -1);
+                removedPoints[pointi] = true;
+                meshMod.removePoint(pointi, -1);
                 meshChanged = true;
             }
         }
     }
 
     // Modify the point location of the remaining points
-    forAll(allPointInfo, pointI)
+    forAll(allPointInfo, pointi)
     {
-        const label collapseIndex = allPointInfo[pointI].collapseIndex();
-        const point& collapsePoint = allPointInfo[pointI].collapsePoint();
+        const label collapseIndex = allPointInfo[pointi].collapseIndex();
+        const point& collapsePoint = allPointInfo[pointi].collapsePoint();
 
         if
         (
-            removedPoints[pointI] == false
+            removedPoints[pointi] == false
          && collapseIndex != -1
          && collapseIndex != -2
         )
         {
             meshMod.modifyPoint
             (
-                pointI,
+                pointi,
                 collapsePoint,
-                pointZones.whichZone(pointI),
+                pointZones.whichZone(pointi),
                 false
             );
         }
@@ -1571,11 +1571,11 @@ bool Foam::edgeCollapser::setRefinement
     const faceZoneMesh& faceZones = mesh_.faceZones();
 
     // Renumber faces that use points
-    forAll(allPointInfo, pointI)
+    forAll(allPointInfo, pointi)
     {
-        if (removedPoints[pointI] == true)
+        if (removedPoints[pointi] == true)
         {
-            const labelList& changedFaces = pointFaces[pointI];
+            const labelList& changedFaces = pointFaces[pointi];
 
             forAll(changedFaces, changedFacei)
             {
@@ -1712,20 +1712,20 @@ void Foam::edgeCollapser::consistentCollapse
         );
 
         // Mark all edges attached to the point for collapse
-        forAll(markedPoints, pointI)
+        forAll(markedPoints, pointi)
         {
-            if (markedPoints[pointI])
+            if (markedPoints[pointi])
             {
-                const label index = allPointInfo[pointI].collapseIndex();
+                const label index = allPointInfo[pointi].collapseIndex();
 
-                const labelList& ptEdges = pointEdges[pointI];
+                const labelList& ptEdges = pointEdges[pointi];
 
                 forAll(ptEdges, ptEdgeI)
                 {
                     const label edgeI = ptEdges[ptEdgeI];
-                    const label nbrPointI = edges[edgeI].otherVertex(pointI);
+                    const label nbrPointi = edges[edgeI].otherVertex(pointi);
                     const label nbrIndex
-                        = allPointInfo[nbrPointI].collapseIndex();
+                        = allPointInfo[nbrPointi].collapseIndex();
 
                     if (collapseEdge[edgeI] && nbrIndex == index)
                     {
@@ -1850,9 +1850,9 @@ Foam::label Foam::edgeCollapser::markSmallEdges
             {
                 collapseEdge[edgeI] = true;
 
-                label masterPointI = edgeMaster(pointPriority, e);
+                label masterPointi = edgeMaster(pointPriority, e);
 
-                if (masterPointI == -1)
+                if (masterPointi == -1)
                 {
                     const point average
                         = 0.5*(points[e.start()] + points[e.end()]);
@@ -1861,9 +1861,9 @@ Foam::label Foam::edgeCollapser::markSmallEdges
                 }
                 else
                 {
-                    const point& collapsePt = points[masterPointI];
+                    const point& collapsePt = points[masterPointi];
 
-                    collapsePointToLocation.set(masterPointI, collapsePt);
+                    collapsePointToLocation.set(masterPointi, collapsePt);
                 }
 
 
@@ -1901,11 +1901,11 @@ Foam::label Foam::edgeCollapser::markMergeEdges
 
     if (nTotRemove > 0)
     {
-        forAll(pointEdges, pointI)
+        forAll(pointEdges, pointi)
         {
-            if (pointCanBeDeleted[pointI])
+            if (pointCanBeDeleted[pointi])
             {
-                const labelList& pEdges = pointEdges[pointI];
+                const labelList& pEdges = pointEdges[pointi];
 
                 if (pEdges.size() == 2)
                 {
@@ -1933,8 +1933,8 @@ Foam::label Foam::edgeCollapser::markMergeEdges
 
                             checkBoundaryPointMergeEdges
                             (
-                                pointI,
-                                edges[e0].otherVertex(pointI),
+                                pointi,
+                                edges[e0].otherVertex(pointi),
                                 pointPriority,
                                 collapsePointToLocation
                             );
@@ -1945,8 +1945,8 @@ Foam::label Foam::edgeCollapser::markMergeEdges
 
                             checkBoundaryPointMergeEdges
                             (
-                                pointI,
-                                edges[e1].otherVertex(pointI),
+                                pointi,
+                                edges[e1].otherVertex(pointi),
                                 pointPriority,
                                 collapsePointToLocation
                             );
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
index 98861ca6ef..2d80b2fa35 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
@@ -173,8 +173,8 @@ private:
         //- Decides which points in an edge to collapse, based on their priority
         void checkBoundaryPointMergeEdges
         (
-            const label pointI,
-            const label otherPointI,
+            const label pointi,
+            const label otherPointi,
             const labelList& pointPriority,
             Map<point>& collapsePointToLocation
         ) const;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index 14a710b3e3..dab1e39735 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -153,7 +153,7 @@ void Foam::faceCollapser::filterFace
     {
         label nei = -1;
 
-        label patchI = -1;
+        label patchi = -1;
 
         if (mesh_.isInternalFace(facei))
         {
@@ -161,7 +161,7 @@ void Foam::faceCollapser::filterFace
         }
         else
         {
-            patchI = mesh_.boundaryMesh().whichPatch(facei);
+            patchi = mesh_.boundaryMesh().whichPatch(facei);
         }
 
         // Get current zone info
@@ -185,7 +185,7 @@ void Foam::faceCollapser::filterFace
                 mesh_.faceOwner()[facei],   // owner
                 nei,                        // neighbour
                 false,                      // face flip
-                patchI,                     // patch for face
+                patchi,                     // patch for face
                 false,                      // remove from zone
                 zoneID,                     // zone for face
                 zoneFlip                    // face flip in zone
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index ba244cd633..7872d76afb 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -192,7 +192,7 @@ Foam::label Foam::hexRef8::addInternalFace
 (
     polyTopoChange& meshMod,
     const label meshFacei,
-    const label meshPointI,
+    const label meshPointi,
     const face& newFace,
     const label own,
     const label nei
@@ -248,16 +248,16 @@ Foam::label Foam::hexRef8::addInternalFace
 
         ////- Inflate-from-point:
         //// Check if point has any internal faces we can use.
-        //label masterPointI = -1;
+        //label masterPointi = -1;
         //
-        //const labelList& pFaces = mesh_.pointFaces()[meshPointI];
+        //const labelList& pFaces = mesh_.pointFaces()[meshPointi];
         //
         //forAll(pFaces, i)
         //{
         //    if (mesh_.isInternalFace(pFaces[i]))
         //    {
         //        // meshPoint uses internal faces so ok to inflate from it
-        //        masterPointI = meshPointI;
+        //        masterPointi = meshPointi;
         //
         //        break;
         //    }
@@ -270,7 +270,7 @@ Foam::label Foam::hexRef8::addInternalFace
         //        newFace,                    // face
         //        own,                        // owner
         //        nei,                        // neighbour
-        //        masterPointI,               // master point
+        //        masterPointi,               // master point
         //        -1,                         // master edge
         //        -1,                         // master face for addition
         //        false,                      // flux flip
@@ -530,7 +530,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
 }
 
 
-// Check whether pointI is an anchor on celli.
+// Check whether pointi is an anchor on celli.
 // If it is not check whether any other point on the face is an anchor cell.
 Foam::label Foam::hexRef8::getAnchorCell
 (
@@ -538,12 +538,12 @@ Foam::label Foam::hexRef8::getAnchorCell
     const labelListList& cellAddedCells,
     const label celli,
     const label facei,
-    const label pointI
+    const label pointi
 ) const
 {
     if (cellAnchorPoints[celli].size())
     {
-        label index = findIndex(cellAnchorPoints[celli], pointI);
+        label index = findIndex(cellAnchorPoints[celli], pointi);
 
         if (index != -1)
         {
@@ -551,7 +551,7 @@ Foam::label Foam::hexRef8::getAnchorCell
         }
 
 
-        // pointI is not an anchor cell.
+        // pointi is not an anchor cell.
         // Maybe we are already a refined face so check all the face
         // vertices.
         const face& f = mesh_.faces()[facei];
@@ -572,7 +572,7 @@ Foam::label Foam::hexRef8::getAnchorCell
             << endl;
 
         FatalErrorInFunction
-            << "Could not find point " << pointI
+            << "Could not find point " << pointi
             << " in the anchorPoints for cell " << celli << endl
             << "Does your original mesh obey the 2:1 constraint and"
             << " did you use consistentRefinement to make your cells to refine"
@@ -594,7 +594,7 @@ void Foam::hexRef8::getFaceNeighbours
     const labelListList& cellAnchorPoints,
     const labelListList& cellAddedCells,
     const label facei,
-    const label pointI,
+    const label pointi,
 
     label& own,
     label& nei
@@ -607,7 +607,7 @@ void Foam::hexRef8::getFaceNeighbours
         cellAddedCells,
         mesh_.faceOwner()[facei],
         facei,
-        pointI
+        pointi
     );
 
     if (mesh_.isInternalFace(facei))
@@ -618,7 +618,7 @@ void Foam::hexRef8::getFaceNeighbours
             cellAddedCells,
             mesh_.faceNeighbour()[facei],
             facei,
-            pointI
+            pointi
         );
     }
     else
@@ -719,11 +719,11 @@ void Foam::hexRef8::dumpCell(const label celli) const
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
-            label nexPointI = f[f.fcIndex(fp)];
+            label pointi = f[fp];
+            label nexPointi = f[f.fcIndex(fp)];
 
-            str << "l " << pointToObjVert[pointI]+1
-                << ' ' << pointToObjVert[nexPointI]+1 << nl;
+            str << "l " << pointToObjVert[pointi]+1
+                << ' ' << pointToObjVert[nexPointi]+1 << nl;
         }
     }
 }
@@ -743,9 +743,9 @@ Foam::label Foam::hexRef8::findLevel
 
     forAll(f, i)
     {
-        label pointI = f[fp];
+        label pointi = f[fp];
 
-        if (pointLevel_[pointI] < wantedLevel)
+        if (pointLevel_[pointi] < wantedLevel)
         {
             dumpCell(mesh_.faceOwner()[facei]);
             if (mesh_.isInternalFace(facei))
@@ -760,7 +760,7 @@ Foam::label Foam::hexRef8::findLevel
                 << " wantedLevel:" << wantedLevel
                 << abort(FatalError);
         }
-        else if (pointLevel_[pointI] == wantedLevel)
+        else if (pointLevel_[pointi] == wantedLevel)
         {
             return fp;
         }
@@ -953,9 +953,9 @@ Foam::label Foam::hexRef8::storeMidPointInfo
     const label celli,
     const label facei,
     const bool faceOrder,
-    const label edgeMidPointI,
-    const label anchorPointI,
-    const label faceMidPointI,
+    const label edgeMidPointi,
+    const label anchorPointi,
+    const label faceMidPointi,
 
     Map<edge>& midPointToAnchors,
     Map<edge>& midPointToFaceMids,
@@ -967,21 +967,21 @@ Foam::label Foam::hexRef8::storeMidPointInfo
     bool changed = false;
     bool haveTwoAnchors = false;
 
-    Map<edge>::iterator edgeMidFnd = midPointToAnchors.find(edgeMidPointI);
+    Map<edge>::iterator edgeMidFnd = midPointToAnchors.find(edgeMidPointi);
 
     if (edgeMidFnd == midPointToAnchors.end())
     {
-        midPointToAnchors.insert(edgeMidPointI, edge(anchorPointI, -1));
+        midPointToAnchors.insert(edgeMidPointi, edge(anchorPointi, -1));
     }
     else
     {
         edge& e = edgeMidFnd();
 
-        if (anchorPointI != e[0])
+        if (anchorPointi != e[0])
         {
             if (e[1] == -1)
             {
-                e[1] = anchorPointI;
+                e[1] = anchorPointi;
                 changed = true;
             }
         }
@@ -994,21 +994,21 @@ Foam::label Foam::hexRef8::storeMidPointInfo
 
     bool haveTwoFaceMids = false;
 
-    Map<edge>::iterator faceMidFnd = midPointToFaceMids.find(edgeMidPointI);
+    Map<edge>::iterator faceMidFnd = midPointToFaceMids.find(edgeMidPointi);
 
     if (faceMidFnd == midPointToFaceMids.end())
     {
-        midPointToFaceMids.insert(edgeMidPointI, edge(faceMidPointI, -1));
+        midPointToFaceMids.insert(edgeMidPointi, edge(faceMidPointi, -1));
     }
     else
     {
         edge& e = faceMidFnd();
 
-        if (faceMidPointI != e[0])
+        if (faceMidPointi != e[0])
         {
             if (e[1] == -1)
             {
-                e[1] = faceMidPointI;
+                e[1] = faceMidPointi;
                 changed = true;
             }
         }
@@ -1024,10 +1024,10 @@ Foam::label Foam::hexRef8::storeMidPointInfo
 
     if (changed && haveTwoAnchors && haveTwoFaceMids)
     {
-        const edge& anchors = midPointToAnchors[edgeMidPointI];
-        const edge& faceMids = midPointToFaceMids[edgeMidPointI];
+        const edge& anchors = midPointToAnchors[edgeMidPointi];
+        const edge& faceMids = midPointToFaceMids[edgeMidPointi];
 
-        label otherFaceMidPointI = faceMids.otherVertex(faceMidPointI);
+        label otherFaceMidPointi = faceMids.otherVertex(faceMidPointi);
 
         // Create face consistent with anchorI being the owner.
         // Note that the edges between the edge mid point and the face mids
@@ -1037,53 +1037,53 @@ Foam::label Foam::hexRef8::storeMidPointInfo
         DynamicList<label> newFaceVerts(4);
         if (faceOrder == (mesh_.faceOwner()[facei] == celli))
         {
-            newFaceVerts.append(faceMidPointI);
+            newFaceVerts.append(faceMidPointi);
 
             // Check & insert edge split if any
             insertEdgeSplit
             (
                 edgeMidPoint,
-                faceMidPointI,  // edge between faceMid and
-                edgeMidPointI,  // edgeMid
+                faceMidPointi,  // edge between faceMid and
+                edgeMidPointi,  // edgeMid
                 newFaceVerts
             );
 
-            newFaceVerts.append(edgeMidPointI);
+            newFaceVerts.append(edgeMidPointi);
 
             insertEdgeSplit
             (
                 edgeMidPoint,
-                edgeMidPointI,
-                otherFaceMidPointI,
+                edgeMidPointi,
+                otherFaceMidPointi,
                 newFaceVerts
             );
 
-            newFaceVerts.append(otherFaceMidPointI);
+            newFaceVerts.append(otherFaceMidPointi);
             newFaceVerts.append(cellMidPoint[celli]);
         }
         else
         {
-            newFaceVerts.append(otherFaceMidPointI);
+            newFaceVerts.append(otherFaceMidPointi);
 
             insertEdgeSplit
             (
                 edgeMidPoint,
-                otherFaceMidPointI,
-                edgeMidPointI,
+                otherFaceMidPointi,
+                edgeMidPointi,
                 newFaceVerts
             );
 
-            newFaceVerts.append(edgeMidPointI);
+            newFaceVerts.append(edgeMidPointi);
 
             insertEdgeSplit
             (
                 edgeMidPoint,
-                edgeMidPointI,
-                faceMidPointI,
+                edgeMidPointi,
+                faceMidPointi,
                 newFaceVerts
             );
 
-            newFaceVerts.append(faceMidPointI);
+            newFaceVerts.append(faceMidPointi);
             newFaceVerts.append(cellMidPoint[celli]);
         }
 
@@ -1096,7 +1096,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
             cellAddedCells,
             celli,
             facei,
-            anchorPointI
+            anchorPointi
         );
         label anchorCell1 = getAnchorCell
         (
@@ -1104,7 +1104,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
             cellAddedCells,
             celli,
             facei,
-            anchors.otherVertex(anchorPointI)
+            anchors.otherVertex(anchorPointi)
         );
 
 
@@ -1116,8 +1116,8 @@ Foam::label Foam::hexRef8::storeMidPointInfo
             own = anchorCell0;
             nei = anchorCell1;
 
-            ownPt = mesh_.points()[anchorPointI];
-            neiPt = mesh_.points()[anchors.otherVertex(anchorPointI)];
+            ownPt = mesh_.points()[anchorPointi];
+            neiPt = mesh_.points()[anchors.otherVertex(anchorPointi)];
 
         }
         else
@@ -1126,8 +1126,8 @@ Foam::label Foam::hexRef8::storeMidPointInfo
             nei = anchorCell0;
             newFace.flip();
 
-            ownPt = mesh_.points()[anchors.otherVertex(anchorPointI)];
-            neiPt = mesh_.points()[anchorPointI];
+            ownPt = mesh_.points()[anchors.otherVertex(anchorPointi)];
+            neiPt = mesh_.points()[anchorPointi];
         }
 
         if (debug)
@@ -1136,13 +1136,13 @@ Foam::label Foam::hexRef8::storeMidPointInfo
 
             if (anchorCell0 < anchorCell1)
             {
-                ownPt = mesh_.points()[anchorPointI];
-                neiPt = mesh_.points()[anchors.otherVertex(anchorPointI)];
+                ownPt = mesh_.points()[anchorPointi];
+                neiPt = mesh_.points()[anchors.otherVertex(anchorPointi)];
             }
             else
             {
-                ownPt = mesh_.points()[anchors.otherVertex(anchorPointI)];
-                neiPt = mesh_.points()[anchorPointI];
+                ownPt = mesh_.points()[anchors.otherVertex(anchorPointi)];
+                neiPt = mesh_.points()[anchorPointi];
             }
 
             checkInternalOrientation
@@ -1160,7 +1160,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
         (
             meshMod,
             facei,
-            anchorPointI,
+            anchorPointi,
             newFace,
             own,
             nei
@@ -1215,7 +1215,7 @@ void Foam::hexRef8::createInternalFaces
         // We are on the celli side of face f. The face will have 1 or 4
         // cLevel points and lots of higher numbered ones.
 
-        label faceMidPointI = -1;
+        label faceMidPointi = -1;
 
         label nAnchors = countAnchors(f, cLevel);
 
@@ -1254,14 +1254,14 @@ void Foam::hexRef8::createInternalFaces
                 cLevel+1
             );
 
-            faceMidPointI = f[faceMid];
+            faceMidPointi = f[faceMid];
         }
         else if (nAnchors == 4)
         {
             // There is no face middle yet but the face will be marked for
             // splitting.
 
-            faceMidPointI = faceMidPoint[facei];
+            faceMidPointi = faceMidPoint[facei];
         }
         else
         {
@@ -1296,7 +1296,7 @@ void Foam::hexRef8::createInternalFaces
                 // to cLevel+1 or edgeMidPoint of this level.
 
 
-                label edgeMidPointI = -1;
+                label edgeMidPointi = -1;
 
                 label fp1 = f.fcIndex(fp0);
 
@@ -1305,9 +1305,9 @@ void Foam::hexRef8::createInternalFaces
                     // Anchor. Edge will be split.
                     label edgeI = fEdges[fp0];
 
-                    edgeMidPointI = edgeMidPoint[edgeI];
+                    edgeMidPointi = edgeMidPoint[edgeI];
 
-                    if (edgeMidPointI == -1)
+                    if (edgeMidPointi == -1)
                     {
                         dumpCell(celli);
 
@@ -1324,7 +1324,7 @@ void Foam::hexRef8::createInternalFaces
                             << UIndirectList<label>(pointLevel_, f)()
                             << " faceAnchorLevel:" << faceAnchorLevel[facei]
                             << " faceMidPoint:" << faceMidPoint[facei]
-                            << " faceMidPointI:" << faceMidPointI
+                            << " faceMidPointi:" << faceMidPointi
                             << " fp:" << fp0
                             << abort(FatalError);
                     }
@@ -1334,7 +1334,7 @@ void Foam::hexRef8::createInternalFaces
                     // Search forward in face to clevel+1
                     label edgeMid = findLevel(facei, f, fp1, true, cLevel+1);
 
-                    edgeMidPointI = f[edgeMid];
+                    edgeMidPointi = f[edgeMid];
                 }
 
                 label newFacei = storeMidPointInfo
@@ -1347,9 +1347,9 @@ void Foam::hexRef8::createInternalFaces
                     celli,
                     facei,
                     true,                   // mid point after anchor
-                    edgeMidPointI,          // edgemid
+                    edgeMidPointi,          // edgemid
                     point0,                 // anchor
-                    faceMidPointI,
+                    faceMidPointi,
 
                     midPointToAnchors,
                     midPointToFaceMids,
@@ -1378,9 +1378,9 @@ void Foam::hexRef8::createInternalFaces
                     // Anchor. Edge will be split.
                     label edgeI = fEdges[fpMin1];
 
-                    edgeMidPointI = edgeMidPoint[edgeI];
+                    edgeMidPointi = edgeMidPoint[edgeI];
 
-                    if (edgeMidPointI == -1)
+                    if (edgeMidPointi == -1)
                     {
                         dumpCell(celli);
 
@@ -1397,7 +1397,7 @@ void Foam::hexRef8::createInternalFaces
                             << UIndirectList<label>(pointLevel_, f)()
                             << " faceAnchorLevel:" << faceAnchorLevel[facei]
                             << " faceMidPoint:" << faceMidPoint[facei]
-                            << " faceMidPointI:" << faceMidPointI
+                            << " faceMidPointi:" << faceMidPointi
                             << " fp:" << fp0
                             << abort(FatalError);
                     }
@@ -1414,7 +1414,7 @@ void Foam::hexRef8::createInternalFaces
                         cLevel+1
                     );
 
-                    edgeMidPointI = f[edgeMid];
+                    edgeMidPointi = f[edgeMid];
                 }
 
                 newFacei = storeMidPointInfo
@@ -1427,9 +1427,9 @@ void Foam::hexRef8::createInternalFaces
                     celli,
                     facei,
                     false,                  // mid point before anchor
-                    edgeMidPointI,          // edgemid
+                    edgeMidPointi,          // edgemid
                     point0,                 // anchor
-                    faceMidPointI,
+                    faceMidPointi,
 
                     midPointToAnchors,
                     midPointToFaceMids,
@@ -1772,10 +1772,10 @@ void Foam::hexRef8::collectLevelPoints
 {
     forAll(f, fp)
     {
-        label pointI = meshPoints[f[fp]];
-        if (pointLevel_[pointI] <= level)
+        label pointi = meshPoints[f[fp]];
+        if (pointLevel_[pointi] <= level)
         {
-            points.append(pointI);
+            points.append(pointi);
         }
     }
 }
@@ -1840,11 +1840,11 @@ bool Foam::hexRef8::matchHexShape
                 // a midpoint of a split face)
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
-                    if (pointLevel_[pointI] == cellLevel+1)
+                    label pointi = f[fp];
+                    if (pointLevel_[pointi] == cellLevel+1)
                     {
                         Map<labelList>::iterator iter =
-                            pointFaces.find(pointI);
+                            pointFaces.find(pointi);
                         if (iter != pointFaces.end())
                         {
                             labelList& pFaces = iter();
@@ -1857,7 +1857,7 @@ bool Foam::hexRef8::matchHexShape
                         {
                             pointFaces.insert
                             (
-                                pointI,
+                                pointi,
                                 labelList(1, facei)
                             );
                         }
@@ -2577,11 +2577,11 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
         // as cell level purely for ease)
         labelList maxPointCount(mesh_.nPoints(), 0);
 
-        forAll(maxPointCount, pointI)
+        forAll(maxPointCount, pointi)
         {
-            label& pLevel = maxPointCount[pointI];
+            label& pLevel = maxPointCount[pointi];
 
-            const labelList& pCells = mesh_.pointCells(pointI);
+            const labelList& pCells = mesh_.pointCells(pointi);
 
             forAll(pCells, i)
             {
@@ -2606,12 +2606,12 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
 
         forAll(pointsToCheck, i)
         {
-            label pointI = pointsToCheck[i];
+            label pointi = pointsToCheck[i];
 
             // Loop over all cells using the point and check whether their
             // refinement level is much less than the maximum.
 
-            const labelList& pCells = mesh_.pointCells(pointI);
+            const labelList& pCells = mesh_.pointCells(pointi);
 
             forAll(pCells, pCelli)
             {
@@ -2623,7 +2623,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
                 (
                    !cellInfo.isRefined()
                  && (
-                        maxPointCount[pointI]
+                        maxPointCount[pointi]
                       > cellInfo.count() + maxFaceDiff*maxPointDiff
                     )
                 )
@@ -3267,9 +3267,9 @@ Foam::labelListList Foam::hexRef8::setRefinement
         newCellLevel.append(cellLevel_[celli]);
     }
     DynamicList<label> newPointLevel(pointLevel_.size());
-    forAll(pointLevel_, pointI)
+    forAll(pointLevel_, pointi)
     {
-        newPointLevel.append(pointLevel_[pointI]);
+        newPointLevel.append(pointLevel_[pointi]);
     }
 
 
@@ -3290,14 +3290,14 @@ Foam::labelListList Foam::hexRef8::setRefinement
     {
         label celli = cellLabels[i];
 
-        label anchorPointI = mesh_.faces()[mesh_.cells()[celli][0]][0];
+        label anchorPointi = mesh_.faces()[mesh_.cells()[celli][0]][0];
 
         cellMidPoint[celli] = meshMod.setAction
         (
             polyAddPoint
             (
                 mesh_.cellCentres()[celli],     // point
-                anchorPointI,                   // master point
+                anchorPointi,                   // master point
                 -1,                             // zone for point
                 true                            // supports a cell
             )
@@ -3681,9 +3681,9 @@ Foam::labelListList Foam::hexRef8::setRefinement
             }
         }
 
-        forAll(pointLevel_, pointI)
+        forAll(pointLevel_, pointi)
         {
-            const labelList& pCells = mesh_.pointCells(pointI);
+            const labelList& pCells = mesh_.pointCells(pointi);
 
             forAll(pCells, pCelli)
             {
@@ -3692,7 +3692,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
                 if
                 (
                     cellMidPoint[celli] >= 0
-                 && pointLevel_[pointI] <= cellLevel_[celli]
+                 && pointLevel_[pointi] <= cellLevel_[celli]
                 )
                 {
                     if (nAnchorPoints[celli] == 8)
@@ -3707,7 +3707,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
                             << abort(FatalError);
                     }
 
-                    cellAnchorPoints[celli][nAnchorPoints[celli]++] = pointI;
+                    cellAnchorPoints[celli][nAnchorPoints[celli]++] = pointi;
                 }
             }
         }
@@ -3868,15 +3868,15 @@ Foam::labelListList Foam::hexRef8::setRefinement
 
             forAll(f, fp)
             {
-                label pointI = f[fp];
+                label pointi = f[fp];
 
-                if (pointLevel_[pointI] <= anchorLevel)
+                if (pointLevel_[pointi] <= anchorLevel)
                 {
                     // point is anchor. Start collecting face.
 
                     DynamicList<label> faceVerts(4);
 
-                    faceVerts.append(pointI);
+                    faceVerts.append(pointi);
 
                     // Walk forward to mid point.
                     // - if next is +2 midpoint is +1
@@ -3916,7 +3916,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
                         cellAnchorPoints,
                         cellAddedCells,
                         facei,
-                        pointI,          // Anchor point
+                        pointi,          // Anchor point
 
                         own,
                         nei
@@ -4168,42 +4168,42 @@ Foam::labelListList Foam::hexRef8::setRefinement
     // Check
     if (debug)
     {
-        label minPointI = labelMax;
-        label maxPointI = labelMin;
+        label minPointi = labelMax;
+        label maxPointi = labelMin;
 
         forAll(cellMidPoint, celli)
         {
             if (cellMidPoint[celli] >= 0)
             {
-                minPointI = min(minPointI, cellMidPoint[celli]);
-                maxPointI = max(maxPointI, cellMidPoint[celli]);
+                minPointi = min(minPointi, cellMidPoint[celli]);
+                maxPointi = max(maxPointi, cellMidPoint[celli]);
             }
         }
         forAll(faceMidPoint, facei)
         {
             if (faceMidPoint[facei] >= 0)
             {
-                minPointI = min(minPointI, faceMidPoint[facei]);
-                maxPointI = max(maxPointI, faceMidPoint[facei]);
+                minPointi = min(minPointi, faceMidPoint[facei]);
+                maxPointi = max(maxPointi, faceMidPoint[facei]);
             }
         }
         forAll(edgeMidPoint, edgeI)
         {
             if (edgeMidPoint[edgeI] >= 0)
             {
-                minPointI = min(minPointI, edgeMidPoint[edgeI]);
-                maxPointI = max(maxPointI, edgeMidPoint[edgeI]);
+                minPointi = min(minPointi, edgeMidPoint[edgeI]);
+                maxPointi = max(maxPointi, edgeMidPoint[edgeI]);
             }
         }
 
-        if (minPointI != labelMax && minPointI != mesh_.nPoints())
+        if (minPointi != labelMax && minPointi != mesh_.nPoints())
         {
             FatalErrorInFunction
                 << "Added point labels not consecutive to existing mesh points."
                 << nl
                 << "mesh_.nPoints():" << mesh_.nPoints()
-                << " minPointI:" << minPointI
-                << " maxPointI:" << maxPointI
+                << " minPointi:" << minPointi
+                << " maxPointi:" << maxPointi
                 << abort(FatalError);
         }
     }
@@ -4268,8 +4268,8 @@ void Foam::hexRef8::storeData
     savedPointLevel_.resize(2*pointsToStore.size());
     forAll(pointsToStore, i)
     {
-        label pointI = pointsToStore[i];
-        savedPointLevel_.insert(pointI, pointLevel_[pointI]);
+        label pointi = pointsToStore[i];
+        savedPointLevel_.insert(pointi, pointLevel_[pointi]);
     }
 
     savedCellLevel_.resize(2*cellsToStore.size());
@@ -4410,24 +4410,24 @@ void Foam::hexRef8::updateMesh
 
             labelList newPointLevel(pointMap.size());
 
-            forAll(pointMap, newPointI)
+            forAll(pointMap, newPointi)
             {
-                label oldPointI = pointMap[newPointI];
+                label oldPointi = pointMap[newPointi];
 
-                if (oldPointI == -1)
+                if (oldPointi == -1)
                 {
                     //FatalErrorInFunction
-                    //    << "Problem : point " << newPointI
-                    //    << " at " << mesh_.points()[newPointI]
+                    //    << "Problem : point " << newPointi
+                    //    << " at " << mesh_.points()[newPointi]
                     //    << " does not originate from another point"
                     //    << " (i.e. is inflated)." << nl
                     //    << "Hence we cannot determine the new pointLevel"
                     //    << " for it." << abort(FatalError);
-                    newPointLevel[newPointI] = -1;
+                    newPointLevel[newPointi] = -1;
                 }
                 else
                 {
-                    newPointLevel[newPointI] = pointLevel_[oldPointI];
+                    newPointLevel[newPointi] = pointLevel_[oldPointi];
                 }
             }
             pointLevel_.transfer(newPointLevel);
@@ -4437,21 +4437,21 @@ void Foam::hexRef8::updateMesh
         // the corresponding old point (the one from the call to storeData)
         forAllConstIter(Map<label>, pointsToRestore, iter)
         {
-            label newPointI = iter.key();
-            label storedPointI = iter();
+            label newPointi = iter.key();
+            label storedPointi = iter();
 
-            Map<label>::iterator fnd = savedPointLevel_.find(storedPointI);
+            Map<label>::iterator fnd = savedPointLevel_.find(storedPointi);
 
             if (fnd == savedPointLevel_.end())
             {
                 FatalErrorInFunction
                     << "Problem : trying to restore old value for new point "
-                    << newPointI << " but cannot find old point "
-                    << storedPointI
+                    << newPointi << " but cannot find old point "
+                    << storedPointi
                     << " in map of stored values " << savedPointLevel_
                     << abort(FatalError);
             }
-            pointLevel_[newPointI] = fnd();
+            pointLevel_[newPointi] = fnd();
         }
 
         //if (findIndex(pointLevel_, -1) != -1)
@@ -4534,9 +4534,9 @@ void Foam::hexRef8::subset
     {
         labelList newPointLevel(pointMap.size());
 
-        forAll(pointMap, newPointI)
+        forAll(pointMap, newPointi)
         {
-            newPointLevel[newPointI] = pointLevel_[pointMap[newPointI]];
+            newPointLevel[newPointi] = pointLevel_[pointMap[newPointi]];
         }
 
         pointLevel_.transfer(newPointLevel);
@@ -4915,17 +4915,17 @@ void Foam::hexRef8::checkRefinementLevels
         );
 
 
-        forAll(syncPointLevel, pointI)
+        forAll(syncPointLevel, pointi)
         {
-            if (pointLevel_[pointI] != syncPointLevel[pointI])
+            if (pointLevel_[pointi] != syncPointLevel[pointi])
             {
                 FatalErrorInFunction
                     << "PointLevel is not consistent across coupled patches."
                     << endl
-                    << "point:" << pointI << " coord:" << mesh_.points()[pointI]
-                    << " has level " << pointLevel_[pointI]
+                    << "point:" << pointi << " coord:" << mesh_.points()[pointi]
+                    << " has level " << pointLevel_[pointi]
                     << " whereas the coupled point has level "
-                    << syncPointLevel[pointI]
+                    << syncPointLevel[pointi]
                     << abort(FatalError);
             }
         }
@@ -4938,11 +4938,11 @@ void Foam::hexRef8::checkRefinementLevels
         // Determine per point the max cell level.
         labelList maxPointLevel(mesh_.nPoints(), 0);
 
-        forAll(maxPointLevel, pointI)
+        forAll(maxPointLevel, pointi)
         {
-            const labelList& pCells = mesh_.pointCells(pointI);
+            const labelList& pCells = mesh_.pointCells(pointi);
 
-            label& pLevel = maxPointLevel[pointI];
+            label& pLevel = maxPointLevel[pointi];
 
             forAll(pCells, i)
             {
@@ -4962,9 +4962,9 @@ void Foam::hexRef8::checkRefinementLevels
         // Check 2:1 across boundary points
         forAll(pointsToCheck, i)
         {
-            label pointI = pointsToCheck[i];
+            label pointi = pointsToCheck[i];
 
-            const labelList& pCells = mesh_.pointCells(pointI);
+            const labelList& pCells = mesh_.pointCells(pointi);
 
             forAll(pCells, i)
             {
@@ -4972,7 +4972,7 @@ void Foam::hexRef8::checkRefinementLevels
 
                 if
                 (
-                    mag(cellLevel_[celli]-maxPointLevel[pointI])
+                    mag(cellLevel_[celli]-maxPointLevel[pointi])
                   > maxPointDiff
                 )
                 {
@@ -4983,10 +4983,10 @@ void Foam::hexRef8::checkRefinementLevels
                         << " point-connected cells." << nl
                         << "cell:" << celli
                         << " cellLevel:" << cellLevel_[celli]
-                        << " uses point:" << pointI
-                        << " coord:" << mesh_.points()[pointI]
+                        << " uses point:" << pointi
+                        << " coord:" << mesh_.points()[pointi]
                         << " which is also used by a cell with level:"
-                        << maxPointLevel[pointI]
+                        << maxPointLevel[pointi]
                         << abort(FatalError);
                 }
             }
@@ -5011,13 +5011,13 @@ void Foam::hexRef8::checkRefinementLevels
     //
     //        forAll(meshPoints, i)
     //        {
-    //            label pointI = meshPoints[i];
+    //            label pointi = meshPoints[i];
     //
-    //            const labelList& pEdges = mesh_.pointEdges()[pointI];
+    //            const labelList& pEdges = mesh_.pointEdges()[pointi];
     //
     //            if (pEdges.size() == 2)
     //            {
-    //                isHangingPoint[pointI] = true;
+    //                isHangingPoint[pointi] = true;
     //            }
     //        }
     //    }
@@ -5035,16 +5035,16 @@ void Foam::hexRef8::checkRefinementLevels
     //
     //    label nHanging = 0;
     //
-    //    forAll(isHangingPoint, pointI)
+    //    forAll(isHangingPoint, pointi)
     //    {
-    //        if (isHangingPoint[pointI])
+    //        if (isHangingPoint[pointi])
     //        {
     //            nHanging++;
     //
-    //            Pout<< "Hanging boundary point " << pointI
-    //                << " at " << mesh_.points()[pointI]
+    //            Pout<< "Hanging boundary point " << pointi
+    //                << " at " << mesh_.points()[pointi]
     //                << endl;
-    //            //meshTools::writeOBJ(str, mesh_.points()[pointI]);
+    //            //meshTools::writeOBJ(str, mesh_.points()[pointi]);
     //        }
     //    }
     //
@@ -5150,13 +5150,13 @@ Foam::labelList Foam::hexRef8::getSplitPoints() const
     // Unmark all with not 8 cells
     //const labelListList& pointCells = mesh_.pointCells();
 
-    for (label pointI = 0; pointI < mesh_.nPoints(); pointI++)
+    for (label pointi = 0; pointi < mesh_.nPoints(); pointi++)
     {
-        const labelList& pCells = mesh_.pointCells(pointI);
+        const labelList& pCells = mesh_.pointCells(pointi);
 
         if (pCells.size() != 8)
         {
-            splitMaster[pointI] = -2;
+            splitMaster[pointi] = -2;
         }
     }
 
@@ -5174,9 +5174,9 @@ Foam::labelList Foam::hexRef8::getSplitPoints() const
             // Check same master.
             forAll(cPoints, i)
             {
-                label pointI = cPoints[i];
+                label pointi = cPoints[i];
 
-                label masterCelli = splitMaster[pointI];
+                label masterCelli = splitMaster[pointi];
 
                 if (masterCelli == -1)
                 {
@@ -5185,8 +5185,8 @@ Foam::labelList Foam::hexRef8::getSplitPoints() const
                     // is additional guarantee that we're referring to the
                     // same master at the same refinement level.
 
-                    splitMaster[pointI] = parentIndex;
-                    splitMasterLevel[pointI] = cellLevel_[celli] - 1;
+                    splitMaster[pointi] = parentIndex;
+                    splitMasterLevel[pointi] = cellLevel_[celli] - 1;
                 }
                 else if (masterCelli == -2)
                 {
@@ -5195,12 +5195,12 @@ Foam::labelList Foam::hexRef8::getSplitPoints() const
                 else if
                 (
                     (masterCelli != parentIndex)
-                 || (splitMasterLevel[pointI] != cellLevel_[celli] - 1)
+                 || (splitMasterLevel[pointi] != cellLevel_[celli] - 1)
                 )
                 {
                     // Different masters so point is on two refinement
                     // patterns
-                    splitMaster[pointI] = -2;
+                    splitMaster[pointi] = -2;
                 }
             }
         }
@@ -5209,9 +5209,9 @@ Foam::labelList Foam::hexRef8::getSplitPoints() const
             // Either not visible or is unrefined cell
             forAll(cPoints, i)
             {
-                label pointI = cPoints[i];
+                label pointi = cPoints[i];
 
-                splitMaster[pointI] = -2;
+                splitMaster[pointi] = -2;
             }
         }
     }
@@ -5237,9 +5237,9 @@ Foam::labelList Foam::hexRef8::getSplitPoints() const
 
     label nSplitPoints = 0;
 
-    forAll(splitMaster, pointI)
+    forAll(splitMaster, pointi)
     {
-        if (splitMaster[pointI] >= 0)
+        if (splitMaster[pointi] >= 0)
         {
             nSplitPoints++;
         }
@@ -5248,11 +5248,11 @@ Foam::labelList Foam::hexRef8::getSplitPoints() const
     labelList splitPoints(nSplitPoints);
     nSplitPoints = 0;
 
-    forAll(splitMaster, pointI)
+    forAll(splitMaster, pointi)
     {
-        if (splitMaster[pointI] >= 0)
+        if (splitMaster[pointi] >= 0)
         {
-            splitPoints[nSplitPoints++] = pointI;
+            splitPoints[nSplitPoints++] = pointi;
         }
     }
 
@@ -5351,9 +5351,9 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
 
     forAll(pointsToUnrefine, i)
     {
-        label pointI = pointsToUnrefine[i];
+        label pointi = pointsToUnrefine[i];
 
-        unrefinePoint.set(pointI);
+        unrefinePoint.set(pointi);
     }
 
 
@@ -5364,11 +5364,11 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
 
         PackedBoolList unrefineCell(mesh_.nCells());
 
-        forAll(unrefinePoint, pointI)
+        forAll(unrefinePoint, pointi)
         {
-            if (unrefinePoint.get(pointI))
+            if (unrefinePoint.get(pointi))
             {
-                const labelList& pCells = mesh_.pointCells(pointI);
+                const labelList& pCells = mesh_.pointCells(pointi);
 
                 forAll(pCells, j)
                 {
@@ -5511,17 +5511,17 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         // Knock out any point whose cell neighbour cannot be unrefined.
-        forAll(unrefinePoint, pointI)
+        forAll(unrefinePoint, pointi)
         {
-            if (unrefinePoint.get(pointI))
+            if (unrefinePoint.get(pointi))
             {
-                const labelList& pCells = mesh_.pointCells(pointI);
+                const labelList& pCells = mesh_.pointCells(pointi);
 
                 forAll(pCells, j)
                 {
                     if (!unrefineCell.get(pCells[j]))
                     {
-                        unrefinePoint.unset(pointI);
+                        unrefinePoint.unset(pointi);
                         break;
                     }
                 }
@@ -5533,9 +5533,9 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
     // Convert back to labelList.
     label nSet = 0;
 
-    forAll(unrefinePoint, pointI)
+    forAll(unrefinePoint, pointi)
     {
-        if (unrefinePoint.get(pointI))
+        if (unrefinePoint.get(pointi))
         {
             nSet++;
         }
@@ -5544,11 +5544,11 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
     labelList newPointsToUnrefine(nSet);
     nSet = 0;
 
-    forAll(unrefinePoint, pointI)
+    forAll(unrefinePoint, pointi)
     {
-        if (unrefinePoint.get(pointI))
+        if (unrefinePoint.get(pointi))
         {
-            newPointsToUnrefine[nSet++] = pointI;
+            newPointsToUnrefine[nSet++] = pointi;
         }
     }
 
@@ -5656,17 +5656,17 @@ void Foam::hexRef8::setUnrefinement
 
     forAll(splitPointLabels, i)
     {
-        label pointI = splitPointLabels[i];
+        label pointi = splitPointLabels[i];
 
         // Get original cell label
 
-        const labelList& pCells = mesh_.pointCells(pointI);
+        const labelList& pCells = mesh_.pointCells(pointi);
 
         // Check
         if (pCells.size() != 8)
         {
             FatalErrorInFunction
-                << "splitPoint " << pointI
+                << "splitPoint " << pointi
                 << " should have 8 cells using it. It has " << pCells
                 << abort(FatalError);
         }
@@ -5690,7 +5690,7 @@ void Foam::hexRef8::setUnrefinement
                         << "Ininitial set of split points to unrefine does not"
                         << " seem to be consistent or not mid points"
                         << " of refined cells" << nl
-                        << "cell:" << celli << " on splitPoint " << pointI
+                        << "cell:" << celli << " on splitPoint " << pointi
                         << " has no region to be merged into"
                         << abort(FatalError);
                 }
@@ -5698,7 +5698,7 @@ void Foam::hexRef8::setUnrefinement
                 if (masterCelli != cellRegionMaster[region])
                 {
                     FatalErrorInFunction
-                        << "cell:" << celli << " on splitPoint:" << pointI
+                        << "cell:" << celli << " on splitPoint:" << pointi
                         << " in region " << region
                         << " has master:" << cellRegionMaster[region]
                         << " which is not the lowest numbered cell"
@@ -5724,9 +5724,9 @@ void Foam::hexRef8::setUnrefinement
     // either get removed or stay at the same position.
     forAll(splitPointLabels, i)
     {
-        label pointI = splitPointLabels[i];
+        label pointi = splitPointLabels[i];
 
-        const labelList& pCells = mesh_.pointCells(pointI);
+        const labelList& pCells = mesh_.pointCells(pointi);
 
         label masterCelli = min(pCells);
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index 1e236e61eb..09694f7a41 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -129,7 +129,7 @@ class hexRef8
         (
             polyTopoChange& meshMod,
             const label meshFacei,
-            const label meshPointI,
+            const label meshPointi,
             const face& newFace,
             const label own,
             const label nei
@@ -155,17 +155,17 @@ class hexRef8
             const labelListList& cellAddedCells,
             const label celli,
             const label facei,
-            const label pointI
+            const label pointi
         ) const;
 
-        //- Get new owner and neighbour (in unspecified order) of pointI
+        //- Get new owner and neighbour (in unspecified order) of pointi
         //  on facei.
         void getFaceNeighbours
         (
             const labelListList& cellAnchorPoints,
             const labelListList& cellAddedCells,
             const label facei,
-            const label pointI,
+            const label pointi,
 
             label& own,
             label& nei
@@ -235,9 +235,9 @@ class hexRef8
             const label celli,
             const label facei,
             const bool faceOrder,
-            const label midPointI,
-            const label anchorPointI,
-            const label faceMidPointI,
+            const label midPointi,
+            const label anchorPointi,
+            const label faceMidPointi,
 
             Map<edge>& midPointToAnchors,
             Map<edge>& midPointToFaceMids,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapse.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapse.H
index 83ac672b33..e9cc990c29 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapse.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapse.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ public:
             inline void leaveDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -131,7 +131,7 @@ public:
             inline void enterDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -149,7 +149,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const label edgeI,
                 const pointEdgeCollapse& edgeInfo,
                 const scalar tol,
@@ -162,7 +162,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const pointEdgeCollapse& newPointInfo,
                 const scalar tol,
                 TrackingData& td
@@ -184,7 +184,7 @@ public:
             (
                 const polyMesh& mesh,
                 const label edgeI,
-                const label pointI,
+                const label pointi,
                 const pointEdgeCollapse& pointInfo,
                 const scalar tol,
                 TrackingData& td
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
index f97b9bcdbc..65aa81fac3 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -170,7 +170,7 @@ template<class TrackingData>
 inline void Foam::pointEdgeCollapse::leaveDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -196,7 +196,7 @@ template<class TrackingData>
 inline void Foam::pointEdgeCollapse::enterDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -211,7 +211,7 @@ template<class TrackingData>
 inline bool Foam::pointEdgeCollapse::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const label edgeI,
     const pointEdgeCollapse& edgeInfo,
     const scalar tol,
@@ -227,7 +227,7 @@ template<class TrackingData>
 inline bool Foam::pointEdgeCollapse::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const pointEdgeCollapse& newPointInfo,
     const scalar tol,
     TrackingData& td
@@ -256,7 +256,7 @@ inline bool Foam::pointEdgeCollapse::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
-    const label pointI,
+    const label pointi,
     const pointEdgeCollapse& pointInfo,
     const scalar tol,
     TrackingData& td
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index b57e6f3203..e6e9ab2a72 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -931,26 +931,26 @@ void Foam::polyTopoChange::compact
     label nActivePoints = 0;
     {
         labelList localPointMap(points_.size(), -1);
-        label newPointI = 0;
+        label newPointi = 0;
 
         if (!orderPoints)
         {
             nInternalPoints = -1;
 
-            forAll(points_, pointI)
+            forAll(points_, pointi)
             {
-                if (!pointRemoved(pointI) && !retiredPoints_.found(pointI))
+                if (!pointRemoved(pointi) && !retiredPoints_.found(pointi))
                 {
-                    localPointMap[pointI] = newPointI++;
+                    localPointMap[pointi] = newPointi++;
                 }
             }
-            nActivePoints = newPointI;
+            nActivePoints = newPointi;
         }
         else
         {
-            forAll(points_, pointI)
+            forAll(points_, pointi)
             {
-                if (!pointRemoved(pointI) && !retiredPoints_.found(pointI))
+                if (!pointRemoved(pointi) && !retiredPoints_.found(pointi))
                 {
                     nActivePoints++;
                 }
@@ -971,42 +971,42 @@ void Foam::polyTopoChange::compact
 
                     forAll(f, fp)
                     {
-                        label pointI = f[fp];
+                        label pointi = f[fp];
 
-                        if (localPointMap[pointI] == -1)
+                        if (localPointMap[pointi] == -1)
                         {
                             if
                             (
-                                pointRemoved(pointI)
-                             || retiredPoints_.found(pointI)
+                                pointRemoved(pointi)
+                             || retiredPoints_.found(pointi)
                             )
                             {
                                 FatalErrorInFunction
-                                    << "Removed or retired point " << pointI
+                                    << "Removed or retired point " << pointi
                                     << " in face " << f
                                     << " at position " << facei << endl
                                     << "Probably face has not been adapted for"
                                     << " removed points." << abort(FatalError);
                             }
-                            localPointMap[pointI] = newPointI++;
+                            localPointMap[pointi] = newPointi++;
                         }
                     }
                 }
             }
 
-            label nBoundaryPoints = newPointI;
+            label nBoundaryPoints = newPointi;
             nInternalPoints = nActivePoints - nBoundaryPoints;
 
             // Move the boundary addressing up
-            forAll(localPointMap, pointI)
+            forAll(localPointMap, pointi)
             {
-                if (localPointMap[pointI] != -1)
+                if (localPointMap[pointi] != -1)
                 {
-                    localPointMap[pointI] += nInternalPoints;
+                    localPointMap[pointi] += nInternalPoints;
                 }
             }
 
-            newPointI = 0;
+            newPointi = 0;
 
             // Mark internal points
             forAll(faceOwner_, facei)
@@ -1023,55 +1023,55 @@ void Foam::polyTopoChange::compact
 
                     forAll(f, fp)
                     {
-                        label pointI = f[fp];
+                        label pointi = f[fp];
 
-                        if (localPointMap[pointI] == -1)
+                        if (localPointMap[pointi] == -1)
                         {
                             if
                             (
-                                pointRemoved(pointI)
-                             || retiredPoints_.found(pointI)
+                                pointRemoved(pointi)
+                             || retiredPoints_.found(pointi)
                             )
                             {
                                 FatalErrorInFunction
-                                    << "Removed or retired point " << pointI
+                                    << "Removed or retired point " << pointi
                                     << " in face " << f
                                     << " at position " << facei << endl
                                     << "Probably face has not been adapted for"
                                     << " removed points." << abort(FatalError);
                             }
-                            localPointMap[pointI] = newPointI++;
+                            localPointMap[pointi] = newPointi++;
                         }
                     }
                 }
             }
 
-            if (newPointI != nInternalPoints)
+            if (newPointi != nInternalPoints)
             {
                 FatalErrorInFunction
                     << "Problem." << abort(FatalError);
             }
-            newPointI = nActivePoints;
+            newPointi = nActivePoints;
         }
 
         forAllConstIter(labelHashSet, retiredPoints_, iter)
         {
-            localPointMap[iter.key()] = newPointI++;
+            localPointMap[iter.key()] = newPointi++;
         }
 
 
         if (debug)
         {
             Pout<< "Points : active:" << nActivePoints
-                << "  removed:" << points_.size()-newPointI << endl;
+                << "  removed:" << points_.size()-newPointi << endl;
         }
 
         reorder(localPointMap, points_);
-        points_.setCapacity(newPointI);
+        points_.setCapacity(newPointi);
 
         // Update pointMaps
         reorder(localPointMap, pointMap_);
-        pointMap_.setCapacity(newPointI);
+        pointMap_.setCapacity(newPointi);
         renumberReverseMap(localPointMap, reversePointMap_);
 
         renumberKey(localPointMap, pointZone_);
@@ -1887,28 +1887,28 @@ void Foam::polyTopoChange::calcFaceZonePointMap
 
         curFzPointRnb.setSize(newZoneMeshPoints.size());
 
-        forAll(newZoneMeshPoints, pointI)
+        forAll(newZoneMeshPoints, pointi)
         {
-            if (newZoneMeshPoints[pointI] < pointMap_.size())
+            if (newZoneMeshPoints[pointi] < pointMap_.size())
             {
                 Map<label>::const_iterator ozmpmIter =
                     oldZoneMeshPointMap.find
                     (
-                        pointMap_[newZoneMeshPoints[pointI]]
+                        pointMap_[newZoneMeshPoints[pointi]]
                     );
 
                 if (ozmpmIter != oldZoneMeshPointMap.end())
                 {
-                    curFzPointRnb[pointI] = ozmpmIter();
+                    curFzPointRnb[pointi] = ozmpmIter();
                 }
                 else
                 {
-                    curFzPointRnb[pointI] = -1;
+                    curFzPointRnb[pointi] = -1;
                 }
             }
             else
             {
-                curFzPointRnb[pointI] = -1;
+                curFzPointRnb[pointi] = -1;
             }
         }
     }
@@ -2314,13 +2314,13 @@ void Foam::polyTopoChange::addMesh
         }
 
         // Add points in mesh order
-        for (label pointI = 0; pointI < mesh.nPoints(); pointI++)
+        for (label pointi = 0; pointi < mesh.nPoints(); pointi++)
         {
             addPoint
             (
-                points[pointI],
-                pointI,
-                newZoneID[pointI],
+                points[pointi],
+                pointi,
+                newZoneID[pointi],
                 true
             );
         }
@@ -2648,50 +2648,50 @@ Foam::label Foam::polyTopoChange::addPoint
     const bool inCell
 )
 {
-    label pointI = points_.size();
+    label pointi = points_.size();
 
     points_.append(pt);
     pointMap_.append(masterPointID);
-    reversePointMap_.append(pointI);
+    reversePointMap_.append(pointi);
 
     if (zoneID >= 0)
     {
-        pointZone_.insert(pointI, zoneID);
+        pointZone_.insert(pointi, zoneID);
     }
 
     if (!inCell)
     {
-        retiredPoints_.insert(pointI);
+        retiredPoints_.insert(pointi);
     }
 
-    return pointI;
+    return pointi;
 }
 
 
 void Foam::polyTopoChange::modifyPoint
 (
-    const label pointI,
+    const label pointi,
     const point& pt,
     const label newZoneID,
     const bool inCell
 )
 {
-    if (pointI < 0 || pointI >= points_.size())
+    if (pointi < 0 || pointi >= points_.size())
     {
         FatalErrorInFunction
-            << "illegal point label " << pointI << endl
+            << "illegal point label " << pointi << endl
             << "Valid point labels are 0 .. " << points_.size()-1
             << abort(FatalError);
     }
-    if (pointRemoved(pointI) || pointMap_[pointI] == -1)
+    if (pointRemoved(pointi) || pointMap_[pointi] == -1)
     {
         FatalErrorInFunction
-            << "point " << pointI << " already marked for removal"
+            << "point " << pointi << " already marked for removal"
             << abort(FatalError);
     }
-    points_[pointI] = pt;
+    points_[pointi] = pt;
 
-    Map<label>::iterator pointFnd = pointZone_.find(pointI);
+    Map<label>::iterator pointFnd = pointZone_.find(pointi);
 
     if (pointFnd != pointZone_.end())
     {
@@ -2706,16 +2706,16 @@ void Foam::polyTopoChange::modifyPoint
     }
     else if (newZoneID >= 0)
     {
-        pointZone_.insert(pointI, newZoneID);
+        pointZone_.insert(pointi, newZoneID);
     }
 
     if (inCell)
     {
-        retiredPoints_.erase(pointI);
+        retiredPoints_.erase(pointi);
     }
     else
     {
-        retiredPoints_.insert(pointI);
+        retiredPoints_.insert(pointi);
     }
 }
 
@@ -2731,23 +2731,23 @@ void Foam::polyTopoChange::movePoints(const pointField& newPoints)
             << abort(FatalError);
     }
 
-    forAll(points_, pointI)
+    forAll(points_, pointi)
     {
-        points_[pointI] = newPoints[pointI];
+        points_[pointi] = newPoints[pointi];
     }
 }
 
 
 void Foam::polyTopoChange::removePoint
 (
-    const label pointI,
-    const label mergePointI
+    const label pointi,
+    const label mergePointi
 )
 {
-    if (pointI < 0 || pointI >= points_.size())
+    if (pointi < 0 || pointi >= points_.size())
     {
         FatalErrorInFunction
-            << "illegal point label " << pointI << endl
+            << "illegal point label " << pointi << endl
             << "Valid point labels are 0 .. " << points_.size()-1
             << abort(FatalError);
     }
@@ -2755,34 +2755,34 @@ void Foam::polyTopoChange::removePoint
     if
     (
         strict_
-     && (pointRemoved(pointI) || pointMap_[pointI] == -1)
+     && (pointRemoved(pointi) || pointMap_[pointi] == -1)
     )
     {
         FatalErrorInFunction
-            << "point " << pointI << " already marked for removal" << nl
-            << "Point:" << points_[pointI] << " pointMap:" << pointMap_[pointI]
+            << "point " << pointi << " already marked for removal" << nl
+            << "Point:" << points_[pointi] << " pointMap:" << pointMap_[pointi]
             << abort(FatalError);
     }
 
-    if (pointI == mergePointI)
+    if (pointi == mergePointi)
     {
         FatalErrorInFunction
-            << "Cannot remove/merge point " << pointI << " onto itself."
+            << "Cannot remove/merge point " << pointi << " onto itself."
             << abort(FatalError);
     }
 
-    points_[pointI] = point::max;
-    pointMap_[pointI] = -1;
-    if (mergePointI >= 0)
+    points_[pointi] = point::max;
+    pointMap_[pointi] = -1;
+    if (mergePointi >= 0)
     {
-        reversePointMap_[pointI] = -mergePointI-2;
+        reversePointMap_[pointi] = -mergePointi-2;
     }
     else
     {
-        reversePointMap_[pointI] = -1;
+        reversePointMap_[pointi] = -1;
     }
-    pointZone_.erase(pointI);
-    retiredPoints_.erase(pointI);
+    pointZone_.erase(pointi);
+    retiredPoints_.erase(pointi);
 }
 
 
@@ -3107,17 +3107,17 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
         // (appended points (i.e. from nowhere) get value zero)
         pointField renumberedMeshPoints(newPoints.size());
 
-        forAll(pointMap_, newPointI)
+        forAll(pointMap_, newPointi)
         {
-            label oldPointI = pointMap_[newPointI];
+            label oldPointi = pointMap_[newPointi];
 
-            if (oldPointI >= 0)
+            if (oldPointi >= 0)
             {
-                renumberedMeshPoints[newPointI] = mesh.points()[oldPointI];
+                renumberedMeshPoints[newPointi] = mesh.points()[oldPointi];
             }
             else
             {
-                renumberedMeshPoints[newPointI] = Zero;
+                renumberedMeshPoints[newPointi] = Zero;
             }
         }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
index b61554e8d8..e97c6ef7db 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
@@ -252,7 +252,7 @@ class polyTopoChange
             const label facei,
             const label own,
             const label nei,
-            const label patchI,
+            const label patchi,
             const label zoneI
         ) const;
 
@@ -445,7 +445,7 @@ public:
             }
 
             //- Is point removed?
-            inline bool pointRemoved(const label pointI) const;
+            inline bool pointRemoved(const label pointi) const;
 
             //- Is face removed?
             inline bool faceRemoved(const label facei) const;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
index fb531c93e3..f8347b8846 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
@@ -27,9 +27,9 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-inline bool Foam::polyTopoChange::pointRemoved(const label pointI) const
+inline bool Foam::polyTopoChange::pointRemoved(const label pointi) const
 {
-    const point& pt = points_[pointI];
+    const point& pt = points_[pointi];
 
     return
         pt.x() > 0.5*vector::max.x()
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
index 2042adcb0a..d46ae0f246 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
@@ -459,20 +459,20 @@ void Foam::removeCells::setRefinement
     // Remove points that are no longer used.
     // Loop rewritten to not use pointFaces.
 
-    forAll(nFacesUsingPoint, pointI)
+    forAll(nFacesUsingPoint, pointi)
     {
-        if (nFacesUsingPoint[pointI] == 0)
+        if (nFacesUsingPoint[pointi] == 0)
         {
-            //Pout<< "Removing unused point " << pointI
-            //    << " at:" << mesh_.points()[pointI] << endl;
+            //Pout<< "Removing unused point " << pointi
+            //    << " at:" << mesh_.points()[pointi] << endl;
 
-            meshMod.setAction(polyRemovePoint(pointI));
+            meshMod.setAction(polyRemovePoint(pointi));
         }
-        else if (nFacesUsingPoint[pointI] == 1)
+        else if (nFacesUsingPoint[pointi] == 1)
         {
             WarningInFunction
-                << "point " << pointI << " at coordinate "
-                << mesh_.points()[pointI]
+                << "point " << pointi << " at coordinate "
+                << mesh_.points()[pointi]
                 << " is only used by 1 face after removing cells."
                 << " This probably results in an illegal mesh."
                 << endl;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
index e38d1d0012..212620862e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
@@ -183,9 +183,9 @@ Foam::boolList Foam::removeFaces::getFacesAffected
     // Mark faces affected by removal of points
     forAllConstIter(labelHashSet, pointsToRemove, iter)
     {
-        label pointI = iter.key();
+        label pointi = iter.key();
 
-        const labelList& pFaces = mesh_.pointFaces()[pointI];
+        const labelList& pFaces = mesh_.pointFaces()[pointi];
 
         forAll(pFaces, pFacei)
         {
@@ -350,16 +350,16 @@ void Foam::removeFaces::mergeFaces
 
     forAll(edgeLoop, i)
     {
-        label pointI = fp.meshPoints()[edgeLoop[i]];
+        label pointi = fp.meshPoints()[edgeLoop[i]];
 
-        if (pointsToRemove.found(pointI))
+        if (pointsToRemove.found(pointi))
         {
-            //Pout<< "**Removing point " << pointI << " from "
+            //Pout<< "**Removing point " << pointi << " from "
             //    << edgeLoop << endl;
         }
         else
         {
-            faceVerts.append(pointI);
+            faceVerts.append(pointi);
         }
     }
 
@@ -1255,9 +1255,9 @@ void Foam::removeFaces::setRefinement
 
         const labelListList& pointEdges = mesh_.pointEdges();
 
-        forAll(pointEdges, pointI)
+        forAll(pointEdges, pointi)
         {
-            nEdgesPerPoint[pointI] = pointEdges[pointI].size();
+            nEdgesPerPoint[pointi] = pointEdges[pointi].size();
         }
 
         forAllConstIter(labelHashSet, edgesToRemove, iter)
@@ -1272,14 +1272,14 @@ void Foam::removeFaces::setRefinement
         }
 
         // Check locally (before synchronizing) for strangeness
-        forAll(nEdgesPerPoint, pointI)
+        forAll(nEdgesPerPoint, pointi)
         {
-            if (nEdgesPerPoint[pointI] == 1)
+            if (nEdgesPerPoint[pointi] == 1)
             {
                 FatalErrorInFunction
                     << "Problem : point would get 1 edge using it only."
-                    << " pointI:" << pointI
-                    << " coord:" << mesh_.points()[pointI]
+                    << " pointi:" << pointi
+                    << " coord:" << mesh_.points()[pointi]
                     << abort(FatalError);
             }
         }
@@ -1294,20 +1294,20 @@ void Foam::removeFaces::setRefinement
             labelMin
         );
 
-        forAll(nEdgesPerPoint, pointI)
+        forAll(nEdgesPerPoint, pointi)
         {
-            if (nEdgesPerPoint[pointI] == 0)
+            if (nEdgesPerPoint[pointi] == 0)
             {
-                pointsToRemove.insert(pointI);
+                pointsToRemove.insert(pointi);
             }
-            else if (nEdgesPerPoint[pointI] == 1)
+            else if (nEdgesPerPoint[pointi] == 1)
             {
                 // Already checked before
             }
-            else if (nEdgesPerPoint[pointI] == 2)
+            else if (nEdgesPerPoint[pointi] == 2)
             {
                 // Remove point and merge edges.
-                pointsToRemove.insert(pointI);
+                pointsToRemove.insert(pointi);
             }
         }
     }
@@ -1376,9 +1376,9 @@ void Foam::removeFaces::setRefinement
     // Remove points.
     forAllConstIter(labelHashSet, pointsToRemove, iter)
     {
-        label pointI = iter.key();
+        label pointi = iter.key();
 
-        meshMod.setAction(polyRemovePoint(pointI, -1));
+        meshMod.setAction(polyRemovePoint(pointi, -1));
     }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index ae9589d6f0..d5a3c44600 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -84,7 +84,7 @@ void Foam::removePoints::modifyFace
 ) const
 {
     // Get other face data.
-    label patchI = -1;
+    label patchi = -1;
     label owner = mesh_.faceOwner()[facei];
     label neighbour = -1;
 
@@ -94,7 +94,7 @@ void Foam::removePoints::modifyFace
     }
     else
     {
-        patchI = mesh_.boundaryMesh().whichPatch(facei);
+        patchi = mesh_.boundaryMesh().whichPatch(facei);
     }
 
     label zoneID = mesh_.faceZones().whichZone(facei);
@@ -117,7 +117,7 @@ void Foam::removePoints::modifyFace
             owner,          // owner
             neighbour,      // neighbour
             false,          // face flip
-            patchI,         // patch for face
+            patchi,         // patch for face
             false,          // remove from zone
             zoneID,         // zone for face
             zoneFlip        // face flip in zone
@@ -162,31 +162,31 @@ Foam::label Foam::removePoints::countPointUsage
 
         forAll(e, eI)
         {
-            label pointI = e[eI];
+            label pointi = e[eI];
 
-            if (edge0[pointI] == -2)
+            if (edge0[pointi] == -2)
             {
                 // Already too many edges
             }
-            else if (edge0[pointI] == -1)
+            else if (edge0[pointi] == -1)
             {
                 // Store first edge using point
-                edge0[pointI] = edgeI;
+                edge0[pointi] = edgeI;
             }
             else
             {
                 // Already one edge using point. Check second container.
 
-                if (edge1[pointI] == -1)
+                if (edge1[pointi] == -1)
                 {
                     // Store second edge using point
-                    edge1[pointI] = edgeI;
+                    edge1[pointi] = edgeI;
                 }
                 else
                 {
                     // Third edge using point. Mark.
-                    edge0[pointI] = -2;
-                    edge1[pointI] = -2;
+                    edge0[pointi] = -2;
+                    edge1[pointi] = -2;
                 }
             }
         }
@@ -200,14 +200,14 @@ Foam::label Foam::removePoints::countPointUsage
     pointCanBeDeleted = false;
     //label nDeleted = 0;
 
-    forAll(edge0, pointI)
+    forAll(edge0, pointi)
     {
-        if (edge0[pointI] >= 0 && edge1[pointI] >= 0)
+        if (edge0[pointi] >= 0 && edge1[pointi] >= 0)
         {
             // Point used by two edges exactly
 
-            const edge& e0 = edges[edge0[pointI]];
-            const edge& e1 = edges[edge1[pointI]];
+            const edge& e0 = edges[edge0[pointi]];
+            const edge& e1 = edges[edge1[pointi]];
 
             label common = e0.commonVertex(e1);
             label vLeft = e0.otherVertex(common);
@@ -221,14 +221,14 @@ Foam::label Foam::removePoints::countPointUsage
 
             if ((e0Vec & e1Vec) > minCos)
             {
-                pointCanBeDeleted[pointI] = true;
+                pointCanBeDeleted[pointi] = true;
                 //nDeleted++;
             }
         }
-        else if (edge0[pointI] == -1)
+        else if (edge0[pointi] == -1)
         {
             // point not used at all
-            pointCanBeDeleted[pointI] = true;
+            pointCanBeDeleted[pointi] = true;
             //nDeleted++;
         }
     }
@@ -280,9 +280,9 @@ Foam::label Foam::removePoints::countPointUsage
     );
 
     label nDeleted = 0;
-    forAll(pointCanBeDeleted, pointI)
+    forAll(pointCanBeDeleted, pointi)
     {
-        if (pointCanBeDeleted[pointI])
+        if (pointCanBeDeleted[pointi])
         {
             nDeleted++;
         }
@@ -300,9 +300,9 @@ void Foam::removePoints::setRefinement
 {
     // Count deleted points
     label nDeleted = 0;
-    forAll(pointCanBeDeleted, pointI)
+    forAll(pointCanBeDeleted, pointi)
     {
-        if (pointCanBeDeleted[pointI])
+        if (pointCanBeDeleted[pointi])
         {
             nDeleted++;
         }
@@ -329,19 +329,19 @@ void Foam::removePoints::setRefinement
 
     nDeleted = 0;
 
-    forAll(pointCanBeDeleted, pointI)
+    forAll(pointCanBeDeleted, pointi)
     {
-        if (pointCanBeDeleted[pointI])
+        if (pointCanBeDeleted[pointi])
         {
             if (undoable_)
             {
-                pointToSaved.insert(pointI, nDeleted);
-                savedPoints_[nDeleted++] = mesh_.points()[pointI];
+                pointToSaved.insert(pointi, nDeleted);
+                savedPoints_[nDeleted++] = mesh_.points()[pointi];
             }
-            meshMod.setAction(polyRemovePoint(pointI));
+            meshMod.setAction(polyRemovePoint(pointi));
 
             // Store faces affected
-            const labelList& pFaces = mesh_.pointFaces()[pointI];
+            const labelList& pFaces = mesh_.pointFaces()[pointi];
 
             forAll(pFaces, i)
             {
@@ -375,11 +375,11 @@ void Foam::removePoints::setRefinement
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
+            label pointi = f[fp];
 
-            if (!pointCanBeDeleted[pointI])
+            if (!pointCanBeDeleted[pointi])
             {
-                newFace[newI++] = pointI;
+                newFace[newI++] = pointi;
             }
         }
         newFace.setSize(newI);
@@ -397,15 +397,15 @@ void Foam::removePoints::setRefinement
 
             forAll(f, fp)
             {
-                label pointI = f[fp];
+                label pointi = f[fp];
 
-                if (pointCanBeDeleted[pointI])
+                if (pointCanBeDeleted[pointi])
                 {
-                    savedFace[fp] = -pointToSaved[pointI]-1;
+                    savedFace[fp] = -pointToSaved[pointi]-1;
                 }
                 else
                 {
-                    savedFace[fp] = pointI;
+                    savedFace[fp] = pointi;
                 }
             }
         }
@@ -483,16 +483,16 @@ void Foam::removePoints::updateMesh(const mapPolyMesh& map)
 
             forAll(f, fp)
             {
-                label pointI = f[fp];
+                label pointi = f[fp];
 
-                if (pointI >= 0)
+                if (pointi >= 0)
                 {
-                    f[fp] = map.reversePointMap()[pointI];
+                    f[fp] = map.reversePointMap()[pointi];
 
                     if (f[fp] == -1)
                     {
                         FatalErrorInFunction
-                            << "Old point " << pointI
+                            << "Old point " << pointi
                             << " seems to have dissapeared."
                             << abort(FatalError);
                     }
@@ -518,11 +518,11 @@ void Foam::removePoints::updateMesh(const mapPolyMesh& map)
 
                     forAll(savedFace, fp)
                     {
-                        label pointI = savedFace[fp];
+                        label pointi = savedFace[fp];
 
-                        if (pointI >= 0)
+                        if (pointi >= 0)
                         {
-                            keptFace[keptFp++] = pointI;
+                            keptFace[keptFp++] = pointi;
                         }
                     }
                     keptFace.setSize(keptFp);
@@ -623,19 +623,19 @@ void Foam::removePoints::getUnrefimentSet
                 {
                     if (savedFace[fp] < 0)
                     {
-                        label savedPointI = -savedFace[fp]-1;
+                        label savedPointi = -savedFace[fp]-1;
 
-                        if (savedPoints_[savedPointI] == vector::max)
+                        if (savedPoints_[savedPointi] == vector::max)
                         {
                             FatalErrorInFunction
-                                << "Trying to restore point " << savedPointI
+                                << "Trying to restore point " << savedPointi
                                 << " from mesh face " << savedFaceLabels_[saveI]
                                 << " saved face:" << savedFace
                                 << " which has already been undone."
                                 << abort(FatalError);
                         }
 
-                        localPointsSet.insert(savedPointI);
+                        localPointsSet.insert(savedPointi);
                     }
                 }
             }
@@ -666,9 +666,9 @@ void Foam::removePoints::getUnrefimentSet
                 {
                     if (savedFace[fp] < 0)
                     {
-                        label savedPointI = -savedFace[fp]-1;
+                        label savedPointi = -savedFace[fp]-1;
 
-                        if (localPointsSet.found(savedPointI))
+                        if (localPointsSet.found(savedPointi))
                         {
                             fRestore[fp] = true;
                         }
@@ -722,9 +722,9 @@ void Foam::removePoints::getUnrefimentSet
                                 << abort(FatalError);
                         }
 
-                        label savedPointI = -savedFace[fp]-1;
+                        label savedPointi = -savedFace[fp]-1;
 
-                        localPointsSet.insert(savedPointI);
+                        localPointsSet.insert(savedPointi);
                     }
                 }
             }
@@ -747,9 +747,9 @@ void Foam::removePoints::getUnrefimentSet
         {
             if (savedFace[fp] < 0)
             {
-                label savedPointI = -savedFace[fp]-1;
+                label savedPointi = -savedFace[fp]-1;
 
-                if (localPointsSet.found(savedPointI))
+                if (localPointsSet.found(savedPointi))
                 {
                     localFacesSet.insert(saveI);
                 }
@@ -828,12 +828,12 @@ void Foam::removePoints::setUnrefinement
         {
             if (savedFace[fp] < 0)
             {
-                label addedPointI = addedPoints[-savedFace[fp]-1];
+                label addedPointi = addedPoints[-savedFace[fp]-1];
 
-                if (addedPointI != -1)
+                if (addedPointi != -1)
                 {
-                    savedFace[fp] = addedPointI;
-                    newFace[newFp++] = addedPointI;
+                    savedFace[fp] = addedPointi;
+                    newFace[newFp++] = addedPointi;
                 }
                 else
                 {
@@ -889,15 +889,15 @@ void Foam::removePoints::setUnrefinement
             {
                 if (savedFace[fp] < 0)
                 {
-                    label addedPointI = addedPoints[-savedFace[fp]-1];
+                    label addedPointi = addedPoints[-savedFace[fp]-1];
 
-                    if (addedPointI != -1)
+                    if (addedPointi != -1)
                     {
                         FatalErrorInFunction
                             << "Face:" << savedFaceLabels_[saveI]
                             << " savedVerts:" << savedFace
                             << " uses restored point:" << -savedFace[fp]-1
-                            << " with new pointlabel:" << addedPointI
+                            << " with new pointlabel:" << addedPointi
                             << abort(FatalError);
                     }
                 }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
index 2ecae363bb..6109cde63c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
@@ -57,7 +57,7 @@ void Foam::tetDecomposer::modifyFace
     const label facei,
     const label own,
     const label nei,
-    const label patchI,
+    const label patchi,
     const label zoneI,
     const bool zoneFlip
 ) const
@@ -72,7 +72,7 @@ void Foam::tetDecomposer::modifyFace
             own,                        // owner
             nei,                        // neighbour
             false,                      // face flip
-            patchI,                     // patch for face
+            patchi,                     // patch for face
             zoneI,                      // zone for face
             zoneFlip                    // face flip in zone
         );
@@ -86,7 +86,7 @@ void Foam::tetDecomposer::modifyFace
             nei,                        // owner
             own,                        // neighbour
             true,                       // face flip
-            patchI,                     // patch for face
+            patchi,                     // patch for face
             zoneI,                      // zone for face
             !zoneFlip                   // face flip in zone
         );
@@ -103,7 +103,7 @@ void Foam::tetDecomposer::addFace
     const label masterPointID,
     const label masterEdgeID,
     const label masterFaceID,
-    const label patchI,
+    const label patchi,
     const label zoneI,
     const bool zoneFlip
 ) const
@@ -120,7 +120,7 @@ void Foam::tetDecomposer::addFace
             masterEdgeID,               // master edge
             masterFaceID,               // master face
             false,                      // face flip
-            patchI,                     // patch for face
+            patchi,                     // patch for face
             zoneI,                      // zone for face
             zoneFlip                    // face flip in zone
         );
@@ -136,7 +136,7 @@ void Foam::tetDecomposer::addFace
             masterEdgeID,               // master edge
             masterFaceID,               // master face
             true,                       // face flip
-            patchI,                     // patch for face
+            patchi,                     // patch for face
             zoneI,                      // zone for face
             !zoneFlip                   // face flip in zone
         );
@@ -189,12 +189,12 @@ void Foam::tetDecomposer::setRefinement
     forAll(mesh_.cellCentres(), celli)
     {
         // Any point on the cell
-        label masterPointI = mesh_.faces()[mesh_.cells()[celli][0]][0];
+        label masterPointi = mesh_.faces()[mesh_.cells()[celli][0]][0];
 
         cellToPoint_[celli] = meshMod.addPoint
         (
             mesh_.cellCentres()[celli],
-            masterPointI,
+            masterPointi,
             -1,
             true
         );
@@ -208,12 +208,12 @@ void Foam::tetDecomposer::setRefinement
         forAll(mesh_.faceCentres(), facei)
         {
             // Any point on the face
-            const label masterPointI = mesh_.faces()[facei][0];
+            const label masterPointi = mesh_.faces()[facei][0];
 
             faceToPoint_[facei] = meshMod.addPoint
             (
                 mesh_.faceCentres()[facei],
-                masterPointI,
+                masterPointi,
                 -1,
                 true
             );
@@ -326,10 +326,10 @@ void Foam::tetDecomposer::setRefinement
         const labelList& addedNei = faceNeighbourCells_[facei];
         const face& f = mesh_.faces()[facei];
 
-        label patchI = -1;
+        label patchi = -1;
         if (facei >= mesh_.nInternalFaces())
         {
-            patchI = mesh_.boundaryMesh().whichPatch(facei);
+            patchi = mesh_.boundaryMesh().whichPatch(facei);
         }
 
         label zoneI = mesh_.faceZones().whichZone(facei);
@@ -361,7 +361,7 @@ void Foam::tetDecomposer::setRefinement
                             facei,
                             addedOwn[fp],
                             addedNei[fp],
-                            patchI,
+                            patchi,
                             zoneI,
                             zoneFlip
                         );
@@ -377,7 +377,7 @@ void Foam::tetDecomposer::setRefinement
                             -1,                 //point
                             -1,                 //edge
                             facei,              //face
-                            patchI,
+                            patchi,
                             zoneI,
                             zoneFlip
                         );
@@ -403,7 +403,7 @@ void Foam::tetDecomposer::setRefinement
                         f[fp],      //point
                         -1,         //edge
                         -1,         //face
-                        -1,         //patchI
+                        -1,         //patchi
                         zoneI,
                         zoneFlip
                     );
@@ -427,7 +427,7 @@ void Foam::tetDecomposer::setRefinement
                         f[fp],      //point
                         -1,         //edge
                         -1,         //face
-                        -1,         //patchI
+                        -1,         //patchi
                         zoneI,
                         zoneFlip
                     );
@@ -468,7 +468,7 @@ void Foam::tetDecomposer::setRefinement
                             facei,
                             addedOwn[triI],
                             addedNei[triI],
-                            patchI,
+                            patchi,
                             zoneI,
                             zoneFlip
                         );
@@ -484,7 +484,7 @@ void Foam::tetDecomposer::setRefinement
                             -1,                 //point
                             -1,                 //edge
                             facei,              //face
-                            patchI,
+                            patchi,
                             zoneI,
                             zoneFlip
                         );
@@ -511,7 +511,7 @@ void Foam::tetDecomposer::setRefinement
                         f[fp],      //point
                         -1,         //edge
                         -1,         //face
-                        -1,         //patchI
+                        -1,         //patchi
                         zoneI,
                         zoneFlip
                     );
@@ -536,7 +536,7 @@ void Foam::tetDecomposer::setRefinement
                             f[fp],      //point
                             -1,         //edge
                             -1,         //face
-                            -1,         //patchI
+                            -1,         //patchi
                             zoneI,
                             zoneFlip
                         );
@@ -683,7 +683,7 @@ void Foam::tetDecomposer::setRefinement
                         -1,         //masterPoint
                         -1,         //fEdges[fp], //masterEdge
                         facei,      //masterFace
-                        -1,         //patchI
+                        -1,         //patchi
                         zoneI,
                         zoneFlip
                     );
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
index 07c8f4f2e8..540df2dd20 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
@@ -103,7 +103,7 @@ private:
             const label facei,
             const label own,
             const label nei,
-            const label patchI,
+            const label patchi,
             const label zoneI,
             const bool zoneFlip
         ) const;
@@ -118,7 +118,7 @@ private:
             const label masterPointID,
             const label masterEdgeID,
             const label masterFaceID,
-            const label patchI,
+            const label patchi,
             const label zoneI,
             const bool zoneFlip
         ) const;
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 6a3c9866a8..1d5794a507 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -154,18 +154,18 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     Map<label>& pointMergeMap = cutPatch.pointMergeMap();
 
     // Create mapping for every merged point of the slave patch
-    forAll(slavePointPointHits, pointI)
+    forAll(slavePointPointHits, pointi)
     {
-        if (slavePointPointHits[pointI] >= 0)
+        if (slavePointPointHits[pointi] >= 0)
         {
-            // Pout<< "Inserting point merge pair: " << slaveMeshPoints[pointI]
-            //     << " : " << masterMeshPoints[slavePointPointHits[pointI]]
+            // Pout<< "Inserting point merge pair: " << slaveMeshPoints[pointi]
+            //     << " : " << masterMeshPoints[slavePointPointHits[pointi]]
             //     << endl;
 
             pointMergeMap.insert
             (
-                slaveMeshPoints[pointI],
-                masterMeshPoints[slavePointPointHits[pointI]]
+                slaveMeshPoints[pointi],
+                masterMeshPoints[slavePointPointHits[pointi]]
             );
         }
     }
@@ -175,15 +175,15 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     List<labelHashSet> usedMasterEdges(slaveEdges.size());
 
     // Collect of slave point hits
-    forAll(slavePointPointHits, pointI)
+    forAll(slavePointPointHits, pointi)
     {
         // For point hits, add all point-edges from master side to all point
-        const labelList& curSlaveEdges = slavePointEdges[pointI];
+        const labelList& curSlaveEdges = slavePointEdges[pointi];
 
-        if (slavePointPointHits[pointI] > -1)
+        if (slavePointPointHits[pointi] > -1)
         {
             const labelList& curMasterEdges =
-                masterPointEdges[slavePointPointHits[pointI]];
+                masterPointEdges[slavePointPointHits[pointi]];
 
             // Mark all current master edges as used for all the current slave
             // edges
@@ -197,14 +197,14 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                 }
             }
         }
-        else if (slavePointEdgeHits[pointI] > -1)
+        else if (slavePointEdgeHits[pointi] > -1)
         {
             // For edge hits, add the master edge
             forAll(curSlaveEdges, slaveEdgeI)
             {
                 usedMasterEdges[curSlaveEdges[slaveEdgeI]].insert
                 (
-                    slavePointEdgeHits[pointI]
+                    slavePointEdgeHits[pointi]
                 );
             }
         }
@@ -213,14 +213,14 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     // Collect off master point hits
     // For every master point that has hit an edge, add all edges coming from
     // that point to the slave edge that has been hit
-    forAll(masterPointEdgeHits, masterPointI)
+    forAll(masterPointEdgeHits, masterPointi)
     {
-        if (masterPointEdgeHits[masterPointI] > -1)
+        if (masterPointEdgeHits[masterPointi] > -1)
         {
-            const labelList& curMasterEdges = masterPointEdges[masterPointI];
+            const labelList& curMasterEdges = masterPointEdges[masterPointi];
 
             labelHashSet& sm =
-                usedMasterEdges[masterPointEdgeHits[masterPointI]];
+                usedMasterEdges[masterPointEdgeHits[masterPointi]];
 
             forAll(curMasterEdges, masterEdgeI)
             {
@@ -243,17 +243,17 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     List<DynamicList<label>> pointsIntoSlaveEdges(slaveEdges.size());
 
     // Add all points from the slave patch that have hit the edge
-    forAll(slavePointEdgeHits, pointI)
+    forAll(slavePointEdgeHits, pointi)
     {
-        if (slavePointEdgeHits[pointI] > -1)
+        if (slavePointEdgeHits[pointi] > -1)
         {
             // Create a new point on the master edge
 
             point edgeCutPoint =
-                masterEdges[slavePointEdgeHits[pointI]].line
+                masterEdges[slavePointEdgeHits[pointi]].line
                 (
                     masterLocalPoints
-                ).nearestDist(projectedSlavePoints[pointI]).hitPoint();
+                ).nearestDist(projectedSlavePoints[pointi]).hitPoint();
 
             label newPoint =
                 ref.setAction
@@ -261,23 +261,23 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                     polyAddPoint
                     (
                         edgeCutPoint,             // point
-                        slaveMeshPoints[pointI],  // master point
+                        slaveMeshPoints[pointi],  // master point
                         cutPointZoneID_.index(),  // zone for point
                         true                      // supports a cell
                     )
                 );
 
             // Pout<< "Inserting merge pair off edge: "
-            //     << slaveMeshPoints[pointI] << " " << newPoint
+            //     << slaveMeshPoints[pointi] << " " << newPoint
             //     << " cut point: " << edgeCutPoint
-            //     << " orig: " << slaveLocalPoints[pointI]
-            //     << " proj: " << projectedSlavePoints[pointI]
+            //     << " orig: " << slaveLocalPoints[pointi]
+            //     << " proj: " << projectedSlavePoints[pointi]
             //     << endl;
 
             // Add the new edge point into the merge map
-            pointMergeMap.insert(slaveMeshPoints[pointI], newPoint);
+            pointMergeMap.insert(slaveMeshPoints[pointi], newPoint);
 
-            pointsIntoMasterEdges[slavePointEdgeHits[pointI]].append
+            pointsIntoMasterEdges[slavePointEdgeHits[pointi]].append
             (
                 newPoint
             );
@@ -303,13 +303,13 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     }
 
     // Add all points from the slave patch that have hit a face
-    forAll(slavePointFaceHits, pointI)
+    forAll(slavePointFaceHits, pointi)
     {
         if
         (
-            slavePointPointHits[pointI] < 0
-         && slavePointEdgeHits[pointI] < 0
-         && slavePointFaceHits[pointI].hit()
+            slavePointPointHits[pointi] < 0
+         && slavePointEdgeHits[pointi] < 0
+         && slavePointFaceHits[pointi].hit()
         )
         {
             label newPoint =
@@ -317,43 +317,43 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                 (
                     polyAddPoint
                     (
-                        projectedSlavePoints[pointI],   // point
-                        slaveMeshPoints[pointI],        // master point
+                        projectedSlavePoints[pointi],   // point
+                        slaveMeshPoints[pointi],        // master point
                         cutPointZoneID_.index(),        // zone for point
                         true                            // supports a cell
                     )
                 );
 
             // Pout<< "Inserting merge pair off face: "
-            //     << slaveMeshPoints[pointI]
+            //     << slaveMeshPoints[pointi]
             //     << " " << newPoint
             //     << endl;
 
             // Add the new edge point into the merge map
-            pointMergeMap.insert(slaveMeshPoints[pointI], newPoint);
+            pointMergeMap.insert(slaveMeshPoints[pointi], newPoint);
 
             // Add the point into the enriched patch map
             pointMap.insert
             (
                 newPoint,
-                projectedSlavePoints[pointI]
+                projectedSlavePoints[pointi]
             );
 
             if (debug)
             {
                 Pout<< "f: " << newPoint << " = "
-                    << projectedSlavePoints[pointI] << endl;
+                    << projectedSlavePoints[pointi] << endl;
             }
         }
     }
 
-    forAll(masterPointEdgeHits, pointI)
+    forAll(masterPointEdgeHits, pointi)
     {
-        if (masterPointEdgeHits[pointI] > -1)
+        if (masterPointEdgeHits[pointi] > -1)
         {
-            pointsIntoSlaveEdges[masterPointEdgeHits[pointI]].append
+            pointsIntoSlaveEdges[masterPointEdgeHits[pointi]].append
             (
-                masterMeshPoints[pointI]
+                masterMeshPoints[pointi]
             );
         }
     }
@@ -1282,16 +1282,16 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         face oldFace(oldRichFace.size());
         label nOldFace = 0;
 
-        forAll(oldRichFace, pointI)
+        forAll(oldRichFace, pointi)
         {
-            if (ref.pointRemoved(oldRichFace[pointI]))
+            if (ref.pointRemoved(oldRichFace[pointi]))
             {
                 changed = true;
             }
             else
             {
                 // Point off patch
-                oldFace[nOldFace] = oldRichFace[pointI];
+                oldFace[nOldFace] = oldRichFace[pointi];
                 nOldFace++;
             }
         }
@@ -1304,25 +1304,25 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
         DynamicList<label> newFaceLabels(2*oldFace.size());
 
-        forAll(oldFace, pointI)
+        forAll(oldFace, pointi)
         {
-            if (masterMeshPointMap.found(oldFace[pointI]))
+            if (masterMeshPointMap.found(oldFace[pointi]))
             {
                 // Point is in master patch. Add it
 
                 // If the point is a direct hit, grab its label; otherwise
                 // keep the original
-                if (pointMergeMap.found(oldFace[pointI]))
+                if (pointMergeMap.found(oldFace[pointi]))
                 {
                     changed = true;
                     newFaceLabels.append
                     (
-                        pointMergeMap.find(oldFace[pointI])()
+                        pointMergeMap.find(oldFace[pointi])()
                     );
                 }
                 else
                 {
-                    newFaceLabels.append(oldFace[pointI]);
+                    newFaceLabels.append(oldFace[pointi]);
                 }
 
                 // Find if there are additional points inserted onto the edge
@@ -1332,18 +1332,18 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                 //    out of the current point.
                 // 2) If the next point in the face to pick the right edge
                 const label localFirstLabel =
-                    masterMeshPointMap.find(oldFace[pointI])();
+                    masterMeshPointMap.find(oldFace[pointi])();
 
                 const labelList& curEdges = masterPointEdges[localFirstLabel];
 
-                const label  nextLabel = oldFace.nextLabel(pointI);
+                const label  nextLabel = oldFace.nextLabel(pointi);
 
                 Map<label>::const_iterator mmpmIter =
                     masterMeshPointMap.find(nextLabel);
 
                 if (mmpmIter != masterMeshPointMap.end())
                 {
-                    // Pout<< "found label pair " << oldFace[pointI]
+                    // Pout<< "found label pair " << oldFace[pointi]
                     //     << " and " << nextLabel;
                     // Find the points on the edge between them
                     const label localNextLabel = mmpmIter();
@@ -1450,7 +1450,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             }
             else
             {
-                newFaceLabels.append(oldFace[pointI]);
+                newFaceLabels.append(oldFace[pointi]);
             }
         }
 
@@ -1553,22 +1553,22 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         face oldFace(oldRichFace.size());
         label nOldFace = 0;
 
-        forAll(oldRichFace, pointI)
+        forAll(oldRichFace, pointi)
         {
             if
             (
-                rpm.found(oldRichFace[pointI])
-             || slaveMeshPointMap.found(oldRichFace[pointI])
+                rpm.found(oldRichFace[pointi])
+             || slaveMeshPointMap.found(oldRichFace[pointi])
             )
             {
                 // Point definitely live. Add it
-                oldFace[nOldFace] = oldRichFace[pointI];
+                oldFace[nOldFace] = oldRichFace[pointi];
                 nOldFace++;
             }
             else if
             (
-                ref.pointRemoved(oldRichFace[pointI])
-             || masterMeshPointMap.found(oldRichFace[pointI])
+                ref.pointRemoved(oldRichFace[pointi])
+             || masterMeshPointMap.found(oldRichFace[pointi])
             )
             {
                 // Point removed and not on slave patch
@@ -1579,7 +1579,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             else
             {
                 // Point off patch
-                oldFace[nOldFace] = oldRichFace[pointI];
+                oldFace[nOldFace] = oldRichFace[pointi];
                 nOldFace++;
             }
         }
@@ -1592,12 +1592,12 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         //     << " old face: " << oldFace
         //     << endl;
 
-        forAll(oldFace, pointI)
+        forAll(oldFace, pointi)
         {
             // Try to find the point in retired points
-            label curP = oldFace[pointI];
+            label curP = oldFace[pointi];
 
-            Map<label>::const_iterator rpmIter = rpm.find(oldFace[pointI]);
+            Map<label>::const_iterator rpmIter = rpm.find(oldFace[pointi]);
 
             if (rpmIter != rpm.end())
             {
@@ -1636,7 +1636,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
                 const labelList& curEdges = slavePointEdges[localFirstLabel];
 
-                label nextLabel = oldFace.nextLabel(pointI);
+                label nextLabel = oldFace.nextLabel(pointi);
 
                 Map<label>::const_iterator rpmNextIter =
                     rpm.find(nextLabel);
@@ -1757,7 +1757,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             }
             else
             {
-                newFaceLabels.append(oldFace[pointI]);
+                newFaceLabels.append(oldFace[pointi]);
             }
         }
 
@@ -1852,9 +1852,9 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     label nRetiredPoints = 0;
 
-    forAll(slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointi)
     {
-        if (pointMergeMap.found(slaveMeshPoints[pointI]))
+        if (pointMergeMap.found(slaveMeshPoints[pointi]))
         {
             // Retire the point - only used for supporting the detached
             // slave patch
@@ -1864,29 +1864,29 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             // (
             //    polyModifyPoint
             //    (
-            //        slaveMeshPoints[pointI],             // point ID
-            //        points[slaveMeshPoints[pointI]],     // point
+            //        slaveMeshPoints[pointi],             // point ID
+            //        points[slaveMeshPoints[pointi]],     // point
             //        false,                               // remove from zone
-            //        mesh.pointZones().whichZone(slaveMeshPoints[pointI]),
+            //        mesh.pointZones().whichZone(slaveMeshPoints[pointi]),
             //                                             // zone
             //        false                                // in a cell
             //    )
             // );
-            //Pout<< "MJ retire slave point " << slaveMeshPoints[pointI]
-            //    << " coord " << points[slaveMeshPoints[pointI]]
+            //Pout<< "MJ retire slave point " << slaveMeshPoints[pointi]
+            //    << " coord " << points[slaveMeshPoints[pointi]]
             //    << endl;
             ref.setAction
             (
                 polyRemovePoint
                 (
-                    slaveMeshPoints[pointI]
+                    slaveMeshPoints[pointi]
                 )
             );
 
             addToRpm.insert
             (
-                pointMergeMap.find(slaveMeshPoints[pointI])(),
-                slaveMeshPoints[pointI]
+                pointMergeMap.find(slaveMeshPoints[pointi])(),
+                slaveMeshPoints[pointi]
             );
         }
         else
@@ -1895,10 +1895,10 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             (
                 polyModifyPoint
                 (
-                    slaveMeshPoints[pointI],             // point ID
-                    points[slaveMeshPoints[pointI]],     // point
+                    slaveMeshPoints[pointi],             // point ID
+                    points[slaveMeshPoints[pointi]],     // point
                     false,                               // remove from zone
-                    mesh.pointZones().whichZone(slaveMeshPoints[pointI]),// zone
+                    mesh.pointZones().whichZone(slaveMeshPoints[pointi]),// zone
                     true                                 // in a cell
                 )
             );
diff --git a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
index 2e172e5587..e454e31981 100644
--- a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
@@ -145,17 +145,17 @@ void Foam::slidingInterface::decoupleInterface
         }
 
         // Recover retired points on the slave side
-        forAll(newFace, pointI)
+        forAll(newFace, pointi)
         {
-            Map<label>::const_iterator rpmIter = rpm.find(newFace[pointI]);
+            Map<label>::const_iterator rpmIter = rpm.find(newFace[pointi]);
             if (rpmIter != rpm.end())
             {
                 // Master of retired point; grab its original
-                // Pout<< "Reinstating retired point: " << newFace[pointI]
-                //     << " with old: " << rpm.find(newFace[pointI])()
+                // Pout<< "Reinstating retired point: " << newFace[pointi]
+                //     << " with old: " << rpm.find(newFace[pointi])()
                 //     << endl;
 
-                newFace[pointI] = rpmIter();
+                newFace[pointi] = rpmIter();
             }
         }
 
@@ -193,17 +193,17 @@ void Foam::slidingInterface::decoupleInterface
 
         bool changed = false;
 
-        forAll(oldFace, pointI)
+        forAll(oldFace, pointi)
         {
             // Check if the point is removed
-            if (ref.pointRemoved(oldFace[pointI]))
+            if (ref.pointRemoved(oldFace[pointi]))
             {
                 // Point removed; skip it
                 changed = true;
             }
             else
             {
-                newFaceLabels.append(oldFace[pointI]);
+                newFaceLabels.append(oldFace[pointi]);
             }
         }
 
@@ -304,33 +304,33 @@ void Foam::slidingInterface::decoupleInterface
 
         bool changed = false;
 
-        forAll(oldFace, pointI)
+        forAll(oldFace, pointi)
         {
             // Check if the point is removed or retired
-            if (rpm.found(oldFace[pointI]))
+            if (rpm.found(oldFace[pointi]))
             {
                 // Master of retired point; grab its original
                 changed = true;
 
-                // Pout<< "Reinstating retired point: " << oldFace[pointI]
-                //     << " with old: " << rpm.find(oldFace[pointI])()
+                // Pout<< "Reinstating retired point: " << oldFace[pointi]
+                //     << " with old: " << rpm.find(oldFace[pointi])()
                 //     << endl;
 
-                newFaceLabels.append(rpm.find(oldFace[pointI])());
+                newFaceLabels.append(rpm.find(oldFace[pointi])());
             }
-            else if (ref.pointRemoved(oldFace[pointI]))
+            else if (ref.pointRemoved(oldFace[pointi]))
             {
                 // Point removed; skip it
                 changed = true;
             }
-            else if (masterPm.found(oldFace[pointI]))
+            else if (masterPm.found(oldFace[pointi]))
             {
                 // Point from master patch only; skip it
                 changed = true;
             }
             else
             {
-                newFaceLabels.append(oldFace[pointI]);
+                newFaceLabels.append(oldFace[pointi]);
             }
         }
 
@@ -391,16 +391,16 @@ void Foam::slidingInterface::decoupleInterface
     const labelList& slaveMeshPoints =
         mesh.faceZones()[slaveFaceZoneID_.index()]().meshPoints();
 
-    forAll(slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointi)
     {
         ref.setAction
         (
             polyModifyPoint
             (
-                slaveMeshPoints[pointI],             // point ID
-                points[slaveMeshPoints[pointI]],     // point
+                slaveMeshPoints[pointi],             // point ID
+                points[slaveMeshPoints[pointi]],     // point
                 false,                               // remove from zone
-                mesh.pointZones().whichZone(slaveMeshPoints[pointI]), // zone
+                mesh.pointZones().whichZone(slaveMeshPoints[pointi]), // zone
                 true                                // in a cell
             )
         );
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
index a1cc04a3c5..bbe891aa73 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
@@ -86,9 +86,9 @@ void Foam::enrichedPatch::calcLocalFaces() const
 
         curlf.setSize(f.size());
 
-        forAll(f, pointI)
+        forAll(f, pointi)
         {
-            curlf[pointI] = mpLookup.find(f[pointI])();
+            curlf[pointi] = mpLookup.find(f[pointi])();
         }
     }
 }
@@ -229,13 +229,13 @@ bool Foam::enrichedPatch::checkSupport() const
     {
         const face& curFace = faces[facei];
 
-        forAll(curFace, pointI)
+        forAll(curFace, pointi)
         {
-            if (!pointMap().found(curFace[pointI]))
+            if (!pointMap().found(curFace[pointi]))
             {
                 WarningInFunction
-                    << "Point " << pointI << " of face " << facei
-                    << " global point index: " << curFace[pointI]
+                    << "Point " << pointi << " of face " << facei
+                    << " global point index: " << curFace[pointi]
                     << " not supported in point map.  This is not allowed."
                     << endl;
 
@@ -254,9 +254,9 @@ void Foam::enrichedPatch::writeOBJ(const fileName& fName) const
 
     const pointField& lp = localPoints();
 
-    forAll(lp, pointI)
+    forAll(lp, pointi)
     {
-        meshTools::writeOBJ(str, lp[pointI]);
+        meshTools::writeOBJ(str, lp[pointi]);
     }
 
     const faceList& faces = localFaces();
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index e649b5ace1..50c1af29f3 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -123,11 +123,11 @@ void Foam::enrichedPatch::calcCutFaces() const
         // }
         // {
         //     pointField facePoints = curLocalFace.points(lp);
-        //     forAll(curLocalFace, pointI)
+        //     forAll(curLocalFace, pointi)
         //     {
-        //         Pout<< "v " << facePoints[pointI].x() << " "
-        //             << facePoints[pointI].y() << " "
-        //             << facePoints[pointI].z() << endl;
+        //         Pout<< "v " << facePoints[pointi].x() << " "
+        //             << facePoints[pointi].y() << " "
+        //             << facePoints[pointi].z() << endl;
         //     }
         // }
 
@@ -451,16 +451,16 @@ void Foam::enrichedPatch::calcCutFaces() const
 
                             for
                             (
-                                label pointI = 1;
-                                pointI < cutFaceGlobal.size();
-                                pointI++
+                                label pointi = 1;
+                                pointi < cutFaceGlobal.size();
+                                pointi++
                             )
                             {
                                 Map<labelList>::const_iterator
                                     mpfAddrPointIter =
                                         masterPointFaceAddr.find
                                         (
-                                            cutFaceGlobal[pointI]
+                                            cutFaceGlobal[pointi]
                                         );
 
                                 if
@@ -499,16 +499,16 @@ void Foam::enrichedPatch::calcCutFaces() const
                             // If all point are found attempt matching
                             if (!miss)
                             {
-                                forAll(hits, pointI)
+                                forAll(hits, pointi)
                                 {
-                                    if (hits[pointI] == cutFaceGlobal.size())
+                                    if (hits[pointi] == cutFaceGlobal.size())
                                     {
                                         // Found other side.
                                         otherSideFound = true;
 
                                         cfMaster.append
                                         (
-                                            masterFacesOfPZero[pointI]
+                                            masterFacesOfPZero[pointi]
                                         );
 
                                         cfSlave.append(facei);
@@ -520,7 +520,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                                         if (debug)
                                         {
                                             Pout<< " other side: "
-                                                << masterFacesOfPZero[pointI]
+                                                << masterFacesOfPZero[pointi]
                                                 << endl;
                                         }
                                     } // end of hits
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
index 554913a02f..f6eb9de42e 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
@@ -156,13 +156,13 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
                 pointField slavePosOnEdge(slavePointsOnEdge.size());
 
-                forAll(slavePointsOnEdge, edgePointI)
+                forAll(slavePointsOnEdge, edgePointi)
                 {
-                    slavePosOnEdge[edgePointI] =
-                        pointMap().find(slavePointsOnEdge[edgePointI])();
+                    slavePosOnEdge[edgePointi] =
+                        pointMap().find(slavePointsOnEdge[edgePointi])();
 
-                    edgePointWeights[edgePointI] =
-                        (e & (slavePosOnEdge[edgePointI] - startPoint));
+                    edgePointWeights[edgePointi] =
+                        (e & (slavePosOnEdge[edgePointi] - startPoint));
                 }
 
                 if (debug)
@@ -292,13 +292,13 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
                 pointField masterPosOnEdge(masterPointsOnEdge.size());
 
-                forAll(masterPointsOnEdge, edgePointI)
+                forAll(masterPointsOnEdge, edgePointi)
                 {
-                    masterPosOnEdge[edgePointI] =
-                        pointMap().find(masterPointsOnEdge[edgePointI])();
+                    masterPosOnEdge[edgePointi] =
+                        pointMap().find(masterPointsOnEdge[edgePointi])();
 
-                    edgePointWeights[edgePointI] =
-                        (e & (masterPosOnEdge[edgePointI] - startPoint));
+                    edgePointWeights[edgePointi] =
+                        (e & (masterPosOnEdge[edgePointi] - startPoint));
                 }
 
                 if (debug)
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
index c5beb388ec..280f4324d2 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
@@ -60,22 +60,22 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     {
         const face& curFace = ef[facei + slavePatch_.size()];
 //         Pout<< "Cur face in pfAddr: " << curFace << endl;
-        forAll(curFace, pointI)
+        forAll(curFace, pointi)
         {
             Map<DynamicList<label>>::iterator mpfIter =
-                mpf.find(curFace[pointI]);
+                mpf.find(curFace[pointi]);
 
             if (mpfIter == mpf.end())
             {
                 // Not found, add new dynamic list
                 mpf.insert
                 (
-                    curFace[pointI],
+                    curFace[pointi],
                     DynamicList<label>(primitiveMesh::facesPerPoint_)
                 );
 
                 // Iterator is invalidated - have to find again
-                mpf.find(curFace[pointI])().append(facei);
+                mpf.find(curFace[pointi])().append(facei);
             }
             else
             {
@@ -87,19 +87,19 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     // Add the projected points which hit the face
     const labelList& slaveMeshPoints = slavePatch_.meshPoints();
 
-    forAll(slavePointFaceHits_, pointI)
+    forAll(slavePointFaceHits_, pointi)
     {
         if
         (
-            slavePointPointHits_[pointI] < 0
-         && slavePointEdgeHits_[pointI] < 0
-         && slavePointFaceHits_[pointI].hit()
+            slavePointPointHits_[pointi] < 0
+         && slavePointEdgeHits_[pointi] < 0
+         && slavePointFaceHits_[pointi].hit()
         )
         {
             // Get the index of projected point corresponding to this slave
             // point
             const label mergedSmp =
-                pointMergeMap().find(slaveMeshPoints[pointI])();
+                pointMergeMap().find(slaveMeshPoints[pointi])();
 
             Map<DynamicList<label>>::iterator mpfIter =
                 mpf.find(mergedSmp);
@@ -116,12 +116,12 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
                 // Iterator is invalidated - have to find again
                 mpf.find(mergedSmp)().append
                 (
-                    slavePointFaceHits_[pointI].hitObject()
+                    slavePointFaceHits_[pointi].hitObject()
                 );
             }
             else
             {
-                mpfIter().append(slavePointFaceHits_[pointI].hitObject());
+                mpfIter().append(slavePointFaceHits_[pointi].hitObject());
             }
         }
     }
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
index a0f0ca0f9d..bab79f6926 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,14 +47,14 @@ void Foam::enrichedPatch::completePointMap() const
     const labelList& masterMeshPoints = masterPatch_.meshPoints();
     const pointField& masterLocalPoints = masterPatch_.localPoints();
 
-    forAll(masterMeshPoints, pointI)
+    forAll(masterMeshPoints, pointi)
     {
-        if (!pmm.found(masterMeshPoints[pointI]))
+        if (!pmm.found(masterMeshPoints[pointi]))
         {
             pointMap_.insert
             (
-                masterMeshPoints[pointI],
-                masterLocalPoints[pointI]
+                masterMeshPoints[pointi],
+                masterLocalPoints[pointi]
             );
         }
     }
@@ -63,14 +63,14 @@ void Foam::enrichedPatch::completePointMap() const
     const labelList& slaveMeshPoints = slavePatch_.meshPoints();
     const pointField& slaveLocalPoints = slavePatch_.localPoints();
 
-    forAll(slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointi)
     {
-        if (!pmm.found(slaveMeshPoints[pointI]))
+        if (!pmm.found(slaveMeshPoints[pointi]))
         {
             pointMap_.insert
             (
-                slaveMeshPoints[pointI],
-                slaveLocalPoints[pointI]
+                slaveMeshPoints[pointi],
+                slaveLocalPoints[pointi]
             );
         }
     }
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
index 2a1491e8d1..c0f8dd6fa7 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
@@ -57,13 +57,13 @@ void Foam::enrichedPatch::calcPointPoints() const
     {
         const face& curFace = lf[facei];
 
-        forAll(curFace, pointI)
+        forAll(curFace, pointi)
         {
             DynamicList<label, primitiveMesh::edgesPerPoint_>&
-                curPp = pp[curFace[pointI]];
+                curPp = pp[curFace[pointi]];
 
             // Do next label
-            label next = curFace.nextLabel(pointI);
+            label next = curFace.nextLabel(pointi);
 
             found = false;
 
@@ -82,7 +82,7 @@ void Foam::enrichedPatch::calcPointPoints() const
             }
 
             // Do previous label
-            label prev = curFace.prevLabel(pointI);
+            label prev = curFace.prevLabel(pointi);
             found = false;
 
             forAll(curPp, i)
@@ -105,9 +105,9 @@ void Foam::enrichedPatch::calcPointPoints() const
     pointPointsPtr_ = new labelListList(pp.size());
     labelListList& ppAddr = *pointPointsPtr_;
 
-    forAll(pp, pointI)
+    forAll(pp, pointi)
     {
-        ppAddr[pointI].transfer(pp[pointI]);
+        ppAddr[pointi].transfer(pp[pointi]);
     }
 }
 
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 65f2150c81..ad1ed4d871 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -450,10 +450,10 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
         const pointField& slaveLocalPoints = slavePatch.localPoints();
         const vectorField& slavePointNormals = slavePatch.pointNormals();
 
-        forAll(cutPoints, pointI)
+        forAll(cutPoints, pointi)
         {
             // Try to find the cut point in retired points
-            Map<label>::const_iterator rpmIter = rpm.find(cutPoints[pointI]);
+            Map<label>::const_iterator rpmIter = rpm.find(cutPoints[pointi]);
 
             if (rpmIter != rpm.end())
             {
@@ -463,7 +463,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
                 }
 
                 // Cut point is a retired point
-                motionPoints[cutPoints[pointI]] =
+                motionPoints[cutPoints[pointi]] =
                     projectedSlavePoints[slaveZonePointMap.find(rpmIter())()];
             }
             else
@@ -472,12 +472,12 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
                 // must be an edge-to-edge intersection.
 
                 Map<Pair<edge>>::const_iterator cpepmIter =
-                    cpepm.find(cutPoints[pointI]);
+                    cpepm.find(cutPoints[pointi]);
 
                 if (cpepmIter != cpepm.end())
                 {
                     // Pout<< "Need to re-create hit for point "
-                    //     << cutPoints[pointI]
+                    //     << cutPoints[pointi]
                     //     << " lookup: " << cpepmIter()
                     //     << endl;
 
@@ -597,7 +597,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
                             )
                             {
                                 // Cut both master and slave.
-                                motionPoints[cutPoints[pointI]] =
+                                motionPoints[cutPoints[pointi]] =
                                     masterCutPoint;
                             }
                         }
@@ -627,7 +627,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
                 else
                 {
                     FatalErrorInFunction
-                        << "Cut point " << cutPoints[pointI]
+                        << "Cut point " << cutPoints[pointi]
                         << " not recognised as either the projected "
                         << "or as intersection point.  Error in point "
                         << "projection or data mapping"
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
index 4579e9750d..34504028ce 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
@@ -148,9 +148,9 @@ void Foam::slidingInterface::calcAttachedAddressing() const
 
         const labelList& masterMeshPoints = masterPatch.meshPoints();
 
-        forAll(masterMeshPoints, pointI)
+        forAll(masterMeshPoints, pointi)
         {
-            const labelList& curFaces = pointFaces[masterMeshPoints[pointI]];
+            const labelList& curFaces = pointFaces[masterMeshPoints[pointi]];
 
             forAll(curFaces, facei)
             {
@@ -177,9 +177,9 @@ void Foam::slidingInterface::calcAttachedAddressing() const
 
         const labelList& slaveMeshPoints = slavePatch.meshPoints();
 
-        forAll(slaveMeshPoints, pointI)
+        forAll(slaveMeshPoints, pointi)
         {
-            const labelList& curFaces = pointFaces[slaveMeshPoints[pointI]];
+            const labelList& curFaces = pointFaces[slaveMeshPoints[pointi]];
 
             forAll(curFaces, facei)
             {
@@ -444,12 +444,12 @@ void Foam::slidingInterface::renumberAttachedAddressing
     const labelList& sfzPointRenumber =
         m.faceZonePointMap()[slaveFaceZoneID_.index()];
 
-    forAll(newProjectedSlavePoints, pointI)
+    forAll(newProjectedSlavePoints, pointi)
     {
-        if (sfzPointRenumber[pointI] > -1)
+        if (sfzPointRenumber[pointi] > -1)
         {
-            newProjectedSlavePoints[pointI] =
-                projectedSlavePoints[sfzPointRenumber[pointI]];
+            newProjectedSlavePoints[pointi] =
+                projectedSlavePoints[sfzPointRenumber[pointi]];
         }
     }
 
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C b/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
index a6648eb5e6..201ecf582c 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
@@ -51,9 +51,9 @@ void Foam::slidingInterface::clearCouple
     const labelList& cutPointZoneLabels =
         mesh.pointZones()[cutPointZoneID_.index()];
 
-    forAll(cutPointZoneLabels, pointI)
+    forAll(cutPointZoneLabels, pointi)
     {
-        ref.setAction(polyRemovePoint(cutPointZoneLabels[pointI]));
+        ref.setAction(polyRemovePoint(cutPointZoneLabels[pointi]));
     }
 
     // Remove all faces from the face zone
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index 83dded3548..a672011e28 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -233,9 +233,9 @@ bool Foam::slidingInterface::projectPoints() const
     {
         label nHits = 0;
 
-        forAll(slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointi)
         {
-            if (slavePointFaceHits[pointI].hit())
+            if (slavePointFaceHits[pointi].hit())
             {
                 nHits++;
             }
@@ -268,17 +268,17 @@ bool Foam::slidingInterface::projectPoints() const
                 << "Adjusting point projection for integral match: ";
         }
 
-        forAll(slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointi)
         {
-            if (slavePointFaceHits[pointI].hit())
+            if (slavePointFaceHits[pointi].hit())
             {
                 // Grab the hit point
-                projectedSlavePoints[pointI] =
+                projectedSlavePoints[pointi] =
                     masterLocalFaces
-                        [slavePointFaceHits[pointI].hitObject()].ray
+                        [slavePointFaceHits[pointi].hitObject()].ray
                         (
-                            slaveLocalPoints[pointI],
-                            slavePointNormals[pointI],
+                            slaveLocalPoints[pointi],
+                            slavePointNormals[pointi],
                             masterLocalPoints,
                             projectionAlgo_
                         ).hitPoint();
@@ -287,22 +287,22 @@ bool Foam::slidingInterface::projectPoints() const
             {
                 // Grab the nearest point on the face (edge)
                 pointHit missAdjust =
-                    masterLocalFaces[slavePointFaceHits[pointI].hitObject()].ray
+                    masterLocalFaces[slavePointFaceHits[pointi].hitObject()].ray
                     (
-                        slaveLocalPoints[pointI],
-                        slavePointNormals[pointI],
+                        slaveLocalPoints[pointi],
+                        slavePointNormals[pointi],
                         masterLocalPoints,
                         projectionAlgo_
                     );
 
                 const point nearPoint = missAdjust.missPoint();
                 const point missPoint =
-                    slaveLocalPoints[pointI]
-                  + slavePointNormals[pointI]*missAdjust.distance();
+                    slaveLocalPoints[pointi]
+                  + slavePointNormals[pointi]*missAdjust.distance();
 
                 // Calculate the tolerance
                 const scalar mergeTol =
-                    integralAdjTol_*minSlavePointLength[pointI];
+                    integralAdjTol_*minSlavePointLength[pointi];
 
                 // Adjust the hit
                 if (mag(nearPoint - missPoint) < mergeTol)
@@ -313,21 +313,21 @@ bool Foam::slidingInterface::projectPoints() const
                     }
 
 //                     Pout<< "Moving slave point in integral adjustment "
-//                         << pointI << " miss point: " << missPoint
+//                         << pointi << " miss point: " << missPoint
 //                         << " near point: " << nearPoint
 //                         << " mergeTol: " << mergeTol
 //                         << " dist: " << mag(nearPoint - missPoint) << endl;
 
-                    projectedSlavePoints[pointI] = nearPoint;
+                    projectedSlavePoints[pointi] = nearPoint;
 
-                    slavePointFaceHits[pointI] =
-                        objectHit(true, slavePointFaceHits[pointI].hitObject());
+                    slavePointFaceHits[pointi] =
+                        objectHit(true, slavePointFaceHits[pointi].hitObject());
 
                     nAdjustedPoints++;
                 }
                 else
                 {
-                    projectedSlavePoints[pointI] = slaveLocalPoints[pointI];
+                    projectedSlavePoints[pointi] = slaveLocalPoints[pointi];
 
                     if (debug)
                     {
@@ -344,17 +344,17 @@ bool Foam::slidingInterface::projectPoints() const
     }
     else if (matchType_ == PARTIAL)
     {
-        forAll(slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointi)
         {
-            if (slavePointFaceHits[pointI].hit())
+            if (slavePointFaceHits[pointi].hit())
             {
                 // Grab the hit point
-                projectedSlavePoints[pointI] =
+                projectedSlavePoints[pointi] =
                     masterLocalFaces
-                        [slavePointFaceHits[pointI].hitObject()].ray
+                        [slavePointFaceHits[pointi].hitObject()].ray
                         (
-                            slaveLocalPoints[pointI],
-                            slavePointNormals[pointI],
+                            slaveLocalPoints[pointi],
+                            slavePointNormals[pointi],
                             masterLocalPoints,
                             projectionAlgo_
                         ).hitPoint();
@@ -362,7 +362,7 @@ bool Foam::slidingInterface::projectPoints() const
             else
             {
                 // The point remains where it started from
-                projectedSlavePoints[pointI] = slaveLocalPoints[pointI];
+                projectedSlavePoints[pointi] = slaveLocalPoints[pointi];
             }
         }
     }
@@ -435,43 +435,43 @@ bool Foam::slidingInterface::projectPoints() const
 
     label nMergedPoints = 0;
 
-    forAll(projectedSlavePoints, pointI)
+    forAll(projectedSlavePoints, pointi)
     {
-        if (slavePointFaceHits[pointI].hit())
+        if (slavePointFaceHits[pointi].hit())
         {
             // Taking a non-const reference so the point can be adjusted
-            point& curPoint = projectedSlavePoints[pointI];
+            point& curPoint = projectedSlavePoints[pointi];
 
             // Get the hit face
             const face& hitFace =
-                masterLocalFaces[slavePointFaceHits[pointI].hitObject()];
+                masterLocalFaces[slavePointFaceHits[pointi].hitObject()];
 
             label mergePoint = -1;
             scalar mergeDist = GREAT;
 
             // Try all point before deciding on best fit.
-            forAll(hitFace, hitPointI)
+            forAll(hitFace, hitPointi)
             {
                 scalar dist =
-                    mag(masterLocalPoints[hitFace[hitPointI]] - curPoint);
+                    mag(masterLocalPoints[hitFace[hitPointi]] - curPoint);
 
                 // Calculate the tolerance
                 const scalar mergeTol =
                     pointMergeTol_*
                     min
                     (
-                        minSlavePointLength[pointI],
-                        minMasterPointLength[hitFace[hitPointI]]
+                        minSlavePointLength[pointi],
+                        minMasterPointLength[hitFace[hitPointi]]
                     );
 
                 if (dist < mergeTol && dist < mergeDist)
                 {
-                    mergePoint = hitFace[hitPointI];
+                    mergePoint = hitFace[hitPointi];
                     mergeDist = dist;
 
 //                     Pout<< "Merging slave point "
-//                         << slavePatch.meshPoints()[pointI] << " at "
-//                         << slaveLocalPoints[pointI] << " with master "
+//                         << slavePatch.meshPoints()[pointi] << " at "
+//                         << slaveLocalPoints[pointi] << " with master "
 //                         << masterPatch.meshPoints()[mergePoint] << " at "
 //                         << masterLocalPoints[mergePoint]
 //                         << ". dist: " << mergeDist
@@ -484,9 +484,9 @@ bool Foam::slidingInterface::projectPoints() const
                 // Point is to be merged with master point
                 nMergedPoints++;
 
-                slavePointPointHits[pointI] = mergePoint;
+                slavePointPointHits[pointi] = mergePoint;
                 curPoint = masterLocalPoints[mergePoint];
-                masterPointPointHits[mergePoint] = pointI;
+                masterPointPointHits[mergePoint] = pointi;
             }
         }
     }
@@ -532,24 +532,24 @@ bool Foam::slidingInterface::projectPoints() const
 
     label nMovedPoints = 0;
 
-    forAll(projectedSlavePoints, pointI)
+    forAll(projectedSlavePoints, pointi)
     {
         // Eliminate the points merged into points
-        if (slavePointPointHits[pointI] < 0)
+        if (slavePointPointHits[pointi] < 0)
         {
             // Get current point position
-            point& curPoint = projectedSlavePoints[pointI];
+            point& curPoint = projectedSlavePoints[pointi];
 
             // Get the hit face
             const labelList& hitFaceEdges =
-                masterFaceEdges[slavePointFaceHits[pointI].hitObject()];
+                masterFaceEdges[slavePointFaceHits[pointi].hitObject()];
 
             // Calculate the tolerance
             const scalar mergeLength =
                 min
                 (
-                    minSlavePointLength[pointI],
-                    minMasterFaceLength[slavePointFaceHits[pointI].hitObject()]
+                    minSlavePointLength[pointi],
+                    minMasterFaceLength[slavePointFaceHits[pointi].hitObject()]
                 );
 
             const scalar mergeTol = pointMergeTol_*mergeLength;
@@ -566,22 +566,22 @@ bool Foam::slidingInterface::projectPoints() const
                 if (edgeHit.hit())
                 {
                     scalar dist =
-                        mag(edgeHit.hitPoint() - projectedSlavePoints[pointI]);
+                        mag(edgeHit.hitPoint() - projectedSlavePoints[pointi]);
 
                     if (dist < mergeTol && dist < minDistance)
                     {
                         // Point is to be moved onto master edge
                         nMovedPoints++;
 
-                        slavePointEdgeHits[pointI] = hitFaceEdges[edgeI];
-                        projectedSlavePoints[pointI] = edgeHit.hitPoint();
+                        slavePointEdgeHits[pointi] = hitFaceEdges[edgeI];
+                        projectedSlavePoints[pointi] = edgeHit.hitPoint();
 
                         minDistance = dist;
 
 //                         Pout<< "Moving slave point "
-//                             << slavePatch.meshPoints()[pointI]
-//                             << " (" << pointI
-//                             << ") at " << slaveLocalPoints[pointI]
+//                             << slavePatch.meshPoints()[pointi]
+//                             << " (" << pointi
+//                             << ") at " << slaveLocalPoints[pointi]
 //                             << " onto master edge " << hitFaceEdges[edgeI]
 //                             << " or ("
 //                             << masterLocalPoints[curEdge.start()]
@@ -593,14 +593,14 @@ bool Foam::slidingInterface::projectPoints() const
                 }
             } // end of hit face edges
 
-            if (slavePointEdgeHits[pointI] > -1)
+            if (slavePointEdgeHits[pointi] > -1)
             {
                 // Projected slave point has moved.  Re-attempt merge with
                 // master points of the edge
-                point& curPoint = projectedSlavePoints[pointI];
+                point& curPoint = projectedSlavePoints[pointi];
 
                 const edge& hitMasterEdge =
-                    masterEdges[slavePointEdgeHits[pointI]];
+                    masterEdges[slavePointEdgeHits[pointi]];
 
                 label mergePoint = -1;
                 scalar mergeDist = GREAT;
@@ -615,7 +615,7 @@ bool Foam::slidingInterface::projectPoints() const
                         pointMergeTol_*
                         min
                         (
-                            minSlavePointLength[pointI],
+                            minSlavePointLength[pointi],
                             minMasterPointLength[hitMasterEdge[hmeI]]
                     );
 
@@ -625,9 +625,9 @@ bool Foam::slidingInterface::projectPoints() const
                         mergeDist = hmeDist;
 
 //                     Pout<< "Merging slave point; SECOND TRY "
-//                         << slavePatch.meshPoints()[pointI] << " local "
-//                         << pointI << " at "
-//                         << slaveLocalPoints[pointI] << " with master "
+//                         << slavePatch.meshPoints()[pointi] << " local "
+//                         << pointi << " at "
+//                         << slaveLocalPoints[pointi] << " with master "
 //                         << masterPatch.meshPoints()[mergePoint] << " at "
 //                         << masterLocalPoints[mergePoint]
 //                         << ". hmeDist: " << mergeDist
@@ -638,16 +638,16 @@ bool Foam::slidingInterface::projectPoints() const
                 if (mergePoint > -1)
                 {
                     // Point is to be merged with master point
-                    slavePointPointHits[pointI] = mergePoint;
+                    slavePointPointHits[pointi] = mergePoint;
                     curPoint = masterLocalPoints[mergePoint];
-                    masterPointPointHits[mergePoint] = pointI;
+                    masterPointPointHits[mergePoint] = pointi;
 
-                    slavePointFaceHits[pointI] =
-                        objectHit(true, slavePointFaceHits[pointI].hitObject());
+                    slavePointFaceHits[pointi] =
+                        objectHit(true, slavePointFaceHits[pointi].hitObject());
 
 
                     // Disable edge merge
-                    slavePointEdgeHits[pointI] = -1;
+                    slavePointEdgeHits[pointi] = -1;
                 }
             }
         }
@@ -893,9 +893,9 @@ bool Foam::slidingInterface::projectPoints() const
             {
                 const face& f = masterLocalFaces[curFaces[facei]];
 
-                forAll(f, pointI)
+                forAll(f, pointi)
                 {
-                    curPointMap.insert(f[pointI]);
+                    curPointMap.insert(f[pointi]);
                 }
             }
 
@@ -945,9 +945,9 @@ bool Foam::slidingInterface::projectPoints() const
 
             edgeNormalInPlane /= mag(edgeNormalInPlane);
 
-            forAll(curMasterPoints, pointI)
+            forAll(curMasterPoints, pointi)
             {
-                const label cmp = curMasterPoints[pointI];
+                const label cmp = curMasterPoints[pointi];
 
                 // Skip the current point if the edge start or end has
                 // been adjusted onto in
@@ -1174,16 +1174,16 @@ bool Foam::slidingInterface::projectPoints() const
 
         const List<objectHit>& oldPointFaceHits = *slavePointFaceHitsPtr_;
 
-        forAll(slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointi)
         {
             if
             (
-                slavePointPointHits[pointI] < 0
-             && slavePointEdgeHits[pointI] < 0
+                slavePointPointHits[pointi] < 0
+             && slavePointEdgeHits[pointi] < 0
             )
             {
                 // This is a straight face hit
-                if (slavePointFaceHits[pointI] != oldPointFaceHits[pointI])
+                if (slavePointFaceHits[pointi] != oldPointFaceHits[pointi])
                 {
                     // Two lists are different
                     faceHitsDifferent = true;
diff --git a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C b/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C
index 5045d031b3..643c161cb1 100644
--- a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,17 +197,17 @@ bool Foam::fileFormats::NASedgeFormat::read
         label nUsed = 0;
 
         pointField& pts = storedPoints();
-        forAll(pts, pointI)
+        forAll(pts, pointi)
         {
-            if (usedPoints.get(pointI))
+            if (usedPoints.get(pointi))
             {
-                if (nUsed != pointI)
+                if (nUsed != pointi)
                 {
-                    pts[nUsed] = pts[pointI];
+                    pts[nUsed] = pts[pointi];
                 }
 
                 // map prev -> new id
-                mapPointId[pointI] = nUsed;
+                mapPointId[pointi] = nUsed;
 
                 ++nUsed;
             }
diff --git a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C b/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
index 8b6e64cc59..af52b56c59 100644
--- a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -191,14 +191,14 @@ bool Foam::fileFormats::OBJedgeFormat::read(const fileName& filename)
     // cull unused points
     label nUsed = 0;
 
-    forAll(dynPoints, pointI)
+    forAll(dynPoints, pointi)
     {
-        if (dynUsedPoints[pointI] >= 0)
+        if (dynUsedPoints[pointi] >= 0)
         {
-            if (nUsed != pointI)
+            if (nUsed != pointi)
             {
-                dynPoints[nUsed] = dynPoints[pointI];
-                dynUsedPoints[pointI] = nUsed;   // new position
+                dynPoints[nUsed] = dynPoints[pointi];
+                dynUsedPoints[pointi] = nUsed;   // new position
             }
             ++nUsed;
         }
diff --git a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C b/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C
index 7fd3141d1b..d58a67c562 100644
--- a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -193,17 +193,17 @@ bool Foam::fileFormats::STARCDedgeFormat::read
         label nUsed = 0;
 
         pointField& pts = storedPoints();
-        forAll(pts, pointI)
+        forAll(pts, pointi)
         {
-            if (usedPoints.get(pointI))
+            if (usedPoints.get(pointi))
             {
-                if (nUsed != pointI)
+                if (nUsed != pointi)
                 {
-                    pts[nUsed] = pts[pointI];
+                    pts[nUsed] = pts[pointi];
                 }
 
                 // map prev -> new id
-                mapPointId.set(pointI, nUsed);
+                mapPointId.set(pointi, nUsed);
 
                 ++nUsed;
             }
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index fa67abf460..d28b966698 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -985,50 +985,50 @@ void Foam::extendedEdgeMesh::add(const extendedEdgeMesh& fem)
     labelList reversePointMap(points().size());
     labelList reverseFemPointMap(fem.points().size());
 
-    label newPointI = 0;
+    label newPointi = 0;
     for (label i = 0; i < concaveStart(); i++)
     {
-        reversePointMap[i] = newPointI++;
+        reversePointMap[i] = newPointi++;
     }
     for (label i = 0; i < fem.concaveStart(); i++)
     {
-        reverseFemPointMap[i] = newPointI++;
+        reverseFemPointMap[i] = newPointi++;
     }
 
     // Concave
-    label newConcaveStart = newPointI;
+    label newConcaveStart = newPointi;
     for (label i = concaveStart(); i < mixedStart(); i++)
     {
-        reversePointMap[i] = newPointI++;
+        reversePointMap[i] = newPointi++;
     }
     for (label i = fem.concaveStart(); i < fem.mixedStart(); i++)
     {
-        reverseFemPointMap[i] = newPointI++;
+        reverseFemPointMap[i] = newPointi++;
     }
 
     // Mixed
-    label newMixedStart = newPointI;
+    label newMixedStart = newPointi;
     for (label i = mixedStart(); i < nonFeatureStart(); i++)
     {
-        reversePointMap[i] = newPointI++;
+        reversePointMap[i] = newPointi++;
     }
     for (label i = fem.mixedStart(); i < fem.nonFeatureStart(); i++)
     {
-        reverseFemPointMap[i] = newPointI++;
+        reverseFemPointMap[i] = newPointi++;
     }
 
     // Non-feature
-    label newNonFeatureStart = newPointI;
+    label newNonFeatureStart = newPointi;
     for (label i = nonFeatureStart(); i < points().size(); i++)
     {
-        reversePointMap[i] = newPointI++;
+        reversePointMap[i] = newPointi++;
     }
     for (label i = fem.nonFeatureStart(); i < fem.points().size(); i++)
     {
-        reverseFemPointMap[i] = newPointI++;
+        reverseFemPointMap[i] = newPointi++;
     }
 
-    pointField newPoints(newPointI);
+    pointField newPoints(newPointi);
     newPoints.rmap(points(), reversePointMap);
     newPoints.rmap(fem.points(), reverseFemPointMap);
 
@@ -1234,17 +1234,17 @@ void Foam::extendedEdgeMesh::flipNormals()
 
     // Flip convex and concave points
 
-    label newPointI = 0;
+    label newPointi = 0;
     // Concave points become convex
     for (label i = concaveStart(); i < mixedStart(); i++)
     {
-        reversePointMap[i] = newPointI++;
+        reversePointMap[i] = newPointi++;
     }
     // Convex points become concave
-    label newConcaveStart = newPointI;
+    label newConcaveStart = newPointi;
     for (label i = 0; i < concaveStart(); i++)
     {
-        reversePointMap[i] = newPointI++;
+        reversePointMap[i] = newPointi++;
     }
 
 
diff --git a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
index 901eac5232..ecaef7ea0e 100644
--- a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
@@ -122,9 +122,9 @@ void Foam::ensightSetWriter<Type>::write
 
         for (direction cmpt = 0; cmpt < vector::nComponents; cmpt++)
         {
-            forAll(points, pointI)
+            forAll(points, pointi)
             {
-                const scalar comp = points[pointI][cmpt];
+                const scalar comp = points[pointi][cmpt];
                 if (mag(comp) >= scalar(floatScalarVSMALL))
                 {
                     os  << setw(12) << comp << nl;
@@ -137,9 +137,9 @@ void Foam::ensightSetWriter<Type>::write
         }
         os  << "point" << nl
             << setw(10) << points.size() << nl;
-        forAll(points, pointI)
+        forAll(points, pointi)
         {
-            os  << setw(10) << pointI+1 << nl;
+            os  << setw(10) << pointi+1 << nl;
         }
     }
 
@@ -240,9 +240,9 @@ void Foam::ensightSetWriter<Type>::write
 
             for (direction cmpt = 0; cmpt < vector::nComponents; cmpt++)
             {
-                forAll(points, pointI)
+                forAll(points, pointi)
                 {
-                    const scalar comp = points[pointI][cmpt];
+                    const scalar comp = points[pointi][cmpt];
                     if (mag(comp) >= scalar(floatScalarVSMALL))
                     {
                         os  << setw(12) << comp << nl;
diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
index 4663b0878f..ac33b1c6e9 100644
--- a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
@@ -90,13 +90,13 @@ void Foam::vtkSetWriter<Type>::write
 
         const Field<Type>& fld = *valueSets[setI];
 
-        forAll(fld, pointI)
+        forAll(fld, pointi)
         {
-            if (pointI != 0)
+            if (pointi != 0)
             {
                 os  << ' ';
             }
-            writer<Type>::write(fld[pointI], os);
+            writer<Type>::write(fld[pointi], os);
         }
         os  << nl;
     }
diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/fileFormats/sampledSetWriters/writer.C
index aa195da043..036de180ba 100644
--- a/src/fileFormats/sampledSetWriters/writer.C
+++ b/src/fileFormats/sampledSetWriters/writer.C
@@ -77,17 +77,17 @@ template<class Type>
 void Foam::writer<Type>::writeCoord
 (
     const coordSet& points,
-    const label pointI,
+    const label pointi,
     Ostream& os
 ) const
 {
     if (points.hasVectorAxis())
     {
-        write(points.vectorCoord(pointI), os);
+        write(points.vectorCoord(pointi), os);
     }
     else
     {
-        write(points.scalarCoord(pointI), os);
+        write(points.scalarCoord(pointi), os);
     }
 }
 
@@ -100,11 +100,11 @@ void Foam::writer<Type>::writeTable
     Ostream& os
 ) const
 {
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        writeCoord(points, pointI, os);
+        writeCoord(points, pointi, os);
         writeSeparator(os);
-        write(values[pointI], os);
+        write(values[pointi], os);
         os << nl;
     }
 }
@@ -118,16 +118,16 @@ void Foam::writer<Type>::writeTable
     Ostream& os
 ) const
 {
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        writeCoord(points, pointI, os);
+        writeCoord(points, pointi, os);
 
         forAll(valuesPtrList, i)
         {
             writeSeparator(os);
 
             const List<Type>& values = *valuesPtrList[i];
-            write(values[pointI], os);
+            write(values[pointi], os);
         }
         os << nl;
     }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
index 9253d9259d..540828b1a0 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
@@ -42,15 +42,15 @@ void Foam::CPCCellToCellStencil::calcPointBoundaryData
 
     forAll(boundaryPoints, i)
     {
-        label pointI = boundaryPoints[i];
+        label pointi = boundaryPoints[i];
 
         neiGlobal.insert
         (
-            pointI,
+            pointi,
             calcFaceCells
             (
                 isValidBFace,
-                mesh().pointFaces()[pointI],
+                mesh().pointFaces()[pointi],
                 pointGlobals
             )
         );
@@ -95,12 +95,12 @@ void Foam::CPCCellToCellStencil::calcCellStencil
 
     forAll(boundaryPoints, i)
     {
-        label pointI = boundaryPoints[i];
+        label pointi = boundaryPoints[i];
 
-        const labelList& pGlobals = neiGlobal[pointI];
+        const labelList& pGlobals = neiGlobal[pointi];
 
         // Distribute to all pointCells
-        const labelList& pCells = mesh().pointCells(pointI);
+        const labelList& pCells = mesh().pointCells(pointi);
 
         forAll(pCells, j)
         {
@@ -120,19 +120,19 @@ void Foam::CPCCellToCellStencil::calcCellStencil
     // Do remaining points cells
     labelHashSet pointGlobals;
 
-    for (label pointI = 0; pointI < mesh().nPoints(); pointI++)
+    for (label pointi = 0; pointi < mesh().nPoints(); pointi++)
     {
         labelList pGlobals
         (
             calcFaceCells
             (
                 isValidBFace,
-                mesh().pointFaces()[pointI],
+                mesh().pointFaces()[pointi],
                 pointGlobals
             )
         );
 
-        const labelList& pCells = mesh().pointCells(pointI);
+        const labelList& pCells = mesh().pointCells(pointi);
 
         forAll(pCells, j)
         {
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index 8a5dfdc92b..101b60c59b 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -364,10 +364,10 @@ void Foam::singleCellFvMesh::agglomerateMesh
 
             forAll(oldFz, i)
             {
-                label newPointI  = reversePointMap_[oldFz[i]];
-                if (newPointI != -1)
+                label newPointi  = reversePointMap_[oldFz[i]];
+                if (newPointi != -1)
                 {
-                    newAddressing.append(newPointI);
+                    newAddressing.append(newPointi);
                 }
             }
 
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
index 26c22dc349..47d9ab90d9 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
@@ -187,19 +187,19 @@ void Foam::pointConstraints::makePatchPatchAddressing()
         globalPointSlavesMap.distribute(constraints);
 
         // Combine master with slave constraints
-        forAll(globalPointSlaves, pointI)
+        forAll(globalPointSlaves, pointi)
         {
-            const labelList& slaves = globalPointSlaves[pointI];
+            const labelList& slaves = globalPointSlaves[pointi];
 
             // Combine master constraint with slave constraints
             forAll(slaves, i)
             {
-                constraints[pointI].combine(constraints[slaves[i]]);
+                constraints[pointi].combine(constraints[slaves[i]]);
             }
             // Duplicate master constraint into slave slots
             forAll(slaves, i)
             {
-                constraints[slaves[i]] = constraints[pointI];
+                constraints[slaves[i]] = constraints[pointi];
             }
         }
 
@@ -211,23 +211,23 @@ void Foam::pointConstraints::makePatchPatchAddressing()
         );
 
         // Add back into patchPatch constraints
-        forAll(constraints, coupledPointI)
+        forAll(constraints, coupledPointi)
         {
-            if (constraints[coupledPointI].first() != 0)
+            if (constraints[coupledPointi].first() != 0)
             {
-                label meshPointI = cpMeshPoints[coupledPointI];
+                label meshPointi = cpMeshPoints[coupledPointi];
 
-                Map<label>::iterator iter = patchPatchPointSet.find(meshPointI);
+                Map<label>::iterator iter = patchPatchPointSet.find(meshPointi);
 
                 label constraintI = -1;
 
                 if (iter == patchPatchPointSet.end())
                 {
-                    //Pout<< indent << "on meshpoint:" << meshPointI
-                    //    << " coupled:" << coupledPointI
-                    //    << " at:" << mesh.points()[meshPointI]
+                    //Pout<< indent << "on meshpoint:" << meshPointi
+                    //    << " coupled:" << coupledPointi
+                    //    << " at:" << mesh.points()[meshPointi]
                     //    << " have new constraint:"
-                    //    << constraints[coupledPointI]
+                    //    << constraints[coupledPointi]
                     //    << endl;
 
                     // Allocate new constraint
@@ -235,17 +235,17 @@ void Foam::pointConstraints::makePatchPatchAddressing()
                     {
                         patchPatchPoints.setSize(pppi+100);
                     }
-                    patchPatchPointSet.insert(meshPointI, pppi);
-                    patchPatchPoints[pppi] = meshPointI;
+                    patchPatchPointSet.insert(meshPointi, pppi);
+                    patchPatchPoints[pppi] = meshPointi;
                     constraintI = pppi++;
                 }
                 else
                 {
-                    //Pout<< indent << "on meshpoint:" << meshPointI
-                    //    << " coupled:" << coupledPointI
-                    //    << " at:" << mesh.points()[meshPointI]
+                    //Pout<< indent << "on meshpoint:" << meshPointi
+                    //    << " coupled:" << coupledPointi
+                    //    << " at:" << mesh.points()[meshPointi]
                     //    << " have possibly extended constraint:"
-                    //    << constraints[coupledPointI]
+                    //    << constraints[coupledPointi]
                     //    << endl;
 
                     constraintI = iter();
@@ -255,7 +255,7 @@ void Foam::pointConstraints::makePatchPatchAddressing()
                 // on coupled.
                 patchPatchPointConstraints_[constraintI].combine
                 (
-                    constraints[coupledPointI]
+                    constraints[coupledPointi]
                 );
             }
         }
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index d318331699..4bd21004f6 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -228,14 +228,14 @@ void Foam::volPointInterpolation::interpolateBoundaryField
 
     forAll(boundary.meshPoints(), i)
     {
-        label pointI = boundary.meshPoints()[i];
+        label pointi = boundary.meshPoints()[i];
 
-        if (isPatchPoint_[pointI])
+        if (isPatchPoint_[pointi])
         {
             const labelList& pFaces = boundary.pointFaces()[i];
             const scalarList& pWeights = boundaryPointWeights_[i];
 
-            Type& val = pfi[pointI];
+            Type& val = pfi[pointi];
 
             val = Zero;
             forAll(pFaces, j)
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
index 41c5d716d9..6a4cb4df1e 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
@@ -116,13 +116,13 @@ void Foam::volPointInterpolation::calcBoundaryAddressing()
             orEqOp<bool>()
         );
 
-        forAll(isPatchPoint_, pointI)
+        forAll(isPatchPoint_, pointi)
         {
-            if (isPatchPoint_[pointI] != oldData[pointI])
+            if (isPatchPoint_[pointi] != oldData[pointi])
             {
                 Pout<< "volPointInterpolation::calcBoundaryAddressing():"
-                    << " added dangling mesh point:" << pointI
-                    << " at:" << mesh().points()[pointI]
+                    << " added dangling mesh point:" << pointi
+                    << " at:" << mesh().points()[pointi]
                     << endl;
             }
         }
@@ -210,16 +210,16 @@ void Foam::volPointInterpolation::makeBoundaryWeights(scalarField& sumWeights)
 
     forAll(boundary.meshPoints(), i)
     {
-        label pointI = boundary.meshPoints()[i];
+        label pointi = boundary.meshPoints()[i];
 
-        if (isPatchPoint_[pointI])
+        if (isPatchPoint_[pointi])
         {
             const labelList& pFaces = boundary.pointFaces()[i];
 
             scalarList& pw = boundaryPointWeights_[i];
             pw.setSize(pFaces.size());
 
-            sumWeights[pointI] = 0.0;
+            sumWeights[pointi] = 0.0;
 
             forAll(pFaces, i)
             {
@@ -227,8 +227,8 @@ void Foam::volPointInterpolation::makeBoundaryWeights(scalarField& sumWeights)
                 {
                     label facei = mesh().nInternalFaces() + pFaces[i];
 
-                    pw[i] = 1.0/mag(points[pointI] - faceCentres[facei]);
-                    sumWeights[pointI] += pw[i];
+                    pw[i] = 1.0/mag(points[pointi] - faceCentres[facei]);
+                    sumWeights[pointi] += pw[i];
                 }
                 else
                 {
@@ -277,13 +277,13 @@ void Foam::volPointInterpolation::makeWeights()
 
     //forAll(boundary.meshPoints(), i)
     //{
-    //    label pointI = boundary.meshPoints()[i];
+    //    label pointi = boundary.meshPoints()[i];
     //
-    //    if (isPatchPoint_[pointI])
+    //    if (isPatchPoint_[pointi])
     //    {
     //        Pout<< "Calculated Weight at boundary point:" << i
-    //            << " at:" << mesh().points()[pointI]
-    //            << " sumWeight:" << sumWeights[pointI]
+    //            << " at:" << mesh().points()[pointi]
+    //            << " sumWeight:" << sumWeights[pointi]
     //            << " from:" << boundaryPointWeights_[i]
     //            << endl;
     //    }
@@ -309,13 +309,13 @@ void Foam::volPointInterpolation::makeWeights()
 
 
     // Normalise internal weights
-    forAll(pointWeights_, pointI)
+    forAll(pointWeights_, pointi)
     {
-        scalarList& pw = pointWeights_[pointI];
+        scalarList& pw = pointWeights_[pointi];
         // Note:pw only sized for !isPatchPoint
         forAll(pw, i)
         {
-            pw[i] /= sumWeights[pointI];
+            pw[i] /= sumWeights[pointi];
         }
     }
 
@@ -324,13 +324,13 @@ void Foam::volPointInterpolation::makeWeights()
 
     forAll(boundary.meshPoints(), i)
     {
-        label pointI = boundary.meshPoints()[i];
+        label pointi = boundary.meshPoints()[i];
 
         scalarList& pw = boundaryPointWeights_[i];
         // Note:pw only sized for isPatchPoint
         forAll(pw, i)
         {
-            pw[i] /= sumWeights[pointI];
+            pw[i] /= sumWeights[pointi];
         }
     }
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
index 4d8db04150..0260a370d4 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
@@ -175,9 +175,9 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
 
             forAll(pz, i)
             {
-                label pointI = pz[i];
+                label pointi = pz[i];
 
-                pointLocation_()[pointI][cmpt_] = points0_[pointI];
+                pointLocation_()[pointi][cmpt_] = points0_[pointi];
             }
         }
 
@@ -203,9 +203,9 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
 
             forAll(pz, i)
             {
-                label pointI = pz[i];
+                label pointi = pz[i];
 
-                curPoints[pointI][cmpt_] = points0_[pointI];
+                curPoints[pointi][cmpt_] = points0_[pointi];
             }
         }
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
index 7c3f889de1..9acd5302ad 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
@@ -136,8 +136,8 @@ displacementInterpolationMotionSolver
 
             forAll(fz().meshPoints(), localI)
             {
-                label pointI = fz().meshPoints()[localI];
-                const scalar coord = points0()[pointI][dir];
+                label pointi = fz().meshPoints()[localI];
+                const scalar coord = points0()[pointi][dir];
                 minCoord = min(minCoord, coord);
                 maxCoord = max(maxCoord, coord);
             }
@@ -240,15 +240,15 @@ displacementInterpolationMotionSolver
         // Count all the points inbetween rangeI and rangeI+1
         labelList nRangePoints(rangeToCoord.size(), 0);
 
-        forAll(meshCoords, pointI)
+        forAll(meshCoords, pointi)
         {
-            label rangeI = findLower(rangeToCoord, meshCoords[pointI]);
+            label rangeI = findLower(rangeToCoord, meshCoords[pointi]);
 
             if (rangeI == -1 || rangeI == rangeToCoord.size()-1)
             {
                 FatalErrorInFunction
-                    << "Did not find point " << points0()[pointI]
-                    << " coordinate " << meshCoords[pointI]
+                    << "Did not find point " << points0()[pointi]
+                    << " coordinate " << meshCoords[pointi]
                     << " in ranges " << rangeToCoord
                     << abort(FatalError);
             }
@@ -277,13 +277,13 @@ displacementInterpolationMotionSolver
             rangeWeights[rangeI].setSize(nRangePoints[rangeI]);
         }
         nRangePoints = 0;
-        forAll(meshCoords, pointI)
+        forAll(meshCoords, pointi)
         {
-            label rangeI = findLower(rangeToCoord, meshCoords[pointI]);
+            label rangeI = findLower(rangeToCoord, meshCoords[pointi]);
             label& nPoints = nRangePoints[rangeI];
-            rangePoints[rangeI][nPoints] = pointI;
+            rangePoints[rangeI][nPoints] = pointi;
             rangeWeights[rangeI][nPoints] =
-                (meshCoords[pointI]-rangeToCoord[rangeI])
+                (meshCoords[pointi]-rangeToCoord[rangeI])
               / (rangeToCoord[rangeI+1]-rangeToCoord[rangeI]);
             nPoints++;
         }
@@ -359,10 +359,10 @@ Foam::displacementInterpolationMotionSolver::curPoints() const
 
             forAll(rPoints, i)
             {
-                label pointI = rPoints[i];
+                label pointi = rPoints[i];
                 scalar w = rWeights[i];
-                //curPoints[pointI] += (1.0-w)*minDisp+w*maxDisp;
-                curPoints[pointI][dir] += (1.0-w)*minDisp+w*maxDisp;
+                //curPoints[pointi] += (1.0-w)*minDisp+w*maxDisp;
+                curPoints[pointi][dir] += (1.0-w)*minDisp+w*maxDisp;
             }
         }
     }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index 0f8c44b35c..44762576f2 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -73,11 +73,11 @@ void Foam::displacementLayeredMotionMotionSolver::calcZoneMask
         forAll(cz, i)
         {
             const labelList& cPoints = mesh().cellPoints(cz[i]);
-            forAll(cPoints, cPointI)
+            forAll(cPoints, cPointi)
             {
-                if (!isZonePoint[cPoints[cPointI]])
+                if (!isZonePoint[cPoints[cPointi]])
                 {
-                    isZonePoint[cPoints[cPointI]] = 1;
+                    isZonePoint[cPoints[cPointi]] = 1;
                     nPoints++;
                 }
             }
@@ -155,13 +155,13 @@ void Foam::displacementLayeredMotionMotionSolver::walkStructured
     // Mark points inside cellZone.
     // Note that we use points0, not mesh.points()
     // so as not to accumulate errors.
-    forAll(isZonePoint, pointI)
+    forAll(isZonePoint, pointi)
     {
-        if (isZonePoint[pointI])
+        if (isZonePoint[pointi])
         {
-            allPointInfo[pointI] = pointEdgeStructuredWalk
+            allPointInfo[pointi] = pointEdgeStructuredWalk
             (
-                points0()[pointI],  // location of data
+                points0()[pointi],  // location of data
                 vector::max,        // not valid
                 0.0,
                 Zero        // passive data
@@ -200,12 +200,12 @@ void Foam::displacementLayeredMotionMotionSolver::walkStructured
     );
 
     // Extract distance and passive data
-    forAll(allPointInfo, pointI)
+    forAll(allPointInfo, pointi)
     {
-        if (isZonePoint[pointI])
+        if (isZonePoint[pointi])
         {
-            distance[pointI] = allPointInfo[pointI].dist();
-            data[pointI] = allPointInfo[pointI].data();
+            distance[pointi] = allPointInfo[pointi].dist();
+            data[pointi] = allPointInfo[pointi].data();
         }
     }
 }
@@ -428,14 +428,14 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
             dimensionedScalar("zero", dimLength, 0.0)
         );
 
-        forAll(distance, pointI)
+        forAll(distance, pointi)
         {
-            scalar d1 = patchDist[0][pointI];
-            scalar d2 = patchDist[1][pointI];
+            scalar d1 = patchDist[0][pointi];
+            scalar d2 = patchDist[1][pointi];
             if (d1 + d2 > SMALL)
             {
                 scalar s = d1/(d1 + d2);
-                distance[pointI] = s;
+                distance[pointi] = s;
             }
         }
 
@@ -450,28 +450,28 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
 
     if (interpolationScheme == "oneSided")
     {
-        forAll(pointDisplacement_, pointI)
+        forAll(pointDisplacement_, pointi)
         {
-            if (isZonePoint[pointI])
+            if (isZonePoint[pointi])
             {
-                pointDisplacement_[pointI] = patchDisp[0][pointI];
+                pointDisplacement_[pointi] = patchDisp[0][pointi];
             }
         }
     }
     else if (interpolationScheme == "linear")
     {
-        forAll(pointDisplacement_, pointI)
+        forAll(pointDisplacement_, pointi)
         {
-            if (isZonePoint[pointI])
+            if (isZonePoint[pointi])
             {
-                scalar d1 = patchDist[0][pointI];
-                scalar d2 = patchDist[1][pointI];
+                scalar d1 = patchDist[0][pointi];
+                scalar d2 = patchDist[1][pointi];
                 scalar s = d1/(d1 + d2 + VSMALL);
 
-                const vector& pd1 = patchDisp[0][pointI];
-                const vector& pd2 = patchDisp[1][pointI];
+                const vector& pd1 = patchDisp[0][pointi];
+                const vector& pd2 = patchDisp[1][pointi];
 
-                pointDisplacement_[pointI] = (1 - s)*pd1 + s*pd2;
+                pointDisplacement_[pointi] = (1 - s)*pd1 + s*pd2;
             }
         }
     }
@@ -565,21 +565,21 @@ void Foam::displacementLayeredMotionMotionSolver::updateMesh
 
     const vectorField displacement(this->newPoints() - points0_);
 
-    forAll(points0_, pointI)
+    forAll(points0_, pointi)
     {
-        label oldPointI = mpm.pointMap()[pointI];
+        label oldPointi = mpm.pointMap()[pointi];
 
-        if (oldPointI >= 0)
+        if (oldPointi >= 0)
         {
-            label masterPointI = mpm.reversePointMap()[oldPointI];
+            label masterPointi = mpm.reversePointMap()[oldPointi];
 
-            if ((masterPointI != pointI))
+            if ((masterPointi != pointi))
             {
                 // newly inserted point in this cellZone
 
                 // need to set point0 so that it represents the position that
                 // it would have had if it had existed for all time
-                points0_[pointI] -= displacement[pointI];
+                points0_[pointi] -= displacement[pointi];
             }
         }
     }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
index 1aa7884f52..ce3ff615d3 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ class displacementLayeredMotionMotionSolver
             const labelList& meshPoints,
             const dictionary& dict,
             const PtrList<pointVectorField>& patchDisp,
-            const label patchI
+            const label patchi
         ) const;
 
         void cellZoneSolve
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
index 604e8ef0f4..387217ca91 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ public:
             inline void leaveDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -139,7 +139,7 @@ public:
             inline void enterDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -157,7 +157,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const label edgeI,
                 const pointEdgeStructuredWalk& edgeInfo,
                 const scalar tol,
@@ -170,7 +170,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const pointEdgeStructuredWalk& newPointInfo,
                 const scalar tol,
                 TrackingData& td
@@ -192,7 +192,7 @@ public:
             (
                 const polyMesh& mesh,
                 const label edgeI,
-                const label pointI,
+                const label pointi,
                 const pointEdgeStructuredWalk& pointInfo,
                 const scalar tol,
                 TrackingData& td
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
index a01394dd7a..218a14c4cd 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
@@ -147,7 +147,7 @@ template<class TrackingData>
 inline void Foam::pointEdgeStructuredWalk::leaveDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -173,7 +173,7 @@ template<class TrackingData>
 inline void Foam::pointEdgeStructuredWalk::enterDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -188,7 +188,7 @@ template<class TrackingData>
 inline bool Foam::pointEdgeStructuredWalk::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const label edgeI,
     const pointEdgeStructuredWalk& edgeInfo,
     const scalar tol,
@@ -211,7 +211,7 @@ template<class TrackingData>
 inline bool Foam::pointEdgeStructuredWalk::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const pointEdgeStructuredWalk& newPointInfo,
     const scalar tol,
     TrackingData& td
@@ -247,7 +247,7 @@ inline bool Foam::pointEdgeStructuredWalk::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
-    const label pointI,
+    const label pointi,
     const pointEdgeStructuredWalk& pointInfo,
     const scalar tol,
     TrackingData& td
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
index 4fa06db981..763f8d68f5 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
@@ -102,18 +102,18 @@ void Foam::inversePointDistanceDiffusivity::correct()
 
             forAll(meshPoints, i)
             {
-                label pointI = meshPoints[i];
+                label pointi = meshPoints[i];
 
-                if (!pointWallDist[pointI].valid(dummyTrackData))
+                if (!pointWallDist[pointi].valid(dummyTrackData))
                 {
                     // Not yet seeded
                     seedInfo[nPatchEdges] = pointEdgePoint
                     (
-                        mesh().points()[pointI],
+                        mesh().points()[pointi],
                         0.0
                     );
-                    seedPoints[nPatchEdges] = pointI;
-                    pointWallDist[pointI] = seedInfo[nPatchEdges];
+                    seedPoints[nPatchEdges] = pointi;
+                    pointWallDist[pointi] = seedInfo[nPatchEdges];
 
                     nPatchEdges++;
                 }
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H
index f21642de45..c9b81509d7 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H
@@ -265,7 +265,7 @@ public:
             (
                 const polyPatch&,
                 TrackData& td,
-                const label patchI,
+                const label patchi,
                 const scalar trackFraction,
                 const tetIndices& tetIs
             );
diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C
index bf497dd2c8..e8ce9f9da0 100644
--- a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C
+++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Foam::referredWallFace::referredWallFace()
 :
     face(),
     pts_(),
-    patchI_()
+    patchi_()
 {}
 
 
@@ -39,12 +39,12 @@ Foam::referredWallFace::referredWallFace
 (
     const face& f,
     const pointField& pts,
-    label patchI
+    label patchi
 )
 :
     face(f),
     pts_(pts),
-    patchI_(patchI)
+    patchi_(patchi)
 {
     if (this->size() != pts_.size())
     {
@@ -59,7 +59,7 @@ Foam::referredWallFace::referredWallFace(const referredWallFace& rWF)
 :
     face(rWF),
     pts_(rWF.pts_),
-    patchI_(rWF.patchI_)
+    patchi_(rWF.patchi_)
 {
     if (this->size() != pts_.size())
     {
@@ -84,7 +84,7 @@ bool Foam::referredWallFace::operator==(const referredWallFace& rhs) const
     (
         static_cast<const face&>(rhs) == static_cast<face>(*this)
      && rhs.pts_ == pts_
-     && rhs.patchI_ == patchI_
+     && rhs.patchi_ == patchi_
     );
 }
 
@@ -99,7 +99,7 @@ bool Foam::referredWallFace::operator!=(const referredWallFace& rhs) const
 
 Foam::Istream& Foam::operator>>(Istream& is, referredWallFace& rWF)
 {
-    is  >> static_cast<face&>(rWF) >> rWF.pts_ >> rWF.patchI_;
+    is  >> static_cast<face&>(rWF) >> rWF.pts_ >> rWF.patchi_;
 
     // Check state of Istream
     is.check
@@ -116,7 +116,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const referredWallFace& rWF)
 {
     os  << static_cast<const face&>(rWF) << token::SPACE
         << rWF.pts_ << token::SPACE
-        << rWF.patchI_;
+        << rWF.patchi_;
 
     // Check state of Ostream
     os.check
diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H
index a1d5cfca96..5c20c81092 100644
--- a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H
+++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ class referredWallFace
         pointField pts_;
 
         //- Index of originating patch
-        label patchI_;
+        label patchi_;
 
 
 public:
@@ -84,7 +84,7 @@ public:
         (
             const face& f,
             const pointField& pts,
-            label patchI
+            label patchi
         );
 
         //- Construct as copy
diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H
index f377aac2d9..0e13b3f167 100644
--- a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H
+++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,13 +41,13 @@ Foam::pointField& Foam::referredWallFace::points()
 
 Foam::label Foam::referredWallFace::patchIndex() const
 {
-    return patchI_;
+    return patchi_;
 }
 
 
 Foam::label& Foam::referredWallFace::patchIndex()
 {
-    return patchI_;
+    return patchi_;
 }
 
 
diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H
index 94264587f0..d6f1855edb 100644
--- a/src/lagrangian/basic/particle/particle.H
+++ b/src/lagrangian/basic/particle/particle.H
@@ -249,7 +249,7 @@ protected:
         (
             const polyPatch&,
             TrackData& td,
-            const label patchI,
+            const label patchi,
             const scalar trackFraction,
             const tetIndices& tetIs
         );
@@ -481,7 +481,7 @@ public:
             //- Which face of this patch is this particle on
             inline label patchFace
             (
-                const label patchI,
+                const label patchi,
                 const label facei
             ) const;
 
@@ -550,12 +550,12 @@ public:
         //- Convert global addressing to the processor patch
         //  local equivalents
         template<class TrackData>
-        void prepareForParallelTransfer(const label patchI, TrackData& td);
+        void prepareForParallelTransfer(const label patchi, TrackData& td);
 
         //- Convert processor patch addressing to the global equivalents
         //  and set the celli to the face-neighbour
         template<class TrackData>
-        void correctAfterParallelTransfer(const label patchI, TrackData& td);
+        void correctAfterParallelTransfer(const label patchi, TrackData& td);
 
 
     // I-O
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 7483deca46..d159423646 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -386,7 +386,7 @@ bool Foam::KinematicParcel<ParcelType>::hitPatch
 (
     const polyPatch& pp,
     TrackData& td,
-    const label patchI,
+    const label patchi,
     const scalar trackFraction,
     const tetIndices& tetIs
 )
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 75a85c72c3..f5e57a3928 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -586,7 +586,7 @@ public:
             (
                 const polyPatch& p,
                 TrackData& td,
-                const label patchI,
+                const label patchi,
                 const scalar trackFraction,
                 const tetIndices& tetIs
             );
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
index 6e73fbcaaa..bdf65c6705 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
@@ -80,7 +80,7 @@ protected:
 
     // Protected Member Functions
 
-        //- Returns local patchI if patch is in patchIds_ list
+        //- Returns local patchi if patch is in patchIds_ list
         label applyToPatch(const label globalPatchi) const;
 
         //- Write post-processing info
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
index 4c1b5588cf..51bb0b3bb1 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
@@ -70,7 +70,7 @@ class PatchPostProcessing
 
     // Private Member Functions
 
-        //- Returns local patchI if patch is in patchIds_ list
+        //- Returns local patchi if patch is in patchIds_ list
         label applyToPatch(const label globalPatchi) const;
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C
index 595881a10c..f14910bb90 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class Type>
 Foam::WallSiteData<Type>::WallSiteData()
 :
-    patchI_(),
+    patchi_(),
     wallData_()
 {}
 
@@ -38,11 +38,11 @@ Foam::WallSiteData<Type>::WallSiteData()
 template<class Type>
 Foam::WallSiteData<Type>::WallSiteData
 (
-    label patchI,
+    label patchi,
     const Type& wallData
 )
 :
-    patchI_(patchI),
+    patchi_(patchi),
     wallData_(wallData)
 {}
 
@@ -62,7 +62,7 @@ bool Foam::WallSiteData<Type>::operator==
     const WallSiteData<Type>& rhs
 ) const
 {
-    return patchI_ == rhs.patchI_ && wallData_ == rhs.wallData_;
+    return patchi_ == rhs.patchi_ && wallData_ == rhs.wallData_;
 }
 
 
@@ -85,7 +85,7 @@ Foam::Istream& Foam::operator>>
     WallSiteData<Type>& wIS
 )
 {
-    is  >> wIS.patchI_ >> wIS.wallData_;
+    is  >> wIS.patchi_ >> wIS.wallData_;
 
     // Check state of Istream
     is.check
@@ -105,7 +105,7 @@ Foam::Ostream& Foam::operator<<
     const WallSiteData<Type>& wIS
 )
 {
-    os  << wIS.patchI_ << token::SPACE << wIS.wallData_;
+    os  << wIS.patchi_ << token::SPACE << wIS.wallData_;
 
     // Check state of Ostream
     os.check
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H
index cb169750d5..4ceb978644 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H
@@ -67,7 +67,7 @@ class WallSiteData
     // Private data
 
         //- Index of originating patch
-        label patchI_;
+        label patchi_;
 
         //- Wall data
         Type wallData_;
@@ -83,7 +83,7 @@ public:
         //- Construct from components
         WallSiteData
         (
-            label patchI,
+            label patchi,
             const Type& wallData
         );
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H
index 150f924371..c127c7b42a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,14 +30,14 @@ License
 template<class Type>
 Foam::label Foam::WallSiteData<Type>::patchIndex() const
 {
-    return patchI_;
+    return patchi_;
 }
 
 
 template<class Type>
 Foam::label& Foam::WallSiteData<Type>::patchIndex()
 {
-    return patchI_;
+    return patchi_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index 80ba549d97..c9c473a839 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -219,13 +219,13 @@ bool Foam::AveragingMethod<Type>::write() const
 
             forAll(vertices, vertexI)
             {
-                const label pointI = vertices[vertexI];
+                const label pointi = vertices[vertexI];
 
-                pointVolume[pointI] += v;
-                pointValue[pointI] +=
-                    v*interpolate(mesh_.points()[pointI], tetIs);
-                pointGrad[pointI] +=
-                    v*interpolateGrad(mesh_.points()[pointI], tetIs);
+                pointVolume[pointi] += v;
+                pointValue[pointi] +=
+                    v*interpolate(mesh_.points()[pointi], tetIs);
+                pointGrad[pointi] +=
+                    v*interpolateGrad(mesh_.points()[pointi], tetIs);
             }
         }
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
index 5fb73664d6..754f3a51ef 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
@@ -342,7 +342,7 @@ public:
         (
             const polyPatch&,
             trackingData& td,
-            const label patchI,
+            const label patchi,
             const scalar trackFraction,
             const tetIndices& tetIs
         );
diff --git a/src/lagrangian/solidParticle/solidParticle.H b/src/lagrangian/solidParticle/solidParticle.H
index 57cf8edaca..ae848b6ef9 100644
--- a/src/lagrangian/solidParticle/solidParticle.H
+++ b/src/lagrangian/solidParticle/solidParticle.H
@@ -192,7 +192,7 @@ public:
             (
                 const polyPatch&,
                 trackingData& td,
-                const label patchI,
+                const label patchi,
                 const scalar trackFraction,
                 const tetIndices& tetIs
             );
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
index 36bd5e3b6c..826820ca26 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
@@ -82,15 +82,15 @@ void Foam::blockMesh::createPoints() const
                 << endl;
         }
 
-        forAll(blockPoints, blockPointI)
+        forAll(blockPoints, blockPointi)
         {
             points_
             [
                 mergeList_
                 [
-                    blockOffsets_[blockI] + blockPointI
+                    blockOffsets_[blockI] + blockPointi
                 ]
-            ] = scaleFactor_ * blockPoints[blockPointI];
+            ] = scaleFactor_ * blockPoints[blockPointi];
         }
     }
 }
@@ -122,12 +122,12 @@ void Foam::blockMesh::createCells() const
         {
             labelList cellPoints(blockCells[blockCelli].size());
 
-            forAll(cellPoints, cellPointI)
+            forAll(cellPoints, cellPointi)
             {
-                cellPoints[cellPointI] =
+                cellPoints[cellPointi] =
                     mergeList_
                     [
-                        blockCells[blockCelli][cellPointI]
+                        blockCells[blockCelli][cellPointi]
                       + blockOffsets_[blockI]
                     ];
             }
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index f32bcca5b7..eaf133989f 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -181,12 +181,12 @@ void Foam::medialAxisMeshMover::smoothPatchNormals
         }
 
         // Transfer to normals vector field
-        forAll(average, pointI)
+        forAll(average, pointi)
         {
             // full smoothing neighbours + point value
-            average[pointI] = 0.5*(normals[pointI]+average[pointI]);
-            normals[pointI] = average[pointI];
-            normals[pointI] /= mag(normals[pointI]) + VSMALL;
+            average[pointi] = 0.5*(normals[pointi]+average[pointi]);
+            normals[pointi] = average[pointi];
+            normals[pointi] /= mag(normals[pointi]) + VSMALL;
         }
     }
 }
@@ -214,8 +214,8 @@ void Foam::medialAxisMeshMover::smoothNormals
     // Internal points that are fixed
     forAll(fixedPoints, i)
     {
-        label meshPointI = fixedPoints[i];
-        isFixedPoint.set(meshPointI, 1);
+        label meshPointi = fixedPoints[i];
+        isFixedPoint.set(meshPointi, 1);
     }
 
     // Make sure that points that are coupled to meshPoints but not on a patch
@@ -268,14 +268,14 @@ void Foam::medialAxisMeshMover::smoothNormals
 
 
         // Transfer to normals vector field
-        forAll(average, pointI)
+        forAll(average, pointi)
         {
-            if (isFixedPoint.get(pointI) == 0)
+            if (isFixedPoint.get(pointi) == 0)
             {
                 //full smoothing neighbours + point value
-                average[pointI] = 0.5*(normals[pointI]+average[pointI]);
-                normals[pointI] = average[pointI];
-                normals[pointI] /= mag(normals[pointI]) + VSMALL;
+                average[pointi] = 0.5*(normals[pointi]+average[pointi]);
+                normals[pointi] = average[pointi];
+                normals[pointi] /= mag(normals[pointi]) + VSMALL;
             }
         }
     }
@@ -463,15 +463,15 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
         // Seed data.
         List<pointData> wallInfo(meshPoints.size());
 
-        forAll(meshPoints, patchPointI)
+        forAll(meshPoints, patchPointi)
         {
-            label pointI = meshPoints[patchPointI];
-            wallInfo[patchPointI] = pointData
+            label pointi = meshPoints[patchPointi];
+            wallInfo[patchPointi] = pointData
             (
-                points[pointI],
+                points[pointi],
                 0.0,
-                pointI,                       // passive scalar
-                pointNormals[patchPointI]     // surface normals
+                pointi,                       // passive scalar
+                pointNormals[patchPointi]     // surface normals
             );
         }
 
@@ -546,22 +546,22 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                 // Unvisited point. See above about nUnvisit warning
                 forAll(e, ep)
                 {
-                    label pointI = e[ep];
+                    label pointi = e[ep];
 
-                    if (!pointMedialDist[pointI].valid(dummyTrackData))
+                    if (!pointMedialDist[pointi].valid(dummyTrackData))
                     {
-                        maxPoints.append(pointI);
+                        maxPoints.append(pointi);
                         maxInfo.append
                         (
                             pointData
                             (
-                                points[pointI],
+                                points[pointi],
                                 0.0,
-                                pointI,         // passive data
+                                pointi,         // passive data
                                 Zero    // passive data
                             )
                         );
-                        pointMedialDist[pointI] = maxInfo.last();
+                        pointMedialDist[pointi] = maxInfo.last();
                     }
                 }
 
@@ -602,22 +602,22 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
 
                     forAll(e, ep)
                     {
-                        label pointI = e[ep];
+                        label pointi = e[ep];
 
-                        if (!pointMedialDist[pointI].valid(dummyTrackData))
+                        if (!pointMedialDist[pointi].valid(dummyTrackData))
                         {
-                            maxPoints.append(pointI);
+                            maxPoints.append(pointi);
                             maxInfo.append
                             (
                                 pointData
                                 (
-                                    medialAxisPt,   //points[pointI],
-                                    magSqr(points[pointI]-medialAxisPt),//0.0,
-                                    pointI,         // passive data
+                                    medialAxisPt,   //points[pointi],
+                                    magSqr(points[pointi]-medialAxisPt),//0.0,
+                                    pointi,         // passive data
                                     Zero    // passive data
                                 )
                             );
-                            pointMedialDist[pointI] = maxInfo.last();
+                            pointMedialDist[pointi] = maxInfo.last();
                         }
                     }
                 }
@@ -660,21 +660,21 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
 
                     forAll(meshPoints, i)
                     {
-                        label pointI = meshPoints[i];
-                        if (!pointMedialDist[pointI].valid(dummyTrackData))
+                        label pointi = meshPoints[i];
+                        if (!pointMedialDist[pointi].valid(dummyTrackData))
                         {
-                            maxPoints.append(pointI);
+                            maxPoints.append(pointi);
                             maxInfo.append
                             (
                                 pointData
                                 (
-                                    points[pointI],
+                                    points[pointi],
                                     0.0,
-                                    pointI,         // passive data
+                                    pointi,         // passive data
                                     Zero    // passive data
                                 )
                             );
-                            pointMedialDist[pointI] = maxInfo.last();
+                            pointMedialDist[pointi] = maxInfo.last();
                         }
                     }
                 }
@@ -701,18 +701,18 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
 
                     forAll(meshPoints, i)
                     {
-                        label pointI = meshPoints[i];
+                        label pointi = meshPoints[i];
 
                         if
                         (
-                            pointWallDist[pointI].valid(dummyTrackData)
-                        && !pointMedialDist[pointI].valid(dummyTrackData)
+                            pointWallDist[pointi].valid(dummyTrackData)
+                        && !pointMedialDist[pointi].valid(dummyTrackData)
                         )
                         {
                             // Check if angle not too large.
                             scalar cosAngle =
                             (
-                               -pointWallDist[pointI].v()
+                               -pointWallDist[pointi].v()
                               & pointNormals[i]
                             );
                             if (cosAngle > slipFeatureAngleCos)
@@ -720,18 +720,18 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                                 // Extrusion direction practically perpendicular
                                 // to the patch. Disable movement at the patch.
 
-                                maxPoints.append(pointI);
+                                maxPoints.append(pointi);
                                 maxInfo.append
                                 (
                                     pointData
                                     (
-                                        points[pointI],
+                                        points[pointi],
                                         0.0,
-                                        pointI,         // passive data
+                                        pointi,         // passive data
                                         Zero    // passive data
                                     )
                                 );
-                                pointMedialDist[pointI] = maxInfo.last();
+                                pointMedialDist[pointi] = maxInfo.last();
                             }
                             else
                             {
@@ -763,21 +763,21 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
 
 
         // Extract medial axis distance as pointScalarField
-        forAll(pointMedialDist, pointI)
+        forAll(pointMedialDist, pointi)
         {
-            if (pointMedialDist[pointI].valid(dummyTrackData))
+            if (pointMedialDist[pointi].valid(dummyTrackData))
             {
-                medialDist_[pointI] = Foam::sqrt
+                medialDist_[pointi] = Foam::sqrt
                 (
-                    pointMedialDist[pointI].distSqr()
+                    pointMedialDist[pointi].distSqr()
                 );
-                medialVec_[pointI] = pointMedialDist[pointI].origin();
+                medialVec_[pointi] = pointMedialDist[pointi].origin();
             }
             else
             {
                 // Unvisited. Do as if on medial axis so unmoving
-                medialDist_[pointI] = 0.0;
-                medialVec_[pointI] = point(1, 0, 0);
+                medialDist_[pointi] = 0.0;
+                medialVec_[pointi] = point(1, 0, 0);
             }
         }
     }
@@ -806,16 +806,16 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
     );
 
     // Calculate ratio point medial distance to point wall distance
-    forAll(medialRatio_, pointI)
+    forAll(medialRatio_, pointi)
     {
-        if (!pointWallDist[pointI].valid(dummyTrackData))
+        if (!pointWallDist[pointi].valid(dummyTrackData))
         {
-            medialRatio_[pointI] = 0.0;
+            medialRatio_[pointi] = 0.0;
         }
         else
         {
-            scalar wDist2 = pointWallDist[pointI].distSqr();
-            scalar mDist = medialDist_[pointI];
+            scalar wDist2 = pointWallDist[pointi].distSqr();
+            scalar mDist = medialDist_[pointi];
 
             if (wDist2 < sqr(SMALL) && mDist < SMALL)
             //- Note: maybe less strict:
@@ -824,11 +824,11 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
             // && mDist < meshRefiner_.mergeDistance()
             //)
             {
-                medialRatio_[pointI] = 0.0;
+                medialRatio_[pointi] = 0.0;
             }
             else
             {
-                medialRatio_[pointI] = mDist / (Foam::sqrt(wDist2) + mDist);
+                medialRatio_[pointi] = mDist / (Foam::sqrt(wDist2) + mDist);
             }
         }
     }
@@ -860,21 +860,21 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
 
 bool Foam::medialAxisMeshMover::unmarkExtrusion
 (
-    const label patchPointI,
+    const label patchPointi,
     pointField& patchDisp,
     List<snappyLayerDriver::extrudeMode>& extrudeStatus
 )
 {
-    if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDE)
+    if (extrudeStatus[patchPointi] == snappyLayerDriver::EXTRUDE)
     {
-        extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
-        patchDisp[patchPointI] = Zero;
+        extrudeStatus[patchPointi] = snappyLayerDriver::NOEXTRUDE;
+        patchDisp[patchPointi] = Zero;
         return true;
     }
-    else if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDEREMOVE)
+    else if (extrudeStatus[patchPointi] == snappyLayerDriver::EXTRUDEREMOVE)
     {
-        extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
-        patchDisp[patchPointI] = Zero;
+        extrudeStatus[patchPointi] = snappyLayerDriver::NOEXTRUDE;
+        patchDisp[patchPointi] = Zero;
         return true;
     }
     else
@@ -1044,19 +1044,19 @@ void Foam::medialAxisMeshMover::minSmoothField
         average *= invSumWeight;
 
         // Transfer to field
-        forAll(field, pointI)
+        forAll(field, pointi)
         {
             //full smoothing neighbours + point value
-            average[pointI] = 0.5*(field[pointI]+average[pointI]);
+            average[pointi] = 0.5*(field[pointi]+average[pointi]);
 
             // perform monotonic smoothing
             if
             (
-                average[pointI] < field[pointI]
-             && average[pointI] >= fieldMin[pointI]
+                average[pointi] < field[pointi]
+             && average[pointi] >= fieldMin[pointi]
             )
             {
-                field[pointI] = average[pointI];
+                field[pointi] = average[pointi];
             }
         }
 
@@ -1310,18 +1310,18 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
             //  >=0: label of point extruded
 
             // Check all surrounding faces that I am the islandPoint
-            forAll(pointFaces, patchPointI)
+            forAll(pointFaces, patchPointi)
             {
-                if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
+                if (extrudeStatus[patchPointi] != snappyLayerDriver::NOEXTRUDE)
                 {
-                    const labelList& pFaces = pointFaces[patchPointI];
+                    const labelList& pFaces = pointFaces[patchPointi];
 
                     forAll(pFaces, i)
                     {
                         label facei = pFaces[i];
-                        if (islandPoint[facei] != patchPointI)
+                        if (islandPoint[facei] != patchPointi)
                         {
-                            keptPoints[patchPointI] = true;
+                            keptPoints[patchPointi] = true;
                             break;
                         }
                     }
@@ -1350,16 +1350,16 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
 
             const labelListList& pointFaces = pp.pointFaces();
 
-            forAll(keptPoints, patchPointI)
+            forAll(keptPoints, patchPointi)
             {
-                const labelList& pFaces = pointFaces[patchPointI];
+                const labelList& pFaces = pointFaces[patchPointi];
 
                 forAll(pFaces, i)
                 {
                     label facei = pFaces[i];
                     if (extrudedFaces[facei])
                     {
-                        keptPoints[patchPointI] = true;
+                        keptPoints[patchPointi] = true;
                         break;
                     }
                 }
@@ -1378,18 +1378,18 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
 
         label nChanged = 0;
 
-        forAll(keptPoints, patchPointI)
+        forAll(keptPoints, patchPointi)
         {
-            if (!keptPoints[patchPointI])
+            if (!keptPoints[patchPointi])
             {
-                if (unmarkExtrusion(patchPointI, patchDisp, extrudeStatus))
+                if (unmarkExtrusion(patchPointi, patchDisp, extrudeStatus))
                 {
                     nPointCounter++;
                     nChanged++;
 
                     if (str.valid())
                     {
-                        str().write(pp.points()[meshPoints[patchPointI]]);
+                        str().write(pp.points()[meshPoints[patchPointi]]);
                     }
                 }
             }
@@ -1792,11 +1792,11 @@ void Foam::medialAxisMeshMover::calculateDisplacement
 
     thickness = mag(patchDisp);
 
-    forAll(thickness, patchPointI)
+    forAll(thickness, patchPointi)
     {
-        if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
+        if (extrudeStatus[patchPointi] == snappyLayerDriver::NOEXTRUDE)
         {
-            thickness[patchPointI] = 0.0;
+            thickness[patchPointi] = 0.0;
         }
     }
 
@@ -1841,23 +1841,23 @@ void Foam::medialAxisMeshMover::calculateDisplacement
             << " an extrusion distance to " << medialVecStr().name() << endl;
     }
 
-    forAll(meshPoints, patchPointI)
+    forAll(meshPoints, patchPointi)
     {
-        if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
+        if (extrudeStatus[patchPointi] != snappyLayerDriver::NOEXTRUDE)
         {
-            label pointI = meshPoints[patchPointI];
+            label pointi = meshPoints[patchPointi];
 
             //- Option 1: look only at extrusion thickness v.s. distance
             //  to nearest (medial axis or static) point.
-            scalar mDist = medialDist_[pointI];
-            scalar thicknessRatio = thickness[patchPointI]/(mDist+VSMALL);
+            scalar mDist = medialDist_[pointi];
+            scalar thicknessRatio = thickness[patchPointi]/(mDist+VSMALL);
 
             //- Option 2: Look at component in the direction
             //  of nearest (medial axis or static) point.
             vector n =
-                patchDisp[patchPointI]
-              / (mag(patchDisp[patchPointI]) + VSMALL);
-            vector mVec = mesh().points()[pointI]-medialVec_[pointI];
+                patchDisp[patchPointi]
+              / (mag(patchDisp[patchPointi]) + VSMALL);
+            vector mVec = mesh().points()[pointi]-medialVec_[pointi];
             mVec /= mag(mVec)+VSMALL;
             thicknessRatio *= (n&mVec);
 
@@ -1867,13 +1867,13 @@ void Foam::medialAxisMeshMover::calculateDisplacement
                 if (debug&2)
                 {
                     Pout<< "truncating displacement at "
-                        << mesh().points()[pointI]
-                        << " from " << thickness[patchPointI]
+                        << mesh().points()[pointi]
+                        << " from " << thickness[patchPointi]
                         << " to "
                         <<  0.5
                            *(
-                                minThickness[patchPointI]
-                               +thickness[patchPointI]
+                                minThickness[patchPointi]
+                               +thickness[patchPointi]
                             )
                         << " medial direction:" << mVec
                         << " extrusion direction:" << n
@@ -1881,30 +1881,30 @@ void Foam::medialAxisMeshMover::calculateDisplacement
                         << endl;
                 }
 
-                thickness[patchPointI] =
-                    0.5*(minThickness[patchPointI]+thickness[patchPointI]);
+                thickness[patchPointi] =
+                    0.5*(minThickness[patchPointi]+thickness[patchPointi]);
 
-                patchDisp[patchPointI] = thickness[patchPointI]*n;
+                patchDisp[patchPointi] = thickness[patchPointi]*n;
 
-                if (isPatchMasterPoint[patchPointI])
+                if (isPatchMasterPoint[patchPointi])
                 {
                     numThicknessRatioExclude++;
                 }
 
                 if (str.valid())
                 {
-                    const point& pt = mesh().points()[pointI];
-                    str().write(linePointRef(pt, pt+patchDisp[patchPointI]));
+                    const point& pt = mesh().points()[pointi];
+                    str().write(linePointRef(pt, pt+patchDisp[patchPointi]));
                 }
                 if (medialVecStr.valid())
                 {
-                    const point& pt = mesh().points()[pointI];
+                    const point& pt = mesh().points()[pointi];
                     medialVecStr().write
                     (
                         linePointRef
                         (
                             pt,
-                            medialVec_[pointI]
+                            medialVec_[pointi]
                         )
                     );
                 }
@@ -1935,11 +1935,11 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     );
 
     // Update thickess for changed extrusion
-    forAll(thickness, patchPointI)
+    forAll(thickness, patchPointi)
     {
-        if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
+        if (extrudeStatus[patchPointi] == snappyLayerDriver::NOEXTRUDE)
         {
-            thickness[patchPointI] = 0.0;
+            thickness[patchPointi] = 0.0;
         }
     }
 
@@ -1972,15 +1972,15 @@ void Foam::medialAxisMeshMover::calculateDisplacement
         // Seed data.
         List<pointData> wallInfo(meshPoints.size());
 
-        forAll(meshPoints, patchPointI)
+        forAll(meshPoints, patchPointi)
         {
-            label pointI = meshPoints[patchPointI];
-            wallPoints[patchPointI] = pointI;
-            wallInfo[patchPointI] = pointData
+            label pointi = meshPoints[patchPointi];
+            wallPoints[patchPointi] = pointi;
+            wallInfo[patchPointi] = pointData
             (
-                points[pointI],
+                points[pointi],
                 0.0,
-                thickness[patchPointI],       // transport layer thickness
+                thickness[patchPointi],       // transport layer thickness
                 Zero                  // passive vector
             );
         }
@@ -2003,23 +2003,23 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     // Calculate scaled displacement vector
     pointField& displacement = pointDisplacement_;
 
-    forAll(displacement, pointI)
+    forAll(displacement, pointi)
     {
-        if (!pointWallDist[pointI].valid(dummyTrackData))
+        if (!pointWallDist[pointi].valid(dummyTrackData))
         {
-            displacement[pointI] = Zero;
+            displacement[pointi] = Zero;
         }
         else
         {
             // 1) displacement on nearest wall point, scaled by medialRatio
             //    (wall distance / medial distance)
-            // 2) pointWallDist[pointI].s() is layer thickness transported
+            // 2) pointWallDist[pointi].s() is layer thickness transported
             //    from closest wall point.
             // 3) shrink in opposite direction of addedPoints
-            displacement[pointI] =
-                -medialRatio_[pointI]
-                *pointWallDist[pointI].s()
-                *dispVec_[pointI];
+            displacement[pointi] =
+                -medialRatio_[pointi]
+                *pointWallDist[pointi].s()
+                *dispVec_[pointi];
         }
     }
 
@@ -2151,11 +2151,11 @@ bool Foam::medialAxisMeshMover::move
         pp.nPoints(),
         snappyLayerDriver::EXTRUDE
     );
-    forAll(extrudeStatus, pointI)
+    forAll(extrudeStatus, pointi)
     {
-        if (mag(patchDisp[pointI]) <= minThickness[pointI]+SMALL)
+        if (mag(patchDisp[pointi]) <= minThickness[pointi]+SMALL)
         {
-            extrudeStatus[pointI] = snappyLayerDriver::NOEXTRUDE;
+            extrudeStatus[pointi] = snappyLayerDriver::NOEXTRUDE;
         }
     }
 
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
index 96541453d6..0d370d3393 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
@@ -148,7 +148,7 @@ class medialAxisMeshMover
             //- Unmark extrusion at given point
             static bool unmarkExtrusion
             (
-                const label patchPointI,
+                const label patchPointi,
                 pointField& patchDisp,
                 List<snappyLayerDriver::extrudeMode>& extrudeStatus
             );
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 30e95b65f2..4d3fb54209 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -343,13 +343,13 @@ void Foam::meshRefinement::testSyncPointList
         maxEqOp<scalar>(),
         -GREAT
     );
-    forAll(minFld, pointI)
+    forAll(minFld, pointi)
     {
-        const scalar& minVal = minFld[pointI];
-        const scalar& maxVal = maxFld[pointI];
+        const scalar& minVal = minFld[pointi];
+        const scalar& maxVal = maxFld[pointi];
         if (mag(minVal-maxVal) > SMALL)
         {
-            Pout<< msg << " at:" << mesh.points()[pointI] << nl
+            Pout<< msg << " at:" << mesh.points()[pointi] << nl
                 << "    minFld:" << minVal << nl
                 << "    maxFld:" << maxVal << nl
                 << endl;
@@ -390,13 +390,13 @@ void Foam::meshRefinement::testSyncPointList
         maxMagSqrEqOp<point>(),
         vector::zero
     );
-    forAll(minFld, pointI)
+    forAll(minFld, pointi)
     {
-        const point& minVal = minFld[pointI];
-        const point& maxVal = maxFld[pointI];
+        const point& minVal = minFld[pointi];
+        const point& maxVal = maxFld[pointi];
         if (mag(minVal-maxVal) > SMALL)
         {
-            Pout<< msg << " at:" << mesh.points()[pointI] << nl
+            Pout<< msg << " at:" << mesh.points()[pointi] << nl
                 << "    minFld:" << minVal << nl
                 << "    maxFld:" << maxVal << nl
                 << endl;
@@ -1731,11 +1731,11 @@ Foam::labelList Foam::meshRefinement::intersectedPoints() const
     // Pack
     labelList boundaryPoints(nBoundaryPoints);
     nBoundaryPoints = 0;
-    forAll(isBoundaryPoint, pointI)
+    forAll(isBoundaryPoint, pointi)
     {
-        if (isBoundaryPoint.get(pointI) == 1u)
+        if (isBoundaryPoint.get(pointi) == 1u)
         {
-            boundaryPoints[nBoundaryPoints++] = pointI;
+            boundaryPoints[nBoundaryPoints++] = pointi;
         }
     }
 
@@ -1978,13 +1978,13 @@ void Foam::meshRefinement::calculateEdgeWeights
     );
 
     // Inplace invert
-    forAll(invSumWeight, pointI)
+    forAll(invSumWeight, pointi)
     {
-        scalar w = invSumWeight[pointI];
+        scalar w = invSumWeight[pointi];
 
         if (w > 0.0)
         {
-            invSumWeight[pointI] = 1.0/w;
+            invSumWeight[pointi] = 1.0/w;
         }
     }
 }
@@ -2624,9 +2624,9 @@ Foam::PackedBoolList Foam::meshRefinement::getMasterPoints
     const globalIndex globalPoints(meshPoints.size());
 
     labelList myPoints(meshPoints.size());
-    forAll(meshPoints, pointI)
+    forAll(meshPoints, pointi)
     {
-        myPoints[pointI] = globalPoints.toGlobal(pointI);
+        myPoints[pointi] = globalPoints.toGlobal(pointi);
     }
 
     syncTools::syncPointList
@@ -2640,11 +2640,11 @@ Foam::PackedBoolList Foam::meshRefinement::getMasterPoints
 
 
     PackedBoolList isPatchMasterPoint(meshPoints.size());
-    forAll(meshPoints, pointI)
+    forAll(meshPoints, pointi)
     {
-        if (myPoints[pointI] == globalPoints.toGlobal(pointI))
+        if (myPoints[pointi] == globalPoints.toGlobal(pointi))
         {
-            isPatchMasterPoint[pointI] = true;
+            isPatchMasterPoint[pointi] = true;
         }
     }
 
@@ -2820,9 +2820,9 @@ void Foam::meshRefinement::dumpRefinementLevel() const
 
         const labelList& pointLevel = meshCutter_.pointLevel();
 
-        forAll(pointRefLevel, pointI)
+        forAll(pointRefLevel, pointi)
         {
-            pointRefLevel[pointI] = pointLevel[pointI];
+            pointRefLevel[pointi] = pointLevel[pointi];
         }
 
         pointRefLevel.write();
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 3bba0de30b..1b0578b7d6 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -2609,11 +2609,11 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 
         const labelListList& pointFaces = mesh_.pointFaces();
 
-        forAll(pointFaces, pointI)
+        forAll(pointFaces, pointi)
         {
-            if (pointBaffle[pointI] != -1)
+            if (pointBaffle[pointi] != -1)
             {
-                const labelList& pFaces = pointFaces[pointI];
+                const labelList& pFaces = pointFaces[pointi];
 
                 forAll(pFaces, pFacei)
                 {
@@ -2621,7 +2621,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 
                     if (ownPatch[facei] == -1)
                     {
-                        ownPatch[facei] = pointBaffle[pointI];
+                        ownPatch[facei] = pointBaffle[pointi];
                     }
                 }
             }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index 088424288f..65d6e81e9c 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -731,22 +731,22 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
 
         forAll(cPoints, i)
         {
-            label pointI = cPoints[i];
+            label pointi = cPoints[i];
 
-            if (pointLevel[pointI] <= cellLevel[celli])
+            if (pointLevel[pointi] <= cellLevel[celli])
             {
                 // Anchor point
-                if (isBoundaryPoint[pointI])
+                if (isBoundaryPoint[pointi])
                 {
                     nBoundaryAnchors++;
                 }
                 else
                 {
                     // Anchor point which is not on the surface
-                    nonBoundaryAnchor = pointI;
+                    nonBoundaryAnchor = pointi;
                 }
             }
-            else if (isBoundaryPoint[pointI])
+            else if (isBoundaryPoint[pointi])
             {
                 nNonAnchorBoundary++;
             }
@@ -835,9 +835,9 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
 
     forAllConstIter(labelHashSet, nonBoundaryAnchors, iter)
     {
-        label pointI = iter.key();
+        label pointi = iter.key();
 
-        const labelList& pCells = mesh_.pointCells(pointI, dynPCells);
+        const labelList& pCells = mesh_.pointCells(pointi, dynPCells);
 
         // Count number of 'hasSevenBoundaryAnchorPoints' cells.
         label n = 0;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index aa8d5438db..fdb0b03a7e 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -384,16 +384,16 @@ void Foam::meshRefinement::markFeatureCellLevel
                 // 1. Seed all 'knots' in edgeMesh
 
 
-                forAll(pointEdges, pointI)
+                forAll(pointEdges, pointi)
                 {
-                    if (pointEdges[pointI].size() != 2)
+                    if (pointEdges[pointi].size() != 2)
                     {
                         if (debug&meshRefinement::FEATURESEEDS)
                         {
-                            Pout<< "Adding particle from point:" << pointI
-                                << " coord:" << featureMesh.points()[pointI]
+                            Pout<< "Adding particle from point:" << pointi
+                                << " coord:" << featureMesh.points()[pointi]
                                 << " since number of emanating edges:"
-                                << pointEdges[pointI].size()
+                                << pointEdges[pointi].size()
                                 << endl;
                         }
 
@@ -407,18 +407,18 @@ void Foam::meshRefinement::markFeatureCellLevel
                                 celli,
                                 tetFacei,
                                 tetPtI,
-                                featureMesh.points()[pointI],   // endpos
+                                featureMesh.points()[pointi],   // endpos
                                 featureLevel,                   // level
                                 featI,                          // featureMesh
-                                pointI,                         // end point
+                                pointi,                         // end point
                                 -1                              // feature edge
                             )
                         );
 
                         // Mark
-                        if (pointEdges[pointI].size() > 0)
+                        if (pointEdges[pointi].size() > 0)
                         {
-                            label e0 = pointEdges[pointI][0];
+                            label e0 = pointEdges[pointi][0];
                             label regionI = edgeRegion[e0];
                             regionVisited[regionI] = 1u;
                         }
@@ -433,11 +433,11 @@ void Foam::meshRefinement::markFeatureCellLevel
                     if (regionVisited.set(edgeRegion[edgeI], 1u))
                     {
                         const edge& e = featureMesh.edges()[edgeI];
-                        label pointI = e.start();
+                        label pointi = e.start();
                         if (debug&meshRefinement::FEATURESEEDS)
                         {
-                            Pout<< "Adding particle from point:" << pointI
-                                << " coord:" << featureMesh.points()[pointI]
+                            Pout<< "Adding particle from point:" << pointi
+                                << " coord:" << featureMesh.points()[pointi]
                                 << " on circular region:" << edgeRegion[edgeI]
                                 << endl;
                         }
@@ -452,10 +452,10 @@ void Foam::meshRefinement::markFeatureCellLevel
                                 celli,
                                 tetFacei,
                                 tetPtI,
-                                featureMesh.points()[pointI],   // endpos
+                                featureMesh.points()[pointi],   // endpos
                                 featureLevel,                   // level
                                 featI,                          // featureMesh
-                                pointI,                         // end point
+                                pointi,                         // end point
                                 -1                              // feature edge
                             )
                         );
@@ -526,10 +526,10 @@ void Foam::meshRefinement::markFeatureCellLevel
         const trackedParticle& startTp = iter();
 
         label featI = startTp.i();
-        label pointI = startTp.j();
+        label pointi = startTp.j();
 
         const edgeMesh& featureMesh = features_[featI];
-        const labelList& pEdges = featureMesh.pointEdges()[pointI];
+        const labelList& pEdges = featureMesh.pointEdges()[pointi];
 
         // Now shoot particles down all pEdges.
         forAll(pEdges, pEdgeI)
@@ -542,16 +542,16 @@ void Foam::meshRefinement::markFeatureCellLevel
                 // on the edge.
 
                 const edge& e = featureMesh.edges()[edgeI];
-                label otherPointI = e.otherVertex(pointI);
+                label otherPointi = e.otherVertex(pointi);
 
                 trackedParticle* tp(new trackedParticle(startTp));
-                tp->end() = featureMesh.points()[otherPointI];
-                tp->j() = otherPointI;
+                tp->end() = featureMesh.points()[otherPointi];
+                tp->j() = otherPointi;
                 tp->k() = edgeI;
 
                 if (debug&meshRefinement::FEATURESEEDS)
                 {
-                    Pout<< "Adding particle for point:" << pointI
+                    Pout<< "Adding particle for point:" << pointi
                         << " coord:" << tp->position()
                         << " feature:" << featI
                         << " to track to:" << tp->end()
@@ -583,12 +583,12 @@ void Foam::meshRefinement::markFeatureCellLevel
             trackedParticle& tp = iter();
 
             label featI = tp.i();
-            label pointI = tp.j();
+            label pointi = tp.j();
 
             const edgeMesh& featureMesh = features_[featI];
-            const labelList& pEdges = featureMesh.pointEdges()[pointI];
+            const labelList& pEdges = featureMesh.pointEdges()[pointi];
 
-            // Particle now at pointI. Check connected edges to see which one
+            // Particle now at pointi. Check connected edges to see which one
             // we have to visit now.
 
             bool keepParticle = false;
@@ -603,10 +603,10 @@ void Foam::meshRefinement::markFeatureCellLevel
                     // on the edge.
 
                     const edge& e = featureMesh.edges()[edgeI];
-                    label otherPointI = e.otherVertex(pointI);
+                    label otherPointi = e.otherVertex(pointi);
 
-                    tp.end() = featureMesh.points()[otherPointI];
-                    tp.j() = otherPointI;
+                    tp.end() = featureMesh.points()[otherPointi];
+                    tp.j() = otherPointi;
                     tp.k() = edgeI;
                     keepParticle = true;
                     break;
@@ -1196,10 +1196,10 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
         // that on coupled faces both sides visit the intersections in
         // the same order so will decide the same
         labelList visitOrder;
-        forAll(surfaceNormal, pointI)
+        forAll(surfaceNormal, pointi)
         {
-            vectorList& pNormals = surfaceNormal[pointI];
-            labelList& pLevel = surfaceLevel[pointI];
+            vectorList& pNormals = surfaceNormal[pointi];
+            labelList& pLevel = surfaceLevel[pointi];
 
             sortedOrder(pNormals, visitOrder, normalLess(pNormals));
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
index d33f648b40..a55ea51dea 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -192,8 +192,8 @@ void Foam::meshRefinement::collectAndPrint
     sortedOrder(magAllPoints, visitOrder);
     forAll(visitOrder, i)
     {
-        label allPointI = visitOrder[i];
-        Info<< allPoints[allPointI] << " : " << allData[allPointI]
+        label allPointi = visitOrder[i];
+        Info<< allPoints[allPointi] << " : " << allData[allPointi]
             << endl;
     }
 }
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index bd988ed382..13a617d9b8 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -115,23 +115,23 @@ void Foam::refinementFeatures::read
 
             labelList oldToNew(eMesh.points().size(), -1);
             DynamicField<point> newPoints(eMesh.points().size());
-            forAll(pointEdges, pointI)
+            forAll(pointEdges, pointi)
             {
-                if (pointEdges[pointI].size() > 2)
+                if (pointEdges[pointi].size() > 2)
                 {
-                    oldToNew[pointI] = newPoints.size();
-                    newPoints.append(eMesh.points()[pointI]);
+                    oldToNew[pointi] = newPoints.size();
+                    newPoints.append(eMesh.points()[pointi]);
                 }
-                //else if (pointEdges[pointI].size() == 2)
+                //else if (pointEdges[pointi].size() == 2)
                 //MEJ: do something based on a feature angle?
             }
             label nFeatures = newPoints.size();
-            forAll(oldToNew, pointI)
+            forAll(oldToNew, pointi)
             {
-                if (oldToNew[pointI] == -1)
+                if (oldToNew[pointi] == -1)
                 {
-                    oldToNew[pointI] = newPoints.size();
-                    newPoints.append(eMesh.points()[pointI]);
+                    oldToNew[pointi] = newPoints.size();
+                    newPoints.append(eMesh.points()[pointi]);
                 }
             }
 
@@ -372,14 +372,14 @@ void Foam::refinementFeatures::findHigherLevel
     scalarField candidateDistSqr(pt.size());
     label candidateI = 0;
 
-    forAll(maxLevel, pointI)
+    forAll(maxLevel, pointi)
     {
         forAllReverse(levels, levelI)
         {
-            if (levels[levelI] > maxLevel[pointI])
+            if (levels[levelI] > maxLevel[pointi])
             {
-                candidates[candidateI] = pt[pointI];
-                candidateMap[candidateI] = pointI;
+                candidates[candidateI] = pt[pointi];
+                candidateMap[candidateI] = pointi;
                 candidateDistSqr[candidateI] = sqr(distances[levelI]);
                 candidateI++;
                 break;
@@ -415,10 +415,10 @@ void Foam::refinementFeatures::findHigherLevel
                 mag(nearInfo[candidateI].hitPoint()-candidates[candidateI])
             );
 
-            label pointI = candidateMap[candidateI];
+            label pointi = candidateMap[candidateI];
 
             // pt is inbetween shell[minDistI] and shell[minDistI+1]
-            maxLevel[pointI] = levels[minDistI+1];
+            maxLevel[pointi] = levels[minDistI+1];
         }
     }
 }
@@ -474,12 +474,12 @@ Foam::refinementFeatures::refinementFeatures
 //        const labelListList& pointEdges = eMesh.pointEdges();
 //
 //        DynamicList<label> featurePoints;
-//        forAll(pointEdges, pointI)
+//        forAll(pointEdges, pointi)
 //        {
-//            const labelList& pEdges = pointEdges[pointI];
+//            const labelList& pEdges = pointEdges[pointi];
 //            if (pEdges.size() > 2)
 //            {
-//                featurePoints.append(pointI);
+//                featurePoints.append(pointi);
 //            }
 //            else if (pEdges.size() == 2)
 //            {
@@ -487,9 +487,9 @@ Foam::refinementFeatures::refinementFeatures
 //                const edge& e0 = edges[pEdges[0]];
 //                const edge& e1 = edges[pEdges[1]];
 //
-//                const point& p = points[pointI];
-//                const point& p0 = points[e0.otherVertex(pointI)];
-//                const point& p1 = points[e1.otherVertex(pointI)];
+//                const point& p = points[pointi];
+//                const point& p0 = points[e0.otherVertex(pointi)];
+//                const point& p1 = points[e1.otherVertex(pointi)];
 //
 //                vector v0 = p-p0;
 //                scalar v0Mag = mag(v0);
@@ -504,7 +504,7 @@ Foam::refinementFeatures::refinementFeatures
 //                 && ((v0/v0Mag & v1/v1Mag) < minCos)
 //                )
 //                {
-//                    featurePoints.append(pointI);
+//                    featurePoints.append(pointi);
 //                }
 //            }
 //        }
@@ -671,10 +671,10 @@ void Foam::refinementFeatures::findNearestRegionEdge
 //                    label nearFeatI = nearFeature[sampleI];
 //                    const indexedOctree<treeDataPoint>& nearTree =
 //                        pointTrees_[nearFeatI];
-//                    label featPointI =
+//                    label featPointi =
 //                        nearTree.shapes().pointLabels()[nearIndex[sampleI]];
 //                    const point& featPt =
-//                        operator[](nearFeatI).points()[featPointI];
+//                        operator[](nearFeatI).points()[featPointi];
 //                    distSqr = magSqr(featPt-sample);
 //                }
 //                else
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index 285197bc7b..4515e69025 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -568,19 +568,19 @@ void Foam::refinementSurfaces::findHigherIntersection
             }
 
 
-            label pointI = intersectionToPoint[i];
+            label pointi = intersectionToPoint[i];
 
-            if (minLocalLevel > currentLevel[pointI])
+            if (minLocalLevel > currentLevel[pointi])
             {
                 // Mark point for refinement
-                surfaces[pointI] = surfI;
-                surfaceLevel[pointI] = minLocalLevel;
+                surfaces[pointi] = surfI;
+                surfaceLevel[pointi] = minLocalLevel;
             }
             else
             {
-                p0[missI] = start[pointI];
-                p1[missI] = end[pointI];
-                intersectionToPoint[missI] = pointI;
+                p0[missI] = start[pointi];
+                p1[missI] = end[pointi];
+                intersectionToPoint[missI] = pointi;
                 missI++;
             }
         }
@@ -636,23 +636,23 @@ void Foam::refinementSurfaces::findAllHigherIntersections
         // To avoid overhead of calling getRegion for every point
 
         label n = 0;
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            n += hitInfo[pointI].size();
+            n += hitInfo[pointi].size();
         }
 
         List<pointIndexHit> surfInfo(n);
         labelList pointMap(n);
         n = 0;
 
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            const List<pointIndexHit>& pHits = hitInfo[pointI];
+            const List<pointIndexHit>& pHits = hitInfo[pointi];
 
             forAll(pHits, i)
             {
                 surfInfo[n] = pHits[i];
-                pointMap[n] = pointI;
+                pointMap[n] = pointi;
                 n++;
             }
         }
@@ -671,17 +671,17 @@ void Foam::refinementSurfaces::findAllHigherIntersections
         forAll(surfRegion, i)
         {
             label region = globalRegion(surfI, surfRegion[i]);
-            label pointI = pointMap[i];
+            label pointi = pointMap[i];
 
-            if (globalRegionLevel[region] > currentLevel[pointI])
+            if (globalRegionLevel[region] > currentLevel[pointi])
             {
-                // Append to pointI info
-                label sz = surfaceNormal[pointI].size();
-                surfaceNormal[pointI].setSize(sz+1);
-                surfaceNormal[pointI][sz] = surfNormal[i];
+                // Append to pointi info
+                label sz = surfaceNormal[pointi].size();
+                surfaceNormal[pointi].setSize(sz+1);
+                surfaceNormal[pointi][sz] = surfNormal[i];
 
-                surfaceLevel[pointI].setSize(sz+1);
-                surfaceLevel[pointI][sz] = globalRegionLevel[region];
+                surfaceLevel[pointi].setSize(sz+1);
+                surfaceLevel[pointi][sz] = globalRegionLevel[region];
             }
         }
     }
@@ -726,23 +726,23 @@ void Foam::refinementSurfaces::findAllHigherIntersections
         // To avoid overhead of calling getRegion for every point
 
         label n = 0;
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            n += hitInfo[pointI].size();
+            n += hitInfo[pointi].size();
         }
 
         List<pointIndexHit> surfInfo(n);
         labelList pointMap(n);
         n = 0;
 
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            const List<pointIndexHit>& pHits = hitInfo[pointI];
+            const List<pointIndexHit>& pHits = hitInfo[pointi];
 
             forAll(pHits, i)
             {
                 surfInfo[n] = pHits[i];
-                pointMap[n] = pointI;
+                pointMap[n] = pointi;
                 n++;
             }
         }
@@ -758,20 +758,20 @@ void Foam::refinementSurfaces::findAllHigherIntersections
         forAll(surfRegion, i)
         {
             label region = globalRegion(surfI, surfRegion[i]);
-            label pointI = pointMap[i];
+            label pointi = pointMap[i];
 
-            if (globalRegionLevel[region] > currentLevel[pointI])
+            if (globalRegionLevel[region] > currentLevel[pointi])
             {
-                // Append to pointI info
-                label sz = surfaceNormal[pointI].size();
-                surfaceLocation[pointI].setSize(sz+1);
-                surfaceLocation[pointI][sz] = surfInfo[i].hitPoint();
+                // Append to pointi info
+                label sz = surfaceNormal[pointi].size();
+                surfaceLocation[pointi].setSize(sz+1);
+                surfaceLocation[pointi][sz] = surfInfo[i].hitPoint();
 
-                surfaceNormal[pointI].setSize(sz+1);
-                surfaceNormal[pointI][sz] = surfNormal[i];
+                surfaceNormal[pointi].setSize(sz+1);
+                surfaceNormal[pointi][sz] = surfNormal[i];
 
-                surfaceLevel[pointI].setSize(sz+1);
-                surfaceLevel[pointI][sz] = globalRegionLevel[region];
+                surfaceLevel[pointi].setSize(sz+1);
+                surfaceLevel[pointi][sz] = globalRegionLevel[region];
             }
         }
     }
@@ -826,14 +826,14 @@ void Foam::refinementSurfaces::findNearestIntersection
             region
         );
 
-        forAll(nearestInfo, pointI)
+        forAll(nearestInfo, pointi)
         {
-            if (nearestInfo[pointI].hit())
+            if (nearestInfo[pointi].hit())
             {
-                hit1[pointI] = nearestInfo[pointI];
-                surface1[pointI] = surfI;
-                region1[pointI] = region[pointI];
-                nearest[pointI] = hit1[pointI].hitPoint();
+                hit1[pointi] = nearestInfo[pointi];
+                surface1[pointi] = surfI;
+                region1[pointi] = region[pointi];
+                nearest[pointi] = hit1[pointi].hitPoint();
             }
         }
     }
@@ -849,16 +849,16 @@ void Foam::refinementSurfaces::findNearestIntersection
     region2 = region1;
 
     // Set current end of segment to test.
-    forAll(nearest, pointI)
+    forAll(nearest, pointi)
     {
-        if (hit1[pointI].hit())
+        if (hit1[pointi].hit())
         {
-            nearest[pointI] = hit1[pointI].hitPoint();
+            nearest[pointi] = hit1[pointi].hitPoint();
         }
         else
         {
             // Disable testing by setting to end.
-            nearest[pointI] = end[pointI];
+            nearest[pointi] = end[pointi];
         }
     }
 
@@ -881,14 +881,14 @@ void Foam::refinementSurfaces::findNearestIntersection
             region
         );
 
-        forAll(nearestInfo, pointI)
+        forAll(nearestInfo, pointi)
         {
-            if (nearestInfo[pointI].hit())
+            if (nearestInfo[pointi].hit())
             {
-                hit2[pointI] = nearestInfo[pointI];
-                surface2[pointI] = surfI;
-                region2[pointI] = region[pointI];
-                nearest[pointI] = hit2[pointI].hitPoint();
+                hit2[pointi] = nearestInfo[pointi];
+                surface2[pointi] = surfI;
+                region2[pointi] = region[pointi];
+                nearest[pointi] = hit2[pointi].hitPoint();
             }
         }
     }
@@ -896,13 +896,13 @@ void Foam::refinementSurfaces::findNearestIntersection
 
     // Make sure that if hit1 has hit something, hit2 will have at least the
     // same point (due to tolerances it might miss its end point)
-    forAll(hit1, pointI)
+    forAll(hit1, pointi)
     {
-        if (hit1[pointI].hit() && !hit2[pointI].hit())
+        if (hit1[pointi].hit() && !hit2[pointi].hit())
         {
-            hit2[pointI] = hit1[pointI];
-            surface2[pointI] = surface1[pointI];
-            region2[pointI] = region1[pointI];
+            hit2[pointi] = hit1[pointi];
+            surface2[pointi] = surface1[pointi];
+            region2[pointi] = region1[pointi];
         }
     }
 }
@@ -954,15 +954,15 @@ void Foam::refinementSurfaces::findNearestIntersection
         geom.getRegion(nearestInfo, region);
         geom.getNormal(nearestInfo, normal);
 
-        forAll(nearestInfo, pointI)
+        forAll(nearestInfo, pointi)
         {
-            if (nearestInfo[pointI].hit())
+            if (nearestInfo[pointi].hit())
             {
-                hit1[pointI] = nearestInfo[pointI];
-                surface1[pointI] = surfI;
-                region1[pointI] = region[pointI];
-                normal1[pointI] = normal[pointI];
-                nearest[pointI] = hit1[pointI].hitPoint();
+                hit1[pointi] = nearestInfo[pointi];
+                surface1[pointi] = surfI;
+                region1[pointi] = region[pointi];
+                normal1[pointi] = normal[pointi];
+                nearest[pointi] = hit1[pointi].hitPoint();
             }
         }
     }
@@ -979,16 +979,16 @@ void Foam::refinementSurfaces::findNearestIntersection
     normal2 = normal1;
 
     // Set current end of segment to test.
-    forAll(nearest, pointI)
+    forAll(nearest, pointi)
     {
-        if (hit1[pointI].hit())
+        if (hit1[pointi].hit())
         {
-            nearest[pointI] = hit1[pointI].hitPoint();
+            nearest[pointi] = hit1[pointi].hitPoint();
         }
         else
         {
             // Disable testing by setting to end.
-            nearest[pointI] = end[pointI];
+            nearest[pointi] = end[pointi];
         }
     }
 
@@ -1002,15 +1002,15 @@ void Foam::refinementSurfaces::findNearestIntersection
         geom.getRegion(nearestInfo, region);
         geom.getNormal(nearestInfo, normal);
 
-        forAll(nearestInfo, pointI)
+        forAll(nearestInfo, pointi)
         {
-            if (nearestInfo[pointI].hit())
+            if (nearestInfo[pointi].hit())
             {
-                hit2[pointI] = nearestInfo[pointI];
-                surface2[pointI] = surfI;
-                region2[pointI] = region[pointI];
-                normal2[pointI] = normal[pointI];
-                nearest[pointI] = hit2[pointI].hitPoint();
+                hit2[pointi] = nearestInfo[pointi];
+                surface2[pointi] = surfI;
+                region2[pointi] = region[pointi];
+                normal2[pointi] = normal[pointi];
+                nearest[pointi] = hit2[pointi].hitPoint();
             }
         }
     }
@@ -1018,14 +1018,14 @@ void Foam::refinementSurfaces::findNearestIntersection
 
     // Make sure that if hit1 has hit something, hit2 will have at least the
     // same point (due to tolerances it might miss its end point)
-    forAll(hit1, pointI)
+    forAll(hit1, pointi)
     {
-        if (hit1[pointI].hit() && !hit2[pointI].hit())
+        if (hit1[pointi].hit() && !hit2[pointi].hit())
         {
-            hit2[pointI] = hit1[pointI];
-            surface2[pointI] = surface1[pointI];
-            region2[pointI] = region1[pointI];
-            normal2[pointI] = normal1[pointI];
+            hit2[pointi] = hit1[pointi];
+            surface2[pointi] = surface1[pointi];
+            region2[pointi] = region1[pointi];
+            normal2[pointi] = normal1[pointi];
         }
     }
 }
@@ -1075,11 +1075,11 @@ void Foam::refinementSurfaces::findNearest
     );
 
     // Rework the hitSurface to be surface (i.e. index into surfaces_)
-    forAll(hitSurface, pointI)
+    forAll(hitSurface, pointi)
     {
-        if (hitSurface[pointI] != -1)
+        if (hitSurface[pointi] != -1)
         {
-            hitSurface[pointI] = surfacesToTest[hitSurface[pointI]];
+            hitSurface[pointi] = surfacesToTest[hitSurface[pointi]];
         }
     }
 }
@@ -1109,11 +1109,11 @@ void Foam::refinementSurfaces::findNearestRegion
     );
 
     // Rework the hitSurface to be surface (i.e. index into surfaces_)
-    forAll(hitSurface, pointI)
+    forAll(hitSurface, pointi)
     {
-        if (hitSurface[pointI] != -1)
+        if (hitSurface[pointi] != -1)
         {
-            hitSurface[pointI] = surfacesToTest[hitSurface[pointI]];
+            hitSurface[pointi] = surfacesToTest[hitSurface[pointi]];
         }
     }
 
@@ -1173,11 +1173,11 @@ void Foam::refinementSurfaces::findNearestRegion
     );
 
     // Rework the hitSurface to be surface (i.e. index into surfaces_)
-    forAll(hitSurface, pointI)
+    forAll(hitSurface, pointi)
     {
-        if (hitSurface[pointI] != -1)
+        if (hitSurface[pointi] != -1)
         {
-            hitSurface[pointI] = surfacesToTest[hitSurface[pointI]];
+            hitSurface[pointi] = surfacesToTest[hitSurface[pointi]];
         }
     }
 
@@ -1307,23 +1307,23 @@ void Foam::refinementSurfaces::findInside
             List<volumeType> volType;
             surface.getVolumeType(pt, volType);
 
-            forAll(volType, pointI)
+            forAll(volType, pointi)
             {
-                if (insideSurfaces[pointI] == -1)
+                if (insideSurfaces[pointi] == -1)
                 {
                     if
                     (
                         (
-                            volType[pointI] == volumeType::INSIDE
+                            volType[pointi] == volumeType::INSIDE
                          && selectionMethod == surfaceZonesInfo::INSIDE
                         )
                      || (
-                            volType[pointI] == volumeType::OUTSIDE
+                            volType[pointi] == volumeType::OUTSIDE
                          && selectionMethod == surfaceZonesInfo::OUTSIDE
                         )
                     )
                     {
-                        insideSurfaces[pointI] = surfI;
+                        insideSurfaces[pointi] = surfI;
                     }
                 }
             }
diff --git a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
index 2b89bfcca0..ab1f9e0796 100644
--- a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
+++ b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
@@ -250,14 +250,14 @@ void Foam::shellSurfaces::findHigherLevel
         scalarField candidateDistSqr(pt.size());
         label candidateI = 0;
 
-        forAll(maxLevel, pointI)
+        forAll(maxLevel, pointi)
         {
             forAllReverse(levels, levelI)
             {
-                if (levels[levelI] > maxLevel[pointI])
+                if (levels[levelI] > maxLevel[pointi])
                 {
-                    candidates[candidateI] = pt[pointI];
-                    candidateMap[candidateI] = pointI;
+                    candidates[candidateI] = pt[pointi];
+                    candidateMap[candidateI] = pointi;
                     candidateDistSqr[candidateI] = sqr(distances[levelI]);
                     candidateI++;
                     break;
@@ -289,10 +289,10 @@ void Foam::shellSurfaces::findHigherLevel
                     mag(nearInfo[candidateI].hitPoint()-candidates[candidateI])
                 );
 
-                label pointI = candidateMap[candidateI];
+                label pointi = candidateMap[candidateI];
 
                 // pt is inbetween shell[minDistI] and shell[minDistI+1]
-                maxLevel[pointI] = levels[minDistI+1];
+                maxLevel[pointi] = levels[minDistI+1];
             }
         }
     }
@@ -307,12 +307,12 @@ void Foam::shellSurfaces::findHigherLevel
         labelList candidateMap(pt.size());
         label candidateI = 0;
 
-        forAll(maxLevel, pointI)
+        forAll(maxLevel, pointi)
         {
-            if (levels[0] > maxLevel[pointI])
+            if (levels[0] > maxLevel[pointi])
             {
-                candidates[candidateI] = pt[pointI];
-                candidateMap[candidateI] = pointI;
+                candidates[candidateI] = pt[pointi];
+                candidateMap[candidateI] = pointi;
                 candidateI++;
             }
         }
@@ -325,7 +325,7 @@ void Foam::shellSurfaces::findHigherLevel
 
         forAll(volType, i)
         {
-            label pointI = candidateMap[i];
+            label pointi = candidateMap[i];
 
             if
             (
@@ -339,7 +339,7 @@ void Foam::shellSurfaces::findHigherLevel
                 )
             )
             {
-                maxLevel[pointI] = levels[0];
+                maxLevel[pointi] = levels[0];
             }
         }
     }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H
index 8541a5cd3e..d46dbcc184 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H
@@ -107,7 +107,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const label edgeI,
                 const pointData& edgeInfo,
                 const scalar tol,
@@ -120,7 +120,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const pointData& newPointInfo,
                 const scalar tol,
                 TrackingData& td
@@ -142,7 +142,7 @@ public:
             (
                 const polyMesh& mesh,
                 const label edgeI,
-                const label pointI,
+                const label pointi,
                 const pointData& pointInfo,
                 const scalar tol,
                 TrackingData& td
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H
index 14fa39fe94..738d06c57c 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H
@@ -92,7 +92,7 @@ template<class TrackingData>
 inline bool Foam::pointData::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const label edgeI,
     const pointData& edgeInfo,
     const scalar tol,
@@ -104,7 +104,7 @@ inline bool Foam::pointData::updatePoint
         pointEdgePoint::updatePoint
         (
             mesh,
-            pointI,
+            pointi,
             edgeI,
             edgeInfo,
             tol,
@@ -127,7 +127,7 @@ template<class TrackingData>
 inline bool Foam::pointData::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const pointData& newPointInfo,
     const scalar tol,
     TrackingData& td
@@ -138,7 +138,7 @@ inline bool Foam::pointData::updatePoint
         pointEdgePoint::updatePoint
         (
             mesh,
-            pointI,
+            pointi,
             newPointInfo,
             tol,
             td
@@ -184,7 +184,7 @@ inline bool Foam::pointData::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
-    const label pointI,
+    const label pointi,
     const pointData& pointInfo,
     const scalar tol,
     TrackingData& td
@@ -197,7 +197,7 @@ inline bool Foam::pointData::updateEdge
         (
             mesh,
             edgeI,
-            pointI,
+            pointi,
             pointInfo,
             tol,
             td
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index cea42fa12a..417362170a 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -84,22 +84,22 @@ void Foam::snappyLayerDriver::dumpDisplacement
     OBJstream dispStr(prefix + "_disp.obj");
     Info<< "Writing all displacements to " << dispStr.name() << endl;
 
-    forAll(patchDisp, patchPointI)
+    forAll(patchDisp, patchPointi)
     {
-        const point& pt = pp.localPoints()[patchPointI];
-        dispStr.write(linePointRef(pt, pt + patchDisp[patchPointI]));
+        const point& pt = pp.localPoints()[patchPointi];
+        dispStr.write(linePointRef(pt, pt + patchDisp[patchPointi]));
     }
 
 
     OBJstream illStr(prefix + "_illegal.obj");
     Info<< "Writing invalid displacements to " << illStr.name() << endl;
 
-    forAll(patchDisp, patchPointI)
+    forAll(patchDisp, patchPointi)
     {
-        if (extrudeStatus[patchPointI] != EXTRUDE)
+        if (extrudeStatus[patchPointi] != EXTRUDE)
         {
-            const point& pt = pp.localPoints()[patchPointI];
-            illStr.write(linePointRef(pt, pt + patchDisp[patchPointI]));
+            const point& pt = pp.localPoints()[patchPointi];
+            illStr.write(linePointRef(pt, pt + patchDisp[patchPointi]));
         }
     }
 }
@@ -215,24 +215,24 @@ void Foam::snappyLayerDriver::checkMeshManifold() const
 // Unset extrusion on point. Returns true if anything unset.
 bool Foam::snappyLayerDriver::unmarkExtrusion
 (
-    const label patchPointI,
+    const label patchPointi,
     pointField& patchDisp,
     labelList& patchNLayers,
     List<extrudeMode>& extrudeStatus
 )
 {
-    if (extrudeStatus[patchPointI] == EXTRUDE)
+    if (extrudeStatus[patchPointi] == EXTRUDE)
     {
-        extrudeStatus[patchPointI] = NOEXTRUDE;
-        patchNLayers[patchPointI] = 0;
-        patchDisp[patchPointI] = Zero;
+        extrudeStatus[patchPointi] = NOEXTRUDE;
+        patchNLayers[patchPointi] = 0;
+        patchDisp[patchPointi] = Zero;
         return true;
     }
-    else if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
+    else if (extrudeStatus[patchPointi] == EXTRUDEREMOVE)
     {
-        extrudeStatus[patchPointI] = NOEXTRUDE;
-        patchNLayers[patchPointI] = 0;
-        patchDisp[patchPointI] = Zero;
+        extrudeStatus[patchPointi] = NOEXTRUDE;
+        patchNLayers[patchPointi] = 0;
+        patchDisp[patchPointi] = Zero;
         return true;
     }
     else
@@ -364,13 +364,13 @@ void Foam::snappyLayerDriver::handleNonManifolds
     {
         const labelList& meshPoints = pp.meshPoints();
 
-        forAll(meshPoints, patchPointI)
+        forAll(meshPoints, patchPointi)
         {
-            if (nonManifoldPoints.found(meshPoints[patchPointI]))
+            if (nonManifoldPoints.found(meshPoints[patchPointi]))
             {
                 unmarkExtrusion
                 (
-                    patchPointI,
+                    patchPointi,
                     patchDisp,
                     patchNLayers,
                     extrudeStatus
@@ -596,9 +596,9 @@ void Foam::snappyLayerDriver::handleWarpedFaces
 //    cellSet multiPatchCells(mesh, "multiPatchCells", pp.size());
 //
 //    // Detect points that use multiple faces on same cell.
-//    forAll(pointFaces, patchPointI)
+//    forAll(pointFaces, patchPointi)
 //    {
-//        const labelList& pFaces = pointFaces[patchPointI];
+//        const labelList& pFaces = pointFaces[patchPointi];
 //
 //        labelHashSet pointCells(pFaces.size());
 //
@@ -640,11 +640,11 @@ void Foam::snappyLayerDriver::handleWarpedFaces
 //        // (has to be done in separate loop since having one point on
 //        // multipatches has to reset extrusion on all points of cell)
 //
-//        forAll(pointFaces, patchPointI)
+//        forAll(pointFaces, patchPointi)
 //        {
-//            if (extrudeStatus[patchPointI] != NOEXTRUDE)
+//            if (extrudeStatus[patchPointi] != NOEXTRUDE)
 //            {
-//                const labelList& pFaces = pointFaces[patchPointI];
+//                const labelList& pFaces = pointFaces[patchPointi];
 //
 //                forAll(pFaces, i)
 //                {
@@ -657,7 +657,7 @@ void Foam::snappyLayerDriver::handleWarpedFaces
 //                        (
 //                            unmarkExtrusion
 //                            (
-//                                patchPointI,
+//                                patchPointi,
 //                                patchDisp,
 //                                patchNLayers,
 //                                extrudeStatus
@@ -708,12 +708,12 @@ void Foam::snappyLayerDriver::setNumLayers
 
         label wantedLayers = patchToNLayers[patchi];
 
-        forAll(meshPoints, patchPointI)
+        forAll(meshPoints, patchPointi)
         {
-            label ppPointI = pp.meshPointMap()[meshPoints[patchPointI]];
+            label ppPointi = pp.meshPointMap()[meshPoints[patchPointi]];
 
-            maxLayers[ppPointI] = max(wantedLayers, maxLayers[ppPointI]);
-            minLayers[ppPointI] = min(wantedLayers, minLayers[ppPointI]);
+            maxLayers[ppPointi] = max(wantedLayers, maxLayers[ppPointi]);
+            minLayers[ppPointi] = min(wantedLayers, minLayers[ppPointi]);
         }
     }
 
@@ -951,12 +951,12 @@ void Foam::snappyLayerDriver::growNoExtrusion
     }
 
 
-    forAll(extrudeStatus, patchPointI)
+    forAll(extrudeStatus, patchPointi)
     {
-        if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        if (extrudeStatus[patchPointi] == NOEXTRUDE)
         {
-            patchDisp[patchPointI] = Zero;
-            patchNLayers[patchPointI] = 0;
+            patchDisp[patchPointi] = Zero;
+            patchNLayers[patchPointi] = 0;
         }
     }
 
@@ -1093,33 +1093,33 @@ void Foam::snappyLayerDriver::calculateLayerThickness
 
         const labelList& meshPoints = patches[patchi].meshPoints();
 
-        forAll(meshPoints, patchPointI)
+        forAll(meshPoints, patchPointi)
         {
-            label ppPointI = pp.meshPointMap()[meshPoints[patchPointI]];
+            label ppPointi = pp.meshPointMap()[meshPoints[patchPointi]];
 
-            firstLayerThickness[ppPointI] = min
+            firstLayerThickness[ppPointi] = min
             (
-                firstLayerThickness[ppPointI],
+                firstLayerThickness[ppPointi],
                 layerParams.firstLayerThickness()[patchi]
             );
-            finalLayerThickness[ppPointI] = min
+            finalLayerThickness[ppPointi] = min
             (
-                finalLayerThickness[ppPointI],
+                finalLayerThickness[ppPointi],
                 layerParams.finalLayerThickness()[patchi]
             );
-            totalThickness[ppPointI] = min
+            totalThickness[ppPointi] = min
             (
-                totalThickness[ppPointI],
+                totalThickness[ppPointi],
                 layerParams.thickness()[patchi]
             );
-            expRatio[ppPointI] = min
+            expRatio[ppPointi] = min
             (
-                expRatio[ppPointI],
+                expRatio[ppPointi],
                 layerParams.expansionRatio()[patchi]
             );
-            minThickness[ppPointI] = min
+            minThickness[ppPointi] = min
             (
-                minThickness[ppPointI],
+                minThickness[ppPointi],
                 layerParams.minThickness()[patchi]
             );
         }
@@ -1218,14 +1218,14 @@ void Foam::snappyLayerDriver::calculateLayerThickness
         );
 
 
-        forAll(maxPointLevel, pointI)
+        forAll(maxPointLevel, pointi)
         {
             // Find undistorted edge size for this level.
-            scalar edgeLen = edge0Len/(1<<maxPointLevel[pointI]);
-            firstLayerThickness[pointI] *= edgeLen;
-            finalLayerThickness[pointI] *= edgeLen;
-            totalThickness[pointI] *= edgeLen;
-            minThickness[pointI] *= edgeLen;
+            scalar edgeLen = edge0Len/(1<<maxPointLevel[pointi]);
+            firstLayerThickness[pointi] *= edgeLen;
+            finalLayerThickness[pointi] *= edgeLen;
+            totalThickness[pointi] *= edgeLen;
+            minThickness[pointi] *= edgeLen;
         }
     }
 
@@ -1234,24 +1234,24 @@ void Foam::snappyLayerDriver::calculateLayerThickness
     // Rework thickness parameters into overall thickness
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    forAll(firstLayerThickness, pointI)
+    forAll(firstLayerThickness, pointi)
     {
-        thickness[pointI] = layerParams.layerThickness
+        thickness[pointi] = layerParams.layerThickness
         (
-            patchNLayers[pointI],
-            firstLayerThickness[pointI],
-            finalLayerThickness[pointI],
-            totalThickness[pointI],
-            expRatio[pointI]
+            patchNLayers[pointi],
+            firstLayerThickness[pointi],
+            finalLayerThickness[pointi],
+            totalThickness[pointi],
+            expRatio[pointi]
         );
 
-        expansionRatio[pointI] = layerParams.layerExpansionRatio
+        expansionRatio[pointi] = layerParams.layerExpansionRatio
         (
-            patchNLayers[pointI],
-            firstLayerThickness[pointI],
-            finalLayerThickness[pointI],
-            totalThickness[pointI],
-            expRatio[pointI]
+            patchNLayers[pointi],
+            firstLayerThickness[pointi],
+            finalLayerThickness[pointi],
+            totalThickness[pointi],
+            expRatio[pointi]
         );
     }
 
@@ -1294,21 +1294,21 @@ void Foam::snappyLayerDriver::calculateLayerThickness
             scalar sumNearWallThickness = 0;
             label nMasterPoints = 0;
 
-            forAll(meshPoints, patchPointI)
+            forAll(meshPoints, patchPointi)
             {
-                label meshPointI = meshPoints[patchPointI];
-                if (isMasterPoint[meshPointI])
+                label meshPointi = meshPoints[patchPointi];
+                if (isMasterPoint[meshPointi])
                 {
-                    label ppPointI = pp.meshPointMap()[meshPointI];
+                    label ppPointi = pp.meshPointMap()[meshPointi];
 
-                    sumThickness += thickness[ppPointI];
+                    sumThickness += thickness[ppPointi];
                     sumNearWallThickness += layerParams.firstLayerThickness
                     (
-                        patchNLayers[ppPointI],
-                        firstLayerThickness[ppPointI],
-                        finalLayerThickness[ppPointI],
-                        thickness[ppPointI],
-                        expansionRatio[ppPointI]
+                        patchNLayers[ppPointi],
+                        firstLayerThickness[ppPointi],
+                        finalLayerThickness[ppPointi],
+                        thickness[ppPointi],
+                        expansionRatio[ppPointi]
                     );
                     nMasterPoints++;
                 }
@@ -1512,57 +1512,57 @@ void Foam::snappyLayerDriver::getPatchDisplacement
 
 
     // Check if no extrude possible.
-    forAll(pointNormals, patchPointI)
+    forAll(pointNormals, patchPointi)
     {
-        label meshPointI = pp.meshPoints()[patchPointI];
+        label meshPointi = pp.meshPoints()[patchPointi];
 
-        if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        if (extrudeStatus[patchPointi] == NOEXTRUDE)
         {
             // Do not use unmarkExtrusion; forcibly set to zero extrusion.
-            patchNLayers[patchPointI] = 0;
-            patchDisp[patchPointI] = Zero;
+            patchNLayers[patchPointi] = 0;
+            patchDisp[patchPointi] = Zero;
         }
         else
         {
             // Get normal
-            const vector& n = pointNormals[patchPointI];
+            const vector& n = pointNormals[patchPointi];
 
-            if (!meshTools::visNormal(n, faceNormals, pointFaces[patchPointI]))
+            if (!meshTools::visNormal(n, faceNormals, pointFaces[patchPointi]))
             {
                 if (debug&meshRefinement::ATTRACTION)
                 {
-                    Pout<< "No valid normal for point " << meshPointI
-                        << ' ' << pp.points()[meshPointI]
+                    Pout<< "No valid normal for point " << meshPointi
+                        << ' ' << pp.points()[meshPointi]
                         << "; setting displacement to "
-                        << patchDisp[patchPointI]
+                        << patchDisp[patchPointi]
                         << endl;
                 }
 
-                extrudeStatus[patchPointI] = EXTRUDEREMOVE;
+                extrudeStatus[patchPointi] = EXTRUDEREMOVE;
                 nNoVisNormal++;
             }
         }
     }
 
     // At illegal points make displacement average of new neighbour positions
-    forAll(extrudeStatus, patchPointI)
+    forAll(extrudeStatus, patchPointi)
     {
-        if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
+        if (extrudeStatus[patchPointi] == EXTRUDEREMOVE)
         {
             point avg(Zero);
             label nPoints = 0;
 
-            const labelList& pEdges = pp.pointEdges()[patchPointI];
+            const labelList& pEdges = pp.pointEdges()[patchPointi];
 
             forAll(pEdges, i)
             {
                 label edgeI = pEdges[i];
 
-                label otherPointI = pp.edges()[edgeI].otherVertex(patchPointI);
+                label otherPointi = pp.edges()[edgeI].otherVertex(patchPointi);
 
-                if (extrudeStatus[otherPointI] != NOEXTRUDE)
+                if (extrudeStatus[otherPointi] != NOEXTRUDE)
                 {
-                    avg += localPoints[otherPointI] + patchDisp[otherPointI];
+                    avg += localPoints[otherPointi] + patchDisp[otherPointi];
                     nPoints++;
                 }
             }
@@ -1572,15 +1572,15 @@ void Foam::snappyLayerDriver::getPatchDisplacement
                 if (debug&meshRefinement::ATTRACTION)
                 {
                     Pout<< "Displacement at illegal point "
-                        << localPoints[patchPointI]
+                        << localPoints[patchPointi]
                         << " set to "
-                        << (avg / nPoints - localPoints[patchPointI])
+                        << (avg / nPoints - localPoints[patchPointi])
                         << endl;
                 }
 
-                patchDisp[patchPointI] =
+                patchDisp[patchPointi] =
                     avg / nPoints
-                  - localPoints[patchPointI];
+                  - localPoints[patchPointi];
 
                 nExtrudeRemove++;
             }
@@ -1748,13 +1748,13 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
         {
             if (meshPointMap.found(f[fp]))
             {
-                label patchPointI = meshPointMap[f[fp]];
+                label patchPointi = meshPointMap[f[fp]];
 
-                if (extrudeStatus[patchPointI] != NOEXTRUDE)
+                if (extrudeStatus[patchPointi] != NOEXTRUDE)
                 {
                     unmarkExtrusion
                     (
-                        patchPointI,
+                        patchPointi,
                         patchDisp,
                         patchNLayers,
                         extrudeStatus
@@ -1765,15 +1765,15 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
         }
     }
 
-    forAll(patchDisp, patchPointI)
+    forAll(patchDisp, patchPointi)
     {
-        if (mag(patchDisp[patchPointI]) < minThickness[patchPointI])
+        if (mag(patchDisp[patchPointi]) < minThickness[patchPointi])
         {
             if
             (
                 unmarkExtrusion
                 (
-                    patchPointI,
+                    patchPointi,
                     patchDisp,
                     patchNLayers,
                     extrudeStatus
@@ -1783,11 +1783,11 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
                 nChanged++;
             }
         }
-        else if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        else if (extrudeStatus[patchPointi] == NOEXTRUDE)
         {
             // Make sure displacement is 0. Should already be so but ...
-            patchDisp[patchPointI] = Zero;
-            patchNLayers[patchPointI] = 0;
+            patchDisp[patchPointi] = Zero;
+            patchNLayers[patchPointi] = 0;
         }
     }
 
@@ -2140,11 +2140,11 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
 
                 boolList foundNeighbour(pp.nPoints(), false);
 
-                forAll(pp.meshPoints(), patchPointI)
+                forAll(pp.meshPoints(), patchPointi)
                 {
-                    forAll(pointFaces[patchPointI], pointFacei)
+                    forAll(pointFaces[patchPointi], pointFacei)
                     {
-                        label facei = pointFaces[patchPointI][pointFacei];
+                        label facei = pointFaces[patchPointi][pointFacei];
 
                         if
                         (
@@ -2152,7 +2152,7 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
                          && maxLevel[facei] > 0
                         )
                         {
-                            foundNeighbour[patchPointI] = true;
+                            foundNeighbour[patchPointi] = true;
                             break;
                         }
                     }
@@ -2167,13 +2167,13 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
                     false               // null value
                 );
 
-                forAll(pp.meshPoints(), patchPointI)
+                forAll(pp.meshPoints(), patchPointi)
                 {
-                    if (foundNeighbour[patchPointI])
+                    if (foundNeighbour[patchPointi])
                     {
-                        forAll(pointFaces[patchPointI], pointFacei)
+                        forAll(pointFaces[patchPointi], pointFacei)
                         {
-                            label facei = pointFaces[patchPointI][pointFacei];
+                            label facei = pointFaces[patchPointi][pointFacei];
                             if
                             (
                                 nPatchFaceLayers[facei] == -1
@@ -2198,23 +2198,23 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
             }
         }
 
-        forAll(pp.meshPoints(), patchPointI)
+        forAll(pp.meshPoints(), patchPointi)
         {
-            if (extrudeStatus[patchPointI] != NOEXTRUDE)
+            if (extrudeStatus[patchPointi] != NOEXTRUDE)
             {
-                forAll(pointFaces[patchPointI], pointFacei)
+                forAll(pointFaces[patchPointi], pointFacei)
                 {
-                    label face = pointFaces[patchPointI][pointFacei];
-                    nPatchPointLayers[patchPointI] = max
+                    label face = pointFaces[patchPointi][pointFacei];
+                    nPatchPointLayers[patchPointi] = max
                     (
-                        nPatchPointLayers[patchPointI],
+                        nPatchPointLayers[patchPointi],
                         nPatchFaceLayers[face]
                     );
                 }
             }
             else
             {
-                nPatchPointLayers[patchPointI] = 0;
+                nPatchPointLayers[patchPointi] = 0;
             }
         }
         syncTools::syncPointList
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
index 4221127843..2017b2184e 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
@@ -146,7 +146,7 @@ private:
                 //- Unset extrusion on point. Returns true if anything unset.
                 static bool unmarkExtrusion
                 (
-                    const label patchPointI,
+                    const label patchPointi,
                     pointField& patchDisp,
                     labelList& patchNLayers,
                     List<extrudeMode>& extrudeStatus
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
index 4cc0e830bb..bf127f51b1 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
@@ -87,13 +87,13 @@ void Foam::snappyLayerDriver::sumWeights
         scalar(0.0)         // null value
     );
 
-    forAll(invSumWeight, pointI)
+    forAll(invSumWeight, pointi)
     {
-        scalar w = invSumWeight[pointI];
+        scalar w = invSumWeight[pointi];
 
         if (w > 0.0)
         {
-            invSumWeight[pointI] = 1.0/w;
+            invSumWeight[pointi] = 1.0/w;
         }
     }
 }
@@ -144,19 +144,19 @@ void Foam::snappyLayerDriver::smoothField
         );
 
         // Transfer to field
-        forAll(field, pointI)
+        forAll(field, pointi)
         {
             //full smoothing neighbours + point value
-            average[pointI] = 0.5*(field[pointI]+average[pointI]);
+            average[pointi] = 0.5*(field[pointi]+average[pointi]);
 
             // perform monotonic smoothing
             if
             (
-                average[pointI] < field[pointI]
-             && average[pointI] >= fieldMin[pointI]
+                average[pointi] < field[pointi]
+             && average[pointi] >= fieldMin[pointi]
             )
             {
-                field[pointI] = average[pointI];
+                field[pointi] = average[pointi];
             }
         }
 
@@ -325,12 +325,12 @@ void Foam::snappyLayerDriver::smoothPatchNormals
         }
 
         // Transfer to normals vector field
-        forAll(average, pointI)
+        forAll(average, pointi)
         {
             // full smoothing neighbours + point value
-            average[pointI] = 0.5*(normals[pointI]+average[pointI]);
-            normals[pointI] = average[pointI];
-            normals[pointI] /= mag(normals[pointI]) + VSMALL;
+            average[pointi] = 0.5*(normals[pointi]+average[pointi]);
+            normals[pointi] = average[pointi];
+            normals[pointi] /= mag(normals[pointi]) + VSMALL;
         }
     }
 }
@@ -358,8 +358,8 @@ void Foam::snappyLayerDriver::smoothNormals
     // Internal points that are fixed
     forAll(fixedPoints, i)
     {
-        label meshPointI = fixedPoints[i];
-        isFixedPoint.set(meshPointI, 1);
+        label meshPointi = fixedPoints[i];
+        isFixedPoint.set(meshPointi, 1);
     }
 
     // Make sure that points that are coupled to meshPoints but not on a patch
@@ -412,14 +412,14 @@ void Foam::snappyLayerDriver::smoothNormals
 
 
         // Transfer to normals vector field
-        forAll(average, pointI)
+        forAll(average, pointi)
         {
-            if (isFixedPoint.get(pointI) == 0)
+            if (isFixedPoint.get(pointi) == 0)
             {
                 //full smoothing neighbours + point value
-                average[pointI] = 0.5*(normals[pointI]+average[pointI]);
-                normals[pointI] = average[pointI];
-                normals[pointI] /= mag(normals[pointI]) + VSMALL;
+                average[pointi] = 0.5*(normals[pointi]+average[pointi]);
+                normals[pointi] = average[pointi];
+                normals[pointi] /= mag(normals[pointi]) + VSMALL;
             }
         }
     }
@@ -708,16 +708,16 @@ void Foam::snappyLayerDriver::findIsolatedRegions
         const labelListList& pointFaces = pp.pointFaces();
 
         boolList keptPoints(pp.nPoints(), false);
-        forAll(keptPoints, patchPointI)
+        forAll(keptPoints, patchPointi)
         {
-            const labelList& pFaces = pointFaces[patchPointI];
+            const labelList& pFaces = pointFaces[patchPointi];
 
             forAll(pFaces, i)
             {
                 label facei = pFaces[i];
                 if (extrudedFaces[facei])
                 {
-                    keptPoints[patchPointI] = true;
+                    keptPoints[patchPointi] = true;
                     break;
                 }
             }
@@ -734,15 +734,15 @@ void Foam::snappyLayerDriver::findIsolatedRegions
 
         label nChanged = 0;
 
-        forAll(keptPoints, patchPointI)
+        forAll(keptPoints, patchPointi)
         {
-            if (!keptPoints[patchPointI])
+            if (!keptPoints[patchPointi])
             {
                 if
                 (
                     unmarkExtrusion
                     (
-                        patchPointI,
+                        patchPointi,
                         patchDisp,
                         patchNLayers,
                         extrudeStatus
@@ -957,15 +957,15 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
         // Seed data.
         List<pointData> wallInfo(meshPoints.size());
 
-        forAll(meshPoints, patchPointI)
+        forAll(meshPoints, patchPointi)
         {
-            label pointI = meshPoints[patchPointI];
-            wallInfo[patchPointI] = pointData
+            label pointi = meshPoints[patchPointi];
+            wallInfo[patchPointi] = pointData
             (
-                points[pointI],
+                points[pointi],
                 0.0,
-                pointI,                       // passive scalar
-                pointNormals[patchPointI]     // surface normals
+                pointi,                       // passive scalar
+                pointNormals[patchPointi]     // surface normals
             );
         }
 
@@ -1009,12 +1009,12 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
         scalarField distSqr(pointWallDist.size());
         //NA scalarField passiveS(pointWallDist.size());
         pointField passiveV(pointWallDist.size());
-        forAll(pointWallDist, pointI)
+        forAll(pointWallDist, pointi)
         {
-            origin[pointI] = pointWallDist[pointI].origin();
-            distSqr[pointI] = pointWallDist[pointI].distSqr();
-            //passiveS[pointI] = pointWallDist[pointI].s();
-            passiveV[pointI] = pointWallDist[pointI].v();
+            origin[pointi] = pointWallDist[pointi].origin();
+            distSqr[pointi] = pointWallDist[pointi].distSqr();
+            //passiveS[pointi] = pointWallDist[pointi].s();
+            passiveV[pointi] = pointWallDist[pointi].v();
         }
         meshRefinement::testSyncPointList("origin", mesh, origin);
         meshRefinement::testSyncPointList("distSqr", mesh, distSqr);
@@ -1085,22 +1085,22 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
 
                     forAll(e, ep)
                     {
-                        label pointI = e[ep];
+                        label pointi = e[ep];
 
-                        if (!pointMedialDist[pointI].valid(dummyTrackData))
+                        if (!pointMedialDist[pointi].valid(dummyTrackData))
                         {
-                            maxPoints.append(pointI);
+                            maxPoints.append(pointi);
                             maxInfo.append
                             (
                                 pointData
                                 (
-                                    medialAxisPt,   //points[pointI],
-                                    magSqr(points[pointI]-medialAxisPt),//0.0,
-                                    pointI,         // passive data
+                                    medialAxisPt,   //points[pointi],
+                                    magSqr(points[pointi]-medialAxisPt),//0.0,
+                                    pointi,         // passive data
                                     Zero    // passive data
                                 )
                             );
-                            pointMedialDist[pointI] = maxInfo.last();
+                            pointMedialDist[pointi] = maxInfo.last();
                         }
                     }
                 }
@@ -1142,21 +1142,21 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
 
                     forAll(meshPoints, i)
                     {
-                        label pointI = meshPoints[i];
-                        if (!pointMedialDist[pointI].valid(dummyTrackData))
+                        label pointi = meshPoints[i];
+                        if (!pointMedialDist[pointi].valid(dummyTrackData))
                         {
-                            maxPoints.append(pointI);
+                            maxPoints.append(pointi);
                             maxInfo.append
                             (
                                 pointData
                                 (
-                                    points[pointI],
+                                    points[pointi],
                                     0.0,
-                                    pointI,         // passive data
+                                    pointi,         // passive data
                                     Zero    // passive data
                                 )
                             );
-                            pointMedialDist[pointI] = maxInfo.last();
+                            pointMedialDist[pointi] = maxInfo.last();
                         }
                     }
                 }
@@ -1176,18 +1176,18 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
 
                     forAll(meshPoints, i)
                     {
-                        label pointI = meshPoints[i];
+                        label pointi = meshPoints[i];
 
                         if
                         (
-                            pointWallDist[pointI].valid(dummyTrackData)
-                        && !pointMedialDist[pointI].valid(dummyTrackData)
+                            pointWallDist[pointi].valid(dummyTrackData)
+                        && !pointMedialDist[pointi].valid(dummyTrackData)
                         )
                         {
                             // Check if angle not too large.
                             scalar cosAngle =
                             (
-                               -pointWallDist[pointI].v()
+                               -pointWallDist[pointi].v()
                               & pointNormals[i]
                             );
                             if (cosAngle > featureAngleCos)
@@ -1195,18 +1195,18 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
                                 // Extrusion direction practically perpendicular
                                 // to the patch. Disable movement at the patch.
 
-                                maxPoints.append(pointI);
+                                maxPoints.append(pointi);
                                 maxInfo.append
                                 (
                                     pointData
                                     (
-                                        points[pointI],
+                                        points[pointi],
                                         0.0,
-                                        pointI,         // passive data
+                                        pointi,         // passive data
                                         Zero    // passive data
                                     )
                                 );
-                                pointMedialDist[pointI] = maxInfo.last();
+                                pointMedialDist[pointi] = maxInfo.last();
                             }
                             else
                             {
@@ -1236,10 +1236,10 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
         );
 
         // Extract medial axis distance as pointScalarField
-        forAll(pointMedialDist, pointI)
+        forAll(pointMedialDist, pointi)
         {
-            medialDist[pointI] = Foam::sqrt(pointMedialDist[pointI].distSqr());
-            medialVec[pointI] = pointMedialDist[pointI].origin();
+            medialDist[pointi] = Foam::sqrt(pointMedialDist[pointi].distSqr());
+            medialVec[pointi] = pointMedialDist[pointi].origin();
         }
 
         // Check
@@ -1279,16 +1279,16 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
     }
 
     // Calculate ratio point medial distance to point wall distance
-    forAll(medialRatio, pointI)
+    forAll(medialRatio, pointi)
     {
-        if (!pointWallDist[pointI].valid(dummyTrackData))
+        if (!pointWallDist[pointi].valid(dummyTrackData))
         {
-            medialRatio[pointI] = 0.0;
+            medialRatio[pointi] = 0.0;
         }
         else
         {
-            scalar wDist2 = pointWallDist[pointI].distSqr();
-            scalar mDist = medialDist[pointI];
+            scalar wDist2 = pointWallDist[pointi].distSqr();
+            scalar mDist = medialDist[pointi];
 
             if (wDist2 < sqr(SMALL) && mDist < SMALL)
             //- Note: maybe less strict:
@@ -1297,11 +1297,11 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
             // && mDist < meshRefiner_.mergeDistance()
             //)
             {
-                medialRatio[pointI] = 0.0;
+                medialRatio[pointi] = 0.0;
             }
             else
             {
-                medialRatio[pointI] = mDist / (Foam::sqrt(wDist2) + mDist);
+                medialRatio[pointi] = mDist / (Foam::sqrt(wDist2) + mDist);
             }
         }
     }
@@ -1396,11 +1396,11 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
 
     thickness = mag(patchDisp);
 
-    forAll(thickness, patchPointI)
+    forAll(thickness, patchPointi)
     {
-        if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        if (extrudeStatus[patchPointi] == NOEXTRUDE)
         {
-            thickness[patchPointI] = 0.0;
+            thickness[patchPointi] = 0.0;
         }
     }
 
@@ -1443,23 +1443,23 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
             << medialVecStr().name() << endl;
     }
 
-    forAll(meshPoints, patchPointI)
+    forAll(meshPoints, patchPointi)
     {
-        if (extrudeStatus[patchPointI] != NOEXTRUDE)
+        if (extrudeStatus[patchPointi] != NOEXTRUDE)
         {
-            label pointI = meshPoints[patchPointI];
+            label pointi = meshPoints[patchPointi];
 
             //- Option 1: look only at extrusion thickness v.s. distance
             //  to nearest (medial axis or static) point.
-            scalar mDist = medialDist[pointI];
-            scalar thicknessRatio = thickness[patchPointI]/(mDist+VSMALL);
+            scalar mDist = medialDist[pointi];
+            scalar thicknessRatio = thickness[patchPointi]/(mDist+VSMALL);
 
             //- Option 2: Look at component in the direction
             //  of nearest (medial axis or static) point.
             vector n =
-                patchDisp[patchPointI]
-              / (mag(patchDisp[patchPointI]) + VSMALL);
-            vector mVec = mesh.points()[pointI]-medialVec[pointI];
+                patchDisp[patchPointi]
+              / (mag(patchDisp[patchPointi]) + VSMALL);
+            vector mVec = mesh.points()[pointi]-medialVec[pointi];
             mVec /= mag(mVec)+VSMALL;
             thicknessRatio *= (n&mVec);
 
@@ -1469,13 +1469,13 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
                 if (debug)
                 {
                     Pout<< "truncating displacement at "
-                        << mesh.points()[pointI]
-                        << " from " << thickness[patchPointI]
+                        << mesh.points()[pointi]
+                        << " from " << thickness[patchPointi]
                         << " to "
                         <<  0.5
                            *(
-                                minThickness[patchPointI]
-                               +thickness[patchPointI]
+                                minThickness[patchPointi]
+                               +thickness[patchPointi]
                             )
                         << " medial direction:" << mVec
                         << " extrusion direction:" << n
@@ -1483,30 +1483,30 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
                         << endl;
                 }
 
-                thickness[patchPointI] =
-                    0.5*(minThickness[patchPointI]+thickness[patchPointI]);
+                thickness[patchPointi] =
+                    0.5*(minThickness[patchPointi]+thickness[patchPointi]);
 
-                patchDisp[patchPointI] = thickness[patchPointI]*n;
+                patchDisp[patchPointi] = thickness[patchPointi]*n;
 
-                if (isMasterPoint[pointI])
+                if (isMasterPoint[pointi])
                 {
                     numThicknessRatioExclude++;
                 }
 
                 if (str.valid())
                 {
-                    const point& pt = mesh.points()[pointI];
-                    str().write(linePointRef(pt, pt+patchDisp[patchPointI]));
+                    const point& pt = mesh.points()[pointi];
+                    str().write(linePointRef(pt, pt+patchDisp[patchPointi]));
                 }
                 if (medialVecStr.valid())
                 {
-                    const point& pt = mesh.points()[pointI];
+                    const point& pt = mesh.points()[pointi];
                     medialVecStr().write
                     (
                         linePointRef
                         (
                             pt,
-                            medialVec[pointI]
+                            medialVec[pointi]
                         )
                     );
                 }
@@ -1537,11 +1537,11 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
     );
 
     // Update thickess for changed extrusion
-    forAll(thickness, patchPointI)
+    forAll(thickness, patchPointi)
     {
-        if (extrudeStatus[patchPointI] == NOEXTRUDE)
+        if (extrudeStatus[patchPointi] == NOEXTRUDE)
         {
-            thickness[patchPointI] = 0.0;
+            thickness[patchPointi] = 0.0;
         }
     }
 
@@ -1575,15 +1575,15 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
         // Seed data.
         List<pointData> wallInfo(meshPoints.size());
 
-        forAll(meshPoints, patchPointI)
+        forAll(meshPoints, patchPointi)
         {
-            label pointI = meshPoints[patchPointI];
-            wallPoints[patchPointI] = pointI;
-            wallInfo[patchPointI] = pointData
+            label pointi = meshPoints[patchPointi];
+            wallPoints[patchPointi] = pointi;
+            wallInfo[patchPointi] = pointData
             (
-                points[pointI],
+                points[pointi],
                 0.0,
-                thickness[patchPointI],       // transport layer thickness
+                thickness[patchPointi],       // transport layer thickness
                 Zero                  // passive vector
             );
         }
@@ -1604,23 +1604,23 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
     // Calculate scaled displacement vector
     pointVectorField& displacement = meshMover.displacement();
 
-    forAll(displacement, pointI)
+    forAll(displacement, pointi)
     {
-        if (!pointWallDist[pointI].valid(dummyTrackData))
+        if (!pointWallDist[pointi].valid(dummyTrackData))
         {
-            displacement[pointI] = Zero;
+            displacement[pointi] = Zero;
         }
         else
         {
             // 1) displacement on nearest wall point, scaled by medialRatio
             //    (wall distance / medial distance)
-            // 2) pointWallDist[pointI].s() is layer thickness transported
+            // 2) pointWallDist[pointi].s() is layer thickness transported
             //    from closest wall point.
             // 3) shrink in opposite direction of addedPoints
-            displacement[pointI] =
-                -medialRatio[pointI]
-                *pointWallDist[pointI].s()
-                *dispVec[pointI];
+            displacement[pointi] =
+                -medialRatio[pointi]
+                *pointWallDist[pointi].s()
+                *dispVec[pointi];
         }
     }
 
@@ -1723,9 +1723,9 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
 
         // pointWallDist
         scalarField pWallDist(pointWallDist.size());
-        forAll(pointWallDist, pointI)
+        forAll(pointWallDist, pointi)
         {
-            pWallDist[pointI] = pointWallDist[pointI].s();
+            pWallDist[pointi] = pointWallDist[pointi].s();
         }
         meshRefinement::testSyncPointList("pointWallDist", mesh, pWallDist);
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 051508b3d2..786e370eff 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -86,32 +86,32 @@ Foam::label Foam::snappySnapDriver::getCollocatedPoints
     // Per old point the newPoint. Or -1 (not set yet) or -2 (already seen
     // twice)
     labelList firstOldPoint(nUnique, -1);
-    forAll(pointMap, oldPointI)
+    forAll(pointMap, oldPointi)
     {
-        label newPointI = pointMap[oldPointI];
+        label newPointi = pointMap[oldPointi];
 
-        if (firstOldPoint[newPointI] == -1)
+        if (firstOldPoint[newPointi] == -1)
         {
-            // First use of oldPointI. Store.
-            firstOldPoint[newPointI] = oldPointI;
+            // First use of oldPointi. Store.
+            firstOldPoint[newPointi] = oldPointi;
         }
-        else if (firstOldPoint[newPointI] == -2)
+        else if (firstOldPoint[newPointi] == -2)
         {
-            // Third or more reference of oldPointI -> non-manifold
-            isCollocatedPoint.set(oldPointI, 1u);
+            // Third or more reference of oldPointi -> non-manifold
+            isCollocatedPoint.set(oldPointi, 1u);
             nCollocated++;
         }
         else
         {
-            // Second reference of oldPointI -> non-manifold
-            isCollocatedPoint.set(firstOldPoint[newPointI], 1u);
+            // Second reference of oldPointi -> non-manifold
+            isCollocatedPoint.set(firstOldPoint[newPointi], 1u);
             nCollocated++;
 
-            isCollocatedPoint.set(oldPointI, 1u);
+            isCollocatedPoint.set(oldPointi, 1u);
             nCollocated++;
 
             // Mark with special value to save checking next time round
-            firstOldPoint[newPointI] = -2;
+            firstOldPoint[newPointi] = -2;
         }
     }
     return returnReduce(nCollocated, sumOp<label>());
@@ -192,9 +192,9 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
     vectorField avgBoundary(pointFaces.size(), Zero);
     labelList nBoundary(pointFaces.size(), 0);
 
-    forAll(pointFaces, patchPointI)
+    forAll(pointFaces, patchPointi)
     {
-        const labelList& pFaces = pointFaces[patchPointI];
+        const labelList& pFaces = pointFaces[patchPointi];
 
         forAll(pFaces, pfI)
         {
@@ -202,8 +202,8 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
 
             if (isMasterFace.get(pp.addressing()[facei]))
             {
-                avgBoundary[patchPointI] += pp[facei].centre(points);
-                nBoundary[patchPointI]++;
+                avgBoundary[patchPointi] += pp[facei].centre(points);
+                nBoundary[patchPointi]++;
             }
         }
     }
@@ -303,21 +303,21 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
         avgInternal.setSize(meshPoints.size());
         nInternal.setSize(meshPoints.size());
 
-        forAll(avgInternal, patchPointI)
+        forAll(avgInternal, patchPointi)
         {
-            label meshPointI = meshPoints[patchPointI];
+            label meshPointi = meshPoints[patchPointi];
 
-            nInternal[patchPointI] = globalNum[meshPointI];
+            nInternal[patchPointi] = globalNum[meshPointi];
 
-            if (nInternal[patchPointI] == 0)
+            if (nInternal[patchPointi] == 0)
             {
-                avgInternal[patchPointI] = globalSum[meshPointI];
+                avgInternal[patchPointi] = globalSum[meshPointi];
             }
             else
             {
-                avgInternal[patchPointI] =
-                    globalSum[meshPointI]
-                  / nInternal[patchPointI];
+                avgInternal[patchPointi] =
+                    globalSum[meshPointi]
+                  / nInternal[patchPointi];
             }
         }
     }
@@ -355,8 +355,8 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
 
     forAll(pointFaces, i)
     {
-        label meshPointI = meshPoints[i];
-        const point& currentPos = pp.points()[meshPointI];
+        label meshPointi = meshPoints[i];
+        const point& currentPos = pp.points()[meshPointi];
 
         // Now we have the two average points: avgBoundary and avgInternal
         // and how many boundary/internal faces connect to the point
@@ -387,9 +387,9 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
         {
             // Non-manifold without internal faces. Use any connected cell
             // as internal point instead. Use precalculated any cell to avoid
-            // e.g. pointCells()[meshPointI][0]
+            // e.g. pointCells()[meshPointi][0]
 
-            const point& cc = mesh.cellCentres()[anyCell[meshPointI]];
+            const point& cc = mesh.cellCentres()[anyCell[meshPointi]];
 
             scalar cellCBlend = 0.8;
             scalar blend = 0.1;
@@ -547,9 +547,9 @@ Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::edgePatchDist
     //        pointDist[e[0]] += d;
     //        pointDist[e[1]] += d;
     //    }
-    //    forAll(pointDist, pointI)
+    //    forAll(pointDist, pointi)
     //    {
-    //        pointDist[pointI] /= mesh.pointEdges()[pointI].size();
+    //        pointDist[pointi] /= mesh.pointEdges()[pointi].size();
     //    }
     //    Info<< "Writing patch distance to " << pointDist.name()
     //        << " at time " << meshRefiner_.timeName() << endl;
@@ -599,11 +599,11 @@ bool Foam::snappySnapDriver::outwardsDisplacement
     const vectorField& faceNormals = pp.faceNormals();
     const labelListList& pointFaces = pp.pointFaces();
 
-    forAll(pointFaces, pointI)
+    forAll(pointFaces, pointi)
     {
-        const labelList& pFaces = pointFaces[pointI];
+        const labelList& pFaces = pointFaces[pointi];
 
-        vector disp(patchDisp[pointI]);
+        vector disp(patchDisp[pointi]);
 
         scalar magDisp = mag(disp);
 
@@ -615,9 +615,9 @@ bool Foam::snappySnapDriver::outwardsDisplacement
 
             if (!outwards)
             {
-                Warning<< "Displacement " << patchDisp[pointI]
-                    << " at mesh point " << pp.meshPoints()[pointI]
-                    << " coord " << pp.points()[pp.meshPoints()[pointI]]
+                Warning<< "Displacement " << patchDisp[pointi]
+                    << " at mesh point " << pp.meshPoints()[pointi]
+                    << " coord " << pp.points()[pp.meshPoints()[pointi]]
                     << " points through the surrounding patch faces" << endl;
                 return false;
             }
@@ -690,9 +690,9 @@ Foam::scalarField Foam::snappySnapDriver::calcSnapDistance
 
     scalarField maxEdgeLen(localPoints.size(), -GREAT);
 
-    forAll(pointEdges, pointI)
+    forAll(pointEdges, pointi)
     {
-        const labelList& pEdges = pointEdges[pointI];
+        const labelList& pEdges = pointEdges[pointi];
 
         forAll(pEdges, pEdgeI)
         {
@@ -700,7 +700,7 @@ Foam::scalarField Foam::snappySnapDriver::calcSnapDistance
 
             scalar len = e.mag(localPoints);
 
-            maxEdgeLen[pointI] = max(maxEdgeLen[pointI], len);
+            maxEdgeLen[pointi] = max(maxEdgeLen[pointi], len);
         }
     }
 
@@ -844,15 +844,15 @@ Foam::labelList Foam::snappySnapDriver::getZoneSurfacePoints
 
         forAll(f, fp)
         {
-            label meshPointI = f[fp];
+            label meshPointi = f[fp];
 
             Map<label>::const_iterator iter =
-                pp.meshPointMap().find(meshPointI);
+                pp.meshPointMap().find(meshPointi);
 
             if (iter != pp.meshPointMap().end())
             {
-                label pointI = iter();
-                pointOnZone[pointI] = true;
+                label pointi = iter();
+                pointOnZone[pointi] = true;
             }
         }
     }
@@ -877,9 +877,9 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
     pointField& avgBoundary = tavgBoundary.ref();
     labelList nBoundary(pointFaces.size(), 0);
 
-    forAll(pointFaces, pointI)
+    forAll(pointFaces, pointi)
     {
-        const labelList& pFaces = pointFaces[pointI];
+        const labelList& pFaces = pointFaces[pointi];
 
         forAll(pFaces, pfI)
         {
@@ -887,8 +887,8 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
             label meshFacei = pp.addressing()[facei];
 
             label own = mesh.faceOwner()[meshFacei];
-            avgBoundary[pointI] += mesh.cellCentres()[own];
-            nBoundary[pointI]++;
+            avgBoundary[pointi] += mesh.cellCentres()[own];
+            nBoundary[pointi]++;
         }
     }
 
@@ -955,10 +955,10 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
 //        );
 //
 //
-//        forAll(maxPointLevel, pointI)
+//        forAll(maxPointLevel, pointi)
 //        {
 //            // Find undistorted edge size for this level.
-//            edgeLen[pointI] = edge0Len/(1<<maxPointLevel[pointI]);
+//            edgeLen[pointi] = edge0Len/(1<<maxPointLevel[pointi]);
 //        }
 //    }
 //    return tedgeLen;
@@ -997,9 +997,9 @@ void Foam::snappySnapDriver::detectNearSurfaces
     //    pointField end(start.size());
     //
     //    label rayI = 0;
-    //    forAll(localPoints, pointI)
+    //    forAll(localPoints, pointi)
     //    {
-    //        const point& pt = localPoints[pointI];
+    //        const point& pt = localPoints[pointi];
     //
     //        // Along coordinate axes
     //
@@ -1007,42 +1007,42 @@ void Foam::snappySnapDriver::detectNearSurfaces
     //            start[rayI] = pt;
     //            point& endPt = end[rayI++];
     //            endPt = pt;
-    //            endPt.x() -= edgeLen[pointI];
+    //            endPt.x() -= edgeLen[pointi];
     //        }
     //        {
     //            start[rayI] = pt;
     //            point& endPt = end[rayI++];
     //            endPt = pt;
-    //            endPt.x() += edgeLen[pointI];
+    //            endPt.x() += edgeLen[pointi];
     //        }
     //        {
     //            start[rayI] = pt;
     //            point& endPt = end[rayI++];
     //            endPt = pt;
-    //            endPt.y() -= edgeLen[pointI];
+    //            endPt.y() -= edgeLen[pointi];
     //        }
     //        {
     //            start[rayI] = pt;
     //            point& endPt = end[rayI++];
     //            endPt = pt;
-    //            endPt.y() += edgeLen[pointI];
+    //            endPt.y() += edgeLen[pointi];
     //        }
     //        {
     //            start[rayI] = pt;
     //            point& endPt = end[rayI++];
     //            endPt = pt;
-    //            endPt.z() -= edgeLen[pointI];
+    //            endPt.z() -= edgeLen[pointi];
     //        }
     //        {
     //            start[rayI] = pt;
     //            point& endPt = end[rayI++];
     //            endPt = pt;
-    //            endPt.z() += edgeLen[pointI];
+    //            endPt.z() += edgeLen[pointi];
     //        }
     //
     //        // At 45 degrees
     //
-    //        const vector vec(edgeLen[pointI]*n);
+    //        const vector vec(edgeLen[pointi]*n);
     //
     //        {
     //            start[rayI] = pt;
@@ -1171,7 +1171,7 @@ void Foam::snappySnapDriver::detectNearSurfaces
     //        Info<< "Dumping intersections with co-planar surfaces to "
     //            << str.name() << endl;
     //
-    //        forAll(localPoints, pointI)
+    //        forAll(localPoints, pointi)
     //        {
     //            bool hasNormal = false;
     //            point surfPointA;
@@ -1181,7 +1181,7 @@ void Foam::snappySnapDriver::detectNearSurfaces
     //
     //            bool isCoplanar = false;
     //
-    //            label rayI = 14*pointI;
+    //            label rayI = 14*pointi;
     //            for (label i = 0; i < 14; i++)
     //            {
     //                if (hit1[rayI].hit())
@@ -1266,12 +1266,12 @@ void Foam::snappySnapDriver::detectNearSurfaces
     // Construct rays through localPoints to beyond cell centre
     pointField start(pp.nPoints());
     pointField end(pp.nPoints());
-    forAll(localPoints, pointI)
+    forAll(localPoints, pointi)
     {
-        const point& pt = localPoints[pointI];
-        const vector d = 2*(avgCc[pointI]-pt);
-        start[pointI] = pt - d;
-        end[pointI] = pt + d;
+        const point& pt = localPoints[pointi];
+        const vector d = 2*(avgCc[pointi]-pt);
+        start[pointi] = pt - d;
+        end[pointi] = pt + d;
     }
 
 
@@ -1337,61 +1337,61 @@ void Foam::snappySnapDriver::detectNearSurfaces
         );
 
 
-        forAll(localPoints, pointI)
+        forAll(localPoints, pointi)
         {
             // Current location
-            const point& pt = localPoints[pointI];
+            const point& pt = localPoints[pointi];
 
             bool override = false;
 
-            //if (hit1[pointI].hit())
+            //if (hit1[pointi].hit())
             //{
             //    if
             //    (
             //        meshRefiner_.isGap
             //        (
             //            planarCos,
-            //            nearestPoint[pointI],
-            //            nearestNormal[pointI],
-            //            hit1[pointI].hitPoint(),
-            //            normal1[pointI]
+            //            nearestPoint[pointi],
+            //            nearestNormal[pointi],
+            //            hit1[pointi].hitPoint(),
+            //            normal1[pointi]
             //        )
             //    )
             //    {
-            //        disp[pointI] = hit1[pointI].hitPoint()-pt;
+            //        disp[pointi] = hit1[pointi].hitPoint()-pt;
             //        override = true;
             //    }
             //}
-            //if (hit2[pointI].hit())
+            //if (hit2[pointi].hit())
             //{
             //    if
             //    (
             //        meshRefiner_.isGap
             //        (
             //            planarCos,
-            //            nearestPoint[pointI],
-            //            nearestNormal[pointI],
-            //            hit2[pointI].hitPoint(),
-            //            normal2[pointI]
+            //            nearestPoint[pointi],
+            //            nearestNormal[pointi],
+            //            hit2[pointi].hitPoint(),
+            //            normal2[pointi]
             //        )
             //    )
             //    {
-            //        disp[pointI] = hit2[pointI].hitPoint()-pt;
+            //        disp[pointi] = hit2[pointi].hitPoint()-pt;
             //        override = true;
             //    }
             //}
 
-            if (hit1[pointI].hit() && hit2[pointI].hit())
+            if (hit1[pointi].hit() && hit2[pointi].hit())
             {
                 if
                 (
                     meshRefiner_.isGap
                     (
                         planarCos,
-                        hit1[pointI].hitPoint(),
-                        normal1[pointI],
-                        hit2[pointI].hitPoint(),
-                        normal2[pointI]
+                        hit1[pointi].hitPoint(),
+                        normal1[pointi],
+                        hit2[pointi].hitPoint(),
+                        normal2[pointi]
                     )
                 )
                 {
@@ -1400,17 +1400,17 @@ void Foam::snappySnapDriver::detectNearSurfaces
 
                     if (gapStr.valid())
                     {
-                        const point& intPt = hit2[pointI].hitPoint();
+                        const point& intPt = hit2[pointi].hitPoint();
                         gapStr().write(linePointRef(pt, intPt));
                     }
 
                     // Choose hit2 : nearest to end point (so inside the domain)
-                    disp[pointI] = hit2[pointI].hitPoint()-pt;
+                    disp[pointi] = hit2[pointi].hitPoint()-pt;
                     override = true;
                 }
             }
 
-            if (override && isPatchMasterPoint[pointI])
+            if (override && isPatchMasterPoint[pointi])
             {
                 nOverride++;
             }
@@ -1479,10 +1479,10 @@ void Foam::snappySnapDriver::detectNearSurfaces
 
             forAll(hit1, i)
             {
-                label pointI = zonePointIndices[i];
+                label pointi = zonePointIndices[i];
 
                 // Current location
-                const point& pt = localPoints[pointI];
+                const point& pt = localPoints[pointi];
 
                 bool override = false;
 
@@ -1493,14 +1493,14 @@ void Foam::snappySnapDriver::detectNearSurfaces
                 //        meshRefiner_.isGap
                 //        (
                 //            planarCos,
-                //            nearestPoint[pointI],
-                //            nearestNormal[pointI],
+                //            nearestPoint[pointi],
+                //            nearestNormal[pointi],
                 //            hit1[i].hitPoint(),
                 //            normal1[i]
                 //        )
                 //    )
                 //    {
-                //        disp[pointI] = hit1[i].hitPoint()-pt;
+                //        disp[pointi] = hit1[i].hitPoint()-pt;
                 //        override = true;
                 //    }
                 //}
@@ -1511,14 +1511,14 @@ void Foam::snappySnapDriver::detectNearSurfaces
                 //        meshRefiner_.isGap
                 //        (
                 //            planarCos,
-                //            nearestPoint[pointI],
-                //            nearestNormal[pointI],
+                //            nearestPoint[pointi],
+                //            nearestNormal[pointi],
                 //            hit2[i].hitPoint(),
                 //            normal2[i]
                 //        )
                 //    )
                 //    {
-                //        disp[pointI] = hit2[i].hitPoint()-pt;
+                //        disp[pointi] = hit2[i].hitPoint()-pt;
                 //        override = true;
                 //    }
                 //}
@@ -1543,12 +1543,12 @@ void Foam::snappySnapDriver::detectNearSurfaces
                             gapStr().write(linePointRef(pt, intPt));
                         }
 
-                        disp[pointI] = hit2[i].hitPoint()-pt;
+                        disp[pointi] = hit2[i].hitPoint()-pt;
                         override = true;
                     }
                 }
 
-                if (override && isPatchMasterPoint[pointI])
+                if (override && isPatchMasterPoint[pointi])
                 {
                     nOverride++;
                 }
@@ -1622,12 +1622,12 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
                     hitNormal
                 );
 
-                forAll(hitInfo, pointI)
+                forAll(hitInfo, pointi)
                 {
-                    if (hitInfo[pointI].hit())
+                    if (hitInfo[pointi].hit())
                     {
-                        nearestPoint[pointI] = hitInfo[pointI].hitPoint();
-                        nearestNormal[pointI] = hitNormal[pointI];
+                        nearestPoint[pointi] = hitInfo[pointi].hitPoint();
+                        nearestNormal[pointi] = hitNormal[pointi];
                     }
                 }
             }
@@ -1643,15 +1643,15 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
                 );
             }
 
-            forAll(hitInfo, pointI)
+            forAll(hitInfo, pointi)
             {
-                if (hitInfo[pointI].hit())
+                if (hitInfo[pointi].hit())
                 {
-                    patchDisp[pointI] =
-                        hitInfo[pointI].hitPoint()
-                      - localPoints[pointI];
+                    patchDisp[pointi] =
+                        hitInfo[pointi].hitPoint()
+                      - localPoints[pointi];
 
-                    snapSurf[pointI] = hitSurface[pointI];
+                    snapSurf[pointi] = hitSurface[pointi];
                 }
             }
         }
@@ -1709,9 +1709,9 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
                 {
                     if (hitInfo[i].hit())
                     {
-                        label pointI = zonePointIndices[i];
-                        nearestPoint[pointI] = hitInfo[i].hitPoint();
-                        nearestNormal[pointI] = hitNormal[i];
+                        label pointi = zonePointIndices[i];
+                        nearestPoint[pointi] = hitInfo[i].hitPoint();
+                        nearestNormal[pointi] = hitNormal[i];
                     }
                 }
             }
@@ -1729,35 +1729,35 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 
             forAll(hitInfo, i)
             {
-                label pointI = zonePointIndices[i];
+                label pointi = zonePointIndices[i];
 
                 if (hitInfo[i].hit())
                 {
-                    patchDisp[pointI] =
+                    patchDisp[pointi] =
                         hitInfo[i].hitPoint()
-                      - localPoints[pointI];
+                      - localPoints[pointi];
 
-                    minSnapDist[pointI] = min
+                    minSnapDist[pointi] = min
                     (
-                        minSnapDist[pointI],
-                        mag(patchDisp[pointI])
+                        minSnapDist[pointi],
+                        mag(patchDisp[pointi])
                     );
 
-                    snapSurf[pointI] = zoneSurfI;
+                    snapSurf[pointi] = zoneSurfI;
                 }
             }
         }
 
         // Check if all points are being snapped
-        forAll(snapSurf, pointI)
+        forAll(snapSurf, pointi)
         {
-            if (snapSurf[pointI] == -1)
+            if (snapSurf[pointi] == -1)
             {
                 WarningInFunction
-                    << "For point:" << pointI
-                    << " coordinate:" << localPoints[pointI]
+                    << "For point:" << pointi
+                    << " coordinate:" << localPoints[pointi]
                     << " did not find any surface within:"
-                    << minSnapDist[pointI]
+                    << minSnapDist[pointi]
                     << " metre." << endl;
             }
         }
@@ -1786,16 +1786,16 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 
 
     // Limit amount of movement.
-    forAll(patchDisp, patchPointI)
+    forAll(patchDisp, patchPointi)
     {
-        scalar magDisp = mag(patchDisp[patchPointI]);
+        scalar magDisp = mag(patchDisp[patchPointi]);
 
-        if (magDisp > snapDist[patchPointI])
+        if (magDisp > snapDist[patchPointi])
         {
-            patchDisp[patchPointI] *= snapDist[patchPointI] / magDisp;
+            patchDisp[patchPointi] *= snapDist[patchPointi] / magDisp;
 
-            Pout<< "Limiting displacement for " << patchPointI
-                << " from " << magDisp << " to " << snapDist[patchPointI]
+            Pout<< "Limiting displacement for " << patchPointi
+                << " from " << magDisp << " to " << snapDist[patchPointi]
                 << endl;
         }
     }
@@ -1835,15 +1835,15 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 //
 //        forAll(f, fp)
 //        {
-//            label meshPointI = f[fp];
+//            label meshPointi = f[fp];
 //
 //            Map<label>::const_iterator iter =
-//                allPp.meshPointMap().find(meshPointI);
+//                allPp.meshPointMap().find(meshPointi);
 //
 //            if (iter != allPp.meshPointMap().end())
 //            {
-//                label pointI = iter();
-//                pointOnZone[pointI] = true;
+//                label pointi = iter();
+//                pointOnZone[pointi] = true;
 //            }
 //        }
 //    }
@@ -1877,11 +1877,11 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 ////        label patchi = meshMover.adaptPatchIDs()[i];
 ////        const labelList& meshPoints = pbm[patchi].meshPoints();
 ////
-////        forAll(meshPoints, meshPointI)
+////        forAll(meshPoints, meshPointi)
 ////        {
-////            label meshPointI = meshPoints[meshPointI];
-////            minPatch[meshPointI] = min(minPatch[meshPointI], patchi);
-////            maxPatch[meshPointI] = max(maxPatch[meshPointI], patchi);
+////            label meshPointi = meshPoints[meshPointi];
+////            minPatch[meshPointi] = min(minPatch[meshPointi], patchi);
+////            maxPatch[meshPointi] = max(maxPatch[meshPointi], patchi);
 ////        }
 ////    }
 ////
@@ -1945,18 +1945,18 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 //
 //            forAll(hitInfo, i)
 //            {
-//                label pointI = patchPointIndices[i];
+//                label pointi = patchPointIndices[i];
 //
 //                if (hitInfo[i].hit())
 //                {
 //                    const point& pt = hitInfo[i].hitPoint();
-//                    patchDisp[pointI] = pt-localPoints[pointI];
-//                    minSnapDist[pointI] = min
+//                    patchDisp[pointi] = pt-localPoints[pointi];
+//                    minSnapDist[pointi] = min
 //                    (
-//                        minSnapDist[pointI],
-//                        mag(patchDisp[pointI])
+//                        minSnapDist[pointi],
+//                        mag(patchDisp[pointi])
 //                    );
-//                    snapSurf[pointI] = surfI;
+//                    snapSurf[pointi] = surfI;
 //                }
 //            }
 //
@@ -1986,18 +1986,18 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 //
 //                forAll(hitInfo, i)
 //                {
-//                    label pointI = patchPointIndices[i];
+//                    label pointi = patchPointIndices[i];
 //
 //                    if (hitInfo[i].hit())
 //                    {
 //                        const point& pt = hitInfo[i].hitPoint();
-//                        patchDisp[pointI] = pt-localPoints[pointI];
-//                        minSnapDist[pointI] = min
+//                        patchDisp[pointi] = pt-localPoints[pointi];
+//                        minSnapDist[pointi] = min
 //                        (
-//                            minSnapDist[pointI],
-//                            mag(patchDisp[pointI])
+//                            minSnapDist[pointi],
+//                            mag(patchDisp[pointi])
 //                        );
-//                        snapSurf[pointI] = surfI;
+//                        snapSurf[pointi] = surfI;
 //                    }
 //                }
 //            }
@@ -2006,15 +2006,15 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 //
 //
 //    // Check if all points are being snapped
-//    forAll(snapSurf, pointI)
+//    forAll(snapSurf, pointi)
 //    {
-//        if (snapSurf[pointI] == -1)
+//        if (snapSurf[pointi] == -1)
 //        {
 //            WarningInFunction
-//                << "For point:" << pointI
-//                << " coordinate:" << localPoints[pointI]
+//                << "For point:" << pointi
+//                << " coordinate:" << localPoints[pointi]
 //                << " did not find any surface within:"
-//                << minSnapDist[pointI]
+//                << minSnapDist[pointi]
 //                << " metre." << endl;
 //        }
 //    }
@@ -2034,16 +2034,16 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 //
 //
 //    // Limit amount of movement.
-//    forAll(patchDisp, patchPointI)
+//    forAll(patchDisp, patchPointi)
 //    {
-//        scalar magDisp = mag(patchDisp[patchPointI]);
+//        scalar magDisp = mag(patchDisp[patchPointi]);
 //
-//        if (magDisp > snapDist[patchPointI])
+//        if (magDisp > snapDist[patchPointi])
 //        {
-//            patchDisp[patchPointI] *= snapDist[patchPointI] / magDisp;
+//            patchDisp[patchPointi] *= snapDist[patchPointi] / magDisp;
 //
-//            Pout<< "Limiting displacement for " << patchPointI
-//                << " from " << magDisp << " to " << snapDist[patchPointI]
+//            Pout<< "Limiting displacement for " << patchPointi
+//                << " from " << magDisp << " to " << snapDist[patchPointi]
 //                << endl;
 //        }
 //    }
@@ -2630,20 +2630,20 @@ void Foam::snappySnapDriver::doSnap
             // Collect all points (recount since syncPointList might have
             // increased set)
             nDuplicatePoints = 0;
-            forAll(duplicatePoint, pointI)
+            forAll(duplicatePoint, pointi)
             {
-                if (duplicatePoint[pointI])
+                if (duplicatePoint[pointi])
                 {
                     nDuplicatePoints++;
                 }
             }
             labelList candidatePoints(nDuplicatePoints);
             nDuplicatePoints = 0;
-            forAll(duplicatePoint, pointI)
+            forAll(duplicatePoint, pointi)
             {
-                if (duplicatePoint[pointI])
+                if (duplicatePoint[pointi])
                 {
-                    candidatePoints[nDuplicatePoints++] = pointI;
+                    candidatePoints[nDuplicatePoints++] = pointi;
                 }
             }
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
index d79f1fa5a8..bb377697b8 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
@@ -130,7 +130,7 @@ class snappySnapDriver
                     const scalar featureCos,
                     const indirectPrimitivePatch& pp,
                     const PackedBoolList& isFeatureEdge,
-                    const label pointI
+                    const label pointi
                 ) const;
 
                 void smoothAndConstrain
@@ -298,7 +298,7 @@ class snappySnapDriver
                     const indirectPrimitivePatch& pp,
                     const scalarField& snapDist,
                     const vectorField& nearestDisp,
-                    const label pointI,
+                    const label pointi,
 
                     const List<List<point>>& pointFaceSurfNormals,
                     const List<List<point>>& pointFaceDisp,
@@ -411,7 +411,7 @@ class snappySnapDriver
 
                     const indirectPrimitivePatch& pp,
                     const scalarField& snapDist,
-                    const label pointI,
+                    const label pointi,
                     const point& estimatedPt,
 
                     List<List<DynamicList<point>>>&,
@@ -432,7 +432,7 @@ class snappySnapDriver
 
                     const indirectPrimitivePatch& pp,
                     const scalarField& snapDist,
-                    const label pointI,
+                    const label pointi,
                     const point& estimatedPt,
 
                     // Feature-point to pp point
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index a6c7f69bc9..da684ac797 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -68,12 +68,12 @@ bool Foam::snappySnapDriver::isFeaturePoint
     const scalar featureCos,
     const indirectPrimitivePatch& pp,
     const PackedBoolList& isFeatureEdge,
-    const label pointI
+    const label pointi
 ) const
 {
     const pointField& points = pp.localPoints();
     const edgeList& edges = pp.edges();
-    const labelList& pEdges = pp.pointEdges()[pointI];
+    const labelList& pEdges = pp.pointEdges()[pointi];
 
     label nFeatEdges = 0;
 
@@ -90,9 +90,9 @@ bool Foam::snappySnapDriver::isFeaturePoint
                     const edge& eI = edges[pEdges[i]];
                     const edge& eJ = edges[pEdges[j]];
 
-                    const point& p = points[pointI];
-                    const point& pI = points[eI.otherVertex(pointI)];
-                    const point& pJ = points[eJ.otherVertex(pointI)];
+                    const point& p = points[pointi];
+                    const point& pI = points[eI.otherVertex(pointi)];
+                    const point& pJ = points[eJ.otherVertex(pointi)];
 
                     vector vI = p-pI;
                     scalar vIMag = mag(vI);
@@ -156,11 +156,11 @@ void Foam::snappySnapDriver::smoothAndConstrain
         const labelListList& pointEdges = pp.pointEdges();
         const edgeList& edges = pp.edges();
 
-        forAll(pointEdges, pointI)
+        forAll(pointEdges, pointi)
         {
-            const labelList& pEdges = pointEdges[pointI];
+            const labelList& pEdges = pointEdges[pointi];
 
-            label nConstraints = constraints[pointI].first();
+            label nConstraints = constraints[pointi].first();
 
             if (nConstraints <= 1)
             {
@@ -170,11 +170,11 @@ void Foam::snappySnapDriver::smoothAndConstrain
 
                     if (isPatchMasterEdge[edgeI])
                     {
-                        label nbrPointI = edges[edgeI].otherVertex(pointI);
-                        if (constraints[nbrPointI].first() >= nConstraints)
+                        label nbrPointi = edges[edgeI].otherVertex(pointi);
+                        if (constraints[nbrPointi].first() >= nConstraints)
                         {
-                            dispSum[pointI] += disp[nbrPointI];
-                            dispCount[pointI]++;
+                            dispSum[pointi] += disp[nbrPointi];
+                            dispCount[pointi]++;
                         }
                     }
                 }
@@ -201,14 +201,14 @@ void Foam::snappySnapDriver::smoothAndConstrain
         );
 
         // Constraints
-        forAll(constraints, pointI)
+        forAll(constraints, pointi)
         {
-            if (dispCount[pointI] > 0)
+            if (dispCount[pointi] > 0)
             {
                 // Mix my displacement with neighbours' displacement
-                disp[pointI] =
+                disp[pointi] =
                     0.5
-                   *(disp[pointI] + dispSum[pointI]/dispCount[pointI]);
+                   *(disp[pointi] + dispSum[pointi]/dispCount[pointi]);
             }
         }
     }
@@ -466,9 +466,9 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
     pointFacePatchID.setSize(pp.nPoints());
 
     // Fill local data
-    forAll(pp.pointFaces(), pointI)
+    forAll(pp.pointFaces(), pointi)
     {
-        const labelList& pFaces = pp.pointFaces()[pointI];
+        const labelList& pFaces = pp.pointFaces()[pointi];
 
         // Count valid face normals
         label nFaces = 0;
@@ -482,13 +482,13 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
         }
 
 
-        List<point>& pNormals = pointFaceSurfNormals[pointI];
+        List<point>& pNormals = pointFaceSurfNormals[pointi];
         pNormals.setSize(nFaces);
-        List<point>& pDisp = pointFaceDisp[pointI];
+        List<point>& pDisp = pointFaceDisp[pointi];
         pDisp.setSize(nFaces);
-        List<point>& pFc = pointFaceCentres[pointI];
+        List<point>& pFc = pointFaceCentres[pointi];
         pFc.setSize(nFaces);
-        labelList& pFid = pointFacePatchID[pointI];
+        labelList& pFid = pointFacePatchID[pointi];
         pFid.setSize(nFaces);
 
         nFaces = 0;
@@ -547,15 +547,15 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
         const labelList& boundaryPoints = pp.boundaryPoints();
         forAll(boundaryPoints, i)
         {
-            label pointI = boundaryPoints[i];
-            label meshPointI = pp.meshPoints()[pointI];
-            const point& pt = mesh.points()[meshPointI];
-            const labelList& pFaces = mesh.pointFaces()[meshPointI];
+            label pointi = boundaryPoints[i];
+            label meshPointi = pp.meshPoints()[pointi];
+            const point& pt = mesh.points()[meshPointi];
+            const labelList& pFaces = mesh.pointFaces()[meshPointi];
 
-            List<point>& pNormals = pointFaceSurfNormals[pointI];
-            List<point>& pDisp = pointFaceDisp[pointI];
-            List<point>& pFc = pointFaceCentres[pointI];
-            labelList& pFid = pointFacePatchID[pointI];
+            List<point>& pNormals = pointFaceSurfNormals[pointi];
+            List<point>& pDisp = pointFaceDisp[pointi];
+            List<point>& pFc = pointFaceCentres[pointi];
+            labelList& pFid = pointFacePatchID[pointi];
 
             forAll(pFaces, i)
             {
@@ -617,12 +617,12 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
     // Sort the data according to the face centres. This is only so we get
     // consistent behaviour serial and parallel.
     labelList visitOrder;
-    forAll(pointFaceDisp, pointI)
+    forAll(pointFaceDisp, pointi)
     {
-        List<point>& pNormals = pointFaceSurfNormals[pointI];
-        List<point>& pDisp = pointFaceDisp[pointI];
-        List<point>& pFc = pointFaceCentres[pointI];
-        labelList& pFid = pointFacePatchID[pointI];
+        List<point>& pNormals = pointFaceSurfNormals[pointi];
+        List<point>& pDisp = pointFaceDisp[pointi];
+        List<point>& pFc = pointFaceCentres[pointi];
+        labelList& pFid = pointFacePatchID[pointi];
 
         sortedOrder(mag(pFc)(), visitOrder);
 
@@ -811,7 +811,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
     const indirectPrimitivePatch& pp,
     const scalarField& snapDist,
     const vectorField& nearestDisp,
-    const label pointI,
+    const label pointi,
 
     const List<List<point>>& pointFaceSurfNormals,
     const List<List<point>>& pointFaceDisp,
@@ -829,9 +829,9 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
     patchAttraction = Zero;
     patchConstraint = pointConstraint();
 
-    const List<point>& pfSurfNormals = pointFaceSurfNormals[pointI];
-    const List<point>& pfDisp = pointFaceDisp[pointI];
-    const List<point>& pfCentres = pointFaceCentres[pointI];
+    const List<point>& pfSurfNormals = pointFaceSurfNormals[pointi];
+    const List<point>& pfDisp = pointFaceDisp[pointi];
+    const List<point>& pfCentres = pointFaceCentres[pointi];
 
     // Bin according to surface normal
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -855,7 +855,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
         const vector& fDisp = pfDisp[i];
 
         // What to do with very far attraction? For now just ignore the face
-        if (magSqr(fDisp) < sqr(snapDist[pointI]) && mag(fSNormal) > VSMALL)
+        if (magSqr(fDisp) < sqr(snapDist[pointi]) && mag(fSNormal) > VSMALL)
         {
             const point pt = fc + fDisp;
 
@@ -912,7 +912,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
                         plane pl3(pt, fSNormal);
                         point p013(pl0.planePlaneIntersect(pl1, pl3));
 
-                        if (mag(p012-p013) > snapDist[pointI])
+                        if (mag(p012-p013) > snapDist[pointi])
                         {
                             // Different feature point
                             surfacePoints.append(pt);
@@ -926,7 +926,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
     }
 
 
-    const point& pt = pp.localPoints()[pointI];
+    const point& pt = pp.localPoints()[pointi];
 
     // Check the number of directions
     if (surfaceNormals.size() == 1)
@@ -937,9 +937,9 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
            *surfaceNormals[0];
 
         // Trim to snap distance
-        if (magSqr(d) > sqr(snapDist[pointI]))
+        if (magSqr(d) > sqr(snapDist[pointi]))
         {
-            d *= Foam::sqrt(sqr(snapDist[pointI])/magSqr(d));
+            d *= Foam::sqrt(sqr(snapDist[pointi])/magSqr(d));
         }
 
         patchAttraction = d;
@@ -959,9 +959,9 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
         d -= (d&n)*n;
 
         // Trim to snap distance
-        if (magSqr(d) > sqr(snapDist[pointI]))
+        if (magSqr(d) > sqr(snapDist[pointi]))
         {
-            d *= Foam::sqrt(sqr(snapDist[pointI])/magSqr(d));
+            d *= Foam::sqrt(sqr(snapDist[pointi])/magSqr(d));
         }
 
         patchAttraction = d;
@@ -980,9 +980,9 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
         vector d = cornerPt - pt;
 
         // Trim to snap distance
-        if (magSqr(d) > sqr(snapDist[pointI]))
+        if (magSqr(d) > sqr(snapDist[pointi]))
         {
-            d *= Foam::sqrt(sqr(snapDist[pointI])/magSqr(d));
+            d *= Foam::sqrt(sqr(snapDist[pointi])/magSqr(d));
         }
 
         patchAttraction = d;
@@ -1046,7 +1046,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
     DynamicList<vector> surfaceNormals(4);
     labelList faceToNormalBin;
 
-    forAll(pp.localPoints(), pointI)
+    forAll(pp.localPoints(), pointi)
     {
         vector attraction = Zero;
         pointConstraint constraint;
@@ -1060,7 +1060,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
             snapDist,
             nearestDisp,
 
-            pointI,
+            pointi,
 
             pointFaceSurfNormals,
             pointFaceDisp,
@@ -1077,25 +1077,25 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
 
         if
         (
-            (constraint.first() > patchConstraints[pointI].first())
+            (constraint.first() > patchConstraints[pointi].first())
          || (
-                (constraint.first() == patchConstraints[pointI].first())
-             && (magSqr(attraction) < magSqr(patchAttraction[pointI]))
+                (constraint.first() == patchConstraints[pointi].first())
+             && (magSqr(attraction) < magSqr(patchAttraction[pointi]))
             )
         )
         {
-            patchAttraction[pointI] = attraction;
-            patchConstraints[pointI] = constraint;
+            patchAttraction[pointi] = attraction;
+            patchConstraints[pointi] = constraint;
 
-            const point& pt = pp.localPoints()[pointI];
+            const point& pt = pp.localPoints()[pointi];
 
-            if (patchConstraints[pointI].first() == 2 && feStr.valid())
+            if (patchConstraints[pointi].first() == 2 && feStr.valid())
             {
-                feStr().write(linePointRef(pt, pt+patchAttraction[pointI]));
+                feStr().write(linePointRef(pt, pt+patchAttraction[pointi]));
             }
-            else if (patchConstraints[pointI].first() == 3 && fpStr.valid())
+            else if (patchConstraints[pointi].first() == 3 && fpStr.valid())
             {
-                fpStr().write(linePointRef(pt, pt+patchAttraction[pointI]));
+                fpStr().write(linePointRef(pt, pt+patchAttraction[pointi]));
             }
         }
     }
@@ -1144,13 +1144,13 @@ void Foam::snappySnapDriver::stringFeatureEdges
         label nChanged = 0;
 
         const labelListList& pointEdges = pp.pointEdges();
-        forAll(pointEdges, pointI)
+        forAll(pointEdges, pointi)
         {
-            if (patchConstraints[pointI].first() == 2)
+            if (patchConstraints[pointi].first() == 2)
             {
-                const point& pt = pp.localPoints()[pointI];
-                const labelList& pEdges = pointEdges[pointI];
-                const vector& featVec = patchConstraints[pointI].second();
+                const point& pt = pp.localPoints()[pointi];
+                const labelList& pEdges = pointEdges[pointi];
+                const vector& featVec = patchConstraints[pointi].second();
 
                 // Detect whether there are edges in both directions.
                 // (direction along the feature edge that is)
@@ -1160,13 +1160,13 @@ void Foam::snappySnapDriver::stringFeatureEdges
                 forAll(pEdges, pEdgeI)
                 {
                     const edge& e = pp.edges()[pEdges[pEdgeI]];
-                    label nbrPointI = e.otherVertex(pointI);
+                    label nbrPointi = e.otherVertex(pointi);
 
-                    if (patchConstraints[nbrPointI].first() > 1)
+                    if (patchConstraints[nbrPointi].first() > 1)
                     {
-                        const point& nbrPt = pp.localPoints()[nbrPointI];
+                        const point& nbrPt = pp.localPoints()[nbrPointi];
                         const point featPt =
-                            nbrPt + patchAttraction[nbrPointI];
+                            nbrPt + patchAttraction[nbrPointi];
                         const scalar cosAngle = (featVec & (featPt-pt));
 
                         if (cosAngle > 0)
@@ -1183,41 +1183,41 @@ void Foam::snappySnapDriver::stringFeatureEdges
                 if (!hasPos || !hasNeg)
                 {
                     //Pout<< "**Detected feature string end at  "
-                    //    << pp.localPoints()[pointI] << endl;
+                    //    << pp.localPoints()[pointi] << endl;
 
                     // No string. Assign best choice on either side
-                    label bestPosPointI = -1;
+                    label bestPosPointi = -1;
                     scalar minPosDistSqr = GREAT;
-                    label bestNegPointI = -1;
+                    label bestNegPointi = -1;
                     scalar minNegDistSqr = GREAT;
 
                     forAll(pEdges, pEdgeI)
                     {
                         const edge& e = pp.edges()[pEdges[pEdgeI]];
-                        label nbrPointI = e.otherVertex(pointI);
+                        label nbrPointi = e.otherVertex(pointi);
 
                         if
                         (
-                            patchConstraints[nbrPointI].first() <= 1
-                         && rawPatchConstraints[nbrPointI].first() > 1
+                            patchConstraints[nbrPointi].first() <= 1
+                         && rawPatchConstraints[nbrPointi].first() > 1
                         )
                         {
                             const vector& nbrFeatVec =
-                                rawPatchConstraints[pointI].second();
+                                rawPatchConstraints[pointi].second();
 
                             if (mag(featVec&nbrFeatVec) > featureCos)
                             {
-                                // nbrPointI attracted to sameish feature
+                                // nbrPointi attracted to sameish feature
                                 // Note: also check on position.
 
                                 scalar d2 = magSqr
                                 (
-                                    rawPatchAttraction[nbrPointI]
+                                    rawPatchAttraction[nbrPointi]
                                 );
 
                                 const point featPt =
-                                    pp.localPoints()[nbrPointI]
-                                  + rawPatchAttraction[nbrPointI];
+                                    pp.localPoints()[nbrPointi]
+                                  + rawPatchAttraction[nbrPointi];
                                 const scalar cosAngle =
                                     (featVec & (featPt-pt));
 
@@ -1226,7 +1226,7 @@ void Foam::snappySnapDriver::stringFeatureEdges
                                     if (!hasPos && d2 < minPosDistSqr)
                                     {
                                         minPosDistSqr = d2;
-                                        bestPosPointI = nbrPointI;
+                                        bestPosPointi = nbrPointi;
                                     }
                                 }
                                 else
@@ -1234,44 +1234,44 @@ void Foam::snappySnapDriver::stringFeatureEdges
                                     if (!hasNeg && d2 < minNegDistSqr)
                                     {
                                         minNegDistSqr = d2;
-                                        bestNegPointI = nbrPointI;
+                                        bestNegPointi = nbrPointi;
                                     }
                                 }
                             }
                         }
                     }
 
-                    if (bestPosPointI != -1)
+                    if (bestPosPointi != -1)
                     {
                         // Use reconstructed-feature attraction. Use only
                         // part of it since not sure...
                         //const point& bestPt =
-                        //    pp.localPoints()[bestPosPointI];
+                        //    pp.localPoints()[bestPosPointi];
                         //Pout<< "**Overriding point " << bestPt
                         //    << " on reconstructed feature edge at "
-                        //    << rawPatchAttraction[bestPosPointI]+bestPt
+                        //    << rawPatchAttraction[bestPosPointi]+bestPt
                         //    << " to attracted-to-feature-edge." << endl;
-                        patchAttraction[bestPosPointI] =
-                            0.5*rawPatchAttraction[bestPosPointI];
-                        patchConstraints[bestPosPointI] =
-                            rawPatchConstraints[bestPosPointI];
+                        patchAttraction[bestPosPointi] =
+                            0.5*rawPatchAttraction[bestPosPointi];
+                        patchConstraints[bestPosPointi] =
+                            rawPatchConstraints[bestPosPointi];
 
                         nChanged++;
                     }
-                    if (bestNegPointI != -1)
+                    if (bestNegPointi != -1)
                     {
                         // Use reconstructed-feature attraction. Use only
                         // part of it since not sure...
                         //const point& bestPt =
-                        //    pp.localPoints()[bestNegPointI];
+                        //    pp.localPoints()[bestNegPointi];
                         //Pout<< "**Overriding point " << bestPt
                         //    << " on reconstructed feature edge at "
-                        //    << rawPatchAttraction[bestNegPointI]+bestPt
+                        //    << rawPatchAttraction[bestNegPointi]+bestPt
                         //    << " to attracted-to-feature-edge." << endl;
-                        patchAttraction[bestNegPointI] =
-                            0.5*rawPatchAttraction[bestNegPointI];
-                        patchConstraints[bestNegPointI] =
-                            rawPatchConstraints[bestNegPointI];
+                        patchAttraction[bestNegPointi] =
+                            0.5*rawPatchAttraction[bestNegPointi];
+                        patchConstraints[bestNegPointi] =
+                            rawPatchConstraints[bestNegPointi];
 
                         nChanged++;
                     }
@@ -1329,37 +1329,37 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
     // 1. Mark points on multiple patches
     PackedBoolList isMultiPatchPoint(pp.size());
 
-    forAll(pointFacePatchID, pointI)
+    forAll(pointFacePatchID, pointi)
     {
         pointIndexHit multiPatchPt = findMultiPatchPoint
         (
-            pp.localPoints()[pointI],
-            pointFacePatchID[pointI],
-            pointFaceCentres[pointI]
+            pp.localPoints()[pointi],
+            pointFacePatchID[pointi],
+            pointFaceCentres[pointi]
         );
-        isMultiPatchPoint[pointI] = multiPatchPt.hit();
+        isMultiPatchPoint[pointi] = multiPatchPt.hit();
     }
 
     // 2. Make sure multi-patch points are also attracted
-    forAll(isMultiPatchPoint, pointI)
+    forAll(isMultiPatchPoint, pointi)
     {
-        if (isMultiPatchPoint[pointI])
+        if (isMultiPatchPoint[pointi])
         {
             if
             (
-                patchConstraints[pointI].first() <= 1
-             && rawPatchConstraints[pointI].first() > 1
+                patchConstraints[pointi].first() <= 1
+             && rawPatchConstraints[pointi].first() > 1
             )
             {
-                patchAttraction[pointI] = rawPatchAttraction[pointI];
-                patchConstraints[pointI] = rawPatchConstraints[pointI];
+                patchAttraction[pointi] = rawPatchAttraction[pointi];
+                patchConstraints[pointi] = rawPatchConstraints[pointi];
 
                 //if (multiPatchStr.valid())
                 //{
                 //    Pout<< "Adding constraint on multiPatchPoint:"
-                //        << pp.localPoints()[pointI]
-                //        << " constraint:" << patchConstraints[pointI]
-                //        << " attraction:" << patchAttraction[pointI]
+                //        << pp.localPoints()[pointi]
+                //        << " constraint:" << patchConstraints[pointi]
+                //        << " attraction:" << patchAttraction[pointi]
                 //        << endl;
                 //}
             }
@@ -1378,11 +1378,11 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
         label nMultiPatchPoints = 0;
         forAll(f, fp)
         {
-            label pointI = f[fp];
+            label pointi = f[fp];
             if
             (
-                isMultiPatchPoint[pointI]
-             && patchConstraints[pointI].first() > 1
+                isMultiPatchPoint[pointi]
+             && patchConstraints[pointi].first() > 1
             )
             {
                 nMultiPatchPoints++;
@@ -1393,23 +1393,23 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
         {
             forAll(f, fp)
             {
-                label pointI = f[fp];
+                label pointi = f[fp];
                 if
                 (
-                   !isMultiPatchPoint[pointI]
-                 && patchConstraints[pointI].first() > 1
+                   !isMultiPatchPoint[pointi]
+                 && patchConstraints[pointi].first() > 1
                 )
                 {
                     //Pout<< "Knocking out constraint"
                     //    << " on non-multiPatchPoint:"
-                    //    << pp.localPoints()[pointI] << endl;
-                    patchAttraction[pointI] = Zero;
-                    patchConstraints[pointI] = pointConstraint();
+                    //    << pp.localPoints()[pointi] << endl;
+                    patchAttraction[pointi] = Zero;
+                    patchConstraints[pointi] = pointConstraint();
                     nChanged++;
 
                     if (multiPatchStr.valid())
                     {
-                        multiPatchStr().write(pp.localPoints()[pointI]);
+                        multiPatchStr().write(pp.localPoints()[pointi]);
                     }
                 }
             }
@@ -1441,8 +1441,8 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
     {
         forAll(f, fp)
         {
-            label pointI = f[fp];
-            if (patchConstraints[pointI].first() >= 2)
+            label pointi = f[fp];
+            if (patchConstraints[pointi].first() >= 2)
             {
                 // Attract to feature edge or point
                 if (attractIndices[0] == -1)
@@ -1541,10 +1541,10 @@ void Foam::snappySnapDriver::avoidDiagonalAttraction
                 scalar minDistSqr = GREAT;
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
-                    if (patchConstraints[pointI].first() <= 1)
+                    label pointi = f[fp];
+                    if (patchConstraints[pointi].first() <= 1)
                     {
-                        const point& pt = pp.localPoints()[pointI];
+                        const point& pt = pp.localPoints()[pointi];
                         scalar distSqr = magSqr(mid-pt);
                         if (distSqr < minDistSqr)
                         {
@@ -1555,10 +1555,10 @@ void Foam::snappySnapDriver::avoidDiagonalAttraction
                 }
                 if (minFp != -1)
                 {
-                    label minPointI = f[minFp];
-                    patchAttraction[minPointI] =
-                        mid-pp.localPoints()[minPointI];
-                    patchConstraints[minPointI] =
+                    label minPointi = f[minFp];
+                    patchAttraction[minPointi] =
+                        mid-pp.localPoints()[minPointi];
+                    patchConstraints[minPointi] =
                         patchConstraints[f[diag[0]]];
                 }
             }
@@ -1591,7 +1591,7 @@ Foam::snappySnapDriver::findNearFeatureEdge
 
     const indirectPrimitivePatch& pp,
     const scalarField& snapDist,
-    const label pointI,
+    const label pointi,
     const point& estimatedPt,
 
     List<List<DynamicList<point>>>& edgeAttractors,
@@ -1611,7 +1611,7 @@ Foam::snappySnapDriver::findNearFeatureEdge
         features.findNearestRegionEdge
         (
             pointField(1, estimatedPt),
-            scalarField(1, sqr(snapDist[pointI])),
+            scalarField(1, sqr(snapDist[pointi])),
             nearEdgeFeat,
             nearEdgeInfo,
             nearNormal
@@ -1622,7 +1622,7 @@ Foam::snappySnapDriver::findNearFeatureEdge
         features.findNearestEdge
         (
             pointField(1, estimatedPt),
-            scalarField(1, sqr(snapDist[pointI])),
+            scalarField(1, sqr(snapDist[pointi])),
             nearEdgeFeat,
             nearEdgeInfo,
             nearNormal
@@ -1644,9 +1644,9 @@ Foam::snappySnapDriver::findNearFeatureEdge
         edgeConstraints[featI][nearInfo.index()].append(c);
 
         // Store for later use
-        patchAttraction[pointI] =
-            nearInfo.hitPoint()-pp.localPoints()[pointI];
-        patchConstraints[pointI] = c;
+        patchAttraction[pointi] =
+            nearInfo.hitPoint()-pp.localPoints()[pointi];
+        patchConstraints[pointi] = c;
     }
     return Tuple2<label, pointIndexHit>(featI, nearInfo);
 }
@@ -1659,7 +1659,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
 
     const indirectPrimitivePatch& pp,
     const scalarField& snapDist,
-    const label pointI,
+    const label pointi,
     const point& estimatedPt,
 
     // Feature-point to pp point
@@ -1680,7 +1680,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
     features.findNearestPoint
     (
         pointField(1, estimatedPt),
-        scalarField(1, sqr(snapDist[pointI])),
+        scalarField(1, sqr(snapDist[pointi])),
         nearFeat,
         nearInfo
     );
@@ -1689,39 +1689,39 @@ Foam::snappySnapDriver::findNearFeaturePoint
 
     if (featI != -1)
     {
-        const point& pt = pp.localPoints()[pointI];
+        const point& pt = pp.localPoints()[pointi];
 
-        label featPointI = nearInfo[0].index();
+        label featPointi = nearInfo[0].index();
         const point& featPt = nearInfo[0].hitPoint();
         scalar distSqr = magSqr(featPt-pt);
 
         // Check if already attracted
-        label oldPointI = pointAttractor[featI][featPointI];
+        label oldPointi = pointAttractor[featI][featPointi];
 
-        if (oldPointI != -1)
+        if (oldPointi != -1)
         {
             // Check distance
-            if (distSqr >= magSqr(featPt-pp.localPoints()[oldPointI]))
+            if (distSqr >= magSqr(featPt-pp.localPoints()[oldPointi]))
             {
-                // oldPointI nearest. Keep.
+                // oldPointi nearest. Keep.
                 featI = -1;
-                featPointI = -1;
+                featPointi = -1;
             }
             else
             {
-                // Current pointI nearer.
-                pointAttractor[featI][featPointI] = pointI;
-                pointConstraints[featI][featPointI].first() = 3;
-                pointConstraints[featI][featPointI].second() = Zero;
+                // Current pointi nearer.
+                pointAttractor[featI][featPointi] = pointi;
+                pointConstraints[featI][featPointi].first() = 3;
+                pointConstraints[featI][featPointi].second() = Zero;
 
                 // Store for later use
-                patchAttraction[pointI] = featPt-pt;
-                patchConstraints[pointI] =
-                    pointConstraints[featI][featPointI];
+                patchAttraction[pointi] = featPt-pt;
+                patchConstraints[pointi] =
+                    pointConstraints[featI][featPointi];
 
-                // Reset oldPointI to nearest on feature edge
-                patchAttraction[oldPointI] = Zero;
-                patchConstraints[oldPointI] = pointConstraint();
+                // Reset oldPointi to nearest on feature edge
+                patchAttraction[oldPointi] = Zero;
+                patchConstraints[oldPointi] = pointConstraint();
 
                 findNearFeatureEdge
                 (
@@ -1729,8 +1729,8 @@ Foam::snappySnapDriver::findNearFeaturePoint
 
                     pp,
                     snapDist,
-                    oldPointI,
-                    pp.localPoints()[oldPointI],
+                    oldPointi,
+                    pp.localPoints()[oldPointi],
 
                     edgeAttractors,
                     edgeConstraints,
@@ -1741,14 +1741,14 @@ Foam::snappySnapDriver::findNearFeaturePoint
         }
         else
         {
-            // Current pointI nearer.
-            pointAttractor[featI][featPointI] = pointI;
-            pointConstraints[featI][featPointI].first() = 3;
-            pointConstraints[featI][featPointI].second() = Zero;
+            // Current pointi nearer.
+            pointAttractor[featI][featPointi] = pointi;
+            pointConstraints[featI][featPointi].first() = 3;
+            pointConstraints[featI][featPointi].second() = Zero;
 
             // Store for later use
-            patchAttraction[pointI] = featPt-pt;
-            patchConstraints[pointI] = pointConstraints[featI][featPointI];
+            patchAttraction[pointi] = featPt-pt;
+            patchConstraints[pointi] = pointConstraints[featI][featPointi];
         }
     }
 
@@ -1827,9 +1827,9 @@ void Foam::snappySnapDriver::determineFeatures
     DynamicList<vector> surfaceNormals(4);
     labelList faceToNormalBin;
 
-    forAll(pp.localPoints(), pointI)
+    forAll(pp.localPoints(), pointi)
     {
-        const point& pt = pp.localPoints()[pointI];
+        const point& pt = pp.localPoints()[pointi];
 
         vector attraction = Zero;
         pointConstraint constraint;
@@ -1843,7 +1843,7 @@ void Foam::snappySnapDriver::determineFeatures
             snapDist,
             nearestDisp,
 
-            pointI,
+            pointi,
 
             pointFaceSurfNormals,
             pointFaceDisp,
@@ -1861,29 +1861,29 @@ void Foam::snappySnapDriver::determineFeatures
 
         if
         (
-            (constraint.first() > patchConstraints[pointI].first())
+            (constraint.first() > patchConstraints[pointi].first())
          || (
-                (constraint.first() == patchConstraints[pointI].first())
-             && (magSqr(attraction) < magSqr(patchAttraction[pointI]))
+                (constraint.first() == patchConstraints[pointi].first())
+             && (magSqr(attraction) < magSqr(patchAttraction[pointi]))
             )
         )
         {
-            patchAttraction[pointI] = attraction;
-            patchConstraints[pointI] = constraint;
+            patchAttraction[pointi] = attraction;
+            patchConstraints[pointi] = constraint;
 
             // Check the number of directions
-            if (patchConstraints[pointI].first() == 1)
+            if (patchConstraints[pointi].first() == 1)
             {
                 // Flat surface. Check for different patchIDs
                 if (multiRegionFeatureSnap)
                 {
-                    const point estimatedPt(pt + nearestDisp[pointI]);
+                    const point estimatedPt(pt + nearestDisp[pointi]);
                     pointIndexHit multiPatchPt
                     (
                         findMultiPatchPoint
                         (
                             estimatedPt,
-                            pointFacePatchID[pointI],
+                            pointFacePatchID[pointi],
                             surfaceNormals,
                             faceToNormalBin
                         )
@@ -1900,7 +1900,7 @@ void Foam::snappySnapDriver::determineFeatures
                             true,                       // isRegionPoint
                             pp,
                             snapDist,
-                            pointI,
+                            pointi,
                             multiPatchPt.hitPoint(),    // estimatedPt
 
                             edgeAttractors,
@@ -1935,12 +1935,12 @@ void Foam::snappySnapDriver::determineFeatures
                     }
                 }
             }
-            else if (patchConstraints[pointI].first() == 2)
+            else if (patchConstraints[pointi].first() == 2)
             {
                 // Mark point on the nearest feature edge. Note that we
                 // only search within the surrounding since the plane
                 // reconstruction might find a feature where there isn't one.
-                const point estimatedPt(pt + patchAttraction[pointI]);
+                const point estimatedPt(pt + patchAttraction[pointi]);
 
                 Tuple2<label, pointIndexHit> nearInfo(-1, pointIndexHit());
 
@@ -1953,7 +1953,7 @@ void Foam::snappySnapDriver::determineFeatures
                         findMultiPatchPoint
                         (
                             estimatedPt,
-                            pointFacePatchID[pointI],
+                            pointFacePatchID[pointi],
                             surfaceNormals,
                             faceToNormalBin
                         )
@@ -1968,7 +1968,7 @@ void Foam::snappySnapDriver::determineFeatures
                                 true,               // isRegionPoint
                                 pp,
                                 snapDist,
-                                pointI,
+                                pointi,
                                 estimatedPt,
 
                                 edgeAttractors,
@@ -1988,7 +1988,7 @@ void Foam::snappySnapDriver::determineFeatures
                                 true,           // isRegionPoint
                                 pp,
                                 snapDist,
-                                pointI,
+                                pointi,
                                 estimatedPt,
 
                                 // Feature-point to pp point
@@ -2017,7 +2017,7 @@ void Foam::snappySnapDriver::determineFeatures
                         false,      // isRegionPoint
                         pp,
                         snapDist,
-                        pointI,
+                        pointi,
                         estimatedPt,
 
                         edgeAttractors,
@@ -2035,7 +2035,7 @@ void Foam::snappySnapDriver::determineFeatures
                 {
                     if
                     (
-                        patchConstraints[pointI].first() == 3
+                        patchConstraints[pointi].first() == 3
                      && featurePointStr.valid()
                     )
                     {
@@ -2046,7 +2046,7 @@ void Foam::snappySnapDriver::determineFeatures
                     }
                     else if
                     (
-                        patchConstraints[pointI].first() == 2
+                        patchConstraints[pointi].first() == 2
                      && featureEdgeStr.valid()
                     )
                     {
@@ -2067,10 +2067,10 @@ void Foam::snappySnapDriver::determineFeatures
                     }
                 }
             }
-            else if (patchConstraints[pointI].first() == 3)
+            else if (patchConstraints[pointi].first() == 3)
             {
                 // Mark point on the nearest feature point.
-                const point estimatedPt(pt + patchAttraction[pointI]);
+                const point estimatedPt(pt + patchAttraction[pointi]);
 
                 Tuple2<label, pointIndexHit> nearInfo(-1, pointIndexHit());
 
@@ -2081,7 +2081,7 @@ void Foam::snappySnapDriver::determineFeatures
                         findMultiPatchPoint
                         (
                             estimatedPt,
-                            pointFacePatchID[pointI],
+                            pointFacePatchID[pointi],
                             surfaceNormals,
                             faceToNormalBin
                         )
@@ -2094,7 +2094,7 @@ void Foam::snappySnapDriver::determineFeatures
                             true,           // isRegionPoint
                             pp,
                             snapDist,
-                            pointI,
+                            pointi,
                             estimatedPt,
 
                             // Feature-point to pp point
@@ -2115,7 +2115,7 @@ void Foam::snappySnapDriver::determineFeatures
                             false,              // isRegionPoint
                             pp,
                             snapDist,
-                            pointI,
+                            pointi,
                             estimatedPt,
 
                             // Feature-point to pp point
@@ -2138,7 +2138,7 @@ void Foam::snappySnapDriver::determineFeatures
                         false,              // isRegionPoint
                         pp,
                         snapDist,
-                        pointI,
+                        pointi,
                         estimatedPt,
 
                         // Feature-point to pp point
@@ -2291,7 +2291,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
         << " edges." << endl;
 
 
-    forAll(pp.pointEdges(), pointI)
+    forAll(pp.pointEdges(), pointi)
     {
         if
         (
@@ -2300,30 +2300,30 @@ void Foam::snappySnapDriver::determineBaffleFeatures
                 featureCos,
                 pp,
                 isBaffleEdge,
-                pointI
+                pointi
             )
         )
         {
-            //Pout<< "Detected feature point:" << pp.localPoints()[pointI]
+            //Pout<< "Detected feature point:" << pp.localPoints()[pointi]
             //    << endl;
             //-TEMPORARILY DISABLED:
-            //pointStatus[pointI] = 1;
+            //pointStatus[pointi] = 1;
         }
     }
 
 
-    forAll(pointStatus, pointI)
+    forAll(pointStatus, pointi)
     {
-        const point& pt = pp.localPoints()[pointI];
+        const point& pt = pp.localPoints()[pointi];
 
-        if (pointStatus[pointI] == 0)   // baffle edge
+        if (pointStatus[pointi] == 0)   // baffle edge
         {
             Tuple2<label, pointIndexHit> nearInfo = findNearFeatureEdge
             (
                 false,          // isRegionPoint?
                 pp,
                 snapDist,
-                pointI,
+                pointi,
                 pt,
 
                 edgeAttractors,
@@ -2338,14 +2338,14 @@ void Foam::snappySnapDriver::determineBaffleFeatures
                 //    << endl;
             }
         }
-        else if (pointStatus[pointI] == 1)   // baffle point
+        else if (pointStatus[pointi] == 1)   // baffle point
         {
             labelList nearFeat;
             List<pointIndexHit> nearInfo;
             features.findNearestPoint
             (
                 pointField(1, pt),
-                scalarField(1, sqr(snapDist[pointI])),
+                scalarField(1, sqr(snapDist[pointi])),
                 nearFeat,
                 nearInfo
             );
@@ -2354,33 +2354,33 @@ void Foam::snappySnapDriver::determineBaffleFeatures
 
             if (featI != -1)
             {
-                label featPointI = nearInfo[0].index();
+                label featPointi = nearInfo[0].index();
                 const point& featPt = nearInfo[0].hitPoint();
                 scalar distSqr = magSqr(featPt-pt);
 
                 // Check if already attracted
-                label oldPointI = pointAttractor[featI][featPointI];
+                label oldPointi = pointAttractor[featI][featPointi];
 
                 if
                 (
-                    oldPointI == -1
+                    oldPointi == -1
                  || (
                         distSqr
-                      < magSqr(featPt-pp.localPoints()[oldPointI])
+                      < magSqr(featPt-pp.localPoints()[oldPointi])
                     )
                 )
                 {
-                    pointAttractor[featI][featPointI] = pointI;
-                    pointConstraints[featI][featPointI].first() = 3;
-                    pointConstraints[featI][featPointI].second() =
+                    pointAttractor[featI][featPointi] = pointi;
+                    pointConstraints[featI][featPointi].first() = 3;
+                    pointConstraints[featI][featPointi].second() =
                         Zero;
 
                     // Store for later use
-                    patchAttraction[pointI] = featPt-pt;
-                    patchConstraints[pointI] =
-                        pointConstraints[featI][featPointI];
+                    patchAttraction[pointi] = featPt-pt;
+                    patchConstraints[pointi] =
+                        pointConstraints[featI][featPointi];
 
-                    if (oldPointI != -1)
+                    if (oldPointi != -1)
                     {
                         // The current point is closer so wins. Reset
                         // the old point to attract to nearest edge
@@ -2390,8 +2390,8 @@ void Foam::snappySnapDriver::determineBaffleFeatures
                             false,              // isRegionPoint
                             pp,
                             snapDist,
-                            oldPointI,
-                            pp.localPoints()[oldPointI],
+                            oldPointi,
+                            pp.localPoints()[oldPointi],
 
                             edgeAttractors,
                             edgeConstraints,
@@ -2421,7 +2421,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
                     false,                  // isRegionPoint
                     pp,
                     snapDist,
-                    pointI,
+                    pointi,
                     pt,                     // starting point
 
                     edgeAttractors,
@@ -2484,11 +2484,11 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
 
         boolList isFeatureEdgeOrPoint(pp.nPoints(), false);
         label nFeats = 0;
-        forAll(rawPatchConstraints, pointI)
+        forAll(rawPatchConstraints, pointi)
         {
-            if (rawPatchConstraints[pointI].first() >= 2)
+            if (rawPatchConstraints[pointi].first() >= 2)
             {
-                isFeatureEdgeOrPoint[pointI] = true;
+                isFeatureEdgeOrPoint[pointi] = true;
                 nFeats++;
             }
         }
@@ -2544,11 +2544,11 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
 
 
         // Collect attractPoints
-        forAll(isFeatureEdgeOrPoint, pointI)
+        forAll(isFeatureEdgeOrPoint, pointi)
         {
-            if (isFeatureEdgeOrPoint[pointI])
+            if (isFeatureEdgeOrPoint[pointi])
             {
-                attractPoints.append(pointI);
+                attractPoints.append(pointi);
             }
         }
 
@@ -2595,20 +2595,20 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
 
                 if (nearInfo.hit())
                 {
-                    label pointI =
+                    label pointi =
                         ppTree.shapes().pointLabels()[nearInfo.index()];
-                    const point attraction = featPt-pp.localPoints()[pointI];
+                    const point attraction = featPt-pp.localPoints()[pointi];
 
                     // Check if this point is already being attracted. If so
                     // override it only if nearer.
                     if
                     (
-                        patchConstraints[pointI].first() <= 1
-                     || magSqr(attraction) < magSqr(patchAttraction[pointI])
+                        patchConstraints[pointi].first() <= 1
+                     || magSqr(attraction) < magSqr(patchAttraction[pointi])
                     )
                     {
-                        patchAttraction[pointI] = attraction;
-                        patchConstraints[pointI] = edgeConstr[featEdgeI][i];
+                        patchAttraction[pointi] = attraction;
+                        patchConstraints[pointi] = edgeConstr[featEdgeI][i];
                     }
                 }
                 else
@@ -2636,13 +2636,13 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
         const labelList& pointAttr = pointAttractor[featI];
         const List<pointConstraint>& pointConstr = pointConstraints[featI];
 
-        forAll(pointAttr, featPointI)
+        forAll(pointAttr, featPointi)
         {
-            if (pointAttr[featPointI] != -1)
+            if (pointAttr[featPointi] != -1)
             {
                 const point& featPt = features[featI].points()
                 [
-                    featPointI
+                    featPointi
                 ];
 
                 // Find nearest pp point
@@ -2654,37 +2654,37 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
 
                 if (nearInfo.hit())
                 {
-                    label pointI =
+                    label pointi =
                         ppTree.shapes().pointLabels()[nearInfo.index()];
 
-                    const point& pt = pp.localPoints()[pointI];
+                    const point& pt = pp.localPoints()[pointi];
                     const point attraction = featPt-pt;
 
                     // - already attracted to feature edge : point always wins
                     // - already attracted to feature point: nearest wins
 
-                    if (patchConstraints[pointI].first() <= 1)
+                    if (patchConstraints[pointi].first() <= 1)
                     {
-                        patchAttraction[pointI] = attraction;
-                        patchConstraints[pointI] = pointConstr[featPointI];
+                        patchAttraction[pointi] = attraction;
+                        patchConstraints[pointi] = pointConstr[featPointi];
                     }
-                    else if (patchConstraints[pointI].first() == 2)
+                    else if (patchConstraints[pointi].first() == 2)
                     {
-                        patchAttraction[pointI] = attraction;
-                        patchConstraints[pointI] = pointConstr[featPointI];
+                        patchAttraction[pointi] = attraction;
+                        patchConstraints[pointi] = pointConstr[featPointi];
                     }
-                    else if (patchConstraints[pointI].first() == 3)
+                    else if (patchConstraints[pointi].first() == 3)
                     {
                         // Only if nearer
                         if
                         (
                             magSqr(attraction)
-                          < magSqr(patchAttraction[pointI])
+                          < magSqr(patchAttraction[pointi])
                         )
                         {
-                            patchAttraction[pointI] = attraction;
-                            patchConstraints[pointI] =
-                                pointConstr[featPointI];
+                            patchAttraction[pointi] = attraction;
+                            patchConstraints[pointi] =
+                                pointConstr[featPointi];
                         }
                     }
                 }
@@ -2856,16 +2856,16 @@ void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
         Info<< "Dumping feature-point attraction to "
             << featurePointStr.name() << endl;
 
-        forAll(patchConstraints, pointI)
+        forAll(patchConstraints, pointi)
         {
-            const point& pt = pp.localPoints()[pointI];
-            const vector& attr = patchAttraction[pointI];
+            const point& pt = pp.localPoints()[pointi];
+            const vector& attr = patchAttraction[pointi];
 
-            if (patchConstraints[pointI].first() == 2)
+            if (patchConstraints[pointi].first() == 2)
             {
                 featureEdgeStr.write(linePointRef(pt, pt+attr));
             }
-            else if (patchConstraints[pointI].first() == 3)
+            else if (patchConstraints[pointi].first() == 3)
             {
                 featurePointStr.write(linePointRef(pt, pt+attr));
             }
@@ -2978,12 +2978,12 @@ void Foam::snappySnapDriver::preventFaceSqueeze
         label nConstraints = 0;
         forAll(f, fp)
         {
-            label pointI = f[fp];
-            const point& pt = pp.localPoints()[pointI];
+            label pointi = f[fp];
+            const point& pt = pp.localPoints()[pointi];
 
-            if (patchConstraints[pointI].first() > 1)
+            if (patchConstraints[pointi].first() > 1)
             {
-                points[fp] = pt + patchAttraction[pointI];
+                points[fp] = pt + patchAttraction[pointi];
                 nConstraints++;
             }
             else
@@ -3012,9 +3012,9 @@ void Foam::snappySnapDriver::preventFaceSqueeze
                 }
                 if (maxFp != -1)
                 {
-                    label pointI = f[maxFp];
-                    // Lower attraction on pointI
-                    patchAttraction[pointI] *= 0.5;
+                    label pointi = f[maxFp];
+                    // Lower attraction on pointi
+                    patchAttraction[pointi] *= 0.5;
                 }
             }
         }
@@ -3242,13 +3242,13 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
 
 
     // Mix with direct feature attraction
-    forAll(patchConstraints, pointI)
+    forAll(patchConstraints, pointi)
     {
-        if (patchConstraints[pointI].first() > 1)
+        if (patchConstraints[pointi].first() > 1)
         {
-            patchDisp[pointI] =
-                (1.0-featureAttract)*patchDisp[pointI]
-              + featureAttract*patchAttraction[pointI];
+            patchDisp[pointi] =
+                (1.0-featureAttract)*patchDisp[pointi]
+              + featureAttract*patchAttraction[pointi];
         }
     }
 
@@ -3261,21 +3261,21 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
         label nEdge = 0;
         label nPoint = 0;
 
-        forAll(patchConstraints, pointI)
+        forAll(patchConstraints, pointi)
         {
-            if (isPatchMasterPoint[pointI])
+            if (isPatchMasterPoint[pointi])
             {
                 nMasterPoints++;
 
-                if (patchConstraints[pointI].first() == 1)
+                if (patchConstraints[pointi].first() == 1)
                 {
                     nPlanar++;
                 }
-                else if (patchConstraints[pointI].first() == 2)
+                else if (patchConstraints[pointi].first() == 2)
                 {
                     nEdge++;
                 }
-                else if (patchConstraints[pointI].first() == 3)
+                else if (patchConstraints[pointi].first() == 3)
                 {
                     nPoint++;
                 }
diff --git a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
index 94123bedc0..30ef8d7195 100644
--- a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
+++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
@@ -139,7 +139,7 @@ bool Foam::trackedParticle::hitPatch
 (
     const polyPatch&,
     trackingData& td,
-    const label patchI,
+    const label patchi,
     const scalar trackFraction,
     const tetIndices& tetIs
 )
@@ -228,11 +228,11 @@ void Foam::trackedParticle::hitPatch
 
 void Foam::trackedParticle::correctAfterParallelTransfer
 (
-    const label patchI,
+    const label patchi,
     trackingData& td
 )
 {
-    particle::correctAfterParallelTransfer(patchI, td);
+    particle::correctAfterParallelTransfer(patchi, td);
 
     label edgeI = k();
     if (edgeI != -1)
diff --git a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
index 35cde2ea85..0281c20bd1 100644
--- a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
+++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
@@ -218,7 +218,7 @@ public:
             (
                 const polyPatch&,
                 trackingData& td,
-                const label patchI,
+                const label patchi,
                 const scalar trackFraction,
                 const tetIndices& tetIs
             );
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
index b391e37fb4..b0d01a81b3 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
@@ -83,11 +83,11 @@ void Foam::PointEdgeWave<Type, TrackingData>::leaveDomain
 
     forAll(patchPointLabels, i)
     {
-        label patchPointI = patchPointLabels[i];
+        label patchPointi = patchPointLabels[i];
 
-        const point& pt = patch.points()[meshPoints[patchPointI]];
+        const point& pt = patch.points()[meshPoints[patchPointi]];
 
-        pointInfo[i].leaveDomain(patch, patchPointI, pt, td_);
+        pointInfo[i].leaveDomain(patch, patchPointi, pt, td_);
     }
 }
 
@@ -105,11 +105,11 @@ void Foam::PointEdgeWave<Type, TrackingData>::enterDomain
 
     forAll(patchPointLabels, i)
     {
-        label patchPointI = patchPointLabels[i];
+        label patchPointi = patchPointLabels[i];
 
-        const point& pt = patch.points()[meshPoints[patchPointI]];
+        const point& pt = patch.points()[meshPoints[patchPointi]];
 
-        pointInfo[i].enterDomain(patch, patchPointI, pt, td_);
+        pointInfo[i].enterDomain(patch, patchPointi, pt, td_);
     }
 }
 
@@ -148,7 +148,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::transform
 }
 
 
-// Update info for pointI, at position pt, with information from
+// Update info for pointi, at position pt, with information from
 // neighbouring edge.
 // Updates:
 //      - changedPoint_, changedPoints_, nChangedPoints_,
@@ -156,7 +156,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::transform
 template<class Type, class TrackingData>
 bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
 (
-    const label pointI,
+    const label pointi,
     const label neighbourEdgeI,
     const Type& neighbourInfo,
     Type& pointInfo
@@ -170,7 +170,7 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
         pointInfo.updatePoint
         (
             mesh_,
-            pointI,
+            pointi,
             neighbourEdgeI,
             neighbourInfo,
             propagationTol_,
@@ -179,10 +179,10 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
 
     if (propagate)
     {
-        if (!changedPoint_[pointI])
+        if (!changedPoint_[pointi])
         {
-            changedPoint_[pointI] = true;
-            changedPoints_[nChangedPoints_++] = pointI;
+            changedPoint_[pointi] = true;
+            changedPoints_[nChangedPoints_++] = pointi;
         }
     }
 
@@ -195,7 +195,7 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
 }
 
 
-// Update info for pointI, at position pt, with information from
+// Update info for pointi, at position pt, with information from
 // same point.
 // Updates:
 //      - changedPoint_, changedPoints_, nChangedPoints_,
@@ -203,7 +203,7 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
 template<class Type, class TrackingData>
 bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
 (
-    const label pointI,
+    const label pointi,
     const Type& neighbourInfo,
     Type& pointInfo
 )
@@ -216,7 +216,7 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
         pointInfo.updatePoint
         (
             mesh_,
-            pointI,
+            pointi,
             neighbourInfo,
             propagationTol_,
             td_
@@ -224,10 +224,10 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
 
     if (propagate)
     {
-        if (!changedPoint_[pointI])
+        if (!changedPoint_[pointi])
         {
-            changedPoint_[pointI] = true;
-            changedPoints_[nChangedPoints_++] = pointI;
+            changedPoint_[pointi] = true;
+            changedPoints_[nChangedPoints_++] = pointi;
         }
     }
 
@@ -249,7 +249,7 @@ template<class Type, class TrackingData>
 bool Foam::PointEdgeWave<Type, TrackingData>::updateEdge
 (
     const label edgeI,
-    const label neighbourPointI,
+    const label neighbourPointi,
     const Type& neighbourInfo,
     Type& edgeInfo
 )
@@ -263,7 +263,7 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updateEdge
         (
             mesh_,
             edgeI,
-            neighbourPointI,
+            neighbourPointi,
             neighbourInfo,
             propagationTol_,
             td_
@@ -332,14 +332,14 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
 
         // Get all changed points in reverse order
         const labelList& neighbPoints = procPatch.neighbPoints();
-        forAll(neighbPoints, thisPointI)
+        forAll(neighbPoints, thisPointi)
         {
-            label meshPointI = procPatch.meshPoints()[thisPointI];
-            if (changedPoint_[meshPointI])
+            label meshPointi = procPatch.meshPoints()[thisPointi];
+            if (changedPoint_[meshPointi])
             {
-                patchInfo.append(allPointInfo_[meshPointI]);
-                thisPoints.append(thisPointI);
-                nbrPoints.append(neighbPoints[thisPointI]);
+                patchInfo.append(allPointInfo_[meshPointi]);
+                thisPoints.append(thisPointi);
+                nbrPoints.append(neighbPoints[thisPointi]);
             }
         }
 
@@ -398,15 +398,15 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
         const labelList& meshPoints = procPatch.meshPoints();
         forAll(patchInfo, i)
         {
-            label meshPointI = meshPoints[patchPoints[i]];
+            label meshPointi = meshPoints[patchPoints[i]];
 
-            if (!allPointInfo_[meshPointI].equal(patchInfo[i], td_))
+            if (!allPointInfo_[meshPointi].equal(patchInfo[i], td_))
             {
                 updatePoint
                 (
-                    meshPointI,
+                    meshPointi,
                     patchInfo[i],
-                    allPointInfo_[meshPointI]
+                    allPointInfo_[meshPointi]
                 );
             }
         }
@@ -452,15 +452,15 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleCyclicPatches()
 
                 forAll(pairs, pairI)
                 {
-                    label thisPointI = pairs[pairI][0];
-                    label nbrPointI = pairs[pairI][1];
-                    label meshPointI = meshPoints[nbrPointI];
+                    label thisPointi = pairs[pairI][0];
+                    label nbrPointi = pairs[pairI][1];
+                    label meshPointi = meshPoints[nbrPointi];
 
-                    if (changedPoint_[meshPointI])
+                    if (changedPoint_[meshPointi])
                     {
-                        nbrInfo.append(allPointInfo_[meshPointI]);
-                        nbrPoints.append(nbrPointI);
-                        thisPoints.append(thisPointI);
+                        nbrInfo.append(allPointInfo_[meshPointi]);
+                        nbrPoints.append(nbrPointi);
+                        thisPoints.append(thisPointi);
                     }
                 }
 
@@ -491,15 +491,15 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleCyclicPatches()
             const labelList& meshPoints = cycPatch.meshPoints();
             forAll(nbrInfo, i)
             {
-                label meshPointI = meshPoints[thisPoints[i]];
+                label meshPointi = meshPoints[thisPoints[i]];
 
-                if (!allPointInfo_[meshPointI].equal(nbrInfo[i], td_))
+                if (!allPointInfo_[meshPointi].equal(nbrInfo[i], td_))
                 {
                     updatePoint
                     (
-                        meshPointI,
+                        meshPointi,
                         nbrInfo[i],
-                        allPointInfo_[meshPointI]
+                        allPointInfo_[meshPointi]
                     );
                 }
             }
@@ -522,9 +522,9 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
     const labelListList& slaves = gmd.globalPointSlaves();
 
     List<Type> elems(slavesMap.constructSize());
-    forAll(meshPoints, pointI)
+    forAll(meshPoints, pointi)
     {
-        elems[pointI] = allPointInfo_[meshPoints[pointI]];
+        elems[pointi] = allPointInfo_[meshPoints[pointi]];
     }
 
     // Pull slave data onto master (which might or might not have any
@@ -534,11 +534,11 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
     // Combine master data with slave data
     combineEqOp<Type, TrackingData> cop(td_);
 
-    forAll(slaves, pointI)
+    forAll(slaves, pointi)
     {
-        Type& elem = elems[pointI];
+        Type& elem = elems[pointi];
 
-        const labelList& slavePoints = slaves[pointI];
+        const labelList& slavePoints = slaves[pointi];
 
         // Combine master with untransformed slave data
         forAll(slavePoints, j)
@@ -557,23 +557,23 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
     slavesMap.reverseDistribute(elems.size(), elems, false);
 
     // Extract back onto mesh
-    forAll(meshPoints, pointI)
+    forAll(meshPoints, pointi)
     {
-        if (elems[pointI].valid(td_))
+        if (elems[pointi].valid(td_))
         {
-            label meshPointI = meshPoints[pointI];
+            label meshPointi = meshPoints[pointi];
 
-            Type& elem = allPointInfo_[meshPointI];
+            Type& elem = allPointInfo_[meshPointi];
 
             bool wasValid = elem.valid(td_);
 
             // Like updatePoint but bypass Type::updatePoint with its tolerance
             // checking
-            //if (!elem.valid(td_) || !elem.equal(elems[pointI], td_))
-            if (!elem.equal(elems[pointI], td_))
+            //if (!elem.valid(td_) || !elem.equal(elems[pointi], td_))
+            if (!elem.equal(elems[pointi], td_))
             {
                 nEvals_++;
-                elem = elems[pointI];
+                elem = elems[pointi];
 
                 // See if element now valid
                 if (!wasValid && elem.valid(td_))
@@ -582,10 +582,10 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
                 }
 
                 // Update database of changed points
-                if (!changedPoint_[meshPointI])
+                if (!changedPoint_[meshPointi])
                 {
-                    changedPoint_[meshPointI] = true;
-                    changedPoints_[nChangedPoints_++] = meshPointI;
+                    changedPoint_[meshPointi] = true;
+                    changedPoints_[nChangedPoints_++] = meshPointi;
                 }
             }
         }
@@ -735,27 +735,27 @@ void Foam::PointEdgeWave<Type, TrackingData>::setPointInfo
     const List<Type>& changedPointsInfo
 )
 {
-    forAll(changedPoints, changedPointI)
+    forAll(changedPoints, changedPointi)
     {
-        label pointI = changedPoints[changedPointI];
+        label pointi = changedPoints[changedPointi];
 
-        bool wasValid = allPointInfo_[pointI].valid(td_);
+        bool wasValid = allPointInfo_[pointi].valid(td_);
 
-        // Copy info for pointI
-        allPointInfo_[pointI] = changedPointsInfo[changedPointI];
+        // Copy info for pointi
+        allPointInfo_[pointi] = changedPointsInfo[changedPointi];
 
         // Maintain count of unset points
-        if (!wasValid && allPointInfo_[pointI].valid(td_))
+        if (!wasValid && allPointInfo_[pointi].valid(td_))
         {
             --nUnvisitedPoints_;
         }
 
-        // Mark pointI as changed, both on list and on point itself.
+        // Mark pointi as changed, both on list and on point itself.
 
-        if (!changedPoint_[pointI])
+        if (!changedPoint_[pointi])
         {
-            changedPoint_[pointI] = true;
-            changedPoints_[nChangedPoints_++] = pointI;
+            changedPoint_[pointi] = true;
+            changedPoints_[nChangedPoints_++] = pointi;
         }
     }
 
@@ -848,27 +848,27 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::pointToEdge()
 
     for
     (
-        label changedPointI = 0;
-        changedPointI < nChangedPoints_;
-        changedPointI++
+        label changedPointi = 0;
+        changedPointi < nChangedPoints_;
+        changedPointi++
     )
     {
-        label pointI = changedPoints_[changedPointI];
+        label pointi = changedPoints_[changedPointi];
 
-        if (!changedPoint_[pointI])
+        if (!changedPoint_[pointi])
         {
             FatalErrorInFunction
-                << "Point " << pointI
+                << "Point " << pointi
                 << " not marked as having been changed" << nl
                 << "This might be caused by multiple occurences of the same"
                 << " seed point." << abort(FatalError);
         }
 
-        const Type& neighbourWallInfo = allPointInfo_[pointI];
+        const Type& neighbourWallInfo = allPointInfo_[pointi];
 
         // Evaluate all connected edges
 
-        const labelList& edgeLabels = pointEdges[pointI];
+        const labelList& edgeLabels = pointEdges[pointi];
         forAll(edgeLabels, edgeLabelI)
         {
             label edgeI = edgeLabels[edgeLabelI];
@@ -880,7 +880,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::pointToEdge()
                 updateEdge
                 (
                     edgeI,
-                    pointI,
+                    pointi,
                     neighbourWallInfo,
                     currentWallInfo
                 );
@@ -888,7 +888,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::pointToEdge()
         }
 
         // Reset status of point
-        changedPoint_[pointI] = false;
+        changedPoint_[pointi] = false;
     }
 
     // Handled all changed points by now
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
index 1d2d07f9a0..2317fa3a64 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
@@ -168,7 +168,7 @@ class PointEdgeWave
         //  statistics.
         bool updatePoint
         (
-            const label pointI,
+            const label pointi,
             const label neighbourEdgeI,
             const Type& neighbourInfo,
             Type& pointInfo
@@ -178,7 +178,7 @@ class PointEdgeWave
         //  statistics.
         bool updatePoint
         (
-            const label pointI,
+            const label pointi,
             const Type& neighbourInfo,
             Type& pointInfo
         );
@@ -188,7 +188,7 @@ class PointEdgeWave
         bool updateEdge
         (
             const label edgeI,
-            const label neighbourPointI,
+            const label neighbourPointi,
             const Type& neighbourInfo,
             Type& edgeInfo
         );
diff --git a/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H b/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H
index c1704440a5..ee9c4438ba 100644
--- a/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H
+++ b/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ public:
             inline void leaveDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -148,7 +148,7 @@ public:
             inline void enterDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -166,7 +166,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const label edgeI,
                 const pointEdgePoint& edgeInfo,
                 const scalar tol,
@@ -179,7 +179,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const pointEdgePoint& newPointInfo,
                 const scalar tol,
                 TrackingData& td
@@ -201,7 +201,7 @@ public:
             (
                 const polyMesh& mesh,
                 const label edgeI,
-                const label pointI,
+                const label pointi,
                 const pointEdgePoint& pointInfo,
                 const scalar tol,
                 TrackingData& td
diff --git a/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H b/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H
index bc55dda9ce..42f363093b 100644
--- a/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H
+++ b/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -199,7 +199,7 @@ template<class TrackingData>
 inline void Foam::pointEdgePoint::leaveDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -225,7 +225,7 @@ template<class TrackingData>
 inline void Foam::pointEdgePoint::enterDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -240,14 +240,14 @@ template<class TrackingData>
 inline bool Foam::pointEdgePoint::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const label edgeI,
     const pointEdgePoint& edgeInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    return update(mesh.points()[pointI], edgeInfo, tol, td);
+    return update(mesh.points()[pointi], edgeInfo, tol, td);
 }
 
 
@@ -256,13 +256,13 @@ template<class TrackingData>
 inline bool Foam::pointEdgePoint::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const pointEdgePoint& newPointInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    return update(mesh.points()[pointI], newPointInfo, tol, td);
+    return update(mesh.points()[pointi], newPointInfo, tol, td);
 }
 
 
@@ -285,7 +285,7 @@ inline bool Foam::pointEdgePoint::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
-    const label pointI,
+    const label pointi,
     const pointEdgePoint& pointInfo,
     const scalar tol,
     TrackingData& td
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index bfb8443463..294ececd2e 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -354,11 +354,11 @@ void Foam::cellClassification::classifyPoints
 {
     pointSide.setSize(mesh_.nPoints());
 
-    forAll(mesh_.pointCells(), pointI)
+    forAll(mesh_.pointCells(), pointi)
     {
-        const labelList& pCells = mesh_.pointCells()[pointI];
+        const labelList& pCells = mesh_.pointCells()[pointi];
 
-        pointSide[pointI] = UNSET;
+        pointSide[pointi] = UNSET;
 
         forAll(pCells, i)
         {
@@ -366,26 +366,26 @@ void Foam::cellClassification::classifyPoints
 
             if (type == meshType)
             {
-                if (pointSide[pointI] == UNSET)
+                if (pointSide[pointi] == UNSET)
                 {
-                    pointSide[pointI] = MESH;
+                    pointSide[pointi] = MESH;
                 }
-                else if (pointSide[pointI] == NONMESH)
+                else if (pointSide[pointi] == NONMESH)
                 {
-                    pointSide[pointI] = MIXED;
+                    pointSide[pointi] = MIXED;
 
                     break;
                 }
             }
             else
             {
-                if (pointSide[pointI] == UNSET)
+                if (pointSide[pointi] == UNSET)
                 {
-                    pointSide[pointI] = NONMESH;
+                    pointSide[pointi] = NONMESH;
                 }
-                else if (pointSide[pointI] == MESH)
+                else if (pointSide[pointi] == MESH)
                 {
-                    pointSide[pointI] = MIXED;
+                    pointSide[pointi] = MIXED;
 
                     break;
                 }
@@ -568,12 +568,12 @@ Foam::label Foam::cellClassification::trimCutCells
         classifyPoints(meshType, newCellType, pointSide);
 
         // Grow layer of outside cells
-        forAll(pointSide, pointI)
+        forAll(pointSide, pointi)
         {
-            if (pointSide[pointI] == MIXED)
+            if (pointSide[pointi] == MIXED)
             {
                 // Make cut
-                const labelList& pCells = mesh_.pointCells()[pointI];
+                const labelList& pCells = mesh_.pointCells()[pointi];
 
                 forAll(pCells, i)
                 {
@@ -626,9 +626,9 @@ Foam::label Foam::cellClassification::growSurface
 
     // Mark points used by meshType cells
 
-    forAll(mesh_.pointCells(), pointI)
+    forAll(mesh_.pointCells(), pointi)
     {
-        const labelList& myCells = mesh_.pointCells()[pointI];
+        const labelList& myCells = mesh_.pointCells()[pointi];
 
         // Check if one of cells has meshType
         forAll(myCells, myCelli)
@@ -637,7 +637,7 @@ Foam::label Foam::cellClassification::growSurface
 
             if (type == meshType)
             {
-                hasMeshType[pointI] = true;
+                hasMeshType[pointi] = true;
 
                 break;
             }
@@ -648,11 +648,11 @@ Foam::label Foam::cellClassification::growSurface
 
     label nChanged = 0;
 
-    forAll(hasMeshType, pointI)
+    forAll(hasMeshType, pointi)
     {
-        if (hasMeshType[pointI])
+        if (hasMeshType[pointi])
         {
-            const labelList& myCells = mesh_.pointCells()[pointI];
+            const labelList& myCells = mesh_.pointCells()[pointi];
 
             forAll(myCells, myCelli)
             {
@@ -693,11 +693,11 @@ Foam::label Foam::cellClassification::fillHangingCells
         // Check all cells using mixed point type for whether they use mixed
         // points only. Note: could probably speed this up by counting number
         // of mixed verts per face and mixed faces per cell or something?
-        forAll(pointSide, pointI)
+        forAll(pointSide, pointi)
         {
-            if (pointSide[pointI] == MIXED)
+            if (pointSide[pointi] == MIXED)
             {
-                const labelList& pCells = mesh_.pointCells()[pointI];
+                const labelList& pCells = mesh_.pointCells()[pointi];
 
                 forAll(pCells, i)
                 {
@@ -832,9 +832,9 @@ Foam::label Foam::cellClassification::fillRegionPoints
         forAllConstIter(labelHashSet, nonManifoldPoints, iter)
         {
             // Find a face on fp using point and remove it.
-            const label patchPointI = meshPointMap[iter.key()];
+            const label patchPointi = meshPointMap[iter.key()];
 
-            const labelList& pFaces = fp.pointFaces()[patchPointI];
+            const labelList& pFaces = fp.pointFaces()[patchPointi];
 
             // Remove any face using conflicting point. Does first face which
             // has not yet been done. Could be more intelligent and decide which
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index e985d32df6..4387e9310f 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -145,9 +145,9 @@ Foam::label Foam::cellDistFuncs::getPointNeighbours
 
     forAll(f, fp)
     {
-        label pointI = f[fp];
+        label pointi = f[fp];
 
-        const labelList& pointNbs = patch.pointFaces()[pointI];
+        const labelList& pointNbs = patch.pointFaces()[pointi];
 
         forAll(pointNbs, nbI)
         {
@@ -344,9 +344,9 @@ void Foam::cellDistFuncs::correctBoundaryPointCells
             const labelList& meshPoints = patch.meshPoints();
             const labelListList& pointFaces = patch.pointFaces();
 
-            forAll(meshPoints, meshPointI)
+            forAll(meshPoints, meshPointi)
             {
-                label vertI = meshPoints[meshPointI];
+                label vertI = meshPoints[meshPointi];
 
                 const labelList& neighbours = mesh().pointCells(vertI);
 
@@ -356,7 +356,7 @@ void Foam::cellDistFuncs::correctBoundaryPointCells
 
                     if (!nearestFace.found(celli))
                     {
-                        const labelList& wallFaces = pointFaces[meshPointI];
+                        const labelList& wallFaces = pointFaces[meshPointi];
 
                         label minFacei = -1;
 
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index e4c6beda2a..9044fae0b2 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -104,8 +104,8 @@ bool Foam::treeDataPoint::overlaps
     const treeBoundBox& cubeBb
 ) const
 {
-    label pointI = (useSubset_ ? pointLabels_[index] : index);
-    return cubeBb.contains(points_[pointI]);
+    label pointi = (useSubset_ ? pointLabels_[index] : index);
+    return cubeBb.contains(points_[pointi]);
 }
 
 
@@ -116,9 +116,9 @@ bool Foam::treeDataPoint::overlaps
     const scalar radiusSqr
 ) const
 {
-    label pointI = (useSubset_ ? pointLabels_[index] : index);
+    label pointi = (useSubset_ ? pointLabels_[index] : index);
 
-    if (magSqr(points_[pointI] - centre) <= radiusSqr)
+    if (magSqr(points_[pointi] - centre) <= radiusSqr)
     {
         return true;
     }
@@ -142,14 +142,14 @@ void Foam::treeDataPoint::findNearestOp::operator()
     forAll(indices, i)
     {
         const label index = indices[i];
-        label pointI =
+        label pointi =
         (
             shape.useSubset()
           ? shape.pointLabels()[index]
           : index
         );
 
-        const point& pt = shape.points()[pointI];
+        const point& pt = shape.points()[pointi];
 
         scalar distSqr = magSqr(pt - sample);
 
@@ -186,14 +186,14 @@ void Foam::treeDataPoint::findNearestOp::operator()
     forAll(indices, i)
     {
         const label index = indices[i];
-        label pointI =
+        label pointi =
         (
             shape.useSubset()
           ? shape.pointLabels()[index]
           : index
         );
 
-        const point& shapePt = shape.points()[pointI];
+        const point& shapePt = shape.points()[pointi];
 
         if (tightest.contains(shapePt))
         {
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index 86a7e186b5..bc59306401 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -53,14 +53,14 @@ bool Foam::meshSearch::findNearer
 {
     bool nearer = false;
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        scalar distSqr = magSqr(points[pointI] - sample);
+        scalar distSqr = magSqr(points[pointi] - sample);
 
         if (distSqr < nearestDistSqr)
         {
             nearestDistSqr = distSqr;
-            nearestI = pointI;
+            nearestI = pointi;
             nearer = true;
         }
     }
@@ -82,14 +82,14 @@ bool Foam::meshSearch::findNearer
 
     forAll(indices, i)
     {
-        label pointI = indices[i];
+        label pointi = indices[i];
 
-        scalar distSqr = magSqr(points[pointI] - sample);
+        scalar distSqr = magSqr(points[pointi] - sample);
 
         if (distSqr < nearestDistSqr)
         {
             nearestDistSqr = distSqr;
-            nearestI = pointI;
+            nearestI = pointi;
             nearer = true;
         }
     }
diff --git a/src/meshTools/meshStructure/meshStructure.C b/src/meshTools/meshStructure/meshStructure.C
index 51e999d616..b573897c51 100644
--- a/src/meshTools/meshStructure/meshStructure.C
+++ b/src/meshTools/meshStructure/meshStructure.C
@@ -74,12 +74,12 @@ bool Foam::meshStructure::isStructuredCell
             label nLayerPlus1 = 0;
             forAll(f, fp)
             {
-                label pointI = f[fp];
-                if (pointLayer_[pointI] == layerI)
+                label pointi = f[fp];
+                if (pointLayer_[pointi] == layerI)
                 {
                     nLayer++;
                 }
-                else if (pointLayer_[pointI] == layerI+1)
+                else if (pointLayer_[pointi] == layerI+1)
                 {
                     nLayerPlus1++;
                 }
@@ -227,10 +227,10 @@ void Foam::meshStructure::correct
         // Start of changes
         labelList patchPoints(pp.nPoints());
         List<pointTopoDistanceData> patchData(pp.nPoints());
-        forAll(pp.meshPoints(), patchPointI)
+        forAll(pp.meshPoints(), patchPointi)
         {
-            patchPoints[patchPointI] = pp.meshPoints()[patchPointI];
-            patchData[patchPointI] = pointTopoDistanceData(patchPointI, 0);
+            patchPoints[patchPointi] = pp.meshPoints()[patchPointi];
+            patchData[patchPointi] = pointTopoDistanceData(patchPointi, 0);
         }
 
 
@@ -246,10 +246,10 @@ void Foam::meshStructure::correct
             mesh.globalData().nTotalPoints()  // max iterations
         );
 
-        forAll(pointData, pointI)
+        forAll(pointData, pointi)
         {
-            pointToPatchPointAddressing_[pointI] = pointData[pointI].data();
-            pointLayer_[pointI] = pointData[pointI].distance();
+            pointToPatchPointAddressing_[pointi] = pointData[pointi].data();
+            pointLayer_[pointi] = pointData[pointi].distance();
         }
 
 
@@ -304,15 +304,15 @@ void Foam::meshStructure::correct
                     // See if there is any edge
                     forAll(f, fp)
                     {
-                        label pointI = f[fp];
-                        label nextPointI = f.nextLabel(fp);
+                        label pointi = f[fp];
+                        label nextPointi = f.nextLabel(fp);
 
                         EdgeMap<label>::const_iterator fnd = pointsToEdge.find
                         (
                             edge
                             (
-                                pointData[pointI].data(),
-                                pointData[nextPointI].data()
+                                pointData[pointi].data(),
+                                pointData[nextPointi].data()
                             )
                         );
                         if (fnd != pointsToEdge.end())
diff --git a/src/meshTools/meshStructure/pointTopoDistanceData.H b/src/meshTools/meshStructure/pointTopoDistanceData.H
index d8c7cf8830..48bb8cfaa3 100644
--- a/src/meshTools/meshStructure/pointTopoDistanceData.H
+++ b/src/meshTools/meshStructure/pointTopoDistanceData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ public:
             inline void leaveDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -126,7 +126,7 @@ public:
             inline void enterDomain
             (
                 const polyPatch& patch,
-                const label patchPointI,
+                const label patchPointi,
                 const point& pos,
                 TrackingData& td
             );
@@ -144,7 +144,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const label edgeI,
                 const pointTopoDistanceData& edgeInfo,
                 const scalar tol,
@@ -157,7 +157,7 @@ public:
             inline bool updatePoint
             (
                 const polyMesh& mesh,
-                const label pointI,
+                const label pointi,
                 const pointTopoDistanceData& newPointInfo,
                 const scalar tol,
                 TrackingData& td
@@ -179,7 +179,7 @@ public:
             (
                 const polyMesh& mesh,
                 const label edgeI,
-                const label pointI,
+                const label pointi,
                 const pointTopoDistanceData& pointInfo,
                 const scalar tol,
                 TrackingData& td
diff --git a/src/meshTools/meshStructure/pointTopoDistanceDataI.H b/src/meshTools/meshStructure/pointTopoDistanceDataI.H
index 4dcf167625..d5a47e7ec3 100644
--- a/src/meshTools/meshStructure/pointTopoDistanceDataI.H
+++ b/src/meshTools/meshStructure/pointTopoDistanceDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ template<class TrackingData>
 inline void Foam::pointTopoDistanceData::leaveDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -99,7 +99,7 @@ template<class TrackingData>
 inline void Foam::pointTopoDistanceData::enterDomain
 (
     const polyPatch& patch,
-    const label patchPointI,
+    const label patchPointi,
     const point& coord,
     TrackingData& td
 )
@@ -111,7 +111,7 @@ template<class TrackingData>
 inline bool Foam::pointTopoDistanceData::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const label edgeI,
     const pointTopoDistanceData& edgeInfo,
     const scalar tol,
@@ -136,7 +136,7 @@ template<class TrackingData>
 inline bool Foam::pointTopoDistanceData::updatePoint
 (
     const polyMesh& mesh,
-    const label pointI,
+    const label pointi,
     const pointTopoDistanceData& newPointInfo,
     const scalar tol,
     TrackingData& td
@@ -181,7 +181,7 @@ inline bool Foam::pointTopoDistanceData::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
-    const label pointI,
+    const label pointi,
     const pointTopoDistanceData& pointInfo,
     const scalar tol,
     TrackingData& td
diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index deef730459..a54307bbc5 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -71,19 +71,19 @@ Foam::vectorField Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)
     const vectorField& pointNormals = pp.pointNormals();
     const labelListList& pointFaces = pp.pointFaces();
 
-    forAll(pointFaces, pointI)
+    forAll(pointFaces, pointi)
     {
-        const labelList& pFaces = pointFaces[pointI];
+        const labelList& pFaces = pointFaces[pointi];
 
-        if (visNormal(pointNormals[pointI], faceNormals, pFaces))
+        if (visNormal(pointNormals[pointi], faceNormals, pFaces))
         {
-            pn[pointI] = pointNormals[pointI];
+            pn[pointi] = pointNormals[pointi];
         }
         else
         {
             WarningInFunction
                 << "Average point normal not visible for point:"
-                << pp.meshPoints()[pointI] << endl;
+                << pp.meshPoints()[pointi] << endl;
 
             label visOctant =
                 mXmYmZMask
@@ -167,16 +167,16 @@ Foam::vectorField Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)
             if (visI != -1)
             {
                 // Take a vector in this octant.
-                pn[pointI] = octantNormal[visI];
+                pn[pointi] = octantNormal[visI];
             }
             else
             {
-                pn[pointI] = Zero;
+                pn[pointi] = Zero;
 
                 WarningInFunction
-                    << "No visible octant for point:" << pp.meshPoints()[pointI]
-                    << " cooord:" << pp.points()[pp.meshPoints()[pointI]] << nl
-                    << "Normal set to " << pn[pointI] << endl;
+                    << "No visible octant for point:" << pp.meshPoints()[pointi]
+                    << " cooord:" << pp.points()[pp.meshPoints()[pointi]] << nl
+                    << "Normal set to " << pn[pointi] << endl;
             }
         }
     }
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index 24e8738d3d..7826a10493 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -183,15 +183,15 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
             {
                 const edge& curEdge = singleEdges[edgeI];
 
-                forAll(cellPoints, pointI)
+                forAll(cellPoints, pointi)
                 {
                     if
                     (
-                        cellPoints[pointI] == curEdge.start()
-                     || cellPoints[pointI] == curEdge.end()
+                        cellPoints[pointi] == curEdge.start()
+                     || cellPoints[pointi] == curEdge.end()
                     )
                     {
-                        pointUsage[pointI]++;
+                        pointUsage[pointi]++;
                     }
                 }
             }
@@ -209,18 +209,18 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 label newEdgeEnd = singleEdges[edgeI].end();
 
                 // check that the edge has not got all ends blocked
-                forAll(cellPoints, pointI)
+                forAll(cellPoints, pointi)
                 {
-                    if (cellPoints[pointI] == newEdgeStart)
+                    if (cellPoints[pointi] == newEdgeStart)
                     {
-                        if (pointUsage[pointI] > 2)
+                        if (pointUsage[pointi] > 2)
                         {
                             blockedHead = true;
                         }
                     }
-                    else if (cellPoints[pointI] == newEdgeEnd)
+                    else if (cellPoints[pointi] == newEdgeEnd)
                     {
-                        if (pointUsage[pointI] > 2)
+                        if (pointUsage[pointi] > 2)
                         {
                             blockedTail = true;
                         }
@@ -266,11 +266,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     #endif
 
                     // Check if head or tail are blocked
-                    forAll(cellPoints, pointI)
+                    forAll(cellPoints, pointi)
                     {
-                        if (cellPoints[pointI] == newEdgeStart)
+                        if (cellPoints[pointi] == newEdgeStart)
                         {
-                            if (pointUsage[pointI] > 2)
+                            if (pointUsage[pointi] > 2)
                             {
                                 #ifdef DEBUG_CHAIN
                                 Info<< "start head blocked" << endl;
@@ -279,9 +279,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                 blockHead = true;
                             }
                         }
-                        else if (cellPoints[pointI] == newEdgeEnd)
+                        else if (cellPoints[pointi] == newEdgeEnd)
                         {
-                            if (pointUsage[pointI] > 2)
+                            if (pointUsage[pointi] > 2)
                             {
                                 #ifdef DEBUG_CHAIN
                                 Info<< "start tail blocked" << endl;
@@ -361,11 +361,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                     << " curEdgeEnd: " << curEdgeEnd << endl;
                                 #endif
 
-                                forAll(cellPoints, pointI)
+                                forAll(cellPoints, pointi)
                                 {
-                                    if (cellPoints[pointI] == curEdgeStart)
+                                    if (cellPoints[pointi] == curEdgeStart)
                                     {
-                                        if (pointUsage[pointI] > 2)
+                                        if (pointUsage[pointi] > 2)
                                         {
                                             #ifdef DEBUG_CHAIN
                                             Info<< "head blocked" << endl;
@@ -374,9 +374,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                             blockHead = true;
                                         }
                                     }
-                                    else if (cellPoints[pointI] == curEdgeEnd)
+                                    else if (cellPoints[pointi] == curEdgeEnd)
                                     {
-                                        if (pointUsage[pointI] > 2)
+                                        if (pointUsage[pointi] > 2)
                                         {
                                             #ifdef DEBUG_CHAIN
                                             Info<< "tail blocked" << endl;
diff --git a/src/meshTools/regionSplit/localPointRegion.C b/src/meshTools/regionSplit/localPointRegion.C
index 66bd766335..60820952bc 100644
--- a/src/meshTools/regionSplit/localPointRegion.C
+++ b/src/meshTools/regionSplit/localPointRegion.C
@@ -135,23 +135,23 @@ void Foam::localPointRegion::countPointRegions
 
             forAll(f, fp)
             {
-                label pointI = f[fp];
+                label pointi = f[fp];
 
                 // Even points which were not candidates for splitting might
                 // be on multiple baffles that are being split so check.
 
-                if (candidatePoint[pointI])
+                if (candidatePoint[pointi])
                 {
                     label region = minRegion[facei][fp];
 
-                    if (minPointRegion[pointI] == -1)
+                    if (minPointRegion[pointi] == -1)
                     {
-                        minPointRegion[pointI] = region;
+                        minPointRegion[pointi] = region;
                     }
-                    else if (minPointRegion[pointI] != region)
+                    else if (minPointRegion[pointi] != region)
                     {
                         // Multiple regions for this point. Add.
-                        Map<label>::iterator iter = meshPointMap_.find(pointI);
+                        Map<label>::iterator iter = meshPointMap_.find(pointi);
                         if (iter != meshPointMap_.end())
                         {
                             labelList& regions = pointRegions[iter()];
@@ -164,10 +164,10 @@ void Foam::localPointRegion::countPointRegions
                         }
                         else
                         {
-                            label localPointI = meshPointMap_.size();
-                            meshPointMap_.insert(pointI, localPointI);
+                            label localPointi = meshPointMap_.size();
+                            meshPointMap_.insert(pointi, localPointi);
                             labelList regions(2);
-                            regions[0] = minPointRegion[pointI];
+                            regions[0] = minPointRegion[pointi];
                             regions[1] = region;
                             pointRegions.append(regions);
                         }
@@ -360,12 +360,12 @@ void Foam::localPointRegion::calcPointRegions
 
                     forAll(f, fp)
                     {
-                        label pointI = f[fp];
-                        Map<label>::iterator iter = minPointValue.find(pointI);
+                        label pointi = f[fp];
+                        Map<label>::iterator iter = minPointValue.find(pointi);
 
                         if (iter == minPointValue.end())
                         {
-                            minPointValue.insert(pointI, minRegion[facei][fp]);
+                            minPointValue.insert(pointi, minRegion[facei][fp]);
                         }
                         else
                         {
@@ -657,11 +657,11 @@ void Foam::localPointRegion::updateMesh(const mapPolyMesh& map)
 
         forAllConstIter(Map<label>, meshPointMap_, iter)
         {
-            label newPointI = map.reversePointMap()[iter.key()];
+            label newPointi = map.reversePointMap()[iter.key()];
 
-            if (newPointI >= 0)
+            if (newPointi >= 0)
             {
-                newMap.insert(newPointI, iter());
+                newMap.insert(newPointi, iter());
             }
         }
 
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index ba5da457eb..dfe684bb4d 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -519,22 +519,22 @@ void Foam::searchableBox::findLineAll
       + vector(ROOTVSMALL,ROOTVSMALL,ROOTVSMALL)
     );
 
-    forAll(start, pointI)
+    forAll(start, pointi)
     {
         // See if any intersection between pt and end
-        pointIndexHit inter = findLine(start[pointI], end[pointI]);
+        pointIndexHit inter = findLine(start[pointi], end[pointi]);
 
         if (inter.hit())
         {
             hits.clear();
             hits.append(inter);
 
-            point pt = inter.hitPoint() + smallVec[pointI];
+            point pt = inter.hitPoint() + smallVec[pointi];
 
-            while (((pt-start[pointI])&dirVec[pointI]) <= magSqrDirVec[pointI])
+            while (((pt-start[pointi])&dirVec[pointi]) <= magSqrDirVec[pointi])
             {
                 // See if any intersection between pt and end
-                pointIndexHit inter = findLine(pt, end[pointI]);
+                pointIndexHit inter = findLine(pt, end[pointi]);
 
                 // Check for not hit or hit same face as before (can happen
                 // if vector along surface of face)
@@ -548,14 +548,14 @@ void Foam::searchableBox::findLineAll
                 }
                 hits.append(inter);
 
-                pt = inter.hitPoint() + smallVec[pointI];
+                pt = inter.hitPoint() + smallVec[pointi];
             }
 
-            info[pointI].transfer(hits);
+            info[pointi].transfer(hits);
         }
         else
         {
-            info[pointI].clear();
+            info[pointi].clear();
         }
     }
 }
@@ -604,15 +604,15 @@ void Foam::searchableBox::getVolumeType
     volType.setSize(points.size());
     volType = volumeType::INSIDE;
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         for (direction dir = 0; dir < vector::nComponents; dir++)
         {
             if (pt[dir] < min()[dir] || pt[dir] > max()[dir])
             {
-                volType[pointI] = volumeType::OUTSIDE;
+                volType[pointi] = volumeType::OUTSIDE;
                 break;
             }
         }
diff --git a/src/meshTools/searchableSurface/searchableCylinder.C b/src/meshTools/searchableSurface/searchableCylinder.C
index 53c0c48cb3..c158e32b85 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.C
+++ b/src/meshTools/searchableSurface/searchableCylinder.C
@@ -730,9 +730,9 @@ void Foam::searchableCylinder::getVolumeType
     volType.setSize(points.size());
     volType = volumeType::INSIDE;
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         vector v(pt - point1_);
 
@@ -742,12 +742,12 @@ void Foam::searchableCylinder::getVolumeType
         if (parallel < 0)
         {
             // left of point1 endcap
-            volType[pointI] = volumeType::OUTSIDE;
+            volType[pointi] = volumeType::OUTSIDE;
         }
         else if (parallel > magDir_)
         {
             // right of point2 endcap
-            volType[pointI] = volumeType::OUTSIDE;
+            volType[pointi] = volumeType::OUTSIDE;
         }
         else
         {
@@ -756,11 +756,11 @@ void Foam::searchableCylinder::getVolumeType
 
             if (mag(v) > radius_)
             {
-                volType[pointI] = volumeType::OUTSIDE;
+                volType[pointi] = volumeType::OUTSIDE;
             }
             else
             {
-                volType[pointI] = volumeType::INSIDE;
+                volType[pointi] = volumeType::INSIDE;
             }
         }
     }
diff --git a/src/meshTools/searchableSurface/searchablePlane.C b/src/meshTools/searchableSurface/searchablePlane.C
index d059c6ef44..81cf1f98cd 100644
--- a/src/meshTools/searchableSurface/searchablePlane.C
+++ b/src/meshTools/searchableSurface/searchablePlane.C
@@ -213,16 +213,16 @@ void Foam::searchablePlane::findLineAll
     findLine(start, end, nearestInfo);
 
     info.setSize(start.size());
-    forAll(info, pointI)
+    forAll(info, pointi)
     {
-        if (nearestInfo[pointI].hit())
+        if (nearestInfo[pointi].hit())
         {
-            info[pointI].setSize(1);
-            info[pointI][0] = nearestInfo[pointI];
+            info[pointi].setSize(1);
+            info[pointi][0] = nearestInfo[pointi];
         }
         else
         {
-            info[pointI].clear();
+            info[pointi].clear();
         }
     }
 }
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index aacb605b31..6ae652d1b4 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -391,16 +391,16 @@ void Foam::searchablePlate::findLineAll
     findLine(start, end, nearestInfo);
 
     info.setSize(start.size());
-    forAll(info, pointI)
+    forAll(info, pointi)
     {
-        if (nearestInfo[pointI].hit())
+        if (nearestInfo[pointi].hit())
         {
-            info[pointI].setSize(1);
-            info[pointI][0] = nearestInfo[pointI];
+            info[pointi].setSize(1);
+            info[pointi][0] = nearestInfo[pointi];
         }
         else
         {
-            info[pointI].clear();
+            info[pointi].clear();
         }
     }
 }
diff --git a/src/meshTools/searchableSurface/searchableSphere.C b/src/meshTools/searchableSurface/searchableSphere.C
index d63749657b..3db3e7c80a 100644
--- a/src/meshTools/searchableSurface/searchableSphere.C
+++ b/src/meshTools/searchableSurface/searchableSphere.C
@@ -353,17 +353,17 @@ void Foam::searchableSphere::getVolumeType
     volType.setSize(points.size());
     volType = volumeType::INSIDE;
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         if (magSqr(pt - centre_) <= sqr(radius_))
         {
-            volType[pointI] = volumeType::INSIDE;
+            volType[pointi] = volumeType::INSIDE;
         }
         else
         {
-            volType[pointI] = volumeType::OUTSIDE;
+            volType[pointi] = volumeType::OUTSIDE;
         }
     }
 }
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.C b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
index 17477023ca..e85200a8b0 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
@@ -78,9 +78,9 @@ void Foam::searchableSurfaceCollection::findNearest
             hitInfo
         );
 
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            if (hitInfo[pointI].hit())
+            if (hitInfo[pointi].hit())
             {
                 // Rework back into global coordinate sys. Multiply then
                 // transform
@@ -88,24 +88,24 @@ void Foam::searchableSurfaceCollection::findNearest
                 (
                     cmptMultiply
                     (
-                        hitInfo[pointI].rawPoint(),
+                        hitInfo[pointi].rawPoint(),
                         scale_[surfI]
                     )
                 );
 
-                scalar distSqr = magSqr(globalPt - samples[pointI]);
+                scalar distSqr = magSqr(globalPt - samples[pointi]);
 
-                if (distSqr < minDistSqr[pointI])
+                if (distSqr < minDistSqr[pointi])
                 {
-                    minDistSqr[pointI] = distSqr;
-                    nearestInfo[pointI].setPoint(globalPt);
-                    nearestInfo[pointI].setHit();
-                    nearestInfo[pointI].setIndex
+                    minDistSqr[pointi] = distSqr;
+                    nearestInfo[pointi].setPoint(globalPt);
+                    nearestInfo[pointi].setHit();
+                    nearestInfo[pointi].setIndex
                     (
-                        hitInfo[pointI].index()
+                        hitInfo[pointi].index()
                       + indexOffset_[surfI]
                     );
-                    nearestSurf[pointI] = surfI;
+                    nearestSurf[pointi] = surfI;
                 }
             }
         }
@@ -125,11 +125,11 @@ void Foam::searchableSurfaceCollection::sortHits
     // Count hits per surface.
     labelList nHits(subGeom_.size(), 0);
 
-    forAll(info, pointI)
+    forAll(info, pointi)
     {
-        if (info[pointI].hit())
+        if (info[pointi].hit())
         {
-            label index = info[pointI].index();
+            label index = info[pointi].index();
             label surfI = findLower(indexOffset_, index+1);
             nHits[surfI]++;
         }
@@ -147,11 +147,11 @@ void Foam::searchableSurfaceCollection::sortHits
     }
     nHits = 0;
 
-    forAll(info, pointI)
+    forAll(info, pointi)
     {
-        if (info[pointI].hit())
+        if (info[pointi].hit())
         {
-            label index = info[pointI].index();
+            label index = info[pointi].index();
             label surfI = findLower(indexOffset_, index+1);
 
             // Store for correct surface and adapt indices back to local
@@ -159,11 +159,11 @@ void Foam::searchableSurfaceCollection::sortHits
             label localI = nHits[surfI]++;
             surfInfo[surfI][localI] = pointIndexHit
             (
-                info[pointI].hit(),
-                info[pointI].rawPoint(),
+                info[pointi].hit(),
+                info[pointi].rawPoint(),
                 index-indexOffset_[surfI]
             );
-            infoMap[surfI][localI] = pointI;
+            infoMap[surfI][localI] = pointi;
         }
     }
 }
@@ -486,24 +486,24 @@ void Foam::searchableSurfaceCollection::findLine
 
         subGeom_[surfI].findLine(e0, e1, hitInfo);
 
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            if (hitInfo[pointI].hit())
+            if (hitInfo[pointi].hit())
             {
                 // Transform back to global coordinate sys.
-                nearest[pointI] = transform_[surfI].globalPosition
+                nearest[pointi] = transform_[surfI].globalPosition
                 (
                     cmptMultiply
                     (
-                        hitInfo[pointI].rawPoint(),
+                        hitInfo[pointi].rawPoint(),
                         scale_[surfI]
                     )
                 );
-                info[pointI] = hitInfo[pointI];
-                info[pointI].rawPoint() = nearest[pointI];
-                info[pointI].setIndex
+                info[pointi] = hitInfo[pointi];
+                info[pointi].rawPoint() = nearest[pointi];
+                info[pointi].setIndex
                 (
-                    hitInfo[pointI].index()
+                    hitInfo[pointi].index()
                   + indexOffset_[surfI]
                 );
             }
@@ -514,27 +514,27 @@ void Foam::searchableSurfaceCollection::findLine
     // Debug check
     if (false)
     {
-        forAll(info, pointI)
+        forAll(info, pointi)
         {
-            if (info[pointI].hit())
+            if (info[pointi].hit())
             {
-                vector n(end[pointI] - start[pointI]);
+                vector n(end[pointi] - start[pointi]);
                 scalar magN = mag(n);
 
                 if (magN > SMALL)
                 {
                     n /= mag(n);
 
-                    scalar s = ((info[pointI].rawPoint()-start[pointI])&n);
+                    scalar s = ((info[pointi].rawPoint()-start[pointi])&n);
 
                     if (s < 0 || s > 1)
                     {
                         FatalErrorInFunction
-                            << "point:" << info[pointI]
+                            << "point:" << info[pointi]
                             << " s:" << s
                             << " outside vector "
-                            << " start:" << start[pointI]
-                            << " end:" << end[pointI]
+                            << " start:" << start[pointi]
+                            << " end:" << end[pointi]
                             << abort(FatalError);
                     }
                 }
@@ -568,16 +568,16 @@ void Foam::searchableSurfaceCollection::findLineAll
     findLine(start, end, nearestInfo);
 
     info.setSize(start.size());
-    forAll(info, pointI)
+    forAll(info, pointi)
     {
-        if (nearestInfo[pointI].hit())
+        if (nearestInfo[pointi].hit())
         {
-            info[pointI].setSize(1);
-            info[pointI][0] = nearestInfo[pointI];
+            info[pointi].setSize(1);
+            info[pointi][0] = nearestInfo[pointi];
         }
         else
         {
-            info[pointI].clear();
+            info[pointi].clear();
         }
     }
 }
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
index ce9d1addd3..9371c32757 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
@@ -349,16 +349,16 @@ void Foam::searchableSurfaceWithGaps::findLineAll
     findLine(start, end, nearestInfo);
 
     info.setSize(start.size());
-    forAll(info, pointI)
+    forAll(info, pointi)
     {
-        if (nearestInfo[pointI].hit())
+        if (nearestInfo[pointi].hit())
         {
-            info[pointI].setSize(1);
-            info[pointI][0] = nearestInfo[pointI];
+            info[pointi].setSize(1);
+            info[pointi][0] = nearestInfo[pointi];
         }
         else
         {
-            info[pointI].clear();
+            info[pointi].clear();
         }
     }
 }
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index fd9914c725..26abe9bde4 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -483,19 +483,19 @@ void Foam::searchableSurfacesQueries::findAllIntersections
 
     // Set hitSurfaces and distance
     List<scalarList> hitDistSqr(hitInfo.size());
-    forAll(hitInfo, pointI)
+    forAll(hitInfo, pointi)
     {
-        const List<pointIndexHit>& pHits = hitInfo[pointI];
+        const List<pointIndexHit>& pHits = hitInfo[pointi];
 
-        labelList& pSurfaces = hitSurfaces[pointI];
+        labelList& pSurfaces = hitSurfaces[pointi];
         pSurfaces.setSize(pHits.size());
         pSurfaces = 0;
 
-        scalarList& pDistSqr = hitDistSqr[pointI];
+        scalarList& pDistSqr = hitDistSqr[pointi];
         pDistSqr.setSize(pHits.size());
         forAll(pHits, i)
         {
-            pDistSqr[i] = magSqr(pHits[i].hitPoint() - start[pointI]);
+            pDistSqr[i] = magSqr(pHits[i].hitPoint() - start[pointi]);
         }
     }
 
@@ -513,18 +513,18 @@ void Foam::searchableSurfacesQueries::findAllIntersections
                 surfHits
             );
 
-            forAll(surfHits, pointI)
+            forAll(surfHits, pointi)
             {
                 mergeHits
                 (
-                    start[pointI],          // Current segment
+                    start[pointi],          // Current segment
 
                     testI,                  // Surface and its hits
-                    surfHits[pointI],
+                    surfHits[pointi],
 
-                    hitSurfaces[pointI],    // Merge into overall hit info
-                    hitInfo[pointI],
-                    hitDistSqr[pointI]
+                    hitSurfaces[pointi],    // Merge into overall hit info
+                    hitInfo[pointi],
+                    hitDistSqr[pointi]
                 );
             }
         }
@@ -568,13 +568,13 @@ void Foam::searchableSurfacesQueries::findNearestIntersection
            nearestInfo
        );
 
-       forAll(nearestInfo, pointI)
+       forAll(nearestInfo, pointi)
        {
-           if (nearestInfo[pointI].hit())
+           if (nearestInfo[pointi].hit())
            {
-               hit1[pointI] = nearestInfo[pointI];
-               surface1[pointI] = testI;
-               nearest[pointI] = hit1[pointI].hitPoint();
+               hit1[pointi] = nearestInfo[pointi];
+               surface1[pointi] = testI;
+               nearest[pointi] = hit1[pointi].hitPoint();
            }
        }
    }
@@ -589,16 +589,16 @@ void Foam::searchableSurfacesQueries::findNearestIntersection
    hit2 = hit1;
 
    // Set current end of segment to test.
-   forAll(nearest, pointI)
+   forAll(nearest, pointi)
    {
-       if (hit1[pointI].hit())
+       if (hit1[pointi].hit())
        {
-           nearest[pointI] = hit1[pointI].hitPoint();
+           nearest[pointi] = hit1[pointi].hitPoint();
        }
        else
        {
            // Disable testing by setting to end.
-           nearest[pointI] = end[pointI];
+           nearest[pointi] = end[pointi];
        }
    }
 
@@ -607,13 +607,13 @@ void Foam::searchableSurfacesQueries::findNearestIntersection
        // See if any intersection between end and current nearest
        allSurfaces[surfacesToTest[testI]].findLine(end, nearest, nearestInfo);
 
-       forAll(nearestInfo, pointI)
+       forAll(nearestInfo, pointi)
        {
-           if (nearestInfo[pointI].hit())
+           if (nearestInfo[pointi].hit())
            {
-               hit2[pointI] = nearestInfo[pointI];
-               surface2[pointI] = testI;
-               nearest[pointI] = hit2[pointI].hitPoint();
+               hit2[pointi] = nearestInfo[pointi];
+               surface2[pointi] = testI;
+               nearest[pointi] = hit2[pointi].hitPoint();
            }
        }
    }
@@ -650,17 +650,17 @@ void Foam::searchableSurfacesQueries::findNearest
         );
 
         // Update minDistSqr and arguments
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            if (hitInfo[pointI].hit())
+            if (hitInfo[pointi].hit())
             {
-                minDistSqr[pointI] = magSqr
+                minDistSqr[pointi] = magSqr
                 (
-                    hitInfo[pointI].hitPoint()
-                  - samples[pointI]
+                    hitInfo[pointi].hitPoint()
+                  - samples[pointi]
                 );
-                nearestInfo[pointI] = hitInfo[pointI];
-                nearestSurfaces[pointI] = testI;
+                nearestInfo[pointi] = hitInfo[pointi];
+                nearestSurfaces[pointi] = testI;
             }
         }
     }
@@ -712,17 +712,17 @@ void Foam::searchableSurfacesQueries::findNearest
         );
 
         // Update minDistSqr and arguments
-        forAll(hitInfo, pointI)
+        forAll(hitInfo, pointi)
         {
-            if (hitInfo[pointI].hit())
+            if (hitInfo[pointi].hit())
             {
-                minDistSqr[pointI] = magSqr
+                minDistSqr[pointi] = magSqr
                 (
-                    hitInfo[pointI].hitPoint()
-                  - samples[pointI]
+                    hitInfo[pointi].hitPoint()
+                  - samples[pointi]
                 );
-                nearestInfo[pointI] = hitInfo[pointI];
-                nearestSurfaces[pointI] = testI;
+                nearestInfo[pointi] = hitInfo[pointi];
+                nearestSurfaces[pointi] = testI;
             }
         }
     }
@@ -781,14 +781,14 @@ void Foam::searchableSurfacesQueries::signedDistance
         // Push back to original
         forAll(volType, i)
         {
-            label pointI = surfIndices[i];
-            scalar dist = mag(samples[pointI] - nearestInfo[pointI].hitPoint());
+            label pointi = surfIndices[i];
+            scalar dist = mag(samples[pointi] - nearestInfo[pointi].hitPoint());
 
             volumeType vT = volType[i];
 
             if (vT == volumeType::OUTSIDE)
             {
-                distance[pointI] = dist;
+                distance[pointi] = dist;
             }
             else if (vT == volumeType::INSIDE)
             {
@@ -800,12 +800,12 @@ void Foam::searchableSurfacesQueries::signedDistance
                 {
                     case volumeType::OUTSIDE:
                     {
-                        distance[pointI] = dist;
+                        distance[pointi] = dist;
                         break;
                     }
                     case volumeType::INSIDE:
                     {
-                        distance[pointI] = -dist;
+                        distance[pointi] = -dist;
                         break;
                     }
                     default:
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index c7258aab13..e9680b3f89 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -151,15 +151,15 @@ bool Foam::triSurfaceMesh::isSurfaceClosed() const
     // To prevent doing work twice per edge only look at edges to higher
     // point
     EdgeMap<label> facesPerEdge(100);
-    forAll(pointFaces, pointI)
+    forAll(pointFaces, pointi)
     {
-        const labelList& pFaces = pointFaces[pointI];
+        const labelList& pFaces = pointFaces[pointi];
 
         facesPerEdge.clear();
         forAll(pFaces, i)
         {
             const triSurface::FaceType& f = triSurface::operator[](pFaces[i]);
-            label fp = findIndex(f, pointI);
+            label fp = findIndex(f, pointi);
 
             // Something weird: if I expand the code of addFaceToEdge in both
             // below instances it gives a segmentation violation on some
@@ -167,13 +167,13 @@ bool Foam::triSurfaceMesh::isSurfaceClosed() const
 
 
             // Forward edge
-            label nextPointI = f[f.fcIndex(fp)];
+            label nextPointi = f[f.fcIndex(fp)];
 
-            if (nextPointI > pointI)
+            if (nextPointi > pointi)
             {
                 bool okFace = addFaceToEdge
                 (
-                    edge(pointI, nextPointI),
+                    edge(pointi, nextPointi),
                     facesPerEdge
                 );
 
@@ -183,13 +183,13 @@ bool Foam::triSurfaceMesh::isSurfaceClosed() const
                 }
             }
             // Reverse edge
-            label prevPointI = f[f.rcIndex(fp)];
+            label prevPointi = f[f.rcIndex(fp)];
 
-            if (prevPointI > pointI)
+            if (prevPointi > pointi)
             {
                 bool okFace = addFaceToEdge
                 (
-                    edge(pointI, prevPointI),
+                    edge(pointi, prevPointi),
                     facesPerEdge
                 );
 
@@ -769,19 +769,19 @@ void Foam::triSurfaceMesh::getVolumeType
     scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
     indexedOctree<treeDataTriSurface>::perturbTol() = tolerance();
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         if (!tree().bb().contains(pt))
         {
             // Have to calculate directly as outside the octree
-            volType[pointI] = tree().shapes().getVolumeType(tree(), pt);
+            volType[pointi] = tree().shapes().getVolumeType(tree(), pt);
         }
         else
         {
             // - use cached volume type per each tree node
-            volType[pointI] = tree().getVolumeType(pt);
+            volType[pointi] = tree().getVolumeType(pt);
         }
     }
 
diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
index bf7bb5d7e5..a7bba62b12 100644
--- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
+++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,9 +53,9 @@ Foam::topoSetSource::addToUsageTable Foam::nearestToCell::usage_
 
 void Foam::nearestToCell::combine(topoSet& set, const bool add) const
 {
-    forAll(points_, pointI)
+    forAll(points_, pointi)
     {
-        addOrDelete(set, mesh_.findNearestCell(points_[pointI]), add);
+        addOrDelete(set, mesh_.findNearestCell(points_[pointi]), add);
     }
 }
 
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 0bd6e71e9e..467e894f8c 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -75,8 +75,8 @@ void Foam::pointToCell::combine(topoSet& set, const bool add) const
     {
         forAllConstIter(pointSet, loadedSet, iter)
         {
-            const label pointI = iter.key();
-            const labelList& pCells = mesh_.pointCells()[pointI];
+            const label pointi = iter.key();
+            const labelList& pCells = mesh_.pointCells()[pointi];
 
             forAll(pCells, pCelli)
             {
diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
index 341da4c78c..22e3c17132 100644
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
@@ -224,11 +224,11 @@ void Foam::regionToCell::shrinkRegions
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     label nChanged = 0;
-    forAll(boundaryPoint, pointI)
+    forAll(boundaryPoint, pointi)
     {
-        if (boundaryPoint[pointI])
+        if (boundaryPoint[pointi])
         {
-            const labelList& pCells = mesh_.pointCells(pointI);
+            const labelList& pCells = mesh_.pointCells(pointi);
             forAll(pCells, i)
             {
                 label celli = pCells[i];
@@ -313,11 +313,11 @@ void Foam::regionToCell::erode
         // Select all cells using these points
 
         label nChanged = 0;
-        forAll(boundaryPoint, pointI)
+        forAll(boundaryPoint, pointi)
         {
-            if (boundaryPoint[pointI])
+            if (boundaryPoint[pointi])
             {
-                const labelList& pCells = mesh_.pointCells(pointI);
+                const labelList& pCells = mesh_.pointCells(pointi);
                 forAll(pCells, i)
                 {
                     label celli = pCells[i];
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
index 067e0d279d..4188bf15d2 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
@@ -66,13 +66,13 @@ Foam::topoSetSource::addToUsageTable Foam::surfaceToCell::usage_
 Foam::label Foam::surfaceToCell::getNearest
 (
     const triSurfaceSearch& querySurf,
-    const label pointI,
+    const label pointi,
     const point& pt,
     const vector& span,
     Map<label>& cache
 )
 {
-    Map<label>::const_iterator iter = cache.find(pointI);
+    Map<label>::const_iterator iter = cache.find(pointi);
 
     if (iter != cache.end())
     {
@@ -87,7 +87,7 @@ Foam::label Foam::surfaceToCell::getNearest
         label triI = inter.index();
 
         // Store triangle on point
-        cache.insert(pointI, triI);
+        cache.insert(pointi, triI);
 
         return triI;
     }
@@ -119,14 +119,14 @@ bool Foam::surfaceToCell::differingPointNormals
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
+            label pointi = f[fp];
 
             label pointTriI =
                 getNearest
                 (
                     querySurf,
-                    pointI,
-                    points[pointI],
+                    pointi,
+                    points[pointi],
                     span,
                     pointToNearest
                 );
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
index 5db79b4c95..9e4784573a 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
@@ -110,11 +110,11 @@ class surfaceToCell
 
         //- Find index of nearest triangle to point. Returns triangle or -1 if
         //  not found within search span.
-        //  Cache result under pointI.
+        //  Cache result under pointi.
         static label getNearest
         (
             const triSurfaceSearch& querySurf,
-            const label pointI,
+            const label pointi,
             const point& pt,
             const vector& searchSpan,
             Map<label>& cache
diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
index 9868577e30..5a389bf321 100644
--- a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
+++ b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
@@ -139,20 +139,20 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
         const boundBox& bb = mesh_.bounds();
         pointField points(bb.points());
 
-        //label minPointI = -1;
-        label maxPointI = -1;
-        forAll(points, pointI)
+        //label minPointi = -1;
+        label maxPointi = -1;
+        forAll(points, pointi)
         {
-            scalar c = (points[pointI]&n_);
+            scalar c = (points[pointi]&n_);
             if (c > maxComp)
             {
                 maxComp = c;
-                maxPointI = pointI;
+                maxPointi = pointi;
             }
             else if (c < minComp)
             {
                 minComp = c;
-                //minPointI = pointI;
+                //minPointi = pointi;
             }
         }
 
@@ -164,7 +164,7 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
         if (maxCells != nTotCells)
         {
             WarningInFunction
-                << "Plane " << plane(points[maxPointI], n_)
+                << "Plane " << plane(points[maxPointi], n_)
                 << " selects " << maxCells
                 << " cells instead of all " << nTotCells
                 << " cells. Results might be wrong." << endl;
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index d10ecfca99..e85becdabb 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -77,8 +77,8 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
         // Add faces with any point in loadedSet
         forAllConstIter(pointSet, loadedSet, iter)
         {
-            const label pointI = iter.key();
-            const labelList& pFaces = mesh_.pointFaces()[pointI];
+            const label pointi = iter.key();
+            const labelList& pFaces = mesh_.pointFaces()[pointi];
 
             forAll(pFaces, pFacei)
             {
@@ -95,8 +95,8 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
 
         forAllConstIter(pointSet, loadedSet, iter)
         {
-            const label pointI = iter.key();
-            const labelList& pFaces = mesh_.pointFaces()[pointI];
+            const label pointi = iter.key();
+            const labelList& pFaces = mesh_.pointFaces()[pointi];
 
             forAll(pFaces, pFacei)
             {
diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
index 53bb9b41fe..c11a49064f 100644
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,13 +56,13 @@ void Foam::boxToPoint::combine(topoSet& set, const bool add) const
 {
     const pointField& pts = mesh_.points();
 
-    forAll(pts, pointI)
+    forAll(pts, pointi)
     {
         forAll(bbs_, i)
         {
-            if (bbs_[i].contains(pts[pointI]))
+            if (bbs_[i].contains(pts[pointi]))
             {
-                addOrDelete(set, pointI, add);
+                addOrDelete(set, pointi, add);
             }
         }
     }
diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
index 6ce211033f..c83340db6d 100644
--- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
+++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,27 +55,27 @@ void Foam::nearestToPoint::combine(topoSet& set, const bool add) const
 {
     // Do linear search since usually just a few points.
 
-    forAll(points_, pointI)
+    forAll(points_, pointi)
     {
         const pointField& pts = mesh_.points();
 
         if (pts.size())
         {
-            label minPointI = 0;
-            scalar minDistSqr = magSqr(pts[minPointI] - points_[pointI]);
+            label minPointi = 0;
+            scalar minDistSqr = magSqr(pts[minPointi] - points_[pointi]);
 
             for (label i = 1; i < pts.size(); i++)
             {
-                scalar distSqr = magSqr(pts[i] - points_[pointI]);
+                scalar distSqr = magSqr(pts[i] - points_[pointi]);
 
                 if (distSqr < minDistSqr)
                 {
                     minDistSqr = distSqr;
-                    minPointI = i;
+                    minPointi = i;
                 }
             }
 
-            addOrDelete(set, minPointI, add);
+            addOrDelete(set, minPointi, add);
         }
     }
 }
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
index 7f0d0ed9f9..81d4ccf1b7 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,13 +71,13 @@ void Foam::surfaceToPoint::combine(topoSet& set, const bool add) const
     {
         boolList pointInside(querySurf.calcInside(mesh_.points()));
 
-        forAll(pointInside, pointI)
+        forAll(pointInside, pointi)
         {
-            bool isInside = pointInside[pointI];
+            bool isInside = pointInside[pointi];
 
             if ((isInside && includeInside_) || (!isInside && includeOutside_))
             {
-                addOrDelete(set, pointI, add);
+                addOrDelete(set, pointi, add);
             }
         }
     }
@@ -89,15 +89,15 @@ void Foam::surfaceToPoint::combine(topoSet& set, const bool add) const
         // Box dimensions to search in octree.
         const vector span(nearDist_, nearDist_, nearDist_);
 
-        forAll(meshPoints, pointI)
+        forAll(meshPoints, pointi)
         {
-            const point& pt = meshPoints[pointI];
+            const point& pt = meshPoints[pointi];
 
             pointIndexHit inter = querySurf.nearest(pt, span);
 
             if (inter.hit() && (mag(inter.hitPoint() - pt) < nearDist_))
             {
-                addOrDelete(set, pointI, add);
+                addOrDelete(set, pointi, add);
             }
         }
     }
diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C
index dd6316d01a..b272752adc 100644
--- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C
+++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,11 +125,11 @@ void Foam::setToPointZone::applyToSet
 
             forAllConstIter(pointSet, fSet, iter)
             {
-                label pointI = iter.key();
+                label pointi = iter.key();
 
-                if (!fzSet.found(pointI))
+                if (!fzSet.found(pointi))
                 {
-                    newAddressing.append(pointI);
+                    newAddressing.append(pointi);
                 }
             }
 
diff --git a/src/meshTools/sets/topoSets/pointSet.C b/src/meshTools/sets/topoSets/pointSet.C
index 5fd073a78b..925de24908 100644
--- a/src/meshTools/sets/topoSets/pointSet.C
+++ b/src/meshTools/sets/topoSets/pointSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,11 +132,11 @@ void pointSet::sync(const polyMesh& mesh)
 
     labelHashSet newContents(size());
 
-    forAll(contents, pointI)
+    forAll(contents, pointi)
     {
-        if (contents[pointI])
+        if (contents[pointi])
         {
-            newContents.insert(pointI);
+            newContents.insert(pointi);
         }
     }
 
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C
index 7bfc299ca4..4b2794363b 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.C
+++ b/src/meshTools/sets/topoSets/pointZoneSet.C
@@ -141,9 +141,9 @@ void pointZoneSet::invert(const label maxLen)
     // Count
     label n = 0;
 
-    for (label pointI = 0; pointI < maxLen; pointI++)
+    for (label pointi = 0; pointi < maxLen; pointi++)
     {
-        if (!found(pointI))
+        if (!found(pointi))
         {
             n++;
         }
@@ -153,11 +153,11 @@ void pointZoneSet::invert(const label maxLen)
     addressing_.setSize(n);
     n = 0;
 
-    for (label pointI = 0; pointI < maxLen; pointI++)
+    for (label pointi = 0; pointi < maxLen; pointi++)
     {
-        if (!found(pointI))
+        if (!found(pointi))
         {
-            addressing_[n] = pointI;
+            addressing_[n] = pointi;
             n++;
         }
     }
@@ -173,11 +173,11 @@ void pointZoneSet::subset(const topoSet& set)
 
     forAll(fSet.addressing(), i)
     {
-        label pointI = fSet.addressing()[i];
+        label pointi = fSet.addressing()[i];
 
-        if (found(pointI))
+        if (found(pointi))
         {
-            newAddressing.append(pointI);
+            newAddressing.append(pointi);
         }
     }
 
@@ -194,11 +194,11 @@ void pointZoneSet::addSet(const topoSet& set)
 
     forAll(fSet.addressing(), i)
     {
-        label pointI = fSet.addressing()[i];
+        label pointi = fSet.addressing()[i];
 
-        if (!found(pointI))
+        if (!found(pointi))
         {
-            newAddressing.append(pointI);
+            newAddressing.append(pointi);
         }
     }
 
@@ -215,12 +215,12 @@ void pointZoneSet::deleteSet(const topoSet& set)
 
     forAll(addressing_, i)
     {
-        label pointI = addressing_[i];
+        label pointi = addressing_[i];
 
-        if (!fSet.found(pointI))
+        if (!fSet.found(pointi))
         {
             // Not found in fSet so add
-            newAddressing.append(pointI);
+            newAddressing.append(pointi);
         }
     }
 
@@ -291,11 +291,11 @@ void pointZoneSet::updateMesh(const mapPolyMesh& morphMap)
     label n = 0;
     forAll(addressing_, i)
     {
-        label pointI = addressing_[i];
-        label newPointI = morphMap.reversePointMap()[pointI];
-        if (newPointI >= 0)
+        label pointi = addressing_[i];
+        label newPointi = morphMap.reversePointMap()[pointi];
+        if (newPointi >= 0)
         {
-            newAddressing[n] = newPointI;
+            newAddressing[n] = newPointi;
             n++;
         }
     }
diff --git a/src/meshTools/surfaceSets/surfaceSets.C b/src/meshTools/surfaceSets/surfaceSets.C
index 9c7302d274..d2b7106ab0 100644
--- a/src/meshTools/surfaceSets/surfaceSets.C
+++ b/src/meshTools/surfaceSets/surfaceSets.C
@@ -45,14 +45,14 @@ License
 //Foam::scalar Foam::surfaceSets::minEdgeLen
 //(
 //    const primitiveMesh& mesh,
-//    const label pointI
+//    const label pointi
 //)
 //{
 //    const edgeList& edges = mesh.edges();
 //
 //    const pointField& points = mesh.points();
 //
-//    const labelList& pEdges = mesh.pointEdges()[pointI];
+//    const labelList& pEdges = mesh.pointEdges()[pointi];
 //
 //    scalar minLen = GREAT;
 //
@@ -131,14 +131,14 @@ License
 //
 //            forAll(f, fp)
 //            {
-//                label pointI = f[fp];
+//                label pointi = f[fp];
 //
-//                if (outsidePoints.insert(pointI))
+//                if (outsidePoints.insert(pointi))
 //                {
 //                    // Calculate new position for this outside point
 //                    tmp<pointField> tnearest =
-//                        querySurf.calcNearest(pointField(1, points[pointI]));
-//                    newPoints[pointI] = tnearest()[0];
+//                        querySurf.calcNearest(pointField(1, points[pointi]));
+//                    newPoints[pointi] = tnearest()[0];
 //                }
 //            }
 //        }
@@ -200,15 +200,15 @@ License
 //
 //    forAll(candidates, i)
 //    {
-//        label pointI = candidates[i];
+//        label pointi = candidates[i];
 //
-//        scalar minLen = minEdgeLen(mesh, pointI);
+//        scalar minLen = minEdgeLen(mesh, pointi);
 //
-//        scalar dist = mag(nearest[i] - points[pointI]);
+//        scalar dist = mag(nearest[i] - points[pointi]);
 //
 //        if (dist < edgeFactor * minLen)
 //        {
-//            nearPointSet.insert(pointI);
+//            nearPointSet.insert(pointi);
 //        }
 //    }
 //}
@@ -308,15 +308,15 @@ Foam::labelHashSet Foam::surfaceSets::getHangingCells
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
+                    label pointi = f[fp];
 
-                    if (pointSide[pointI] == NOTSET)
+                    if (pointSide[pointi] == NOTSET)
                     {
-                        pointSide[pointI] = INSIDE;
+                        pointSide[pointi] = INSIDE;
                     }
-                    else if (pointSide[pointI] == OUTSIDE)
+                    else if (pointSide[pointi] == OUTSIDE)
                     {
-                        pointSide[pointI] = MIXED;
+                        pointSide[pointi] = MIXED;
                     }
                     else
                     {
@@ -336,15 +336,15 @@ Foam::labelHashSet Foam::surfaceSets::getHangingCells
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
+                    label pointi = f[fp];
 
-                    if (pointSide[pointI] == NOTSET)
+                    if (pointSide[pointi] == NOTSET)
                     {
-                        pointSide[pointI] = OUTSIDE;
+                        pointSide[pointi] = OUTSIDE;
                     }
-                    else if (pointSide[pointI] == INSIDE)
+                    else if (pointSide[pointi] == INSIDE)
                     {
-                        pointSide[pointI] = MIXED;
+                        pointSide[pointi] = MIXED;
                     }
                     else
                     {
@@ -358,11 +358,11 @@ Foam::labelHashSet Foam::surfaceSets::getHangingCells
 
     //OFstream mixedStr("mixed.obj");
     //
-    //forAll(pointSide, pointI)
+    //forAll(pointSide, pointi)
     //{
-    //    if (pointSide[pointI] == MIXED)
+    //    if (pointSide[pointi] == MIXED)
     //    {
-    //        const point& pt = points[pointI];
+    //        const point& pt = points[pointi];
     //
     //        mixedStr << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z()
     //            << endl;
diff --git a/src/meshTools/surfaceSets/surfaceSets.H b/src/meshTools/surfaceSets/surfaceSets.H
index 18edb8bbf9..30f2da5ecc 100644
--- a/src/meshTools/surfaceSets/surfaceSets.H
+++ b/src/meshTools/surfaceSets/surfaceSets.H
@@ -79,7 +79,7 @@ class surfaceSets
         //static scalar minEdgeLen
         //(
         //    const primitiveMesh& mesh,
-        //    const label pointI
+        //    const label pointi
         //);
         //
         ////- Returns true if cell uses at least one selected point
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 6689fae63c..02c672a4e5 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -582,44 +582,44 @@ Foam::booleanSurface::booleanSurface
         cutSurf1.nPoints() - cutSurf1.nSurfacePoints()
     );
 
-    label combinedPointI = 0;
+    label combinedPointi = 0;
 
-    forAll(subSurf1.points(), pointI)
+    forAll(subSurf1.points(), pointi)
     {
         // Label in cutSurf
-        label cutSurfPointI = pointMap1[pointI];
+        label cutSurfPointi = pointMap1[pointi];
 
-        if (!cutSurf1.isSurfacePoint(cutSurfPointI))
+        if (!cutSurf1.isSurfacePoint(cutSurfPointi))
         {
-            // Label in original intersection is equal to the cutSurfPointI
+            // Label in original intersection is equal to the cutSurfPointi
 
             // Remember label in combinedPoints for intersection point.
-            intersectionLabels[cutSurfPointI] = combinedPointI;
+            intersectionLabels[cutSurfPointi] = combinedPointi;
         }
 
         // Copy point
-        combinedPoints[combinedPointI++] = subSurf1.points()[pointI];
+        combinedPoints[combinedPointi++] = subSurf1.points()[pointi];
     }
 
     // Append points from subSurf2 (if they are not intersection points)
     // and construct mapping
     labelList pointMap(subSurf2.nPoints());
 
-    forAll(subSurf2.points(), pointI)
+    forAll(subSurf2.points(), pointi)
     {
         // Label in cutSurf
-        label cutSurfPointI = pointMap2[pointI];
+        label cutSurfPointi = pointMap2[pointi];
 
-        if (!cutSurf2.isSurfacePoint(cutSurfPointI))
+        if (!cutSurf2.isSurfacePoint(cutSurfPointi))
         {
             // Lookup its label in combined point list.
-            pointMap[pointI] = intersectionLabels[cutSurfPointI];
+            pointMap[pointi] = intersectionLabels[cutSurfPointi];
         }
         else
         {
-            pointMap[pointI] = combinedPointI;
+            pointMap[pointi] = combinedPointi;
 
-            combinedPoints[combinedPointI++] = subSurf2.points()[pointI];
+            combinedPoints[combinedPointi++] = subSurf2.points()[pointi];
         }
     }
 
@@ -813,21 +813,21 @@ Foam::booleanSurface::booleanSurface
 
     // Copy all points from 1 and non-intersection ones from 2.
 
-    label combinedPointI = 0;
+    label combinedPointi = 0;
 
-    forAll(cutSurf1.points(), pointI)
+    forAll(cutSurf1.points(), pointi)
     {
-        combinedPoints[combinedPointI++] = cutSurf1.points()[pointI];
+        combinedPoints[combinedPointi++] = cutSurf1.points()[pointi];
     }
 
     for
     (
-        label pointI = 0;
-        pointI < cutSurf2.nSurfacePoints();
-        pointI++
+        label pointi = 0;
+        pointi < cutSurf2.nSurfacePoints();
+        pointi++
     )
     {
-        combinedPoints[combinedPointI++] = cutSurf2.points()[pointI];
+        combinedPoints[combinedPointi++] = cutSurf2.points()[pointi];
     }
 
     // Point order is now
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index c891d82865..87405317a2 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -47,9 +47,9 @@ void Foam::edgeSurface::writeOBJ
     Ostream& os
 )
 {
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
     }
@@ -71,9 +71,9 @@ void Foam::edgeSurface::writeOBJ
     Ostream& os
 )
 {
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
     }
@@ -101,9 +101,9 @@ void Foam::edgeSurface::calcPointEdges()
         pointNEdges[e[1]]++;
     }
 
-    forAll(pointEdges_, pointI)
+    forAll(pointEdges_, pointi)
     {
-        pointEdges_[pointI].setSize(pointNEdges[pointI]);
+        pointEdges_[pointi].setSize(pointNEdges[pointi]);
     }
 
     pointNEdges = 0;
@@ -142,20 +142,20 @@ Foam::edgeSurface::edgeSurface
     // Copy points (surface ones first)
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    label pointI = 0;
+    label pointi = 0;
 
     const pointField& surfPoints = surf.localPoints();
 
     forAll(surfPoints, i)
     {
-        points_[pointI++] = surfPoints[i];
+        points_[pointi++] = surfPoints[i];
     }
 
     const pointField& cutPoints = inter.cutPoints();
 
     forAll(cutPoints, i)
     {
-        points_[pointI++] = cutPoints[i];
+        points_[pointi++] = cutPoints[i];
     }
 
 
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 260e2aab7e..ac63a6bd24 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -59,9 +59,9 @@ void Foam::intersectedSurface::writeOBJ
     Ostream& os
 )
 {
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
     }
@@ -83,9 +83,9 @@ void Foam::intersectedSurface::writeOBJ
     Ostream& os
 )
 {
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
     }
@@ -119,15 +119,15 @@ void Foam::intersectedSurface::writeLocalOBJ
 
         forAll(e, i)
         {
-            label pointI = e[i];
+            label pointi = e[i];
 
-            if (pointMap[pointI] == -1)
+            if (pointMap[pointi] == -1)
             {
-                const point& pt = points[pointI];
+                const point& pt = points[pointi];
 
                 os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
 
-                pointMap[pointI] = maxVertI++;
+                pointMap[pointi] = maxVertI++;
             }
         }
     }
@@ -150,9 +150,9 @@ void Foam::intersectedSurface::writeOBJ
     Ostream& os
 )
 {
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
     }
@@ -640,7 +640,7 @@ void Foam::intersectedSurface::findNearestVisited
     const Map<DynamicList<label>>& facePointEdges,
     const Map<label>& pointVisited,
     const point& pt,
-    const label excludePointI,
+    const label excludePointi,
 
     label& minVertI,
     scalar& minDist
@@ -651,21 +651,21 @@ void Foam::intersectedSurface::findNearestVisited
 
     forAllConstIter(Map<label>, pointVisited, iter)
     {
-        label pointI = iter.key();
+        label pointi = iter.key();
 
-        if (pointI != excludePointI)
+        if (pointi != excludePointi)
         {
             label nVisits = iter();
 
-            if (nVisits == 2*facePointEdges[pointI].size())
+            if (nVisits == 2*facePointEdges[pointi].size())
             {
                 // Fully visited (i.e. both sides of all edges)
-                scalar dist = mag(eSurf.points()[pointI] - pt);
+                scalar dist = mag(eSurf.points()[pointi] - pt);
 
                 if (dist < minDist)
                 {
                     minDist = dist;
-                    minVertI = pointI;
+                    minVertI = pointi;
                 }
             }
         }
@@ -721,9 +721,9 @@ Foam::faceList Foam::intersectedSurface::resplitFace
         OFstream str0("visitedNone.obj");
         OFstream str1("visitedOnce.obj");
         OFstream str2("visitedTwice.obj");
-        forAll(eSurf.points(), pointI)
+        forAll(eSurf.points(), pointi)
         {
-            const point& pt = eSurf.points()[pointI];
+            const point& pt = eSurf.points()[pointi];
 
             str0 << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
             str1 << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
@@ -767,12 +767,12 @@ Foam::faceList Foam::intersectedSurface::resplitFace
     {
         forAllConstIter(Map<label>, pointVisited, iter)
         {
-            label pointI = iter.key();
+            label pointi = iter.key();
 
             label nVisits = iter();
 
-            Pout<< "point:" << pointI << "  nVisited:" << nVisits
-                << "  pointEdges:" << facePointEdges[pointI].size() << endl;
+            Pout<< "point:" << pointi << "  nVisited:" << nVisits
+                << "  pointEdges:" << facePointEdges[pointi].size() << endl;
         }
     }
 
@@ -788,9 +788,9 @@ Foam::faceList Foam::intersectedSurface::resplitFace
 
         forAllConstIter(Map<DynamicList<label>>, facePointEdges, iter)
         {
-            label pointI = iter.key();
+            label pointi = iter.key();
 
-            label nVisits = pointVisited[pointI];
+            label nVisits = pointVisited[pointi];
 
             const DynamicList<label>& pEdges = iter();
 
@@ -807,7 +807,7 @@ Foam::faceList Foam::intersectedSurface::resplitFace
                     facei,
                     facePointEdges,
                     pointVisited,
-                    eSurf.points()[pointI],
+                    eSurf.points()[pointi],
                     -1,                         // Do not exclude vertex
                     nearVertI,
                     nearDist
@@ -818,7 +818,7 @@ Foam::faceList Foam::intersectedSurface::resplitFace
                 {
                     minDist = nearDist;
                     visitedVert0 = nearVertI;
-                    unvisitedVert0 = pointI;
+                    unvisitedVert0 = pointi;
                 }
             }
         }
@@ -833,11 +833,11 @@ Foam::faceList Foam::intersectedSurface::resplitFace
 
         forAllConstIter(Map<DynamicList<label>>, facePointEdges, iter)
         {
-            label pointI = iter.key();
+            label pointi = iter.key();
 
-            if (pointI != unvisitedVert0)
+            if (pointi != unvisitedVert0)
             {
-                label nVisits = pointVisited[pointI];
+                label nVisits = pointVisited[pointi];
 
                 const DynamicList<label>& pEdges = iter();
 
@@ -854,7 +854,7 @@ Foam::faceList Foam::intersectedSurface::resplitFace
                         facei,
                         facePointEdges,
                         pointVisited,
-                        eSurf.points()[pointI],
+                        eSurf.points()[pointi],
                         visitedVert0,           // vertex to exclude
                         nearVertI,
                         nearDist
@@ -865,7 +865,7 @@ Foam::faceList Foam::intersectedSurface::resplitFace
                     {
                         minDist = nearDist;
                         visitedVert1 = nearVertI;
-                        unvisitedVert1 = pointI;
+                        unvisitedVert1 = pointi;
                     }
                 }
             }
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.H b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.H
index 636aa84ea5..a3eb54c9a2 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.H
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.H
@@ -284,9 +284,9 @@ public:
         }
 
         //- Is point coming from original surface?
-        bool isSurfacePoint(const label pointI) const
+        bool isSurfacePoint(const label pointi) const
         {
-            return pointI < nSurfacePoints_;
+            return pointi < nSurfacePoints_;
         }
 };
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 22c383d50d..a53981e2f5 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -328,8 +328,8 @@ bool Foam::edgeIntersections::rotatePerturb
             const edge& e = surf1.edges()[edgeI];
 
             // Endpoint to modify. Choose either start or end.
-            label pointI = e[rndGen.bit()];
-            //label pointI = e[0];
+            label pointi = e[rndGen.bit()];
+            //label pointi = e[0];
 
             // Generate random vector slightly larger than tolerance.
             vector rndVec = rndGen.vector01() - vector(0.5, 0.5, 0.5);
@@ -347,17 +347,17 @@ bool Foam::edgeIntersections::rotatePerturb
             // Scale to be moved by tolerance.
             rndVec *= 0.01*magN;
 
-            Pout<< "rotating: shifting endpoint " << meshPoints[pointI]
+            Pout<< "rotating: shifting endpoint " << meshPoints[pointi]
                 << " of edge:" << edgeI << " verts:"
                 << points1[meshPoints[e[0]]] << ' '
                 << points1[meshPoints[e[1]]]
                 << " by " << rndVec
-                << " tol:" << surf1PointTol[pointI] << endl;
+                << " tol:" << surf1PointTol[pointi] << endl;
 
-            points1[meshPoints[pointI]] += rndVec;
+            points1[meshPoints[pointi]] += rndVec;
 
             // Mark edges affected by change to point
-            const labelList& pEdges = surf1.pointEdges()[pointI];
+            const labelList& pEdges = surf1.pointEdges()[pointi];
 
             forAll(pEdges, i)
             {
@@ -519,9 +519,9 @@ Foam::scalarField Foam::edgeIntersections::minEdgeLength(const triSurface& surf)
 
     scalarField minLen(localPoints.size());
 
-    forAll(minLen, pointI)
+    forAll(minLen, pointi)
     {
-        const labelList& pEdges = pointEdges[pointI];
+        const labelList& pEdges = pointEdges[pointi];
 
         scalar minDist = GREAT;
 
@@ -530,7 +530,7 @@ Foam::scalarField Foam::edgeIntersections::minEdgeLength(const triSurface& surf)
             minDist = min(minDist, edges[pEdges[i]].mag(localPoints));
         }
 
-        minLen[pointI] = minDist;
+        minLen[pointi] = minDist;
     }
     return minLen;
 }
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 824edfc775..0e52bd292a 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -573,11 +573,11 @@ void Foam::surfaceIntersection::doCutEdges
     // Calculate local (to point) tolerance based on min edge length.
     scalarField surf1PointTol(surf1Pts.size());
 
-    forAll(surf1PointTol, pointI)
+    forAll(surf1PointTol, pointi)
     {
-        surf1PointTol[pointI] =
+        surf1PointTol[pointi] =
             intersection::planarTol()
-          * minEdgeLen(surf1, pointI);
+          * minEdgeLen(surf1, pointi);
     }
 
     const triSurface& surf2 = querySurf2.surface();
@@ -959,13 +959,13 @@ Foam::surfaceIntersection::surfaceIntersection
 
         forAllConstIter(labelPairLookup, facePairToVertex_, iter)
         {
-            label pointI = iter();
+            label pointi = iter();
 
-            if (!usedPoints.found(pointI))
+            if (!usedPoints.found(pointi))
             {
                 WarningInFunction
-                    << "Problem: cut point:" << pointI
-                    << " coord:" << cutPoints_[pointI]
+                    << "Problem: cut point:" << pointi
+                    << " coord:" << cutPoints_[pointi]
                     << " not used by any edge" << endl;
             }
         }
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
index 76a6936d36..d316bf2915 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
@@ -124,7 +124,7 @@ class surfaceIntersection
         static void transfer(List<DynamicList<T>>&,  List<List<T>>&);
 
         //- Get minimum length of all edges connected to point
-        static scalar minEdgeLen(const triSurface& surf, const label pointI);
+        static scalar minEdgeLen(const triSurface& surf, const label pointi);
 
         //- Get edge label of edge between face vertices fp and fp+1
         static label getEdge
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 73be4e106b..3ae120f594 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -64,10 +64,10 @@ void Foam::surfaceIntersection::writeOBJ
 Foam::scalar Foam::surfaceIntersection::minEdgeLen
 (
     const triSurface& surf,
-    const label pointI
+    const label pointi
 )
 {
-    const labelList& pEdges = surf.pointEdges()[pointI];
+    const labelList& pEdges = surf.pointEdges()[pointi];
 
     scalar minLen = GREAT;
 
@@ -265,13 +265,13 @@ void Foam::surfaceIntersection::writeIntersectedEdges
     // Dump all points (surface followed by cutPoints)
     const pointField& pts = surf.localPoints();
 
-    forAll(pts, pointI)
+    forAll(pts, pointi)
     {
-        writeOBJ(pts[pointI], os);
+        writeOBJ(pts[pointi], os);
     }
-    forAll(cutPoints(), cutPointI)
+    forAll(cutPoints(), cutPointi)
     {
-        writeOBJ(cutPoints()[cutPointI], os);
+        writeOBJ(cutPoints()[cutPointi], os);
     }
 
     forAll(edgeCutVerts, edgeI)
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 2462180a12..767b4bb7fa 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -192,9 +192,9 @@ void Foam::surfaceFeatures::calcFeatPoints
     const edgeList& edges = surf_.edges();
     const pointField& localPoints = surf_.localPoints();
 
-    forAll(pointEdges, pointI)
+    forAll(pointEdges, pointi)
     {
-        const labelList& pEdges = pointEdges[pointI];
+        const labelList& pEdges = pointEdges[pointi];
 
         label nFeatEdges = 0;
 
@@ -208,7 +208,7 @@ void Foam::surfaceFeatures::calcFeatPoints
 
         if (nFeatEdges > 2)
         {
-            featurePoints.append(pointI);
+            featurePoints.append(pointi);
         }
         else if (nFeatEdges == 2)
         {
@@ -228,7 +228,7 @@ void Foam::surfaceFeatures::calcFeatPoints
 
             if (mag(edgeVecs[0] & edgeVecs[1]) < minCos)
             {
-                featurePoints.append(pointI);
+                featurePoints.append(pointi);
             }
         }
     }
@@ -299,7 +299,7 @@ void Foam::surfaceFeatures::classifyFeatureAngles
 }
 
 
-// Returns next feature edge connected to pointI with correct value.
+// Returns next feature edge connected to pointi with correct value.
 Foam::label Foam::surfaceFeatures::nextFeatEdge
 (
     const List<edgeStatus>& edgeStat,
@@ -341,7 +341,7 @@ Foam::label Foam::surfaceFeatures::nextFeatEdge
 
 
 // Finds connected feature edges by walking from prevEdgeI in direction of
-// prevPointI. Marks feature edges visited in featVisited by assigning them
+// prevPointi. Marks feature edges visited in featVisited by assigning them
 // the current feature line number. Returns cumulative length of edges walked.
 // Works in one of two modes:
 // - mark : step to edges with featVisited = -1.
@@ -353,20 +353,20 @@ Foam::surfaceFeatures::labelScalar Foam::surfaceFeatures::walkSegment
     const bool mark,
     const List<edgeStatus>& edgeStat,
     const label startEdgeI,
-    const label startPointI,
+    const label startPointi,
     const label currentFeatI,
     labelList& featVisited
 )
 {
     label edgeI = startEdgeI;
 
-    label vertI = startPointI;
+    label vertI = startPointi;
 
     scalar visitedLength = 0.0;
 
     label nVisited = 0;
 
-    if (findIndex(featurePoints_, startPointI) >= 0)
+    if (findIndex(featurePoints_, startPointi) >= 0)
     {
         // Do not walk across feature points
 
@@ -430,7 +430,7 @@ Foam::surfaceFeatures::labelScalar Foam::surfaceFeatures::walkSegment
         {
             Warning<< "walkSegment : reached iteration limit in walking "
                 << "feature edges on surface from edge:" << startEdgeI
-                << " vertex:" << startPointI << nl
+                << " vertex:" << startPointi << nl
                 << "Returning with large length" << endl;
 
             return labelScalar(nVisited, GREAT);
@@ -897,9 +897,9 @@ void Foam::surfaceFeatures::writeObj(const fileName& prefix) const
 
     forAll(featurePoints_, i)
     {
-        label pointI = featurePoints_[i];
+        label pointi = featurePoints_[i];
 
-        meshTools::writeOBJ(pointStr, surf_.localPoints()[pointI]);
+        meshTools::writeOBJ(pointStr, surf_.localPoints()[pointi]);
     }
 }
 
@@ -933,9 +933,9 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
 
     forAll(pointLabels, i)
     {
-        label surfPointI = pointLabels[i];
+        label surfPointi = pointLabels[i];
 
-        const point& surfPt = surfPoints[surfPointI];
+        const point& surfPt = surfPoints[surfPointi];
 
         pointIndexHit info = ppTree.findNearest
         (
@@ -947,7 +947,7 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
         {
             FatalErrorInFunction
                 << "Problem for point "
-                << surfPointI << " in tree " << ppTree.bb()
+                << surfPointi << " in tree " << ppTree.bb()
                 << abort(FatalError);
         }
 
@@ -955,7 +955,7 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
 
         if (magSqr(samples[sampleI] - surfPt) < maxDistSqr[sampleI])
         {
-            nearest.insert(sampleI, surfPointI);
+            nearest.insert(sampleI, surfPointi);
         }
     }
 
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
index 72d893a779..3eb4e6f025 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,7 +164,7 @@ private:
             const bool mark,
             const List<edgeStatus>& edgeStat,
             const label startEdgeI,
-            const label startPointI,
+            const label startPointi,
             const label currentFeatI,
             labelList& featVisited
         );
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index 7bcfe6095e..36f6ac9ca9 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -55,10 +55,10 @@ bool Foam::triSurfaceSearch::checkUniqueHit
     {
         // near point
 
-        const label nearPointI = f[nearLabel];
+        const label nearPointi = f[nearLabel];
 
         const labelList& pointFaces =
-            surface().pointFaces()[surface().meshPointMap()[nearPointI]];
+            surface().pointFaces()[surface().meshPointMap()[nearPointi]];
 
         forAll(pointFaces, pI)
         {
@@ -394,7 +394,7 @@ void Foam::triSurfaceSearch::findLineAll
 
     treeDataTriSurface::findAllIntersectOp allIntersectOp(octree, shapeMask);
 
-    forAll(start, pointI)
+    forAll(start, pointi)
     {
         hits.clear();
         shapeMask.clear();
@@ -404,14 +404,14 @@ void Foam::triSurfaceSearch::findLineAll
             // See if any intersection between pt and end
             pointIndexHit inter = octree.findLine
             (
-                start[pointI],
-                end[pointI],
+                start[pointi],
+                end[pointi],
                 allIntersectOp
             );
 
             if (inter.hit())
             {
-                vector lineVec = end[pointI] - start[pointI];
+                vector lineVec = end[pointi] - start[pointi];
                 lineVec /= mag(lineVec) + VSMALL;
 
                 if
@@ -435,7 +435,7 @@ void Foam::triSurfaceSearch::findLineAll
             }
         }
 
-        info[pointI].transfer(hits);
+        info[pointi].transfer(hits);
     }
 
     indexedOctree<treeDataTriSurface>::perturbTol() = oldTol;
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 9bffe1bf9c..1915de7ecc 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -86,13 +86,13 @@ void Foam::triSurfaceTools::calcRefineStatus
 }
 
 
-// Split facei along edgeI at position newPointI
+// Split facei along edgeI at position newPointi
 void Foam::triSurfaceTools::greenRefine
 (
     const triSurface& surf,
     const label facei,
     const label edgeI,
-    const label newPointI,
+    const label newPointi,
     DynamicList<labelledTri>& newFaces
 )
 {
@@ -113,7 +113,7 @@ void Foam::triSurfaceTools::greenRefine
             labelledTri
             (
                 f[fp0],
-                newPointI,
+                newPointi,
                 f[fp2],
                 f.region()
             )
@@ -122,7 +122,7 @@ void Foam::triSurfaceTools::greenRefine
         (
             labelledTri
             (
-                newPointI,
+                newPointi,
                 f[fp1],
                 f[fp2],
                 f.region()
@@ -136,7 +136,7 @@ void Foam::triSurfaceTools::greenRefine
             labelledTri
             (
                 f[fp2],
-                newPointI,
+                newPointi,
                 f[fp1],
                 f.region()
             )
@@ -145,7 +145,7 @@ void Foam::triSurfaceTools::greenRefine
         (
             labelledTri
             (
-                newPointI,
+                newPointi,
                 f[fp0],
                 f[fp1],
                 f.region()
@@ -164,9 +164,9 @@ Foam::triSurface Foam::triSurfaceTools::doRefine
 {
     // Storage for new points. (start after old points)
     DynamicList<point> newPoints(surf.nPoints());
-    forAll(surf.localPoints(), pointI)
+    forAll(surf.localPoints(), pointi)
     {
-        newPoints.append(surf.localPoints()[pointI]);
+        newPoints.append(surf.localPoints()[pointi]);
     }
     label newVertI = surf.nPoints();
 
@@ -842,7 +842,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::cutEdge
     const triSurface& s,
     const label triI,
     const label excludeEdgeI,
-    const label excludePointI,
+    const label excludePointi,
 
     const point& triPoint,
     const plane& cutPlane,
@@ -877,11 +877,11 @@ Foam::surfaceLocation Foam::triSurfaceTools::cutEdge
     // Return information
     surfaceLocation cut;
 
-    if (excludePointI != -1)
+    if (excludePointi != -1)
     {
         // Excluded point. Test only opposite edge.
 
-        label fp0 = findIndex(s.localFaces()[triI], excludePointI);
+        label fp0 = findIndex(s.localFaces()[triI], excludePointi);
 
         if (fp0 == -1)
         {
@@ -1166,7 +1166,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::visitFaces
     const labelList& eFaces,
     const surfaceLocation& start,
     const label excludeEdgeI,
-    const label excludePointI,
+    const label excludePointi,
     const surfaceLocation& end,
     const plane& cutPlane
 )
@@ -1199,7 +1199,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::visitFaces
                     s,
                     triI,
                     excludeEdgeI,       // excludeEdgeI
-                    excludePointI,      // excludePointI
+                    excludePointi,      // excludePointi
                     start.rawPoint(),
                     cutPlane,
                     end.rawPoint()
@@ -1255,9 +1255,9 @@ void Foam::triSurfaceTools::writeOBJ
 {
     OFstream outFile(fName);
 
-    forAll(pts, pointI)
+    forAll(pts, pointi)
     {
-        const point& pt = pts[pointI];
+        const point& pt = pts[pointi];
 
         outFile<< "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
     }
@@ -1716,9 +1716,9 @@ Foam::triSurface Foam::triSurfaceTools::collapseEdges
 
     // Map for old to new points
     labelList pointMap(localPoints.size());
-    forAll(localPoints, pointI)
+    forAll(localPoints, pointi)
     {
-        pointMap[pointI] = pointI;
+        pointMap[pointi] = pointi;
     }
 
 
@@ -1894,7 +1894,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
 
     pointField newPoints(surf.localPoints());
     newPoints.setSize(surf.nPoints() + surf.nEdges());
-    label newPointI = surf.nPoints();
+    label newPointi = surf.nPoints();
 
 
     // Refine edges
@@ -1927,7 +1927,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
                   + surf.localPoints()[e.end()]
                 );
 
-            newPoints[newPointI] = mid;
+            newPoints[newPointi] = mid;
 
             // Refine faces using edge
             forAll(myFaces, myFacei)
@@ -1938,7 +1938,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
                     surf,
                     myFaces[myFacei],
                     edgeI,
-                    newPointI,
+                    newPointi,
                     newFaces
                 );
 
@@ -1946,7 +1946,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
                 refineStatus[myFaces[myFacei]] = GREEN;
             }
 
-            newPointI++;
+            newPointi++;
         }
     }
 
@@ -1960,7 +1960,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
     }
 
     newFaces.shrink();
-    newPoints.setSize(newPointI);
+    newPoints.setSize(newPointi);
 
     return triSurface(newFaces, surf.patches(), newPoints, true);
 }
@@ -2276,13 +2276,13 @@ Foam::triSurfaceTools::sideType Foam::triSurfaceTools::surfaceSide
 
 
         const triSurface::FaceType& localF = surf.localFaces()[nearestFacei];
-        label nearPointI = localF[nearLabel];
+        label nearPointi = localF[nearLabel];
 
         const edgeList& edges = surf.edges();
         const pointField& localPoints = surf.localPoints();
-        const point& base = localPoints[nearPointI];
+        const point& base = localPoints[nearPointi];
 
-        const labelList& pEdges = surf.pointEdges()[nearPointI];
+        const labelList& pEdges = surf.pointEdges()[nearPointi];
 
         scalar minDistSqr = Foam::sqr(GREAT);
         label minEdgeI = -1;
@@ -2293,10 +2293,10 @@ Foam::triSurfaceTools::sideType Foam::triSurfaceTools::surfaceSide
 
             const edge& e = edges[edgeI];
 
-            label otherPointI = e.otherVertex(nearPointI);
+            label otherPointi = e.otherVertex(nearPointi);
 
             // Get edge normal.
-            vector eVec(localPoints[otherPointI] - base);
+            vector eVec(localPoints[otherPointi] - base);
             scalar magEVec = mag(eVec);
 
             if (magEVec > VSMALL)
@@ -2431,15 +2431,15 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
 
     pointField newPoints(points.size() + faceCentres.size());
 
-    label newPointI = 0;
+    label newPointi = 0;
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        newPoints[newPointI++] = points[pointI];
+        newPoints[newPointi++] = points[pointi];
     }
     forAll(faceCentres, facei)
     {
-        newPoints[newPointI++] = faceCentres[facei];
+        newPoints[newPointi++] = faceCentres[facei];
     }
 
 
@@ -2463,7 +2463,7 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
             // Face in global coords.
             const face& f = patch[patchFacei];
 
-            // Index in newPointI of face centre.
+            // Index in newPointi of face centre.
             label fc = points.size() + patchFacei + patch.start();
 
             forAll(f, fp)
@@ -2843,7 +2843,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::trackToEdge
                 eFaces,
                 start,
                 start.index(),      // excludeEdgeI
-                -1,                 // excludePointI
+                -1,                 // excludePointi
                 end,
                 cutPlane
             );
@@ -2858,7 +2858,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::trackToEdge
                 pFaces,
                 start,
                 -1,                 // excludeEdgeI
-                start.index(),      // excludePointI
+                start.index(),      // excludePointi
                 end,
                 cutPlane
             );
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
index 1a6dafc4b1..24fd96322e 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
@@ -83,7 +83,7 @@ class triSurfaceTools
                 const triSurface& surf,
                 const label facei,
                 const label edgeI,
-                const label newPointI,
+                const label newPointi,
                 DynamicList<labelledTri>& newFaces
             );
             static triSurface doRefine
@@ -205,7 +205,7 @@ class triSurfaceTools
                 const triSurface& s,
                 const label triI,
                 const label excludeEdgeI,
-                const label excludePointI,
+                const label excludePointi,
                 const point& triPoint,
                 const plane& cutPlane,
                 const point& toPoint
@@ -234,7 +234,7 @@ class triSurfaceTools
                 const labelList& eFaces,
                 const surfaceLocation& start,
                 const label excludeEdgeI,
-                const label excludePointI,
+                const label excludePointi,
                 const surfaceLocation& end,
                 const plane& cutPlane
             );
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index 03d3565611..ccd7257ee0 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -330,11 +330,11 @@ void Foam::twoDPointCorrector::correctDisplacement
     {
         const edge& e = meshEdges[neIndices[edgeI]];
 
-        label startPointI = e.start();
-        point pStart = p[startPointI] + disp[startPointI];
+        label startPointi = e.start();
+        point pStart = p[startPointi] + disp[startPointi];
 
-        label endPointI = e.end();
-        point pEnd = p[endPointI] + disp[endPointI];
+        label endPointi = e.end();
+        point pEnd = p[endPointi] + disp[endPointi];
 
         // calculate average point position
         point A = 0.5*(pStart + pEnd);
@@ -344,14 +344,14 @@ void Foam::twoDPointCorrector::correctDisplacement
         {
             snapToWedge(pn, A, pStart);
             snapToWedge(pn, A, pEnd);
-            disp[startPointI] = pStart - p[startPointI];
-            disp[endPointI] = pEnd - p[endPointI];
+            disp[startPointi] = pStart - p[startPointi];
+            disp[endPointi] = pEnd - p[endPointi];
         }
         else
         {
             // correct point locations
-            disp[startPointI] = (A + pn*(pn & (pStart - A))) - p[startPointI];
-            disp[endPointI] = (A + pn*(pn & (pEnd - A))) - p[endPointI];
+            disp[startPointi] = (A + pn*(pn & (pStart - A))) - p[startPointi];
+            disp[endPointi] = (A + pn*(pn & (pEnd - A))) - p[endPointi];
         }
     }
 }
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C
index 9a2a7de2f7..3fb25cd9f3 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C
@@ -148,9 +148,9 @@ void Foam::decompositionConstraints::preserveFaceZonesConstraint::apply
 
     labelList destProc(mesh.nFaces()-mesh.nInternalFaces(), labelMax);
 
-    forAll(pbm, patchI)
+    forAll(pbm, patchi)
     {
-        const polyPatch& pp = pbm[patchI];
+        const polyPatch& pp = pbm[patchi];
 
         const labelUList& faceCells = pp.faceCells();
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.C
index 7341e2b15c..5371688325 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.C
@@ -147,9 +147,9 @@ void Foam::decompositionConstraints::preservePatchesConstraint::apply
 
     labelList destProc(mesh.nFaces()-mesh.nInternalFaces(), labelMax);
 
-    forAll(pbm, patchI)
+    forAll(pbm, patchi)
     {
-        const polyPatch& pp = pbm[patchI];
+        const polyPatch& pp = pbm[patchi];
 
         const labelUList& faceCells = pp.faceCells();
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.C
index da140d6658..71fb90c832 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.C
@@ -197,11 +197,11 @@ void Foam::decompositionConstraints::singleProcessorFaceSetsConstraint::add
 
     label nUnblocked = 0;
 
-    forAll(procFacePoint, pointI)
+    forAll(procFacePoint, pointi)
     {
-        if (procFacePoint[pointI])
+        if (procFacePoint[pointi])
         {
-            const labelList& pFaces = mesh.pointFaces()[pointI];
+            const labelList& pFaces = mesh.pointFaces()[pointi];
             forAll(pFaces, i)
             {
                 if (blockedFace[pFaces[i]])
@@ -278,11 +278,11 @@ void Foam::decompositionConstraints::singleProcessorFaceSetsConstraint::apply
         syncTools::syncPointList(mesh, procFacePoint, orEqOp<bool>(), false);
 
         // 2. Unblock all faces on procFacePoint
-        forAll(procFacePoint, pointI)
+        forAll(procFacePoint, pointi)
         {
-            if (procFacePoint[pointI])
+            if (procFacePoint[pointi])
             {
-                const labelList& pFaces = mesh.pointFaces()[pointI];
+                const labelList& pFaces = mesh.pointFaces()[pointi];
                 forAll(pFaces, i)
                 {
                     label faceI = pFaces[i];
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index 8b4d98c50a..7ff750db12 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -521,9 +521,9 @@ void Foam::decompositionMethod::calcCellCells
 
     labelList globalNeighbour(mesh.nFaces()-mesh.nInternalFaces());
 
-    forAll(patches, patchI)
+    forAll(patches, patchi)
     {
-        const polyPatch& pp = patches[patchI];
+        const polyPatch& pp = patches[patchi];
 
         if (pp.coupled() && (parallel || !isA<processorPolyPatch>(pp)))
         {
@@ -562,9 +562,9 @@ void Foam::decompositionMethod::calcCellCells
         nFacesPerCell[nei]++;
     }
 
-    forAll(patches, patchI)
+    forAll(patches, patchi)
     {
-        const polyPatch& pp = patches[patchI];
+        const polyPatch& pp = patches[patchi];
 
         if (pp.coupled() && (parallel || !isA<processorPolyPatch>(pp)))
         {
@@ -620,9 +620,9 @@ void Foam::decompositionMethod::calcCellCells
     }
 
     // For boundary faces is offsetted coupled neighbour
-    forAll(patches, patchI)
+    forAll(patches, patchi)
     {
-        const polyPatch& pp = patches[patchI];
+        const polyPatch& pp = patches[patchi];
 
         if (pp.coupled() && (parallel || !isA<processorPolyPatch>(pp)))
         {
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 9fa9446ee3..30fc200ff2 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,8 +147,8 @@ void Foam::hierarchGeomDecomp::calculateSortedWeightedSizes
     sortedWeightedSizes[0] = 0;
     forAll(current, i)
     {
-        label pointI = current[indices[i]];
-        sortedWeightedSizes[i + 1] = sortedWeightedSizes[i] + weights[pointI];
+        label pointi = current[indices[i]];
+        sortedWeightedSizes[i + 1] = sortedWeightedSizes[i] + weights[pointi];
     }
     // Non-dimensionalise and multiply by size.
     scalar globalCurrentLength = returnReduce
@@ -341,9 +341,9 @@ void Foam::hierarchGeomDecomp::sortComponent
 
     forAll(current, i)
     {
-        label pointI = current[i];
+        label pointi = current[i];
 
-        sortedCoord[i] = points[pointI][compI];
+        sortedCoord[i] = points[pointi][compI];
     }
     sortedCoord.sort();
 
@@ -448,13 +448,13 @@ void Foam::hierarchGeomDecomp::sortComponent
 
         forAll(slice, i)
         {
-            label pointI = current[sortedCoord.indices()[leftIndex+i]];
+            label pointi = current[sortedCoord.indices()[leftIndex+i]];
 
             // Mark point into correct bin
-            finalDecomp[pointI] += bin*mult;
+            finalDecomp[pointi] += bin*mult;
 
             // And collect for next sorting action
-            slice[i] = pointI;
+            slice[i] = pointi;
         }
 
         // Sort slice in next component
@@ -516,9 +516,9 @@ void Foam::hierarchGeomDecomp::sortComponent
 
     forAll(current, i)
     {
-        label pointI = current[i];
+        label pointi = current[i];
 
-        sortedCoord[i] = points[pointI][compI];
+        sortedCoord[i] = points[pointi][compI];
     }
     sortedCoord.sort();
 
@@ -631,13 +631,13 @@ void Foam::hierarchGeomDecomp::sortComponent
 
         forAll(slice, i)
         {
-            label pointI = current[sortedCoord.indices()[leftIndex+i]];
+            label pointi = current[sortedCoord.indices()[leftIndex+i]];
 
             // Mark point into correct bin
-            finalDecomp[pointI] += bin*mult;
+            finalDecomp[pointi] += bin*mult;
 
             // And collect for next sorting action
-            slice[i] = pointI;
+            slice[i] = pointi;
         }
 
         // Sort slice in next component
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index 3adc6279de..219365e0e4 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -273,13 +273,13 @@ void Foam::multiLevelDecomp::decompose
 
                 label nPoints = 0;
                 labelList nOutsideConnections(n, 0);
-                forAll(pointPoints, pointI)
+                forAll(pointPoints, pointi)
                 {
-                    if ((dist[pointI] / nNext) == blockI)
+                    if ((dist[pointi] / nNext) == blockI)
                     {
                         nPoints++;
 
-                        const labelList& pPoints = pointPoints[pointI];
+                        const labelList& pPoints = pointPoints[pointi];
 
                         forAll(pPoints, i)
                         {
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 2978e4e84b..63ffb1e451 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -966,7 +966,7 @@ void Foam::distributedTriSurfaceMesh::subsetMeshMap
     oldToNewPoints = -1;
     {
         label facei = 0;
-        label pointI = 0;
+        label pointi = 0;
 
         forAll(include, oldFacei)
         {
@@ -980,17 +980,17 @@ void Foam::distributedTriSurfaceMesh::subsetMeshMap
 
                 forAll(f, fp)
                 {
-                    label oldPointI = f[fp];
+                    label oldPointi = f[fp];
 
-                    if (oldToNewPoints[oldPointI] == -1)
+                    if (oldToNewPoints[oldPointi] == -1)
                     {
-                        oldToNewPoints[oldPointI] = pointI;
-                        newToOldPoints[pointI++] = oldPointI;
+                        oldToNewPoints[oldPointi] = pointi;
+                        newToOldPoints[pointi++] = oldPointi;
                     }
                 }
             }
         }
-        newToOldPoints.setSize(pointI);
+        newToOldPoints.setSize(pointi);
     }
 }
 
@@ -1088,7 +1088,7 @@ Foam::triSurface Foam::distributedTriSurfaceMesh::subsetMesh
     newToOldPoints.setSize(s.points().size());
     labelList oldToNewPoints(s.points().size(), -1);
     {
-        label pointI = 0;
+        label pointi = 0;
 
         forAll(include, oldFacei)
         {
@@ -1099,17 +1099,17 @@ Foam::triSurface Foam::distributedTriSurfaceMesh::subsetMesh
 
                 forAll(f, fp)
                 {
-                    label oldPointI = f[fp];
+                    label oldPointi = f[fp];
 
-                    if (oldToNewPoints[oldPointI] == -1)
+                    if (oldToNewPoints[oldPointi] == -1)
                     {
-                        oldToNewPoints[oldPointI] = pointI;
-                        newToOldPoints[pointI++] = oldPointI;
+                        oldToNewPoints[oldPointi] = pointi;
+                        newToOldPoints[pointi++] = oldPointi;
                     }
                 }
             }
         }
-        newToOldPoints.setSize(pointI);
+        newToOldPoints.setSize(pointi);
     }
 
     return subsetMesh
@@ -1184,24 +1184,24 @@ void Foam::distributedTriSurfaceMesh::merge
     // Add all unmatched points
     // ~~~~~~~~~~~~~~~~~~~~~~~~
 
-    label allPointI = nOldAllPoints;
-    forAll(pointConstructMap, pointI)
+    label allPointi = nOldAllPoints;
+    forAll(pointConstructMap, pointi)
     {
-        if (pointConstructMap[pointI] == -1)
+        if (pointConstructMap[pointi] == -1)
         {
-            pointConstructMap[pointI] = allPointI++;
+            pointConstructMap[pointi] = allPointi++;
         }
     }
 
-    if (allPointI > nOldAllPoints)
+    if (allPointi > nOldAllPoints)
     {
-        allPoints.setSize(allPointI);
+        allPoints.setSize(allPointi);
 
-        forAll(pointConstructMap, pointI)
+        forAll(pointConstructMap, pointi)
         {
-            if (pointConstructMap[pointI] >= nOldAllPoints)
+            if (pointConstructMap[pointi] >= nOldAllPoints)
             {
-                allPoints[pointConstructMap[pointI]] = subPoints[pointI];
+                allPoints[pointConstructMap[pointi]] = subPoints[pointi];
             }
         }
     }
@@ -1652,23 +1652,23 @@ void Foam::distributedTriSurfaceMesh::findNearest
         {
             if (allInfo[i].hit())
             {
-                label pointI = allSegmentMap[i];
+                label pointi = allSegmentMap[i];
 
-                if (!info[pointI].hit())
+                if (!info[pointi].hit())
                 {
                     // No intersection yet so take this one
-                    info[pointI] = allInfo[i];
+                    info[pointi] = allInfo[i];
                 }
                 else
                 {
                     // Nearest intersection
                     if
                     (
-                        magSqr(allInfo[i].hitPoint()-samples[pointI])
-                      < magSqr(info[pointI].hitPoint()-samples[pointI])
+                        magSqr(allInfo[i].hitPoint()-samples[pointi])
+                      < magSqr(info[pointi].hitPoint()-samples[pointi])
                     )
                     {
-                        info[pointI] = allInfo[i];
+                        info[pointi] = allInfo[i];
                     }
                 }
             }
@@ -1755,26 +1755,26 @@ void Foam::distributedTriSurfaceMesh::findLineAll
     label compactI = 0;
 
     info.setSize(hitInfo.size());
-    forAll(hitInfo, pointI)
+    forAll(hitInfo, pointi)
     {
-        if (hitInfo[pointI].hit())
+        if (hitInfo[pointi].hit())
         {
-            info[pointI].setSize(1);
-            info[pointI][0] = hitInfo[pointI];
+            info[pointi].setSize(1);
+            info[pointi][0] = hitInfo[pointi];
 
-            point pt = hitInfo[pointI].hitPoint() + smallVec[pointI];
+            point pt = hitInfo[pointi].hitPoint() + smallVec[pointi];
 
-            if (((pt-start[pointI])&dirVec[pointI]) <= magSqrDirVec[pointI])
+            if (((pt-start[pointi])&dirVec[pointi]) <= magSqrDirVec[pointi])
             {
                 e0[compactI] = pt;
-                e1[compactI] = end[pointI];
-                pointMap[compactI] = pointI;
+                e1[compactI] = end[pointi];
+                pointMap[compactI] = pointi;
                 compactI++;
             }
         }
         else
         {
-            info[pointI].clear();
+            info[pointi].clear();
         }
     }
 
@@ -1799,19 +1799,19 @@ void Foam::distributedTriSurfaceMesh::findLineAll
         {
             if (hitInfo[i].hit())
             {
-                label pointI = pointMap[i];
+                label pointi = pointMap[i];
 
-                label sz = info[pointI].size();
-                info[pointI].setSize(sz+1);
-                info[pointI][sz] = hitInfo[i];
+                label sz = info[pointi].size();
+                info[pointi].setSize(sz+1);
+                info[pointi][sz] = hitInfo[i];
 
-                point pt = hitInfo[i].hitPoint() + smallVec[pointI];
+                point pt = hitInfo[i].hitPoint() + smallVec[pointi];
 
-                if (((pt-start[pointI])&dirVec[pointI]) <= magSqrDirVec[pointI])
+                if (((pt-start[pointi])&dirVec[pointi]) <= magSqrDirVec[pointi])
                 {
                     e0[compactI] = pt;
-                    e1[compactI] = end[pointI];
-                    pointMap[compactI] = pointI;
+                    e1[compactI] = end[pointi];
+                    pointMap[compactI] = pointi;
                     compactI++;
                 }
             }
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index 9fa58ecdb6..adc11f5635 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -248,9 +248,9 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
                 << abort(FatalError);
         }
 
-        forAll(pointProcAddressingI, pointI)
+        forAll(pointProcAddressingI, pointi)
         {
-            newPoints[pointProcAddressingI[pointI]] = procPoints[pointI];
+            newPoints[pointProcAddressingI[pointi]] = procPoints[pointi];
         }
     }
 
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.C b/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.C
index 0386cf5705..990b24ba9a 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.C
+++ b/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.C
@@ -120,7 +120,7 @@ bool Foam::findCellParticle::hitPatch
 (
     const polyPatch&,
     trackingData& td,
-    const label patchI,
+    const label patchi,
     const scalar trackFraction,
     const tetIndices& tetIs
 )
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H b/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H
index edd69fadf0..80d3a5bf6a 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H
+++ b/src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H
@@ -183,7 +183,7 @@ public:
             (
                 const polyPatch&,
                 trackingData& td,
-                const label patchI,
+                const label patchi,
                 const scalar trackFraction,
                 const tetIndices& tetIs
             );
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index dda36dd685..6fba3c22ab 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -324,7 +324,7 @@ bool Foam::streamLineParticle::hitPatch
 (
     const polyPatch&,
     trackingData& td,
-    const label patchI,
+    const label patchi,
     const scalar trackFraction,
     const tetIndices& tetIs
 )
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
index cd9b1bf420..8ecde3fad4 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
@@ -224,7 +224,7 @@ public:
             (
                 const polyPatch&,
                 trackingData& td,
-                const label patchI,
+                const label patchi,
                 const scalar trackFraction,
                 const tetIndices& tetIs
             );
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
index e3766f2e0b..ccfbe856b4 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
@@ -150,7 +150,7 @@ protected:
         (
             const polyPatch&,
             TrackData& td,
-            const label patchI,
+            const label patchi,
             const scalar trackFraction,
             const tetIndices& tetIs
         );
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 733b77def8..0e23bcc86a 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -76,24 +76,24 @@ void Foam::functionObjects::forceCoeffs::writeFileHeader(const label i)
 
         vectorField binPoints(nBin_);
         writeCommented(file(i), "x co-ords  :");
-        forAll(binPoints, pointI)
+        forAll(binPoints, pointi)
         {
-            binPoints[pointI] = (binMin_ + (pointI + 1)*binDx_)*binDir_;
-            file(i) << tab << binPoints[pointI].x();
+            binPoints[pointi] = (binMin_ + (pointi + 1)*binDx_)*binDir_;
+            file(i) << tab << binPoints[pointi].x();
         }
         file(i) << nl;
 
         writeCommented(file(i), "y co-ords  :");
-        forAll(binPoints, pointI)
+        forAll(binPoints, pointi)
         {
-            file(i) << tab << binPoints[pointI].y();
+            file(i) << tab << binPoints[pointi].y();
         }
         file(i) << nl;
 
         writeCommented(file(i), "z co-ords  :");
-        forAll(binPoints, pointI)
+        forAll(binPoints, pointi)
         {
-            file(i) << tab << binPoints[pointI].z();
+            file(i) << tab << binPoints[pointi].z();
         }
         file(i) << nl;
 
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index b0fe879e93..4095d509f4 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -104,24 +104,24 @@ void Foam::functionObjects::forces::writeFileHeader(const label i)
 
         vectorField binPoints(nBin_);
         writeCommented(file(i), "x co-ords  :");
-        forAll(binPoints, pointI)
+        forAll(binPoints, pointi)
         {
-            binPoints[pointI] = (binMin_ + (pointI + 1)*binDx_)*binDir_;
-            file(i) << tab << binPoints[pointI].x();
+            binPoints[pointi] = (binMin_ + (pointi + 1)*binDx_)*binDir_;
+            file(i) << tab << binPoints[pointi].x();
         }
         file(i) << nl;
 
         writeCommented(file(i), "y co-ords  :");
-        forAll(binPoints, pointI)
+        forAll(binPoints, pointi)
         {
-            file(i) << tab << binPoints[pointI].y();
+            file(i) << tab << binPoints[pointi].y();
         }
         file(i) << nl;
 
         writeCommented(file(i), "z co-ords  :");
-        forAll(binPoints, pointI)
+        forAll(binPoints, pointi)
         {
-            file(i) << tab << binPoints[pointI].z();
+            file(i) << tab << binPoints[pointi].z();
         }
         file(i) << nl;
 
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.C
index 3805da989c..2b1f968f68 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.C
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.C
@@ -129,7 +129,7 @@ pyrolysisModel::~pyrolysisModel()
 
 scalar pyrolysisModel::addMassSources
 (
-    const label patchI,
+    const label patchi,
     const label facei
 )
 {
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
index c23990a87e..92e495b0b5 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
@@ -212,7 +212,7 @@ public:
                 //- External hook to add mass to the primary region
                 virtual scalar addMassSources
                 (
-                    const label patchI,
+                    const label patchi,
                     const label facei
                 );
 
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
index 434fc94755..0826d6fc23 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
@@ -265,8 +265,8 @@ public:
             //- External hook to add mass to the primary region
             virtual scalar addMassSources
             (
-                const label patchI,            // patchI on primary region
-                const label facei              // facei of patchI
+                const label patchi,            // patchi on primary region
+                const label facei              // facei of patchi
             );
 
             //- Mean diffusion number of the solid region
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
index 66871bd8dc..e5152f43c4 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
@@ -227,7 +227,7 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::updateCoeffs()
     const mappedPatchBase& mpp =
         refCast<const mappedPatchBase>(patch().patch());
 
-    const label patchI = patch().index();
+    const label patchi = patch().index();
     const label nbrPatchi = mpp.samplePolyPatch().index();
     const polyMesh& mesh = patch().boundaryMesh().mesh();
     const polyMesh& nbrMesh = mpp.sampleMesh();
@@ -274,7 +274,7 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::updateCoeffs()
     label coupledPatchi = -1;
     if (pyrolysisRegionName_ == mesh.name())
     {
-        coupledPatchi = patchI;
+        coupledPatchi = patchi;
         if (QrName_ != "none")
         {
             Qr = nbrPatch.lookupPatchField<volScalarField, scalar>(QrName_);
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index fc3ab80322..5734f736f3 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
@@ -146,13 +146,13 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
 
     scalarField& Tp = *this;
 
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
     // Retrieve film model
     const filmModelType& filmModel =
         db().time().lookupObject<filmModelType>(filmRegionName_);
 
-    const label filmPatchi = filmModel.regionPatchID(patchI);
+    const label filmPatchi = filmModel.regionPatchID(patchi);
 
     scalarField alphaFilm = filmModel.alpha().boundaryField()[filmPatchi];
     filmModel.toPrimary(filmPatchi, alphaFilm);
@@ -164,7 +164,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
     const pyrModelType& pyrModel =
         db().time().lookupObject<pyrModelType>(pyrolysisRegionName_);
 
-    const label pyrPatchi = pyrModel.regionPatchID(patchI);
+    const label pyrPatchi = pyrModel.regionPatchID(patchi);
 
     scalarField TPyr = pyrModel.T().boundaryField()[pyrPatchi];
     pyrModel.toPrimary(pyrPatchi, TPyr);
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 985f3fbdcb..4f30cb3a30 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -146,13 +146,13 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
 
     vectorField& Up = *this;
 
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
     // Retrieve film model
     const filmModelType& filmModel =
         db().time().lookupObject<filmModelType>(filmRegionName_);
 
-    const label filmPatchi = filmModel.regionPatchID(patchI);
+    const label filmPatchi = filmModel.regionPatchID(patchi);
 
     scalarField alphaFilm = filmModel.alpha().boundaryField()[filmPatchi];
     filmModel.toPrimary(filmPatchi, alphaFilm);
@@ -164,7 +164,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
     const pyrModelType& pyrModel =
         db().time().lookupObject<pyrModelType>(pyrolysisRegionName_);
 
-    const label pyrPatchi = pyrModel.regionPatchID(patchI);
+    const label pyrPatchi = pyrModel.regionPatchID(patchi);
 
     scalarField phiPyr = pyrModel.phiGas().boundaryField()[pyrPatchi];
     pyrModel.toPrimary(pyrPatchi, phiPyr);
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H
index 7cdd2c83c6..d0cfcc65d3 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/regionModels/regionModel/regionModel/regionModel.H
@@ -228,11 +228,11 @@ public:
 
             // Addressing
 
-                //- Return true if patchI on the local region is a coupled
+                //- Return true if patchi on the local region is a coupled
                 //  patch to the primary region
                 inline bool isCoupledPatch(const label regionPatchi) const;
 
-                //- Return true if patchI on the primary region is a coupled
+                //- Return true if patchi on the primary region is a coupled
                 //  patch to the local region
                 inline bool isRegionPatch(const label primaryPatchi) const;
 
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
index 582b4bc32e..ef1676b79c 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
@@ -235,15 +235,15 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
                 vector localDelta = Zero;
                 forAll(f, pti)
                 {
-                    const label pointI = f[pti];
+                    const label pointi = f[pti];
 
                     if
                     (
-                        mag((nbrCf - (oldPoints[pointI] + newDelta)) & n)
+                        mag((nbrCf - (oldPoints[pointi] + newDelta)) & n)
                       > minDelta
                     )
                     {
-                        newPoints[pointI] = oldPoints[pointI] + newDelta;
+                        newPoints[pointi] = oldPoints[pointi] + newDelta;
                         localDelta = newDelta;
                         cellMoveMap[celli] = 1;
                     }
@@ -257,14 +257,14 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
             newDelta += (deltaV[celli]/mag(sf))*n;
             forAll(f, pti)
             {
-                const label pointI = f[pti];
+                const label pointi = f[pti];
                 if
                 (
-                    mag((nbrCf - (oldPoints[pointI] + newDelta)) & n)
+                    mag((nbrCf - (oldPoints[pointi] + newDelta)) & n)
                   > minDelta
                 )
                 {
-                    newPoints[pointI] = oldPoints[pointI] + newDelta;
+                    newPoints[pointi] = oldPoints[pointi] + newDelta;
                     cellMoveMap[celli] = 1;
                 }
             }
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
index 0b469fe561..8266374472 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
@@ -403,8 +403,8 @@ public:
             //- External hook to add sources to the film
             virtual void addSources
             (
-                const label patchI,            // patchI on primary region
-                const label facei,             // facei of patchI
+                const label patchi,            // patchi on primary region
+                const label facei,             // facei of patchi
                 const scalar massSource,       // [kg]
                 const vector& momentumSource,  // [kg.m/s] (tang'l momentum)
                 const scalar pressureSource,   // [kg.m/s] (normal momentum)
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
index afc316cd30..755e691456 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
@@ -102,7 +102,7 @@ public:
             //- External hook to add sources to the film
             virtual void addSources
             (
-                const label patchI,
+                const label patchi,
                 const label facei,
                 const scalar massSource,
                 const vector& momentumSource,
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
index 0a3a86d2c0..9e5198bcd4 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
@@ -148,7 +148,7 @@ public:
             //- External hook to add sources to the film
             virtual void addSources
             (
-                const label patchI,
+                const label patchi,
                 const label facei,
                 const scalar massSource,
                 const vector& momentumSource,
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index 33b3474ddd..8265c3400f 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -297,7 +297,7 @@ public:
                 inline tmp<scalarField> hs
                 (
                     const scalarField& T,
-                    const label patchI
+                    const label patchi
                 ) const;
 
                 //- Return sensible enthalpy as a function of temperature
@@ -318,8 +318,8 @@ public:
             //- External hook to add sources to the film
             virtual void addSources
             (
-                const label patchI,            // patchI on primary region
-                const label facei,             // facei of patchI
+                const label patchi,            // patchi on primary region
+                const label facei,             // facei of patchi
                 const scalar massSource,       // [kg]
                 const vector& momentumSource,  // [kg.m/s] (tangential momentum)
                 const scalar pressureSource,   // [kg.m/s] (normal momentum)
@@ -369,10 +369,10 @@ public:
         // Derived fields (calculated on-the-fly)
 
             //- Return the convective heat energy from film to wall
-            inline tmp<scalarField> Qconvw(const label patchI) const;
+            inline tmp<scalarField> Qconvw(const label patchi) const;
 
             //- Return the convective heat energy from primary region to film
-            inline tmp<scalarField> Qconvp(const label patchI) const;
+            inline tmp<scalarField> Qconvp(const label patchi) const;
 
 
         // Evolution
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
index eecbd4265b..c96cf9cf73 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,7 +180,7 @@ public:
                 (
                     const scalarField& p,
                     const scalarField& T,
-                    const label patchI
+                    const label patchi
                 ) const;
 
                 //- Return sensible enthalpy/internal energy
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffleI.H b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffleI.H
index afad57dea7..ca0e9ed8c7 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffleI.H
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,10 +42,10 @@ inline tmp<scalarField> thermalBaffle::he
 (
     const scalarField& p,
     const scalarField& T,
-    const label patchI
+    const label patchi
 ) const
 {
-    return thermo_->he(p, T, patchI);
+    return thermo_->he(p, T, patchi);
 }
 
 
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index 554403adf1..4580e126d0 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -403,14 +403,14 @@ void Foam::meshToMesh::distributeCells
                 face& f = subFaces[subFacei];
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
-                    if (reversePointMap[pointI] == -1)
+                    label pointi = f[fp];
+                    if (reversePointMap[pointi] == -1)
                     {
-                        reversePointMap[pointI] = subPoints.size();
-                        subPoints.append(tgtMesh.points()[pointI]);
+                        reversePointMap[pointi] = subPoints.size();
+                        subPoints.append(tgtMesh.points()[pointi]);
                     }
 
-                    f[fp] = reversePointMap[pointI];
+                    f[fp] = reversePointMap[pointi];
                 }
             }
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index e93bc9f94f..caaa6a8c8c 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -133,10 +133,10 @@ void Foam::isoSurface::syncUnseparatedPoints
 
                 pointField patchInfo(meshPts.size());
 
-                forAll(nbrPts, pointI)
+                forAll(nbrPts, pointi)
                 {
-                    label nbrPointI = nbrPts[pointI];
-                    patchInfo[nbrPointI] = pointValues[meshPts[pointI]];
+                    label nbrPointi = nbrPts[pointi];
+                    patchInfo[nbrPointi] = pointValues[meshPts[pointi]];
                 }
 
                 OPstream toNbr(Pstream::blocking, pp.neighbProcNo());
@@ -168,13 +168,13 @@ void Foam::isoSurface::syncUnseparatedPoints
 
                 const labelList& meshPts = pp.meshPoints();
 
-                forAll(meshPts, pointI)
+                forAll(meshPts, pointi)
                 {
-                    label meshPointI = meshPts[pointI];
+                    label meshPointi = meshPts[pointi];
                     minEqOp<point>()
                     (
-                        pointValues[meshPointI],
-                        nbrPatchInfo[pointI]
+                        pointValues[meshPointi],
+                        nbrPatchInfo[pointi]
                     );
                 }
             }
@@ -231,9 +231,9 @@ void Foam::isoSurface::syncUnseparatedPoints
 
         forAll(pd.sharedPointLabels(), i)
         {
-            label meshPointI = pd.sharedPointLabels()[i];
+            label meshPointi = pd.sharedPointLabels()[i];
             // Fill my entries in the shared points
-            sharedPts[pd.sharedPointAddr()[i]] = pointValues[meshPointI];
+            sharedPts[pd.sharedPointAddr()[i]] = pointValues[meshPointi];
         }
 
         // Combine on master.
@@ -244,8 +244,8 @@ void Foam::isoSurface::syncUnseparatedPoints
         // my local information.
         forAll(pd.sharedPointLabels(), i)
         {
-            label meshPointI = pd.sharedPointLabels()[i];
-            pointValues[meshPointI] = sharedPts[pd.sharedPointAddr()[i]];
+            label meshPointi = pd.sharedPointLabels()[i];
+            pointValues[meshPointi] = sharedPts[pd.sharedPointAddr()[i]];
         }
     }
 }
@@ -589,9 +589,9 @@ void Foam::isoSurface::calcSnappedCc
                     snappedCc[celli] = snappedPoints.size();
                     snappedPoints.append(otherPointSum/nOther);
 
-                    //Pout<< "    point:" << pointI
-                    //    << " replacing coord:" << mesh_.points()[pointI]
-                    //    << " by average:" << collapsedPoint[pointI] << endl;
+                    //Pout<< "    point:" << pointi
+                    //    << " replacing coord:" << mesh_.points()[pointi]
+                    //    << " by average:" << collapsedPoint[pointi] << endl;
                 }
             }
             else if (localTriPoints.size() == 3)
@@ -602,9 +602,9 @@ void Foam::isoSurface::calcSnappedCc
                 snappedCc[celli] = snappedPoints.size();
                 snappedPoints.append(sum(points)/points.size());
 
-                //Pout<< "    point:" << pointI
-                //    << " replacing coord:" << mesh_.points()[pointI]
-                //    << " by average:" << collapsedPoint[pointI] << endl;
+                //Pout<< "    point:" << pointi
+                //    << " replacing coord:" << mesh_.points()[pointi]
+                //    << " by average:" << collapsedPoint[pointi] << endl;
             }
             else
             {
@@ -635,9 +635,9 @@ void Foam::isoSurface::calcSnappedCc
                 {
                     snappedCc[celli] = snappedPoints.size();
                     snappedPoints.append(calcCentre(surf));
-                    //Pout<< "    point:" << pointI << " nZones:" << nZones
-                    //    << " replacing coord:" << mesh_.points()[pointI]
-                    //    << " by average:" << collapsedPoint[pointI] << endl;
+                    //Pout<< "    point:" << pointi << " nZones:" << nZones
+                    //    << " replacing coord:" << mesh_.points()[pointi]
+                    //    << " by average:" << collapsedPoint[pointi] << endl;
                 }
             }
         }
@@ -666,14 +666,14 @@ void Foam::isoSurface::calcSnappedPoint
     // Work arrays
     DynamicList<point, 64> localTriPoints(100);
 
-    forAll(mesh_.pointFaces(), pointI)
+    forAll(mesh_.pointFaces(), pointi)
     {
-        if (isBoundaryPoint.get(pointI) == 1)
+        if (isBoundaryPoint.get(pointi) == 1)
         {
             continue;
         }
 
-        const labelList& pFaces = mesh_.pointFaces()[pointI];
+        const labelList& pFaces = mesh_.pointFaces()[pointi];
 
         bool anyCut = false;
 
@@ -725,20 +725,20 @@ void Foam::isoSurface::calcSnappedPoint
             FixedList<scalar, 4> s;
             FixedList<point, 4> pt;
 
-            label fp = findIndex(f, pointI);
-            s[0] = isoFraction(pVals[pointI], cVals[own]);
-            pt[0] = (1.0-s[0])*pts[pointI] + s[0]*cc[own];
+            label fp = findIndex(f, pointi);
+            s[0] = isoFraction(pVals[pointi], cVals[own]);
+            pt[0] = (1.0-s[0])*pts[pointi] + s[0]*cc[own];
 
-            s[1] = isoFraction(pVals[pointI], nbrValue);
-            pt[1] = (1.0-s[1])*pts[pointI] + s[1]*nbrPoint;
+            s[1] = isoFraction(pVals[pointi], nbrValue);
+            pt[1] = (1.0-s[1])*pts[pointi] + s[1]*nbrPoint;
 
-            label nextPointI = f[f.fcIndex(fp)];
-            s[2] = isoFraction(pVals[pointI], pVals[nextPointI]);
-            pt[2] = (1.0-s[2])*pts[pointI] + s[2]*pts[nextPointI];
+            label nextPointi = f[f.fcIndex(fp)];
+            s[2] = isoFraction(pVals[pointi], pVals[nextPointi]);
+            pt[2] = (1.0-s[2])*pts[pointi] + s[2]*pts[nextPointi];
 
-            label prevPointI = f[f.rcIndex(fp)];
-            s[3] = isoFraction(pVals[pointI], pVals[prevPointI]);
-            pt[3] = (1.0-s[3])*pts[pointI] + s[3]*pts[prevPointI];
+            label prevPointi = f[f.rcIndex(fp)];
+            s[3] = isoFraction(pVals[pointi], pVals[prevPointi]);
+            pt[3] = (1.0-s[3])*pts[pointi] + s[3]*pts[prevPointi];
 
             if
             (
@@ -780,7 +780,7 @@ void Foam::isoSurface::calcSnappedPoint
             // points.
             if (nOther > 0)
             {
-                collapsedPoint[pointI] = otherPointSum/nOther;
+                collapsedPoint[pointi] = otherPointSum/nOther;
             }
         }
         else if (localTriPoints.size() == 3)
@@ -788,7 +788,7 @@ void Foam::isoSurface::calcSnappedPoint
             // Single triangle. No need for any analysis. Average points.
             pointField points;
             points.transfer(localTriPoints);
-            collapsedPoint[pointI] = sum(points)/points.size();
+            collapsedPoint[pointi] = sum(points)/points.size();
         }
         else
         {
@@ -817,7 +817,7 @@ void Foam::isoSurface::calcSnappedPoint
 
             if (nZones == 1)
             {
-                collapsedPoint[pointI] = calcCentre(surf);
+                collapsedPoint[pointi] = calcCentre(surf);
             }
         }
     }
@@ -830,12 +830,12 @@ void Foam::isoSurface::calcSnappedPoint
     snappedPoint.setSize(mesh_.nPoints());
     snappedPoint = -1;
 
-    forAll(collapsedPoint, pointI)
+    forAll(collapsedPoint, pointi)
     {
-        if (collapsedPoint[pointI] != point::max)
+        if (collapsedPoint[pointi] != point::max)
         {
-            snappedPoint[pointI] = snappedPoints.size();
-            snappedPoints.append(collapsedPoint[pointI]);
+            snappedPoint[pointi] = snappedPoints.size();
+            snappedPoints.append(collapsedPoint[pointi]);
         }
     }
 }
@@ -897,19 +897,19 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
     List<labelledTri> tris;
     {
         DynamicList<labelledTri> dynTris(nTris);
-        label rawPointI = 0;
+        label rawPointi = 0;
         DynamicList<label> newToOldTri(nTris);
 
         for (label oldTriI = 0; oldTriI < nTris; oldTriI++)
         {
             labelledTri tri
             (
-                triPointReverseMap[rawPointI],
-                triPointReverseMap[rawPointI+1],
-                triPointReverseMap[rawPointI+2],
+                triPointReverseMap[rawPointi],
+                triPointReverseMap[rawPointi+1],
+                triPointReverseMap[rawPointi+2],
                 0
             );
-            rawPointI += 3;
+            rawPointi += 3;
 
             if ((tri[0] != tri[1]) && (tri[0] != tri[2]) && (tri[1] != tri[2]))
             {
@@ -1112,7 +1112,7 @@ Foam::triSurface Foam::isoSurface::subsetMesh
     oldToNewPoints.setSize(s.points().size());
     oldToNewPoints = -1;
     {
-        label pointI = 0;
+        label pointi = 0;
 
         forAll(include, oldFacei)
         {
@@ -1123,17 +1123,17 @@ Foam::triSurface Foam::isoSurface::subsetMesh
 
                 forAll(tri, fp)
                 {
-                    label oldPointI = tri[fp];
+                    label oldPointi = tri[fp];
 
-                    if (oldToNewPoints[oldPointI] == -1)
+                    if (oldToNewPoints[oldPointi] == -1)
                     {
-                        oldToNewPoints[oldPointI] = pointI;
-                        newToOldPoints[pointI++] = oldPointI;
+                        oldToNewPoints[oldPointi] = pointi;
+                        newToOldPoints[pointi++] = oldPointi;
                     }
                 }
             }
         }
-        newToOldPoints.setSize(pointI);
+        newToOldPoints.setSize(pointi);
     }
 
     // Extract points
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index c5393411d7..c477f9fc45 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -395,15 +395,15 @@ void Foam::isoSurfaceCell::calcSnappedCc
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
+                    label pointi = f[fp];
 
-                    scalar s = isoFraction(cVal, pVals[pointI]);
+                    scalar s = isoFraction(cVal, pVals[pointi]);
 
                     if (s >= 0.0 && s <= 0.5)
                     {
-                        if (pointToLocal.insert(pointI, localPoints.size()))
+                        if (pointToLocal.insert(pointi, localPoints.size()))
                         {
-                            localPoints.append((1.0-s)*cc[celli]+s*pts[pointI]);
+                            localPoints.append((1.0-s)*cc[celli]+s*pts[pointi]);
                         }
                     }
                 }
@@ -531,7 +531,7 @@ void Foam::isoSurfaceCell::genPointTris
 (
     const scalarField& cellValues,
     const scalarField& pointValues,
-    const label pointI,
+    const label pointi,
     const label facei,
     const label celli,
     DynamicList<point, 64>& localTriPoints
@@ -548,7 +548,7 @@ void Foam::isoSurfaceCell::genPointTris
         label nextFp = f.fcIndex(fp);
         triFace tri(f[fp0], f[fp], f[nextFp]);
 
-        label index = findIndex(tri, pointI);
+        label index = findIndex(tri, pointi);
 
         if (index == -1)
         {
@@ -561,9 +561,9 @@ void Foam::isoSurfaceCell::genPointTris
 
         // Get fractions for the three edges emanating from point
         FixedList<scalar, 3> s(3);
-        s[0] = isoFraction(pointValues[pointI], pointValues[b]);
-        s[1] = isoFraction(pointValues[pointI], pointValues[c]);
-        s[2] = isoFraction(pointValues[pointI], cellValues[celli]);
+        s[0] = isoFraction(pointValues[pointi], pointValues[b]);
+        s[1] = isoFraction(pointValues[pointi], pointValues[c]);
+        s[2] = isoFraction(pointValues[pointi], cellValues[celli]);
 
         if
         (
@@ -572,14 +572,14 @@ void Foam::isoSurfaceCell::genPointTris
          && (s[2] >= 0.0 && s[2] <= 0.5)
         )
         {
-            point p0 = (1.0-s[0])*pts[pointI] + s[0]*pts[b];
-            point p1 = (1.0-s[1])*pts[pointI] + s[1]*pts[c];
-            point p2 = (1.0-s[2])*pts[pointI] + s[2]*cc[celli];
+            point p0 = (1.0-s[0])*pts[pointi] + s[0]*pts[b];
+            point p1 = (1.0-s[1])*pts[pointi] + s[1]*pts[c];
+            point p2 = (1.0-s[2])*pts[pointi] + s[2]*cc[celli];
 
             if
             (
                 (mesh_.faceOwner()[facei] == celli)
-             == (pointValues[pointI] > cellValues[celli])
+             == (pointValues[pointi] > cellValues[celli])
             )
             {
                 localTriPoints.append(p0);
@@ -602,7 +602,7 @@ void Foam::isoSurfaceCell::genPointTris
 void Foam::isoSurfaceCell::genPointTris
 (
     const scalarField& pointValues,
-    const label pointI,
+    const label pointi,
     const label facei,
     const label celli,
     DynamicList<point, 64>& localTriPoints
@@ -618,7 +618,7 @@ void Foam::isoSurfaceCell::genPointTris
     const face& f = mesh_.faces()[facei];
 
     // Find 4th point
-    label ccPointI = -1;
+    label ccPointi = -1;
     forAll(cFaces, cFacei)
     {
         const face& f1 = mesh_.faces()[cFaces[cFacei]];
@@ -628,11 +628,11 @@ void Foam::isoSurfaceCell::genPointTris
 
             if (findIndex(f, p1) == -1)
             {
-                ccPointI = p1;
+                ccPointi = p1;
                 break;
             }
         }
-        if (ccPointI != -1)
+        if (ccPointi != -1)
         {
             break;
         }
@@ -640,18 +640,18 @@ void Foam::isoSurfaceCell::genPointTris
 
 
     // Tet between index..index-1, index..index+1, index..cc
-    label index = findIndex(f, pointI);
+    label index = findIndex(f, pointi);
     label b = f[f.fcIndex(index)];
     label c = f[f.rcIndex(index)];
 
-    //Pout<< " p0:" << pointI << " b:" << b << " c:" << c
-    //<< " d:" << ccPointI << endl;
+    //Pout<< " p0:" << pointi << " b:" << b << " c:" << c
+    //<< " d:" << ccPointi << endl;
 
     // Get fractions for the three edges emanating from point
     FixedList<scalar, 3> s(3);
-    s[0] = isoFraction(pointValues[pointI], pointValues[b]);
-    s[1] = isoFraction(pointValues[pointI], pointValues[c]);
-    s[2] = isoFraction(pointValues[pointI], pointValues[ccPointI]);
+    s[0] = isoFraction(pointValues[pointi], pointValues[b]);
+    s[1] = isoFraction(pointValues[pointi], pointValues[c]);
+    s[2] = isoFraction(pointValues[pointi], pointValues[ccPointi]);
 
     if
     (
@@ -660,9 +660,9 @@ void Foam::isoSurfaceCell::genPointTris
      && (s[2] >= 0.0 && s[2] <= 0.5)
     )
     {
-        point p0 = (1.0-s[0])*pts[pointI] + s[0]*pts[b];
-        point p1 = (1.0-s[1])*pts[pointI] + s[1]*pts[c];
-        point p2 = (1.0-s[2])*pts[pointI] + s[2]*pts[ccPointI];
+        point p0 = (1.0-s[0])*pts[pointi] + s[0]*pts[b];
+        point p1 = (1.0-s[1])*pts[pointi] + s[1]*pts[c];
+        point p2 = (1.0-s[2])*pts[pointi] + s[2]*pts[ccPointi];
 
         if (mesh_.faceOwner()[facei] != celli)
         {
@@ -723,14 +723,14 @@ void Foam::isoSurfaceCell::calcSnappedPoint
     DynamicList<point, 64> localTriPoints(100);
     labelHashSet localPointCells(100);
 
-    forAll(mesh_.pointFaces(), pointI)
+    forAll(mesh_.pointFaces(), pointi)
     {
-        if (isBoundaryPoint.get(pointI) == 1)
+        if (isBoundaryPoint.get(pointi) == 1)
         {
             continue;
         }
 
-        const labelList& pFaces = mesh_.pointFaces()[pointI];
+        const labelList& pFaces = mesh_.pointFaces()[pointi];
 
         bool anyCut = false;
 
@@ -774,7 +774,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
                 // we only generate a triangle once per point.
                 if (localPointCells.insert(own))
                 {
-                    genPointTris(pVals, pointI, facei, own, localTriPoints);
+                    genPointTris(pVals, pointi, facei, own, localTriPoints);
                 }
             }
             else
@@ -783,7 +783,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
                 (
                     cVals,
                     pVals,
-                    pointI,
+                    pointi,
                     facei,
                     own,
                     localTriPoints
@@ -798,7 +798,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
                 {
                     if (localPointCells.insert(nei))
                     {
-                        genPointTris(pVals, pointI, facei, nei, localTriPoints);
+                        genPointTris(pVals, pointi, facei, nei, localTriPoints);
                     }
                 }
                 else
@@ -807,7 +807,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
                     (
                         cVals,
                         pVals,
-                        pointI,
+                        pointi,
                         facei,
                         nei,
                         localTriPoints
@@ -821,11 +821,11 @@ void Foam::isoSurfaceCell::calcSnappedPoint
             // Single triangle. No need for any analysis. Average points.
             pointField points;
             points.transfer(localTriPoints);
-            collapsedPoint[pointI] = sum(points)/points.size();
+            collapsedPoint[pointi] = sum(points)/points.size();
 
-            //Pout<< "    point:" << pointI
-            //    << " replacing coord:" << mesh_.points()[pointI]
-            //    << " by average:" << collapsedPoint[pointI] << endl;
+            //Pout<< "    point:" << pointi
+            //    << " replacing coord:" << mesh_.points()[pointi]
+            //    << " by average:" << collapsedPoint[pointi] << endl;
         }
         else if (localTriPoints.size())
         {
@@ -868,7 +868,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
                 }
                 if (minCos > 0)
                 {
-                    collapsedPoint[pointI] = calcCentre(surf);
+                    collapsedPoint[pointi] = calcCentre(surf);
                 }
             }
         }
@@ -885,14 +885,14 @@ void Foam::isoSurfaceCell::calcSnappedPoint
     snappedPoint.setSize(mesh_.nPoints());
     snappedPoint = -1;
 
-    forAll(collapsedPoint, pointI)
+    forAll(collapsedPoint, pointi)
     {
         // Cannot do == comparison since might be transformed so have
         // truncation errors.
-        if (magSqr(collapsedPoint[pointI]) < 0.5*magSqr(greatPoint))
+        if (magSqr(collapsedPoint[pointi]) < 0.5*magSqr(greatPoint))
         {
-            snappedPoint[pointI] = snappedPoints.size();
-            snappedPoints.append(collapsedPoint[pointI]);
+            snappedPoint[pointi] = snappedPoints.size();
+            snappedPoints.append(collapsedPoint[pointi]);
         }
     }
 }
@@ -957,16 +957,16 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
     List<labelledTri> tris;
     {
         DynamicList<labelledTri> dynTris(nTris);
-        label rawPointI = 0;
+        label rawPointi = 0;
         DynamicList<label> newToOldTri(nTris);
 
         for (label oldTriI = 0; oldTriI < nTris; oldTriI++)
         {
             labelledTri tri
             (
-                triPointReverseMap[rawPointI],
-                triPointReverseMap[rawPointI+1],
-                triPointReverseMap[rawPointI+2],
+                triPointReverseMap[rawPointi],
+                triPointReverseMap[rawPointi+1],
+                triPointReverseMap[rawPointi+2],
                 0
             );
             if ((tri[0] != tri[1]) && (tri[0] != tri[2]) && (tri[1] != tri[2]))
@@ -975,7 +975,7 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
                 dynTris.append(tri);
             }
 
-            rawPointI += 3;
+            rawPointi += 3;
         }
 
         triMap.transfer(newToOldTri);
@@ -1311,7 +1311,7 @@ Foam::triSurface Foam::isoSurfaceCell::subsetMesh
     oldToNewPoints.setSize(s.points().size());
     oldToNewPoints = -1;
     {
-        label pointI = 0;
+        label pointi = 0;
 
         forAll(include, oldFacei)
         {
@@ -1322,17 +1322,17 @@ Foam::triSurface Foam::isoSurfaceCell::subsetMesh
 
                 forAll(f, fp)
                 {
-                    label oldPointI = f[fp];
+                    label oldPointi = f[fp];
 
-                    if (oldToNewPoints[oldPointI] == -1)
+                    if (oldToNewPoints[oldPointi] == -1)
                     {
-                        oldToNewPoints[oldPointI] = pointI;
-                        newToOldPoints[pointI++] = oldPointI;
+                        oldToNewPoints[oldPointi] = pointi;
+                        newToOldPoints[pointi++] = oldPointi;
                     }
                 }
             }
         }
-        newToOldPoints.setSize(pointI);
+        newToOldPoints.setSize(pointi);
     }
 
     // Extract points
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index f871542ce5..0a46bcf770 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -169,22 +169,22 @@ class isoSurfaceCell
             labelList& snappedCc
         ) const;
 
-        //- Generate triangles for face connected to pointI
+        //- Generate triangles for face connected to pointi
         void genPointTris
         (
             const scalarField& cellValues,
             const scalarField& pointValues,
-            const label pointI,
+            const label pointi,
             const label facei,
             const label celli,
             DynamicList<point, 64>& localTriPoints
         ) const;
 
-        //- Generate triangles for tet connected to pointI
+        //- Generate triangles for tet connected to pointi
         void genPointTris
         (
             const scalarField& pointValues,
-            const label pointI,
+            const label pointi,
             const label facei,
             const label celli,
             DynamicList<point, 64>& localTriPoints
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index be9ee1eddc..9ab7c9619e 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -460,26 +460,26 @@ Foam::label Foam::isoSurface::generateFaceTriPoints
 
     forAll(f, fp)
     {
-        label pointI = f[fp];
-        label nextPointI = f[f.fcIndex(fp)];
+        label pointi = f[fp];
+        label nextPointi = f[f.fcIndex(fp)];
 
         generateTriPoints
         (
-            pVals[pointI],
-            pCoords[pointI],
-            snappedPoint[pointI] != -1,
+            pVals[pointi],
+            pCoords[pointi],
+            snappedPoint[pointi] != -1,
             (
-                snappedPoint[pointI] != -1
-              ? snappedPoints[snappedPoint[pointI]]
+                snappedPoint[pointi] != -1
+              ? snappedPoints[snappedPoint[pointi]]
               : Type(Zero)
             ),
 
-            pVals[nextPointI],
-            pCoords[nextPointI],
-            snappedPoint[nextPointI] != -1,
+            pVals[nextPointi],
+            pCoords[nextPointi],
+            snappedPoint[nextPointi] != -1,
             (
-                snappedPoint[nextPointI] != -1
-              ? snappedPoints[snappedPoint[nextPointI]]
+                snappedPoint[nextPointi] != -1
+              ? snappedPoints[snappedPoint[nextPointi]]
               : Type(Zero)
             ),
 
@@ -748,12 +748,12 @@ Foam::isoSurface::interpolate
 
     forAll(unmergedValues, i)
     {
-        label mergedPointI = triPointMergeMap[i];
+        label mergedPointi = triPointMergeMap[i];
 
-        if (mergedPointI >= 0)
+        if (mergedPointi >= 0)
         {
-            values[mergedPointI] += unmergedValues[i];
-            nValues[mergedPointI]++;
+            values[mergedPointi] += unmergedValues[i];
+            nValues[mergedPointi]++;
         }
     }
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
index 46663e2306..8e31ea4fac 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
@@ -124,15 +124,15 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
         scalarField cellAvg(fvm.nCells(), scalar(0.0));
         labelField nPointCells(fvm.nCells(), 0);
         {
-            for (label pointI = 0; pointI < fvm.nPoints(); pointI++)
+            for (label pointi = 0; pointi < fvm.nPoints(); pointi++)
             {
-                const labelList& pCells = fvm.pointCells(pointI);
+                const labelList& pCells = fvm.pointCells(pointi);
 
                 forAll(pCells, i)
                 {
                     label celli = pCells[i];
 
-                    cellAvg[celli] += pointFld().primitiveField()[pointI];
+                    cellAvg[celli] += pointFld().primitiveField()[pointi];
                     nPointCells[celli]++;
                 }
             }
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
index 12a17abc49..13a7fde3cf 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
@@ -67,16 +67,16 @@ Foam::sampledIsoSurfaceCell::interpolateField
 
         forAll(f, faceVertI)
         {
-            label pointI = f[faceVertI];
+            label pointi = f[faceVertI];
 
-            if (!pointDone[pointI])
+            if (!pointDone[pointi])
             {
-                values[pointI] = interpolator.interpolate
+                values[pointi] = interpolator.interpolate
                 (
-                    points()[pointI],
+                    points()[pointi],
                     meshCells_[cutFacei]
                 );
-                pointDone[pointI] = true;
+                pointDone[pointi] = true;
             }
         }
     }
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
index a2c0166858..7265c5ea14 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
@@ -93,20 +93,20 @@ Foam::sampledPatch::interpolateField
 
         forAll(f, faceVertI)
         {
-            label pointI = f[faceVertI];
+            label pointi = f[faceVertI];
 
-            if (!pointDone[pointI])
+            if (!pointDone[pointi])
             {
                 label facei = patchFacei + pp.start();
                 label celli = own[facei];
 
-                values[pointI] = interpolator.interpolate
+                values[pointi] = interpolator.interpolate
                 (
-                    points()[pointI],
+                    points()[pointi],
                     celli,
                     facei
                 );
-                pointDone[pointI] = true;
+                pointDone[pointi] = true;
             }
         }
     }
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
index 53518039fd..f3ff590c1b 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
@@ -57,16 +57,16 @@ Foam::sampledPlane::interpolateField
 
         forAll(f, faceVertI)
         {
-            label pointI = f[faceVertI];
+            label pointi = f[faceVertI];
 
-            if (!pointDone[pointI])
+            if (!pointDone[pointi])
             {
-                values[pointI] = interpolator.interpolate
+                values[pointi] = interpolator.interpolate
                 (
-                    points()[pointI],
+                    points()[pointi],
                     meshCells()[cutFacei]
                 );
-                pointDone[pointI] = true;
+                pointDone[pointi] = true;
             }
         }
     }
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index 71aeb1f457..1759583596 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -181,15 +181,15 @@ Foam::sampledSurface::pointAverage
 
     labelField nPointCells(mesh.nCells(), 0);
     {
-        for (label pointI = 0; pointI < mesh.nPoints(); pointI++)
+        for (label pointi = 0; pointi < mesh.nPoints(); pointi++)
         {
-            const labelList& pCells = mesh.pointCells(pointI);
+            const labelList& pCells = mesh.pointCells(pointi);
 
             forAll(pCells, i)
             {
                 label celli = pCells[i];
 
-                cellAvg[celli] += pfld[pointI];
+                cellAvg[celli] += pfld[pointi];
                 nPointCells[celli]++;
             }
         }
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index 7187624c99..475c08349c 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -271,7 +271,7 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
     labelList reversePointMap(s.points().size(), -1);
 
     {
-        label newPointI = 0;
+        label newPointi = 0;
         label newFacei = 0;
 
         forAll(s, facei)
@@ -285,14 +285,14 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
                 {
                     if (reversePointMap[f[fp]] == -1)
                     {
-                        pointMap[newPointI] = f[fp];
-                        reversePointMap[f[fp]] = newPointI++;
+                        pointMap[newPointi] = f[fp];
+                        reversePointMap[f[fp]] = newPointi++;
                     }
                 }
             }
         }
         faceMap.setSize(newFacei);
-        pointMap.setSize(newPointI);
+        pointMap.setSize(newPointi);
     }
 
 
@@ -345,11 +345,11 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
             // samplePoints_   : per surface point a location inside the cell
             // sampleElements_ : per surface point the cell
 
-            forAll(points(), pointI)
+            forAll(points(), pointi)
             {
-                const point& pt = points()[pointI];
-                label celli = cellOrFaceLabels[pointToFace[pointI]];
-                sampleElements_[pointI] = celli;
+                const point& pt = points()[pointi];
+                label celli = cellOrFaceLabels[pointToFace[pointi]];
+                sampleElements_[pointi] = celli;
 
                 // Check if point inside cell
                 if
@@ -357,12 +357,12 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
                     mesh().pointInCell
                     (
                         pt,
-                        sampleElements_[pointI],
+                        sampleElements_[pointi],
                         meshSearcher.decompMode()
                     )
                 )
                 {
-                    samplePoints_[pointI] = pt;
+                    samplePoints_[pointi] = pt;
                 }
                 else
                 {
@@ -378,7 +378,7 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
                         if (info.distance() < minDistSqr)
                         {
                             minDistSqr = info.distance();
-                            samplePoints_[pointI] = info.rawPoint();
+                            samplePoints_[pointi] = info.rawPoint();
                         }
                     }
                 }
@@ -389,12 +389,12 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
             // samplePoints_   : per surface point a location inside the cell
             // sampleElements_ : per surface point the cell
 
-            forAll(points(), pointI)
+            forAll(points(), pointi)
             {
-                const point& pt = points()[pointI];
-                label celli = cellOrFaceLabels[pointToFace[pointI]];
-                sampleElements_[pointI] = celli;
-                samplePoints_[pointI] = pt;
+                const point& pt = points()[pointi];
+                label celli = cellOrFaceLabels[pointToFace[pointi]];
+                sampleElements_[pointi] = celli;
+                samplePoints_[pointi] = pt;
             }
         }
         else
@@ -403,12 +403,12 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
             // sampleElements_ : per surface point the boundary face containing
             //                   the location
 
-            forAll(points(), pointI)
+            forAll(points(), pointi)
             {
-                const point& pt = points()[pointI];
-                label facei = cellOrFaceLabels[pointToFace[pointI]];
-                sampleElements_[pointI] = facei;
-                samplePoints_[pointI] =  mesh().faces()[facei].nearestPoint
+                const point& pt = points()[pointi];
+                label facei = cellOrFaceLabels[pointToFace[pointi]];
+                sampleElements_[pointi] = facei;
+                samplePoints_[pointi] =  mesh().faces()[facei].nearestPoint
                 (
                     pt,
                     mesh().points()
@@ -444,15 +444,15 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
         {
             if (sampleSource_ == cells || sampleSource_ == insideCells)
             {
-                forAll(samplePoints_, pointI)
+                forAll(samplePoints_, pointi)
                 {
-                    meshTools::writeOBJ(str, points()[pointI]);
+                    meshTools::writeOBJ(str, points()[pointi]);
                     vertI++;
 
-                    meshTools::writeOBJ(str, samplePoints_[pointI]);
+                    meshTools::writeOBJ(str, samplePoints_[pointi]);
                     vertI++;
 
-                    label celli = sampleElements_[pointI];
+                    label celli = sampleElements_[pointi];
                     meshTools::writeOBJ(str, mesh().cellCentres()[celli]);
                     vertI++;
                     str << "l " << vertI-2 << ' ' << vertI-1 << ' ' << vertI
@@ -461,15 +461,15 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
             }
             else
             {
-                forAll(samplePoints_, pointI)
+                forAll(samplePoints_, pointi)
                 {
-                    meshTools::writeOBJ(str, points()[pointI]);
+                    meshTools::writeOBJ(str, points()[pointi]);
                     vertI++;
 
-                    meshTools::writeOBJ(str, samplePoints_[pointI]);
+                    meshTools::writeOBJ(str, samplePoints_[pointi]);
                     vertI++;
 
-                    label facei = sampleElements_[pointI];
+                    label facei = sampleElements_[pointi];
                     meshTools::writeOBJ(str, mesh().faceCentres()[facei]);
                     vertI++;
                     str << "l " << vertI-2 << ' ' << vertI-1 << ' ' << vertI
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
index b12bd6b91f..880b7fd5b7 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
@@ -98,12 +98,12 @@ Foam::sampledTriSurfaceMesh::interpolateField
     {
         // Sample cells.
 
-        forAll(sampleElements_, pointI)
+        forAll(sampleElements_, pointi)
         {
-            values[pointI] = interpolator.interpolate
+            values[pointi] = interpolator.interpolate
             (
-                samplePoints_[pointI],
-                sampleElements_[pointI]
+                samplePoints_[pointi],
+                sampleElements_[pointi]
             );
         }
     }
@@ -111,13 +111,13 @@ Foam::sampledTriSurfaceMesh::interpolateField
     {
         // Sample boundary faces.
 
-        forAll(samplePoints_, pointI)
+        forAll(samplePoints_, pointi)
         {
-            label facei = sampleElements_[pointI];
+            label facei = sampleElements_[pointi];
 
-            values[pointI] = interpolator.interpolate
+            values[pointi] = interpolator.interpolate
             (
-                samplePoints_[pointI],
+                samplePoints_[pointi],
                 mesh().faceOwner()[facei],
                 facei
             );
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
index 0ea4750045..5058dcff4a 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
@@ -68,16 +68,16 @@ Foam::sampledThresholdCellFaces::interpolateField
 
         forAll(f, faceVertI)
         {
-            label pointI = f[faceVertI];
+            label pointi = f[faceVertI];
 
-            if (!pointDone[pointI])
+            if (!pointDone[pointi])
             {
-                values[pointI] = interpolator.interpolate
+                values[pointi] = interpolator.interpolate
                 (
-                    points()[pointI],
+                    points()[pointi],
                     meshCells_[cutFacei]
                 );
-                pointDone[pointI] = true;
+                pointDone[pointi] = true;
             }
         }
     }
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
index aee0758812..15251ccd66 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
@@ -245,11 +245,11 @@ void Foam::thresholdCellFaces::calculate
 
     pointField surfPoints(nPoints);
     nPoints = 0;
-    forAll(oldToNewPoints, pointI)
+    forAll(oldToNewPoints, pointi)
     {
-        if (oldToNewPoints[pointI] >= 0)
+        if (oldToNewPoints[pointi] >= 0)
         {
-            surfPoints[oldToNewPoints[pointI]] = origPoints[pointI];
+            surfPoints[oldToNewPoints[pointi]] = origPoints[pointi];
             nPoints++;
         }
     }
diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C
index 7b8c463b77..8d93f2e101 100644
--- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C
@@ -53,9 +53,9 @@ void Foam::dxSurfaceWriter::writeGeometry
         << "object 1 class array type float rank 1 shape 3 items "
         << points.size() << " data follows" << nl;
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
 
         os  << float(pt.x()) << ' ' << float(pt.y()) << ' ' << float(pt.z())
             << nl;
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
index b8d077b836..8a7cd7dc0e 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
@@ -87,7 +87,7 @@ void Foam::nastranSurfaceWriter::formatOS(OFstream& os) const
 void Foam::nastranSurfaceWriter::writeCoord
 (
     const point& p,
-    const label pointI,
+    const label pointi,
     OFstream& os
 ) const
 {
@@ -110,7 +110,7 @@ void Foam::nastranSurfaceWriter::writeCoord
             os  << setw(8) << "GRID";
             os.unsetf(ios_base::left);
             os.setf(ios_base::right);
-            os  << setw(8) << pointI + 1
+            os  << setw(8) << pointi + 1
                 << "        " 
                 << setw(8) << p.x()
                 << setw(8) << p.y()
@@ -126,7 +126,7 @@ void Foam::nastranSurfaceWriter::writeCoord
             os  << setw(8) << "GRID*";
             os.unsetf(ios_base::left);
             os.setf(ios_base::right);
-            os  << setw(16) << pointI + 1
+            os  << setw(16) << pointi + 1
                 << "                "
                 << setw(16) << p.x()
                 << setw(16) << p.y()
@@ -145,7 +145,7 @@ void Foam::nastranSurfaceWriter::writeCoord
         case wfFree:
         {
             os  << "GRID"
-                << ',' << pointI + 1
+                << ',' << pointi + 1
                 << ','
                 << ',' << p.x()
                 << ',' << p.y()
@@ -271,9 +271,9 @@ void Foam::nastranSurfaceWriter::writeGeometry
         << "$ Points" << nl
         << "$" << nl;
 
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        writeCoord(points[pointI], pointI, os);
+        writeCoord(points[pointi], pointi, os);
     }
 
 
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
index 5dfcf44e7a..ff215fa7fd 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
@@ -101,7 +101,7 @@ private:
         void writeCoord
         (
             const point& p,
-            const label pointI,
+            const label pointi,
             OFstream& os
         ) const;
 
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
index f14b7dd144..05668e18a6 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
@@ -46,10 +46,10 @@ inline void Foam::rawSurfaceWriter::writeLocation
 (
     Ostream& os,
     const pointField& points,
-    const label pointI
+    const label pointi
 )
 {
-    const point& pt = points[pointI];
+    const point& pt = points[pointi];
     os  << pt.x() << ' ' << pt.y() << ' ' << pt.z() << ' ';
 }
 
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
index af0f585086..b615142076 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
@@ -63,7 +63,7 @@ class rawSurfaceWriter
         (
             Ostream&,
             const pointField&,
-            const label pointI
+            const label pointi
         );
 
         static inline void writeLocation
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
index d1556576a8..5cacc1fd4a 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
@@ -56,9 +56,9 @@ void Foam::vtkSurfaceWriter::writeGeometry
 
     // Write vertex coords
     os  << "POINTS " << points.size() << " double" << nl;
-    forAll(points, pointI)
+    forAll(points, pointi)
     {
-        const point& pt = points[pointI];
+        const point& pt = points[pointi];
         os  << float(pt.x()) << ' '
             << float(pt.y()) << ' '
             << float(pt.z()) << nl;
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index fab8bb67fc..ce323f912e 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -673,7 +673,7 @@ bool Foam::MeshedSurface<Face>::checkFaces
 
     label newFacei = 0;
     // Detect badly labelled faces and mark degenerate faces
-    const label maxPointI = this->points().size() - 1;
+    const label maxPointi = this->points().size() - 1;
     forAll(faceLst, facei)
     {
         Face& f = faceLst[facei];
@@ -683,12 +683,12 @@ bool Foam::MeshedSurface<Face>::checkFaces
         {
             forAll(f, fp)
             {
-                if (f[fp] < 0 || f[fp] > maxPointI)
+                if (f[fp] < 0 || f[fp] > maxPointi)
                 {
                     FatalErrorInFunction
                         << "face " << f
                         << " uses point indices outside point range 0.."
-                    << maxPointI
+                    << maxPointi
                         << exit(FatalError);
                 }
             }
@@ -947,10 +947,10 @@ Foam::MeshedSurface<Face> Foam::MeshedSurface<Face>::subsetMesh
     // Create compact coordinate list and forward mapping array
     pointField newPoints(pointMap.size());
     labelList oldToNew(locPoints.size());
-    forAll(pointMap, pointI)
+    forAll(pointMap, pointi)
     {
-        newPoints[pointI] = locPoints[pointMap[pointI]];
-        oldToNew[pointMap[pointI]] = pointI;
+        newPoints[pointi] = locPoints[pointMap[pointi]];
+        oldToNew[pointMap[pointi]] = pointi;
     }
 
     // create/copy a new zones list, each zone with zero size
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 104b36be81..da340d49d5 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -543,10 +543,10 @@ Foam::UnsortedMeshedSurface<Face>::subsetMesh
     // Create compact coordinate list and forward mapping array
     pointField newPoints(pointMap.size());
     labelList  oldToNew(locPoints.size());
-    forAll(pointMap, pointI)
+    forAll(pointMap, pointi)
     {
-        newPoints[pointI] = locPoints[pointMap[pointI]];
-        oldToNew[pointMap[pointI]] = pointI;
+        newPoints[pointi] = locPoints[pointMap[pointi]];
+        oldToNew[pointMap[pointi]] = pointi;
     }
 
     // Renumber face node labels and compact
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
index 8fcd47e9fd..9d9f3c5f0b 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@@ -84,7 +84,7 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
     zoneIds.setSize(nElems);
 
     // Read points
-    forAll(pointLst, pointI)
+    forAll(pointLst, pointi)
     {
         scalar x, y, z;
         line = this->getLineNoComment(is);
@@ -94,7 +94,7 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
                 >> x >> y >> z;
         }
 
-        pointLst[pointI] = point(x, y, z);
+        pointLst[pointi] = point(x, y, z);
     }
 
     // Read edges (Foam indexing)
@@ -275,9 +275,9 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
 
 
     // Write vertex coords
-    forAll(pointLst, pointI)
+    forAll(pointLst, pointi)
     {
-        const point& pt = pointLst[pointI];
+        const point& pt = pointLst[pointi];
 
         os  << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
     }
@@ -378,11 +378,11 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
 
 
     // Write vertex coords
-    forAll(pointLst, pointI)
+    forAll(pointLst, pointi)
     {
-        os  << pointLst[pointI].x() << ' '
-            << pointLst[pointI].y() << ' '
-            << pointLst[pointI].z() << endl;
+        os  << pointLst[pointi].x() << ' '
+            << pointLst[pointi].y() << ' '
+            << pointLst[pointi].z() << endl;
     }
 
 
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index 1760d4c8b5..86e8220c6a 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -82,7 +82,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
 
     // Read points
     pointField pointLst(nPoints);
-    forAll(pointLst, pointI)
+    forAll(pointLst, pointi)
     {
         scalar x, y, z;
         line = this->getLineNoComment(is);
@@ -90,7 +90,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
             IStringStream lineStream(line);
             lineStream >> x >> y >> z;
         }
-        pointLst[pointI] = point(x, y, z);
+        pointLst[pointi] = point(x, y, z);
     }
 
     // Read faces - ignore optional zone information
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
index 588bcd1607..b8d866df73 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
@@ -109,7 +109,7 @@ public:
         // Per patch calculation
 
             //- Anisotropic thermal conductivity [W/m/K]
-            virtual tmp<vectorField> Kappa(const label patchI) const;
+            virtual tmp<vectorField> Kappa(const label patchi) const;
 };
 
 
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
index a2a5731162..2d4f1c2e15 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ public:
             //- Anisotropic thermal conductivity [W/m/K]
             virtual tmp<vectorField> Kappa
             (
-                const label patchI
+                const label patchi
             ) const = 0;
 
 
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index c5fa19aeb1..6f085b5cff 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -226,9 +226,9 @@ void Foam::mixerFvMesh::calcMovingMasks() const
             // Mark all the points as moving
             const face& curFace = f[curCell[facei]];
 
-            forAll(curFace, pointI)
+            forAll(curFace, pointi)
             {
-                movingPointsMask[curFace[pointI]] = 1;
+                movingPointsMask[curFace[pointi]] = 1;
             }
         }
     }
@@ -245,9 +245,9 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     {
         const face& curFace = f[innerSliderAddr[facei]];
 
-        forAll(curFace, pointI)
+        forAll(curFace, pointi)
         {
-            movingPointsMask[curFace[pointI]] = 1;
+            movingPointsMask[curFace[pointi]] = 1;
         }
     }
 
@@ -263,9 +263,9 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     {
         const face& curFace = f[outerSliderAddr[facei]];
 
-        forAll(curFace, pointI)
+        forAll(curFace, pointi)
         {
-            movingPointsMask[curFace[pointI]] = 0;
+            movingPointsMask[curFace[pointi]] = 0;
         }
     }
 }
diff --git a/src/triSurface/meshTriangulation/meshTriangulation.C b/src/triSurface/meshTriangulation/meshTriangulation.C
index ddcf0ec715..e0d8a753d0 100644
--- a/src/triSurface/meshTriangulation/meshTriangulation.C
+++ b/src/triSurface/meshTriangulation/meshTriangulation.C
@@ -223,9 +223,9 @@ Foam::meshTriangulation::meshTriangulation
     if (faceCentreDecomposition)
     {
         newPoints.setSize(mesh.nPoints() + faces.size());
-        forAll(mesh.points(), pointI)
+        forAll(mesh.points(), pointi)
         {
-            newPoints[pointI] = mesh.points()[pointI];
+            newPoints[pointi] = mesh.points()[pointi];
         }
         // Face centres
         forAll(faces, facei)
diff --git a/src/triSurface/triSurface/interfaces/DX/writeDX.C b/src/triSurface/triSurface/interfaces/DX/writeDX.C
index 1b91756c44..668a3a8acf 100644
--- a/src/triSurface/triSurface/interfaces/DX/writeDX.C
+++ b/src/triSurface/triSurface/interfaces/DX/writeDX.C
@@ -60,9 +60,9 @@ void triSurface::writeDXGeometry
     os  << "# The irregular positions" << endl
         << "object 1 class array type float rank 1 shape 3 items "
         << nPoints() << " data follows" << endl;
-    forAll(localPoints(), pointI)
+    forAll(localPoints(), pointi)
     {
-        const point& pt = localPoints()[pointI];
+        const point& pt = localPoints()[pointi];
         os  << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
     }
     os  << endl;
@@ -182,9 +182,9 @@ void triSurface::writeDX(const scalarField& field, Ostream& os) const
         // Positions dependent data
         os  << "object 3 class array type float rank 0 items " << field.size()
             << " data follows" << endl;
-        forAll(field, pointI)
+        forAll(field, pointi)
         {
-            os  << field[pointI] << endl;
+            os  << field[pointi] << endl;
         }
         os  << endl
             << "attribute \"dep\" string \"positions\"" << endl << endl;
@@ -227,11 +227,11 @@ void triSurface::writeDX(const vectorField& field, Ostream& os) const
         // Positions dependent data
         os  << "object 3 class array type float rank 1 shape 3 items "
             << field.size() << " data follows" << endl;
-        forAll(field, pointI)
+        forAll(field, pointi)
         {
-            os  << field[pointI].x() << ' '
-                << field[pointI].y() << ' '
-                << field[pointI].z() << endl;
+            os  << field[pointi].x() << ' '
+                << field[pointi].y() << ' '
+                << field[pointi].z() << endl;
         }
         os  << endl
             << "attribute \"dep\" string \"positions\"" << endl << endl;
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
index 3c4d2fdb66..2de0ac13aa 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -432,10 +432,10 @@ bool triSurface::readSTLASCII(const fileName& STLfileName)
 
     setSize(lexer.nTriangles());
     sp.setSize(nUniquePoints);
-    forAll(STLpoints, pointI)
+    forAll(STLpoints, pointi)
     {
-        const floatVector& pt = STLpoints[pointI];
-        sp[pointMap[pointI]] = vector
+        const floatVector& pt = STLpoints[pointi];
+        sp[pointMap[pointi]] = vector
         (
             scalar(pt.x()),
             scalar(pt.y()),
@@ -444,12 +444,12 @@ bool triSurface::readSTLASCII(const fileName& STLfileName)
     }
 
     // Assign triangles
-    label pointI = 0;
+    label pointi = 0;
     forAll(*this, i)
     {
-        operator[](i)[0] = pointMap[pointI++];
-        operator[](i)[1] = pointMap[pointI++];
-        operator[](i)[2] = pointMap[pointI++];
+        operator[](i)[0] = pointMap[pointi++];
+        operator[](i)[1] = pointMap[pointi++];
+        operator[](i)[2] = pointMap[pointi++];
         operator[](i).region() = STLlabels[i];
     }
 
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
index 5c860006c0..d44274b12c 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ bool Foam::triSurface::readSTLBINARY(const fileName& STLfileName)
     List<floatVector> STLpoints(3*nTris);
     setSize(nTris);
 
-    label pointI = 0;
+    label pointi = 0;
 
     for (label i = 0; i < nTris; i++)
     {
@@ -106,9 +106,9 @@ bool Foam::triSurface::readSTLBINARY(const fileName& STLfileName)
         STLtriangle stlTri(STLfile);
 
         // Set the STLpoints to the vertices of the STL triangle
-        STLpoints[pointI++] = stlTri.a();
-        STLpoints[pointI++] = stlTri.b();
-        STLpoints[pointI++] = stlTri.c();
+        STLpoints[pointi++] = stlTri.a();
+        STLpoints[pointi++] = stlTri.b();
+        STLpoints[pointi++] = stlTri.c();
         operator[](i).region() = stlTri.attrib();
     }
 
@@ -125,10 +125,10 @@ bool Foam::triSurface::readSTLBINARY(const fileName& STLfileName)
     pointField& sp = storedPoints();
 
     sp.setSize(nUniquePoints);
-    forAll(STLpoints, pointI)
+    forAll(STLpoints, pointi)
     {
-        const floatVector& pt = STLpoints[pointI];
-        sp[pointMap[pointI]] = vector
+        const floatVector& pt = STLpoints[pointi];
+        sp[pointMap[pointi]] = vector
         (
             scalar(pt.x()),
             scalar(pt.y()),
@@ -137,12 +137,12 @@ bool Foam::triSurface::readSTLBINARY(const fileName& STLfileName)
     }
 
     // Assign triangles
-    pointI = 0;
+    pointi = 0;
     forAll(*this, i)
     {
-        operator[](i)[0] = pointMap[pointI++];
-        operator[](i)[1] = pointMap[pointI++];
-        operator[](i)[2] = pointMap[pointI++];
+        operator[](i)[0] = pointMap[pointi++];
+        operator[](i)[1] = pointMap[pointi++];
+        operator[](i)[2] = pointMap[pointi++];
     }
 
     return true;
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index 438847d7a9..f11ddcfd5e 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,22 +130,22 @@ bool Foam::triSurface::readTRI(const fileName& TRIfileName)
 
     pointField rawPoints(STLpoints.size());
 
-    label pointI = 0;
+    label pointi = 0;
     forAllConstIter(SLList<STLpoint>, STLpoints, iter)
     {
-        rawPoints[pointI++] = *iter;
+        rawPoints[pointi++] = *iter;
     }
 
     setSize(STLlabels.size());
 
     // Assign triangles
-    pointI = 0;
+    pointi = 0;
     SLList<label>::const_iterator iter = STLlabels.begin();
     forAll(*this, i)
     {
-        operator[](i)[0] = pointI++;
-        operator[](i)[1] = pointI++;
-        operator[](i)[2] = pointI++;
+        operator[](i)[0] = pointi++;
+        operator[](i)[1] = pointi++;
+        operator[](i)[2] = pointi++;
         operator[](i).region() = *iter;
         ++iter;
     }
diff --git a/src/triSurface/triSurface/stitchTriangles.C b/src/triSurface/triSurface/stitchTriangles.C
index 6a41407bd1..053eadd085 100644
--- a/src/triSurface/triSurface/stitchTriangles.C
+++ b/src/triSurface/triSurface/stitchTriangles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,8 +111,8 @@ bool Foam::triSurface::stitchTriangles
 
                 forAll(f, fp)
                 {
-                    label pointI = f[fp];
-                    if (pointIsUsed.set(pointI, 1))
+                    label pointi = f[fp];
+                    if (pointIsUsed.set(pointi, 1))
                     {
                         nPoints++;
                     }
@@ -123,16 +123,16 @@ bool Foam::triSurface::stitchTriangles
             {
                 // 2. Compact.
                 pointMap.setSize(ps.size());
-                label newPointI = 0;
-                forAll(pointIsUsed, pointI)
+                label newPointi = 0;
+                forAll(pointIsUsed, pointi)
                 {
-                    if (pointIsUsed[pointI])
+                    if (pointIsUsed[pointi])
                     {
-                        ps[newPointI] = ps[pointI];
-                        pointMap[pointI] = newPointI++;
+                        ps[newPointi] = ps[pointi];
+                        pointMap[pointi] = newPointi++;
                     }
                 }
-                ps.setSize(newPointI);
+                ps.setSize(newPointi);
 
                 newTriangleI = 0;
                 forAll(*this, i)
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index d6ae673116..decb3a90d7 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -183,7 +183,7 @@ Foam::string Foam::triSurface::getLineNoComment(IFstream& is)
 void Foam::triSurface::checkTriangles(const bool verbose)
 {
     // Simple check on indices ok.
-    const label maxPointI = points().size() - 1;
+    const label maxPointi = points().size() - 1;
 
     forAll(*this, facei)
     {
@@ -191,12 +191,12 @@ void Foam::triSurface::checkTriangles(const bool verbose)
 
         forAll(f, fp)
         {
-            if (f[fp] < 0 || f[fp] > maxPointI)
+            if (f[fp] < 0 || f[fp] > maxPointi)
             {
                 FatalErrorInFunction
                     << "triangle " << f
                     << " uses point indices outside point range 0.."
-                    << maxPointI
+                    << maxPointi
                     << exit(FatalError);
             }
         }
@@ -951,7 +951,7 @@ void Foam::triSurface::subsetMeshMap
     const List<labelledTri>& locFaces = localFaces();
 
     label facei = 0;
-    label pointI = 0;
+    label pointi = 0;
 
     faceMap.setSize(locFaces.size());
 
@@ -975,7 +975,7 @@ void Foam::triSurface::subsetMeshMap
                 if (!pointHad[labI])
                 {
                     pointHad[labI] = true;
-                    pointMap[pointI++] = labI;
+                    pointMap[pointi++] = labI;
                 }
             }
         }
@@ -983,7 +983,7 @@ void Foam::triSurface::subsetMeshMap
 
     // Trim
     faceMap.setSize(facei);
-    pointMap.setSize(pointI);
+    pointMap.setSize(pointi);
 }
 
 
@@ -1079,11 +1079,11 @@ void Foam::triSurface::writeStats(Ostream& os) const
 
         forAll(f, fp)
         {
-            label pointI = f[fp];
-            if (pointIsUsed.set(pointI, 1))
+            label pointi = f[fp];
+            if (pointIsUsed.set(pointi, 1))
             {
-                bb.min() = ::Foam::min(bb.min(), points()[pointI]);
-                bb.max() = ::Foam::max(bb.max(), points()[pointI]);
+                bb.min() = ::Foam::min(bb.min(), points()[pointi]);
+                bb.max() = ::Foam::max(bb.max(), points()[pointi]);
                 nPoints++;
             }
         }