diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict
index 73d21918e7f84a4fbbc2e673bc2c789aa84eccdb..f36eb6c05fb1e1c18976cdaf05c89bcfad39a9a0 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict
@@ -14,7 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+dynamicFvMesh   dynamicOversetFvMesh;
+
+motionSolverLibs (fvMotionSolvers);
 
 solver          displacementLaplacian;
 
@@ -23,6 +25,4 @@ displacementLaplacianCoeffs
     diffusivity     uniform 1;
 }
 
-dynamicFvMesh       dynamicOversetFvMesh;
-
 // ************************************************************************* //
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
index 73d21918e7f84a4fbbc2e673bc2c789aa84eccdb..f36eb6c05fb1e1c18976cdaf05c89bcfad39a9a0 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
@@ -14,7 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+dynamicFvMesh   dynamicOversetFvMesh;
+
+motionSolverLibs (fvMotionSolvers);
 
 solver          displacementLaplacian;
 
@@ -23,6 +25,4 @@ displacementLaplacianCoeffs
     diffusivity     uniform 1;
 }
 
-dynamicFvMesh       dynamicOversetFvMesh;
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict
index 32193bcb2f73c6d52036c31c2fa653670f7bedbc..0d465eb3078074872114f777553fd09ca5b39d26 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict
@@ -17,9 +17,9 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+motionSolverLibs (fvMotionSolvers);
 
-solver displacementComponentLaplacian;
+solver          displacementComponentLaplacian;
 
 displacementComponentLaplacianCoeffs
 {
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/dynamicMeshDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/dynamicMeshDict
index 73d21918e7f84a4fbbc2e673bc2c789aa84eccdb..f36eb6c05fb1e1c18976cdaf05c89bcfad39a9a0 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/dynamicMeshDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/dynamicMeshDict
@@ -14,7 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+dynamicFvMesh   dynamicOversetFvMesh;
+
+motionSolverLibs (fvMotionSolvers);
 
 solver          displacementLaplacian;
 
@@ -23,6 +25,4 @@ displacementLaplacianCoeffs
     diffusivity     uniform 1;
 }
 
-dynamicFvMesh       dynamicOversetFvMesh;
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/dynamicMeshDict
index 6c2be31d83504ae186bf20044fb0e0f1e8835014..d018b8d344816637316e758db240b75a609fd08a 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/dynamicMeshDict
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    velocityComponentLaplacian;
 
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
index 6c2be31d83504ae186bf20044fb0e0f1e8835014..d018b8d344816637316e758db240b75a609fd08a 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    velocityComponentLaplacian;
 
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/constant/dynamicMeshDict b/tutorials/incompressible/lumpedPointMotion/building/steady/constant/dynamicMeshDict
index cef0d8f71f4bc53956ed713c992a38db4fb76f57..34d5b5937d306b5d79d50cd025706586b638618e 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/constant/dynamicMeshDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/constant/dynamicMeshDict
@@ -16,11 +16,11 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dynamicFvMesh dynamicMotionSolverFvMesh;
+dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
-solver  displacementLaplacian;
+solver          displacementLaplacian;
 
 displacementLaplacianCoeffs
 {
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/controlDict b/tutorials/incompressible/lumpedPointMotion/building/steady/system/controlDict
index d03a8250b56966166ecd88ef5617b5ed05573be1..5deb1dcc8646e975021a6caf8331501d9a93194b 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/controlDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/controlDict
@@ -16,9 +16,9 @@ FoamFile
 
 libs
 (
-    "libmeshTools.so"
-    "liblumpedPointMotion.so"
-    "libfvMotionSolvers.so"
+    meshTools
+    lumpedPointMotion
+    fvMotionSolvers
 );
 
 application     simpleFoam;     // Change to pimpleFoam for transient
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
index 73d21918e7f84a4fbbc2e673bc2c789aa84eccdb..f25fbcfba83b918ca24755c37f9f1fddaa835758 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
@@ -14,7 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+dynamicFvMesh   dynamicOversetFvMesh;
+
+motionSolverLibs (fvMotionSolvers);
 
 solver          displacementLaplacian;
 
@@ -23,6 +25,5 @@ displacementLaplacianCoeffs
     diffusivity     uniform 1;
 }
 
-dynamicFvMesh       dynamicOversetFvMesh;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict
index 55c18c5404b357170229dddc286549f12ca99070..99d58af7000db47362c3e39e4f086f124503cbd2 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 dynamicFvMesh       dynamicOversetFvMesh;
 
-//motionSolverLibs ( "libfvMotionSolvers.so" );
+//motionSolverLibs (fvMotionSolvers);
 //
 //solver          displacementLaplacian;
 //
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/dynamicMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/dynamicMeshDict
index 73d21918e7f84a4fbbc2e673bc2c789aa84eccdb..f25fbcfba83b918ca24755c37f9f1fddaa835758 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/dynamicMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/dynamicMeshDict
@@ -14,7 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+dynamicFvMesh   dynamicOversetFvMesh;
+
+motionSolverLibs (fvMotionSolvers);
 
 solver          displacementLaplacian;
 
@@ -23,6 +25,5 @@ displacementLaplacianCoeffs
     diffusivity     uniform 1;
 }
 
-dynamicFvMesh       dynamicOversetFvMesh;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict
index 0321e42875e61170fc10ee0bf4f83abb24d01c26..19f74c3f0fdc5bde6c39a2bcd2fc6c73c3560dfc 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    solidBody;
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict
index fff7903a338480fe22220f9bc6e00c8f3b70ba5c..7b960f25bf05f6f217c17ee346d760f30dde2e7f 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    solidBody;
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict
index 581b56c73d7f773a5a85e75701f597fa4f280daa..84ed4a1506daa91b0ed864696ca3b9acf8bda3d1 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    solidBody;
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict
index 61fdfa7cb101c9b606792fc112720218c3731c35..ff9dc98dacb5426c8f880a6d1354158816747d23 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict
@@ -14,9 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dynamicFvMesh      dynamicMotionSolverFvMesh;
+dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("sixDoFRigidBodyMotion");
+motionSolverLibs (sixDoFRigidBodyMotion);
 
 motionSolver    sixDoFRigidBodyMotion;
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict
index 6c2be31d83504ae186bf20044fb0e0f1e8835014..d018b8d344816637316e758db240b75a609fd08a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    velocityComponentLaplacian;
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
index 0791e0d128a4a32599b69e534a2f527608965cf0..6b657be5662a44c163ea02e6522ff25004354bb0 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    solidBody;
 
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
index 6e62c17621a3d2b2dcefbd75bac4d60954efda83..3f07a02b4ddf5f427544758a9c12aa60e1716e73 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
@@ -18,7 +18,7 @@ FoamFile
 
 dynamicFvMesh dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver displacementSBRStress;   //displacementLaplacian;
 //motionSolver velocityComponentLaplacian z;
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
index c86c4a31cabb2bea84f178ec6c23e4a46e6d4d80..270cae3461944b9a0c614237db708d63f9c45d7f 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverTopoFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 solver          displacementLayeredMotion;
 
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/controlDict
index de9aace104a2bfbaaccc230da171c6a304b4e722..fe8c17c11a338fa963ef3c58589d04f55ef6aac2 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/controlDict
@@ -53,8 +53,8 @@ maxAlphaCo      0.1;
 
 libs
 (
-    "sixDoFRigidBodyMotion"
-    "libtopoChangerFvMesh.so"
+    sixDoFRigidBodyMotion
+    topoChangerFvMesh
 );
 
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict
index b2d378e7cd3da50c8427c8fa127b4b00ee00ade3..b410a602164ccaf6dd679a4a9486cc62837dee64 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs   ("librigidBodyMeshMotion.so");
+motionSolverLibs (rigidBodyMeshMotion);
 
 motionSolver    rigidBodyMotion;
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF
index 8461d90420b268dbb7772d54e757a98319d82ed8..4bf041b107daf86f995ad9546fa0f2ebc58af01f 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF
@@ -16,7 +16,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs    ("sixDoFRigidBodyMotion");
+motionSolverLibs (sixDoFRigidBodyMotion);
 
 motionSolver    sixDoFRigidBodyMotion;
 
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
index 09a9deeb7cd3f4d28f866c8a854bedccd6c5489f..ac88be9d2fd2b47b2469a29c7a93400890ec3e4b 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 dynamicFvMesh       dynamicMotionSolverFvMesh;
 
-motionSolverLibs   ("librigidBodyMeshMotion.so");
+motionSolverLibs   (rigidBodyMeshMotion);
 
 motionSolver       rigidBodyMotion;
 
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
index 09ad7d75113e4e76e58641f3d8f0ef76e7f97a68..44ea7b18e0f68d66de2b985697799d4a8733f73c 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
@@ -16,7 +16,7 @@ FoamFile
 
 dynamicFvMesh       dynamicMotionSolverFvMesh;
 
-motionSolverLibs    ("sixDoFRigidBodyMotion");
+motionSolverLibs    (sixDoFRigidBodyMotion);
 
 motionSolver        sixDoFRigidBodyMotion;
 
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
index c4b6d9f10d135829d00c9fa9d739034d3325a356..6b657be5662a44c163ea02e6522ff25004354bb0 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    solidBody;
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict
index df1488daa15aac5495a065c89848e1007b84a995..20d708a618734190880e05f9d447147564c073d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict
@@ -15,13 +15,13 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dynamicFvMesh       dynamicMotionSolverFvMesh;
-motionSolverLibs    ("libfvMotionSolvers.so");
+motionSolverLibs    (fvMotionSolvers);
 
 solver              displacementLaplacian;
 
 displacementLaplacianCoeffs
 {
-    diffusivity         inverseDistance (leftwall);
+    diffusivity     inverseDistance (leftwall);
 }
 
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict
index df1488daa15aac5495a065c89848e1007b84a995..20d708a618734190880e05f9d447147564c073d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict
@@ -15,13 +15,13 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dynamicFvMesh       dynamicMotionSolverFvMesh;
-motionSolverLibs    ("libfvMotionSolvers.so");
+motionSolverLibs    (fvMotionSolvers);
 
 solver              displacementLaplacian;
 
 displacementLaplacianCoeffs
 {
-    diffusivity         inverseDistance (leftwall);
+    diffusivity     inverseDistance (leftwall);
 }
 
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
index dc13f1b577c66745ca4039a0bf0e87fe71e90f51..2ac965c55a121971cee4043b3eacd669b6aeda25 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
@@ -15,13 +15,13 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dynamicFvMesh       dynamicMotionSolverFvMesh;
-motionSolverLibs    ("libfvMotionSolvers.so");
+motionSolverLibs    (fvMotionSolvers);
 
 solver              displacementLaplacian;
 
 displacementLaplacianCoeffs
 {
-    diffusivity         inverseDistance (inlet);
+    diffusivity     inverseDistance (inlet);
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
index 959e84655f8c2095f9758fe561fedc542a759a6e..f303e25a63b419f55fe7176cf970ea4f417d5c8c 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    solidBody;
 
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict
index 1823501faf3fe718fea3e6a0a56ec055cb536feb..30f033b7399e0d3da6ded867e37392d5de358f23 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ( "libfvMotionSolvers.so" );
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    solidBody;
 
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
index a6389e7c7385f89bad829e0d9e14cc9681d5bbca..936bc80faa42afc3c61309cb96e77b5a497f3f29 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
@@ -15,7 +15,7 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-motionSolverLibs    ("librigidBodyMeshMotion.so");
+motionSolverLibs    (rigidBodyMeshMotion);
 
 dynamicFvMesh       dynamicOversetFvMesh;
 
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict
index 7c1b6cd51cb66f917acb33d876c5739dbcf3d8fd..c94ba7e84593805e1b62efdccc180ca15031f822 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict
@@ -17,9 +17,9 @@ FoamFile
 
 libs
 (
-    "liboverset.so"
-    "librigidBodyDynamics.so"
-    "libfvMotionSolvers.so"
+    overset
+    rigidBodyDynamics
+    fvMotionSolvers
 );
 
 application     overInterDyMFoam;
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
index dc23585abbca69b4da7fdbbb6338dc83f5f298d8..aa094af39d728fc83a041beab8860a540afbe01a 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-motionSolverLibs    ("sixDoFRigidBodyMotion");
+motionSolverLibs    (sixDoFRigidBodyMotion);
 
 dynamicFvMesh       dynamicOversetFvMesh;
 
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
index c9eb82936835d19f2427ec638631cb6744f8752b..62e253e9ec04a4d33eb7c429ef57efa7afff4d78 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
@@ -14,13 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dynamicFvMesh       dynamicOversetFvMesh;
+dynamicFvMesh   dynamicOversetFvMesh;
 
 solvers
 {
      VF
      {
-        motionSolverLibs ("libfvMotionSolvers.so" );
+        motionSolverLibs (fvMotionSolvers);
 
         motionSolver            solidBody;
         solidBodyMotionFunction drivenLinearMotion;
@@ -32,8 +32,8 @@ solvers
 
     cube
     {
-        motionSolverLibs    ("sixDoFRigidBodyMotion");
-        motionSolver          sixDoFRigidBodyMotion;
+        motionSolverLibs   (sixDoFRigidBodyMotion);
+        motionSolver        sixDoFRigidBodyMotion;
 
         cellSet         c1;
 
@@ -108,9 +108,6 @@ solvers
 
         }
     }
-
-
-
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
index 0464694c99c34494f413cd58e5348ab5f0ce5ecb..164f4bfc8d8a497ba6f50f72ce8c9c12358300e7 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
@@ -18,7 +18,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-motionSolverLibs ("libfvMotionSolvers.so");
+motionSolverLibs (fvMotionSolvers);
 
 motionSolver    displacementLaplacian;