diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H
index 94e93bd1fe2b7cfc5c8405e7cd0abcd4d967b48a..69cae68456d72fe85227699b03170cdf657877b6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H
@@ -41,8 +41,8 @@ Description
     \verbatim
     phaseForces.water
     {
-        type            phaseForces;
-        libs ("libreactingEulerFoamFunctionObjects.so");
+        type phaseForces;
+        libs (reactingEulerFoamFunctionObjects);
         writeControl    writeTime;
         writeInterval   1;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H
index 37d2c7fecf9514e6558f4fc6cd78756b42c6c8db..ca21b6a64a1fb33366ec5710595a6004d2641827 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H
@@ -38,7 +38,7 @@ Description
     box.all.numberDensity.volume.bubbles
     {
         type sizeDistribution;
-        libs ("libreactingEulerFoamFunctionObjects.so");
+        libs (reactingEulerFoamFunctionObjects);
         writeControl    outputTime;
         writeInterval   1;
         log             true;
diff --git a/applications/test/PDRblockMesh/box0/system/controlDict b/applications/test/PDRblockMesh/box0/system/controlDict
index 604309ae53c351415357d907b423ae1a242515b1..264a99e4489c729969dfe7f48c8c325a478df358 100644
--- a/applications/test/PDRblockMesh/box0/system/controlDict
+++ b/applications/test/PDRblockMesh/box0/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs            ("libblockMesh.so");
+libs            (blockMesh);
 
 application     PDRblockMesh;
 
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/processorField b/applications/test/mapDistributePolyMesh/cavity/system/processorField
index 36c1f6c69e77f16956369a0ec5a36033fe6c1c5f..73d6932428544d72a7bb6b56ba4253daebbf1e05 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/processorField
+++ b/applications/test/mapDistributePolyMesh/cavity/system/processorField
@@ -19,8 +19,7 @@ functions
     processorField
     {
         type            processorField;
-
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
 
         enabled         true;
 
@@ -29,8 +28,7 @@ functions
     cellID
     {
         type coded;
-
-        libs ("libutilityFunctionObjects.so");
+        libs (utilityFunctionObjects);
 
         name cellID;
 
diff --git a/applications/test/parallelOverset/heatTransfer/system/controlDict b/applications/test/parallelOverset/heatTransfer/system/controlDict
index 14c0f98e3ce5987c6594c8584fd49d8fe348d7e8..9b3aa44948187104e77703f6b96108d61702d689 100644
--- a/applications/test/parallelOverset/heatTransfer/system/controlDict
+++ b/applications/test/parallelOverset/heatTransfer/system/controlDict
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Make sure all preprocessing tools know about the 'overset' bc
-libs            ("liboverset.so");
+libs            (overset);
 
 DebugSwitches
 {
diff --git a/applications/test/parallelOverset/heatTransfer/system/postProcessingDict b/applications/test/parallelOverset/heatTransfer/system/postProcessingDict
index e3e3a031b1c48a953225e7d44c75477581b157fa..f59b39ce27afa826fc2bd34479070b5ee5335626 100644
--- a/applications/test/parallelOverset/heatTransfer/system/postProcessingDict
+++ b/applications/test/parallelOverset/heatTransfer/system/postProcessingDict
@@ -18,16 +18,10 @@ functions
 {
     processorField1
     {
-        // Type of functionObject
         type            processorField;
+        libs            (fieldFunctionObjects);
 
-        // Where to load it from (if not already in solver)
-        libs            ("libfieldFunctionObjects.so");
-
-        // Function object enabled flag
         enabled         true;
-
-        // When to output the average fields
         writeControl    writeTime;
     }
 }
diff --git a/applications/test/parallelOverset/heatTransfer/system/processorField b/applications/test/parallelOverset/heatTransfer/system/processorField
index de13e1ed7a0e65245e54fc4d39c537f0e6cba97b..651d1229ae649fb4ee1fc8ee4573a3b8db563ffd 100644
--- a/applications/test/parallelOverset/heatTransfer/system/processorField
+++ b/applications/test/parallelOverset/heatTransfer/system/processorField
@@ -16,16 +16,10 @@ FoamFile
 
 processorField
 {
-    // Type of functionObject
     type            processorField;
+    libs            (fieldFunctionObjects);
 
-    // Where to load it from (if not already in solver)
-    libs            ("libfieldFunctionObjects.so");
-
-    // Function object enabled flag
     enabled         true;
-
-    // When to output the average fields
     writeControl    timeStep;
 }
 
diff --git a/etc/caseDicts/annotated/runTimePostProcessingDict b/etc/caseDicts/annotated/runTimePostProcessingDict
index 2e46a69c5834916f0a5ef864e0502f9f8eb36874..f30f8bc42e635d8d43f120814fd729b093ddae6b 100644
--- a/etc/caseDicts/annotated/runTimePostProcessingDict
+++ b/etc/caseDicts/annotated/runTimePostProcessingDict
@@ -19,7 +19,7 @@ FoamFile
 type            runTimePostProcessing;
 
 // Where to load it from
-libs            ("runTimePostProcessing");
+libs            (runTimePostProcessing);
 
 // Function object enabled flag
 enabled         true;
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 460fa82d0d96a8b1465ccb9ba933ccdda96cd402..a6979cda63ff269b04830eb14d3fa51af40bccd0 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,7 +48,7 @@ Description
         <functionObjectName>
         {
             type                functionObjectType;
-            libs                ("libMyFunctionObjectlib.so");
+            libs                (myFunctionObjectLib);
             region              defaultRegion;
             enabled             yes;
             timeStart           0;
diff --git a/src/functionObjects/doc/functionObjects.dox b/src/functionObjects/doc/functionObjects.dox
index 154911decbc3343d619e49208553c6aa81d4d20d..fc4c772bef703a0210413ea1ca68c8d45e0d472f 100644
--- a/src/functionObjects/doc/functionObjects.dox
+++ b/src/functionObjects/doc/functionObjects.dox
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2014 OpenFOAM Foundation
-    Copyright (C) 2015-2017 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,7 +61,7 @@ functions
     myFunctionObject    // user-defined name of function object entry
     {
         type                functionObjectType;
-        libs                ("libMyFunctionObjectlib.so");
+        libs                (myFunctionObjectLib);
         region              defaultRegion;
         enabled             yes;
         timeStart           0;
diff --git a/src/functionObjects/field/AMIWeights/AMIWeights.H b/src/functionObjects/field/AMIWeights/AMIWeights.H
index a682d382fdc3f64fa86a5f333834730feded6d56..6d2067930a5d8e48181959fe619f51200a9f3445 100644
--- a/src/functionObjects/field/AMIWeights/AMIWeights.H
+++ b/src/functionObjects/field/AMIWeights/AMIWeights.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     AMIWeights1
     {
         type        AMIWeights;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         writeFields yes;
     }
     \endverbatim
diff --git a/src/functionObjects/field/CourantNo/CourantNo.H b/src/functionObjects/field/CourantNo/CourantNo.H
index 3df29c9c0c77edfa3de44e1f4b9765638ccb22ec..c7e644a3e9d637c7423c5c6fb480c755d556f4be 100644
--- a/src/functionObjects/field/CourantNo/CourantNo.H
+++ b/src/functionObjects/field/CourantNo/CourantNo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2016 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,7 @@ Usage
     CourantNo1
     {
         type        CourantNo;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/Curle/Curle.H b/src/functionObjects/field/Curle/Curle.H
index dd25fd953577b67f6a58200a1f54661f7e947e09..ba58799a723bde214f3328b955d2b31d38390af0 100644
--- a/src/functionObjects/field/Curle/Curle.H
+++ b/src/functionObjects/field/Curle/Curle.H
@@ -57,7 +57,7 @@ Usage
     Curle1
     {
         type        Curle;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         patches     (surface1 surface2);
         c0          330;
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.H b/src/functionObjects/field/DESModelRegions/DESModelRegions.H
index 26437ee438f593371ed2af4d9e615bad8d41378e..e2e09a112a5c93482001f06e180d6a61d09f51be 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.H
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,7 +45,7 @@ Usage
     DESModelRegions1
     {
         type        DESModelRegions;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/PecletNo/PecletNo.H b/src/functionObjects/field/PecletNo/PecletNo.H
index 8f56b657253d978b6dbbc657751aea8a1cdf2348..30259f32c2e234b91ad3870c71e71acbd34f7755 100644
--- a/src/functionObjects/field/PecletNo/PecletNo.H
+++ b/src/functionObjects/field/PecletNo/PecletNo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +39,7 @@ Usage
     PecletNo1
     {
         type        PecletNo;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/Q/Q.H b/src/functionObjects/field/Q/Q.H
index 32d005bafe572beb6f5e6a88bb65bbd857ee9e90..57393012c58d6450f6f45d8c97f773ef3af1f97d 100644
--- a/src/functionObjects/field/Q/Q.H
+++ b/src/functionObjects/field/Q/Q.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,7 +49,7 @@ Usage
     Q1
     {
         type        Q;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/XiReactionRate/XiReactionRate.H b/src/functionObjects/field/XiReactionRate/XiReactionRate.H
index f4931b4c489b77bb1c92a0c13e72c442b1351956..5a5263cdea770bc3b34f4ac137807187711ca888 100644
--- a/src/functionObjects/field/XiReactionRate/XiReactionRate.H
+++ b/src/functionObjects/field/XiReactionRate/XiReactionRate.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     XiReactionRate
     {
         type        XiReactionRate;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/add/add.H b/src/functionObjects/field/add/add.H
index dfb48bc01ad3b34c9082d23dde50739e51078ea3..4c23eeea2277e7b7f90daa1abb1ab4ead056b461 100644
--- a/src/functionObjects/field/add/add.H
+++ b/src/functionObjects/field/add/add.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +41,7 @@ Description
     Ttot
     {
         type            add;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         fields          (T Tdelta);
         result          Ttot;
         executeControl  writeTime;
diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.H b/src/functionObjects/field/blendingFactor/blendingFactor.H
index b7f84e9d65bacb95d4e2f9d175a54e1ab40f00f8..c9ef01cc3fa6383fe4771003aaa55ceafad1b897 100644
--- a/src/functionObjects/field/blendingFactor/blendingFactor.H
+++ b/src/functionObjects/field/blendingFactor/blendingFactor.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,7 +60,7 @@ Usage
     blendingFactor1
     {
         type        blendingFactor;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
 
         ...
 
diff --git a/src/functionObjects/field/columnAverage/columnAverage.H b/src/functionObjects/field/columnAverage/columnAverage.H
index 39cd1a3b6cc434a84577d8d15c815a8b8c3f19f8..03289082c8cfcd96286a6b094c9818bd98e54c84 100644
--- a/src/functionObjects/field/columnAverage/columnAverage.H
+++ b/src/functionObjects/field/columnAverage/columnAverage.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,7 +45,7 @@ Usage
     columnAverage1
     {
         type        columnAverage;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         patches     (front side);
         fields      (U p);
diff --git a/src/functionObjects/field/continuityError/continuityError.H b/src/functionObjects/field/continuityError/continuityError.H
index e58026d57f70766002f9bf3808ea8215919c7d5a..3966a2ba9e9b27277a0ccb92d8f5b0c32f2766fc 100644
--- a/src/functionObjects/field/continuityError/continuityError.H
+++ b/src/functionObjects/field/continuityError/continuityError.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Usage
     continuityError1
     {
         type        continuityError;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         writeToFile yes;
         log         yes;
diff --git a/src/functionObjects/field/ddt2/ddt2.H b/src/functionObjects/field/ddt2/ddt2.H
index 64ebf92922a59a6b21f98915b79c2829f391394b..59b3bc0741e579c8672ae9c6fd9f3d4c15a08265 100644
--- a/src/functionObjects/field/ddt2/ddt2.H
+++ b/src/functionObjects/field/ddt2/ddt2.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,7 +42,7 @@ Usage
     dpdt2
     {
         type        ddt2;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         fields      (p);
         result      d@@dt2;
         ...
diff --git a/src/functionObjects/field/derivedFields/derivedFields.H b/src/functionObjects/field/derivedFields/derivedFields.H
index b21c214d8aea7d2fd22ffcf45bc7604bb2df16ca..469ec66fd43fef0cdc32e8e79fda86ebe0148df2 100644
--- a/src/functionObjects/field/derivedFields/derivedFields.H
+++ b/src/functionObjects/field/derivedFields/derivedFields.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,7 +36,7 @@ Description
     derived
     {
         type    derivedFields;
-        libs    ("libfieldFunctionObjects.so");
+        libs    (fieldFunctionObjects);
 
         fields  (rhoU pTotal);
 
diff --git a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
index 812ab98f88c655085acabaca4d613982766772a8..123b5d3145e1bf75716897c6d115bf6280a9db51 100644
--- a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
+++ b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2015-2018 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ Usage
     extractEulerianParticles1
     {
         type            extractEulerianParticles;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         ...
         faceZone        f0;
         nLocations      10;
diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.H b/src/functionObjects/field/fieldAverage/fieldAverage.H
index 522f1bf60f59e2f75728edea050908bbc906720f..c2a713d59c8c40a22e5fa0de600ec4ffff5b1810 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverage.H
+++ b/src/functionObjects/field/fieldAverage/fieldAverage.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,7 +75,7 @@ Usage
     fieldAverage1
     {
         type                fieldAverage;
-        libs                ("libfieldFunctionObjects.so");
+        libs                (fieldFunctionObjects);
 
         writeControl        writeTime;
 
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index 841c5b68229cb6e1b8dadb456f8566abf7fe3579..9035f285c5c88f64f7964ddd1031dce955732392 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2018 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,7 @@ Usage
     fieldCoordinateSystemTransform1
     {
         type    fieldCoordinateSystemTransform;
-        libs    ("libfieldFunctionObjects.so");
+        libs    (fieldFunctionObjects);
         ...
         fields  ( U UMean UPrime2Mean );
 
diff --git a/src/functionObjects/field/fieldExtents/fieldExtents.H b/src/functionObjects/field/fieldExtents/fieldExtents.H
index 6d6f337809406b2a0b3d6bf48ccf00d9673519b7..18f6b270a8893df2fbe39936f68e2564ea177696 100644
--- a/src/functionObjects/field/fieldExtents/fieldExtents.H
+++ b/src/functionObjects/field/fieldExtents/fieldExtents.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,7 @@ Usage
     fieldExtents1
     {
         type        fieldExtents;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         writeToFile yes;
         log         yes;
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
index c90602c2d77a5a905afc57800ef5d8c053eb4a10..8d8ae94cfb0935b2a89db68542e8cfe4f1029f33 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2017 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ Usage
     fieldMinMax1
     {
         type        fieldMinMax;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         writeToFile yes;
         log         yes;
diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index 169736a5cd0188705afba7e15c1f1c7d8429d8e9..e77bb75e1b93b7c035e5262fa2f768d726beb147 100644
--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2017 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,7 +42,7 @@ Usage
     fieldValueDelta1
     {
         type            fieldValueDelta;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         operation       subtract;
 
         region1
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
index 4431170675133093baa8274f1b51ea5816865306..d5f264f440b1655d494b77c5627396411c105928 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
@@ -46,7 +46,7 @@ Usage
     movingWallPatch
     {
         type            surfaceFieldValue;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
 
         log             true;
         writeControl    writeTime;
@@ -62,7 +62,7 @@ Usage
     surfaceFieldValue1
     {
         type            surfaceFieldValue;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
 
         log             true;
         writeControl    writeTime;
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
index f633e87d4d42829242db2872551eb21fe7a51dd5..499f7196a78e73278d9abc535253a5b2acb2afe5 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
@@ -42,7 +42,7 @@ Usage
     volFieldValue1
     {
         type            volFieldValue;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
 
         log             true;
         writeControl    writeTime;
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.H b/src/functionObjects/field/fluxSummary/fluxSummary.H
index 149cf236ba02b318d09e769af38d8e72fef13e17..129e646b6f431df5a96524054dc74123331c355e 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.H
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ Usage
     fluxSummary1
     {
         type        fluxSummary;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         write       yes;
         log         yes;
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.H
index a872c8c33e0b8e4798d609cc74c18109a01844be..01c42773305bdee832a34ab6fce756fdadd31b1f 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,7 +46,7 @@ Usage
     htc
     {
         type        heatTransferCoeff;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
 
         field       T;
         patches     ("walls.*");
@@ -65,7 +65,7 @@ Usage
     htc
     {
         type        heatTransferCoeff;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
 
         field       T;
         patches     ("walls.*");
@@ -80,7 +80,7 @@ Usage
     htc
     {
         type        heatTransferCoeff;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
 
         field       T;
         patches     ("walls.*");
@@ -93,7 +93,7 @@ Usage
     htc
     {
         type        heatTransferCoeff;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
 
         field       T;
         patches     ("walls.*");
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H
index 22d2ec8a3841b1f296bafd89dc189036fa4878a0..3e9b463622dae95eb6e91bc148c4fca462677346 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H
@@ -46,7 +46,7 @@ Usage
     Example of function object specification:
     \verbatim
         type            heatTransferCoeff;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         ...
         htcModel        ReynoldsAnalogy;
         UInf            (20 0 0);
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.H
index b0a2c2ad8cfc7c6a4c770e94dcecf07359e40911..e5f17ea8da0547b0404c10733f7bf936ee8003e0 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     Example of function object specification:
     \verbatim
         type            heatTransferCoeff;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         ...
         htcModel        fixedReferenceTemperature;
         TRef            300;
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.H
index 81bf3df9a0bed22a6df54b3a034e195bbb1caaa7..f7578eec4d98b09280ace3eedce0fb4147b1ad46 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     Example of function object specification:
     \verbatim
         type            heatTransferCoeff;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         ...
         htcModel        localReferenceTemperature;
         ...
diff --git a/src/functionObjects/field/histogram/histogram.H b/src/functionObjects/field/histogram/histogram.H
index e344d42d39ab36605e78191ada9571557a750344..b5d191d698ee7f560d3f840a151d98cbc13329cb 100644
--- a/src/functionObjects/field/histogram/histogram.H
+++ b/src/functionObjects/field/histogram/histogram.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,8 +39,7 @@ Usage
     histogram1
     {
         type            histogram;
-
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
 
         field           p;
         nBins           100;
diff --git a/src/functionObjects/field/interfaceHeight/interfaceHeight.H b/src/functionObjects/field/interfaceHeight/interfaceHeight.H
index 7d882cca784da192fa6c3c79a4dafd1e0fb34b94..3b37ca68fada2f3d05de92c6a9bef881c1b7a55f 100644
--- a/src/functionObjects/field/interfaceHeight/interfaceHeight.H
+++ b/src/functionObjects/field/interfaceHeight/interfaceHeight.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2019 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +40,7 @@ Description
     interfaceHeight1
     {
         type           interfaceHeight;
-        libs           ("libfieldFunctionObjects.so");
+        libs           (fieldFunctionObjects);
         alpha          alpha.water;
         locations      ((0 0 0) (10 0 0) (20 0 0));
     }
diff --git a/src/functionObjects/field/lambVector/lambVector.H b/src/functionObjects/field/lambVector/lambVector.H
index 97b5cc739055baa879c234d6bcaa8d7e6a5edd44..bf8e2622351e166c289aab4a60d4eeeb68f59c7e 100644
--- a/src/functionObjects/field/lambVector/lambVector.H
+++ b/src/functionObjects/field/lambVector/lambVector.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,7 +42,7 @@ Usage
     lambVector1
     {
         type        lambVector;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         field       UMean;
         ... Base options of fieldExpression ...
     }
diff --git a/src/functionObjects/field/limitFields/limitFields.H b/src/functionObjects/field/limitFields/limitFields.H
index 9a8e9dec3786158aeb772557ca2a3edd3af7891d..25d73bb49f31cbafe28c2960d227c9d3d4f4c8e7 100644
--- a/src/functionObjects/field/limitFields/limitFields.H
+++ b/src/functionObjects/field/limitFields/limitFields.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,7 +43,7 @@ Usage
     limitFields1
     {
         type        limitFields;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         fields      (U);
         limit       max;
diff --git a/src/functionObjects/field/mapFields/mapFields.H b/src/functionObjects/field/mapFields/mapFields.H
index b0bb62b9311cd6850754057732bc161eb4ce0e0d..d233071619287921416ef8335aa1117dd660aa74 100644
--- a/src/functionObjects/field/mapFields/mapFields.H
+++ b/src/functionObjects/field/mapFields/mapFields.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Usage
     mapFields1
     {
         type            mapFields;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         ...
 
         mapRegion       coarseMesh;
diff --git a/src/functionObjects/field/momentum/momentum.H b/src/functionObjects/field/momentum/momentum.H
index 8a0517c3e9af8011f468e1696b1f19feca4c0910..2a8e0b00b803148f255bba4aeaacc7522114f71e 100644
--- a/src/functionObjects/field/momentum/momentum.H
+++ b/src/functionObjects/field/momentum/momentum.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,7 +42,7 @@ Usage
     momentum1
     {
         type        momentum;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         log         yes;
 
diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.H b/src/functionObjects/field/nearWallFields/nearWallFields.H
index b4ab93d606389944df8d38eb87a2d75da456f36e..4ea4b8c636ac82ac57b23f36bf75d4d7b5a35682 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/functionObjects/field/nearWallFields/nearWallFields.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,7 @@ Usage
     nearWallFields1
     {
         type        nearWallFields;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
 
         writeControl writeTime;
 
diff --git a/src/functionObjects/field/particleDistribution/particleDistribution.H b/src/functionObjects/field/particleDistribution/particleDistribution.H
index 530dc9ec5bf9523c1ba76fb666ee8ab21aeecc49..36b5debc882c45ab66d0f03575e17cbd5c6e326f 100644
--- a/src/functionObjects/field/particleDistribution/particleDistribution.H
+++ b/src/functionObjects/field/particleDistribution/particleDistribution.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ Usage
     particleDistribution1
     {
         type        particleDistribution;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         cloud       "myCloud";
         nameVsBinWidth
diff --git a/src/functionObjects/field/pressure/pressure.H b/src/functionObjects/field/pressure/pressure.H
index 86a26bf2ce73e0200628b0ebd9cad2157af14ff1..be01ff916ac7e55ae2d3645f315e01cc228ef49d 100644
--- a/src/functionObjects/field/pressure/pressure.H
+++ b/src/functionObjects/field/pressure/pressure.H
@@ -81,7 +81,7 @@ Usage
     pressure1
     {
         type        pressure;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         mode        staticCoeff;
     }
diff --git a/src/functionObjects/field/processorField/processorField.H b/src/functionObjects/field/processorField/processorField.H
index 1d2f322906d61af1baf8de1ee6ec77dff6532854..662362baf6aeeae40200ceb54cc758bd67cae0b1 100644
--- a/src/functionObjects/field/processorField/processorField.H
+++ b/src/functionObjects/field/processorField/processorField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +40,7 @@ Usage
     processorField1
     {
         type        processorField;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.H b/src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.H
index 3804a6e25e69fca9f46c01a8fd13a31c7ccc3327..d934b0ecfc97831717e15f64d4f2866cffbc5fde 100644
--- a/src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.H
+++ b/src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,7 +62,7 @@ Usage
     proudmanAcousticPower1
     {
         type        proudmanAcousticPower;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
 
         // Required additional entries for incompressible calculations
diff --git a/src/functionObjects/field/readFields/readFields.H b/src/functionObjects/field/readFields/readFields.H
index 115ad42dc8210cd392663241376c0170db85ad57..f53fff37f926f953a187d8931a4079b1e709c3e1 100644
--- a/src/functionObjects/field/readFields/readFields.H
+++ b/src/functionObjects/field/readFields/readFields.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2017 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     readFields1
     {
         type        readFields;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         fields      (U p);
     }
diff --git a/src/functionObjects/field/reference/reference.H b/src/functionObjects/field/reference/reference.H
index 488e42a9062279016983089ce7d2a578665dae51..eb7cc258ea26ec8d075475a136dce2c2528893fe 100644
--- a/src/functionObjects/field/reference/reference.H
+++ b/src/functionObjects/field/reference/reference.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ Usage
     pRef
     {
         type        reference;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         field       p;
         result      pRef;
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index ba3b42f7740be3886510fe3e414c5a0e91f61d5a..3d94650950636aeb1d306b925fbf902f0785a887 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2018 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,7 +66,7 @@ Usage
     regionSizeDistribution1
     {
         type            regionSizeDistribution;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         ...
         field           alpha;
         patches         (inlet);
diff --git a/src/functionObjects/field/setFlow/setFlow.H b/src/functionObjects/field/setFlow/setFlow.H
index c919ae68d0a5e7b042846e47d1b26eb8d921543b..658ed9181548134e8a6a23ebae389f63b26f1025 100644
--- a/src/functionObjects/field/setFlow/setFlow.H
+++ b/src/functionObjects/field/setFlow/setFlow.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,7 +43,7 @@ Usage
     setFlow1
     {
         type            setFlow;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         ...
         mode            rotation;
         scale           1;
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
index 8a4c8ad130dcfad6a7e7582a6eee7e7f4e461c1b..01366b72513963775c3d1600ad9f8835a70ed61f 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -175,7 +175,7 @@ Usage
     stabilityBlendingFactor1
     {
         type                stabilityBlendingFactor;
-        libs                ("libfieldFunctionObjects.so");
+        libs                (fieldFunctionObjects);
 
         log                 true;
         writeToFile         false;
@@ -221,7 +221,7 @@ Usage
         residuals
         {
             type            residuals;
-            libs            ("libutilityFunctionObjects.so");
+            libs            (utilityFunctionObjects);
             writeFields     true;
             writeControl    outputTime;
             fields          (p);
diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H
index 844c864abf43255300c0835db373229ef862bea5..fed75b085c047c7455563ac5c4fe5dacf1449093 100644
--- a/src/functionObjects/field/streamLine/streamLine.H
+++ b/src/functionObjects/field/streamLine/streamLine.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2017 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     streamLine1
     {
         type            streamLine;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
 
         writeControl    writeTime;
 
diff --git a/src/functionObjects/field/subtract/subtract.H b/src/functionObjects/field/subtract/subtract.H
index a5e8ba75fe6b613b642c2cb003656b5243240867..1d4a4c5d7ee45885331291c70caa82b0ed5c946e 100644
--- a/src/functionObjects/field/subtract/subtract.H
+++ b/src/functionObjects/field/subtract/subtract.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +41,7 @@ Description
     Tdiff
     {
         type            subtract;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         fields          (T Tmean);
         result          Tdiff;
         executeControl  writeTime;
diff --git a/src/functionObjects/field/surfaceDistance/surfaceDistance.H b/src/functionObjects/field/surfaceDistance/surfaceDistance.H
index 93515bea97bb5bc155a3874bee313cb534d752bd..2c0f7960a744cd87fa456c721221b39cdbae74ae 100644
--- a/src/functionObjects/field/surfaceDistance/surfaceDistance.H
+++ b/src/functionObjects/field/surfaceDistance/surfaceDistance.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,9 +38,8 @@ Usage
     \verbatim
     surfaceDistance
     {
-        // Where to load it from
-        libs            (libfieldFunctionObjects);
         type            surfaceDistance;
+        libs            (fieldFunctionObjects);
 
         geometry
         {
diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H
index 5c21d1a8f5692579aa80f290c53895b0e8dfe735..bff41b2aa65be5658495760ac01f1f4325d84541 100644
--- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H
+++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,7 @@ Usage
     surfaceInterpolate1
     {
         type        surfaceInterpolate;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         fields      ((p pNear)(U UNear));
     }
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
index 9382b03e236d00288632523da8de640c17e5777d..1c290e4ba7f2002240efc9fe4d1096e57198fd05 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.H
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2018 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,7 +46,7 @@ Usage
     turbulenceFields1
     {
         type        turbulenceFields;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         fields
         (
diff --git a/src/functionObjects/field/valueAverage/valueAverage.H b/src/functionObjects/field/valueAverage/valueAverage.H
index 6c0fa9256d93dd7b957561111240c16478dcda60..f72cb86daa524fdb5a67c399c8217c9c63969022 100644
--- a/src/functionObjects/field/valueAverage/valueAverage.H
+++ b/src/functionObjects/field/valueAverage/valueAverage.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     valueAverage1
     {
         type        valueAverage;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         writeToFile yes;
         log         yes;
diff --git a/src/functionObjects/field/vorticity/vorticity.H b/src/functionObjects/field/vorticity/vorticity.H
index 9e900e67b15582e9874ea1de2674b28e1544b972..51ef99c1c9030d52918f88c658411923a1e5c6d7 100644
--- a/src/functionObjects/field/vorticity/vorticity.H
+++ b/src/functionObjects/field/vorticity/vorticity.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,7 @@ Usage
     vorticity1
     {
         type        vorticity;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index fa89c04ae69f86ca33387f098999678a96d55977..6423f0e5620317ed444c7189edfd3f2034b61a7d 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2017 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,7 @@ Usage
     wallBoundedStreamLine1
     {
         type            wallBoundedStreamLine;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
 
         writeControl    writeTime;
 
diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
index afdfd582b702d450b8c8db4821bb5692466ab8dd..f4b49a1fcca7d3b5ffbbc1e7ddf906a875fc46d8 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
@@ -43,7 +43,7 @@ Usage
     wallHeatFlux1
     {
         type        wallHeatFlux;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         region      fluid;
         patches     (".*Wall");
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.H b/src/functionObjects/field/wallShearStress/wallShearStress.H
index 81ff8cbabb59e679a6125a948924991e01b030a6..0ffc6252ab27215cf159ab894ce76381d24ecb68 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.H
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2016 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ Usage
     wallShearStress1
     {
         type        wallShearStress;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         patches     (".*Wall");
     }
diff --git a/src/functionObjects/field/writeCellCentres/writeCellCentres.H b/src/functionObjects/field/writeCellCentres/writeCellCentres.H
index 43c0f20de11aef117c8d3848a15cbd1763e1f2cc..b1baa6459527e467ba5102ec0194af6786c7f041 100644
--- a/src/functionObjects/field/writeCellCentres/writeCellCentres.H
+++ b/src/functionObjects/field/writeCellCentres/writeCellCentres.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     writeCellCentres
     {
         type        writeCellCentres;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H
index 862d5324a8759b07cd13a7a4d3249965dadb85eb..dcbd14deff6e414fcd0d20672222a78c5cbce108 100644
--- a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H
+++ b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +39,7 @@ Usage
     writeCellVolumes
     {
         type        writeCellVolumes;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/yPlus/yPlus.H b/src/functionObjects/field/yPlus/yPlus.H
index ec0f670102d1fc332838d4670452c1821abedd71..65cedb3d739bd60d929fd5f4fb3b2a8569c9a4a8 100644
--- a/src/functionObjects/field/yPlus/yPlus.H
+++ b/src/functionObjects/field/yPlus/yPlus.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2016 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,7 +42,7 @@ Usage
     yPlus1
     {
         type        yPlus;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.H b/src/functionObjects/field/zeroGradient/zeroGradient.H
index 85472f80b4b4b6e48a2dace840f352e2fc946cfb..fffb8a354fd4527250c2a31e5d9af59234b63ab4 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.H
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,7 +42,7 @@ Usage
     zeroGrad
     {
         type        zeroGradient;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         fields      (U "(T|k|epsilon|omega)");
         result      @@nearWall;
         ...
diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/functionObjects/forces/forceCoeffs/forceCoeffs.H
index a5e37070fc96f10737f9b8aebee229d381d65539..b17fd8c7858dfb3ad3ab9776559d4ad52cbd1137 100644
--- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,7 +66,7 @@ Usage
     forceCoeffs1
     {
         type        forceCoeffs;
-        libs        ("libforces.so");
+        libs        (forces);
         ...
         log         yes;
         writeFields yes;
diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H
index eeb9150e40cc4f0cca2013337752db8e141c6a5f..b92c9089a1c028493112e99452f8b853f7e31321 100644
--- a/src/functionObjects/forces/forces/forces.H
+++ b/src/functionObjects/forces/forces/forces.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2018 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,7 @@ Usage
     forces1
     {
         type        forces;
-        libs        ("libforces.so");
+        libs        (forces);
         ...
         log         yes;
         writeFields yes;
diff --git a/src/functionObjects/initialisation/hydrostaticPressure/hydrostaticPressure.H b/src/functionObjects/initialisation/hydrostaticPressure/hydrostaticPressure.H
index adc76b9ccad2f071fe1d0aec88e5d02f14675407..0911b6557dbf0d5fac3cc8c1ea0689cd59034acf 100644
--- a/src/functionObjects/initialisation/hydrostaticPressure/hydrostaticPressure.H
+++ b/src/functionObjects/initialisation/hydrostaticPressure/hydrostaticPressure.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Usage
     hydrostaticPressure1
     {
         type        hydrostaticPressure;
-        libs        ("libinitialisationFunctionObjects.so");
+        libs        (initialisationFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H
index 873f632c5b7b5067ef688685768eaf794a8ef966..da19031243efa307aaaa0f35e37bda201acfbf75 100644
--- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H
+++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,7 +43,7 @@ Usage
     cloudInfo1
     {
         type        cloudInfo;
-        libs        ("liblagrangianFunctionObjects.so");
+        libs        (lagrangianFunctionObjects);
         ...
         clouds
         (
diff --git a/src/functionObjects/lagrangian/dataCloud/dataCloud.H b/src/functionObjects/lagrangian/dataCloud/dataCloud.H
index 8e663e1d168e2eea33f2e554634a5030fe48c6d0..4943ccf1c7040c6637314b31429556a0db05c9cd 100644
--- a/src/functionObjects/lagrangian/dataCloud/dataCloud.H
+++ b/src/functionObjects/lagrangian/dataCloud/dataCloud.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ Description
     cloudWrite1
     {
         type            dataCloud;
-        libs            ("liblagrangianFunctionObjects.so");
+        libs            (lagrangianFunctionObjects);
         writeControl    writeTime;
         writeInterval   1;
         cloud           myCloud;
diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
index 08a93a250049f4bd6310545d1024a766a646a2cb..7e70ed393a8735df6bbaf0c6e19769f9b9623e80 100644
--- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
+++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,7 +44,7 @@ Usage
     dsmcFields1
     {
         type        dsmcFields;
-        libs        ("liblagrangianFunctionObjects.so");
+        libs        (lagrangianFunctionObjects);
         ...
     }
     \endverbatim
diff --git a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H
index c394ddc8ee68aefdcbc21bf35b70a8bc392470f9..9beeec8d775ba88471b16b968baab5bd79e10764 100644
--- a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H
+++ b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,8 +51,8 @@ Usage
     \verbatim
         tracks
         {
-            libs        ("liblagrangianFunctionObjects.so");
-            type        icoUncoupledKinematicCloud;
+            type    icoUncoupledKinematicCloud;
+            libs    (lagrangianFunctionObjects);
         }
     \endverbatim
 
diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.H b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.H
index 7db92c2c6775b342c68b0bb1356259c1712d7d25..9511de0db04920d6f56f9baf26240ec60b9c7191 100644
--- a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.H
+++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Description
     cloudWrite1
     {
         type            vtkCloud;
-        libs            ("liblagrangianFunctionObjects.so");
+        libs            (lagrangianFunctionObjects);
         writeControl    writeTime;
         writeInterval   1;
         format          ascii;
diff --git a/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.H b/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.H
index 9e13f494bb93b9c07e5804685a1a936b98a0ad44..56dd4a737e0f1cdfdc9cfc89477f64905237ac70 100644
--- a/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.H
+++ b/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Usage
     energySpectrum1
     {
         type        energySpectrum;
-        libs        ("libfieldFunctionObjects.so");
+        libs        (fieldFunctionObjects);
         ...
         log         yes;
     }
diff --git a/src/functionObjects/solvers/energyTransport/energyTransport.H b/src/functionObjects/solvers/energyTransport/energyTransport.H
index 0e7d49a2f8102ea14dfc261a317726b75da54bc4..5376401cff3597ac4fec3d0e037e9c5f0095b3e7 100644
--- a/src/functionObjects/solvers/energyTransport/energyTransport.H
+++ b/src/functionObjects/solvers/energyTransport/energyTransport.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,7 +50,7 @@ Usage
         energy
         {
             type            energyTransport;
-            libs             ("libenergyTransportFunctionObjects.so");
+            libs            (energyTransportFunctionObjects);
 
             enabled         true;
             writeControl    outputTime;
@@ -96,7 +96,7 @@ Usage
         energy
         {
             type            energyTransport;
-            libs            ("libenergyTransportFunctionObjects.so");
+            libs            (energyTransportFunctionObjects);
 
             enabled         true;
             writeControl    outputTime;
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.H b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
index e468df4ce779d54687e6dfb177d37b9aa5f97e16..e22cf8dc4b5da834b5fc528368bc27e57340feeb 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.H
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,7 +57,7 @@ Usage
         scalar1
         {
             type            scalarTransport;
-            libs            ("libsolverFunctionObjects.so");
+            libs            (solverFunctionObjects);
 
             resetOnStartUp  no;
             region          cabin;
@@ -81,7 +81,7 @@ Usage
         sTransport
         {
             type            scalarTransport;
-            libs            ("libsolverFunctionObjects.so");
+            libs            (solverFunctionObjects);
 
             enabled         true;
             writeControl    outputTime;
diff --git a/src/functionObjects/utilities/abort/abort.H b/src/functionObjects/utilities/abort/abort.H
index 8484fbfb7906dcf1eeef1a0b7458541bb12f463c..948ca40fc151d4b7490e6b21a4dbc113af5d9657 100644
--- a/src/functionObjects/utilities/abort/abort.H
+++ b/src/functionObjects/utilities/abort/abort.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,7 +46,7 @@ Description
     abort
     {
         type    abort;
-        libs    ("libutilityFunctionObjects.so");
+        libs    (utilityFunctionObjects);
 
         file    "<case>/GOODBYE";
         action  writeNow
diff --git a/src/functionObjects/utilities/areaWrite/areaWrite.H b/src/functionObjects/utilities/areaWrite/areaWrite.H
index 1cadc5f199c8041524b42f0f4cc11b5e548fbffb..aa645f5c9743bfc120123fd1fc1f03dbef89fd81 100644
--- a/src/functionObjects/utilities/areaWrite/areaWrite.H
+++ b/src/functionObjects/utilities/areaWrite/areaWrite.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,7 +35,7 @@ Description
     surfaces
     {
         type    areaWrite;
-        libs    ("libutilityFunctionObjects.so");
+        libs    (utilityFunctionObjects);
 
         // Write at same frequency as fields
         writeControl    outputTime;
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
index ef07eebda5cb8d36ec63bce8a7af191c7cbe806f..c0914e20315071aa2325f20d507a54f585854f9f 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,9 +51,9 @@ Usage
     \verbatim
     difference
     {
-        libs        ("libutilityFunctionObjects.so");
-
         type coded;
+        libs (utilityFunctionObjects);
+
         // Name of on-the-fly generated functionObject
         name writeMagU;
         codeWrite
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.H b/src/functionObjects/utilities/ensightWrite/ensightWrite.H
index 17d4f92d5cc28a85ba814407ec66c6c057a6a772..f91aadc040e61de8813a332041916b869ca63a7f 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWrite.H
+++ b/src/functionObjects/utilities/ensightWrite/ensightWrite.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2018 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ Description
     ensight
     {
         type            ensightWrite;
-        libs            ("libutilityFunctionObjects.so");
+        libs            (utilityFunctionObjects);
         writeControl    writeTime;
         writeInterval   1;
         format          binary;
diff --git a/src/functionObjects/utilities/parProfiling/parProfiling.H b/src/functionObjects/utilities/parProfiling/parProfiling.H
index 7cc6fc3dd4e65ed614efd2eb28e75827960c78cf..873e01af28231c61ab27034fc68337891281c569 100644
--- a/src/functionObjects/utilities/parProfiling/parProfiling.H
+++ b/src/functionObjects/utilities/parProfiling/parProfiling.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Usage
     profiling
     {
         type  parProfiling;
-        libs  ("libutilityFunctionObjects.so");
+        libs  (utilityFunctionObjects);
 
         // Report stats on exit only (instead of every time step)
         executeControl  onEnd;
diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
index 0145952ddab04e1b7508cd2df9e67d34def85799..d61afd35f94649cba7ed1a1796aec158771df788 100644
--- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2016 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +39,7 @@ Usage
     removeRegisteredObject1
     {
         type        removeRegisteredObject;
-        libs        ("libutilityFunctionObjects.so");
+        libs        (utilityFunctionObjects);
         ...
         objects     (obj1 obj2);
     }
diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index 22c7914159ca3390efcedae05420fba68e043140..476aab6810b4fdb4c4b63b5f29777557b97c5c90 100644
--- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,7 +45,7 @@ Usage
     setTimeStep1
     {
         type        setTimeStep;
-        libs        ("libutilityFunctionObjects.so");
+        libs        (utilityFunctionObjects);
 
         deltaT      table ((0 5e-4)(0.01 1e-3));
 
diff --git a/src/functionObjects/utilities/solverInfo/solverInfo.H b/src/functionObjects/utilities/solverInfo/solverInfo.H
index ac68fad315327a703f5aa10440d9628bfc2e4dac..e54e9f370932871a9003fe0d389bd15fb77f3ca8 100644
--- a/src/functionObjects/utilities/solverInfo/solverInfo.H
+++ b/src/functionObjects/utilities/solverInfo/solverInfo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,7 @@ Usage
     solverInfo
     {
         type            solverInfo;
-        libs            ("libutilityFunctionObjects.so");
+        libs            (utilityFunctionObjects);
         ...
         fields          (U p);
         writeResidualFields yes;
diff --git a/src/functionObjects/utilities/systemCall/systemCall.H b/src/functionObjects/utilities/systemCall/systemCall.H
index c24602d2213f485ee8f26673573ac2e066836dbe..e88329e9d32b4e71185562082d96e66cdb14ee96 100644
--- a/src/functionObjects/utilities/systemCall/systemCall.H
+++ b/src/functionObjects/utilities/systemCall/systemCall.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,7 +44,7 @@ Usage
     systemCall1
     {
         type        systemCall;
-        libs        ("libutilityFunctionObjects.so");
+        libs        (utilityFunctionObjects);
         ...
         executeCalls
         (
diff --git a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
index 7bc0f8d09978fd62c1ea1583be135ce8feff5e2c..0438f2499c69fa296a8f2e1502e1b53b5077bdf4 100644
--- a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
+++ b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ Usage
     probes
     {
         type            thermoCoupleProbes;
-        libs            ("libutilityFunctionObjects.so");
+        libs            (utilityFunctionObjects);
         writeControl    timeStep;
         writeInterval   1;
 
diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index eb4e54166111b76d043a263d56e51c9c48ce6128..ae772b9c9b5a2f724ebd53abe1c2f98c42229ad0 100644
--- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Usage
     fileUpdate1
     {
         type              timeActivatedFileUpdate;
-        libs              ("libutilityFunctionObjects.so");
+        libs              (utilityFunctionObjects);
         writeControl      timeStep;
         writeInterval     1;
         fileToUpdate      "<system>/fvSolution";
diff --git a/src/functionObjects/utilities/timeInfo/timeInfo.H b/src/functionObjects/utilities/timeInfo/timeInfo.H
index a378f150b4e047fe14b5f54f0bc9d1e1b71f1378..ea542313890945c54224bafbba140f9844a86460 100644
--- a/src/functionObjects/utilities/timeInfo/timeInfo.H
+++ b/src/functionObjects/utilities/timeInfo/timeInfo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,8 +36,7 @@ Description
     time
     {
         type            timeInfo;
-
-        libs            ("libutilityFunctionObjects.so");
+        libs            (utilityFunctionObjects);
 
         writeControl    timeStep;
         writeInterval   1;
diff --git a/src/functionObjects/utilities/vtkWrite/vtkWrite.H b/src/functionObjects/utilities/vtkWrite/vtkWrite.H
index e898c85cda96bfb00d90b8f4a8d505f15c37a095..60ddff7822121d1477f848f7511fdb08430218a4 100644
--- a/src/functionObjects/utilities/vtkWrite/vtkWrite.H
+++ b/src/functionObjects/utilities/vtkWrite/vtkWrite.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Description
     vtkWrite1
     {
         type            vtkWrite;
-        libs            ("libutilityFunctionObjects.so");
+        libs            (utilityFunctionObjects);
         writeControl    writeTime;
         writeInterval   1;
         format          binary;
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.H b/src/functionObjects/utilities/writeObjects/writeObjects.H
index 63855d6509dcc4d5528f2a528703bf105f41e252..a8edb47ca57c21e0b6f0417ad22ac8f4a3f8ffd8 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.H
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,7 +57,7 @@ Usage
     writeObjects1
     {
         type        writeObjects;
-        libs        ("libutilityFunctionObjects.so");
+        libs        (utilityFunctionObjects);
         ...
         objects     (obj1 obj2);
         writeOption anyWrite;
diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H
index 3722bbe55691c6e8b2f125927090f0497b832616..daf0a823e23ae7dba50191b306f86edac6b460fc 100644
--- a/src/sampling/probes/patchProbes.H
+++ b/src/sampling/probes/patchProbes.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2018 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Description
     patchProbes
     {
         type            patchProbes;
-        libs            ( "libsampling.so" );
+        libs            (sampling);
 
         // Name of the directory for probe data
         name            patchProbes;
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index d47635248a5e0baf7232eacedbf57cab07c08b26..de56fa8f79973087995ec4236b9050666fe4995d 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2018 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Description
     probes
     {
         type            probes;
-        libs            ("libsampling.so");
+        libs            (sampling);
 
         // Name of the directory for probe data
         name            probes;
diff --git a/src/sampling/sampledSet/patchEdge/patchEdgeSet.H b/src/sampling/sampledSet/patchEdge/patchEdgeSet.H
index 0477f695d01e7126913fbab48ef5e63fd6a68eb5..849dc63dfff2475b2574327f304455541b32e342 100644
--- a/src/sampling/sampledSet/patchEdge/patchEdgeSet.H
+++ b/src/sampling/sampledSet/patchEdge/patchEdgeSet.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,7 +35,7 @@ Usage
     sets
     {
         type                sets;
-        libs                ("libsampling.so");
+        libs                (sampling);
         writeControl        timeStep;
         writeInterval       1;
 
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index 641a7bf2bc36d101b7cd5e86fd2a0e4aa90c4ee2..8b1c82752f045a89189f8bdbf1e6035f4a736d1c 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -38,7 +38,7 @@ Description
     surfaces
     {
         type    surfaces;
-        libs    ("libsampling.so");
+        libs    (sampling);
 
         // Write at same frequency as fields
         writeControl    outputTime;
diff --git a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
index 966350b2587df400dc6f9e7b25a4c133e45a8b94..9f3c992a385017dfae5cc9b41f4048db9ac5f878 100644
--- a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
+++ b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Description
     sixDoFRigidBodyState
     {
         type           sixDoFRigidBodyState;
-        libs           ("libsixDoFRigidBodyState.so");
+        libs           (sixDoFRigidBodyState);
         angleFormat    degrees;
     }
     \endverbatim
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS-continuation/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS-continuation/system/controlDict
index 1dc6fea6b1192003f77dbd901bb41c14bb6bb45b..744b7a60524c0a19038a0aedce6e05b00bfd3b49 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS-continuation/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS-continuation/system/controlDict
@@ -49,7 +49,7 @@ functions
     yPlus
     {
         type            yPlus;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         writeControl    writeTime;
     }
 }
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/system/controlDict
index 1dc6fea6b1192003f77dbd901bb41c14bb6bb45b..744b7a60524c0a19038a0aedce6e05b00bfd3b49 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/opt/BFGS/op1/system/controlDict
@@ -49,7 +49,7 @@ functions
     yPlus
     {
         type            yPlus;
-        libs            ("libfieldFunctionObjects.so");
+        libs            (fieldFunctionObjects);
         writeControl    writeTime;
     }
 }
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/probes b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/probes
index 20eeefe3783c5432715e47f784d560fb2165210f..1218fed2e65d0db7ffe37f84a62646cd48c6e38c 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/probes
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/probes
@@ -19,7 +19,7 @@ probes
     name    probes;
     type    probes;
 
-    libs    ("libsampling.so");
+    libs    (sampling);
 
     writeControl   timeStep;
     writeInterval  1;
diff --git a/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/system/controlDict b/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/system/controlDict
index b42e535d9ec75e25a96a4dc26577a36c897a4e38..e07bf4712f024f993e45ce237858c504c6b6901e 100644
--- a/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/system/controlDict
+++ b/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/system/controlDict
@@ -56,7 +56,7 @@ functions
     interfaceHeight1
     {
         type           interfaceHeight;
-        libs           ("libfieldFunctionObjects.so");
+        libs           (fieldFunctionObjects);
         alpha          alpha.liquid;
         locations      ((0 0 0));
         direction       (1 0 0);
diff --git a/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/system/controlDict b/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/system/controlDict
index 35f952a4b8488901156a362c34ffcdff648bc881..319739f59caa1e4f79b88c9fba5f1421f781f49e 100644
--- a/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/system/controlDict
+++ b/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/system/controlDict
@@ -56,7 +56,7 @@ functions
     interfaceHeight1
     {
         type           interfaceHeight;
-        libs           ("libfieldFunctionObjects.so");
+        libs           (fieldFunctionObjects);
         alpha          alpha.liquid;
         locations      ((0 0.0001 1e-5));
         direction       (1 0 0);