diff --git a/tutorials/XiFluid/moriyoshiHomogeneous/Allrun b/tutorials/XiFluid/moriyoshiHomogeneous/Allrun
index 59d6caa6bf..ee6ca26b2c 100755
--- a/tutorials/XiFluid/moriyoshiHomogeneous/Allrun
+++ b/tutorials/XiFluid/moriyoshiHomogeneous/Allrun
@@ -32,7 +32,7 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
         runApplication -a foamDictionary system/controlDict -entry endTime -set 0.015
         runApplication -a foamDictionary system/controlDict -entry writeInterval -set 50
 
-        runApplication -a XiFoam
+        runApplication -a $(getApplication)
     fi
 )
 
diff --git a/tutorials/incompressibleFluid/propeller/Allrun b/tutorials/incompressibleFluid/propeller/Allrun
index 994635332e..3eee18eac8 100755
--- a/tutorials/incompressibleFluid/propeller/Allrun
+++ b/tutorials/incompressibleFluid/propeller/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Mesh if necessary
-if ! cloneMesh ../../../../multiphase/interFoam/RAS/propeller .
+if ! cloneMesh ../../incompressibleVoF/propeller .
 then
     ./Allmesh
 else
diff --git a/tutorials/incompressibleVoF/cavitatingBullet/system/controlDict b/tutorials/incompressibleVoF/cavitatingBullet/system/controlDict
index d33b1c4679..eaa531768c 100644
--- a/tutorials/incompressibleVoF/cavitatingBullet/system/controlDict
+++ b/tutorials/incompressibleVoF/cavitatingBullet/system/controlDict
@@ -13,7 +13,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application             interFoam;
+application             foamRun;
+
+solver                  incompressibleVoF;
 
 startFrom               startTime;
 
diff --git a/tutorials/incompressibleVoF/floatingObject/system/controlDict.sixDoF b/tutorials/incompressibleVoF/floatingObject/system/controlDict.sixDoF
index c015baca8f..6316592889 100644
--- a/tutorials/incompressibleVoF/floatingObject/system/controlDict.sixDoF
+++ b/tutorials/incompressibleVoF/floatingObject/system/controlDict.sixDoF
@@ -14,7 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     interFoam;
+application     foamRun;
+
+solver          incompressibleVoF;
 
 startFrom       startTime;
 
diff --git a/tutorials/incompressibleVoF/floatingObjectWaves/system/controlDict.sixDoF b/tutorials/incompressibleVoF/floatingObjectWaves/system/controlDict.sixDoF
index c015baca8f..6316592889 100644
--- a/tutorials/incompressibleVoF/floatingObjectWaves/system/controlDict.sixDoF
+++ b/tutorials/incompressibleVoF/floatingObjectWaves/system/controlDict.sixDoF
@@ -14,7 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     interFoam;
+application     foamRun;
+
+solver          incompressibleVoF;
 
 startFrom       startTime;
 
diff --git a/tutorials/incompressibleVoF/propeller/Allrun b/tutorials/incompressibleVoF/propeller/Allrun
index 8cd9fbaf6f..00ad5c1a54 100755
--- a/tutorials/incompressibleVoF/propeller/Allrun
+++ b/tutorials/incompressibleVoF/propeller/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Mesh if necessary
-if ! cloneMesh ../../../../modules/incompressibleFluid/propeller .
+if ! cloneMesh ../../incompressibleFluid/propeller .
 then
     ./Allmesh
 else
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict b/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
index e64e639750..737cc10925 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
@@ -14,8 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     potentialFoam;
-
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/controlDict b/tutorials/mesh/snappyHexMesh/flange/system/controlDict
index 2ec8165e4c..7c9f8b4954 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/controlDict
@@ -14,8 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     icoFoam;
-
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/mesh/snappyHexMesh/pipe/system/controlDict b/tutorials/mesh/snappyHexMesh/pipe/system/controlDict
index a552e692b4..e158c514a1 100644
--- a/tutorials/mesh/snappyHexMesh/pipe/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/pipe/system/controlDict
@@ -14,8 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     interFoam;
-
 startFrom       latestTime;
 
 startTime       0;