diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index d025f6bb4..6c78e8f7e 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nCalculating temperature distribution\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
diff --git a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
index 763ebf180..af3bcdcda 100644
--- a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
+++ b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
@@ -80,8 +80,6 @@ int main(int argc, char *argv[])
 
         while (piso.correctNonOrthogonal())
         {
-            p.storePrevIter();
-
             fvScalarMatrix pEqn
             (
                 fvm::laplacian
diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index 3a72a378a..56145a53f 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
 #   include "CourantNo.H"
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
diff --git a/applications/solvers/immersedBoundary/interIbFoam/pEqn.H b/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
index a765455fc..56980d7da 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
@@ -1,9 +1,4 @@
 {
-    if (!pimple.firstIter())
-    {
-        pd.storePrevIter();
-    }
-
     volScalarField rUA = 1.0/UEqn.A();
     surfaceScalarField rUAf = fvc::interpolate(rUA);
 
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C b/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
index 36e139a80..d2e97067b 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
@@ -64,8 +64,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C b/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
index 6c911d4b0..9b6decb00 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
@@ -63,8 +63,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
diff --git a/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C b/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
index 7bb094647..cabc3add3 100644
--- a/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
@@ -55,12 +55,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             // Momentum predictor
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H b/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
index d8c715068..5efe354c3 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
@@ -26,7 +26,7 @@
 
     mesh.schemesDict().setFluxRequired(pcorr.name());
 
-    while (piso.correctNonOrthogonal())
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -36,7 +36,7 @@
         pcorrEqn.setReference(pRefCell, pRefValue);
         pcorrEqn.solve();
 
-        if (piso.finalNonOrthogonalIter())
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H b/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H
index 63d39deef..ca5e25906 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H
@@ -2,10 +2,10 @@
 
 bool correctPhi
 (
-    piso.dict().lookupOrDefault("correctPhi", false)
+    pimple.dict().lookupOrDefault("correctPhi", false)
 );
 
 bool checkMeshCourantNo
 (
-    piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
index 4b37f06a1..f9157e4da 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
@@ -72,7 +72,7 @@
         zeroGradientFvPatchScalarField::typeName
     );
 
-    bool momentumPredictor = piso.momentumPredictor();
+    bool momentumPredictor = pimple.momentumPredictor();
 
     {
         bool momentumPredictorSave = momentumPredictor;
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
index f6beebb7d..6f0803a36 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
@@ -36,7 +36,7 @@ Author
 
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
-#include "pisoControl.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
 
-    pisoControl piso(mesh);
+    pimpleControl pimple(mesh);
 
 #   include "initContinuityErrs.H"
 #   include "initTotalVolume.H"
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
         // --- SIMPLE loop
 
-        while (piso.correct())
+        while (pimple.correct())
         {
 #           include "CourantNo.H"
 
@@ -108,10 +108,8 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            p.storePrevIter();
-
             // Non-orthogonal pressure corrector loop
-            while (piso.correctNonOrthogonal())
+            while (pimple.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -121,10 +119,10 @@ int main(int argc, char *argv[])
                 pEqn.setReference(pRefCell, pRefValue);
                 pEqn.solve
                 (
-                    mesh.solutionDict().solver(p.select(piso.finalInnerIter()))
+                    mesh.solutionDict().solver(p.select(pimple.finalInnerIter()))
                 );
 
-                if (piso.finalNonOrthogonalIter())
+                if (pimple.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H b/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
index 7cc9b3071..9f982e260 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
@@ -1,5 +1,5 @@
 #include "readTimeControls.H"
 
-correctPhi = piso.dict().lookupOrDefault("correctPhi", false);
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
 
-checkMeshCourantNo = piso.dict().lookupOrDefault("checkMeshCourantNo", false);
+checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
index 1ae34775d..92ff938e3 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
@@ -98,11 +98,6 @@ int main(int argc, char *argv[])
         // --- PIMPLE loop
         while (pimple.loop())
         {
-            if (!pimple.firstIter())
-            {
-                p.storePrevIter();
-            }
-
 #           include "UEqn.H"
 
             // --- PISO loop
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 33836621f..9d70da7c0 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -66,11 +66,6 @@ int main(int argc, char *argv[])
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
         {
-            if (!pimple.firstIter())
-            {
-                p.storePrevIter();
-            }
-
 #           include "UEqn.H"
 
             // --- PISO loop
diff --git a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
index 1610ad4be..83bd923c9 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
@@ -57,8 +57,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             #include "UEqn.H"
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index 2d286c65d..63c036252 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -55,8 +55,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
diff --git a/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C b/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
index bd213c98a..a9c823b10 100644
--- a/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
+++ b/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
@@ -57,12 +57,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while(simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             // Momentum predictor