diff --git a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/overLaplacianDyMFoam.C b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/overLaplacianDyMFoam.C
index bc626b3747..9a1c1018d9 100644
--- a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/overLaplacianDyMFoam.C
+++ b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/overLaplacianDyMFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    laplacianFoam
+    overLaplacianDyMFoam
 
 Group
     grpBasicSolvers
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/Make/files b/applications/solvers/basic/potentialFoam/overPotentialFoam/Make/files
index 511066afa5..ed3303d6df 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/Make/files
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/Make/files
@@ -1,3 +1,3 @@
-potentialFoam.C
+overPotentialFoam.C
 
 EXE = $(FOAM_APPBIN)/overPotentialFoam
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/overPotentialFoam/overPotentialFoam.C
similarity index 99%
rename from applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C
rename to applications/solvers/basic/potentialFoam/overPotentialFoam/overPotentialFoam.C
index 3259c951da..3aa88e5998 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/overPotentialFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    potentialFoam
+    overPotentialFoam
 
 Group
     grpBasicSolvers
diff --git a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/files b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/files
index 3d96a548d0..7917b04770 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/files
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/files
@@ -1,3 +1,3 @@
-rhoPimpleDyMFoam.C
+overRhoPimpleDyMFoam.C
 
 EXE = $(FOAM_APPBIN)/overRhoPimpleDyMFoam
diff --git a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/overRhoPimpleDyMFoam.C
similarity index 99%
rename from applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C
rename to applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/overRhoPimpleDyMFoam.C
index 4260feb58c..0bbe9ca7de 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/overRhoPimpleDyMFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    rhoPimpleFoam
+    overRhoPimpleDyMFoam
 
 Group
     grpCompressibleSolvers grpMovingMeshSolvers
diff --git a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/files b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/files
index 0519e8b961..f6d4ea9438 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/files
+++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/files
@@ -1,3 +1,3 @@
-rhoSimpleFoam.C
+overRhoSimpleFoam.C
 
 EXE = $(FOAM_APPBIN)/overRhoSimpleFoam
diff --git a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/overRhoSimpleFoam.C
similarity index 100%
rename from applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/rhoSimpleFoam.C
rename to applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/overRhoSimpleFoam.C
diff --git a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/overPimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/overPimpleDyMFoam.C
index b41b2ece31..04d8d23bb6 100644
--- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/overPimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/overPimpleDyMFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    pimpleDyMFoam.C
+    overPimpleDyMFoam
 
 Group
     grpIncompressibleSolvers grpMovingMeshSolvers
diff --git a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/overSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/overSimpleFoam.C
index f69901b123..6a4bf928cf 100644
--- a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/overSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/overSimpleFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    simpleFoam
+    overSimpleFoam
 
 Group
     grpIncompressibleSolvers
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/files b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/files
index e229fbaed0..c96085f980 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/files
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/files
@@ -1,3 +1,3 @@
-interDyMFoam.C
+overInterDyMFoam.C
 
 EXE = $(FOAM_APPBIN)/overInterDyMFoam
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/overInterDyMFoam/overInterDyMFoam.C
similarity index 100%
rename from applications/solvers/multiphase/interFoam/overInterDyMFoam/interDyMFoam.C
rename to applications/solvers/multiphase/interFoam/overInterDyMFoam/overInterDyMFoam.C