diff --git a/etc/codeTemplates/dynamicCode/Function1Template.C b/etc/codeTemplates/dynamicCode/Function1Template.C
index b0a688f6dc..6b626ff8ae 100644
--- a/etc/codeTemplates/dynamicCode/Function1Template.C
+++ b/etc/codeTemplates/dynamicCode/Function1Template.C
@@ -62,17 +62,6 @@ extern "C"
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::Function1s::${typeName}Function1${TemplateType}::writeData
-(
-    Ostream& os
-) const
-{
-    NotImplemented;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::Function1s::${typeName}Function1${TemplateType}::
@@ -138,4 +127,13 @@ Foam::Function1s::${typeName}Function1${TemplateType}::integral
 }
 
 
+void Foam::Function1s::${typeName}Function1${TemplateType}::write
+(
+    Ostream& os
+) const
+{
+    NotImplemented;
+}
+
+
 // ************************************************************************* i/
diff --git a/etc/codeTemplates/dynamicCode/Function1Template.H b/etc/codeTemplates/dynamicCode/Function1Template.H
index 639ab305f0..572d983ead 100644
--- a/etc/codeTemplates/dynamicCode/Function1Template.H
+++ b/etc/codeTemplates/dynamicCode/Function1Template.H
@@ -55,11 +55,6 @@ class ${typeName}Function1${TemplateType}
 :
     public FieldFunction1<${TemplateType}, ${typeName}Function1${TemplateType}>
 {
-    // Private Member Functions
-
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -113,6 +108,9 @@ public:
             const scalar x2
         ) const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/etc/codeTemplates/dynamicCode/Function2Template.C b/etc/codeTemplates/dynamicCode/Function2Template.C
index c787d024bf..ecdf3897db 100644
--- a/etc/codeTemplates/dynamicCode/Function2Template.C
+++ b/etc/codeTemplates/dynamicCode/Function2Template.C
@@ -62,17 +62,6 @@ extern "C"
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::Function2s::${typeName}Function2${TemplateType}::writeData
-(
-    Ostream& os
-) const
-{
-    NotImplemented;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::Function2s::${typeName}Function2${TemplateType}::
@@ -124,4 +113,15 @@ Foam::Function2s::${typeName}Function2${TemplateType}::
 }
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::Function2s::${typeName}Function2${TemplateType}::write
+(
+    Ostream& os
+) const
+{
+    NotImplemented;
+}
+
+
 // ************************************************************************* i/
diff --git a/etc/codeTemplates/dynamicCode/Function2Template.H b/etc/codeTemplates/dynamicCode/Function2Template.H
index 13990b1d8b..df346b6be2 100644
--- a/etc/codeTemplates/dynamicCode/Function2Template.H
+++ b/etc/codeTemplates/dynamicCode/Function2Template.H
@@ -55,11 +55,6 @@ class ${typeName}Function2${TemplateType}
 :
     public FieldFunction2<${TemplateType}, ${typeName}Function2${TemplateType}>
 {
-    // Private Member Functions
-
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -110,6 +105,9 @@ public:
 //}}} end code
         }
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C
index 381a2fd4dd..07f5235dac 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C
@@ -88,23 +88,16 @@ Foam::Function1s::Coded<Type>::compileNew()
 }
 
 
-template<class Type>
-void Foam::Function1s::Coded<Type>::writeData(Ostream& os) const
-{
-    writeCode(os);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::Function1s::Coded<Type>::Coded
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Function1<Type>(entryName),
+    Function1<Type>(name),
     CodedBase<coded>(dict)
 {
     redirectFunction1Ptr_ = compileNew();
@@ -172,4 +165,11 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1s::Coded<Type>::integral
 }
 
 
+template<class Type>
+void Foam::Function1s::Coded<Type>::write(Ostream& os) const
+{
+    writeCode(os);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
index cd5529249c..469489ec79 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
@@ -116,9 +116,6 @@ class Coded
         //- Compile, link and return the now coded Function1
         autoPtr<Function1<Type>> compileNew();
 
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -131,7 +128,7 @@ public:
         //- Construct from entry name and dictionary
         Coded
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -164,6 +161,9 @@ public:
             const scalarField& x2
         ) const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
index 0dddf88059..f11cf1b2f6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
@@ -30,11 +30,11 @@ License
 template<class Type>
 Foam::Function1s::Constant<Type>::Constant
 (
-    const word& entryName,
+    const word& name,
     const Type& val
 )
 :
-    FieldFunction1<Type, Constant<Type>>(entryName),
+    FieldFunction1<Type, Constant<Type>>(name),
     value_(val)
 {}
 
@@ -42,21 +42,22 @@ Foam::Function1s::Constant<Type>::Constant
 template<class Type>
 Foam::Function1s::Constant<Type>::Constant
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction1<Type, Constant<Type>>(entryName),
+    FieldFunction1<Type, Constant<Type>>(name),
     value_(Zero)
 {
-    if (!dict.found(entryName))
+    if (!dict.found(name))
     {
         dict.lookup("value") >> value_;
     }
     else
     {
-        Istream& is(dict.lookup(entryName));
+        Istream& is(dict.lookup(name));
         word entryType(is);
+
         if (is.eof())
         {
             dict.lookup("value") >> value_;
@@ -72,11 +73,11 @@ Foam::Function1s::Constant<Type>::Constant
 template<class Type>
 Foam::Function1s::Constant<Type>::Constant
 (
-    const word& entryName,
+    const word& name,
     Istream& is
 )
 :
-    FieldFunction1<Type, Constant<Type>>(entryName),
+    FieldFunction1<Type, Constant<Type>>(name),
     value_(pTraits<Type>(is))
 {}
 
@@ -101,8 +102,7 @@ Foam::Function1s::Constant<Type>::~Constant()
 template<class Type>
 void Foam::Function1s::Constant<Type>::write(Ostream& os) const
 {
-    this->writeType(os)
-        << token::SPACE << value_ << token::END_STATEMENT << nl;
+    writeEntry(os, "value", value_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index cd2d73e39b..ee69b26cab 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -27,9 +27,9 @@ Class
 Description
     Templated function that returns a constant value.
 
-    Usage - for entry \<entryName\> returning the value <value>:
+    Usage - for entry \<name\> returning the value <value>:
     \verbatim
-        <entryName>    constant  <value>
+        <name>    constant  <value>
     \endverbatim
 
 SourceFiles
@@ -73,15 +73,15 @@ public:
     // Constructors
 
         //- Construct from entry name and value
-        Constant(const word& entryName, const Type& val);
+        Constant(const word& name, const Type& val);
 
         //- Construct from entry name and dictionary
-        Constant(const word& entryName, const dictionary& dict);
+        Constant(const word& name, const dictionary& dict);
 
         //- Construct from entry name and Istream
         //  Reads the constant value without the Function1 type
         //  for backward compatibility
-        Constant(const word& entryName, Istream& is);
+        Constant(const word& name, Istream& is);
 
         //- Copy constructor
         Constant(const Constant<Type>& cnst);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index 51d0e6e4ca..9276400f63 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -26,21 +26,12 @@ License
 #include "Function1.H"
 
 
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::Function1<Type>::writeType(Ostream& os) const
-{
-    return writeKeyword(os, name_) << type();
-}
-
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Function1<Type>::Function1(const word& entryName)
+Foam::Function1<Type>::Function1(const word& name)
 :
-    name_(entryName)
+    name_(name)
 {}
 
 
@@ -55,10 +46,10 @@ Foam::Function1<Type>::Function1(const Function1<Type>& de)
 template<class Type, class Function1Type>
 Foam::FieldFunction1<Type, Function1Type>::FieldFunction1
 (
-    const word& entryName
+    const word& name
 )
 :
-    Function1<Type>(entryName)
+    Function1<Type>(name)
 {}
 
 
@@ -104,20 +95,6 @@ const Foam::word& Foam::Function1<Type>::name() const
 }
 
 
-template<class Type>
-void Foam::Function1<Type>::write(Ostream& os) const
-{
-    writeKeyword(os, name_)
-        << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
-
-    writeEntry(os, "type", type());
-
-    writeData(os);
-
-    os  << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
 template<class Type, class Function1Type>
 Foam::tmp<Foam::Field<Type>> Foam::FieldFunction1<Type, Function1Type>::value
 (
@@ -161,7 +138,14 @@ Foam::FieldFunction1<Type, Function1Type>::integral
 template<class Type>
 void  Foam::writeEntry(Ostream& os, const Function1<Type>& f1)
 {
+    writeKeyword(os, f1.name())
+        << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
+
+    writeEntry(os, "type", f1.type());
+
     f1.write(os);
+
+    os  << decrIndent << indent << token::END_BLOCK << endl;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index 8c9f34d29b..d94862458d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -71,15 +71,6 @@ protected:
         const word name_;
 
 
-    // Protected member functions
-
-        Ostream& writeType(Ostream& os) const;
-
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const
-        {}
-
-
 public:
 
     typedef Type returnType;
@@ -94,17 +85,17 @@ public:
         Function1,
         dictionary,
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         ),
-        (entryName, dict)
+        (name, dict)
     );
 
 
     // Constructors
 
         //- Construct from entry name
-        Function1(const word& entryName);
+        Function1(const word& name);
 
         //- Copy constructor
         Function1(const Function1<Type>& f1);
@@ -116,7 +107,7 @@ public:
     //- Selector
     static autoPtr<Function1<Type>> New
     (
-        const word& entryName,
+        const word& name,
         const dictionary& dict
     );
 
@@ -146,8 +137,8 @@ public:
             const scalarField& x2
         ) const = 0;
 
-        //- Write dictionary to stream
-        virtual void write(Ostream& os) const;
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const = 0;
 
 
     // Member Operators
@@ -186,7 +177,7 @@ public:
     // Constructors
 
         //- Construct from entry name
-        FieldFunction1(const word& entryName);
+        FieldFunction1(const word& name);
 
         //- Copy constructor
         FieldFunction1(const FieldFunction1<Type, Function1Type>& ff1);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
index dc4cc57327..cf45f3a853 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
@@ -30,13 +30,13 @@ License
 template<class Type>
 Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 {
-    if (dict.isDict(entryName))
+    if (dict.isDict(name))
     {
-        const dictionary& coeffsDict(dict.subDict(entryName));
+        const dictionary& coeffsDict(dict.subDict(name));
 
         const word Function1Type(coeffsDict.lookup("type"));
 
@@ -48,17 +48,17 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
             FatalErrorInFunction
                 << "Unknown Function1 type "
                 << Function1Type << " for Function1 "
-                << entryName << nl << nl
+                << name << nl << nl
                 << "Valid Function1 types are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc() << nl
                 << exit(FatalError);
         }
 
-        return cstrIter()(entryName, coeffsDict);
+        return cstrIter()(name, coeffsDict);
     }
     else
     {
-        Istream& is(dict.lookup(entryName, false));
+        Istream& is(dict.lookup(name, false));
 
         token firstToken(is);
         word Function1Type;
@@ -68,7 +68,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
             is.putBack(firstToken);
             return autoPtr<Function1<Type>>
             (
-                new Function1s::Constant<Type>(entryName, is)
+                new Function1s::Constant<Type>(name, is)
             );
         }
         else
@@ -84,7 +84,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
             FatalErrorInFunction
                 << "Unknown Function1 type "
                 << Function1Type << " for Function1 "
-                << entryName << nl << nl
+                << name << nl << nl
                 << "Valid Function1 types are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc() << nl
                 << exit(FatalError);
@@ -94,18 +94,18 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
         (
             cstrIter()
             (
-                entryName,
-                dict.found(entryName + "Coeffs")
-              ? dict.subDict(entryName + "Coeffs")
+                name,
+                dict.found(name + "Coeffs")
+              ? dict.subDict(name + "Coeffs")
               : dict
             )
         );
 
-        if (dict.found(entryName + "Coeffs"))
+        if (dict.found(name + "Coeffs"))
         {
             IOWarningInFunction(dict)
                 << "Using deprecated "
-                << (entryName + "Coeffs") << " sub-dictionary."<< nl
+                << (name + "Coeffs") << " sub-dictionary."<< nl
                 << "    Please use the simpler form" << endl;
             funcPtr->write(Info);
         }
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
index 910f6010ff..bc89b4a829 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
@@ -28,20 +28,20 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Function1s::OneConstant<Type>::OneConstant(const word& entryName)
+Foam::Function1s::OneConstant<Type>::OneConstant(const word& name)
 :
-    FieldFunction1<Type, OneConstant<Type>>(entryName)
+    FieldFunction1<Type, OneConstant<Type>>(name)
 {}
 
 
 template<class Type>
 Foam::Function1s::OneConstant<Type>::OneConstant
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction1<Type, OneConstant<Type>>(entryName)
+    FieldFunction1<Type, OneConstant<Type>>(name)
 {}
 
 
@@ -56,9 +56,7 @@ Foam::Function1s::OneConstant<Type>::~OneConstant()
 
 template<class Type>
 void Foam::Function1s::OneConstant<Type>::write(Ostream& os) const
-{
-    this->writeType(os) << token::END_STATEMENT << nl;
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
index bd395c7857..fa1f7167e7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
@@ -29,7 +29,7 @@ Description
 
     Usage:
     \verbatim
-        <entryName> one;
+        <name> one;
     \endverbatim
 
 SourceFiles
@@ -68,10 +68,10 @@ public:
     // Constructors
 
         //- Construct from entry name
-        OneConstant(const word& entryName);
+        OneConstant(const word& name);
 
         //- Construct from entry name and dictionary
-        OneConstant(const word& entryName, const dictionary& dict);
+        OneConstant(const word& name, const dictionary& dict);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
index 9c9226f032..6851852a08 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
@@ -30,18 +30,32 @@ License
 template<class Type>
 Foam::Function1s::Polynomial<Type>::Polynomial
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction1<Type, Polynomial<Type>>(entryName),
+    FieldFunction1<Type, Polynomial<Type>>(name),
     coeffs_(),
     canIntegrate_(true)
 {
-    Istream& is(dict.lookup(entryName));
-    word entryType(is);
+    if (!dict.found(name))
+    {
+        dict.lookup("coeffs") >> coeffs_;
+    }
+    else
+    {
+        Istream& is(dict.lookup(name));
+        word entryType(is);
 
-    is  >> coeffs_;
+        if (is.eof())
+        {
+            dict.lookup("coeffs") >> coeffs_;
+        }
+        else
+        {
+            is  >> coeffs_;
+        }
+    }
 
     if (!coeffs_.size())
     {
@@ -74,11 +88,11 @@ Foam::Function1s::Polynomial<Type>::Polynomial
 template<class Type>
 Foam::Function1s::Polynomial<Type>::Polynomial
 (
-    const word& entryName,
+    const word& name,
     const List<Tuple2<Type, Type>>& coeffs
 )
 :
-    FieldFunction1<Type, Polynomial<Type>>(entryName),
+    FieldFunction1<Type, Polynomial<Type>>(name),
     coeffs_(coeffs),
     canIntegrate_(true)
 {
@@ -186,8 +200,7 @@ Type Foam::Function1s::Polynomial<Type>::integral
 template<class Type>
 void Foam::Function1s::Polynomial<Type>::write(Ostream& os) const
 {
-    this->writeType(os)
-       << nl << indent << coeffs_ << token::END_STATEMENT << nl;
+    writeKeyword(os, "coeffs") << coeffs_ << token::END_STATEMENT << nl;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
index babf4b3223..4122fe8ed2 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
@@ -27,10 +27,10 @@ Class
 Description
     PolynomialEntry container data entry for scalars. Items are stored in a
     list of Tuple2's. Data is input in the form,
-    e.g. for an entry \<entryName\> that describes y = x^2 + 2x^3
+    e.g. for an entry \<name\> that describes y = x^2 + 2x^3
 
     \verbatim
-        <entryName>  polynomial
+        <name>  polynomial
         (
             (1    2)
             (2    3)
@@ -82,12 +82,12 @@ public:
 
     // Constructors
 
-        Polynomial(const word& entryName, const dictionary& dict);
+        Polynomial(const word& name, const dictionary& dict);
 
         //- Construct from components
         Polynomial
         (
-            const word& entryName,
+            const word& name,
             const List<Tuple2<Type, Type>>&
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
index 1e621f9e2f..b363b912de 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
@@ -25,16 +25,6 @@ License
 
 #include "Ramp.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template <class Function1Type>
-void Foam::Function1s::Ramp<Function1Type>::writeData(Ostream& os) const
-{
-    writeEntry(os, "start", start_);
-    writeEntry(os, "duration", duration_);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class Function1Type>
@@ -48,11 +38,11 @@ void Foam::Function1s::Ramp<Function1Type>::read(const dictionary& coeffs)
 template <class Function1Type>
 Foam::Function1s::Ramp<Function1Type>::Ramp
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction1<scalar, Function1Type>(entryName)
+    FieldFunction1<scalar, Function1Type>(name)
 {
     read(dict);
 }
@@ -65,4 +55,14 @@ Foam::Function1s::Ramp<Function1Type>::~Ramp()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template <class Function1Type>
+void Foam::Function1s::Ramp<Function1Type>::write(Ostream& os) const
+{
+    writeEntry(os, "start", start_);
+    writeEntry(os, "duration", duration_);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
index c8f15b7b72..f24a1577fe 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
@@ -31,8 +31,8 @@ Description
 
     Usage:
     \verbatim
-        <entryName> <rampFunction>;
-        <entryName>Coeffs
+        <name> <rampFunction>;
+        <name>Coeffs
         {
             start     10;
             duration  20;
@@ -40,7 +40,7 @@ Description
     \endverbatim
     or
     \verbatim
-        <entryName>
+        <name>
         {
             type      <rampFunction>;
             start     10;
@@ -114,9 +114,6 @@ protected:
             return 1/duration_;
         }
 
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 private:
 
@@ -133,7 +130,7 @@ public:
         //- Construct from entry name and dictionary
         Ramp
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -147,6 +144,9 @@ public:
         //- Return value for time t
         virtual scalar value(const scalar t) const = 0;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
index 783b94b27f..a25b78ff8b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
@@ -47,25 +47,16 @@ void Foam::Function1s::Scale<Type>::read(const dictionary& coeffs)
 }
 
 
-template<class Type>
-void Foam::Function1s::Scale<Type>::writeData(Ostream& os) const
-{
-    scale_->write(os);
-    xScale_->write(os);
-    value_->write(os);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::Function1s::Scale<Type>::Scale
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction1<Type, Scale<Type>>(entryName)
+    FieldFunction1<Type, Scale<Type>>(name)
 {
     read(dict);
 }
@@ -90,4 +81,15 @@ Foam::Function1s::Scale<Type>::~Scale()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1s::Scale<Type>::write(Ostream& os) const
+{
+    scale_->write(os);
+    xScale_->write(os);
+    value_->write(os);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
index a9c4ffa7d9..da3f7b92f7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
@@ -34,7 +34,7 @@ Description
 
     Usage for a vector:
     \verbatim
-        <entryName>
+        <name>
         {
             type      scale;
 
@@ -60,7 +60,7 @@ Description
 
     Simplified usage to scale by a constant factor, e.g. 2:
     \verbatim
-        <entryName>
+        <name>
         {
             type      scale;
 
@@ -80,7 +80,7 @@ Description
 
     Usage including the optional 'xScale' function:
     \verbatim
-        <entryName>
+        <name>
         {
             type      scale;
 
@@ -160,9 +160,6 @@ class Scale
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -175,7 +172,7 @@ public:
         //- Construct from entry name and dictionary
         Scale
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -195,6 +192,9 @@ public:
         //- Integrate between two values
         virtual inline Type integral(const scalar x1, const scalar x2) const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 93d0a62f5b..62ab6471aa 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -41,26 +41,16 @@ void Foam::Function1s::Sine<Type>::read(const dictionary& coeffs)
 }
 
 
-template<class Type>
-void Foam::Function1s::Sine<Type>::writeData(Ostream& os) const
-{
-    amplitude_->write(os);
-    writeEntry(os, "frequency", frequency_);
-    writeEntry(os, "start", start_);
-    level_->write(os);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::Function1s::Sine<Type>::Sine
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction1<Type, Sine<Type>>(entryName)
+    FieldFunction1<Type, Sine<Type>>(name)
 {
     read(dict);
 }
@@ -85,4 +75,16 @@ Foam::Function1s::Sine<Type>::~Sine()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1s::Sine<Type>::write(Ostream& os) const
+{
+    amplitude_->write(os);
+    writeEntry(os, "frequency", frequency_);
+    writeEntry(os, "start", start_);
+    level_->write(os);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index e4bd9719e8..96d9a50a08 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -43,8 +43,8 @@ Description
 
     Example for a scalar:
     \verbatim
-        <entryName> sine;
-        <entryName>Coeffs
+        <name> sine;
+        <name>Coeffs
         {
             amplitude 2e-7;
             frequency 10;
@@ -55,8 +55,8 @@ Description
 
     Example for a vector:
     \verbatim
-        <entryName> sine;
-        <entryName>Coeffs
+        <name> sine;
+        <name>Coeffs
         {
             amplitude (1 0.1 0);
             frequency 10;
@@ -114,9 +114,6 @@ class Sine
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -129,7 +126,7 @@ public:
         //- Construct from entry name and dictionary
         Sine
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -149,6 +146,9 @@ public:
         //- Integrate between two values
         virtual inline Type integral(const scalar x1, const scalar x2) const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
index de0c4a5295..08f376bfab 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
@@ -42,27 +42,16 @@ void Foam::Function1s::Square<Type>::read(const dictionary& coeffs)
 }
 
 
-template<class Type>
-void Foam::Function1s::Square<Type>::writeData(Ostream& os) const
-{
-    amplitude_->write(os);
-    writeEntry(os, "frequency", frequency_);
-    writeEntry(os, "start", start_);
-    level_->write(os);
-    writeEntry(os, "markSpace", markSpace_);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::Function1s::Square<Type>::Square
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction1<Type, Square<Type>>(entryName)
+    FieldFunction1<Type, Square<Type>>(name)
 {
     read(dict);
 }
@@ -88,4 +77,17 @@ Foam::Function1s::Square<Type>::~Square()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1s::Square<Type>::write(Ostream& os) const
+{
+    amplitude_->write(os);
+    writeEntry(os, "frequency", frequency_);
+    writeEntry(os, "start", start_);
+    level_->write(os);
+    writeEntry(os, "markSpace", markSpace_);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
index 703088994b..cd5dbe1d0c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
@@ -47,8 +47,8 @@ Description
 
     Example for a scalar:
     \verbatim
-        <entryName> square;
-        <entryName>Coeffs
+        <name> square;
+        <name>Coeffs
         {
             amplitude 2e-7;
             frequency 10;
@@ -60,8 +60,8 @@ Description
 
     Example for a vector:
     \verbatim
-        <entryName> square;
-        <entryName>Coeffs
+        <name> square;
+        <name>Coeffs
         {
             amplitude (1 0.1 0);
             frequency 10;
@@ -125,9 +125,6 @@ class Square
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -140,7 +137,7 @@ public:
         //- Construct from entry name and dictionary
         Square
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -160,6 +157,9 @@ public:
         //- Integrate between two values
         virtual inline Type integral(const scalar x1, const scalar x2) const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
index 76768d7075..3bd5741a0d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
@@ -130,29 +130,6 @@ Foam::scalar Foam::Function1s::Table<Type>::bound
 }
 
 
-template<class Type>
-void Foam::Function1s::Table<Type>::writeData(Ostream& os) const
-{
-    writeEntryIfDifferent
-    (
-        os,
-        "outOfBounds",
-        tableBase::boundsHandlingNames_[tableBase::boundsHandling::clamp],
-        tableBase::boundsHandlingNames_[boundsHandling_]
-    );
-
-    writeEntryIfDifferent
-    (
-        os,
-        "interpolationScheme",
-        linearInterpolationWeights::typeName,
-        interpolationScheme_
-    );
-
-    reader_->write(os, table_);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -316,4 +293,27 @@ Foam::Function1s::Table<Type>::y() const
 }
 
 
+template<class Type>
+void Foam::Function1s::Table<Type>::write(Ostream& os) const
+{
+    writeEntryIfDifferent
+    (
+        os,
+        "outOfBounds",
+        tableBase::boundsHandlingNames_[tableBase::boundsHandling::clamp],
+        tableBase::boundsHandlingNames_[boundsHandling_]
+    );
+
+    writeEntryIfDifferent
+    (
+        os,
+        "interpolationScheme",
+        linearInterpolationWeights::typeName,
+        interpolationScheme_
+    );
+
+    reader_->write(os, table_);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index 28b2793711..7db117e55b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -32,7 +32,7 @@ Description
 
     Usage:
     \verbatim
-        <entryName>   table
+        <name>   table
         (
             (0.0 (1 2 3))
             (1.0 (4 5 6))
@@ -41,7 +41,7 @@ Description
 
     or in dictionary form which supports the setting of options, e.g.
     \verbatim
-        <entryName>   table;
+        <name>   table;
 
         values
         (
@@ -57,7 +57,7 @@ Description
     other entries in the dictionary:
 
     \verbatim
-        <entryName>
+        <name>
         {
             type    table;
 
@@ -76,7 +76,7 @@ Description
 
     Usage:
     \verbatim
-        <entryName>
+        <name>
         {
             type                table;
             file                "<file path>"; // Name/path of thedata file
@@ -162,9 +162,6 @@ class Table
         //  as the interpolator already performs that function.
         scalar bound(const scalar x) const;
 
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -208,6 +205,9 @@ public:
         //- Return the dependent values
         virtual tmp<Field<Type>> y() const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.C b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.C
index f0d166d412..b86930331e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,11 +30,11 @@ License
 template<class Type>
 Foam::Function1s::Uniform<Type>::Uniform
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Constant<Type>(entryName, dict)
+    Constant<Type>(name, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
index bd611ae4ea..ad7900c85f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,9 +30,9 @@ Description
     Provides backward-compatibility for cases where a field is spatially
     "uniform" and may be treated as a constant value.
 
-    Usage - for entry \<entryName\> returning the value <value>:
+    Usage - for entry \<name\> returning the value <value>:
     \verbatim
-        <entryName>    uniform  <value>
+        <name>    uniform  <value>
     \endverbatim
 
 SourceFiles
@@ -71,7 +71,7 @@ public:
     // Constructors
 
         //- Construct from entry name and dictionary
-        Uniform(const word& entryName, const dictionary& dict);
+        Uniform(const word& name, const dictionary& dict);
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
index d286d2f8ba..1c47568bd1 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
@@ -30,11 +30,11 @@ License
 template<class Type>
 Foam::Function1s::ZeroConstant<Type>::ZeroConstant
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction1<Type, ZeroConstant<Type>>(entryName)
+    FieldFunction1<Type, ZeroConstant<Type>>(name)
 {}
 
 
@@ -49,9 +49,7 @@ Foam::Function1s::ZeroConstant<Type>::~ZeroConstant()
 
 template<class Type>
 void Foam::Function1s::ZeroConstant<Type>::write(Ostream& os) const
-{
-    this->writeType(os) << token::END_STATEMENT << nl;
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
index a785f1d129..a679cf335c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
@@ -29,7 +29,7 @@ Description
 
     Usage:
     \verbatim
-        <entryName> zero;
+        <name> zero;
     \endverbatim
 
 SourceFiles
@@ -68,7 +68,7 @@ public:
     // Constructors
 
         //- Construct from entry name and dictionary
-        ZeroConstant(const word& entryName, const dictionary& dict);
+        ZeroConstant(const word& name, const dictionary& dict);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
index 0af8f3a35d..aa58ae0ac0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,11 @@ namespace Function1s
 
 Foam::Function1s::halfCosineRamp::halfCosineRamp
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Ramp<halfCosineRamp>(entryName, dict)
+    Ramp<halfCosineRamp>(name, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
index ded35b8a61..1b1befcab8 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
@@ -68,7 +68,7 @@ public:
         //- Construct from entry name and dictionary
         halfCosineRamp
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
index 497d7af565..428874aaa5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,11 @@ namespace Function1s
 
 Foam::Function1s::linearRamp::linearRamp
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Ramp<linearRamp>(entryName, dict)
+    Ramp<linearRamp>(name, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
index da6e690d28..5d66d40107 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
@@ -68,7 +68,7 @@ public:
         //- Construct from entry name and dictionary
         linearRamp
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H
index 1774930b60..6cb1e703ed 100644
--- a/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H
@@ -70,7 +70,7 @@ class objectFunction1
         template <class PrimitiveType>
         objectFunction1
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict,
             const type<PrimitiveType>&
         );
@@ -83,7 +83,7 @@ public:
         template <template <class> class ObjectType>
         static autoPtr<objectFunction1> New
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict,
             const word& objectName,
             const objectRegistry& db
diff --git a/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C
index 6a7aea7c70..3059f85d69 100644
--- a/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C
+++ b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C
@@ -30,14 +30,14 @@ License
 template <class PrimitiveType>
 Foam::objectFunction1::objectFunction1
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict,
     const type<PrimitiveType>&
 )
 :
     autoPtr<Function1<PrimitiveType>>
     (
-        Function1<PrimitiveType>::New(entryName, dict).ptr()
+        Function1<PrimitiveType>::New(name, dict).ptr()
     )
 {}
 
@@ -47,7 +47,7 @@ Foam::objectFunction1::objectFunction1
 template <template <class> class ObjectType>
 Foam::autoPtr<Foam::objectFunction1> Foam::objectFunction1::New
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict,
     const word& objectName,
     const objectRegistry& db
@@ -56,15 +56,15 @@ Foam::autoPtr<Foam::objectFunction1> Foam::objectFunction1::New
     autoPtr<objectFunction1> ptr
     (
         db.foundObject<ObjectType<scalar>>(objectName)
-      ? new objectFunction1(entryName, dict, type<scalar>())
+      ? new objectFunction1(name, dict, type<scalar>())
       : db.foundObject<ObjectType<vector>>(objectName)
-      ? new objectFunction1(entryName, dict, type<vector>())
+      ? new objectFunction1(name, dict, type<vector>())
       : db.foundObject<ObjectType<symmTensor>>(objectName)
-      ? new objectFunction1(entryName, dict, type<symmTensor>())
+      ? new objectFunction1(name, dict, type<symmTensor>())
       : db.foundObject<ObjectType<sphericalTensor>>(objectName)
-      ? new objectFunction1(entryName, dict, type<sphericalTensor>())
+      ? new objectFunction1(name, dict, type<sphericalTensor>())
       : db.foundObject<ObjectType<tensor>>(objectName)
-      ? new objectFunction1(entryName, dict, type<tensor>())
+      ? new objectFunction1(name, dict, type<tensor>())
       : nullptr
     );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
index 8a4abb33c7..b855d37e5c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,11 @@ namespace Function1s
 
 Foam::Function1s::quadraticRamp::quadraticRamp
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Ramp<quadraticRamp>(entryName, dict)
+    Ramp<quadraticRamp>(name, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
index affd19d697..b175da3116 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
@@ -68,7 +68,7 @@ public:
         //- Construct from entry name and dictionary
         quadraticRamp
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
index 4ce70cb6b9..e58c77438e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,11 @@ namespace Function1s
 
 Foam::Function1s::quarterCosineRamp::quarterCosineRamp
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Ramp<quarterCosineRamp>(entryName, dict)
+    Ramp<quarterCosineRamp>(name, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
index 4495d9f355..f0a4e12a5b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
@@ -68,7 +68,7 @@ public:
         //- Construct from entry name and dictionary
         quarterCosineRamp
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
index 24f0cec2ae..2ec68280ea 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,11 @@ namespace Function1s
 
 Foam::Function1s::quarterSineRamp::quarterSineRamp
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Ramp<quarterSineRamp>(entryName, dict)
+    Ramp<quarterSineRamp>(name, dict)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
index 2c27fdadb5..e78cad8a61 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
@@ -68,7 +68,7 @@ public:
         //- Construct from entry name and dictionary
         quarterSineRamp
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.C b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.C
index 3cd539ad53..8e884e2f01 100644
--- a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.C
@@ -36,24 +36,15 @@ namespace Function1s
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::Function1s::reverseRamp::writeData(Ostream& os) const
-{
-    Ramp<reverseRamp>::writeData(os);
-    ramp_->write(os);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::Function1s::reverseRamp::reverseRamp
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Ramp<reverseRamp>(entryName, dict),
+    Ramp<reverseRamp>(name, dict),
     ramp_(Function1<scalar>::New("ramp", dict))
 {}
 
@@ -74,4 +65,13 @@ Foam::Function1s::reverseRamp::~reverseRamp()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::Function1s::reverseRamp::write(Ostream& os) const
+{
+    Ramp<reverseRamp>::write(os);
+    ramp_->write(os);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
index c25b7a8926..bac13b1b94 100644
--- a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
@@ -31,7 +31,7 @@ Description
 
     Usage for scaling a vector:
     \verbatim
-        <entryName>
+        <name>
         {
             scale
             {
@@ -89,12 +89,6 @@ class reverseRamp
         autoPtr<Function1<scalar>> ramp_;
 
 
-    // Private Member Functions
-
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
-
 public:
 
     // Runtime type information
@@ -106,7 +100,7 @@ public:
         //- Construct from entry name and dictionary
         reverseRamp
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -130,6 +124,9 @@ public:
             const scalar t2
         ) const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C
index ccb72a1b6b..a3d092a890 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C
@@ -88,23 +88,16 @@ Foam::Function2s::Coded<Type>::compileNew()
 }
 
 
-template<class Type>
-void Foam::Function2s::Coded<Type>::writeData(Ostream& os) const
-{
-    writeCode(os);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::Function2s::Coded<Type>::Coded
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    Function2<Type>(entryName),
+    Function2<Type>(name),
     CodedBase<coded>(dict)
 {
     redirectFunction2Ptr_ = compileNew();
@@ -149,4 +142,11 @@ Foam::tmp<Foam::Field<Type>> Foam::Function2s::Coded<Type>::value
 }
 
 
+template<class Type>
+void Foam::Function2s::Coded<Type>::write(Ostream& os) const
+{
+    writeCode(os);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
index 4976173b4a..632a10eecc 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
@@ -89,9 +89,6 @@ class Coded
         //- Compile, link and return the now coded Function2
         autoPtr<Function2<Type>> compileNew();
 
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -104,7 +101,7 @@ public:
         //- Construct from entry name and dictionary
         Coded
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -131,6 +128,9 @@ public:
             const scalarField& y
         ) const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.C b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.C
index 8ac680103a..664b6300e6 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.C
@@ -30,11 +30,11 @@ License
 template<class Type>
 Foam::Function2s::Constant<Type>::Constant
 (
-    const word& entryName,
+    const word& name,
     const Type& val
 )
 :
-    FieldFunction2<Type, Constant<Type>>(entryName),
+    FieldFunction2<Type, Constant<Type>>(name),
     value_(val)
 {}
 
@@ -42,20 +42,20 @@ Foam::Function2s::Constant<Type>::Constant
 template<class Type>
 Foam::Function2s::Constant<Type>::Constant
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction2<Type, Constant<Type>>(entryName),
+    FieldFunction2<Type, Constant<Type>>(name),
     value_(Zero)
 {
-    if (!dict.found(entryName))
+    if (!dict.found(name))
     {
         dict.lookup("value") >> value_;
     }
     else
     {
-        Istream& is(dict.lookup(entryName));
+        Istream& is(dict.lookup(name));
         word entryType(is);
         if (is.eof())
         {
@@ -72,11 +72,11 @@ Foam::Function2s::Constant<Type>::Constant
 template<class Type>
 Foam::Function2s::Constant<Type>::Constant
 (
-    const word& entryName,
+    const word& name,
     Istream& is
 )
 :
-    FieldFunction2<Type, Constant<Type>>(entryName),
+    FieldFunction2<Type, Constant<Type>>(name),
     value_(pTraits<Type>(is))
 {}
 
@@ -101,8 +101,7 @@ Foam::Function2s::Constant<Type>::~Constant()
 template<class Type>
 void Foam::Function2s::Constant<Type>::write(Ostream& os) const
 {
-    this->writeType(os)
-        << token::SPACE << value_ << token::END_STATEMENT << nl;
+    writeEntry(os, "value", value_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
index 1b32cecae0..6da532fe64 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
@@ -27,15 +27,15 @@ Class
 Description
     Templated function of two variables that returns a constant value.
 
-    Usage - for entry \<entryName\> returning the value <value>:
+    Usage - for entry \<name\> returning the value <value>:
     \verbatim
-        <entryName>     constant <value>;
+        <name>     constant <value>;
     \endverbatim
 
     or simply
 
     \verbatim
-        <entryName>     <value>;
+        <name>     <value>;
     \endverbatim
 
 SourceFiles
@@ -79,15 +79,15 @@ public:
     // Constructors
 
         //- Construct from entry name and value
-        Constant(const word& entryName, const Type& val);
+        Constant(const word& name, const Type& val);
 
         //- Construct from entry name and dictionary
-        Constant(const word& entryName, const dictionary& dict);
+        Constant(const word& name, const dictionary& dict);
 
         //- Construct from entry name and Istream
         //  Reads the constant value without the Function2 type
         //  for backward compatibility
-        Constant(const word& entryName, Istream& is);
+        Constant(const word& name, Istream& is);
 
         //- Copy constructor
         Constant(const Constant<Type>& cnst);
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
index 60083544c4..6c2e179e14 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
@@ -25,21 +25,12 @@ License
 
 #include "Function2.H"
 
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::Function2<Type>::writeType(Ostream& os) const
-{
-    return writeKeyword(os, name_) << type();
-}
-
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Function2<Type>::Function2(const word& entryName)
+Foam::Function2<Type>::Function2(const word& name)
 :
-    name_(entryName)
+    name_(name)
 {}
 
 
@@ -54,20 +45,20 @@ Foam::Function2<Type>::Function2(const Function2<Type>& de)
 template<class Type, class Function2Type>
 Foam::FieldFunction2<Type, Function2Type>::FieldFunction2
 (
-    const word& entryName
+    const word& name
 )
 :
-    Function2<Type>(entryName)
+    Function2<Type>(name)
 {}
 
 
 template<class Type, class Function2Type>
 Foam::FieldFunction2<Type, Function2Type>::FieldFunction2
 (
-    const FieldFunction2<Type, Function2Type>& ff1
+    const FieldFunction2<Type, Function2Type>& ff2
 )
 :
-    Function2<Type>(ff1)
+    Function2<Type>(ff2)
 {}
 
 
@@ -103,20 +94,6 @@ const Foam::word& Foam::Function2<Type>::name() const
 }
 
 
-template<class Type>
-void Foam::Function2<Type>::write(Ostream& os) const
-{
-    writeKeyword(os, name_)
-        << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
-
-    writeEntry(os, "type", type());
-
-    writeData(os);
-
-    os  << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
 template<class Type, class Function2Type>
 Foam::tmp<Foam::Field<Type>> Foam::FieldFunction2<Type, Function2Type>::value
 (
@@ -139,9 +116,16 @@ Foam::tmp<Foam::Field<Type>> Foam::FieldFunction2<Type, Function2Type>::value
 // * * * * * * * * * * * * * * * IOstream Functions  * * * * * * * * * * * * //
 
 template<class Type>
-void  Foam::writeEntry(Ostream& os, const Function2<Type>& f1)
+void  Foam::writeEntry(Ostream& os, const Function2<Type>& f2)
 {
-    f1.write(os);
+    writeKeyword(os, f2.name())
+        << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
+
+    writeEntry(os, "type", f2.type());
+
+    f2.write(os);
+
+    os  << decrIndent << indent << token::END_BLOCK << endl;
 }
 
 
@@ -151,7 +135,7 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const Function2<Type>& f1
+    const Function2<Type>& f2
 )
 {
     // Check state of Ostream
@@ -160,7 +144,7 @@ Foam::Ostream& Foam::operator<<
         "Ostream& operator<<(Ostream&, const Function2<Type>&)"
     );
 
-    f1.write(os);
+    f2.write(os);
 
     return os;
 }
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
index 02a53d5b7f..cff14d7f83 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
@@ -71,15 +71,6 @@ protected:
         const word name_;
 
 
-    // Protected member functions
-
-        Ostream& writeType(Ostream& os) const;
-
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const
-        {}
-
-
 public:
 
     typedef Type returnType;
@@ -94,17 +85,17 @@ public:
         Function2,
         dictionary,
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         ),
-        (entryName, dict)
+        (name, dict)
     );
 
 
     // Constructors
 
         //- Construct from entry name
-        Function2(const word& entryName);
+        Function2(const word& name);
 
         //- Copy constructor
         Function2(const Function2<Type>& f1);
@@ -116,7 +107,7 @@ public:
     //- Selector
     static autoPtr<Function2<Type>> New
     (
-        const word& entryName,
+        const word& name,
         const dictionary& dict
     );
 
@@ -141,7 +132,7 @@ public:
         ) const = 0;
 
         //- Write in dictionary format
-        virtual void write(Ostream& os) const;
+        virtual void write(Ostream& os) const = 0;
 
 
     // Member Operators
@@ -180,7 +171,7 @@ public:
     // Constructors
 
         //- Construct from entry name
-        FieldFunction2(const word& entryName);
+        FieldFunction2(const word& name);
 
         //- Copy constructor
         FieldFunction2(const FieldFunction2<Type, Function2Type>& ff1);
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2New.C b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2New.C
index 7096900c7d..3a17b0364c 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2New.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2New.C
@@ -30,13 +30,13 @@ License
 template<class Type>
 Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 {
-    if (dict.isDict(entryName))
+    if (dict.isDict(name))
     {
-        const dictionary& coeffsDict(dict.subDict(entryName));
+        const dictionary& coeffsDict(dict.subDict(name));
 
         const word Function2Type(coeffsDict.lookup("type"));
 
@@ -48,17 +48,17 @@ Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
             FatalErrorInFunction
                 << "Unknown Function2 type "
                 << Function2Type << " for Function2 "
-                << entryName << nl << nl
+                << name << nl << nl
                 << "Valid Function2 types are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc() << nl
                 << exit(FatalError);
         }
 
-        return cstrIter()(entryName, coeffsDict);
+        return cstrIter()(name, coeffsDict);
     }
     else
     {
-        Istream& is(dict.lookup(entryName, false));
+        Istream& is(dict.lookup(name, false));
 
         token firstToken(is);
         word Function2Type;
@@ -68,7 +68,7 @@ Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
             is.putBack(firstToken);
             return autoPtr<Function2<Type>>
             (
-                new Function2s::Constant<Type>(entryName, is)
+                new Function2s::Constant<Type>(name, is)
             );
         }
         else
@@ -84,13 +84,13 @@ Foam::autoPtr<Foam::Function2<Type>> Foam::Function2<Type>::New
             FatalErrorInFunction
                 << "Unknown Function2 type "
                 << Function2Type << " for Function2 "
-                << entryName << nl << nl
+                << name << nl << nl
                 << "Valid Function2 types are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc() << nl
                 << exit(FatalError);
         }
 
-        return cstrIter()(entryName, dict);
+        return cstrIter()(name, dict);
     }
 }
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.C b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.C
index 080ab3a15a..3fad47e7d1 100644
--- a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.C
@@ -28,20 +28,20 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Function2s::OneConstant<Type>::OneConstant(const word& entryName)
+Foam::Function2s::OneConstant<Type>::OneConstant(const word& name)
 :
-    FieldFunction2<Type, OneConstant<Type>>(entryName)
+    FieldFunction2<Type, OneConstant<Type>>(name)
 {}
 
 
 template<class Type>
 Foam::Function2s::OneConstant<Type>::OneConstant
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction2<Type, OneConstant<Type>>(entryName)
+    FieldFunction2<Type, OneConstant<Type>>(name)
 {}
 
 
@@ -56,9 +56,7 @@ Foam::Function2s::OneConstant<Type>::~OneConstant()
 
 template<class Type>
 void Foam::Function2s::OneConstant<Type>::write(Ostream& os) const
-{
-    this->writeType(os) << token::END_STATEMENT << nl;
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
index 21fd84bef8..17564d594a 100644
--- a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
@@ -29,7 +29,7 @@ Description
 
     Usage:
     \verbatim
-        <entryName> one;
+        <name> one;
     \endverbatim
 
 SourceFiles
@@ -68,10 +68,10 @@ public:
     // Constructors
 
         //- Construct from entry name
-        OneConstant(const word& entryName);
+        OneConstant(const word& name);
 
         //- Construct from entry name and dictionary
-        OneConstant(const word& entryName, const dictionary& dict);
+        OneConstant(const word& name, const dictionary& dict);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
index d63ffd0874..cfcf7c1294 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
@@ -49,26 +49,16 @@ void Foam::Function2s::Scale<Type>::read(const dictionary& coeffs)
 }
 
 
-template<class Type>
-void Foam::Function2s::Scale<Type>::writeData(Ostream& os) const
-{
-    scale_->write(os);
-    xScale_->write(os);
-    yScale_->write(os);
-    value_->write(os);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::Function2s::Scale<Type>::Scale
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction2<Type, Scale<Type>>(entryName)
+    FieldFunction2<Type, Scale<Type>>(name)
 {
     read(dict);
 }
@@ -92,4 +82,16 @@ Foam::Function2s::Scale<Type>::~Scale()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function2s::Scale<Type>::write(Ostream& os) const
+{
+    scale_->write(os);
+    xScale_->write(os);
+    yScale_->write(os);
+    value_->write(os);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
index 3279a53aa0..ddebd13a45 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
@@ -80,9 +80,6 @@ class Scale
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Write data to dictionary stream
-        virtual void writeData(Ostream& os) const;
-
 
 public:
 
@@ -95,7 +92,7 @@ public:
         //- Construct from entry name and dictionary
         Scale
         (
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -112,6 +109,9 @@ public:
         //- Return value
         virtual inline Type value(const scalar x, const scalar y) const;
 
+        //- Write data to dictionary stream
+        virtual void write(Ostream& os) const;
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C
index 5e287f01d5..cafb0c70e6 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.C
@@ -30,11 +30,11 @@ License
 template<class Type>
 Foam::Function2s::ZeroConstant<Type>::ZeroConstant
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    FieldFunction2<Type, ZeroConstant<Type>>(entryName)
+    FieldFunction2<Type, ZeroConstant<Type>>(name)
 {}
 
 
@@ -49,9 +49,7 @@ Foam::Function2s::ZeroConstant<Type>::~ZeroConstant()
 
 template<class Type>
 void Foam::Function2s::ZeroConstant<Type>::write(Ostream& os) const
-{
-    this->writeType(os) << token::END_STATEMENT << nl;
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
index fc82966fc5..94ef07c139 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
@@ -29,7 +29,7 @@ Description
 
     Usage:
     \verbatim
-        <entryName> zero;
+        <name> zero;
     \endverbatim
 
 SourceFiles
@@ -68,7 +68,7 @@ public:
     // Constructors
 
         //- Construct from entry name and dictionary
-        ZeroConstant(const word& entryName, const dictionary& dict);
+        ZeroConstant(const word& name, const dictionary& dict);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
index aab93ecd52..b3d6648db1 100644
--- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
@@ -31,13 +31,13 @@ template<class Type>
 Foam::TimeFunction1<Type>::TimeFunction1
 (
     const Time& time,
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
     time_(time),
-    name_(entryName),
-    function_(Function1<Type>::New(entryName, dict))
+    name_(name),
+    function_(Function1<Type>::New(name, dict))
 {}
 
 
@@ -45,11 +45,11 @@ template<class Type>
 Foam::TimeFunction1<Type>::TimeFunction1
 (
     const Time& time,
-    const word& entryName
+    const word& name
 )
 :
     time_(time),
-    name_(entryName),
+    name_(name),
     function_(nullptr)
 {}
 
@@ -106,6 +106,13 @@ Type Foam::TimeFunction1<Type>::integral
 }
 
 
+template<class Type>
+void Foam::TimeFunction1<Type>::write(Ostream& os) const
+{
+    writeEntry(os, function_());
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class Type>
@@ -119,11 +126,4 @@ Foam::Ostream& Foam::operator<<
 }
 
 
-template<class Type>
-void Foam::TimeFunction1<Type>::write(Ostream& os) const
-{
-    function_->write(os);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
index 4fed2ae0dc..bacd32331c 100644
--- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
@@ -82,7 +82,7 @@ public:
         TimeFunction1
         (
             const Time& time,
-            const word& entryName,
+            const word& name,
             const dictionary& dict
         );
 
@@ -90,7 +90,7 @@ public:
         TimeFunction1
         (
             const Time& time,
-            const word& entryName
+            const word& name
         );
 
         //- Copy constructor
diff --git a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
index 2225c79961..8fbf25fc0a 100644
--- a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
+++ b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::pureMixture<ThermoType>::pureMixture
 template<class ThermoType>
 void Foam::pureMixture<ThermoType>::read(const dictionary& thermoDict)
 {
-    mixture_ = ThermoType(thermoDict.subDict("mixture"));
+    // ***HGW mixture_ = ThermoType(thermoDict.subDict("mixture"));
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 2d429b6880..6cbdd24210 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -138,7 +138,8 @@ void Foam::multiComponentMixture<ThermoType>::read
 {
     forAll(species_, i)
     {
-        specieThermos_[i] = ThermoType(thermoDict.subDict(species_[i]));
+        // ***HGW specieThermos_[i] =
+        // ThermoType(thermoDict.subDict(species_[i]));
     }
 }
 
diff --git a/src/thermophysicalModels/specie/Make/files b/src/thermophysicalModels/specie/Make/files
index db7eaed3ec..8feb9af154 100644
--- a/src/thermophysicalModels/specie/Make/files
+++ b/src/thermophysicalModels/specie/Make/files
@@ -10,7 +10,7 @@ thermophysicalFunctions/constant/constantThermophysicalFunction.C
 thermophysicalFunctions/table1D/table1DThermophysicalFunction.C
 thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C
 thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C
-thermophysicalFunctions/table2D/table2DThermophysicalFunction.C
+thermophysicalFunctions/uniformTable2/uniformTable2.C
 thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C
 
 NSRDS = thermophysicalFunctions/NSRDS
diff --git a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H
index e122242304..8270e40c7d 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H
@@ -84,7 +84,7 @@ inline Foam::scalar Foam::icoTabulated<Specie>::rho
     scalar T
 ) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C
index 7ad2ad2028..1656544b58 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C
+++ b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C
@@ -32,7 +32,7 @@ template<class Specie>
 Foam::rhoTabulated<Specie>::rhoTabulated(const dictionary& dict)
 :
     Specie(dict),
-    rho_(dict.subDict("equationOfState").subDict("rho"))
+    rho_("rho", dict.subDict("equationOfState"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
index 50063e683c..8e9fa8e8d5 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
@@ -78,7 +78,7 @@ See also
 #ifndef rhoTabulated_H
 #define rhoTabulated_H
 
-#include "table2DThermophysicalFunction.H"
+#include "uniformTable2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -107,7 +107,7 @@ class rhoTabulated
 :
     public Specie
 {
-    typedef thermophysicalFunctions::table2D table2D;
+    typedef Function2s::uniformTable table2D;
 
 
     // Private Data
diff --git a/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermoI.H b/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermoI.H
index 1d9ed8f796..9ac89199bf 100644
--- a/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermoI.H
@@ -60,7 +60,7 @@ inline Foam::scalar Foam::eIcoTabulatedThermo<EquationOfState>::Cv
     const scalar T
 ) const
 {
-    return Cv_.value(p, T) + EquationOfState::Cv(p, T);
+    return Cv_.value(T) + EquationOfState::Cv(p, T);
 }
 
 
@@ -71,7 +71,7 @@ inline Foam::scalar Foam::eIcoTabulatedThermo<EquationOfState>::Es
     const scalar T
 ) const
 {
-    return Cv_.intfdT(p, T) + EquationOfState::E(p, T);
+    return Cv_.intfdT(T) + EquationOfState::E(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C
index 6a64842c03..7b32c629a0 100644
--- a/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C
@@ -37,8 +37,8 @@ Foam::eTabulatedThermo<EquationOfState>::eTabulatedThermo
     EquationOfState(dict),
     Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
     Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
-    Es_(dict.subDict("thermodynamics").subDict("Es")),
-    Cv_(dict.subDict("thermodynamics").subDict("Cv"))
+    Es_("Es", dict.subDict("thermodynamics")),
+    Cv_("Cv", dict.subDict("thermodynamics"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.H b/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.H
index 69291337c6..6d2e4aea00 100644
--- a/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.H
@@ -90,14 +90,14 @@ SourceFiles
     eTabulatedThermo.C
 
 See also
-    Foam::thermophysicalFunctions::table2D
+    Foam::Function2s::uniformTable
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef eTabulatedThermo_H
 #define eTabulatedThermo_H
 
-#include "table2DThermophysicalFunction.H"
+#include "uniformTable2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -126,7 +126,7 @@ class eTabulatedThermo
 :
     public EquationOfState
 {
-    typedef thermophysicalFunctions::table2D table2D;
+    typedef Function2s::uniformTable table2D;
 
 
     // Private Data
diff --git a/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermoI.H b/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermoI.H
index f6774a88e4..27c3eba832 100644
--- a/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermoI.H
@@ -60,7 +60,7 @@ inline Foam::scalar Foam::hIcoTabulatedThermo<EquationOfState>::Cp
     const scalar T
 ) const
 {
-    return Cp_.value(p, T) + EquationOfState::Cp(p, T);
+    return Cp_.value(T) + EquationOfState::Cp(p, T);
 }
 
 
@@ -71,7 +71,7 @@ inline Foam::scalar Foam::hIcoTabulatedThermo<EquationOfState>::Hs
     const scalar T
 ) const
 {
-    return Cp_.intfdT(p, T) + EquationOfState::H(p, T);
+    return Cp_.intfdT(T) + EquationOfState::H(p, T);
 }
 
 
@@ -101,7 +101,7 @@ inline Foam::scalar Foam::hIcoTabulatedThermo<EquationOfState>::S
     const scalar T
 ) const
 {
-    return Cp_.intfByTdT(p, T) + EquationOfState::Sp(p, T) + Sf_;
+    return Cp_.intfByTdT(T) + EquationOfState::Sp(p, T) + Sf_;
 }
 
 
@@ -111,7 +111,7 @@ inline Foam::scalar Foam::hIcoTabulatedThermo<EquationOfState>::Gstd
     const scalar T
 ) const
 {
-    return Cp_.intfdT(Pstd, T) + Hf_ - (Cp_.intfByTdT(Pstd, T) + Sf_)*T;
+    return Cp_.intfdT(T) + Hf_ - (Cp_.intfByTdT(T) + Sf_)*T;
 }
 
 
@@ -122,7 +122,7 @@ inline Foam::scalar Foam::hIcoTabulatedThermo<EquationOfState>::dCpdT
     const scalar T
 ) const
 {
-    return Cp_.dfdT(p, T);
+    return Cp_.dfdT(T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C
index 6883870602..5d4a81b75a 100644
--- a/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C
@@ -37,8 +37,8 @@ Foam::hTabulatedThermo<EquationOfState>::hTabulatedThermo
     EquationOfState(dict),
     Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
     Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
-    Hs_(dict.subDict("thermodynamics").subDict("Hs")),
-    Cp_(dict.subDict("thermodynamics").subDict("Cp"))
+    Hs_("Hs", dict.subDict("thermodynamics")),
+    Cp_("Cp", dict.subDict("thermodynamics"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.H b/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.H
index ffd52297d8..f917070266 100644
--- a/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.H
@@ -90,14 +90,14 @@ SourceFiles
     hTabulatedThermo.C
 
 See also
-    Foam::thermophysicalFunctions::table2D
+    Foam::Function2s::uniformTable
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef hTabulatedThermo_H
 #define hTabulatedThermo_H
 
-#include "table2DThermophysicalFunction.H"
+#include "uniformTable2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -126,7 +126,7 @@ class hTabulatedThermo
 :
     public EquationOfState
 {
-    typedef thermophysicalFunctions::table2D table2D;
+    typedef Function2s::uniformTable table2D;
 
 
     // Private Data
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C
index fcc0a10866..92bb7d0726 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C
@@ -30,29 +30,25 @@ License
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function2s
 {
-    defineTypeNameAndDebug(APIdiffCoef, 0);
-    addToRunTimeSelectionTable
-    (
-        thermophysicalFunction,
-        APIdiffCoef,
-        dictionary
-    );
+    makeScalarFunction2(APIdiffCoef)
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::APIdiffCoef::APIdiffCoef
+Foam::Function2s::APIdiffCoef::APIdiffCoef
 (
+    const word& name,
     const scalar a,
     const scalar b,
     const scalar wf,
     const scalar wa
 )
 :
+    FieldFunction2<scalar, APIdiffCoef>(name),
     a_(a),
     b_(b),
     wf_(wf),
@@ -62,8 +58,13 @@ Foam::thermophysicalFunctions::APIdiffCoef::APIdiffCoef
 {}
 
 
-Foam::thermophysicalFunctions::APIdiffCoef::APIdiffCoef(const dictionary& dict)
+Foam::Function2s::APIdiffCoef::APIdiffCoef
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction2<scalar, APIdiffCoef>(name),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
     wf_(dict.lookup<scalar>("wf")),
@@ -75,7 +76,7 @@ Foam::thermophysicalFunctions::APIdiffCoef::APIdiffCoef(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::APIdiffCoef::write(Ostream& os) const
+void Foam::Function2s::APIdiffCoef::write(Ostream& os) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.H
index 8a1aff1829..ebbfbb815d 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::APIdiffCoefFunc
+    Foam::Function2s::APIdiffCoefFunc
 
 Description
     API function for vapour mass diffusivity
@@ -38,13 +38,13 @@ Description
 #ifndef APIdiffCoefThermophysicalFunction_H
 #define APIdiffCoefThermophysicalFunction_H
 
-#include "thermophysicalFunction.H"
+#include "Function2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function2s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -53,7 +53,7 @@ namespace thermophysicalFunctions
 
 class APIdiffCoef
 :
-    public thermophysicalFunction
+    public FieldFunction2<scalar, APIdiffCoef>
 {
     // Private Data
 
@@ -75,6 +75,7 @@ public:
         //- Construct from components
         APIdiffCoef
         (
+            const word& name,
             const scalar a,
             const scalar b,
             const scalar wf,
@@ -82,14 +83,24 @@ public:
         );
 
         //- Construct from dictionary
-        APIdiffCoef(const dictionary& dict);
+        APIdiffCoef
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function2<scalar>> clone() const
+        {
+            return tmp<Function2<scalar>>(new APIdiffCoef(*this));
+        }
 
 
     // Member Functions
 
         //- API vapour mass diffusivity function using properties from
         //  construction
-        scalar value(scalar p, scalar T) const
+        virtual scalar value(scalar p, scalar T) const
         {
             return 3.6059e-3*(pow(1.8*T, 1.75))*alpha_/(p*beta_);
         }
@@ -102,8 +113,6 @@ public:
             return 3.6059e-3*(pow(1.8*T, 1.75))*alphaBinary/(p*beta_);
         }
 
-        using thermophysicalFunction::write;
-
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
 };
@@ -111,7 +120,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function2s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.H
index c246324bcc..dc2c5e598c 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.H
@@ -103,7 +103,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             return ((((f_*T + e_)*T + d_)*T + c_)*T + b_)*T + a_;
         }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.H
index d1b4f02344..60891d7f79 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.H
@@ -102,7 +102,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             return exp(a_ + b_/T + c_*log(T) + d_*pow(T, e_));
         }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.H
index b8a55f1b27..1663f6213e 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.H
@@ -102,7 +102,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             scalar Tdash = min(T, Tc_ - rootVSmall);
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.H
index eec4016524..621ed69ece 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.H
@@ -101,7 +101,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             return a_*pow(T, b_)/(1.0 + c_/T + d_/sqr(T));
         }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.H
index e1a2ec695f..e4a1a0a7f6 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.H
@@ -101,7 +101,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             return a_ + b_*exp(-c_/pow(T, d_));
         }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.H
index 6189ae6c1d..d3b4d9963a 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.H
@@ -102,7 +102,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             return a_ + b_/T + c_/pow(T, 3) + d_/pow(T, 8) + e_/pow(T, 9);
         }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.H
index d245ceea5b..6f0565774b 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.H
@@ -101,7 +101,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             return a_/pow(b_, 1 + pow(1 - T/c_, d_));
         }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.H
index 597429af30..417283b369 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.H
@@ -103,7 +103,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             scalar Tr = T/Tc_;
             return a_*pow(1 - Tr, ((e_*Tr + d_)*Tr + c_)*Tr + b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.H
index 71f97096ec..7949f35ab0 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.H
@@ -102,7 +102,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar, scalar T) const
+        scalar value(scalar T) const
         {
             return a_ + b_*sqr((c_/T)/sinh(c_/T)) + d_*sqr((e_/T)/cosh(e_/T));
         }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.C
index a679e1d9a9..af99ad7ffa 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.C
@@ -48,11 +48,7 @@ Foam::thermophysicalFunctions::constant::constant(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::thermophysicalFunctions::constant::value
-(
-    scalar p,
-    scalar T
-) const
+Foam::scalar Foam::thermophysicalFunctions::constant::value(scalar T) const
 {
     return value_;
 }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.H
index a079b2c322..8cdd89b3a0 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.H
@@ -85,7 +85,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar p, scalar T) const;
+        scalar value(scalar T) const;
 
         //- Write the function coefficients
         void write(Ostream& os) const;
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C
index 735afc504c..cd291dc55a 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C
@@ -63,12 +63,12 @@ integratedNonUniformTable1D
 
     for(label i = 0; i<intf_.size() - 1; i++)
     {
-        intf_[i + 1] = intf_[i] + intfdT(0, values()[i + 1].first());
-        intfByT_[i + 1] = intfByT_[i] + intfByTdT(0, values()[i + 1].first());
+        intf_[i + 1] = intf_[i] + intfdT(values()[i + 1].first());
+        intfByT_[i + 1] = intfByT_[i] + intfByTdT(values()[i + 1].first());
     }
 
-    const scalar intfStd = intfdT(Pstd, Tstd);
-    const scalar intfByTStd = intfByTdT(Pstd, Tstd);
+    const scalar intfStd = intfdT(Tstd);
+    const scalar intfByTStd = intfByTdT(Tstd);
 
     forAll(intf_, i)
     {
@@ -92,11 +92,10 @@ integratedNonUniformTable1D
 
 Foam::scalar Foam::thermophysicalFunctions::integratedNonUniformTable1D::intfdT
 (
-    scalar p,
     scalar T
 ) const
 {
-    const label i = index(p, T);
+    const label i = index(T);
     const scalar Ti = values()[i].first();
     const scalar fi = values()[i].second();
     const scalar dT = T - Ti;
@@ -111,11 +110,10 @@ Foam::scalar Foam::thermophysicalFunctions::integratedNonUniformTable1D::intfdT
 Foam::scalar Foam::thermophysicalFunctions::integratedNonUniformTable1D::
 intfByTdT
 (
-    scalar p,
     scalar T
 ) const
 {
-    const label i = index(p, T);
+    const label i = index(T);
     const scalar Ti = values()[i].first();
     const scalar fi = values()[i].second();
     const scalar gradf =
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.H
index 07ef103f8b..375af2539a 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.H
@@ -100,10 +100,10 @@ public:
     // Member Functions
 
         //- Integrate the function and return the result
-        scalar intfdT(scalar p, scalar T) const;
+        scalar intfdT(scalar T) const;
 
         //- Integrate the function divided by T and return the result
-        scalar intfByTdT(scalar p, scalar T) const;
+        scalar intfByTdT(scalar T) const;
 
         //- Write the function coefficients
         void write(Ostream& os) const;
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C
index 8afdfe1e92..debf6a2826 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C
@@ -115,11 +115,10 @@ Foam::thermophysicalFunctions::nonUniformTable1D::nonUniformTable1D
 
 Foam::scalar Foam::thermophysicalFunctions::nonUniformTable1D::value
 (
-    scalar p,
     scalar T
 ) const
 {
-    const label i = index(p, T);
+    const label i = index(T);
     const scalar Ti = values_[i].first();
     const scalar lambda = (T - Ti)/(values_[i + 1].first() - Ti);
 
@@ -131,11 +130,10 @@ Foam::scalar Foam::thermophysicalFunctions::nonUniformTable1D::value
 
 Foam::scalar Foam::thermophysicalFunctions::nonUniformTable1D::dfdT
 (
-    scalar p,
     scalar T
 ) const
 {
-    const label i = index(p, T);
+    const label i = index(T);
 
     return
         (values_[i + 1].second() - values_[i].second())
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.H
index 2153d24047..6e081bf956 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.H
@@ -100,7 +100,7 @@ protected:
 
         //- Return the lower index of the interval in the table
         //  corresponding to the given temperature
-        inline label index(scalar p, scalar T) const;
+        inline label index(scalar T) const;
 
 
 public:
@@ -127,10 +127,10 @@ public:
         }
 
         //- Evaluate the function and return the result
-        scalar value(scalar p, scalar T) const;
+        scalar value(scalar T) const;
 
         //- Evaluate the derivative of the function and return the result
-        scalar dfdT(scalar p, scalar T) const;
+        scalar dfdT(scalar T) const;
 
         //- Write the function coefficients
         void write(Ostream& os) const;
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunctionI.H b/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunctionI.H
index 4ec8f70894..efdeffe408 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunctionI.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunctionI.H
@@ -29,7 +29,6 @@ License
 
 inline Foam::label Foam::thermophysicalFunctions::nonUniformTable1D::index
 (
-    scalar p,
     scalar T
 ) const
 {
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.C
index 8f3e8e8d7e..4c7e1a2527 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.C
@@ -48,11 +48,7 @@ Foam::thermophysicalFunctions::none::none(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::thermophysicalFunctions::none::value
-(
-    scalar p,
-    scalar T
-) const
+Foam::scalar Foam::thermophysicalFunctions::none::value(scalar T) const
 {
     FatalErrorInFunction
         << "Required Function " << nl
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.H
index 4e39fdb706..5126d10674 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.H
@@ -70,7 +70,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar p, scalar T) const;
+        scalar value(scalar T) const;
 
         //- Write the function coefficients
         void write(Ostream& os) const;
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.C
index c87bad2702..7a897298f8 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.C
@@ -66,7 +66,6 @@ Foam::thermophysicalFunctions::table1D::table1D(const dictionary& dict)
 
 Foam::scalar Foam::thermophysicalFunctions::table1D::value
 (
-    scalar p,
     scalar T
 ) const
 {
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.H
index ca92a3e08d..faa5052854 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.H
@@ -109,7 +109,7 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar p, scalar T) const;
+        scalar value(scalar T) const;
 
         //- Write the function coefficients
         void write(Ostream& os) const;
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index 5354e08ecd..6d0dcc0e5a 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -39,8 +39,8 @@ namespace Foam
 
 Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
 (
-    const dictionary& dict,
-    const word& name
+    const word& name,
+    const dictionary& dict
 )
 {
     if (debug)
@@ -81,16 +81,18 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
 }
 
 
+// * * * * * * * * * * * * * * * IOstream Functions  * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::thermophysicalFunction::write(Ostream& os, const word& name) const
+void Foam::writeEntry(Ostream& os, const thermophysicalFunction& f)
 {
-    os << nl;
-    writeKeyword(os, name)
+    writeKeyword(os, "***HGW")
         << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
-    write(os);
-    os << decrIndent << indent << token::END_BLOCK << endl;
+
+    writeEntry(os, "type", f.type());
+
+    f.write(os);
+
+    os  << decrIndent << indent << token::END_BLOCK << endl;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
index 1ca02fb268..62f0977ca4 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
@@ -82,8 +82,8 @@ public:
         //- Return pointer to new thermophysicalFunction created from dict
         static autoPtr<thermophysicalFunction> New
         (
-            const dictionary& dict,
-            const word& name
+            const word& name,
+            const dictionary& dict
         );
 
 
@@ -95,14 +95,11 @@ public:
     // Member Functions
 
         //- Evaluate the function and return the result
-        virtual scalar value(scalar p, scalar T) const = 0;
+        virtual scalar value(scalar T) const = 0;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const = 0;
 
-        //- Write the function coefficients within the property sub-dictionary
-        virtual void write(Ostream& os, const word& name) const;
-
 
     // Ostream Operator
 
@@ -114,6 +111,9 @@ public:
 };
 
 
+void writeEntry(Ostream& os, const thermophysicalFunction& f);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/table2D/table2DThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.C
similarity index 88%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/table2D/table2DThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.C
index 542105d994..9eabd3391a 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/table2D/table2DThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.C
@@ -23,30 +23,29 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "table2DThermophysicalFunction.H"
+#include "uniformTable2.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function2s
 {
-    defineTypeNameAndDebug(table2D, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, table2D, dictionary);
+    makeScalarFunction2(uniformTable)
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::table2D::table2D
+Foam::Function2s::uniformTable::uniformTable
 (
     const word& name,
     const dictionary& dict
 )
 :
-    name_(name),
+    FieldFunction2<scalar, uniformTable>(name),
     pLow_(dict.lookup<scalar>("pLow")),
     pHigh_(dict.lookup<scalar>("pHigh")),
     Tlow_(dict.lookup<scalar>("Tlow")),
@@ -69,15 +68,9 @@ Foam::thermophysicalFunctions::table2D::table2D
 }
 
 
-Foam::thermophysicalFunctions::table2D::table2D(const dictionary& dict)
-:
-    table2D("values", dict)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline void Foam::thermophysicalFunctions::table2D::checkRange
+inline void Foam::Function2s::uniformTable::checkRange
 (
     scalar p,
     scalar ndp,
@@ -107,7 +100,7 @@ inline void Foam::thermophysicalFunctions::table2D::checkRange
 }
 
 
-Foam::scalar Foam::thermophysicalFunctions::table2D::value
+Foam::scalar Foam::Function2s::uniformTable::value
 (
     scalar p,
     scalar T
@@ -142,7 +135,7 @@ Foam::scalar Foam::thermophysicalFunctions::table2D::value
 }
 
 
-Foam::scalar Foam::thermophysicalFunctions::table2D::
+Foam::scalar Foam::Function2s::uniformTable::
 dfdp
 (
     scalar p,
@@ -170,7 +163,7 @@ dfdp
 }
 
 
-Foam::scalar Foam::thermophysicalFunctions::table2D::
+Foam::scalar Foam::Function2s::uniformTable::
 dfdT
 (
     scalar p,
@@ -198,7 +191,7 @@ dfdT
 }
 
 
-void Foam::thermophysicalFunctions::table2D::write(Ostream& os) const
+void Foam::Function2s::uniformTable::write(Ostream& os) const
 {
     writeEntry(os, "pLow", Tlow_);
     writeEntry(os, "pHigh", Thigh_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/table2D/table2DThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.H
similarity index 83%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/table2D/table2DThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.H
index 41caf94eca..a72aaf1eb6 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/table2D/table2DThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.H
@@ -22,17 +22,17 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::table2D
+    Foam::Function2s::uniformTable
 
 Description
     Tabulated property function that linearly interpolates between
-    the table2D values.
+    the uniformTable values.
 
 Usage
     \table
         Property    | Description
-        Tlow        | Lower temperature limit of the table2D
-        Thigh       | Upper temperature limit of the table2D
+        Tlow        | Lower temperature limit of the uniformTable
+        Thigh       | Upper temperature limit of the uniformTable
         values      | Property values, assumed uniformly distributed
     \endtable
 
@@ -40,7 +40,7 @@ Usage
     \verbatim
     rho
     {
-        type    table2D;
+        type    uniformTable;
 
         pLow    1000;
         pHigh   1e6;
@@ -59,32 +59,29 @@ Usage
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef table2DThermophysicalFunction_H
-#define table2DThermophysicalFunction_H
+#ifndef uniformTable2_H
+#define uniformTable2_H
 
-#include "thermophysicalFunction.H"
+#include "Function2.H"
 #include "scalarMatrices.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function2s
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class table2D Declaration
+                            Class uniformTable Declaration
 \*---------------------------------------------------------------------------*/
 
-class table2D
+class uniformTable
 :
-    public thermophysicalFunction
+    public FieldFunction2<scalar, uniformTable>
 {
     // Private member data
 
-        //- Name of dictionary from which this function is instantiated
-        word name_;
-
         //- Lowest pressure in the table
         scalar pLow_;
 
@@ -123,16 +120,13 @@ class table2D
 public:
 
     //- Runtime type information
-    TypeName("table2D");
+    TypeName("uniformTable");
 
 
     // Constructors
 
         //- Construct from entry name and dictionary
-        table2D(const word& name, const dictionary& dict);
-
-        //- Construct from dictionary
-        table2D(const dictionary& dict);
+        uniformTable(const word& name, const dictionary& dict);
 
 
     // Member Functions
@@ -159,7 +153,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function2s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransportI.H b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransportI.H
index a8edea4e0f..c687b123e5 100644
--- a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransportI.H
+++ b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransportI.H
@@ -85,7 +85,7 @@ inline Foam::scalar Foam::icoTabulatedTransport<Thermo>::mu
     const scalar T
 ) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
@@ -96,7 +96,7 @@ inline Foam::scalar Foam::icoTabulatedTransport<Thermo>::kappa
     const scalar T
 ) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C b/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C
index a540e0815c..b9ca4ab438 100644
--- a/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C
+++ b/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C
@@ -35,8 +35,8 @@ Foam::tabulatedTransport<Thermo>::tabulatedTransport
 )
 :
     Thermo(dict),
-    mu_(dict.subDict("transport").subDict("mu")),
-    kappa_(dict.subDict("transport").subDict("kappa"))
+    mu_("mu", dict.subDict("transport")),
+    kappa_("kappa", dict.subDict("transport"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.H b/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.H
index f6558f6c4c..42ca6c5604 100644
--- a/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.H
+++ b/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.H
@@ -85,14 +85,14 @@ SourceFiles
     tabulatedTransport.C
 
 See also
-    Foam::thermophysicalFunctions::table2D
+    Foam::Function2s::uniformTable
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef tabulatedTransport_H
 #define tabulatedTransport_H
 
-#include "table2DThermophysicalFunction.H"
+#include "uniformTable2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -116,7 +116,7 @@ class tabulatedTransport
 :
     public Thermo
 {
-    typedef thermophysicalFunctions::table2D table2D;
+    typedef Function2s::uniformTable table2D;
 
 
     // Private Data
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
index 0fbe49de43..47e257b994 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::Ar::Ar()
     kappa_(0.1819, -0.0003176, -4.11e-06, 0.0, 0.0, 0.0),
     kappag_(0.0001236, 0.8262, -132.8, 16000),
     sigma_(150.86, 0.03823, 1.2927, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 39.948, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 39.948, 28) // note: Same as nHeptane
 {}
 
 
@@ -99,7 +99,7 @@ Foam::Ar::Ar
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
index 120a8777be..0197926492 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
@@ -74,7 +74,7 @@ class Ar
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H
index ca743fb0b7..fcbe06adb8 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::Ar::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::Ar::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
index 2183eef2c3..9e1e399bb7 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C10H22::C10H22()
     kappa_(0.2063, -0.000254, 0.0, 0.0, 0.0, 0.0),
     kappag_(-668.4, 0.9323, -4071000000.0, 0.0),
     sigma_(617.70, 0.055435, 1.3095, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 142.285, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 142.285, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C10H22::C10H22
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
index dbe9e0250a..ef87481529 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class C10H22
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H
index b301996424..e3f600f7bc 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C10H22::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C10H22::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
index bd5f0c3a6b..30fc7a3a55 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::C12H26::C12H26()
     kappa_(0.2047, -0.0002326, 0.0, 0.0, 0.0, 0.0),
     kappag_(5.719e-06, 1.4699, 579.4, 0.0),
     sigma_(658.0, 0.055493, 1.3262, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 170.338, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 170.338, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -99,7 +99,7 @@ Foam::C12H26::C12H26
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
index a802914b61..e14ffb6e59 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class C12H26
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H
index bae5f498ee..b73fc719e5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C12H26::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C12H26::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
index 90c7d4921f..72346cd7fa 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C13H28::C13H28()
     kappa_(0.1981, -0.0002046, 0.0, 0.0, 0.0, 0.0),
     kappag_(5.3701e-06, 1.4751, 599.09, 0.0),
     sigma_(675.80, 0.05561, 1.3361, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 184.365, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 184.365, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C13H28::C13H28
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
index 172f7a8b8f..6762fe466c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class C13H28
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H
index 1dbbf6508e..dc3c610f90 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C13H28::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C13H28::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
index e04218a444..9fd025fd5c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C14H30::C14H30()
     kappa_(0.1957, -0.0001993, 0.0, 0.0, 0.0, 0.0),
     kappag_(-0.000628, 0.944, -5490, 0.0),
     sigma_(692.40, 0.056436, 1.3658, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 198.392, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 198.392, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C14H30::C14H30
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
index fa1fbde8d0..1d5d89663b 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class C14H30
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H
index 6ab5ac879a..da6f8106ff 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C14H30::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C14H30::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
index 9b840e6198..9f767dda46 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C16H34::C16H34()
     kappa_(0.1963, -0.00019, 0.0, 0.0, 0.0, 0.0),
     kappag_(3.075e-06, 1.552, 678.0, 0.0),
     sigma_(720.60, 0.05699, 1.3929, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 226.446, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 226.446, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C16H34::C16H34
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
index d0224166d1..fd80d598b1 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class C16H34
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H
index caa3edb04d..9f0e8a23cb 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C16H34::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C16H34::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
index 9bbee1d47d..453acb4709 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C2H5OH::C2H5OH()
     kappa_(0.253, -0.000281, 0.0, 0.0, 0.0, 0.0),
     kappag_(-3.12, 0.7152, -3550000.0, 0.0),
     sigma_(3.7640e-02, -2.1570e-05, -1.025e-07, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 46.069, 28) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C2H5OH::C2H5OH
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS0& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
index b4b4745ba6..150808b9ac 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class C2H5OH
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS0 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS0& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H
index a3a3c92dbe..389dbffcfb 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C2H5OH::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H5OH::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
index 8780725802..960b07eb5e 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ Foam::C2H6::C2H6()
     kappa_(0.35758, -0.0011458, 6.1866e-07, 0.0, 0.0, 0.0),
     kappag_(7.3869e-05, 1.1689, 500.73, 0.0),
     sigma_(305.32, 0.048643, 1.1981, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 30.070, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 30.070, 28) // note: Same as nHeptane
 {}
 
 
@@ -98,7 +98,7 @@ Foam::C2H6::C2H6
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
index 78af79491e..725cdf0035 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
@@ -74,7 +74,7 @@ class C2H6
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H
index 94068f318e..daf517d7ac 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C2H6::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
index 15b79dd963..c4fabbae02 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C2H6O::C2H6O()
     kappa_(0.31276, -0.0005677, 0.0, 0.0, 0.0, 0.0),
     kappag_(0.2247, 0.1026, 997.06, 1762900),
     sigma_(400.10, 0.06096, 1.2286, 0, 0, 0),
-    D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 46.069, 28) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C2H6O::C2H6O
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
index 9ca984a659..59817c77e3 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
@@ -74,7 +74,7 @@ class C2H6O
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H
index 0ab8582a21..88b3d52895 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C2H6O::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C2H6O::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
index 0e4769a4c2..54575fec6e 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C3H6O::C3H6O()
     kappa_(0.2502, -0.000298, 0.0, 0.0, 0.0, 0.0),
     kappag_(-26.8, 0.9098, -126500000, 0.0),
     sigma_(508.20, 0.0622, 1.124, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 58.08, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 58.08, 28) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C3H6O::C3H6O
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
index 9c13835cd8..c747beffea 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
@@ -74,7 +74,7 @@ class C3H6O
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H
index 400edc9818..b925c7567e 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C3H6O::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H6O::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
index 58c3038be9..8b99fc87d7 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ Foam::C3H8::C3H8()
     kappa_(0.26755, -0.00066457, 2.774e-07, 0.0, 0.0, 0.0),
     kappag_(-1.12, 0.10972, -9834.6, -7535800),
     sigma_(369.83, 0.05092, 1.2197, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 44.096, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 44.096, 28) // note: Same as nHeptane
 {}
 
 
@@ -97,7 +97,7 @@ Foam::C3H8::C3H8
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
index 43ef037faa..efb05d2a00 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
@@ -74,7 +74,7 @@ class C3H8
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H
index 47092d8e7a..047b9f323d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C3H8::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C3H8::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
index 7e7d2d4bac..3c425213e4 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C4H10O::C4H10O()
     kappa_(0.249, -0.0004005, 0.0, 0.0, 0.0, 0.0),
     kappag_(-0.0044894, 0.6155, -3266.3, 0.0),
     sigma_(466.70, 0.057356, 1.288, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 74.123, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 74.123, 28) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C4H10O::C4H10O
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
index a94639bc6d..ebe7782208 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class C4H10O
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H
index a2e6470b1c..df987f077b 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C4H10O::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C4H10O::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
index 3c977ceb8e..1bf4179b28 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C6H14::C6H14()
     kappa_(0.22492, -0.0003533, 0.0, 0.0, 0.0, 0.0),
     kappag_(-650.5, 0.8053, -1412100000, 0.0),
     sigma_(507.60, 0.055003, 1.2674, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 86.177, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 86.177, 28) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C6H14::C6H14
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
index 2607297c1b..23c10edf5d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
@@ -74,7 +74,7 @@ class C6H14
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H
index c30a852133..93db7fa0ec 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C6H14::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H14::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
index 593e667439..18a93bdcdb 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C6H6::C6H6()
     kappa_(0.2407, -0.0003202, 0.0, 0.0, 0.0, 0.0),
     kappag_(1.652e-05, 1.3117, 491, 0.0),
     sigma_(562.16, 0.07195, 1.2389, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 78.114, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 78.114, 28) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C6H6::C6H6
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
index ccacd1792e..a927c68c26 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
@@ -74,7 +74,7 @@ class C6H6
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H
index 74e50e0e73..5ab6a8fa4c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C6H6::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C6H6::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
index 1c4a2bf258..6ce4dbd0d1 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ Foam::C7H16::C7H16()
     kappa_(0.215, -0.000303, 0.0, 0.0, 0.0, 0.0),
     kappag_(-0.070028, 0.38068, -7049.9, -2400500.0),
     sigma_(540.20, 0.054143, 1.2512, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 100.204, 28.0)
+    D_("D", 147.18, 20.1, 100.204, 28.0)
 {}
 
 
@@ -106,7 +106,7 @@ Foam::C7H16::C7H16
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
index bd2a6dddb6..bd8c0c861e 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
@@ -74,7 +74,7 @@ class C7H16
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H
index 9d626eebed..45ee38289a 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C7H16::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H16::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
index 7d4a4c3d31..5f846b45dc 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C7H8::C7H8()
     kappa_(0.2043, -0.000239, 0.0, 0.0, 0.0, 0.0),
     kappag_(2.392e-05, 1.2694, 537, 0.0),
     sigma_(591.79, 0.06685, 1.2456, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 92.141, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 92.141, 28) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C7H8::C7H8
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
index 37f5e00dd2..b7e57b9d3f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
@@ -74,7 +74,7 @@ class C7H8
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H
index 42473c493a..d9eb9d12b1 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C7H8::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C7H8::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
index afceea2b74..d290855398 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C8H10::C8H10()
     kappa_(0.20149, -0.00023988, 0.0, 0.0, 0.0, 0.0),
     kappag_(1.708e-05, 1.319, 565.6, 0.0),
     sigma_(617.17, 0.066, 1.268, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 106.167, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 106.167, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C8H10::C8H10
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
index 5a679a9d77..487de045ab 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
@@ -73,7 +73,7 @@ class C8H10
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -105,7 +105,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H
index f2a3db3edb..da39167801 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C8H10::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H10::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
index b77d64cbbe..c2bb4b64b5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C8H18::C8H18()
     kappa_(0.2156, -0.00029483, 0.0, 0.0, 0.0, 0.0),
     kappag_(-8758, 0.8448, -27121000000.0, 0.0),
     sigma_(568.70, 0.052789, 1.2323, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C8H18::C8H18
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
index b4653e7377..0ef3cf51b0 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
@@ -74,7 +74,7 @@ class C8H18
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H
index 2bc52e9793..ad3650cbcd 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C8H18::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C8H18::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
index 7b7c8ecbdd..bb59751348 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::C9H20::C9H20()
     kappa_(0.209, -0.000264, 0.0, 0.0, 0.0, 0.0),
     kappag_(-0.065771, 0.27198, -3482.3, -1580300.0),
     sigma_(594.60, 0.054975, 1.2897, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 128.258, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 128.258, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::C9H20::C9H20
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
index cdec305825..de32c9cbd5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
@@ -74,7 +74,7 @@ class C9H20
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H
index eb58a33b01..e625eaa73f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::C9H20::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::C9H20::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
index 88a824ba33..b8b141c34d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::CH3OH::CH3OH()
     kappa_(0.2837, -0.000281, 0.0, 0.0, 0.0, 0.0),
     kappag_(-7.763, 1.0279, -74360000.0, 6770000000.0),
     sigma_(512.58, 0.056, -0.00014583, 1.08e-07, 0.0, 0.0),
-    D_(147.18, 20.1, 32.042, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 32.042, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::CH3OH::CH3OH
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
index 37e248b913..b11fa97003 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
@@ -74,7 +74,7 @@ class CH3OH
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H
index 9e942a5a66..d17e78e8e5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::CH3OH::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH3OH::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
index b64cf19078..6a39f12d1f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::CH4N2O::CH4N2O()
     kappa_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0.0, 0.0),
     kappag_(6.977e-05, 1.1243, 844.9, -148850.0),
     sigma_(705.0, 1.0, 0.0, 0.0, 0.0, 0.0), // note: set to constant
-    D_(147.18, 20.1, 60.056, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 60.056, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -91,7 +91,7 @@ Foam::CH4N2O::CH4N2O
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
index 8b9bed929f..03d1781856 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ class CH4N2O
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 public:
 
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2OI.H
index 4d2b1b2bc6..8ec7062c43 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2OI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2OI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::CH4N2O::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::CH4N2O::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
index 3772fc211c..446a74cf1a 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::H2O::H2O()
     kappa_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
     kappag_(6.977e-05, 1.1243, 844.9, -148850),
     sigma_(647.13, 0.18548, 2.717, -3.554, 2.047, 0),
-    D_(15.0, 15.0, 18.015, 28)
+    D_("D", 15.0, 15.0, 18.015, 28)
 {}
 
 
@@ -114,7 +114,7 @@ Foam::H2O::H2O
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
index eb67199560..5ed4b7ba17 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
@@ -73,7 +73,7 @@ class H2O
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -105,7 +105,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2OI.H
index e8ca0ab037..87c69f566c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2OI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2OI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::H2O::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::H2O::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C
index 32b722fe06..35483d9186 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::IC8H18::IC8H18()
     kappa_(0.1508, -0.0001712, 0.0, 0.0, 0.0, 0.0),
     kappag_(1.758e-05, 1.3114, 392.9, 0.0),
     sigma_(543.96, 0.047434, 1.1975, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::IC8H18::IC8H18
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
index 07c3fa35ed..8b835108f5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class IC8H18
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18I.H
index 80691d6be3..e06e6c70e3 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::IC8H18::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::IC8H18::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C
index 0c1ac2619f..c7d6cdb39c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::IDEA::IDEA()
        -2.5529134309e+01,
         8.6488806234
     ),
-    D_(147.18, 20.1, 142.2, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 142.2, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -127,7 +127,7 @@ Foam::IDEA::IDEA
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
index 5b4e0b10b7..34fd147210 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
@@ -96,7 +96,7 @@ class IDEA
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -128,7 +128,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEAI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEAI.H
index 904ee8f5a6..7f8eae0d36 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEAI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEAI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::IDEA::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::IDEA::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C
index ab14903caf..3147ca35f3 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::MB::MB()
     kappa_(0.2298, -0.0003002, 0.0, 0.0, 0.0, 0.0),
     kappag_(1333.1, 0.9962, 12317000000.0, 0.0),
     sigma_(554.5, 0.064084, 1.2418, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 102.133, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 102.133, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -91,7 +91,7 @@ Foam::MB::MB
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
index b874548f74..d86a89e7f8 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
@@ -74,7 +74,7 @@ class MB
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MBI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MBI.H
index a4de0ccac5..ca564a3c11 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MBI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MBI.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::MB::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::MB::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C
index 69bc26d130..b1389adb79 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ Foam::N2::N2()
     kappa_(0.7259, -0.016728, 0.00016215, -5.7605e-07, 0.0, 0.0),
     kappag_(0.000351, 0.7652, 25.767, 0.0),
     sigma_(126.10, 0.02898, 1.2457, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 28.014, 28.0) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 28.014, 28.0) // note: Same as nHeptane
 {}
 
 
@@ -107,7 +107,7 @@ Foam::N2::N2
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
index 29ae924dd8..770082c171 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
@@ -74,7 +74,7 @@ class N2
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2I.H
index d7cc12a081..a5d6b9ed04 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::N2::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::N2::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C
index 8d557ddc24..202b00dc54 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::aC10H7CH3::aC10H7CH3()
     kappa_(0.19758, -0.0001796, 0, 0, 0, 0),
     kappag_(0.3911, -0.1051, -213.52, 2318300),
     sigma_(772.04, 0.076, 1.33, 0, 0, 0),
-    D_(147.18, 20.1, 142.2, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 142.2, 28) // note: Same as nHeptane
 {}
 
 
@@ -99,7 +99,7 @@ Foam::aC10H7CH3::aC10H7CH3
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
index 3f86bc8aed..e0241ecae5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ class aC10H7CH3
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
index 7e99ffc01b..0925aad9ea 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::aC10H7CH3::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::aC10H7CH3::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C
index b3dd25fc55..abd42f8b01 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::bC10H7CH3::bC10H7CH3()
     kappa_(0.1962, -0.00018414, 0.0, 0.0, 0.0, 0.0),
     kappag_(0.4477, -0.1282, -345.89, 2340100),
     sigma_(761.0, 0.066442, 1.2634, 0.0, 0.0, 0.0),
-    D_(147.18, 20.1, 142.2, 28) // note: Same as nHeptane
+    D_("D", 147.18, 20.1, 142.2, 28) // note: Same as nHeptane
 {}
 
 
@@ -99,7 +99,7 @@ Foam::bC10H7CH3::bC10H7CH3
     const thermophysicalFunctions::NSRDS0& thermalConductivity,
     const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
     const thermophysicalFunctions::NSRDS6& surfaceTension,
-    const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+    const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
index f0cf5abf66..3affa8b40f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
@@ -74,7 +74,7 @@ class bC10H7CH3
         thermophysicalFunctions::NSRDS0 kappa_;
         thermophysicalFunctions::NSRDS2 kappag_;
         thermophysicalFunctions::NSRDS6 sigma_;
-        thermophysicalFunctions::APIdiffCoef D_;
+        Function2s::APIdiffCoef D_;
 
 
 public:
@@ -106,7 +106,7 @@ public:
             const thermophysicalFunctions::NSRDS0& thermalConductivity,
             const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
             const thermophysicalFunctions::NSRDS6& surfaceTension,
-            const thermophysicalFunctions::APIdiffCoef& vapourDiffusivity
+            const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
index 43cb350de2..79496ec47c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
@@ -25,73 +25,73 @@ License
 
 inline Foam::scalar Foam::bC10H7CH3::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::bC10H7CH3::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8OI.H
index e82b579329..2df2903088 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8OI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8OI.H
@@ -25,85 +25,85 @@ License
 
 inline Foam::scalar Foam::iC3H8O::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::D(scalar p, scalar T) const
 {
-    return D_.value(p, T);
+    // Use 'standard' NSRDS D(p, T) function
+    return D_.value(T);
 }
 
 
 inline Foam::scalar Foam::iC3H8O::D(scalar p, scalar T, scalar) const
 {
-    // Use 'standard' NSRDS D(p, T) function
     return D(p, T);
 }
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
index d3f0027c61..253f663423 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,19 +39,19 @@ namespace Foam
 Foam::liquid::liquid(const dictionary& dict)
 :
     liquidProperties(dict),
-    rho_(thermophysicalFunction::New(dict, "rho")),
-    pv_(thermophysicalFunction::New(dict, "pv")),
-    hl_(thermophysicalFunction::New(dict, "hl")),
-    Cp_(thermophysicalFunction::New(dict, "Cp")),
-    h_(thermophysicalFunction::New(dict, "h")),
-    Cpg_(thermophysicalFunction::New(dict, "Cpg")),
-    B_(thermophysicalFunction::New(dict, "B")),
-    mu_(thermophysicalFunction::New(dict, "mu")),
-    mug_(thermophysicalFunction::New(dict, "mug")),
-    kappa_(thermophysicalFunction::New(dict, "kappa")),
-    kappag_(thermophysicalFunction::New(dict, "kappag")),
-    sigma_(thermophysicalFunction::New(dict, "sigma")),
-    D_(thermophysicalFunction::New(dict, "D"))
+    rho_(thermophysicalFunction::New("rho", dict)),
+    pv_(thermophysicalFunction::New("pv", dict)),
+    hl_(thermophysicalFunction::New("hl", dict)),
+    Cp_(thermophysicalFunction::New("Cp", dict)),
+    h_(thermophysicalFunction::New("h", dict)),
+    Cpg_(thermophysicalFunction::New("Cpg", dict)),
+    B_(thermophysicalFunction::New("B", dict)),
+    mu_(thermophysicalFunction::New("mu", dict)),
+    mug_(thermophysicalFunction::New("mug", dict)),
+    kappa_(thermophysicalFunction::New("kappa", dict)),
+    kappag_(thermophysicalFunction::New("kappag", dict)),
+    sigma_(thermophysicalFunction::New("sigma", dict)),
+    D_(thermophysicalFunction::New("D", dict))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquidI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquidI.H
index 618f627ac5..bd6e2d40aa 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquidI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquidI.H
@@ -25,86 +25,86 @@ License
 
 inline Foam::scalar Foam::liquid::rho(scalar p, scalar T) const
 {
-    return rho_->value(p, T);
+    return rho_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::pv(scalar p, scalar T) const
 {
-    return pv_->value(p, T);
+    return pv_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::hl(scalar p, scalar T) const
 {
-    return hl_->value(p, T);
+    return hl_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::Cp(scalar p, scalar T) const
 {
-    return Cp_->value(p, T);
+    return Cp_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::h(scalar p, scalar T) const
 {
-    return h_->value(p, T);
+    return h_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::Cpg(scalar p, scalar T) const
 {
-    return Cpg_->value(p, T);
+    return Cpg_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::B(scalar p, scalar T) const
 {
-    return B_->value(p, T);
+    return B_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::mu(scalar p, scalar T) const
 {
-    return mu_->value(p, T);
+    return mu_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::mug(scalar p, scalar T) const
 {
-    return mug_->value(p, T);
+    return mug_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::kappa(scalar p, scalar T) const
 {
-    return kappa_->value(p, T);
+    return kappa_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::kappag(scalar p, scalar T) const
 {
-    return kappag_->value(p, T);
+    return kappag_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::sigma(scalar p, scalar T) const
 {
-    return sigma_->value(p, T);
+    return sigma_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::D(scalar p, scalar T) const
 {
-    return D_->value(p, T);
+    return D_->value(T);
 }
 
 
 inline Foam::scalar Foam::liquid::D(scalar p, scalar T, scalar Wb) const
 {
     // Currently ignoring the Wb argument
-    return D_->value(p, T);
+    return D_->value(T);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
index 4634b91210..6b9e0fa375 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
@@ -164,7 +164,7 @@ inline void Foam::liquidProperties::readIfPresent
     readIfPresent(l.kappa_, "kappa", dict);
     readIfPresent(l.kappag_, "kappag", dict);
     readIfPresent(l.sigma_, "sigma", dict);
-    readIfPresent(l.D_, "D", dict);
+    // readIfPresent(l.D_, "D", dict);
 }
 
 
@@ -176,19 +176,19 @@ inline void Foam::liquidProperties::write
 ) const
 {
     l.liquidProperties::write(os);
-    l.rho_.write(os, "rho");
-    l.pv_.write(os, "pv");
-    l.hl_.write(os, "hl");
-    l.Cp_.write(os, "Cp");
-    l.h_.write(os, "h");
-    l.Cpg_.write(os, "Cpg");
-    l.B_.write(os, "B");
-    l.mu_.write(os, "mu");
-    l.mug_.write(os, "mug");
-    l.kappa_.write(os, "kappa");
-    l.kappag_.write(os, "kappag");
-    l.sigma_.write(os, "sigma");
-    l.D_.write(os, "D");
+    writeEntry(os, l.rho_);
+    writeEntry(os, l.pv_);
+    writeEntry(os, l.hl_);
+    writeEntry(os, l.Cp_);
+    writeEntry(os, l.h_);
+    writeEntry(os, l.Cpg_);
+    writeEntry(os, l.B_);
+    writeEntry(os, l.mu_);
+    writeEntry(os, l.mug_);
+    writeEntry(os,  l.kappa_);
+    writeEntry(os, l.kappag_);
+    writeEntry(os, l.sigma_);
+    writeEntry(os,  l.D_);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8OI.H
index 4cdbf33411..4326c2caaa 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8OI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8OI.H
@@ -25,85 +25,85 @@ License
 
 inline Foam::scalar Foam::nC3H8O::rho(scalar p, scalar T) const
 {
-    return rho_.value(p, T);
+    return rho_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::pv(scalar p, scalar T) const
 {
-    return pv_.value(p, T);
+    return pv_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::hl(scalar p, scalar T) const
 {
-    return hl_.value(p, T);
+    return hl_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::Cp(scalar p, scalar T) const
 {
-    return Cp_.value(p, T);
+    return Cp_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::h(scalar p, scalar T) const
 {
-    return h_.value(p, T);
+    return h_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::Cpg(scalar p, scalar T) const
 {
-    return Cpg_.value(p, T);
+    return Cpg_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::B(scalar p, scalar T) const
 {
-    return B_.value(p, T);
+    return B_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::mu(scalar p, scalar T) const
 {
-    return mu_.value(p, T);
+    return mu_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::mug(scalar p, scalar T) const
 {
-    return mug_.value(p, T);
+    return mug_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::kappa(scalar p, scalar T) const
 {
-    return kappa_.value(p, T);
+    return kappa_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::kappag(scalar p, scalar T) const
 {
-    return kappag_.value(p, T);
+    return kappag_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::sigma(scalar p, scalar T) const
 {
-    return sigma_.value(p, T);
+    return sigma_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::D(scalar p, scalar T) const
 {
-    return D_.value(p, T);
+    // Use 'standard' NSRDS D(p, T) function
+    return D_.value(T);
 }
 
 
 inline Foam::scalar Foam::nC3H8O::D(scalar p, scalar T, scalar) const
 {
-    // Use 'standard' NSRDS D(p, T) function
     return D(p, T);
 }