diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
index 344ae189f92df07ebf3e1629e1a1872f4f18e864..b26960547208040a28efd8ba775dc8a6f0b983b8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict
@@ -55,7 +55,7 @@ functions
         type            writeVTK;
 
         // Where to load it from
-        functionObjectLibs ("libfoamToVTK.so");
+        libs ("libfoamToVTK.so");
 
         // When to write:
         //  timeStep            (with optional writeInterval)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H
index b8c1968f81545f7ee613b8fa26f5f6e2d9504c7e..3dca57387d4923bce9e7342448e53a2f49d1a010 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H
@@ -40,7 +40,7 @@ Description
         writeVTK1
         {
             type        writeVTK;
-            functionObjectLibs ("libIOFunctionObjects.so");
+            libs ("libIOFunctionObjects.so");
             ...
             objectNames (obj1 obj2);
         }
diff --git a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
index 2d540dae0952c488a9ed2c3ab22dfa1d02416b8c..31b1ab25ccfd6303a743fdcad08d0fbdf9ac6030 100644
--- a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            faceSource;
-functionObjectLibs ("libfieldFunctionObjects.so");
+libs ("libfieldFunctionObjects.so");
 
 enabled         true;
 writeControl   timeStep;
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2.cfg b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
index d61c0d4f1f2ad90f132064c4390c2dd53cfb2c2c..cb4a63de6f25b427aad5ef98678efc71720d8621 100644
--- a/etc/caseDicts/postProcessing/fields/Lambda2.cfg
+++ b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            Lambda2;
-functionObjectLibs ("libutilityFunctionObjects.so");
+libs ("libutilityFunctionObjects.so");
 
 enabled         true;
 writeControl   writeTime;
diff --git a/etc/caseDicts/postProcessing/fields/Q.cfg b/etc/caseDicts/postProcessing/fields/Q.cfg
index a9bf4b235f0414ad2d01ea49cf462eef1d2288a4..d486d85ae4661bfb3b7567b7b9f53b528562aab4 100644
--- a/etc/caseDicts/postProcessing/fields/Q.cfg
+++ b/etc/caseDicts/postProcessing/fields/Q.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            Q;
-functionObjectLibs ("libutilityFunctionObjects.so");
+libs ("libutilityFunctionObjects.so");
 
 enabled         true;
 writeControl   writeTime;
diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/postProcessing/forces/forces.cfg
index 9d78c1d2cbf3aa3386207d4e073cd81fd2ef6b55..97b9cd833a673e1db1b7d89cc02c4ade8a4b6459 100644
--- a/etc/caseDicts/postProcessing/forces/forces.cfg
+++ b/etc/caseDicts/postProcessing/forces/forces.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            forces;
-functionObjectLibs ( "libforces.so" );
+libs ( "libforces.so" );
 
 enabled         true;
 writeControl   timeStep;
diff --git a/etc/caseDicts/postProcessing/graphs/graph.cfg b/etc/caseDicts/postProcessing/graphs/graph.cfg
index f11826cb2696a91b3313fd856bd3a6e639f1dd9d..2959089784ff7e3fc371243e6390ccc54132fa6d 100644
--- a/etc/caseDicts/postProcessing/graphs/graph.cfg
+++ b/etc/caseDicts/postProcessing/graphs/graph.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            sets;
-functionObjectLibs ("libsampling.so");
+libs ("libsampling.so");
 
 enabled         true;
 writeControl   writeTime;
diff --git a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
index d7de7029c6a23868258b96384e5282ca06ff3f82..5374dc7dcd0bf9a092069f585120441709369317 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            cellSource;
-functionObjectLibs ("libfieldFunctionObjects.so");
+libs ("libfieldFunctionObjects.so");
 
 enabled         true;
 writeControl   timeStep;
diff --git a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
index 4f6d9f36b2782a2904b95aef2cc6d429e990425c..24053044446ba8adc2a4338d073fb4dda6668c60 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            faceSource;
-functionObjectLibs ("libfieldFunctionObjects.so");
+libs ("libfieldFunctionObjects.so");
 
 enabled         true;
 writeControl   timeStep;
diff --git a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
index 93c1a82eae7621f68e5787f561b3782871119289..b77e7f66e2f85aede275031608629ae3f0bf8e39 100644
--- a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            fieldMinMax;
-functionObjectLibs ("libfieldFunctionObjects.so");
+libs ("libfieldFunctionObjects.so");
 
 enabled         true;
 writeControl   timeStep;
diff --git a/etc/caseDicts/postProcessing/numerical/residuals.cfg b/etc/caseDicts/postProcessing/numerical/residuals.cfg
index a775830cf549725834e3501bb543767ca8b867b3..9ed37bca8ef504aab0399d150a8dd13c2bf71660 100644
--- a/etc/caseDicts/postProcessing/numerical/residuals.cfg
+++ b/etc/caseDicts/postProcessing/numerical/residuals.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            residuals;
-functionObjectLibs ("libutilityFunctionObjects.so");
+libs ("libutilityFunctionObjects.so");
 
 enabled         true;
 writeControl   timeStep;
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
index b1f5dfb82c2d2839b404bbd75c8df4f9c623275c..f93107379ddf42a5029447b0196b99d551c8d2b3 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            fieldValueDelta;
-functionObjectLibs ("libfieldFunctionObjects.so");
+libs ("libfieldFunctionObjects.so");
 
 operation       subtract;
 
diff --git a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
index b548b156fd80a79eedccf40b42736f1350ec477f..47a1f60ad18679d9640a33907d5388b61b94f0a3 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            pressureTools;
-functionObjectLibs ("libutilityFunctionObjects.so");
+libs ("libutilityFunctionObjects.so");
 
 enabled         true;
 writeControl   writeTime;
diff --git a/etc/caseDicts/postProcessing/probes/cloud.cfg b/etc/caseDicts/postProcessing/probes/cloud.cfg
index b474fc9e2a56a20d7478a097f670ea4a629e9ddc..6ce08876f2af117fe46a305c7d90ce9c2d3d56bf 100644
--- a/etc/caseDicts/postProcessing/probes/cloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/cloud.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            sets;
-functionObjectLibs ("libsampling.so");
+libs ("libsampling.so");
 
 enabled         true;
 writeControl   writeTime;
diff --git a/etc/caseDicts/postProcessing/probes/probes.cfg b/etc/caseDicts/postProcessing/probes/probes.cfg
index 5a9b63aaa97957f89480aeb37997667538e95df9..a3eb75d98ad4105b2027c2ec32040b4def08bc76 100644
--- a/etc/caseDicts/postProcessing/probes/probes.cfg
+++ b/etc/caseDicts/postProcessing/probes/probes.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            probes;
-functionObjectLibs ("libsampling.so");
+libs ("libsampling.so");
 
 enabled         true;
 writeControl   timeStep;
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
index eaeea4073d07573da1af539b61c6b393ffb93f86..7f21398303cf4b5731a06eaf6fb6286ad159cf1f 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            scalarTransport;
-functionObjectLibs ("libutilityFunctionObjects.so");
+libs ("libutilityFunctionObjects.so");
 
 enabled         true;
 writeControl   timeStep;
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines.cfg b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
index dd810f96df2cf0f99a0bf09b0b9443469e210e42..e02e8f01e2264bb9fcc431b83bc22816b0e9b55f 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines.cfg
+++ b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            streamLine;
-functionObjectLibs ( "libfieldFunctionObjects.so" );
+libs ( "libfieldFunctionObjects.so" );
 
 writeControl   writeTime;
 
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces.cfg b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
index 203f753e4d547a534a96ff578bd3130a93eb8eb2..919d7b4f98d7b5a5ae5b57ea98b28838b9515073 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces.cfg
+++ b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            surfaces;
-functionObjectLibs ("libsampling.so");
+libs ("libsampling.so");
 
 enabled         true;
 writeControl   writeTime;
diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
index 6dbf37d3fb9ecfa16a5dada8113245dd761262c2..dac326842b413132ab7d8d037d4d80210c1f4ae3 100644
--- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
+++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
@@ -34,7 +34,7 @@ Description
     FUNCTIONOBJECT1
     {
         type           FUNCTIONOBJECT;
-        functionObjectLibs ("libFUNCTIONOBJECTFunctionObject.so");
+        libs ("libFUNCTIONOBJECTFunctionObject.so");
         ...
         wordData       someWord;
         scalarData     1.0;
diff --git a/etc/templates/axisymmetricJet/system/graph b/etc/templates/axisymmetricJet/system/graph
index a419b446d990141f2a3b26d0f06100cb86266447..72b4d2b3cf2bb9fee3fc9c82e20fcc0b4d12a593 100644
--- a/etc/templates/axisymmetricJet/system/graph
+++ b/etc/templates/axisymmetricJet/system/graph
@@ -17,7 +17,7 @@ FoamFile
 graph
 {
     type            sets;
-    functionObjectLibs ("libsampling.so");
+    libs ("libsampling.so");
     writeControl   writeTime;
 
     interpolationScheme cellPointFace;
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 791a8139b0d7204af6f8ff70a1030f1d068cf723..72c5ac5a2e07c084520f53ebb793dc8454dbc429 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -61,12 +61,24 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
         Info<< "Selecting function " << functionType << endl;
     }
 
-    const_cast<Time&>(t).libs().open
-    (
-        dict,
-        "functionObjectLibs",
-        dictionaryConstructorTablePtr_
-    );
+    if (dict.found("functionObjectLibs"))
+    {
+        const_cast<Time&>(t).libs().open
+        (
+            dict,
+            "functionObjectLibs",
+            dictionaryConstructorTablePtr_
+        );
+    }
+    else
+    {
+        const_cast<Time&>(t).libs().open
+        (
+            dict,
+            "libs",
+            dictionaryConstructorTablePtr_
+        );
+    }
 
     if (!dictionaryConstructorTablePtr_)
     {
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index e730c2a6f58f9f09cae57b749c11ffea6c36a6e2..0b3abaf18d3307c67702bd0db7e5eba3a00d43fc 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -46,7 +46,7 @@ Description
             myFunctionObject    // Name of functionObject entry
             {
                 type                functionObjectType;
-                functionObjectLibs  ("libMyFunctionObjectlib.so");
+                libs  ("libMyFunctionObjectlib.so");
                 region              defaultRegion;
                 enabled             yes;
                 timeStart           0;
@@ -62,7 +62,7 @@ Description
     \table
         Property | Description                       | Required | Default value
         type     | Type of function object               | yes      |
-        functionObjectLibs | Libraries containing implementation | yes |
+        libs | Libraries containing implementation | yes |
         region   | Name of region for multi-region cases | no       |
         enabled  | On/off switch                         | no       | yes
         timeStart| Start time                            | no       |
diff --git a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C
index c907c2f9b403b88b3a9729f6a21dcd06082397bc..4b4bf0d9f91fe0fab8dfba615574587da574ab1e 100644
--- a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C
+++ b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C
@@ -64,12 +64,6 @@ void Foam::functionObjects::writeFiles::createFiles()
 }
 
 
-void Foam::functionObjects::writeFiles::write()
-{
-    createFiles();
-}
-
-
 void Foam::functionObjects::writeFiles::resetNames(const wordList& names)
 {
     names_.clear();
@@ -200,4 +194,12 @@ Foam::OFstream& Foam::functionObjects::writeFiles::file(const label i)
 }
 
 
+bool Foam::functionObjects::writeFiles::write(const bool postProcess)
+{
+    createFiles();
+
+    return true;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H
index 8d9831e0a0e9d2736848db56a399f58056de7780..8801c3ee44b03a156ad8e1516935544f99933045 100644
--- a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H
+++ b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H
@@ -74,9 +74,6 @@ protected:
         //- Create the output file
         virtual void createFiles();
 
-        //- Write function
-        virtual void write();
-
         //- Reset the list of names from a wordList
         virtual void resetNames(const wordList& names);
 
@@ -130,6 +127,9 @@ public:
 
         //- Return file 'i'
         OFstream& file(const label i);
+
+        //- Write function
+        virtual bool write(const bool postProcess = false);
 };
 
 
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index d8b20ad200fd3020dbc1d14fee2802163bbedd2a..d2c47ec3aca1fcc42e7f35908b417bb316127102 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -52,7 +52,7 @@ functions
         type            fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         // Function object enabled flag
         enabled         true;
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage.H
index a4bda83f3a08c555284594c3a039206b784bf970..d89247a80c41d88aa9166c58691d323e55bd2760 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage.H
@@ -67,7 +67,7 @@ Description
     fieldAverage1
     {
         type fieldAverage;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         restartOnRestart    false;
         restartOnOutput     false;
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index 23334db14f3c5199e584b614aac232e0a83b606f..7987f13827d01c73481d0852d1832b8bbe691300 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -37,7 +37,7 @@ Description
     fieldCoordinateSystemTransform1
     {
         type        fieldCoordinateSystemTransform;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         fields
         (
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
index 93081e26d10e4c8dbf4b30a1f4737cfcf26eff99..4c680267c0af07aced36549b61c41a3622d6ee81 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
@@ -22,7 +22,7 @@ functions
         type            fieldCoordinateSystemTransform;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         // Function object enabled flag
         enabled         true;
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/controlDict b/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
index 397b57cf0fc5ea05212b0e1a65d41e39734223eb..e31f656b8bd462dd0e8a0e080005f2f91295a9d9 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
@@ -52,7 +52,7 @@ functions
         type            fieldMinMax;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         // Function object enabled flag
         enabled         true;
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index 45942bf2b348fcbb07d0a6c6bdfcc84fd1cd18fb..94ba2f0552af3530fbb3234fe36fe6c3adf3c923 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -39,7 +39,7 @@ Description
     fieldMinMax1
     {
         type        fieldMinMax;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         write       yes;
         log         yes;
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index db529bd1723b044e4cfd78c509db202b393bf5a9..5644582aaaa3e61832d10e643fe987c8565bd5af 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
@@ -39,7 +39,7 @@ Description
     cellSource1
     {
         type            cellSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         log             true;
         valueOutput     true;
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index dd80dd785b903d3c3fb30ac76d5eedde1e8c9b86..5cc34689618303bf0826d65e1a985316d8c963fc 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -49,7 +49,7 @@ functions
     faceObj1
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         enabled         true;
         writeControl   writeTime;
@@ -91,7 +91,7 @@ functions
     faceObj2
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         true;
         writeControl   writeTime;
         log             true;
@@ -109,7 +109,7 @@ functions
     cellObj1
     {
         type            cellSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         true;
         writeControl   writeTime;
         log             true;
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
index 0d775f01edc0c6986a63e6024724e279fa68f440..7a9a6d639311ca5608ffe70bd1357494efe268ee 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
@@ -42,7 +42,7 @@ Description
     faceSource1
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         log             yes;
         valueOutput     true;
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index f164c8f9efc74105bc1e6c2c8702c1ecf9d67ea7..50d4a41e0ade85750a01ec9472fdd1a5d05376a3 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
@@ -36,7 +36,7 @@ Description
     fieldValueDelta1
     {
         type            fieldValueDelta;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         operation       subtract;
 
         fieldValue1
diff --git a/src/postProcessing/functionObjects/field/histogram/histogram.H b/src/postProcessing/functionObjects/field/histogram/histogram.H
index 48f8f2432537826901ec0293401cf2fa62f98329..831df5edda5ecb1d01a388d353649e03c47557d4 100644
--- a/src/postProcessing/functionObjects/field/histogram/histogram.H
+++ b/src/postProcessing/functionObjects/field/histogram/histogram.H
@@ -36,7 +36,7 @@ Description
     {
         type            histogram;
 
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         field           p;
         nBins           100;
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/controlDict b/src/postProcessing/functionObjects/field/nearWallFields/controlDict
index f1d7d283cc0a53ecf6585b8ccad65b1ba6c34f65..9d40cdcf9ff63b1c65c89829b6b849554bf7cfb4 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/controlDict
+++ b/src/postProcessing/functionObjects/field/nearWallFields/controlDict
@@ -49,7 +49,7 @@ functions
     near
     {
         // Where to load it from
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         type nearWallFields;
 
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
index f0bdda2cc83a281ce3d0879aef836a070844d903..93026a3761f30ee135f22131f71c6ddfaf6f4fb7 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
@@ -43,7 +43,7 @@ Description
     nearWallFields1
     {
         type        nearWallFields;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         fields      ((p pNear)(U UNear));
         patches     (movingWall);
diff --git a/src/postProcessing/functionObjects/field/processorField/postProcessingDict b/src/postProcessing/functionObjects/field/processorField/postProcessingDict
index 79463a0058b4e6bcf2a030e788ea35b5357e4bfd..0df126095fabc4ab8909833c15518ef4fb553b7b 100644
--- a/src/postProcessing/functionObjects/field/processorField/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/processorField/postProcessingDict
@@ -22,7 +22,7 @@ functions
         type            processorField;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         // Function object enabled flag
         enabled         true;
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.H b/src/postProcessing/functionObjects/field/processorField/processorField.H
index c3334bedd9e86abcebf22646be650ee999f7fc4b..fe0124cf763e68ea842298efdfc6312222d14f86 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.H
+++ b/src/postProcessing/functionObjects/field/processorField/processorField.H
@@ -36,7 +36,7 @@ Description
     processorField1
     {
         type        processorField;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
     }
     \endverbatim
diff --git a/src/postProcessing/functionObjects/field/readFields/postProcessingDict b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
index 8c86608121e6f530f1dedc15cc10fc299429623d..3ed3fe8e984a4725a6da589235ae559dadbe2681 100644
--- a/src/postProcessing/functionObjects/field/readFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
@@ -19,7 +19,7 @@ functions
     readFields1
     {
         type            readFields;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         true;
         writeControl   timeStep;
         writeInterval  1;
@@ -33,7 +33,7 @@ functions
     faceObj2
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         true;
         writeControl   timeStep;
         writeInterval  1;
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index 0f314eb0b3c6c31b01e92e9423e94b400e0124c2..092b536ae129f3b7e4ad6d667d315113861f9451 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -36,7 +36,7 @@ Description
     readFields1
     {
         type        readFields;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         fields
         (
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index 039db7e35b4476615f2954afbea0a9ad68827b1c..65ccfab63c735e70617779f020e787639d7eca32 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -59,7 +59,7 @@ Description
     regionSizeDistribution1
     {
         type            regionSizeDistribution;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         field           alpha;
         patches         (inlet);
diff --git a/src/postProcessing/functionObjects/field/streamLine/controlDict b/src/postProcessing/functionObjects/field/streamLine/controlDict
index 97ce6665c4522abf527e7ae0703024ebbefe95e1..32d84034db2e112253d3e615f8533f1d32620c42 100644
--- a/src/postProcessing/functionObjects/field/streamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/streamLine/controlDict
@@ -51,7 +51,7 @@ functions
         type            streamLine;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         // Output every
         writeControl   writeTime;
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index 5a577e666dd3334b5bac6da9f3e9f340546a72ff..08a18c96a6eb3713e165aafa731dfdfe0754b44a 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -37,7 +37,7 @@ Description
     streamLine1
     {
         type            streamLine;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         setFormat       vtk;
         UName           U;
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
index eef1c591f8e6e82e0aa1acfde1773563e4b1c172..463c274756e0eebd1093ec74e2b3306a4c2d4bc4 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
@@ -43,7 +43,7 @@ Description
     surfaceInterpolateFields1
     {
         type        surfaceInterpolateFields;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         fields      ((p pNear)(U UNear));
     }
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
index fbba54842d62314879b799b22bf4af57b18284cb..087a6f6c2f56d02af75580fad227ab41670a4c29 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
@@ -49,7 +49,7 @@ functions
     readFields
     {
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         type            readFields;
         fields          (p U k);
@@ -58,7 +58,7 @@ functions
     near
     {
         // Where to load it from
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         type nearWallFields;
 
@@ -82,7 +82,7 @@ functions
     streamLines
     {
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         type            wallBoundedStreamLine;
 
         // Output every
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index 0a76cb120deb02b4f00204c53c61d94cc62557b5..c610cc1d688fe6fe944e6599d5217abf0a3ea680 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
@@ -37,7 +37,7 @@ Description
     wallBoundedStreamLine1
     {
         type            wallBoundedStreamLine;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         ...
         setFormat       vtk;
         UName           UNear;
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
index 1470d5784ceeafd0bd82925f7e490226607efe98..dc4552eab1fe0b12031897aefb28e7c330923cf8 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -37,7 +37,7 @@ Description
     forceCoeffs1
     {
         type        forceCoeffs;
-        functionObjectLibs ("libforces.so");
+        libs ("libforces.so");
         ...
         log         yes;
         patches     (walls);
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index b8270eba3cddfd079c6776638fe8dc1b8873c6a4..d3d994df12e5ee4894eafdc29dc1c7b9846df978 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -40,7 +40,7 @@ Description
     forces1
     {
         type        forces;
-        functionObjectLibs ("libforces.so");
+        libs ("libforces.so");
         ...
         log         yes;
         patches     (walls);
diff --git a/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
index f957966c87ae466064dd0b8a4d9f91038a8211c9..a14a88dffcc49dae080df3fb3474b05fd687795f 100644
--- a/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
+++ b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
@@ -81,7 +81,7 @@ Description
     pressureTools1
     {
         type        pressureTools;
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
         ...
         calcTotal   no;
         calcCoeff   yes;
diff --git a/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
index 8c2ffef6e1661f33dc2a7b21ea8c2fb23f732a76..128885970c45717002aa2bda2a691ba8026db17f 100644
--- a/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
@@ -51,7 +51,7 @@ Description
     wallShearStress1
     {
         type        wallShearStress;
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
         ...
         patches     (".*Wall");
     }
diff --git a/src/postProcessing/functionObjects/lagrangian/Make/files b/src/postProcessing/functionObjects/lagrangian/Make/files
index 1301f29b442c32e4ee33c22d285b668eaf007b49..368d9dffe6ee105b075697a74ac59184020c655d 100644
--- a/src/postProcessing/functionObjects/lagrangian/Make/files
+++ b/src/postProcessing/functionObjects/lagrangian/Make/files
@@ -1,3 +1,4 @@
 cloudInfo/cloudInfo.C
+icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C
 
 LIB = $(FOAM_LIBBIN)/liblagrangianFunctionObjects
diff --git a/src/postProcessing/functionObjects/lagrangian/Make/options b/src/postProcessing/functionObjects/lagrangian/Make/options
index 7699961acc4188d6fdd0df6f9798f19d339fcef9..f99c39cb4bdb08a1c99cec757dcdae94b2e9704a 100644
--- a/src/postProcessing/functionObjects/lagrangian/Make/options
+++ b/src/postProcessing/functionObjects/lagrangian/Make/options
@@ -1,9 +1,19 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
+    -lincompressibleTransportModels \
+    -lmeshTools \
     -llagrangian \
-    -llagrangianIntermediate
+    -llagrangianIntermediate \
+    -llagrangianTurbulence \
+    -lregionModels \
+    -lsurfaceFilmModels
diff --git a/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
index dfd5171275f4641518115b1a363a3e0f5d23a567..3cd45ac7bb25881a34cd244aaa11990e13ebda51 100644
--- a/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
+++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
@@ -38,7 +38,7 @@ Description
     cloudInfo1
     {
         type        cloudInfo;
-        functionObjectLibs ("libcloudFunctionObjects.so");
+        libs ("libcloudFunctionObjects.so");
         ...
         clouds
         (
diff --git a/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict b/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
index 74fd3b9d3795f65f58360e707b6eee3542233962..ca8a3ba09c3cde5de90c6cfb72410ee557741759 100644
--- a/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
+++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
@@ -19,7 +19,7 @@ functions
     cloudInfo1
     {
         type            cloudInfo;
-        functionObjectLibs ("libcloudFunctionObjects.so");
+        libs ("libcloudFunctionObjects.so");
         enabled         true;
         writeControl   timeStep;
         writeInterval  1;
diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
index 4628283137c9f9617ec1f45299b63417923c4772..a2197b23e07592b1b6c57cedd609d251b185231a 100644
--- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
@@ -48,7 +48,7 @@ Description
     \verbatim
     difference
     {
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
 
         type coded;
         // Name of on-the-fly generated functionObject
diff --git a/src/postProcessing/functionObjects/utilities/partialWrite/controlDict b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
index 4ddf310200ca5f45db13767da8578cd9a12a8789..a9f4ec748664d34a878d2d0e3f2736af0664fc2d 100644
--- a/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
@@ -58,7 +58,7 @@ functions
         type            partialWrite;
 
         // Where to load it from
-        functionObjectLibs ("libIOFunctionObjects.so");
+        libs ("libIOFunctionObjects.so");
 
         // Optional mesh region to operate on. Only one partialWrite per
         // region allowed.
@@ -91,7 +91,7 @@ functions
         type            writeRegisteredObject;
 
         // Where to load it from
-        functionObjectLibs ("libIOFunctionObjects.so");
+        libs ("libIOFunctionObjects.so");
 
         // When to write:
         //  timeStep            (with optional writeInterval)
diff --git a/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
index d312a78bab66eb5ed03ab271999c34ee5b91dac2..798522746a6beab4892262a5a5ff5614a1399932 100644
--- a/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
@@ -37,7 +37,7 @@ Description
     partialWrite1
     {
         type        partialWrite;
-        functionObjectLibs ("libIOFunctionObjects.so");
+        libs ("libIOFunctionObjects.so");
         ...
         objectNames (p U T);
         writeInterval 100;
diff --git a/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
index 7120edf8a7df5bd19ed7ec46b3ba2921ea74c64a..1cf76d8eb4de189d9d0707b89ec341dee9859bf5 100644
--- a/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
@@ -35,7 +35,7 @@ Description
     removeRegisteredObject1
     {
         type        removeRegisteredObject;
-        functionObjectLibs ("libIOFunctionObjects.so");
+        libs ("libIOFunctionObjects.so");
         ...
         objectNames (obj1 obj2);
     }
diff --git a/src/postProcessing/functionObjects/utilities/systemCall/controlDict b/src/postProcessing/functionObjects/utilities/systemCall/controlDict
index abed2d748ff3573b6832f8e109a49c0d002eaef1..41287f0c4a6fd4205f1d1a4610845736610d4aa0 100644
--- a/src/postProcessing/functionObjects/utilities/systemCall/controlDict
+++ b/src/postProcessing/functionObjects/utilities/systemCall/controlDict
@@ -49,7 +49,7 @@ functions
     systemCall1
     {
         type            systemCall;
-        functionObjectLibs ("libsystemCall.so");
+        libs ("libsystemCall.so");
         enabled         true;
         writeControl   writeTime;
 
diff --git a/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
index a1dd56046be54bcb51ec723cff12a1fcb88a3b2e..4104a6e415c76c8dac006362fd9f6009bcfcfe25 100644
--- a/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
@@ -40,7 +40,7 @@ Description
     systemCall1
     {
         type        systemCall;
-        functionObjectLibs ("libsystemCall.so");
+        libs ("libsystemCall.so");
         ...
         executeCalls
         (
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
index cb2d1466666a986cae12008175346f29aaca2a0c..5a38c46c947159c367697749942d7f3c5911bf93 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
@@ -49,7 +49,7 @@ functions
     fileUpdate1
     {
         type            timeActivatedFileUpdate;
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
         writeControl   timeStep;
         writeInterval  1;
         fileToUpdate    "$FOAM_CASE/system/fvSolution";
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index e72fb38b7da4e988d48a52558cf0b205034d6d87..79f55ecdd32b67f46fefa19f0d929272b080831a 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -37,7 +37,7 @@ Description
     fileUpdate1
     {
         type              timeActivatedFileUpdate;
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
         writeControl     timeStep;
         writeInterval    1;
         fileToUpdate      "$FOAM_CASE/system/fvSolution";
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
index aa00da824abe0c9150b28383f59c3036b29173a6..dc0cd6d37d9048baaec99ecce5778e57e802a04a 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
@@ -19,7 +19,7 @@ functions
     turbulenceFields1
     {
         type            turbulenceFields;
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
         enabled         true;
         writeControl   timeStep;
         writeInterval  1;
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index bd480dfdfbd79a246581af4a4f8f727fd7ca1d78..13eaac0a90ba31fb2d9ff7dae88aa71560f19469 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -43,7 +43,7 @@ Description
     turbulenceFields1
     {
         type        turbulenceFields;
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
         ...
         fields
         (
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
index 0267dd2ee7abd68aa344fa337b1ea24646aa3975..4f3b184e8334e865408da982cd959b0f2a60c588 100644
--- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
@@ -58,7 +58,7 @@ functions
         type            partialWrite;
 
         // Where to load it from
-        functionObjectLibs ("libIOFunctionObjects.so");
+        libs ("libIOFunctionObjects.so");
 
         // Optional mesh region to operate on. Only one partialWrite per
         // region allowed.
@@ -91,7 +91,7 @@ functions
         type            writeRegisteredObject;
 
         // Where to load it from
-        functionObjectLibs ("libIOFunctionObjects.so");
+        libs ("libIOFunctionObjects.so");
 
         // When to write:
         //  timeStep            (with optional writeInterval)
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
index a9979dfa01d8e9468104168cfd29db5743cea236..11a56f8d505085fbb0beda152ed0ee2f3a8147cf 100644
--- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
@@ -44,7 +44,7 @@ Description
     writeRegisteredObject1
     {
         type        writeRegisteredObject;
-        functionObjectLibs ("libIOFunctionObjects.so");
+        libs ("libIOFunctionObjects.so");
         exclusiveWriting     true;
         ...
         objectNames (obj1 obj2);
diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
index a303ac75f60ca38939aa90dd0ddaa69598e4f530..c326838ddb5b225dbe62ba13394206fe83ff770c 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -50,7 +50,7 @@ functions
     difference
     {
         // Load the library containing the 'coded' functionObject
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
 
         type coded;
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
index 644dd62afed28584e5ee34941006716021a89731..485cc686bd34fa910812ac0b5bd5cfae0941c769 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
@@ -56,7 +56,7 @@ functions
     timeStep
     {
         type coded;
-        functionObjectLibs ("libutilityFunctionObjects.so");
+        libs ("libutilityFunctionObjects.so");
         redirectType setDeltaT;
 
         code
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
index 0ef1f22a5deee13fb731b5f7cfe5d757a163300a..a1cfdee93ec954337167e2e3afa247d82d52da3e 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
@@ -9,7 +9,7 @@
 cuttingPlane
 {
     type            surfaces;
-    functionObjectLibs ("libsampling.so");
+    libs ("libsampling.so");
 
     writeControl   writeTime;
 
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
index 6c543652ae3e66393308535f281d6e4edb023a44..c4cfb33a94971a85d87f0edaf3e3b30833cf7007 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
@@ -53,7 +53,7 @@ functions
 {
     probes
     {
-        functionObjectLibs ( "libsampling.so" );
+        libs ( "libsampling.so" );
         type probes;
         name probes;
         writeControl timeStep;
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
index 6abdc3053ef65625d21a0988c83e41ab4d716b7e..af81fb869a34e744679372226c0cca5428867c26 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
@@ -54,7 +54,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         enabled         true;
         writeControl   writeTime;
 
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
index 0ef1f22a5deee13fb731b5f7cfe5d757a163300a..a1cfdee93ec954337167e2e3afa247d82d52da3e 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
@@ -9,7 +9,7 @@
 cuttingPlane
 {
     type            surfaces;
-    functionObjectLibs ("libsampling.so");
+    libs ("libsampling.so");
 
     writeControl   writeTime;
 
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index aa126e906b32c99a97c40357f08f2c64472dd096..6c20d90831e31d2d600efc2ba5c9b5bc1bdb80f7 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -50,7 +50,7 @@ functions
     forces
     {
         type            forceCoeffs;
-        functionObjectLibs ( "libforces.so" );
+        libs ( "libforces.so" );
         writeControl   timeStep;
         writeInterval  1;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index d435604913d17ab1655d9723ba549d90e0a97dd9..75c6aedf9c670c965d32104dd7e9d55249ac1492 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -52,7 +52,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
 
         fields
@@ -116,7 +116,7 @@ functions
     dsmcFields1
     {
         type            dsmcFields;
-        functionObjectLibs ( "libutilityFunctionObjects.so" );
+        libs ( "libutilityFunctionObjects.so" );
         enabled         true;
         writeControl   writeTime;
     }
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 704666f029b21ac78076753e005a6ccb98c0ca8d..c1a97cd71f6f9c752fd6adff562062b8d444c909 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -52,7 +52,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         restartOnOutput   off;
 
@@ -117,7 +117,7 @@ functions
     dsmcFields1
     {
         type            dsmcFields;
-        functionObjectLibs ( "libutilityFunctionObjects.so" );
+        libs ( "libutilityFunctionObjects.so" );
         enabled         true;
         writeControl   writeTime;
     }
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 450664dc797254f66e5b3d1eeda36a94fe24ad3e..eb5e78206aaea523ee95d30d2e25205678d85d70 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -52,7 +52,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
 
         fields
@@ -116,7 +116,7 @@ functions
     dsmcFields1
     {
         type            dsmcFields;
-        functionObjectLibs ( "libutilityFunctionObjects.so" );
+        libs ( "libutilityFunctionObjects.so" );
         enabled         true;
         writeControl   writeTime;
     }
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 9131af9669549411c6155b3e3dca1908e352f2a9..f89ed2f0162403c6e4c90d32e69d3edec4e0ee27 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -52,7 +52,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
 
         fields
@@ -117,7 +117,7 @@ functions
     dsmcFields1
     {
         type            dsmcFields;
-        functionObjectLibs ( "libutilityFunctionObjects.so" );
+        libs ( "libutilityFunctionObjects.so" );
         enabled         true;
         writeControl   writeTime;
     }
@@ -126,7 +126,7 @@ functions
     {
         type            forces;
         enabled         true;
-        functionObjectLibs ( "libforces.so" );
+        libs ( "libforces.so" );
         writeControl   writeTime;
         patches         ( obstacle );
         directForceDensity true;
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
index 0ef1f22a5deee13fb731b5f7cfe5d757a163300a..a1cfdee93ec954337167e2e3afa247d82d52da3e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
@@ -9,7 +9,7 @@
 cuttingPlane
 {
     type            surfaces;
-    functionObjectLibs ("libsampling.so");
+    libs ("libsampling.so");
 
     writeControl   writeTime;
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
index 325a3bff1dbbbd979bf52679925ad9da663bf96f..a6f431788c193e4f70ba9e38f422908e0f7c239d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
@@ -10,7 +10,7 @@
 Q
 {
     // Where to load it from
-    functionObjectLibs ("libutilityFunctionObjects.so");
+    libs ("libutilityFunctionObjects.so");
 
     type Q;
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
index e6e94fb65d022cf4d83a4759f31d643137cd58be..0bc9c2f89c974e9f8ec9e84a4d1ecaa54f498496 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
@@ -10,7 +10,7 @@ forces
 {
     type        forces;
 
-    functionObjectLibs ( "libforces.so" );
+    libs ( "libforces.so" );
 
     writeControl   timeStep;
     timeInterval    1;
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
index 528b363f63fd11cb6f86fce8958bc094d1f3e610..5d6e58798798e27c99852f32b12897c383ad2def 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
@@ -9,7 +9,7 @@
 surfaces
 {
     type            surfaces;
-    functionObjectLibs ("libsampling.so");
+    libs ("libsampling.so");
     writeControl   writeTime;
 
     surfaceFormat   vtk;
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
index 3fc415deaa5a6587e179048921dabbb107773b50..8eb77896dc89692236a5c93a16123954c27092ca 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
@@ -50,7 +50,7 @@ functions
     forces
     {
         type                forces;
-        functionObjectLibs  ( "libforces.so" );
+        libs  ( "libforces.so" );
         writeControl       timeStep;
         writeInterval      10;
         patches             (wing);
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
index 03793cbc50322379926fb7f126c0e68c3c3ed6e3..0151f88dca5d691f4ccfeea163ab40f33b04d692 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
@@ -54,7 +54,7 @@ functions
     probes
     {
         // Where to load it from
-        functionObjectLibs ( "libsampling.so" );
+        libs ( "libsampling.so" );
 
         type            probes;
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
index 4a43a60f28a7f4276851d935b267f8b30e9f79e8..1fdcaebb0b4bd8342e532af4741040e64b24cf60 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
@@ -54,7 +54,7 @@ functions
     probes
     {
         // Where to load it from
-        functionObjectLibs ( "libsampling.so" );
+        libs ( "libsampling.so" );
 
         type            probes;
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
index d4070fbb9dceaef86a2dee18e5ffaa1043e26014..5e66d134cee58ee6f241470a17f5b99cb7472cba 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
@@ -50,7 +50,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         enabled         true;
         writeControl   writeTime;
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
index 95a1ad13c297a396a0002ce54166d663f3a0a687..141f5df839397b42cdef4b558d34c4f102928e8c 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
@@ -73,7 +73,7 @@ functions
     cuttingPlane
     {
         type            surfaces;
-        functionObjectLibs ( "libsampling.so" );
+        libs ( "libsampling.so" );
         writeControl   writeTime;
         surfaceFormat   vtk;
         fields          ( p U );
@@ -96,7 +96,7 @@ functions
     forces
     {
         type            forceCoeffs;
-        functionObjectLibs ( "libforces.so" );
+        libs ( "libforces.so" );
         writeControl   timeStep;
         writeInterval  1;
         patches         ( "motorBike.*" );
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
index befc1336c35b9137f75a953a59aa2835c7978210..558bf223ce041482abda52fe7f0997ef4a320467 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
@@ -9,7 +9,7 @@
 cuttingPlane
 {
     type            surfaces;
-    functionObjectLibs ("libsampling.so");
+    libs ("libsampling.so");
     writeControl   writeTime;
 
     surfaceFormat   vtk;
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
index 0befb9f69d6bac6c0271814522526ac9a8596102..473439d6de834ae86d50aef47e7b45d02ef254e9 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
@@ -9,7 +9,7 @@
 forces
 {
     type        forceCoeffs;
-    functionObjectLibs ( "libforces.so" );
+    libs ( "libforces.so" );
     writeControl timeStep;
     writeInterval 1;
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 855473e58c969425f14f09490e3fd9215537e01f..d935938c765ee686f724047d4e3c7c6dbc1cd94e 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -50,7 +50,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         enabled         true;
         writeControl   timeStep;
         writeInterval  1;
@@ -76,7 +76,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         true;
         writeControl   writeTime;
 
@@ -105,7 +105,7 @@ functions
         type surfaces;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         enabled         true;
         writeControl   writeTime;
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
index 855473e58c969425f14f09490e3fd9215537e01f..d935938c765ee686f724047d4e3c7c6dbc1cd94e 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
@@ -50,7 +50,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         enabled         true;
         writeControl   timeStep;
         writeInterval  1;
@@ -76,7 +76,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         true;
         writeControl   writeTime;
 
@@ -105,7 +105,7 @@ functions
         type surfaces;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         enabled         true;
         writeControl   writeTime;
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
index befc1336c35b9137f75a953a59aa2835c7978210..558bf223ce041482abda52fe7f0997ef4a320467 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
@@ -9,7 +9,7 @@
 cuttingPlane
 {
     type            surfaces;
-    functionObjectLibs ("libsampling.so");
+    libs ("libsampling.so");
     writeControl   writeTime;
 
     surfaceFormat   vtk;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
index efa27c0eb689169b75907ee86f1e92fe18dc1b59..9c44bca6cf6456ccfd44161b31ad85e0eff3f460 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
@@ -10,7 +10,7 @@ forceCoeffs1
 {
     type        forceCoeffs;
 
-    functionObjectLibs ( "libforces.so" );
+    libs ( "libforces.so" );
 
     writeControl   timeStep;
     timeInterval    1;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index 1a7184fb860d2726dd4cf464ea66ef39ca0d98d8..0e563b4837c35eeac90d306bc4a3c98dea7ed85c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -9,7 +9,7 @@
 streamLines
 {
     // Where to load it from
-    functionObjectLibs ("libfieldFunctionObjects.so");
+    libs ("libfieldFunctionObjects.so");
 
     type            streamLine;
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index 4d13d7d4025dc499c0eeff6269d0ccf3bd9bae8a..052538b5f3344ca5a1d939c0a9008acef9129b51 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -10,7 +10,7 @@
 near
 {
     // Where to load it from
-    functionObjectLibs ("libfieldFunctionObjects.so");
+    libs ("libfieldFunctionObjects.so");
 
     type nearWallFields;
 
@@ -39,7 +39,7 @@ near
 wallBoundedStreamLines
 {
     // Where to load it from (if not already in solver)
-    functionObjectLibs ("libfieldFunctionObjects.so");
+    libs ("libfieldFunctionObjects.so");
     type            wallBoundedStreamLine;
 
     // Output every
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index 71d42db917d5442e52a8080c2de65f38ad0744b7..1edf86c9cb62572de3ebac7547c4e2bf875a4b5f 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -52,7 +52,7 @@ functions
         type            streamLine;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         // Output every
         writeControl   writeTime;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index d8032efee5897a5cf66817d8ce80313145030480..4c60def21932aca0493597564e6d058f57b08e12 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -52,7 +52,7 @@ functions
         type            streamLine;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
 
         // Output every
         writeControl   writeTime;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
index 357bbc962e56f3b0b3cc8024f1d9d63a405bfb02..6121a89143b2b8a72c37ae7d1f3c1a42bcd3c249 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
@@ -56,7 +56,7 @@ functions
     faceSource1
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         yes;
         writeControl   writeTime;
         log             yes;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
index c0b5659ff1a834d311e5904eff27dce558926ec9..6b2dc4faaee5e988c29706777430b92f74e11c00 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
@@ -51,7 +51,7 @@ functions
     faceSource1
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         yes;
         writeControl   writeTime;
         log             yes;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
index b547bcf0c39582a2be2067e6462c2547aa5c5902..85cbcd795dba230e51428f9ed1252b15a2344320 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
@@ -51,7 +51,7 @@ functions
     faceSource1
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         yes;
         writeControl   writeTime;
         log             yes;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index ee6b8267ff062ecebd12e411c7a0a653f787f453..c5ef129b1aaa3e87247102871718143d123dc6be 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -54,7 +54,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         enabled         false;
         writeControl   writeTime;
         fields
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index f495ec0e7f0e29bf19f66ad40824843e67712cdc..8bd22cef0b7696a9077de893dc20da95a889c657 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -54,7 +54,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         enabled         false;
         writeControl   writeTime;
         fields
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
index 6ebd8cd2fed895139debf5003d89fde02500cee0..9c73195f268244e402cafafdd868e73ced0c735e 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -57,7 +57,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   writeTime;
         probeLocations
         (
@@ -74,7 +74,7 @@ functions
     wallPressure
     {
         type            surfaces;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   writeTime;
         surfaceFormat   raw;
         fields
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
index 0425ebae643e14675ac7d0148fb5b3d88e5f4bf6..6d75bbfc4f367402225f5edd47fcd1f8e5864700 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
@@ -56,7 +56,7 @@ functions
     forces
     {
         type forces;
-        functionObjectLibs ( "libforces.so" );
+        libs ( "libforces.so" );
         patches (hull);
         rhoInf  998.8;
         rhoName rho;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index 8dcc4a50347ec7b56f529b19374138e7460f4847..dc1ec8c127d850f2f76da53ac14a62ab14db0185 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -57,7 +57,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   writeTime;
         probeLocations
         (
@@ -74,7 +74,7 @@ functions
     wallPressure
     {
         type            surfaces;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   writeTime;
         surfaceFormat   raw;
         fields
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index d7f803717cc82c062a48190f71957405c4ecbcb1..4f211ef3841d2f578f2d88e5d2372ad77e7df236 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -56,7 +56,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   writeTime;
         probeLocations
         (
@@ -73,7 +73,7 @@ functions
     wallPressure
     {
         type            surfaces;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   writeTime;
         surfaceFormat   raw;
         fields
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 288c68a66ac94106ff8298e5692308dc56e25d39..6e66cae3d499e5798e1efd795db717e8a38cd3b1 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -56,7 +56,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   timeStep;
         writeInterval  1;
         probeLocations
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 3c851f42e0903c658f48d48f9bdd53a388f6a5c8..5a8587772ad154e7f33bf0f8480d64a70bf857a2 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -56,7 +56,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   timeStep;
         writeInterval  1;
         probeLocations
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 3c851f42e0903c658f48d48f9bdd53a388f6a5c8..5a8587772ad154e7f33bf0f8480d64a70bf857a2 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -56,7 +56,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ("libsampling.so");
+        libs ("libsampling.so");
         writeControl   timeStep;
         writeInterval  1;
         probeLocations
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
index 1ecee4b6bbd043dfb4d7e9d21fa7cbf35b4d1ff3..d29b79647b9ad47fef5e5899e1f33a76e9a200b8 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
@@ -50,7 +50,7 @@ functions
     forces
     {
         type forces;
-        functionObjectLibs ( "libforces.so" );
+        libs ( "libforces.so" );
         patches (hull);
         rhoInf  998.8;
         rhoName rho;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
index 865bb59d9948af96a4092c13e40e07ab190530f3..e9292a96afb25eaa561c5078918d7491e53d6601 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
@@ -56,7 +56,7 @@ functions
     inletFlux
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         writeControl   timeStep;
         log             true;
         // Output field values as well
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
index ef183ae9f8097a9a5231eded2015c6aa41e83bd7..8336493c6a68a09cd547488b96a5db4df40ba707 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
index a7682133ac5fcd6dd51420679909a70719013f29..b497ec41436dedf482138759e3683899dcef6ca4 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
@@ -56,7 +56,7 @@ functions
     forces
     {
         type            forces;
-        functionObjectLibs ("libforces.so");
+        libs ("libforces.so");
         writeControl   writeTime;
         patches         (floatingObject);
         pName           p;
@@ -70,7 +70,7 @@ functions
     poolHeight
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         yes;
         writeControl   timeStep;
         writeInterval  1;
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
index f14f8369585f1c7ab1afdfac2e37c3c0e671c936..712edfa6c1138dc3e23516ee3885998cc2a88076 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
@@ -56,7 +56,7 @@ functions
     forces
     {
         type            forces;
-        functionObjectLibs ("libforces.so");
+        libs ("libforces.so");
         writeControl   writeTime;
         patches         (floatingObject);
         pName           p;
@@ -70,7 +70,7 @@ functions
     poolHeight
     {
         type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        libs ("libfieldFunctionObjects.so");
         enabled         yes;
         writeControl   timeStep;
         writeInterval  1;
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
index cea35079efc1e3315457aff7ac2796179afaf232..4952298b153b88289b0d71dd728828836e226747 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -56,7 +56,7 @@ functions0
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 1a0a73e34330556ec66bb5d7c5f733c88f9b2592..bda032fbbb831b9daa874aac69e570814301280d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 1a0a73e34330556ec66bb5d7c5f733c88f9b2592..bda032fbbb831b9daa874aac69e570814301280d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index 8f109eb5896192d26db4583c6b08ac5554970a89..0171ad9a96d0a7d28075d361a06a3167a2438d89 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 1a0a73e34330556ec66bb5d7c5f733c88f9b2592..bda032fbbb831b9daa874aac69e570814301280d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
index 2f8d9ff1085d2bd273201514d0a832a30dbce1d0..bb04d87da134120240f48d44ac9d5b2d99b241e9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
@@ -9,7 +9,7 @@
 inletMassFlowRate
 {
     type            faceSource;
-    functionObjectLibs ("libfieldFunctionObjects.so");
+    libs ("libfieldFunctionObjects.so");
 
     fields
     (
@@ -32,7 +32,7 @@ inletMassFlowRate
 outletMassFlowRate
 {
     type            faceSource;
-    functionObjectLibs ("libfieldFunctionObjects.so");
+    libs ("libfieldFunctionObjects.so");
 
     fields
     (
@@ -55,7 +55,7 @@ outletMassFlowRate
 totalMass
 {
     type            coded;
-    functionObjectLibs ("libutilityFunctionObjects.so");
+    libs ("libutilityFunctionObjects.so");
     redirectType    error;
 
     code
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 1a0a73e34330556ec66bb5d7c5f733c88f9b2592..bda032fbbb831b9daa874aac69e570814301280d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 6b261193bd03208cf0d5e65ee8f8fc972a3d8cb0..bd01b0bd4ff0737d5a4479919a117dcebcddb598 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 1f7f969de77723146596489b828ec2afdf3cc1ba..732ef99879267134ffc253650c22731d1500b7ef 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 1f7f969de77723146596489b828ec2afdf3cc1ba..732ef99879267134ffc253650c22731d1500b7ef 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index e987039e575efd1a471c3ecc6171dad2d8b65f3d..9ccb4f9d3513d3fa857b358b0ff656aa713f2fc2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 1f7f969de77723146596489b828ec2afdf3cc1ba..732ef99879267134ffc253650c22731d1500b7ef 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 1f7f969de77723146596489b828ec2afdf3cc1ba..732ef99879267134ffc253650c22731d1500b7ef 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 4d2ae220212a336a1ffc1845428655e82a82bce9..565b7fedf8621d79b97d0bad6e9e12f03535dfad 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -56,7 +56,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        libs ( "libfieldFunctionObjects.so" );
         writeControl   writeTime;
         fields
         (