diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index b12c08b617..924f2ee9a6 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -107,12 +107,10 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
 {
     const word solverName
     (
-        solverDict.found("motionSolver")
-      ? solverDict.lookup("motionSolver")
-      : solverDict.lookup("solver")
+        solverDict.getCompat<word>("motionSolver", {{"solver", 1612}})
     );
 
-    Info<< "Selecting motion solver: " << solverName << endl;
+    Info<< "Selecting motion solver: " << solverName << nl;
 
     const_cast<Time&>(mesh.time()).libs().open
     (
@@ -135,7 +133,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
         FatalErrorInFunction
             << "Unknown solver type "
             << solverName << nl << nl
-            << "Valid solver types :" << endl
+            << "Valid solver types :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
@@ -237,10 +235,8 @@ bool Foam::motionSolver::read()
 
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }