From 997c9a232cf8ba79866fead96bf1b3efdd3ee79c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sat, 23 May 2020 17:44:25 +0200
Subject: [PATCH] STYLE: use compact form for libs () entries

---
 .../functionObjects/phaseForces/phaseForces.H          |  4 ++--
 .../sizeDistribution/sizeDistribution.H                |  2 +-
 applications/test/PDRblockMesh/box0/system/controlDict |  2 +-
 .../mapDistributePolyMesh/cavity/system/processorField |  6 ++----
 .../parallelOverset/heatTransfer/system/controlDict    |  2 +-
 .../heatTransfer/system/postProcessingDict             |  8 +-------
 .../parallelOverset/heatTransfer/system/processorField |  8 +-------
 etc/caseDicts/annotated/runTimePostProcessingDict      |  2 +-
 .../db/functionObjects/functionObject/functionObject.H |  4 ++--
 src/functionObjects/doc/functionObjects.dox            |  4 ++--
 src/functionObjects/field/AMIWeights/AMIWeights.H      |  4 ++--
 src/functionObjects/field/CourantNo/CourantNo.H        |  4 ++--
 src/functionObjects/field/Curle/Curle.H                |  2 +-
 .../field/DESModelRegions/DESModelRegions.H            |  4 ++--
 src/functionObjects/field/PecletNo/PecletNo.H          |  4 ++--
 src/functionObjects/field/Q/Q.H                        |  4 ++--
 .../field/XiReactionRate/XiReactionRate.H              |  4 ++--
 src/functionObjects/field/add/add.H                    |  3 ++-
 .../field/blendingFactor/blendingFactor.H              |  4 ++--
 .../field/columnAverage/columnAverage.H                |  4 ++--
 .../field/continuityError/continuityError.H            |  4 ++--
 src/functionObjects/field/ddt2/ddt2.H                  |  4 ++--
 .../field/derivedFields/derivedFields.H                |  4 ++--
 .../extractEulerianParticles.H                         |  4 ++--
 src/functionObjects/field/fieldAverage/fieldAverage.H  |  4 ++--
 .../fieldCoordinateSystemTransform.H                   |  4 ++--
 src/functionObjects/field/fieldExtents/fieldExtents.H  |  4 ++--
 src/functionObjects/field/fieldMinMax/fieldMinMax.H    |  4 ++--
 .../fieldValues/fieldValueDelta/fieldValueDelta.H      |  4 ++--
 .../fieldValues/surfaceFieldValue/surfaceFieldValue.H  |  4 ++--
 .../field/fieldValues/volFieldValue/volFieldValue.H    |  2 +-
 src/functionObjects/field/fluxSummary/fluxSummary.H    |  4 ++--
 .../field/heatTransferCoeff/heatTransferCoeff.H        | 10 +++++-----
 .../ReynoldsAnalogy/ReynoldsAnalogy.H                  |  2 +-
 .../fixedReferenceTemperature.H                        |  4 ++--
 .../localReferenceTemperature.H                        |  4 ++--
 src/functionObjects/field/histogram/histogram.H        |  5 ++---
 .../field/interfaceHeight/interfaceHeight.H            |  3 ++-
 src/functionObjects/field/lambVector/lambVector.H      |  4 ++--
 src/functionObjects/field/limitFields/limitFields.H    |  4 ++--
 src/functionObjects/field/mapFields/mapFields.H        |  4 ++--
 src/functionObjects/field/momentum/momentum.H          |  4 ++--
 .../field/nearWallFields/nearWallFields.H              |  4 ++--
 .../field/particleDistribution/particleDistribution.H  |  4 ++--
 src/functionObjects/field/pressure/pressure.H          |  2 +-
 .../field/processorField/processorField.H              |  3 ++-
 .../proudmanAcousticPower/proudmanAcousticPower.H      |  4 ++--
 src/functionObjects/field/readFields/readFields.H      |  4 ++--
 src/functionObjects/field/reference/reference.H        |  4 ++--
 .../regionSizeDistribution/regionSizeDistribution.H    |  4 ++--
 src/functionObjects/field/setFlow/setFlow.H            |  4 ++--
 .../stabilityBlendingFactor/stabilityBlendingFactor.H  |  6 +++---
 src/functionObjects/field/streamLine/streamLine.H      |  4 ++--
 src/functionObjects/field/subtract/subtract.H          |  3 ++-
 .../field/surfaceDistance/surfaceDistance.H            |  5 ++---
 .../field/surfaceInterpolate/surfaceInterpolate.H      |  4 ++--
 .../field/turbulenceFields/turbulenceFields.H          |  4 ++--
 src/functionObjects/field/valueAverage/valueAverage.H  |  4 ++--
 src/functionObjects/field/vorticity/vorticity.H        |  4 ++--
 .../wallBoundedStreamLine/wallBoundedStreamLine.H      |  4 ++--
 src/functionObjects/field/wallHeatFlux/wallHeatFlux.H  |  2 +-
 .../field/wallShearStress/wallShearStress.H            |  4 ++--
 .../field/writeCellCentres/writeCellCentres.H          |  4 ++--
 .../field/writeCellVolumes/writeCellVolumes.H          |  4 ++--
 src/functionObjects/field/yPlus/yPlus.H                |  4 ++--
 src/functionObjects/field/zeroGradient/zeroGradient.H  |  4 ++--
 src/functionObjects/forces/forceCoeffs/forceCoeffs.H   |  4 ++--
 src/functionObjects/forces/forces/forces.H             |  4 ++--
 .../hydrostaticPressure/hydrostaticPressure.H          |  4 ++--
 src/functionObjects/lagrangian/cloudInfo/cloudInfo.H   |  4 ++--
 src/functionObjects/lagrangian/dataCloud/dataCloud.H   |  4 ++--
 src/functionObjects/lagrangian/dsmcFields/dsmcFields.H |  3 ++-
 .../icoUncoupledKinematicCloud.H                       |  5 +++--
 src/functionObjects/lagrangian/vtkCloud/vtkCloud.H     |  4 ++--
 .../randomProcesses/energySpectrum/energySpectrum.H    |  4 ++--
 .../solvers/energyTransport/energyTransport.H          |  6 +++---
 .../solvers/scalarTransport/scalarTransport.H          |  6 +++---
 src/functionObjects/utilities/abort/abort.H            |  4 ++--
 src/functionObjects/utilities/areaWrite/areaWrite.H    |  4 ++--
 .../codedFunctionObject/codedFunctionObject.H          |  6 +++---
 .../utilities/ensightWrite/ensightWrite.H              |  4 ++--
 .../utilities/parProfiling/parProfiling.H              |  4 ++--
 .../removeRegisteredObject/removeRegisteredObject.H    |  4 ++--
 .../utilities/setTimeStep/setTimeStepFunctionObject.H  |  4 ++--
 src/functionObjects/utilities/solverInfo/solverInfo.H  |  4 ++--
 src/functionObjects/utilities/systemCall/systemCall.H  |  3 ++-
 .../utilities/thermoCoupleProbes/thermoCoupleProbes.H  |  4 ++--
 .../timeActivatedFileUpdate/timeActivatedFileUpdate.H  |  4 ++--
 src/functionObjects/utilities/timeInfo/timeInfo.H      |  5 ++---
 src/functionObjects/utilities/vtkWrite/vtkWrite.H      |  4 ++--
 .../utilities/writeObjects/writeObjects.H              |  4 ++--
 src/sampling/probes/patchProbes.H                      |  4 ++--
 src/sampling/probes/probes.H                           |  4 ++--
 src/sampling/sampledSet/patchEdge/patchEdgeSet.H       |  4 ++--
 .../sampledSurface/sampledSurfaces/sampledSurfaces.H   |  2 +-
 src/sixDoFRigidBodyState/sixDoFRigidBodyState.H        |  4 ++--
 .../turbulent/opt/BFGS-continuation/system/controlDict |  2 +-
 .../sbend/turbulent/opt/BFGS/op1/system/controlDict    |  2 +-
 .../PDRsetFields/simplePipeCage/system/probes          |  2 +-
 .../stefanProblem/system/controlDict                   |  2 +-
 .../stefanProblem/system/controlDict                   |  2 +-
 101 files changed, 193 insertions(+), 203 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H
index 94e93bd1fe2..69cae68456d 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 37d2c7fecf9..ca21b6a64a1 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 604309ae53c..264a99e4489 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 36c1f6c69e7..73d69324285 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 14c0f98e3ce..9b3aa449481 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 e3e3a031b1c..f59b39ce27a 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 de13e1ed7a0..651d1229ae6 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 2e46a69c583..f30f8bc42e6 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 460fa82d0d9..a6979cda63f 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 154911decbc..fc4c772bef7 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 a682d382fdc..6d2067930a5 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 3df29c9c0c7..c7e644a3e9d 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 dd25fd95357..ba58799a723 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 26437ee438f..e2e09a112a5 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 8f56b657253..30259f32c2e 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 32d005bafe5..57393012c58 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 f4931b4c489..5a5263cdea7 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 dfb48bc01ad..4c23eeea227 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 b7f84e9d65b..c9ef01cc3fa 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 39cd1a3b6cc..03289082c8c 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 e58026d57f7..3966a2ba9e9 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 64ebf92922a..59b3bc0741e 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 b21c214d8ae..469ec66fd43 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 812ab98f88c..123b5d3145e 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 522f1bf60f5..c2a713d59c8 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 841c5b68229..9035f285c5c 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 6d6f3378094..18f6b270a88 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 c90602c2d77..8d8ae94cfb0 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 169736a5cd0..e77bb75e1b9 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 44311706751..d5f264f440b 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 f633e87d4d4..499f7196a78 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 149cf236ba0..129e646b6f4 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 a872c8c33e0..01c42773305 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 22d2ec8a384..3e9b463622d 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 b0a2c2ad8cf..e5f17ea8da0 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 81bf3df9a0b..f7578eec4d9 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 e344d42d39a..b5d191d698e 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 7d882cca784..3b37ca68fad 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 97b5cc73905..bf8e2622351 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 9a8e9dec378..25d73bb49f3 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 b0bb62b9311..d2330716192 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 8a0517c3e9a..2a8e0b00b80 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 b4ab93d6063..4ea4b8c636a 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 530dc9ec5bf..36b5debc882 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 86a26bf2ce7..be01ff916ac 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 1d2f322906d..662362baf6a 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 3804a6e25e6..d934b0ecfc9 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 115ad42dc82..f53fff37f92 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 488e42a9062..eb7cc258ea2 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 ba3b42f7740..3d946509506 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 c919ae68d0a..658ed918154 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 8a4c8ad130d..01366b72513 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 844c864abf4..fed75b085c0 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 a5e8ba75fe6..1d4a4c5d7ee 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 93515bea97b..2c0f7960a74 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 5c21d1a8f56..bff41b2aa65 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 9382b03e236..1c290e4ba7f 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 6c0fa9256d9..f72cb86daa5 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 9e900e67b15..51ef99c1c90 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 fa89c04ae69..6423f0e5620 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 afdfd582b70..f4b49a1fcca 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 81ff8cbabb5..0ffc6252ab2 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 43c0f20de11..b1baa645952 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 862d5324a87..dcbd14deff6 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 ec0f670102d..65cedb3d739 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 85472f80b4b..fffb8a354fd 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 a5e37070fc9..b17fd8c7858 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 eeb9150e40c..b92c9089a1c 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 adc76b9ccad..0911b6557db 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 873f632c5b7..da19031243e 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 8e663e1d168..4943ccf1c70 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 08a93a25004..7e70ed393a8 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 c394ddc8ee6..9beeec8d775 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 7db92c2c677..9511de0db04 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 9e13f494bb9..56dd4a737e0 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 0e7d49a2f81..5376401cff3 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 e468df4ce77..e22cf8dc4b5 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 8484fbfb790..948ca40fc15 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 1cadc5f199c..aa645f5c974 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 ef07eebda5c..c0914e20315 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 17d4f92d5cc..f91aadc040e 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 7cc6fc3dd4e..873e01af282 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 0145952ddab..d61afd35f94 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 22c7914159c..476aab6810b 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 ac68fad3153..e54e9f37093 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 c24602d2213..e88329e9d32 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 7bc0f8d0997..0438f2499c6 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 eb4e5416611..ae772b9c9b5 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 a378f150b4e..ea542313890 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 e898c85cda9..60ddff78221 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 63855d6509d..a8edb47ca57 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 3722bbe5569..daf0a823e23 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 d47635248a5..de56fa8f799 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 0477f695d01..849dc63dfff 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 641a7bf2bc3..8b1c82752f0 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 966350b2587..9f3c992a385 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 1dc6fea6b11..744b7a60524 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 1dc6fea6b11..744b7a60524 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 20eeefe3783..1218fed2e65 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 b42e535d9ec..e07bf4712f0 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 35f952a4b84..319739f59ca 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);
-- 
GitLab