diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index 6587398daba78accad33df7bdc07e486ec22142a..7e228832568dd0d41d3e54b289c9381e84370daa 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -47,4 +47,10 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell
+    (
+        p,
+        potentialFlow,
+        pRefCell,
+        pRefValue
+    );
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index a08e35669783c16812b41fe50f2ddd2f064a27f1..9f9fa851331fd60cd48c616383ee16e92b91e10e 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -42,8 +42,8 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+    #include "readControls.H"
     #include "createFields.H"
-    #include "readSIMPLEControls.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
index b080a349c61212ded135b68492622c87ca340e90..694e8714c15663aa7410b35dbfd1237c20f04759 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
@@ -22,7 +22,7 @@ ddtSchemes
 
 gradSchemes
 {
-    default         Gauss linear;
+    default         leastSquares;
 }
 
 divSchemes
diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSolution b/tutorials/basic/potentialFoam/cylinder/system/fvSolution
index d608392fe2140a18594d01d98a7ea6050edde3f6..d73d77ca97dc00ea785953794cdd78ba3bc482cb 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/fvSolution
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSolution
@@ -26,7 +26,7 @@ solvers
     }
 }
 
-SIMPLE
+potentialFlow
 {
     nNonOrthogonalCorrectors 3;
 }
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
index 05b12af8e47fb8cfb8ffce6b43d5d70b7443240d..b68901f2ff034a1bb15cc3ab812746e933758f9a 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
@@ -26,7 +26,7 @@ solvers
     }
 }
 
-SIMPLE
+potentialFlow
 {
     nNonOrthogonalCorrectors 0;
 }
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allclean b/tutorials/incompressible/simpleFoam/motorBike/Allclean
index 5e817aa5338f49eb352855ea7202dd4035472a08..2c5a008802e8e91116267233274623cc5c062969 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allclean
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allclean
@@ -3,7 +3,6 @@
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -f system/fvSolution
 rm -rf 0 > /dev/null 2>&1
 
 cleanCase
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 22be2d3fb76afca85eb4f6801c4bc01a09666329..ed9f842fed766d29d015e6399fee07936b9bf0c4 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -2,14 +2,10 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp system/fvSolution.org system/fvSolution
 cp -r 0.org 0 > /dev/null 2>&1
 
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 
-sed -i 's/\(nNonOrthogonalCorrectors\).*;/\1 10;/g' system/fvSolution
 runApplication potentialFoam -writep
-sed -i 's/\(nNonOrthogonalCorrectors\).*;/\1 0;/g' system/fvSolution
-
 runApplication `getApplication`
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
index 359b377f0a8b8aff5c8dc551ece4ebd91194278a..9e50e525a59890081cfcc020d0e59e0d27e6a0e3 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
@@ -21,433 +21,433 @@ FoamFile
     {
         type            patch;
         nFaces          320;
-        startFace       1028304;
+        startFace       1027872;
     }
     inlet
     {
         type            patch;
         nFaces          64;
-        startFace       1028624;
+        startFace       1028192;
     }
     outlet
     {
         type            patch;
         nFaces          64;
-        startFace       1028688;
+        startFace       1028256;
     }
     lowerWall
     {
         type            wall;
         nFaces          5330;
-        startFace       1028752;
+        startFace       1028320;
     }
     upperWall
     {
         type            patch;
         nFaces          160;
-        startFace       1034082;
+        startFace       1033650;
     }
     motorBike_frt-fairing:001%1
     {
         type            wall;
-        nFaces          5427;
-        startFace       1034242;
+        nFaces          5416;
+        startFace       1033810;
     }
     motorBike_windshield:002%2
     {
         type            wall;
         nFaces          50;
-        startFace       1039669;
+        startFace       1039226;
     }
     motorBike_rr-wh-rim:005%5
     {
         type            wall;
-        nFaces          136;
-        startFace       1039719;
+        nFaces          137;
+        startFace       1039276;
     }
     motorBike_rr-wh-rim:010%10
     {
         type            wall;
         nFaces          340;
-        startFace       1039855;
+        startFace       1039413;
     }
     motorBike_fr-wh-rim:011%11
     {
         type            wall;
         nFaces          473;
-        startFace       1040195;
+        startFace       1039753;
     }
     motorBike_fr-wh-brake-disk:012%12
     {
         type            wall;
         nFaces          54;
-        startFace       1040668;
+        startFace       1040226;
     }
     motorBike_frame:016-shadow%13
     {
         type            wall;
-        nFaces          97;
-        startFace       1040722;
+        nFaces          98;
+        startFace       1040280;
     }
     motorBike_rear-susp:014%14
     {
         type            wall;
-        nFaces          839;
-        startFace       1040819;
+        nFaces          844;
+        startFace       1040378;
     }
     motorBike_rear-susp:014-shadow%15
     {
         type            wall;
-        nFaces          469;
-        startFace       1041658;
+        nFaces          461;
+        startFace       1041222;
     }
     motorBike_frame:016%16
     {
         type            wall;
-        nFaces          68;
-        startFace       1042127;
+        nFaces          67;
+        startFace       1041683;
     }
     motorBike_rr-wh-rim:005-shadow%17
     {
         type            wall;
-        nFaces          71;
-        startFace       1042195;
+        nFaces          70;
+        startFace       1041750;
     }
     motorBike_rr-wh-chain-hub:022%22
     {
         type            wall;
         nFaces          141;
-        startFace       1042266;
+        startFace       1041820;
     }
     motorBike_rearseat%24
     {
         type            wall;
         nFaces          430;
-        startFace       1042407;
+        startFace       1041961;
     }
     motorBike_frt-fairing%25
     {
         type            wall;
         nFaces          626;
-        startFace       1042837;
+        startFace       1042391;
     }
     motorBike_windshield%26
     {
         type            wall;
-        nFaces          378;
-        startFace       1043463;
+        nFaces          368;
+        startFace       1043017;
     }
     motorBike_headlights%27
     {
         type            wall;
         nFaces          161;
-        startFace       1043841;
+        startFace       1043385;
     }
     motorBike_driversseat%28
     {
         type            wall;
         nFaces          368;
-        startFace       1044002;
+        startFace       1043546;
     }
     motorBike_rear-body%29
     {
         type            wall;
         nFaces          2077;
-        startFace       1044370;
+        startFace       1043914;
     }
     motorBike_fuel-tank%30
     {
         type            wall;
         nFaces          912;
-        startFace       1046447;
+        startFace       1045991;
     }
     motorBike_exhaust%31
     {
         type            wall;
         nFaces          2392;
-        startFace       1047359;
+        startFace       1046903;
     }
     motorBike_rr-wh-rim%32
     {
         type            wall;
         nFaces          1430;
-        startFace       1049751;
+        startFace       1049295;
     }
     motorBike_fr-mud-guard%33
     {
         type            wall;
-        nFaces          639;
-        startFace       1051181;
+        nFaces          624;
+        startFace       1050725;
     }
     motorBike_fr-wh-rim%34
     {
         type            wall;
         nFaces          591;
-        startFace       1051820;
+        startFace       1051349;
     }
     motorBike_fr-wh-brake-disk%35
     {
         type            wall;
-        nFaces          431;
-        startFace       1052411;
+        nFaces          427;
+        startFace       1051940;
     }
     motorBike_fr-brake-caliper%36
     {
         type            wall;
         nFaces          164;
-        startFace       1052842;
+        startFace       1052367;
     }
     motorBike_fr-wh-tyre%37
     {
         type            wall;
         nFaces          1116;
-        startFace       1053006;
+        startFace       1052531;
     }
     motorBike_hbars%38
     {
         type            wall;
         nFaces          535;
-        startFace       1054122;
+        startFace       1053647;
     }
     motorBike_fr-forks%39
     {
         type            wall;
         nFaces          1140;
-        startFace       1054657;
+        startFace       1054182;
     }
     motorBike_chain%40
     {
         type            wall;
         nFaces          474;
-        startFace       1055797;
+        startFace       1055322;
     }
     motorBike_rr-wh-tyre%41
     {
         type            wall;
         nFaces          1787;
-        startFace       1056271;
+        startFace       1055796;
     }
     motorBike_square-dial%42
     {
         type            wall;
         nFaces          6;
-        startFace       1058058;
+        startFace       1057583;
     }
     motorBike_round-dial%43
     {
         type            wall;
         nFaces          17;
-        startFace       1058064;
+        startFace       1057589;
     }
     motorBike_dial-holder%44
     {
         type            wall;
         nFaces          87;
-        startFace       1058081;
+        startFace       1057606;
     }
     motorBike_rear-susp%45
     {
         type            wall;
         nFaces          1786;
-        startFace       1058168;
+        startFace       1057693;
     }
     motorBike_rear-brake-lights%46
     {
         type            wall;
         nFaces          53;
-        startFace       1059954;
+        startFace       1059479;
     }
     motorBike_rear-light-bracket%47
     {
         type            wall;
         nFaces          163;
-        startFace       1060007;
+        startFace       1059532;
     }
     motorBike_frame%48
     {
         type            wall;
         nFaces          2040;
-        startFace       1060170;
+        startFace       1059695;
     }
     motorBike_rear-mud-guard%49
     {
         type            wall;
         nFaces          663;
-        startFace       1062210;
+        startFace       1061735;
     }
     motorBike_rear-susp-spring-damp%50
     {
         type            wall;
         nFaces          107;
-        startFace       1062873;
+        startFace       1062398;
     }
     motorBike_fairing-inner-plate%51
     {
         type            wall;
         nFaces          445;
-        startFace       1062980;
+        startFace       1062505;
     }
     motorBike_clutch-housing%52
     {
         type            wall;
         nFaces          970;
-        startFace       1063425;
+        startFace       1062950;
     }
     motorBike_radiator%53
     {
         type            wall;
-        nFaces          40;
-        startFace       1064395;
+        nFaces          39;
+        startFace       1063920;
     }
     motorBike_water-pipe%54
     {
         type            wall;
         nFaces          104;
-        startFace       1064435;
+        startFace       1063959;
     }
     motorBike_water-pump%55
     {
         type            wall;
         nFaces          74;
-        startFace       1064539;
+        startFace       1064063;
     }
     motorBike_engine%56
     {
         type            wall;
         nFaces          2389;
-        startFace       1064613;
+        startFace       1064137;
     }
     motorBike_rear-shock-link%57
     {
         type            wall;
-        nFaces          25;
-        startFace       1067002;
+        nFaces          26;
+        startFace       1066526;
     }
     motorBike_rear-brake-fluid-pot-bracket%58
     {
         type            wall;
         nFaces          44;
-        startFace       1067027;
+        startFace       1066552;
     }
     motorBike_rear-brake-fluid-pot%59
     {
         type            wall;
         nFaces          53;
-        startFace       1067071;
+        startFace       1066596;
     }
     motorBike_footpeg%60
     {
         type            wall;
         nFaces          86;
-        startFace       1067124;
+        startFace       1066649;
     }
     motorBike_rr-wh-chain-hub%61
     {
         type            wall;
         nFaces          122;
-        startFace       1067210;
+        startFace       1066735;
     }
     motorBike_rear-brake-caliper%62
     {
         type            wall;
         nFaces          142;
-        startFace       1067332;
+        startFace       1066857;
     }
     motorBike_rider-helmet%65
     {
         type            wall;
         nFaces          583;
-        startFace       1067474;
+        startFace       1066999;
     }
     motorBike_rider-visor%66
     {
         type            wall;
         nFaces          95;
-        startFace       1068057;
+        startFace       1067582;
     }
     motorBike_rider-boots%67
     {
         type            wall;
         nFaces          1025;
-        startFace       1068152;
+        startFace       1067677;
     }
     motorBike_rider-gloves%68
     {
         type            wall;
         nFaces          319;
-        startFace       1069177;
+        startFace       1068702;
     }
     motorBike_rider-body%69
     {
         type            wall;
         nFaces          4555;
-        startFace       1069496;
+        startFace       1069021;
     }
     motorBike_frame:0%70
     {
         type            wall;
         nFaces          37;
-        startFace       1074051;
+        startFace       1073576;
     }
     motorBike_frt-fairing:001-shadow%74
     {
         type            wall;
-        nFaces          3306;
-        startFace       1074088;
+        nFaces          3317;
+        startFace       1073613;
     }
     motorBike_windshield-shadow%75
     {
         type            wall;
-        nFaces          239;
-        startFace       1077394;
+        nFaces          236;
+        startFace       1076930;
     }
     motorBike_fr-mud-guard-shadow%81
     {
         type            wall;
-        nFaces          332;
-        startFace       1077633;
+        nFaces          350;
+        startFace       1077166;
     }
     motorBike_fr-wh-brake-disk-shadow%83
     {
         type            wall;
-        nFaces          182;
-        startFace       1077965;
+        nFaces          186;
+        startFace       1077516;
     }
     motorBike_rear-mud-guard-shadow%84
     {
         type            wall;
-        nFaces          387;
-        startFace       1078147;
+        nFaces          388;
+        startFace       1077702;
     }
     motorBike_rear-susp-spring-damp-shadow%85
     {
         type            wall;
         nFaces          41;
-        startFace       1078534;
+        startFace       1078090;
     }
     motorBike_radiator-shadow%86
     {
         type            wall;
-        nFaces          21;
-        startFace       1078575;
+        nFaces          22;
+        startFace       1078131;
     }
     motorBike_rear-shock-link-shadow%87
     {
         type            wall;
-        nFaces          10;
-        startFace       1078596;
+        nFaces          9;
+        startFace       1078153;
     }
     motorBike_rear-brake-fluid-pot-bracket-shadow%88
     {
         type            wall;
         nFaces          22;
-        startFace       1078606;
+        startFace       1078162;
     }
     motorBike_rr-wh-chain-hub-shadow%89
     {
         type            wall;
         nFaces          53;
-        startFace       1078628;
+        startFace       1078184;
     }
 )
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution.org b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
similarity index 97%
rename from tutorials/incompressible/simpleFoam/motorBike/system/fvSolution.org
rename to tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index f7ab2e81b2921acfaa4233fe0732094ce1b4fd98..a2e1d47d4f68dcc28141fd4eeaf62efff0034b49 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution.org
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
@@ -63,6 +63,11 @@ SIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+potentialFlow
+{
+    nNonOrthogonalCorrectors 10;
+}
+
 relaxationFactors
 {
     p               0.3;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
index 199f651417a9b6404f9cf55d36eea9762a65e017..a235f4ecbe7a5db501403391d94865da9a4387fe 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
@@ -74,7 +74,7 @@ PISO
     momentumPredictor yes;
 }
 
-SIMPLE
+potentialFlow
 {
     // used for potentialFoam initialisation
     nNonOrthogonalCorrectors 10;