diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index d4cb1afaa7..131f63e618 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -98,6 +98,8 @@ primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
 primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
 primitives/functions/Function1/Table/tableBase.C
 primitives/functions/Function1/Table/TableReader/makeTableReaders.C
+primitives/functions/Function1/uniformTable1/uniformTable1.C
+primitives/functions/Function1/nonUniformTable1/nonUniformTable1.C
 
 primitives/functions/Function2/makeFunction2s.C
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
index 469489ec79..26c811bc56 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
@@ -125,7 +125,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Coded
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index ee69b26cab..99674591c8 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -72,13 +72,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and value
+        //- Construct from name and value
         Constant(const word& name, const Type& val);
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Constant(const word& name, const dictionary& dict);
 
-        //- Construct from entry name and Istream
+        //- Construct from name and Istream
         //  Reads the constant value without the Function1 type
         //  for backward compatibility
         Constant(const word& name, Istream& is);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index 9276400f63..f280635354 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -53,16 +53,6 @@ Foam::FieldFunction1<Type, Function1Type>::FieldFunction1
 {}
 
 
-template<class Type, class Function1Type>
-Foam::FieldFunction1<Type, Function1Type>::FieldFunction1
-(
-    const FieldFunction1<Type, Function1Type>& ff1
-)
-:
-    Function1<Type>(ff1)
-{}
-
-
 template<class Type, class Function1Type>
 Foam::tmp<Foam::Function1<Type>>
 Foam::FieldFunction1<Type, Function1Type>::clone() const
@@ -133,6 +123,20 @@ Foam::FieldFunction1<Type, Function1Type>::integral
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1<Type>::operator=(const Function1<Type>& f)
+{
+    if (this == &f)
+    {
+        FatalErrorInFunction
+            << "attempted assignment to self"
+            << abort(FatalError);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Functions  * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index d94862458d..b299e2f599 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -94,7 +94,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
+        //- Construct from name
         Function1(const word& name);
 
         //- Copy constructor
@@ -143,8 +143,8 @@ public:
 
     // Member Operators
 
-        //- Disallow default bitwise assignment
-        void operator=(const Function1<Type>&) = delete;
+        //- Assignment
+        void operator=(const Function1<Type>&);
 
 
     // IOstream Operators
@@ -176,12 +176,9 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
+        //- Construct from name
         FieldFunction1(const word& name);
 
-        //- Copy constructor
-        FieldFunction1(const FieldFunction1<Type, Function1Type>& ff1);
-
         //- Construct and return a clone
         virtual tmp<Function1<Type>> clone() const;
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
index fa1f7167e7..d1c45d9626 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
@@ -67,10 +67,10 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
+        //- Construct from name
         OneConstant(const word& name);
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         OneConstant(const word& name, const dictionary& dict);
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
index 4122fe8ed2..82bda37e65 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
@@ -82,6 +82,7 @@ public:
 
     // Constructors
 
+        //- Construct from name and dictionary
         Polynomial(const word& name, const dictionary& dict);
 
         //- Construct from components
diff --git a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
index b363b912de..33925c8bf7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.C
@@ -28,10 +28,10 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class Function1Type>
-void Foam::Function1s::Ramp<Function1Type>::read(const dictionary& coeffs)
+void Foam::Function1s::Ramp<Function1Type>::read(const dictionary& dict)
 {
-    start_ = coeffs.lookupOrDefault<scalar>("start", 0);
-    duration_ = coeffs.lookup<scalar>("duration");
+    start_ = dict.lookupOrDefault<scalar>("start", 0);
+    duration_ = dict.lookup<scalar>("duration");
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
index f24a1577fe..096635454b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Ramp/Ramp.H
@@ -120,14 +120,14 @@ private:
     // Private Member Functions
 
         //- Read the coefficients from the given dictionary
-        void read(const dictionary& coeffs);
+        void read(const dictionary& dict);
 
 
 public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Ramp
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
index a25b78ff8b..990e6cb1b0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
@@ -28,14 +28,14 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::Scale<Type>::read(const dictionary& coeffs)
+void Foam::Function1s::Scale<Type>::read(const dictionary& dict)
 {
-    scale_ = Function1<scalar>::New("scale", coeffs);
+    scale_ = Function1<scalar>::New("scale", dict);
     xScale_ =
-        coeffs.found("xScale")
-      ? Function1<scalar>::New("xScale", coeffs)
+        dict.found("xScale")
+      ? Function1<scalar>::New("xScale", dict)
       : autoPtr<Function1<scalar>>(new Constant<scalar>("xScale", 1));
-    value_ = Function1<Type>::New("value", coeffs);
+    value_ = Function1<Type>::New("value", dict);
 
     integrableScale_ =
         isA<Constant<scalar>>(xScale_())
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
index da3f7b92f7..5f83dd940a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
@@ -158,7 +158,7 @@ class Scale
     // Private Member Functions
 
         //- Read the coefficients from the given dictionary
-        void read(const dictionary& coeffs);
+        void read(const dictionary& dict);
 
 
 public:
@@ -169,7 +169,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Scale
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 62ab6471aa..fadb559813 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -28,12 +28,12 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::Sine<Type>::read(const dictionary& coeffs)
+void Foam::Function1s::Sine<Type>::read(const dictionary& dict)
 {
-    amplitude_ = Function1<Type>::New("amplitude", coeffs);
-    frequency_ = coeffs.lookup<scalar>("frequency");
-    start_ = coeffs.lookupOrDefault<scalar>("start", 0);
-    level_ = Function1<Type>::New("level", coeffs);
+    amplitude_ = Function1<Type>::New("amplitude", dict);
+    frequency_ = dict.lookup<scalar>("frequency");
+    start_ = dict.lookupOrDefault<scalar>("start", 0);
+    level_ = Function1<Type>::New("level", dict);
 
     integrable_ =
         isA<Constant<Type>>(amplitude_())
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index 96d9a50a08..aab9008ce0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -112,7 +112,7 @@ class Sine
     // Private Member Functions
 
         //- Read the coefficients from the given dictionary
-        void read(const dictionary& coeffs);
+        void read(const dictionary& dict);
 
 
 public:
@@ -123,7 +123,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Sine
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
index 08f376bfab..a7ee7f00d9 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
@@ -28,13 +28,13 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::Square<Type>::read(const dictionary& coeffs)
+void Foam::Function1s::Square<Type>::read(const dictionary& dict)
 {
-    amplitude_ = Function1<Type>::New("amplitude", coeffs);
-    frequency_ = coeffs.lookup<scalar>("frequency");
-    start_ = coeffs.lookupOrDefault<scalar>("start", 0);
-    level_ = Function1<Type>::New("level", coeffs);
-    markSpace_ = coeffs.lookupOrDefault<scalar>("markSpace", 1);
+    amplitude_ = Function1<Type>::New("amplitude", dict);
+    frequency_ = dict.lookup<scalar>("frequency");
+    start_ = dict.lookupOrDefault<scalar>("start", 0);
+    level_ = Function1<Type>::New("level", dict);
+    markSpace_ = dict.lookupOrDefault<scalar>("markSpace", 1);
 
     integrable_ =
         isA<Constant<Type>>(amplitude_())
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
index cd5dbe1d0c..71cb5bf2bd 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
@@ -123,7 +123,7 @@ class Square
     // Private Member Functions
 
         //- Read the coefficients from the given dictionary
-        void read(const dictionary& coeffs);
+        void read(const dictionary& dict);
 
 
 public:
@@ -134,7 +134,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Square
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index 7db117e55b..c985600c9c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -180,7 +180,7 @@ public:
             const List<Tuple2<scalar, Type>>& table
         );
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Table(const word& name, const dictionary& dict);
 
         //- Copy constructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
index ad7900c85f..5a0ee8c9f2 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
@@ -70,7 +70,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Uniform(const word& name, const dictionary& dict);
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
index a679cf335c..c8516b1e0c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
@@ -67,7 +67,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         ZeroConstant(const word& name, const dictionary& dict);
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
index 1b1befcab8..10ee898652 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
@@ -65,7 +65,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         halfCosineRamp
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
index 5d66d40107..2658f77ffa 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
@@ -65,7 +65,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         linearRamp
         (
             const word& name,
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C b/src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1.C
similarity index 65%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C
rename to src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1.C
index debf6a2826..10855d60fc 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C
+++ b/src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1.C
@@ -23,23 +23,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nonUniformTable1DThermophysicalFunction.H"
+#include "nonUniformTable1.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(nonUniformTable1D, 0);
-
-    addToRunTimeSelectionTable
-    (
-        thermophysicalFunction,
-        nonUniformTable1D,
-        dictionary
-    );
+    makeScalarFunction1(nonUniformTable)
 }
 }
 
@@ -52,46 +45,46 @@ const char* const Foam::Tuple2<Foam::scalar, Foam::scalar>::typeName
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::nonUniformTable1D::nonUniformTable1D
+Foam::Function1s::nonUniformTable::nonUniformTable
 (
     const word& name,
     const dictionary& dict
 )
 :
-    name_(name),
-    Tlow_(great),
-    Thigh_(-great),
-    values_(dict.lookup(name)),
-    deltaT_(great)
+    FieldFunction1<scalar, nonUniformTable>(name),
+    low_(great),
+    high_(-great),
+    values_(dict.lookup("values")),
+    delta_(great)
 {
     if (values_.size() < 2)
     {
         FatalIOErrorInFunction(dict)
             << "Table " << nl
-            << "    " << name_ << nl
+            << "    " << name << nl
             << "    has less than 2 entries."
             << exit(FatalIOError);
     }
     else
     {
-        Tlow_ = values_.first().first();
-        Thigh_ = values_.last().first();
+        low_ = values_.first().first();
+        high_ = values_.last().first();
 
         for(label i = 1; i<values_.size(); i++)
         {
-            deltaT_ = min(deltaT_, values_[i].first() - values_[i - 1].first());
+            delta_ = min(delta_, values_[i].first() - values_[i - 1].first());
         }
 
-        deltaT_ *= 0.9;
+        delta_ *= 0.9;
 
-        jumpTable_.setSize((Thigh_ - Tlow_)/deltaT_ + 1);
+        jumpTable_.setSize((high_ - low_)/delta_ + 1);
 
         label i = 0;
         forAll(jumpTable_, j)
         {
-            const scalar T = Tlow_ + j*deltaT_;
+            const scalar x = low_ + j*delta_;
 
-            if (T > values_[i + 1].first())
+            if (x > values_[i + 1].first())
             {
                 i++;
             }
@@ -102,25 +95,16 @@ Foam::thermophysicalFunctions::nonUniformTable1D::nonUniformTable1D
 }
 
 
-Foam::thermophysicalFunctions::nonUniformTable1D::nonUniformTable1D
-(
-    const dictionary& dict
-)
-:
-    nonUniformTable1D("values", dict)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::thermophysicalFunctions::nonUniformTable1D::value
+Foam::scalar Foam::Function1s::nonUniformTable::value
 (
-    scalar T
+    scalar x
 ) const
 {
-    const label i = index(T);
-    const scalar Ti = values_[i].first();
-    const scalar lambda = (T - Ti)/(values_[i + 1].first() - Ti);
+    const label i = index(x);
+    const scalar xi = values_[i].first();
+    const scalar lambda = (x - xi)/(values_[i + 1].first() - xi);
 
     return
         values_[i].second()
@@ -128,7 +112,18 @@ Foam::scalar Foam::thermophysicalFunctions::nonUniformTable1D::value
 }
 
 
-Foam::scalar Foam::thermophysicalFunctions::nonUniformTable1D::dfdT
+Foam::scalar Foam::Function1s::nonUniformTable::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+Foam::scalar Foam::Function1s::nonUniformTable::dfdT
 (
     scalar T
 ) const
@@ -141,7 +136,7 @@ Foam::scalar Foam::thermophysicalFunctions::nonUniformTable1D::dfdT
 }
 
 
-void Foam::thermophysicalFunctions::nonUniformTable1D::write(Ostream& os) const
+void Foam::Function1s::nonUniformTable::write(Ostream& os) const
 {
     writeEntry(os, "values", values_);
 }
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.H b/src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1.H
similarity index 70%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.H
rename to src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1.H
index 6e081bf956..3c1e5a33a0 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.H
+++ b/src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::nonUniformTable1D
+    Foam::Function1s::nonUniformTable
 
 Description
     Non-uniform tabulated property function that linearly interpolates between
@@ -33,16 +33,16 @@ Description
     the table.
 
 Usage
-    \nonUniformTable1D
+    \nonUniformTable
         Property    | Description
-        values      | List of (temperature property) value pairs
-    \endnonUniformTable1D
+        values      | List of value pairs
+    \endnonUniformTable
 
     Example for the density of water between 280 and 350K
     \verbatim
     rho
     {
-        type    nonUniformTable1D;
+        type    nonUniformTable;
 
         values
         (
@@ -55,43 +55,40 @@ Usage
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nonUniformTable1DThermophysicalFunction_H
-#define nonUniformTable1DThermophysicalFunction_H
+#ifndef nonUniformTable1_H
+#define nonUniformTable1_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 #include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
-                       Class nonUniformTable1D Declaration
+                       Class nonUniformTable Declaration
 \*---------------------------------------------------------------------------*/
 
-class nonUniformTable1D
+class nonUniformTable
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, nonUniformTable>
 {
     // Private member data
 
-        //- Name of dictionary from which this function is instantiated
-        word name_;
+        //- Lowest value in the nonUniformTable
+        scalar low_;
 
-        //- Lowest temperature in the nonUniformTable1D
-        scalar Tlow_;
-
-        //- Highest temperature in the nonUniformTable1D
-        scalar Thigh_;
+        //- Highest value in the nonUniformTable
+        scalar high_;
 
         //- Table values
         List<Tuple2<scalar, scalar>> values_;
 
-        //- Temperature increment derived from Tlow_, Thigh_ and values_.size()
-        scalar deltaT_;
+        //- Increment derived from low_, high_ and values_.size()
+        scalar delta_;
 
         List<label> jumpTable_;
 
@@ -99,23 +96,20 @@ class nonUniformTable1D
 protected:
 
         //- Return the lower index of the interval in the table
-        //  corresponding to the given temperature
-        inline label index(scalar T) const;
+        //  corresponding to the given value
+        inline label index(scalar x) const;
 
 
 public:
 
     //- Runtime type information
-    TypeName("nonUniformTable1D");
+    TypeName("nonUniformTable");
 
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        nonUniformTable1D(const word& name, const dictionary& dict);
-
-        //- Construct from dictionary
-        nonUniformTable1D(const dictionary& dict);
+        //- Construct from name and dictionary
+        nonUniformTable(const word& name, const dictionary& dict);
 
 
     // Member Functions
@@ -127,7 +121,10 @@ public:
         }
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const;
+        virtual scalar value(scalar x) const;
+
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Evaluate the derivative of the function and return the result
         scalar dfdT(scalar T) const;
@@ -139,12 +136,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "nonUniformTable1DThermophysicalFunctionI.H"
+#include "nonUniformTable1I.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunctionI.H b/src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1I.H
similarity index 77%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunctionI.H
rename to src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1I.H
index efdeffe408..446b2355dc 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunctionI.H
+++ b/src/OpenFOAM/primitives/functions/Function1/nonUniformTable1/nonUniformTable1I.H
@@ -23,30 +23,28 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nonUniformTable1DThermophysicalFunction.H"
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::thermophysicalFunctions::nonUniformTable1D::index
+inline Foam::label Foam::Function1s::nonUniformTable::index
 (
-    scalar T
+    scalar x
 ) const
 {
-    if (T < Tlow_ || T > Thigh_)
+    if (x < low_ || x > high_)
     {
         FatalErrorInFunction
-            << "Temperature " << T << " out of range "
-            << Tlow_ << " to " << Thigh_ << nl
-            << "    of nonUniformTable1D " << name_
+            << x << " out of range "
+            << low_ << " to " << high_ << nl
+            << "    of nonUniformTable " << name_
             << exit(FatalError);
     }
 
-    const scalar nd = (T - Tlow_)/deltaT_;
+    const scalar nd = (x - low_)/delta_;
     const label j = nd;
 
     label i = jumpTable_[j];
 
-    if (i < values_.size() - 1 && T > values_[i + 1].first())
+    if (i < values_.size() - 1 && x > values_[i + 1].first())
     {
         i++;
     }
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
index b175da3116..a7a13ca89d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
@@ -65,7 +65,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         quadraticRamp
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
index f0a4e12a5b..cecd162a5e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
@@ -65,7 +65,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         quarterCosineRamp
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
index e78cad8a61..f5d5fd1fd5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
@@ -65,7 +65,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         quarterSineRamp
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
index bac13b1b94..ff7d318b2a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
@@ -97,7 +97,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         reverseRamp
         (
             const word& name,
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.C b/src/OpenFOAM/primitives/functions/Function1/uniformTable1/uniformTable1.C
similarity index 70%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.C
rename to src/OpenFOAM/primitives/functions/Function1/uniformTable1/uniformTable1.C
index 7a897298f8..df403dd542 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.C
+++ b/src/OpenFOAM/primitives/functions/Function1/uniformTable1/uniformTable1.C
@@ -23,28 +23,32 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "table1DThermophysicalFunction.H"
+#include "uniformTable1.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(table1D, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, table1D, dictionary);
+    makeScalarFunction1(uniformTable)
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::table1D::table1D(const dictionary& dict)
+Foam::Function1s::uniformTable::uniformTable
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, uniformTable>(name),
     dictName_(dict.name()),
-    Tlow_(dict.lookup<scalar>("Tlow")),
-    Thigh_(dict.lookup<scalar>("Thigh")),
+    low_(dict.lookup<scalar>("low")),
+    high_(dict.lookup<scalar>("high")),
     values_(dict.lookup("values"))
 {
     if (values_.size() < 2)
@@ -57,41 +61,49 @@ Foam::thermophysicalFunctions::table1D::table1D(const dictionary& dict)
     }
     else
     {
-        deltaT_ = (Thigh_ - Tlow_)/(values_.size() - 1);
+        delta_ = (high_ - low_)/(values_.size() - 1);
     }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::thermophysicalFunctions::table1D::value
-(
-    scalar T
-) const
+Foam::scalar Foam::Function1s::uniformTable::value(scalar x) const
 {
-    const scalar nd = (T - Tlow_)/deltaT_;
+    const scalar nd = (x - low_)/delta_;
     const label i = nd;
 
     if (nd < 0 || i > values_.size() - 2)
     {
         FatalErrorInFunction
-            << "Temperature " << T << " out of range "
-            << Tlow_ << " to " << Thigh_ << nl
+            << x << " out of range "
+            << low_ << " to " << high_ << nl
             << "    of table " << dictName_
             << exit(FatalError);
     }
 
-    const scalar Ti = Tlow_ + i*deltaT_;
-    const scalar lambda = (T - Ti)/deltaT_;
+    const scalar xi = low_ + i*delta_;
+    const scalar lambda = (x - xi)/delta_;
 
     return values_[i] + lambda*(values_[i + 1] - values_[i]);
 }
 
 
-void Foam::thermophysicalFunctions::table1D::write(Ostream& os) const
+Foam::scalar Foam::Function1s::uniformTable::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
 {
-    writeEntry(os, "Tlow", Tlow_);
-    writeEntry(os, "Thigh", Thigh_);
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::uniformTable::write(Ostream& os) const
+{
+    writeEntry(os, "low", low_);
+    writeEntry(os, "high", high_);
     writeEntry(os, "values", values_);
 }
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.H b/src/OpenFOAM/primitives/functions/Function1/uniformTable1/uniformTable1.H
similarity index 70%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.H
rename to src/OpenFOAM/primitives/functions/Function1/uniformTable1/uniformTable1.H
index faa5052854..32ea40743a 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/table1D/table1DThermophysicalFunction.H
+++ b/src/OpenFOAM/primitives/functions/Function1/uniformTable1/uniformTable1.H
@@ -22,28 +22,28 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::table1D
+    Foam::Function1s::uniformTable
 
 Description
     Tabulated property function that linearly interpolates between
-    the table1D values.
+    the uniformTable values.
 
 Usage
     \table
         Property    | Description
-        Tlow        | Lower temperature limit of the table1D
-        Thigh       | Upper temperature limit of the table1D
-        values      | Property values, assumed uniformly distributed
+        low         | Lower limit of the table
+        high        | Upper limit of the table
+        values      | Values, assumed uniformly distributed
     \endtable
 
     Example for the density of water between 280 and 350K
     \verbatim
     rho
     {
-        type    table1D;
+        type    uniformTable;
 
-        Tlow    280;
-        Thigh   350;
+        low    280;
+        high   350;
 
         values
         (
@@ -56,60 +56,63 @@ Usage
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef table1DThermophysicalFunction_H
-#define table1DThermophysicalFunction_H
+#ifndef uniformTable1_H
+#define uniformTable1_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class table1D Declaration
+                            Class uniformTable Declaration
 \*---------------------------------------------------------------------------*/
 
-class table1D
+class uniformTable
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, uniformTable>
 {
     // Private member data
 
         //- Name of dictionary from which this function is instantiated
         fileName dictName_;
 
-        //- Lowest temperature in the table
-        scalar Tlow_;
+        //- Lowest value in the table
+        scalar low_;
 
-        //- Highest temperature in the table
-        scalar Thigh_;
+        //- Highest value in the table
+        scalar high_;
 
         //- Table values
         List<scalar> values_;
 
-        //- Temperature increment derived from Tlow_, Thigh_ and values_.size()
-        scalar deltaT_;
+        //- Increment derived from low_, high_ and values_.size()
+        scalar delta_;
 
 
 public:
 
     //- Runtime type information
-    TypeName("table1D");
+    TypeName("uniformTable");
 
 
     // Constructors
 
-        //- Construct from dictionary
-        table1D(const dictionary& dict);
+        //- Construct from name and dictionary
+        uniformTable(const word& name, const dictionary& dict);
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const;
+        virtual scalar value(scalar x) const;
+
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         void write(Ostream& os) const;
@@ -118,7 +121,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
index 632a10eecc..f258a82a29 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.H
@@ -98,7 +98,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Coded
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
index 6da532fe64..00e6a326fb 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Constant/Constant2.H
@@ -78,13 +78,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and value
+        //- Construct from name and value
         Constant(const word& name, const Type& val);
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Constant(const word& name, const dictionary& dict);
 
-        //- Construct from entry name and Istream
+        //- Construct from name and Istream
         //  Reads the constant value without the Function2 type
         //  for backward compatibility
         Constant(const word& name, Istream& is);
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
index 6c2e179e14..b0c6c60291 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.C
@@ -52,16 +52,6 @@ Foam::FieldFunction2<Type, Function2Type>::FieldFunction2
 {}
 
 
-template<class Type, class Function2Type>
-Foam::FieldFunction2<Type, Function2Type>::FieldFunction2
-(
-    const FieldFunction2<Type, Function2Type>& ff2
-)
-:
-    Function2<Type>(ff2)
-{}
-
-
 template<class Type, class Function2Type>
 Foam::tmp<Foam::Function2<Type>>
 Foam::FieldFunction2<Type, Function2Type>::clone() const
@@ -113,6 +103,20 @@ Foam::tmp<Foam::Field<Type>> Foam::FieldFunction2<Type, Function2Type>::value
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function2<Type>::operator=(const Function2<Type>& f)
+{
+    if (this == &f)
+    {
+        FatalErrorInFunction
+            << "attempted assignment to self"
+            << abort(FatalError);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Functions  * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
index cff14d7f83..de41fcd1f7 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H
@@ -94,7 +94,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
+        //- Construct from name
         Function2(const word& name);
 
         //- Copy constructor
@@ -137,8 +137,8 @@ public:
 
     // Member Operators
 
-        //- Disallow default bitwise assignment
-        void operator=(const Function2<Type>&) = delete;
+        //- Assignment
+        void operator=(const Function2<Type>&);
 
 
     // IOstream Operators
@@ -170,12 +170,9 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
+        //- Construct from name
         FieldFunction2(const word& name);
 
-        //- Copy constructor
-        FieldFunction2(const FieldFunction2<Type, Function2Type>& ff1);
-
         //- Construct and return a clone
         virtual tmp<Function2<Type>> clone() const;
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
index 17564d594a..177824dd38 100644
--- a/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/One/OneConstant2.H
@@ -67,10 +67,10 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
+        //- Construct from name
         OneConstant(const word& name);
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         OneConstant(const word& name, const dictionary& dict);
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
index cfcf7c1294..bb3b32ef3e 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
+++ b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.C
@@ -28,24 +28,24 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function2s::Scale<Type>::read(const dictionary& coeffs)
+void Foam::Function2s::Scale<Type>::read(const dictionary& dict)
 {
-    scale_ = Function2<scalar>::New("scale", coeffs);
+    scale_ = Function2<scalar>::New("scale", dict);
     xScale_ =
-        coeffs.found("xScale")
-      ? Function1<scalar>::New("xScale", coeffs)
+        dict.found("xScale")
+      ? Function1<scalar>::New("xScale", dict)
       : autoPtr<Function1<scalar>>
         (
             new Function1s::Constant<scalar>("xScale", 1)
         );
     yScale_ =
-        coeffs.found("yScale")
-      ? Function1<scalar>::New("yScale", coeffs)
+        dict.found("yScale")
+      ? Function1<scalar>::New("yScale", dict)
       : autoPtr<Function1<scalar>>
         (
             new Function1s::Constant<scalar>("yScale", 1)
         );
-    value_ = Function2<Type>::New("value", coeffs);
+    value_ = Function2<Type>::New("value", dict);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
index ddebd13a45..1631d2212e 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Scale/Scale2.H
@@ -78,7 +78,7 @@ class Scale
     // Private Member Functions
 
         //- Read the coefficients from the given dictionary
-        void read(const dictionary& coeffs);
+        void read(const dictionary& dict);
 
 
 public:
@@ -89,7 +89,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         Scale
         (
             const word& name,
diff --git a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
index 94ef07c139..22a39ca5b9 100644
--- a/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
+++ b/src/OpenFOAM/primitives/functions/Function2/Zero/ZeroConstant2.H
@@ -67,7 +67,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         ZeroConstant(const word& name, const dictionary& dict);
 
 
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
index bacd32331c..ec9be22f1e 100644
--- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
@@ -78,7 +78,7 @@ public:
 
     // Constructor
 
-        //- Construct from time, entry name and dictionary
+        //- Construct from time, name and dictionary
         TimeFunction1
         (
             const Time& time,
@@ -86,7 +86,7 @@ public:
             const dictionary& dict
         );
 
-        //- Construct null from time and entry name
+        //- Construct null from time and name
         TimeFunction1
         (
             const Time& time,
diff --git a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
index 8fbf25fc0a..76ce89753c 100644
--- a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
+++ b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C
@@ -46,7 +46,7 @@ Foam::pureMixture<ThermoType>::pureMixture
 template<class ThermoType>
 void Foam::pureMixture<ThermoType>::read(const dictionary& thermoDict)
 {
-    // ***HGW mixture_ = ThermoType(thermoDict.subDict("mixture"));
+    mixture_ = ThermoType(thermoDict.subDict("mixture"));
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 6cbdd24210..2d429b6880 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -138,8 +138,7 @@ void Foam::multiComponentMixture<ThermoType>::read
 {
     forAll(species_, i)
     {
-        // ***HGW specieThermos_[i] =
-        // ThermoType(thermoDict.subDict(species_[i]));
+        specieThermos_[i] = ThermoType(thermoDict.subDict(species_[i]));
     }
 }
 
diff --git a/src/thermophysicalModels/specie/Make/files b/src/thermophysicalModels/specie/Make/files
index 8feb9af154..fda32f93cf 100644
--- a/src/thermophysicalModels/specie/Make/files
+++ b/src/thermophysicalModels/specie/Make/files
@@ -3,25 +3,19 @@ specie/specie.C
 reaction/specieCoeffs/specieCoeffs.C
 reaction/reaction/reaction.C
 
-thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
-
-thermophysicalFunctions/none/noneThermophysicalFunction.C
-thermophysicalFunctions/constant/constantThermophysicalFunction.C
-thermophysicalFunctions/table1D/table1DThermophysicalFunction.C
-thermophysicalFunctions/nonUniformTable1D/nonUniformTable1DThermophysicalFunction.C
-thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C
+thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C
 thermophysicalFunctions/uniformTable2/uniformTable2.C
-thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C
+thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C
 
 NSRDS = thermophysicalFunctions/NSRDS
-$(NSRDS)/NSRDS0/NSRDS0ThermophysicalFunction.C
-$(NSRDS)/NSRDS1/NSRDS1ThermophysicalFunction.C
-$(NSRDS)/NSRDS2/NSRDS2ThermophysicalFunction.C
-$(NSRDS)/NSRDS3/NSRDS3ThermophysicalFunction.C
-$(NSRDS)/NSRDS4/NSRDS4ThermophysicalFunction.C
-$(NSRDS)/NSRDS5/NSRDS5ThermophysicalFunction.C
-$(NSRDS)/NSRDS6/NSRDS6ThermophysicalFunction.C
-$(NSRDS)/NSRDS7/NSRDS7ThermophysicalFunction.C
-$(NSRDS)/NSRDS14/NSRDS14ThermophysicalFunction.C
+$(NSRDS)/NSRDS0/NSRDS0.C
+$(NSRDS)/NSRDS1/NSRDS1.C
+$(NSRDS)/NSRDS2/NSRDS2.C
+$(NSRDS)/NSRDS3/NSRDS3.C
+$(NSRDS)/NSRDS4/NSRDS4.C
+$(NSRDS)/NSRDS5/NSRDS5.C
+$(NSRDS)/NSRDS6/NSRDS6.C
+$(NSRDS)/NSRDS7/NSRDS7.C
+$(NSRDS)/NSRDS14/NSRDS14.C
 
 LIB = $(FOAM_LIBBIN)/libspecie
diff --git a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C
index 2f0765f38b..be3ad45b1d 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C
+++ b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.C
@@ -32,7 +32,7 @@ template<class Specie>
 Foam::icoTabulated<Specie>::icoTabulated(const dictionary& dict)
 :
     Specie(dict),
-    rho_("rho", dict.subDict("equationOfState"))
+    rho_("rho", dict.subDict("equationOfState").subDict("rho"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.H b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.H
index 48fa6bc634..c4af78694d 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulated.H
@@ -52,14 +52,14 @@ SourceFiles
     icoTabulated.C
 
 See also
-    Foam::thermophysicalFunctions::nonUniformTable1D
+    Foam::Function1s::nonUniformTable
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef icoTabulated_H
 #define icoTabulated_H
 
-#include "nonUniformTable1DThermophysicalFunction.H"
+#include "nonUniformTable1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -88,13 +88,13 @@ class icoTabulated
 :
     public Specie
 {
-    typedef thermophysicalFunctions::nonUniformTable1D nonUniformTable1D;
+    typedef Function1s::nonUniformTable nonUniformTable;
 
 
     // Private Data
 
         //- Density table [kg/m^3]
-        nonUniformTable1D rho_;
+        nonUniformTable rho_;
 
 
 public:
@@ -105,7 +105,7 @@ public:
         inline icoTabulated
         (
             const Specie& sp,
-            const nonUniformTable1D& rho
+            const nonUniformTable& rho
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H
index 8270e40c7d..c11a5cbc26 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoTabulated/icoTabulatedI.H
@@ -31,7 +31,7 @@ template<class Specie>
 inline Foam::icoTabulated<Specie>::icoTabulated
 (
     const Specie& sp,
-    const nonUniformTable1D& rho
+    const nonUniformTable& rho
 )
 :
     Specie(sp),
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.C
index 1656544b58..2fd47ca258 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_("rho", dict.subDict("equationOfState"))
+    rho_("rho", dict.subDict("equationOfState").subDict("rho"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
index 8e9fa8e8d5..ed996c9600 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoTabulated/rhoTabulated.H
@@ -71,7 +71,7 @@ SourceFiles
     rhoTabulated.C
 
 See also
-    Foam::thermophysicalFunctions::nonUniformTable1D
+    Foam::Function1s::nonUniformTable
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C
index 0baa50d8f6..d1ce392895 100644
--- a/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.C
@@ -37,7 +37,7 @@ Foam::eIcoTabulatedThermo<EquationOfState>::eIcoTabulatedThermo
     EquationOfState(dict),
     Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
     Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
-    Cv_("Cv", dict.subDict("thermodynamics"))
+    Cv_("Cv", dict.subDict("thermodynamics").subDict("Cv"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.H b/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.H
index 3bb08838bd..d64bdb17ad 100644
--- a/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eIcoTabulated/eIcoTabulatedThermo.H
@@ -57,14 +57,14 @@ SourceFiles
     eIcoTabulatedThermo.C
 
 See also
-    Foam::thermophysicalFunctions::nonUniformTable1D
+    Foam::Function1s::nonUniformTable
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef eIcoTabulatedThermo_H
 #define eIcoTabulatedThermo_H
 
-#include "integratedNonUniformTable1DThermophysicalFunction.H"
+#include "integratedNonUniformTable1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,8 +93,7 @@ class eIcoTabulatedThermo
 :
     public EquationOfState
 {
-    typedef thermophysicalFunctions::integratedNonUniformTable1D
-        integratedNonUniformTable1D;
+    typedef Function1s::integratedNonUniformTable integratedNonUniformTable;
 
 
     // Private Data
@@ -106,7 +105,7 @@ class eIcoTabulatedThermo
         scalar Sf_;
 
         //- Specific heat at constant volume table [J/kg/K]
-        integratedNonUniformTable1D Cv_;
+        integratedNonUniformTable Cv_;
 
 
 public:
diff --git a/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/eTabulated/eTabulatedThermo.C
index 7b32c629a0..c8afe61d39 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_("Es", dict.subDict("thermodynamics")),
-    Cv_("Cv", dict.subDict("thermodynamics"))
+    Es_("Es", dict.subDict("thermodynamics").subDict("Es")),
+    Cv_("Cv", dict.subDict("thermodynamics").subDict("Cv"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C
index dbf8d23d17..d474f47b57 100644
--- a/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.C
@@ -37,7 +37,7 @@ Foam::hIcoTabulatedThermo<EquationOfState>::hIcoTabulatedThermo
     EquationOfState(dict),
     Hf_(dict.subDict("thermodynamics").lookup<scalar>("Hf")),
     Sf_(dict.subDict("thermodynamics").lookup<scalar>("Sf")),
-    Cp_("Cp", dict.subDict("thermodynamics"))
+    Cp_("Cp", dict.subDict("thermodynamics").subDict("Cp"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.H b/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.H
index 49312e1188..cf468adb73 100644
--- a/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hIcoTabulated/hIcoTabulatedThermo.H
@@ -57,14 +57,14 @@ SourceFiles
     hIcoTabulatedThermo.C
 
 See also
-    Foam::thermophysicalFunctions::nonUniformTable1D
+    Foam::Function1s::nonUniformTable
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef hIcoTabulatedThermo_H
 #define hIcoTabulatedThermo_H
 
-#include "integratedNonUniformTable1DThermophysicalFunction.H"
+#include "integratedNonUniformTable1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,8 +93,7 @@ class hIcoTabulatedThermo
 :
     public EquationOfState
 {
-    typedef thermophysicalFunctions::integratedNonUniformTable1D
-        integratedNonUniformTable1D;
+    typedef Function1s::integratedNonUniformTable integratedNonUniformTable;
 
 
     // Private Data
@@ -106,7 +105,7 @@ class hIcoTabulatedThermo
         scalar Sf_;
 
         //- Specific heat at constant pressure table [J/kg/K]
-        integratedNonUniformTable1D Cp_;
+        integratedNonUniformTable Cp_;
 
 
 public:
diff --git a/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C b/src/thermophysicalModels/specie/thermo/hTabulated/hTabulatedThermo.C
index 5d4a81b75a..19585eb78d 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_("Hs", dict.subDict("thermodynamics")),
-    Cp_("Cp", dict.subDict("thermodynamics"))
+    Hs_("Hs", dict.subDict("thermodynamics").subDict("Hs")),
+    Cp_("Cp", dict.subDict("thermodynamics").subDict("Cp"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C
similarity index 98%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C
index 92bb7d0726..030ba4d383 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "APIdiffCoef.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.H
similarity index 96%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.H
index ebbfbb815d..1fd6e7eb90 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/APIfunctions/APIdiffCoef/APIdiffCoefThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.H
@@ -35,8 +35,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef APIdiffCoefThermophysicalFunction_H
-#define APIdiffCoefThermophysicalFunction_H
+#ifndef APIdiffCoef_H
+#define APIdiffCoef_H
 
 #include "Function2.H"
 
@@ -82,7 +82,7 @@ public:
             const scalar wa
         );
 
-        //- Construct from dictionary
+        //- Construct from name and dictionary
         APIdiffCoef
         (
             const word& name,
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C
similarity index 81%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C
index e9d9fc4795..11bc9c16c2 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C
@@ -23,25 +23,25 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS0ThermophysicalFunction.H"
+#include "NSRDS0.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS0, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDS0, dictionary);
+    makeScalarFunction1(NSRDS0)
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS0::NSRDS0
+Foam::Function1s::NSRDS0::NSRDS0
 (
+    const word& name,
     const scalar a,
     const scalar b,
     const scalar c,
@@ -50,6 +50,7 @@ Foam::thermophysicalFunctions::NSRDS0::NSRDS0
     const scalar f
 )
 :
+    FieldFunction1<scalar, NSRDS0>(name),
     a_(a),
     b_(b),
     c_(c),
@@ -59,8 +60,13 @@ Foam::thermophysicalFunctions::NSRDS0::NSRDS0
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS0::NSRDS0(const dictionary& dict)
+Foam::Function1s::NSRDS0::NSRDS0
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS0>(name),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
@@ -72,7 +78,18 @@ Foam::thermophysicalFunctions::NSRDS0::NSRDS0(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS0::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS0::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS0::write(Ostream& os) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.H
similarity index 82%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.H
index dc2c5e598c..95ac99702f 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS0
+    Foam::Function1s::NSRDS0
 
 Description
     NSRDS function number 100
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS0ThermophysicalFunction_H
-#define NSRDS0ThermophysicalFunction_H
+#ifndef NSRDS0_H
+#define NSRDS0_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS0
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS0>
 {
     // Private Data
 
@@ -88,6 +88,7 @@ public:
         //- Construct from components
         NSRDS0
         (
+            const word& name,
             const scalar a,
             const scalar b,
             const scalar c,
@@ -96,19 +97,30 @@ public:
             const scalar f
         );
 
-        //- Construct from dictionary
-        NSRDS0(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS0
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS0(*this));
+        }
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const
+        virtual scalar value(scalar T) const
         {
             return ((((f_*T + e_)*T + d_)*T + c_)*T + b_)*T + a_;
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -117,7 +129,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C
similarity index 80%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C
index fb934a6d06..2fed945e80 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C
@@ -23,25 +23,24 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS7ThermophysicalFunction.H"
+#include "NSRDS1.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS7, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDS7, dictionary);
+    makeScalarFunction1(NSRDS1)
 }
 }
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS7::NSRDS7
+Foam::Function1s::NSRDS1::NSRDS1
 (
+    const word& name,
     const scalar a,
     const scalar b,
     const scalar c,
@@ -49,6 +48,7 @@ Foam::thermophysicalFunctions::NSRDS7::NSRDS7
     const scalar e
 )
 :
+    FieldFunction1<scalar, NSRDS1>(name),
     a_(a),
     b_(b),
     c_(c),
@@ -57,8 +57,13 @@ Foam::thermophysicalFunctions::NSRDS7::NSRDS7
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS7::NSRDS7(const dictionary& dict)
+Foam::Function1s::NSRDS1::NSRDS1
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS1>(name),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
@@ -69,7 +74,18 @@ Foam::thermophysicalFunctions::NSRDS7::NSRDS7(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS7::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS1::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS1::write(Ostream& os) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.H
similarity index 81%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.H
index 60891d7f79..fa55baf293 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS1
+    Foam::Function1s::NSRDS1
 
 Description
     NSRDS function number 101
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS1ThermophysicalFunction_H
-#define NSRDS1ThermophysicalFunction_H
+#ifndef NSRDS1_H
+#define NSRDS1_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS1
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS1>
 {
     // Private Data
 
@@ -88,6 +88,7 @@ public:
         //- Construct from components
         NSRDS1
         (
+            const word& name,
             const scalar a,
             const scalar b,
             const scalar c,
@@ -95,19 +96,30 @@ public:
             const scalar e
         );
 
-        //- Construct from dictionary
-        NSRDS1(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS1
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS1(*this));
+        }
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const
+        virtual scalar value(scalar T) const
         {
             return exp(a_ + b_/T + c_*log(T) + d_*pow(T, e_));
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -116,7 +128,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C
similarity index 80%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C
index ef0e7f3241..f1320321a5 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C
@@ -23,30 +23,25 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS14ThermophysicalFunction.H"
+#include "NSRDS14.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS14, 0);
-    addToRunTimeSelectionTable
-    (
-        thermophysicalFunction,
-        NSRDS14,
-        dictionary
-    );
+    makeScalarFunction1(NSRDS14)
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS14::NSRDS14
+Foam::Function1s::NSRDS14::NSRDS14
 (
+    const word& name,
     const scalar Tc,
     const scalar a,
     const scalar b,
@@ -54,6 +49,7 @@ Foam::thermophysicalFunctions::NSRDS14::NSRDS14
     const scalar d
 )
 :
+    FieldFunction1<scalar, NSRDS14>(name),
     Tc_(Tc),
     a_(a),
     b_(b),
@@ -62,8 +58,13 @@ Foam::thermophysicalFunctions::NSRDS14::NSRDS14
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS14::NSRDS14(const dictionary& dict)
+Foam::Function1s::NSRDS14::NSRDS14
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS14>(name),
     Tc_(dict.lookup<scalar>("Tc")),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
@@ -74,7 +75,18 @@ Foam::thermophysicalFunctions::NSRDS14::NSRDS14(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS14::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS14::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS14::write(Ostream& os) const
 {
     writeEntry(os, "Tc", Tc_);
     writeEntry(os, "a", a_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.H
similarity index 82%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.H
index 1663f6213e..87fac7df7d 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS14
+    Foam::Function1s::NSRDS14
 
 Description
     NSRDS function number 114
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS14ThermophysicalFunction_H
-#define NSRDS14ThermophysicalFunction_H
+#ifndef NSRDS14_H
+#define NSRDS14_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS14
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS14>
 {
     // Private Data
 
@@ -88,6 +88,7 @@ public:
         //- Construct from components
         NSRDS14
         (
+            const word& name,
             const scalar Tc,
             const scalar a,
             const scalar b,
@@ -95,14 +96,24 @@ public:
             const scalar d
         );
 
-        //- Construct from dictionary
-        NSRDS14(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS14
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS14(*this));
+        }
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const
+        virtual scalar value(scalar T) const
         {
             scalar Tdash = min(T, Tc_ - rootVSmall);
 
@@ -115,7 +126,8 @@ public:
                 );
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -124,7 +136,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C
similarity index 80%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C
index 9ccf73dc81..08c762a05d 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C
@@ -23,31 +23,31 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS5ThermophysicalFunction.H"
+#include "NSRDS2.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS5, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDS5, dictionary);
+    makeScalarFunction1(NSRDS2)
 }
 }
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS5::NSRDS5
+Foam::Function1s::NSRDS2::NSRDS2
 (
+    const word& name,
     const scalar a,
     const scalar b,
     const scalar c,
     const scalar d
 )
 :
+    FieldFunction1<scalar, NSRDS2>(name),
     a_(a),
     b_(b),
     c_(c),
@@ -55,8 +55,13 @@ Foam::thermophysicalFunctions::NSRDS5::NSRDS5
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS5::NSRDS5(const dictionary& dict)
+Foam::Function1s::NSRDS2::NSRDS2
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS2>(name),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
@@ -66,7 +71,18 @@ Foam::thermophysicalFunctions::NSRDS5::NSRDS5(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS5::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS2::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS2::write(Ostream& os) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.H
similarity index 81%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.H
index 621ed69ece..f637d072d0 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS2
+    Foam::Function1s::NSRDS2
 
 Description
     NSRDS function number 102
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS2ThermophysicalFunction_H
-#define NSRDS2ThermophysicalFunction_H
+#ifndef NSRDS2_H
+#define NSRDS2_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS2
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS2>
 {
     // Private Data
 
@@ -88,25 +88,37 @@ public:
         //- Construct from components
         NSRDS2
         (
+            const word& name,
             const scalar a,
             const scalar b,
             const scalar c,
             const scalar d
         );
 
-        //- Construct from dictionary
-        NSRDS2(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS2
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS2(*this));
+        }
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const
+        virtual scalar value(scalar T) const
         {
             return a_*pow(T, b_)/(1.0 + c_/T + d_/sqr(T));
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -115,7 +127,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C
similarity index 80%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C
index 90577cb78b..b18c9a1d71 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C
@@ -23,30 +23,31 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS2ThermophysicalFunction.H"
+#include "NSRDS3.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS2, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDS2, dictionary);
+    makeScalarFunction1(NSRDS3)
 }
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS2::NSRDS2
+Foam::Function1s::NSRDS3::NSRDS3
 (
+    const word& name,
     const scalar a,
     const scalar b,
     const scalar c,
     const scalar d
 )
 :
+    FieldFunction1<scalar, NSRDS3>(name),
     a_(a),
     b_(b),
     c_(c),
@@ -54,8 +55,13 @@ Foam::thermophysicalFunctions::NSRDS2::NSRDS2
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS2::NSRDS2(const dictionary& dict)
+Foam::Function1s::NSRDS3::NSRDS3
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS3>(name),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
@@ -65,7 +71,18 @@ Foam::thermophysicalFunctions::NSRDS2::NSRDS2(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS2::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS3::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS3::write(Ostream& os) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.H
similarity index 81%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.H
index e4a1a0a7f6..99282a2a09 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS3
+    Foam::Function1s::NSRDS3
 
 Description
     NSRDS function number 103
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS3ThermophysicalFunction_H
-#define NSRDS3ThermophysicalFunction_H
+#ifndef NSRDS3_H
+#define NSRDS3_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS3
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS3>
 {
     // Private Data
 
@@ -88,25 +88,37 @@ public:
         //- Construct from components
         NSRDS3
         (
+            const word& name,
             const scalar a,
             const scalar b,
             const scalar c,
             const scalar d
         );
 
-        //- Construct from dictionary
-        NSRDS3(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS3
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS3(*this));
+        }
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const
+        virtual scalar value(scalar T) const
         {
             return a_ + b_*exp(-c_/pow(T, d_));
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -115,7 +127,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C
similarity index 80%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C
index c74890dc9c..82743e22e0 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C
@@ -23,24 +23,24 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS4ThermophysicalFunction.H"
+#include "NSRDS4.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS4, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDS4, dictionary);
+    makeScalarFunction1(NSRDS4)
 }
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS4::NSRDS4
+Foam::Function1s::NSRDS4::NSRDS4
 (
+    const word& name,
     const scalar a,
     const scalar b,
     const scalar c,
@@ -48,6 +48,7 @@ Foam::thermophysicalFunctions::NSRDS4::NSRDS4
     const scalar e
 )
 :
+    FieldFunction1<scalar, NSRDS4>(name),
     a_(a),
     b_(b),
     c_(c),
@@ -56,8 +57,13 @@ Foam::thermophysicalFunctions::NSRDS4::NSRDS4
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS4::NSRDS4(const dictionary& dict)
+Foam::Function1s::NSRDS4::NSRDS4
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS4>(name),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
@@ -68,7 +74,18 @@ Foam::thermophysicalFunctions::NSRDS4::NSRDS4(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS4::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS4::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS4::write(Ostream& os) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.H
similarity index 83%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.H
index d3b4d9963a..d785dcd648 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS4
+    Foam::Function1s::NSRDS4
 
 Description
     NSRDS function number 104
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS4ThermophysicalFunction_H
-#define NSRDS4ThermophysicalFunction_H
+#ifndef NSRDS4_H
+#define NSRDS4_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS4
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS4>
 {
     // Private Data
 
@@ -88,6 +88,7 @@ public:
         //- Construct from components
         NSRDS4
         (
+            const word& name,
             const scalar a,
             const scalar b,
             const scalar c,
@@ -95,8 +96,18 @@ public:
             const scalar e
         );
 
-        //- Construct from dictionary
-        NSRDS4(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS4
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS4(*this));
+        }
 
 
     // Member Functions
@@ -107,7 +118,8 @@ public:
             return a_ + b_/T + c_/pow(T, 3) + d_/pow(T, 8) + e_/pow(T, 9);
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -116,7 +128,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C
similarity index 79%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C
index 51e09ed54f..0b746010d9 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C
@@ -23,30 +23,32 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS3ThermophysicalFunction.H"
+#include "NSRDS5.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS3, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDS3, dictionary);
+    makeScalarFunction1(NSRDS5)
 }
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS3::NSRDS3
+Foam::Function1s::NSRDS5::NSRDS5
 (
+    const word& name,
     const scalar a,
     const scalar b,
     const scalar c,
     const scalar d
 )
 :
+    FieldFunction1<scalar, NSRDS5>(name),
     a_(a),
     b_(b),
     c_(c),
@@ -54,8 +56,13 @@ Foam::thermophysicalFunctions::NSRDS3::NSRDS3
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS3::NSRDS3(const dictionary& dict)
+Foam::Function1s::NSRDS5::NSRDS5
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS5>(name),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
@@ -65,7 +72,18 @@ Foam::thermophysicalFunctions::NSRDS3::NSRDS3(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS3::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS5::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS5::write(Ostream& os) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.H
similarity index 81%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.H
index 6f0565774b..b80f5bed00 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS5
+    Foam::Function1s::NSRDS5
 
 Description
     NSRDS function number 105
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS5ThermophysicalFunction_H
-#define NSRDS5ThermophysicalFunction_H
+#ifndef NSRDS5_H
+#define NSRDS5_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS5
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS5>
 {
     // Private Data
 
@@ -88,25 +88,37 @@ public:
         //- Construct from components
         NSRDS5
         (
+            const word& name,
             const scalar a,
             const scalar b,
             const scalar c,
             const scalar d
         );
 
-        //- Construct from dictionary
-        NSRDS5(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS5
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS5(*this));
+        }
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const
+        virtual scalar value(scalar T) const
         {
             return a_/pow(b_, 1 + pow(1 - T/c_, d_));
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -115,7 +127,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C
similarity index 81%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C
index 4f8224227f..a4de14f055 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C
@@ -23,25 +23,25 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS6ThermophysicalFunction.H"
+#include "NSRDS6.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS6, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDS6, dictionary);
+    makeScalarFunction1(NSRDS6)
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS6::NSRDS6
+Foam::Function1s::NSRDS6::NSRDS6
 (
+    const word& name,
     const scalar Tc,
     const scalar a,
     const scalar b,
@@ -50,6 +50,7 @@ Foam::thermophysicalFunctions::NSRDS6::NSRDS6
     const scalar e
 )
 :
+    FieldFunction1<scalar, NSRDS6>(name),
     Tc_(Tc),
     a_(a),
     b_(b),
@@ -59,8 +60,13 @@ Foam::thermophysicalFunctions::NSRDS6::NSRDS6
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS6::NSRDS6(const dictionary& dict)
+Foam::Function1s::NSRDS6::NSRDS6
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS6>(name),
     Tc_(dict.lookup<scalar>("Tc")),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
@@ -72,7 +78,18 @@ Foam::thermophysicalFunctions::NSRDS6::NSRDS6(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS6::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS6::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS6::write(Ostream& os) const
 {
     writeEntry(os, "Tc", Tc_);
     writeEntry(os, "a", a_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.H
similarity index 82%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.H
index 417283b369..05a6525c04 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS6
+    Foam::Function1s::NSRDS6
 
 Description
     NSRDS function number 106
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS6ThermophysicalFunction_H
-#define NSRDS6ThermophysicalFunction_H
+#ifndef NSRDS6_H
+#define NSRDS6_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS6
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS6>
 {
     // Private Data
 
@@ -88,6 +88,7 @@ public:
         //- Construct from components
         NSRDS6
         (
+            const word& name,
             const scalar Tc,
             const scalar a,
             const scalar b,
@@ -96,20 +97,31 @@ public:
             const scalar e
         );
 
-        //- Construct from dictionary
-        NSRDS6(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS6
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS6(*this));
+        }
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const
+        virtual scalar value(scalar T) const
         {
             scalar Tr = T/Tc_;
             return a_*pow(1 - Tr, ((e_*Tr + d_)*Tr + c_)*Tr + b_);
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -118,7 +130,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C
similarity index 80%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C
index c091ed4539..350a1b3bea 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1ThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C
@@ -23,24 +23,25 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NSRDS1ThermophysicalFunction.H"
+#include "NSRDS7.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(NSRDS1, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDS1, dictionary);
+    makeScalarFunction1(NSRDS7)
 }
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::NSRDS1::NSRDS1
+Foam::Function1s::NSRDS7::NSRDS7
 (
+    const word& name,
     const scalar a,
     const scalar b,
     const scalar c,
@@ -48,6 +49,7 @@ Foam::thermophysicalFunctions::NSRDS1::NSRDS1
     const scalar e
 )
 :
+    FieldFunction1<scalar, NSRDS7>(name),
     a_(a),
     b_(b),
     c_(c),
@@ -56,8 +58,13 @@ Foam::thermophysicalFunctions::NSRDS1::NSRDS1
 {}
 
 
-Foam::thermophysicalFunctions::NSRDS1::NSRDS1(const dictionary& dict)
+Foam::Function1s::NSRDS7::NSRDS7
+(
+    const word& name,
+    const dictionary& dict
+)
 :
+    FieldFunction1<scalar, NSRDS7>(name),
     a_(dict.lookup<scalar>("a")),
     b_(dict.lookup<scalar>("b")),
     c_(dict.lookup<scalar>("c")),
@@ -68,7 +75,18 @@ Foam::thermophysicalFunctions::NSRDS1::NSRDS1(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermophysicalFunctions::NSRDS1::write(Ostream& os) const
+Foam::scalar Foam::Function1s::NSRDS7::integral
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::Function1s::NSRDS7::write(Ostream& os) const
 {
     writeEntry(os, "a", a_);
     writeEntry(os, "b", b_);
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.H
similarity index 82%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.H
index 7949f35ab0..f73cf321b0 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7ThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::NSRDS7
+    Foam::Function1s::NSRDS7
 
 Description
     NSRDS-AICHE function number 107
@@ -51,16 +51,16 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NSRDS7ThermophysicalFunction_H
-#define NSRDS7ThermophysicalFunction_H
+#ifndef NSRDS7_H
+#define NSRDS7_H
 
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
@@ -69,7 +69,7 @@ namespace thermophysicalFunctions
 
 class NSRDS7
 :
-    public thermophysicalFunction
+    public FieldFunction1<scalar, NSRDS7>
 {
     // Private Data
 
@@ -88,6 +88,7 @@ public:
         //- Construct from components
         NSRDS7
         (
+            const word& name,
             const scalar a,
             const scalar b,
             const scalar c,
@@ -95,19 +96,30 @@ public:
             const scalar e
         );
 
-        //- Construct from dictionary
-        NSRDS7(const dictionary& dict);
+        //- Construct from name and dictionary
+        NSRDS7
+        (
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Construct and return a clone
+        virtual tmp<Function1<scalar>> clone() const
+        {
+            return tmp<Function1<scalar>>(new NSRDS7(*this));
+        }
 
 
     // Member Functions
 
         //- Evaluate the function and return the result
-        scalar value(scalar T) const
+        virtual scalar value(scalar T) const
         {
             return a_ + b_*sqr((c_/T)/sinh(c_/T)) + d_*sqr((e_/T)/cosh(e_/T));
         }
 
-        using thermophysicalFunction::write;
+        //- Integrate between two scalar values
+        virtual scalar integral(const scalar x1, const scalar x2) const;
 
         //- Write the function coefficients
         virtual void write(Ostream& os) const;
@@ -116,7 +128,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.C
deleted file mode 100644
index af99ad7ffa..0000000000
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.C
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "constantThermophysicalFunction.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace thermophysicalFunctions
-{
-    defineTypeNameAndDebug(constant, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, constant, dictionary);
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::thermophysicalFunctions::constant::constant(const dictionary& dict)
-:
-    value_(dict.lookup<scalar>("value"))
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::scalar Foam::thermophysicalFunctions::constant::value(scalar T) const
-{
-    return value_;
-}
-
-
-void Foam::thermophysicalFunctions::constant::write(Ostream& os) const
-{
-    writeEntry(os, "value", value_);
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.H
deleted file mode 100644
index 8cdd89b3a0..0000000000
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/constant/constantThermophysicalFunction.H
+++ /dev/null
@@ -1,104 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::thermophysicalFunctions::constant
-
-Description
-    Constant property function.
-
-Usage
-    \constant
-        Property    | Description
-        value       | Constant property value
-    \endconstant
-
-    Example for the density of water between 280 and 350K
-    \verbatim
-    rho
-    {
-        type    constant;
-        value   999.87;
-    }
-    \endverbatim
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef constantThermophysicalFunction_H
-#define constantThermophysicalFunction_H
-
-#include "thermophysicalFunction.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace thermophysicalFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-                          Class constant Declaration
-\*---------------------------------------------------------------------------*/
-
-class constant
-:
-    public thermophysicalFunction
-{
-    // Private member data
-
-        //- Constant value
-        scalar value_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("constant");
-
-
-    // Constructors
-
-        //- Construct from dictionary
-        constant(const dictionary& dict);
-
-
-    // Member Functions
-
-        //- Evaluate the function and return the result
-        scalar value(scalar T) const;
-
-        //- Write the function coefficients
-        void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace thermophysicalFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C
similarity index 76%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C
rename to src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C
index cd291dc55a..61583974a9 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "integratedNonUniformTable1DThermophysicalFunction.H"
+#include "integratedNonUniformTable1.H"
 #include "specie.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -31,30 +31,22 @@ License
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
-    defineTypeNameAndDebug(integratedNonUniformTable1D, 0);
-
-    addToRunTimeSelectionTable
-    (
-        thermophysicalFunction,
-        integratedNonUniformTable1D,
-        dictionary
-    );
+    makeScalarFunction1(integratedNonUniformTable)
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::thermophysicalFunctions::integratedNonUniformTable1D::
-integratedNonUniformTable1D
+Foam::Function1s::integratedNonUniformTable::integratedNonUniformTable
 (
     const word& name,
     const dictionary& dict
 )
 :
-    nonUniformTable1D(name, dict),
+    nonUniformTable(name, dict),
     intf_(values().size()),
     intfByT_(values().size())
 {
@@ -78,19 +70,9 @@ integratedNonUniformTable1D
 }
 
 
-Foam::thermophysicalFunctions::integratedNonUniformTable1D::
-integratedNonUniformTable1D
-(
-    const dictionary& dict
-)
-:
-    integratedNonUniformTable1D("values", dict)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::thermophysicalFunctions::integratedNonUniformTable1D::intfdT
+Foam::scalar Foam::Function1s::integratedNonUniformTable::intfdT
 (
     scalar T
 ) const
@@ -107,8 +89,7 @@ Foam::scalar Foam::thermophysicalFunctions::integratedNonUniformTable1D::intfdT
 }
 
 
-Foam::scalar Foam::thermophysicalFunctions::integratedNonUniformTable1D::
-intfByTdT
+Foam::scalar Foam::Function1s::integratedNonUniformTable::intfByTdT
 (
     scalar T
 ) const
@@ -124,12 +105,12 @@ intfByTdT
 }
 
 
-void Foam::thermophysicalFunctions::integratedNonUniformTable1D::write
+void Foam::Function1s::integratedNonUniformTable::write
 (
     Ostream& os
 ) const
 {
-    nonUniformTable1D::write(os);
+    nonUniformTable::write(os);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.H
similarity index 76%
rename from src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.H
rename to src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.H
index 375af2539a..b790e6307b 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1D/integratedNonUniformTable1DThermophysicalFunction.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermophysicalFunctions::integratedNonUniformTable1D
+    Foam::Function1s::integratedNonUniformTable
 
 Description
     Non-uniform tabulated property function that linearly interpolates between
@@ -33,16 +33,16 @@ Description
     the table.
 
 Usage
-    \integratedNonUniformTable1D
+    \integratedNonUniformTable
         Property    | Description
-        values      | List of (temperature property) value pairs
-    \endintegratedNonUniformTable1D
+        values      | List of value pairs
+    \endintegratedNonUniformTable
 
     Example for the density of water between 280 and 350K
     \verbatim
     rho
     {
-        type    integratedNonUniformTable1D;
+        type    integratedNonUniformTable;
 
         values
         (
@@ -55,25 +55,25 @@ Usage
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef integratedNonUniformTable1DThermophysicalFunction_H
-#define integratedNonUniformTable1DThermophysicalFunction_H
+#ifndef integratedNonUniformTable1_H
+#define integratedNonUniformTable1_H
 
-#include "nonUniformTable1DThermophysicalFunction.H"
+#include "nonUniformTable1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace thermophysicalFunctions
+namespace Function1s
 {
 
 /*---------------------------------------------------------------------------*\
-                  Class integratedNonUniformTable1D Declaration
+                  Class integratedNonUniformTable Declaration
 \*---------------------------------------------------------------------------*/
 
-class integratedNonUniformTable1D
+class integratedNonUniformTable
 :
-    public nonUniformTable1D
+    public nonUniformTable
 {
     // Private member data
 
@@ -85,16 +85,13 @@ class integratedNonUniformTable1D
 public:
 
     //- Runtime type information
-    TypeName("integratedNonUniformTable1D");
+    TypeName("integratedNonUniformTable");
 
 
     // Constructors
 
         //- Construct from entry name and dictionary
-        integratedNonUniformTable1D(const word& name, const dictionary& dict);
-
-        //- Construct from dictionary
-        integratedNonUniformTable1D(const dictionary& dict);
+        integratedNonUniformTable(const word& name, const dictionary& dict);
 
 
     // Member Functions
@@ -112,7 +109,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace thermophysicalFunctions
+} // End namespace Function1s
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.C
deleted file mode 100644
index 4c7e1a2527..0000000000
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.C
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "noneThermophysicalFunction.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace thermophysicalFunctions
-{
-    defineTypeNameAndDebug(none, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, none, dictionary);
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::thermophysicalFunctions::none::none(const dictionary& dict)
-:
-    dictName_(dict.name())
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::scalar Foam::thermophysicalFunctions::none::value(scalar T) const
-{
-    FatalErrorInFunction
-        << "Required Function " << nl
-        << "    " << dictName_ << nl
-        << "    is not defined."
-        << exit(FatalError);
-
-    return 0;
-}
-
-void Foam::thermophysicalFunctions::none::write(Ostream& os) const
-{}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.H
deleted file mode 100644
index 5126d10674..0000000000
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/none/noneThermophysicalFunction.H
+++ /dev/null
@@ -1,89 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::thermophysicalFunctions::none
-
-Description
-    Undefined function which returns an error when called.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef noneThermophysicalFunction_H
-#define noneThermophysicalFunction_H
-
-#include "thermophysicalFunction.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace thermophysicalFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-                            Class none Declaration
-\*---------------------------------------------------------------------------*/
-
-class none
-:
-    public thermophysicalFunction
-{
-    // Private member data
-
-        //- Name of dictionary from which this function is instantiated
-        fileName dictName_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("none");
-
-
-    // Constructors
-
-        //- Construct from dictionary
-        none(const dictionary& dict);
-
-
-    // Member Functions
-
-        //- Evaluate the function and return the result
-        scalar value(scalar T) const;
-
-        //- Write the function coefficients
-        void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace thermophysicalFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
deleted file mode 100644
index 6d0dcc0e5a..0000000000
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ /dev/null
@@ -1,108 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "thermophysicalFunction.H"
-#include "noneThermophysicalFunction.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(thermophysicalFunction, 0);
-    defineRunTimeSelectionTable(thermophysicalFunction, dictionary);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
-(
-    const word& name,
-    const dictionary& dict
-)
-{
-    if (debug)
-    {
-        InfoInFunction
-            << "Constructing thermophysicalFunction"
-            << endl;
-    }
-
-    if (dict.isDict(name))
-    {
-        const dictionary& funcDict(dict.subDict(name));
-        const word thermophysicalFunctionType(funcDict.lookup("type"));
-
-        dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(thermophysicalFunctionType);
-
-        if (cstrIter == dictionaryConstructorTablePtr_->end())
-        {
-            FatalErrorInFunction
-                << "Unknown thermophysicalFunction type "
-                << thermophysicalFunctionType
-                << nl << nl
-                << "Valid thermophysicalFunction types are :" << endl
-                << dictionaryConstructorTablePtr_->sortedToc()
-                << abort(FatalError);
-        }
-
-        return autoPtr<thermophysicalFunction>(cstrIter()(funcDict));
-    }
-    else
-    {
-        return autoPtr<thermophysicalFunction>
-        (
-            new thermophysicalFunctions::none(dict.name()/name)
-        );
-    }
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Functions  * * * * * * * * * * * * //
-
-void Foam::writeEntry(Ostream& os, const thermophysicalFunction& f)
-{
-    writeKeyword(os, "***HGW")
-        << nl << indent << token::BEGIN_BLOCK << nl << incrIndent;
-
-    writeEntry(os, "type", f.type());
-
-    f.write(os);
-
-    os  << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
-// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const thermophysicalFunction& f)
-{
-    f.write(os);
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
deleted file mode 100644
index 62f0977ca4..0000000000
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::thermophysicalFunction
-
-Description
-    Abstract base class for thermo-physical functions
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef thermophysicalFunction_H
-#define thermophysicalFunction_H
-
-#include "scalar.H"
-#include "IOstreams.H"
-#include "typeInfo.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-#include "dictionary.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of friend functions and operators
-class thermophysicalFunction;
-Ostream& operator<<(Ostream& os, const thermophysicalFunction& l);
-
-/*---------------------------------------------------------------------------*\
-                   Class thermophysicalFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class thermophysicalFunction
-{
-
-public:
-
-    //- Runtime type information
-    TypeName("thermophysicalFunction");
-
-
-    // Declare run-time constructor selection tables
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            thermophysicalFunction,
-            dictionary,
-            (const dictionary& dict),
-            (dict)
-        );
-
-
-    // Constructors
-
-        //- Construct null
-        thermophysicalFunction()
-        {}
-
-        //- Return pointer to new thermophysicalFunction created from dict
-        static autoPtr<thermophysicalFunction> New
-        (
-            const word& name,
-            const dictionary& dict
-        );
-
-
-    //- Destructor
-    virtual ~thermophysicalFunction()
-    {}
-
-
-    // Member Functions
-
-        //- Evaluate the function and return the result
-        virtual scalar value(scalar T) const = 0;
-
-        //- Write the function coefficients
-        virtual void write(Ostream& os) const = 0;
-
-
-    // Ostream Operator
-
-        friend Ostream& operator<<
-        (
-            Ostream& os,
-            const thermophysicalFunction& f
-        );
-};
-
-
-void writeEntry(Ostream& os, const thermophysicalFunction& f);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.C b/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.C
index 9eabd3391a..d735b4eb44 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.C
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.C
@@ -46,11 +46,9 @@ Foam::Function2s::uniformTable::uniformTable
 )
 :
     FieldFunction2<scalar, uniformTable>(name),
-    pLow_(dict.lookup<scalar>("pLow")),
-    pHigh_(dict.lookup<scalar>("pHigh")),
-    Tlow_(dict.lookup<scalar>("Tlow")),
-    Thigh_(dict.lookup<scalar>("Thigh")),
-    values_(dict.lookup(name))
+    low_(dict.lookup<Pair<scalar>>("low")),
+    high_(dict.lookup<Pair<scalar>>("high")),
+    values_(dict.lookup("values"))
 {
     if (values_.m() < 2 || values_.n() < 2)
     {
@@ -62,8 +60,8 @@ Foam::Function2s::uniformTable::uniformTable
     }
     else
     {
-        deltap_ = (pHigh_ - pLow_)/(values_.m() - 1);
-        deltaT_ = (Thigh_ - Tlow_)/(values_.n() - 1);
+        deltax_ = (high_.first() - low_.first())/(values_.m() - 1);
+        deltay_ = (high_.second() - low_.second())/(values_.n() - 1);
     }
 }
 
@@ -72,28 +70,28 @@ Foam::Function2s::uniformTable::uniformTable
 
 inline void Foam::Function2s::uniformTable::checkRange
 (
-    scalar p,
-    scalar ndp,
-    label ip,
-    scalar T,
-    scalar ndT,
-    label iT
+    scalar x,
+    scalar ndx,
+    label ix,
+    scalar y,
+    scalar ndy,
+    label iy
 ) const
 {
-    if (ndp < 0 || ip > values_.m() - 2)
+    if (ndx < 0 || ix > values_.m() - 2)
     {
         FatalErrorInFunction
-            << "Pressure " << p << " out of range "
-            << pLow_ << " to " << pHigh_ << nl
+            << "x " << x << " out of range "
+            << low_.first() << " to " << high_.first() << nl
             << "    of table " << name_
             << exit(FatalError);
     }
 
-    if (ndT < 0 || iT > values_.n() - 2)
+    if (ndy < 0 || iy > values_.n() - 2)
     {
         FatalErrorInFunction
-            << "Temperature " << T << " out of range "
-            << Tlow_ << " to " << Thigh_ << nl
+            << "y " << y << " out of range "
+            << low_.second() << " to " << high_.second() << nl
             << "    of table " << name_
             << exit(FatalError);
     }
@@ -102,36 +100,36 @@ inline void Foam::Function2s::uniformTable::checkRange
 
 Foam::scalar Foam::Function2s::uniformTable::value
 (
-    scalar p,
-    scalar T
+    scalar x,
+    scalar y
 ) const
 {
-    const scalar ndp = (p - pLow_)/deltap_;
-    const label ip = ndp;
+    const scalar ndx = (x - low_.first())/deltax_;
+    const label ix = ndx;
 
-    const scalar ndT = (T - Tlow_)/deltaT_;
-    const label iT = ndT;
+    const scalar ndy = (y - low_.second())/deltay_;
+    const label iy = ndy;
 
-    checkRange(p, ndp, ip, T, ndT, iT);
+    checkRange(x, ndx, ix, y, ndy, iy);
 
-    const scalar pi = pLow_ + ip*deltap_;
-    const scalar lambdap = (p - pi)/deltap_;
+    const scalar xi = low_.first() + ix*deltax_;
+    const scalar lambdax = (x - xi)/deltax_;
 
-    // Interpolate the values at Ti wrt p
-    const scalar fpi =
-        values_(ip, iT)
-      + lambdap*(values_(ip + 1, iT) - values_(ip, iT));
+    // Interpolate the values at yi wrt x
+    const scalar fxi =
+        values_(ix, iy)
+      + lambdax*(values_(ix + 1, iy) - values_(ix, iy));
 
-    // Interpolate the values at Ti+1 wrt p
-    const scalar fpip1 =
-        values_(ip, iT + 1)
-      + lambdap*(values_(ip + 1, iT + 1) - values_(ip, iT + 1));
+    // Interpolate the values at yi+1 wrt x
+    const scalar fxix1 =
+        values_(ix, iy + 1)
+      + lambdax*(values_(ix + 1, iy + 1) - values_(ix, iy + 1));
 
-    const scalar Ti = Tlow_ + iT*deltaT_;
-    const scalar lambdaT = (T - Ti)/deltaT_;
+    const scalar yi = low_.second() + iy*deltay_;
+    const scalar lambday = (y - yi)/deltay_;
 
-    // Interpolate wrt T
-    return fpi + lambdaT*(fpip1 - fpi);
+    // Interpolate wrt y
+    return fxi + lambday*(fxix1 - fxi);
 }
 
 
@@ -142,21 +140,21 @@ dfdp
     scalar T
 ) const
 {
-    const scalar ndp = (p - pLow_)/deltap_;
+    const scalar ndp = (p - low_.first())/deltax_;
     const label ip = ndp;
 
-    const scalar ndT = (T - Tlow_)/deltaT_;
+    const scalar ndT = (T - low_.second())/deltay_;
     const label iT = ndT;
 
     checkRange(p, ndp, ip, T, ndT, iT);
 
     const scalar dfdpi =
-        (values_(ip + 1, iT) - values_(ip, iT))/deltap_;
+        (values_(ip + 1, iT) - values_(ip, iT))/deltax_;
     const scalar dfdpip1 =
-        (values_(ip + 1, iT + 1) - values_(ip, iT + 1))/deltap_;
+        (values_(ip + 1, iT + 1) - values_(ip, iT + 1))/deltax_;
 
-    const scalar Ti = Tlow_ + iT*deltaT_;
-    const scalar lambdaT = (T - Ti)/deltaT_;
+    const scalar Ti = low_.second() + iT*deltay_;
+    const scalar lambdaT = (T - Ti)/deltay_;
 
     // Interpolate wrt T
     return dfdpi + lambdaT*(dfdpip1 - dfdpi);
@@ -170,21 +168,21 @@ dfdT
     scalar T
 ) const
 {
-    const scalar ndp = (p - pLow_)/deltap_;
+    const scalar ndp = (p - low_.first())/deltax_;
     const label ip = ndp;
 
-    const scalar ndT = (T - Tlow_)/deltaT_;
+    const scalar ndT = (T - low_.second())/deltay_;
     const label iT = ndT;
 
     checkRange(p, ndp, ip, T, ndT, iT);
 
     const scalar dfdTi =
-        (values_(ip, iT + 1) - values_(ip, iT))/deltaT_;
+        (values_(ip, iT + 1) - values_(ip, iT))/deltay_;
     const scalar dfdTip1 =
-        (values_(ip + 1, iT + 1) - values_(ip + 1, iT))/deltaT_;
+        (values_(ip + 1, iT + 1) - values_(ip + 1, iT))/deltay_;
 
-    const scalar pi = pLow_ + ip*deltap_;
-    const scalar lambdap = (p - pi)/deltap_;
+    const scalar pi = low_.first() + ip*deltax_;
+    const scalar lambdap = (p - pi)/deltax_;
 
     // Interpolate wrt p
     return dfdTi + lambdap*(dfdTip1 - dfdTi);
@@ -193,10 +191,8 @@ dfdT
 
 void Foam::Function2s::uniformTable::write(Ostream& os) const
 {
-    writeEntry(os, "pLow", Tlow_);
-    writeEntry(os, "pHigh", Thigh_);
-    writeEntry(os, "Tlow", Tlow_);
-    writeEntry(os, "Thigh", Thigh_);
+    writeEntry(os, "low", low_);
+    writeEntry(os, "high", high_);
     writeEntry(os, "values", values_);
 }
 
diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.H b/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.H
index a72aaf1eb6..cd3b289f93 100644
--- a/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.H
+++ b/src/thermophysicalModels/specie/thermophysicalFunctions/uniformTable2/uniformTable2.H
@@ -64,6 +64,7 @@ Usage
 
 #include "Function2.H"
 #include "scalarMatrices.H"
+#include "Pair.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,38 +83,32 @@ class uniformTable
 {
     // Private member data
 
-        //- Lowest pressure in the table
-        scalar pLow_;
+        //- Lowest values in the table
+        Pair<scalar> low_;
 
-        //- Highest pressure in the table
-        scalar pHigh_;
-
-        //- Lowest temperature in the table
-        scalar Tlow_;
-
-        //- Highest temperature in the table
-        scalar Thigh_;
+        //- Highest values in the table
+        Pair<scalar> high_;
 
         //- Table values
         scalarRectangularMatrix values_;
 
-        //- pressure increment derived from pLow_, pHigh_ and values_.m()
-        scalar deltap_;
+        //- x increment derived from low_, high_ and values_.m()
+        scalar deltax_;
 
-        //- Temperature increment derived from Tlow_, Thigh_ and values_.n()
-        scalar deltaT_;
+        //- y increment derived from low_, high_ and values_.n()
+        scalar deltay_;
 
 
     // Private member functions
 
         inline void checkRange
         (
-            scalar p,
-            scalar ndp,
-            label ip,
-            scalar T,
-            scalar ndT,
-            label iT
+            scalar x,
+            scalar ndx,
+            label ix,
+            scalar y,
+            scalar ndy,
+            label iy
         ) const;
 
 
@@ -125,7 +120,7 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from name and dictionary
         uniformTable(const word& name, const dictionary& dict);
 
 
@@ -138,7 +133,7 @@ public:
         }
 
         //- Evaluate the function and return the result
-        scalar value(scalar p, scalar T) const;
+        virtual scalar value(scalar x, scalar y) const;
 
         //- Evaluate the derivative of the function w.r.t. p
         scalar dfdp(scalar p, scalar T) const;
diff --git a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.C b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.C
index 97c3215283..6d7e7265ba 100644
--- a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.C
+++ b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.C
@@ -35,8 +35,8 @@ Foam::icoTabulatedTransport<Thermo>::icoTabulatedTransport
 )
 :
     Thermo(dict),
-    mu_("mu", dict.subDict("transport")),
-    kappa_("kappa", dict.subDict("transport"))
+    mu_("mu", dict.subDict("transport").subDict("mu")),
+    kappa_("kappa", dict.subDict("transport").subDict("kappa"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.H b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.H
index 1048dba37b..a0a5d9cecd 100644
--- a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.H
+++ b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransport.H
@@ -61,14 +61,14 @@ SourceFiles
     icoTabulatedTransport.C
 
 See also
-    Foam::thermophysicalFunctions::nonUniformTable1D
+    Foam::Function1s::nonUniformTable
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef icoTabulatedTransport_H
 #define icoTabulatedTransport_H
 
-#include "nonUniformTable1DThermophysicalFunction.H"
+#include "nonUniformTable1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -92,16 +92,16 @@ class icoTabulatedTransport
 :
     public Thermo
 {
-    typedef thermophysicalFunctions::nonUniformTable1D nonUniformTable1D;
+    typedef Function1s::nonUniformTable nonUniformTable;
 
 
     // Private Data
 
         //- Dynamic viscosity table [Pa.s]
-        nonUniformTable1D mu_;
+        nonUniformTable mu_;
 
         //- Thermal conductivity table [W/m/K]
-        nonUniformTable1D kappa_;
+        nonUniformTable kappa_;
 
 
     // Private Member Functions
@@ -110,8 +110,8 @@ class icoTabulatedTransport
         inline icoTabulatedTransport
         (
             const Thermo& t,
-            const nonUniformTable1D& muPoly,
-            const nonUniformTable1D& kappaPoly
+            const nonUniformTable& muPoly,
+            const nonUniformTable& kappaPoly
         );
 
 
diff --git a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransportI.H b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransportI.H
index c687b123e5..b2fa65eb8f 100644
--- a/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransportI.H
+++ b/src/thermophysicalModels/specie/transport/icoTabulated/icoTabulatedTransportI.H
@@ -31,8 +31,8 @@ template<class Thermo>
 inline Foam::icoTabulatedTransport<Thermo>::icoTabulatedTransport
 (
     const Thermo& t,
-    const nonUniformTable1D& mu,
-    const nonUniformTable1D& kappa
+    const nonUniformTable& mu,
+    const nonUniformTable& kappa
 )
 :
     Thermo(t),
diff --git a/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C b/src/thermophysicalModels/specie/transport/tabulated/tabulatedTransport.C
index b9ca4ab438..20933a518f 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_("mu", dict.subDict("transport")),
-    kappa_("kappa", dict.subDict("transport"))
+    mu_("mu", dict.subDict("transport").subDict("mu")),
+    kappa_("kappa", dict.subDict("transport").subDict("kappa"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
index 47e257b994..3fe8e48157 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
@@ -53,12 +53,22 @@ Foam::Ar::Ar()
         0.0,
         1.4138e+4
     ),
-    rho_(151.922244, 0.286, 150.86, 0.2984),
-    pv_(39.233, -1051.7, -3.5895, 5.0444e-05, 2),
-    hl_(150.86, 218509.061780314, 0.352, 0.0, 0.0, 0.0),
-    Cp_(4562.43116050866, -70.7770101131471, 0.367477721037349, 0.0, 0.0, 0.0),
+    rho_("rho", 151.922244, 0.286, 150.86, 0.2984),
+    pv_("pv", 39.233, -1051.7, -3.5895, 5.0444e-05, 2),
+    hl_("hl", 150.86, 218509.061780314, 0.352, 0.0, 0.0, 0.0),
+    Cp_
+    (
+        "Cp",
+        4562.43116050866,
+        -70.7770101131471,
+        0.367477721037349,
+        0.0,
+        0.0,
+        0.0
+    ),
     h_
     (
+        "h",
        -1460974.49982473,
         4562.43116050866,
        -35.3885050565735,
@@ -66,20 +76,21 @@ Foam::Ar::Ar()
         0.0,
         0.0
     ),
-    Cpg_(520.326424351657, 0.0, 0.0, 0.0, 0.0, 0.0),
+    Cpg_("Cpg", 520.326424351657, 0.0, 0.0, 0.0, 0.0, 0.0),
     B_
     (
+        "B",
         0.000952488234705117,
        -0.379993992189847,
        -2022.62941824372,
         4633523580654.85,
         -302893761890458.0
     ),
-    mu_(-8.868, 204.3, -0.3831, -1.3e-22, 10.0),
-    mug_(8.386e-07, 0.6175, 75.377, -432.5),
-    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),
+    mu_("mu", -8.868, 204.3, -0.3831, -1.3e-22, 10.0),
+    mug_("mug", 8.386e-07, 0.6175, 75.377, -432.5),
+    kappa_("kappa", 0.1819, -0.0003176, -4.11e-06, 0.0, 0.0, 0.0),
+    kappag_("kappag", 0.0001236, 0.8262, -132.8, 16000),
+    sigma_("sigma", 150.86, 0.03823, 1.2927, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 39.948, 28) // note: Same as nHeptane
 {}
 
@@ -87,18 +98,18 @@ Foam::Ar::Ar()
 Foam::Ar::Ar
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS0& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS0& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
index 0197926492..10cbfe67e6 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
@@ -36,16 +36,16 @@ SourceFiles
 #define Ar_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class Ar
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS0 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS0 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         Ar
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS0& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS0& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
index 9e1e399bb7..a40d5f6388 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
@@ -53,11 +53,12 @@ Foam::C10H22::C10H22()
         0.4923,
         1.57e+4
     ),
-    rho_(60.94208835, 0.25745, 617.7, 0.28912),
-    pv_(112.73, -9749.6, -13.245, 7.1266e-06, 2.0),
-    hl_(617.70, 464743.296904101, 0.39797, 0.0, 0.0, 0.0),
+    rho_("rho", 60.94208835, 0.25745, 617.7, 0.28912),
+    pv_("pv", 112.73, -9749.6, -13.245, 7.1266e-06, 2.0),
+    hl_("hl", 617.70, 464743.296904101, 0.39797, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         1958.18252099659,
        -1.39094071757388,
         0.00754612221948905,
@@ -67,6 +68,7 @@ Foam::C10H22::C10H22()
     ),
     h_
     (
+        "h",
        -2699436.15229142,
         1958.18252099659,
        -0.695470358786942,
@@ -74,20 +76,29 @@ Foam::C10H22::C10H22()
         0.0,
         0.0
     ),
-    Cpg_(1175.10630073444, 3762.16748076045, 1614.1, 2658.04547211582, 742),
+    Cpg_
+    (
+        "Cpg",
+        1175.10630073444,
+        3762.16748076045,
+        1614.1,
+        2658.04547211582,
+        742
+    ),
     B_
     (
+        "B",
         0.00337351091119935,
        -4.13606494008504,
        -534560.916470464,
        -1.13364022911762e+19,
         2.80704220402713e+21
     ),
-    mu_(-16.468, 1533.5, 0.7511, 0.0, 0.0),
-    mug_(2.64e-08, 0.9487, 71.0, 0.0),
-    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),
+    mu_("mu", -16.468, 1533.5, 0.7511, 0.0, 0.0),
+    mug_("mug", 2.64e-08, 0.9487, 71.0, 0.0),
+    kappa_("kappa", 0.2063, -0.000254, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -668.4, 0.9323, -4071000000.0, 0.0),
+    sigma_("sigma", 617.70, 0.055435, 1.3095, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 142.285, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C10H22::C10H22()
 Foam::C10H22::C10H22
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
index ef87481529..ee3538ba4e 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C10H22_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C10H22
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C10H22
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
index 30fc7a3a55..1d24187ea0 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
@@ -53,12 +53,22 @@ Foam::C12H26::C12H26()
         0.5764,
         1.59e+4
     ),
-    rho_(60.53982858, 0.25511, 658.0, 0.29368),
-    pv_(137.47, -11976.0, -16.698, 8.0906e-06, 2.0),
-    hl_(658.0, 454020.829174935, 0.40681, 0.0, 0.0, 0.0),
-    Cp_(2983.53861146661, -8.0352006011577, 0.018207916025784, 0.0, 0.0, 0.0),
+    rho_("rho", 60.53982858, 0.25511, 658.0, 0.29368),
+    pv_("pv", 137.47, -11976.0, -16.698, 8.0906e-06, 2.0),
+    hl_("hl", 658.0, 454020.829174935, 0.40681, 0.0, 0.0, 0.0),
+    Cp_
+    (
+        "Cp",
+        2983.53861146661,
+        -8.0352006011577,
+        0.018207916025784,
+        0.0,
+        0.0,
+        0.0
+    ),
     h_
     (
+        "h",
        -2755166.83820769,
         2983.53861146661,
        -4.01760030057885,
@@ -66,20 +76,29 @@ Foam::C12H26::C12H26()
         0.0,
         0.0
     ),
-    Cpg_(1250.16144371778, 3894.02247296552, 1715.5, 2650.67101879792, 777.5),
+    Cpg_
+    (
+        "Cpg",
+        1250.16144371778,
+        3894.02247296552,
+        1715.5,
+        2650.67101879792,
+        777.5
+    ),
     B_
     (
+        "B",
         0.00516619896910848,
        -6.40491258556517,
        -295295.236529723,
        -3.22147729807794e+19,
         8.78195117941974e+21
     ),
-    mu_(-20.607, 1943, 1.3205, 0.0, 0.0),
-    mug_(6.344e-08, 0.8287, 219.5, 0.0),
-    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),
+    mu_("mu", -20.607, 1943, 1.3205, 0.0, 0.0),
+    mug_("mug", 6.344e-08, 0.8287, 219.5, 0.0),
+    kappa_("kappa", 0.2047, -0.0002326, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 5.719e-06, 1.4699, 579.4, 0.0),
+    sigma_("sigma", 658.0, 0.055493, 1.3262, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 170.338, 28.0) // note: Same as nHeptane
 {}
 
@@ -87,18 +106,18 @@ Foam::C12H26::C12H26()
 Foam::C12H26::C12H26
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
index e14ffb6e59..4811f119ac 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C12H26_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C12H26
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C12H26
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
index 72346cd7fa..c576cf0c6f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
@@ -53,11 +53,12 @@ Foam::C13H28::C13H28()
         0.6186,
         1.5901e+4
     ),
-    rho_(59.513022, 0.2504, 675.8, 0.312),
-    pv_(118.27, -11432, -13.769, 5.9641e-06, 2.0),
-    hl_(675.80, 444227.48352453, 0.4162, 0.0, 0.0, 0.0),
+    rho_("rho", 59.513022, 0.2504, 675.8, 0.312),
+    pv_("pv", 118.27, -11432, -13.769, 5.9641e-06, 2.0),
+    hl_("hl", 675.80, 444227.48352453, 0.4162, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         4275.05220622135,
        -16.6539202126217,
         0.0325755973205326,
@@ -67,6 +68,7 @@ Foam::C13H28::C13H28()
     ),
     h_
     (
+        "h",
        -2860442.0545124,
         4275.05220622135,
        -8.32696010631085,
@@ -74,20 +76,29 @@ Foam::C13H28::C13H28()
         0.0,
         0.0
     ),
-    Cpg_(1136.87522035093, 3641.14663846175, -1443, 2277.00485450058, -683.0),
+    Cpg_
+    (
+        "Cpg",
+        1136.87522035093,
+        3641.14663846175,
+        -1443,
+        2277.00485450058,
+        -683.0
+    ),
     B_
     (
+        "B",
         0.00246321156401703,
        -2.66601578390692,
        -1249532.17801643,
        -1.0460770753668e+19,
         1.90117430097904e+21
     ),
-    mu_(-23.341, 2121.9, 1.7208, 0.0, 0.0),
-    mug_(3.5585e-08, 0.8987, 165.3, 0.0),
-    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),
+    mu_("mu", -23.341, 2121.9, 1.7208, 0.0, 0.0),
+    mug_("mug", 3.5585e-08, 0.8987, 165.3, 0.0),
+    kappa_("kappa", 0.1981, -0.0002046, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 5.3701e-06, 1.4751, 599.09, 0.0),
+    sigma_("sigma", 675.80, 0.05561, 1.3361, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 184.365, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C13H28::C13H28()
 Foam::C13H28::C13H28
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
index 6762fe466c..62a5672c95 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C13H28_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C13H28
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C13H28
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
index 9fd025fd5c..833a47fa73 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
@@ -53,11 +53,12 @@ Foam::C14H30::C14H30()
         0.6617,
         1.6173e+4
     ),
-    rho_(60.92023144, 0.2582, 692.4, 0.26628),
-    pv_(249.21, -16915, -35.195, 0.028451, 1.0),
-    hl_(692.40, 455764.345336506, 0.428, 0.0, 0.0, 0.0),
+    rho_("rho", 60.92023144, 0.2582, 692.4, 0.26628),
+    pv_("pv", 249.21, -16915, -35.195, 0.028451, 1.0),
+    hl_("hl", 692.40, 455764.345336506, 0.428, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         2565.72845679261,
        -4.78114036856325,
         0.0120362716238558,
@@ -67,6 +68,7 @@ Foam::C14H30::C14H30()
     ),
     h_
     (
+        "h",
        -2690601.01887934,
         2565.72845679261,
        -2.39057018428162,
@@ -74,20 +76,29 @@ Foam::C14H30::C14H30()
         0.0,
         0.0
     ),
-    Cpg_(1134.11831122223, 3629.17859591113, -1440.3, 2275.29335860317, -682),
+    Cpg_
+    (
+        "Cpg",
+        1134.11831122223,
+        3629.17859591113,
+        -1440.3,
+        2275.29335860317,
+        -682
+    ),
     B_
     (
+        "B",
         0.00247837614419936,
        -2.62692044034034,
        -1427174.48284205,
        -1.68288035807895e+19,
         3.48854792531957e+21
     ),
-    mu_(-18.964, 2010.9, 1.0648, 0.0, 0.0),
-    mug_(4.4565e-08, 0.8684, 228.16, -4347.2),
-    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),
+    mu_("mu", -18.964, 2010.9, 1.0648, 0.0, 0.0),
+    mug_("mug", 4.4565e-08, 0.8684, 228.16, -4347.2),
+    kappa_("kappa", 0.1957, -0.0001993, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -0.000628, 0.944, -5490, 0.0),
+    sigma_("sigma", 692.40, 0.056436, 1.3658, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 198.392, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C14H30::C14H30()
 Foam::C14H30::C14H30
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
index 1d5d89663b..8d964e66f4 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C14H30_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C14H30
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C14H30
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
index 9f767dda46..9f61121b0f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
@@ -53,11 +53,12 @@ Foam::C16H34::C16H34()
         0.7471,
         1.6052e+4
     ),
-    rho_(61.94656776, 0.25442, 720.6, 0.3238),
-    pv_(233.1, -17346, -32.251, 0.02407, 1.0),
-    hl_(720.60, 430654.548987397, 0.4122, 0.0, 0.0, 0.0),
+    rho_("rho", 61.94656776, 0.25442, 720.6, 0.3238),
+    pv_("pv", 233.1, -17346, -32.251, 0.02407, 1.0),
+    hl_("hl", 720.60, 430654.548987397, 0.4122, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         3769.90540791182,
        -12.5871068599136,
         0.0247211255663602,
@@ -67,6 +68,7 @@ Foam::C16H34::C16H34()
     ),
     h_
     (
+        "h",
        -2777201.30410301,
         3769.90540791182,
        -6.29355342995681,
@@ -74,20 +76,29 @@ Foam::C16H34::C16H34()
         0.0,
         0.0
     ),
-    Cpg_(1128.74592618108, 3600.8584828171, -1429.7, 2259.69988429913, 679.0),
+    Cpg_
+    (
+        "Cpg",
+        1128.74592618108,
+        3600.8584828171,
+        -1429.7,
+        2259.69988429913,
+        679.0
+    ),
     B_
     (
+        "B",
         0.0025091191718997,
        -2.46668079807106,
        -1704070.72767901,
        -3.00623548219001e+19,
         7.07320950690231e+21
     ),
-    mu_(-18.388, 2056.8, 0.98681, 0.0, 0.0),
-    mug_(1.2463e-07, 0.7322, 395.0, 6000.0),
-    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),
+    mu_("mu", -18.388, 2056.8, 0.98681, 0.0, 0.0),
+    mug_("mug", 1.2463e-07, 0.7322, 395.0, 6000.0),
+    kappa_("kappa", 0.1963, -0.00019, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 3.075e-06, 1.552, 678.0, 0.0),
+    sigma_("sigma", 720.60, 0.05699, 1.3929, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 226.446, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C16H34::C16H34()
 Foam::C16H34::C16H34
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
index fd80d598b1..bea912f914 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C16H34_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C16H34
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C16H34
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
index 453acb4709..b966e85b3d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
@@ -53,11 +53,12 @@ Foam::C2H5OH::C2H5OH()
         0.6371,
         2.6421e+4
     ),
-    rho_(70.1308387, 0.26395, 516.25, 0.2367),
-    pv_(59.796, -6595, -5.0474, 6.3e-07, 2),
-    hl_(516.25, 958345.091059064, -0.4134, 0.75362, 0.0, 0.0),
+    rho_("rho", 70.1308387, 0.26395, 516.25, 0.2367),
+    pv_("pv", 59.796, -6595, -5.0474, 6.3e-07, 2),
+    hl_("hl", 516.25, 958345.091059064, -0.4134, 0.75362, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         2052.57331394213,
        -0.121990926653498,
        -0.00714146172046278,
@@ -67,6 +68,7 @@ Foam::C2H5OH::C2H5OH()
     ),
     h_
     (
+        "h",
        -6752827.25039109,
         2052.57331394213,
        -0.060995463326749,
@@ -74,20 +76,29 @@ Foam::C2H5OH::C2H5OH()
         1.30130890620591e-05,
         0.0
     ),
-    Cpg_(909.505307256507, 3358.00646855803, 1530, 2029.56434912848, 640),
+    Cpg_
+    (
+        "Cpg",
+        909.505307256507,
+        3358.00646855803,
+        1530,
+        2029.56434912848,
+        640
+    ),
     B_
     (
+        "B",
        -0.00358158414552085,
         3.90718270420456,
        -1180837.43949293,
         9.81136990166923e+18,
        -3.58592545963663e+21
     ),
-    mu_(8.049, 776, -3.068, 0.0, 0.0),
-    mug_(1.0613e-07, 0.8066, 52.7, 0.0),
-    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),
+    mu_("mu", 8.049, 776, -3.068, 0.0, 0.0),
+    mug_("mug", 1.0613e-07, 0.8066, 52.7, 0.0),
+    kappa_("kappa", 0.253, -0.000281, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -3.12, 0.7152, -3550000.0, 0.0),
+    sigma_("sigma", 3.7640e-02, -2.1570e-05, -1.025e-07, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 46.069, 28) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C2H5OH::C2H5OH()
 Foam::C2H5OH::C2H5OH
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS0& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS0& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
index 150808b9ac..3344b69eb4 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C2H5OH_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C2H5OH
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS0 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS0 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C2H5OH
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS0& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS0& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
index 960b07eb5e..aa6bb8bead 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
@@ -53,32 +53,42 @@ Foam::C2H6::C2H6()
         0.0995,
         1.24e+4
     ),
-    rho_(57.499854, 0.27937, 305.32, 0.29187),
-    pv_(51.857, -2598.7, -5.1283, 1.4913e-05, 2.0),
-    hl_(305.32, 701396.740937812, 0.60646, -0.55492, 0.32799, 0.0),
+    rho_("rho", 57.499854, 0.27937, 305.32, 0.29187),
+    pv_("pv", 51.857, -2598.7, -5.1283, 1.4913e-05, 2.0),
+    hl_("hl", 305.32, 701396.740937812, 0.60646, -0.55492, 0.32799, 0.0),
     Cp_
     (
+        "Cp",
         305.32,
         8.02554965861611,
         2983.63817758563,
         167.548325566287,
        -343.93389207094
     ),
-    h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
-    Cpg_(1341.07083471899, 4463.58496840705, 1655.5, 2435.08480212837, 752.87),
+    h_("h", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
+    Cpg_
+    (
+        "Cpg",
+        1341.07083471899,
+        4463.58496840705,
+        1655.5,
+        2435.08480212837,
+        752.87
+    ),
     B_
     (
+        "B",
         0.00269205187894912,
        -2.05221150648487,
        -47721.9820419022,
         2.24808779514466e+15,
        -3.23910874625873e+17
     ),
-    mu_(-3.4134, 197.05, -1.2193, -9.2023e-26, 10.0),
-    mug_(2.5906e-07, 0.67988, 98.902, 0.0),
-    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),
+    mu_("mu", -3.4134, 197.05, -1.2193, -9.2023e-26, 10.0),
+    mug_("mug", 2.5906e-07, 0.67988, 98.902, 0.0),
+    kappa_("kappa", 0.35758, -0.0011458, 6.1866e-07, 0.0, 0.0, 0.0),
+    kappag_("kappag", 7.3869e-05, 1.1689, 500.73, 0.0),
+    sigma_("sigma", 305.32, 0.048643, 1.1981, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 30.070, 28) // note: Same as nHeptane
 {}
 
@@ -86,18 +96,18 @@ Foam::C2H6::C2H6()
 Foam::C2H6::C2H6
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS14& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS14& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
index 725cdf0035..3e953aebe0 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C2H6_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C2H6
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS14 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS14 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C2H6
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS14& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS14& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
index c4fabbae02..a5ffb47896 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
@@ -53,11 +53,12 @@ Foam::C2H6O::C2H6O()
         0.2036,
         1.7572e+4
     ),
-    rho_(69.472052, 0.26325, 400.1, 0.2806),
-    pv_(51.566, -3664.4, -4.653, 5.9e-06, 2),
-    hl_(400.10, 608435.173326966, 0.2477, -0.089, 0.203, 0),
+    rho_("rho", 69.472052, 0.26325, 400.1, 0.2806),
+    pv_("pv", 51.566, -3664.4, -4.653, 5.9e-06, 2),
+    hl_("hl", 400.10, 608435.173326966, 0.2477, -0.089, 0.203, 0),
     Cp_
     (
+        "Cp",
         1491.24139877141,
         11.3099915344375,
        -0.067273003538171,
@@ -67,6 +68,7 @@ Foam::C2H6O::C2H6O()
     ),
     h_
     (
+        "h",
        -5024829.22619402,
         1491.24139877141,
         5.65499576721874,
@@ -74,20 +76,21 @@ Foam::C2H6O::C2H6O()
         3.41390088779874e-05,
         0.0
     ),
-    Cpg_(950.747791356443, 3160.47667628991, 1284, 1291.5409494454, 520),
+    Cpg_("Cpg", 950.747791356443, 3160.47667628991, 1284, 1291.5409494454, 520),
     B_
     (
+        "B",
         0.00235082159369641,
        -2.26616596843865,
        -123293.320888233,
        -8.87364605266014e+16,
         1.46389111984198e+19
     ),
-    mu_(-10.62, 448.99, 8.3967e-05, 0.0, 0.0),
-    mug_(7.27, 0.1091, 440600000, 0.0),
-    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),
+    mu_("mu", -10.62, 448.99, 8.3967e-05, 0.0, 0.0),
+    mug_("mug", 7.27, 0.1091, 440600000, 0.0),
+    kappa_("kappa", 0.31276, -0.0005677, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 0.2247, 0.1026, 997.06, 1762900),
+    sigma_("sigma", 400.10, 0.06096, 1.2286, 0, 0, 0),
     D_("D", 147.18, 20.1, 46.069, 28) // note: Same as nHeptane
 {}
 
@@ -95,18 +98,18 @@ Foam::C2H6O::C2H6O()
 Foam::C2H6O::C2H6O
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
index 59817c77e3..d6754b6e36 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C2H6O_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C2H6O
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C2H6O
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
index 54575fec6e..a962a5f792 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
@@ -53,11 +53,12 @@ Foam::C3H6O::C3H6O()
         0.3064,
         1.9774e+4
     ),
-    rho_(71.426784, 0.2576, 508.2, 0.29903),
-    pv_(70.72, -5685, -7.351, 6.3e-06, 2.0),
-    hl_(508.20, 846590.909090909, 1.036, -1.294, 0.672, 0.0),
+    rho_("rho", 71.426784, 0.2576, 508.2, 0.29903),
+    pv_("pv", 70.72, -5685, -7.351, 6.3e-06, 2.0),
+    hl_("hl", 508.20, 846590.909090909, 1.036, -1.294, 0.672, 0.0),
     Cp_
     (
+        "Cp",
         2334.71074380165,
        -3.04752066115702,
         0.00488464187327824,
@@ -67,6 +68,7 @@ Foam::C3H6O::C3H6O()
     ),
     h_
     (
+        "h",
        -4.905296049462618e06,
         2334.71074380165,
        -1.52376033057851,
@@ -74,20 +76,29 @@ Foam::C3H6O::C3H6O()
         2.96573691460055e-06,
         0.0
     ),
-    Cpg_(828.512396694215, 2830.57851239669, 1250.0, 1234.50413223141, -524.4),
+    Cpg_
+    (
+        "Cpg",
+        828.512396694215,
+        2830.57851239669,
+        1250.0,
+        1234.50413223141,
+        -524.4
+    ),
     B_
     (
+        "B",
         0.00190599173553719,
        -1.70798898071625,
        -525826.446280992,
         1.70282369146006e+17,
        -2.83298898071625e+20
     ),
-    mu_(-14.918, 1023.4, 0.5961, 0.0, 0.0),
-    mug_(3.1005e-08, 0.9762, 23.139, 0.0),
-    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),
+    mu_("mu", -14.918, 1023.4, 0.5961, 0.0, 0.0),
+    mug_("mug", 3.1005e-08, 0.9762, 23.139, 0.0),
+    kappa_("kappa", 0.2502, -0.000298, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -26.8, 0.9098, -126500000, 0.0),
+    sigma_("sigma", 508.20, 0.0622, 1.124, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 58.08, 28) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C3H6O::C3H6O()
 Foam::C3H6O::C3H6O
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
index c747beffea..3006766ef2 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C3H6O_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C3H6O
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C3H6O
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
index 8b99fc87d7..21402f6dab 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
@@ -52,32 +52,42 @@ Foam::C3H8::C3H8()
         0.1523,
         1.31e+4
     ),
-    rho_(60.6628672, 0.27453, 369.83, 0.29359),
-    pv_(59.078, -3492.6, -6.0669, 1.0919e-05, 2.0),
-    hl_(369.83, 662395.682148041, 0.78237, -0.77319, 0.39246, 0.0),
+    rho_("rho", 60.6628672, 0.27453, 369.83, 0.29359),
+    pv_("pv", 59.078, -3492.6, -6.0669, 1.0919e-05, 2.0),
+    hl_("hl", 369.83, 662395.682148041, 0.78237, -0.77319, 0.39246, 0.0),
     Cp_
     (
+        "Cp",
         369.83,
         9.48470319647089,
         2576.87772133527,
         95.3560311677331,
        -131.535634282099
     ),
-    h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
-    Cpg_(1177.43105950653, 4364.34143686502, 1626.5, 2648.76632801161, 723.6),
+    h_("h", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
+    Cpg_
+    (
+        "Cpg",
+        1177.43105950653,
+        4364.34143686502,
+        1626.5,
+        2648.76632801161,
+        723.6
+    ),
     B_
     (
+        "B",
         0.00255578737300435,
        -2.24963715529753,
        -102276.850507983,
         7.00743831640058e+15,
        -1.59878447024673e+18
     ),
-    mu_(-6.9281, 420.76, -0.63276, -1.713e-26, 10.0),
-    mug_(2.4993e-07, 0.68612, 179.34, -8254.6),
-    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),
+    mu_("mu", -6.9281, 420.76, -0.63276, -1.713e-26, 10.0),
+    mug_("mug", 2.4993e-07, 0.68612, 179.34, -8254.6),
+    kappa_("kappa", 0.26755, -0.00066457, 2.774e-07, 0.0, 0.0, 0.0),
+    kappag_("kappag", -1.12, 0.10972, -9834.6, -7535800),
+    sigma_("sigma", 369.83, 0.05092, 1.2197, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 44.096, 28) // note: Same as nHeptane
 {}
 
@@ -85,18 +95,18 @@ Foam::C3H8::C3H8()
 Foam::C3H8::C3H8
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS14& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS14& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
index efb05d2a00..c8ebb2653e 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C3H8_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C3H8
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS14 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS14 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C3H8
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS14& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS14& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
index 3c425213e4..d1f058c95c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
@@ -53,11 +53,12 @@ Foam::C4H10O::C4H10O()
         0.2846,
         1.5532e+4
     ),
-    rho_(75.2793188, 0.27608, 466.7, 0.29358),
-    pv_(101.03, -6311.5, -12.27, 1.377e-05, 2),
-    hl_(466.70, 566355.921913576, 0.40717, 0, 0, 0),
+    rho_("rho", 75.2793188, 0.27608, 466.7, 0.29358),
+    pv_("pv", 101.03, -6311.5, -12.27, 1.377e-05, 2),
+    hl_("hl", 466.70, 566355.921913576, 0.40717, 0, 0, 0),
     Cp_
     (
+        "Cp",
         599.004357621791,
         17.5519069654493,
        -0.0742009902459426,
@@ -67,6 +68,7 @@ Foam::C4H10O::C4H10O()
     ),
     h_
     (
+        "h",
        -4312350.92187216,
         599.004357621791,
         8.77595348272466,
@@ -74,20 +76,29 @@ Foam::C4H10O::C4H10O()
         2.95556035238725e-05,
         0.0
     ),
-    Cpg_(1163.06679438231, 3441.57683849817, 1541.3, 1938.66950878944, -688.9),
+    Cpg_
+    (
+        "Cpg",
+        1163.06679438231,
+        3441.57683849817,
+        1541.3,
+        1938.66950878944,
+        -688.9
+    ),
     B_
     (
+        "B",
         0.00215992337061371,
        -1.810504162001,
        -276972.0599544,
        -2.12349742994752e+17,
         3.1016013922804e+19
     ),
-    mu_(10.197, -63.8, -3.226, 0.0, 0.0),
-    mug_(1.948e-06, 0.41, 495.8, 0.0),
-    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),
+    mu_("mu", 10.197, -63.8, -3.226, 0.0, 0.0),
+    mug_("mug", 1.948e-06, 0.41, 495.8, 0.0),
+    kappa_("kappa", 0.249, -0.0004005, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -0.0044894, 0.6155, -3266.3, 0.0),
+    sigma_("sigma", 466.70, 0.057356, 1.288, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 74.123, 28) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C4H10O::C4H10O()
 Foam::C4H10O::C4H10O
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
index ebe7782208..af1dccd00f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C4H10O_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C4H10O
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C4H10O
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
index 1bf4179b28..32e1b47cc9 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
@@ -53,11 +53,12 @@ Foam::C6H14::C6H14()
         0.3013,
         1.49e+4
     ),
-    rho_(61.03399848, 0.26411, 507.6, 0.27537),
-    pv_(104.65, -6995.5, -12.702, 1.2381e-05, 2.0),
-    hl_(507.60, 527286.863084118, 0.39002, 0.0, 0.0, 0.0),
+    rho_("rho", 61.03399848, 0.26411, 507.6, 0.27537),
+    pv_("pv", 104.65, -6995.5, -12.702, 1.2381e-05, 2.0),
+    hl_("hl", 507.60, 527286.863084118, 0.39002, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         1997.28465831951,
        -2.13258758137322,
         0.0102964828202421,
@@ -67,6 +68,7 @@ Foam::C6H14::C6H14()
     ),
     h_
     (
+        "h",
        -2902186.5403246,
         1997.28465831951,
        -1.06629379068661,
@@ -74,20 +76,29 @@ Foam::C6H14::C6H14()
         0.0,
         0.0
     ),
-    Cpg_(1211.4601343746, 4088.0977523005, 1694.6, 2748.99335089409, 761.6),
+    Cpg_
+    (
+        "Cpg",
+        1211.4601343746,
+        4088.0977523005,
+        1694.6,
+        2748.99335089409,
+        761.6
+    ),
     B_
     (
+        "B",
         0.0022859927822969,
        -2.32080485512376,
        -430509.300625457,
         1.93787205402834e+17,
        -7.17128700233241e+19
     ),
-    mu_(-20.715, 1207.5, 1.4993, 0.0, 0.0),
-    mug_(1.7514e-07, 0.70737, 157.14, 0.0),
-    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),
+    mu_("mu", -20.715, 1207.5, 1.4993, 0.0, 0.0),
+    mug_("mug", 1.7514e-07, 0.70737, 157.14, 0.0),
+    kappa_("kappa", 0.22492, -0.0003533, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -650.5, 0.8053, -1412100000, 0.0),
+    sigma_("sigma", 507.60, 0.055003, 1.2674, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 86.177, 28) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C6H14::C6H14()
 Foam::C6H14::C6H14
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
index 23c10edf5d..cd814bd312 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C6H14_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C6H14
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C6H14
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
index 18a93bdcdb..cb8a78068d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
@@ -53,11 +53,12 @@ Foam::C6H6::C6H6()
         0.2108,
         1.8706e+4
     ),
-    rho_(80.5511568, 0.2667, 562.16, 0.2818),
-    pv_(78.05, -6275.5, -8.4443, 6.26e-06, 2),
-    hl_(562.16, 649435.440510024, 0.7616, -0.5052, 0.1564, 0),
+    rho_("rho", 80.5511568, 0.2667, 562.16, 0.2818),
+    pv_("pv", 78.05, -6275.5, -8.4443, 6.26e-06, 2),
+    hl_("hl", 562.16, 649435.440510024, 0.7616, -0.5052, 0.1564, 0),
     Cp_
     (
+        "Cp",
         1386.69124612745,
        -0.416058581048212,
         0.00542796425736744,
@@ -67,6 +68,7 @@ Foam::C6H6::C6H6()
     ),
     h_
     (
+        "h",
         186141.395065592,
         1386.69124612745,
        -0.208029290524106,
@@ -74,20 +76,29 @@ Foam::C6H6::C6H6()
         0.0,
         0.0
     ),
-    Cpg_(568.656066774202, 2970.65826868423, 1494.6, 2203.57426325627, -678.15),
+    Cpg_
+    (
+        "Cpg",
+        568.656066774202,
+        2970.65826868423,
+        1494.6,
+        2203.57426325627,
+        -678.15
+    ),
     B_
     (
+        "B",
         0.00184089919860716,
        -2.30176408838364,
        -309176.332027549,
        -5.12072099751645e+15,
        -2.90216862534245e+19
     ),
-    mu_(6.764, 336.4, -2.687, 0.0, 0.0),
-    mug_(3.134e-08, 0.9676, 7.9, 0.0),
-    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),
+    mu_("mu", 6.764, 336.4, -2.687, 0.0, 0.0),
+    mug_("mug", 3.134e-08, 0.9676, 7.9, 0.0),
+    kappa_("kappa", 0.2407, -0.0003202, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 1.652e-05, 1.3117, 491, 0.0),
+    sigma_("sigma", 562.16, 0.07195, 1.2389, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 78.114, 28) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C6H6::C6H6()
 Foam::C6H6::C6H6
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
index a927c68c26..c4f3f33250 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C6H6_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C6H6
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C6H6
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
index 6ce4dbd0d1..05871e04e3 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
@@ -53,11 +53,12 @@ Foam::C7H16::C7H16()
         0.3495,
         1.52e+4
     ),
-    rho_(61.38396836, 0.26211, 540.2, 0.28141),
-    pv_(87.829, -6996.4, -9.8802, 7.2099e-06, 2.0),
-    hl_(540.20, 499121.791545248, 0.38795, 0.0, 0.0, 0.0),
+    rho_("rho", 61.38396836, 0.26211, 540.2, 0.28141),
+    pv_("pv", 87.829, -6996.4, -9.8802, 7.2099e-06, 2.0),
+    hl_("hl", 540.20, 499121.791545248, 0.38795, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         540.20,
         6.11976102401216,
         3137.69909384855,
@@ -66,6 +67,7 @@ Foam::C7H16::C7H16()
     ),
     h_
     (
+        "h",
        -3.1469964e+6,
         7.3072e+3,
        -3.52884e+1,
@@ -73,20 +75,29 @@ Foam::C7H16::C7H16()
        -1.634831e-4,
         9.64941e-8
     ),
-    Cpg_(1199.05392998284, 3992.85457666361, 1676.6, 2734.42177956968, 756.4),
+    Cpg_
+    (
+        "Cpg",
+        1199.05392998284,
+        3992.85457666361,
+        1676.6,
+        2734.42177956968,
+        756.4
+    ),
     B_
     (
+        "B",
         0.00274040956448844,
        -2.90407568560137,
        -440900.562851782,
        -8.78208454752305e+17,
         1.28238393676899e+20
     ),
-    mu_(-24.451, 1533.1, 2.0087, 0.0, 0.0),
-    mug_(6.672e-08, 0.82837, 85.752, 0.0),
-    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),
+    mu_("mu", -24.451, 1533.1, 2.0087, 0.0, 0.0),
+    mug_("mug", 6.672e-08, 0.82837, 85.752, 0.0),
+    kappa_("kappa", 0.215, -0.000303, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -0.070028, 0.38068, -7049.9, -2400500.0),
+    sigma_("sigma", 540.20, 0.054143, 1.2512, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 100.204, 28.0)
 {}
 
@@ -94,18 +105,18 @@ Foam::C7H16::C7H16()
 Foam::C7H16::C7H16
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS14& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS14& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
index bd8c0c861e..f5ed186fd1 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C7H16_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C7H16
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS14 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS14 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C7H16
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS14& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS14& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
index 5f846b45dc..a120506295 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
@@ -53,11 +53,12 @@ Foam::C7H8::C7H8()
         0.2641,
         1.8346e+4
     ),
-    rho_(81.32088237, 0.27108, 591.79, 0.29889),
-    pv_(83.359, -6995, -9.1635, 6.225e-06, 2.0),
-    hl_(591.79, 544383.065085033, 0.3834, 0.0, 0.0, 0.0),
+    rho_("rho", 81.32088237, 0.27108, 591.79, 0.29889),
+    pv_("pv", 83.359, -6995, -9.1635, 6.225e-06, 2.0),
+    hl_("hl", 591.79, 544383.065085033, 0.3834, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         2066.83235476064,
        -8.14664481609707,
         0.0322581695445024,
@@ -67,6 +68,7 @@ Foam::C7H8::C7H8()
     ),
     h_
     (
+        "h",
        -353094.830249075,
         2066.83235476064,
        -4.07332240804853,
@@ -74,20 +76,29 @@ Foam::C7H8::C7H8()
        -7.53057813568336e-06,
         0.0
     ),
-    Cpg_(630.989461803106, 3107.19440856947, 1440.6, 2059.88647833212, -650.43),
+    Cpg_
+    (
+        "Cpg",
+        630.989461803106,
+        3107.19440856947,
+        1440.6,
+        2059.88647833212,
+        -650.43
+    ),
     B_
     (
+        "B",
         0.00191120131103418,
        -2.24970425760519,
        -482293.441573241,
        -7.62309938029759e+17,
         1.00986531511488e+20
     ),
-    mu_(-13.362, 1183, 0.333, 0.0, 0.0),
-    mug_(2.919e-08, 0.9648, 0.0, 0.0),
-    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),
+    mu_("mu", -13.362, 1183, 0.333, 0.0, 0.0),
+    mug_("mug", 2.919e-08, 0.9648, 0.0, 0.0),
+    kappa_("kappa", 0.2043, -0.000239, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 2.392e-05, 1.2694, 537, 0.0),
+    sigma_("sigma", 591.79, 0.06685, 1.2456, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 92.141, 28) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C7H8::C7H8()
 Foam::C7H8::C7H8
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
index b7e57b9d3f..151023431a 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C7H8_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C7H8
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C7H8
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
index d290855398..7eba99b861 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
@@ -53,11 +53,12 @@ Foam::C8H10::C8H10()
         0.3036,
         1.8043e+4
     ),
-    rho_(76.3765398, 0.26438, 617.17, 0.2921),
-    pv_(88.246, -7691.1, -9.797, 5.931e-06, 2.0),
-    hl_(617.17, 516167.924119547, 0.3882, 0.0, 0.0, 0.0),
+    rho_("rho", 76.3765398, 0.26438, 617.17, 0.2921),
+    pv_("pv", 88.246, -7691.1, -9.797, 5.931e-06, 2.0),
+    hl_("hl", 617.17, 516167.924119547, 0.3882, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         818.521762883005,
         6.66873887366131,
        -0.0248005500767658,
@@ -67,6 +68,7 @@ Foam::C8H10::C8H10()
     ),
     h_
     (
+        "h",
        -524002.612929508,
         818.521762883005,
         3.33436943683065,
@@ -74,20 +76,29 @@ Foam::C8H10::C8H10()
         1.05965130407754e-05,
         0.0
     ),
-    Cpg_(738.835984816374, 3201.5598067196, 1559, 2285.07916772632, -702.0),
+    Cpg_
+    (
+        "Cpg",
+        738.835984816374,
+        3201.5598067196,
+        1559,
+        2285.07916772632,
+        -702.0
+    ),
     B_
     (
+        "B",
         0.00165776559571242,
        -2.77958310962917,
        -388067.855359952,
        -5.86905535618412e+18,
         1.58052878954854e+21
     ),
-    mu_(-10.452, 1048.4, -0.0715, 0.0, 0.0),
-    mug_(1.2e-06, 0.4518, 439.0, 0.0),
-    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),
+    mu_("mu", -10.452, 1048.4, -0.0715, 0.0, 0.0),
+    mug_("mug", 1.2e-06, 0.4518, 439.0, 0.0),
+    kappa_("kappa", 0.20149, -0.00023988, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 1.708e-05, 1.319, 565.6, 0.0),
+    sigma_("sigma", 617.17, 0.066, 1.268, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 106.167, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C8H10::C8H10()
 Foam::C8H10::C8H10
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
index 487de045ab..7c2081e694 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
@@ -36,15 +36,15 @@ SourceFiles
 #define C8H10_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,18 +61,18 @@ class C8H10
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -93,18 +93,18 @@ public:
         C8H10
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
index c2bb4b64b5..09674a2f57 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
@@ -53,11 +53,12 @@ Foam::C8H18::C8H18()
         0.3996,
         1.54e+4
     ),
-    rho_(61.37745861, 0.26115, 568.7, 0.28034),
-    pv_(96.084, -7900.2, -11.003, 7.1802e-06, 2.0),
-    hl_(568.70, 483056.263186, 0.38467, 0.0, 0.0, 0.0),
+    rho_("rho", 61.37745861, 0.26115, 568.7, 0.28034),
+    pv_("pv", 96.084, -7900.2, -11.003, 7.1802e-06, 2.0),
+    hl_("hl", 568.70, 483056.263186, 0.38467, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         1968.20477803749,
        -1.63379467920267,
         0.00839448135795012,
@@ -67,6 +68,7 @@ Foam::C8H18::C8H18()
     ),
     h_
     (
+        "h",
        -2778787.734126,
         1968.20477803749,
        -0.816897339601334,
@@ -74,20 +76,29 @@ Foam::C8H18::C8H18()
         0.0,
         0.0
     ),
-    Cpg_(1186.54305748877, 3878.9820626625, 1635.6, 2673.52995246474, 746.4),
+    Cpg_
+    (
+        "Cpg",
+        1186.54305748877,
+        3878.9820626625,
+        1635.6,
+        2673.52995246474,
+        746.4
+    ),
     B_
     (
+        "B",
         0.00239777293379205,
        -2.81394717721109,
        -585042.589139551,
        -1.11265768486663e+18,
         1.40968738783693e+20
     ),
-    mu_(-20.463, 1497.4, 1.379, 0.0, 0.0),
-    mug_(3.1191e-08, 0.92925, 55.092, 0.0),
-    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),
+    mu_("mu", -20.463, 1497.4, 1.379, 0.0, 0.0),
+    mug_("mug", 3.1191e-08, 0.92925, 55.092, 0.0),
+    kappa_("kappa", 0.2156, -0.00029483, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -8758, 0.8448, -27121000000.0, 0.0),
+    sigma_("sigma", 568.70, 0.052789, 1.2323, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C8H18::C8H18()
 Foam::C8H18::C8H18
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
index 0ef3cf51b0..b61014ab34 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C8H18_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C8H18
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C8H18
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
index bb59751348..d846c4cf51 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
@@ -53,11 +53,12 @@ Foam::C9H20::C9H20()
         0.4435,
         1.56e+4
     ),
-    rho_(62.06019846, 0.26147, 594.6, 0.28281),
-    pv_(109.35, -90304.0, -12.882, 7.8544e-06, 2.0),
-    hl_(594.60, 470691.886665939, 0.38522, 0.0, 0.0, 0.0),
+    rho_("rho", 62.06019846, 0.26147, 594.6, 0.28281),
+    pv_("pv", 109.35, -90304.0, -12.882, 7.8544e-06, 2.0),
+    hl_("hl", 594.60, 470691.886665939, 0.38522, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         2986.79224687739,
        -8.88677509395125,
         0.0211300659607978,
@@ -67,6 +68,7 @@ Foam::C9H20::C9H20()
     ),
     h_
     (
+        "h",
        -2825628.50868792,
         2986.79224687739,
        -4.44338754697563,
@@ -74,20 +76,29 @@ Foam::C9H20::C9H20()
         0.0,
         0.0
     ),
-    Cpg_(1183.16206396482, 3832.11963386299, 1644.8, 2705.48425829188, 749.6),
+    Cpg_
+    (
+        "Cpg",
+        1183.16206396482,
+        3832.11963386299,
+        1644.8,
+        2705.48425829188,
+        749.6
+    ),
     B_
     (
+        "B",
         0.00304542406711472,
        -3.65357326638494,
        -520825.211682702,
        -6.15400208953827e+18,
         1.41901479829718e+21
     ),
-    mu_(-21.149, 1658, 1.454, 0.0, 0.0),
-    mug_(1.0344e-07, 0.77301, 220.47, 0.0),
-    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),
+    mu_("mu", -21.149, 1658, 1.454, 0.0, 0.0),
+    mug_("mug", 1.0344e-07, 0.77301, 220.47, 0.0),
+    kappa_("kappa", 0.209, -0.000264, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -0.065771, 0.27198, -3482.3, -1580300.0),
+    sigma_("sigma", 594.60, 0.054975, 1.2897, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 128.258, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::C9H20::C9H20()
 Foam::C9H20::C9H20
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
index de32c9cbd5..76b083f64a 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
@@ -36,16 +36,16 @@ SourceFiles
 #define C9H20_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class C9H20
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         C9H20
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
index b8b141c34d..7299a0fcff 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
@@ -53,11 +53,12 @@ Foam::CH3OH::CH3OH()
         0.5656,
         2.9523e+4
     ),
-    rho_(73.952936, 0.27192, 512.58, 0.2331),
-    pv_(109.93, -7471.3, -13.988, 0.015281, 1.0),
-    hl_(512.58, 1644716.30984333, 0.3766, 0.0, 0.0, 0.0),
+    rho_("rho", 73.952936, 0.27192, 512.58, 0.2331),
+    pv_("pv", 109.93, -7471.3, -13.988, 0.015281, 1.0),
+    hl_("hl", 512.58, 1644716.30984333, 0.3766, 0.0, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         3358.09250358904,
        -11.8781599151114,
         0.0305536483365583,
@@ -67,6 +68,7 @@ Foam::CH3OH::CH3OH()
     ),
     h_
     (
+        "h",
        -8190474.32066862,
         3358.09250358904,
        -5.93907995755571,
@@ -74,20 +76,29 @@ Foam::CH3OH::CH3OH()
         0.0,
         0.0
     ),
-    Cpg_(1226.9521253355, 2772.92303851195, 1963, 1733.66206853505, 909.6),
+    Cpg_
+    (
+        "Cpg",
+        1226.9521253355,
+        2772.92303851195,
+        1963,
+        1733.66206853505,
+        909.6
+    ),
     B_
     (
+        "B",
        -0.0199737844079645,
         19.3496036452157,
        -3342487.98452032,
         2.40808938268523e+19,
        -6.85787404032208e+21
     ),
-    mu_(-7.288, 1065.3, -0.6657, 0.0, 0.0),
-    mug_(3.0663e-07, 0.69655, 205.0, 0.0),
-    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),
+    mu_("mu", -7.288, 1065.3, -0.6657, 0.0, 0.0),
+    mug_("mug", 3.0663e-07, 0.69655, 205.0, 0.0),
+    kappa_("kappa", 0.2837, -0.000281, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -7.763, 1.0279, -74360000.0, 6770000000.0),
+    sigma_("sigma", 512.58, 0.056, -0.00014583, 1.08e-07, 0.0, 0.0),
     D_("D", 147.18, 20.1, 32.042, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::CH3OH::CH3OH()
 Foam::CH3OH::CH3OH
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
index b11fa97003..341f8c5972 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
@@ -36,16 +36,16 @@ SourceFiles
 #define CH3OH_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class CH3OH
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         CH3OH
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
index 6a39f12d1f..f04aa0c1c0 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
@@ -53,25 +53,42 @@ Foam::CH4N2O::CH4N2O()
         0.3449,
         4.7813e+4
     ),
-    rho_(1230.006936, 0.0, 0.0, 0.0, 0.0, 0.0),
-    pv_(3015.15611544, -185497.059684, -430.223621983, 0.00017405122622, 2.0),
-    hl_(705.0, 2534249.0, 0.5, 0.0, 0.0, 0.0),
-    Cp_(2006.46063673904, 0.0, 0.0, 0.0, 0.0, 0.0),
-    h_(-6154107.41641135, 2006.46063673904, 0.0, 0.0, 0.0, 0.0),
-    Cpg_(811.875582789397, 2099.04089516451, 1627.3, 1603.63660583455, 724.41),
+    rho_("rho", 1230.006936, 0.0, 0.0, 0.0, 0.0, 0.0),
+    pv_
+    (
+        "pv",
+        3015.15611544,
+        -185497.059684,
+        -430.223621983,
+        0.00017405122622,
+        2.0
+    ),
+    hl_("hl", 705.0, 2534249.0, 0.5, 0.0, 0.0, 0.0),
+    Cp_("Cp", 2006.46063673904, 0.0, 0.0, 0.0, 0.0, 0.0),
+    h_("h", -6154107.41641135, 2006.46063673904, 0.0, 0.0, 0.0, 0.0),
+    Cpg_
+    (
+        "Cpg",
+        811.875582789397,
+        2099.04089516451,
+        1627.3,
+        1603.63660583455,
+        724.41
+    ),
     B_
     (
+        "B",
        -0.000383641934194752,
         0.447249234048222,
        -469062.208605302,
         5.5628080458239e+18,
        -2.3040162514986e+21
     ),
-    mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10.0),
-    mug_(2.6986e-06, 0.498, 1257.7, -19570.0),
-    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
+    mu_("mu", -51.964, 3670.6, 5.7331, -5.3495e-29, 10.0),
+    mug_("mug", 2.6986e-06, 0.498, 1257.7, -19570.0),
+    kappa_("kappa", -0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0.0, 0.0),
+    kappag_("kappag", 6.977e-05, 1.1243, 844.9, -148850.0),
+    sigma_("sigma", 705.0, 1.0, 0.0, 0.0, 0.0, 0.0), // note: set to constant
     D_("D", 147.18, 20.1, 60.056, 28.0) // note: Same as nHeptane
 {}
 
@@ -79,18 +96,18 @@ Foam::CH4N2O::CH4N2O()
 Foam::CH4N2O::CH4N2O
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS0& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS0& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
index 03d1781856..ceb82fd7ad 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
@@ -37,16 +37,16 @@ SourceFiles
 #define CH4N2O_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,18 +63,18 @@ class CH4N2O
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS0 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS0 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 public:
@@ -94,18 +94,18 @@ public:
         CH4N2O
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS0& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS0& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
index 446a74cf1a..5b6e206e16 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
@@ -53,11 +53,12 @@ Foam::H2O::H2O()
         0.3449,
         4.7813e+4
     ),
-    rho_(98.343885, 0.30542, 647.13, 0.081),
-    pv_(73.649, -7258.2, -7.3037, 4.1653e-06, 2),
-    hl_(647.13, 2889425.47876769, 0.3199, -0.212, 0.25795, 0),
+    rho_("rho", 98.343885, 0.30542, 647.13, 0.081),
+    pv_("pv", 73.649, -7258.2, -7.3037, 4.1653e-06, 2),
+    hl_("hl", 647.13, 2889425.47876769, 0.3199, -0.212, 0.25795, 0),
     Cp_
     (
+        "Cp",
         15341.1046350264,
        -116.019983347211,
         0.451013044684985,
@@ -67,6 +68,7 @@ Foam::H2O::H2O()
     ),
     h_
     (
+        "h",
        -17957283.7993676,
         15341.1046350264,
        -58.0099916736053,
@@ -76,6 +78,7 @@ Foam::H2O::H2O()
     ),
     Cpg_
     (
+        "Cpg",
         1851.73466555648,
         1487.53816264224,
         2609.3,
@@ -84,17 +87,18 @@ Foam::H2O::H2O()
     ),
     B_
     (
+        "B",
        -0.0012789342214821,
         1.4909797391063,
        -1563696.91923397,
         1.85445462114904e+19,
        -7.68082153760755e+21
     ),
-    mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10),
-    mug_(2.6986e-06, 0.498, 1257.7, -19570),
-    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),
+    mu_("mu", -51.964, 3670.6, 5.7331, -5.3495e-29, 10),
+    mug_("mug", 2.6986e-06, 0.498, 1257.7, -19570),
+    kappa_("kappa", -0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
+    kappag_("kappag", 6.977e-05, 1.1243, 844.9, -148850),
+    sigma_("sigma", 647.13, 0.18548, 2.717, -3.554, 2.047, 0),
     D_("D", 15.0, 15.0, 18.015, 28)
 {}
 
@@ -102,18 +106,18 @@ Foam::H2O::H2O()
 Foam::H2O::H2O
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
index 5ed4b7ba17..435be64b26 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
@@ -36,15 +36,15 @@ SourceFiles
 #define H2O_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,18 +61,18 @@ class H2O
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -93,18 +93,18 @@ public:
         H2O
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C
index 35483d9186..082859ad5f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C
@@ -53,11 +53,12 @@ Foam::IC8H18::IC8H18()
         0.3031,
         1.4051e+4
     ),
-    rho_(67.2363666, 0.27373, 543.96, 0.2846),
-    pv_(120.81, -7550, -16.111, 0.017099, 1.0),
-    hl_(543.96, 375379.713037617, 0.1549, 0.138, 0.0666, 0.0),
+    rho_("rho", 67.2363666, 0.27373, 543.96, 0.2846),
+    pv_("pv", 120.81, -7550, -16.111, 0.017099, 1.0),
+    hl_("hl", 543.96, 375379.713037617, 0.1549, 0.138, 0.0666, 0.0),
     Cp_
     (
+        "Cp",
         1219.89652546156,
         1.67205049417409,
         0.00414073237562483,
@@ -67,6 +68,7 @@ Foam::IC8H18::IC8H18()
     ),
     h_
     (
+        "h",
        -2743275.10767575,
         1219.89652546156,
         0.836025247087043,
@@ -74,20 +76,29 @@ Foam::IC8H18::IC8H18()
         0.0,
         0.0
     ),
-    Cpg_(997.10236275617, 4627.4653990598, 1594, 2933.52942721328, 677.94),
+    Cpg_
+    (
+        "Cpg",
+        997.10236275617,
+        4627.4653990598,
+        1594,
+        2933.52942721328,
+        677.94
+    ),
     B_
     (
+        "B",
         0.00234936225718063,
        -2.83381919093766,
        -413154.047500241,
        -3.49703670632315e+17,
         3.13750207912038e+19
     ),
-    mu_(-15.811, 1282.5, 0.67791, -3.8617e-28, 10.0),
-    mug_(1.107e-07, 0.746, 72.4, 0.0),
-    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),
+    mu_("mu", -15.811, 1282.5, 0.67791, -3.8617e-28, 10.0),
+    mug_("mug", 1.107e-07, 0.746, 72.4, 0.0),
+    kappa_("kappa", 0.1508, -0.0001712, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 1.758e-05, 1.3114, 392.9, 0.0),
+    sigma_("sigma", 543.96, 0.047434, 1.1975, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::IC8H18::IC8H18()
 Foam::IC8H18::IC8H18
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
index 8b835108f5..1c6458864a 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
@@ -36,16 +36,16 @@ SourceFiles
 #define IC8H18_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class IC8H18
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         IC8H18
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C
index c7d6cdb39c..d73458193b 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C
@@ -53,9 +53,10 @@ Foam::IDEA::IDEA()
         0.3478,
         1.57e+4
     ),
-    rho_(152.012105, 3.87150382e-1, 618.073893, 4.00790044e-1),
+    rho_("rho", 152.012105, 3.87150382e-1, 618.073893, 4.00790044e-1),
     pv_
     (
+        "pv",
         8.4817774623e+01,
        -8.6782398353e+03,
        -9.1277694857,
@@ -64,6 +65,7 @@ Foam::IDEA::IDEA()
     ),
     hl_
     (
+        "hl",
         618.074,
         2.1671983789e+05,
        -4.2413153435e+00,
@@ -71,10 +73,11 @@ Foam::IDEA::IDEA()
        -1.1656446689e+01,
         4.3667661492
     ),
-    Cp_(1.6604957e+3, -6.250871e-1, 6.1778552e-3, 0.0, 0.0, 0.0),
-    h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
+    Cp_("Cp", 1.6604957e+3, -6.250871e-1, 6.1778552e-3, 0.0, 0.0, 0.0),
+    h_("h", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
     Cpg_
     (
+        "Cpg",
         1.0457515243e+03,
         3.4410492875e+03,
         1.5976862298e+03,
@@ -83,17 +86,19 @@ Foam::IDEA::IDEA()
     ),
     B_
     (
+        "B",
         0.00337351091119935,
        -4.13606494008504,
        -534560.916470464,
        -1.13364022911762e+19,
         2.80704220402713e+21
     ),
-    mu_(-6.9645853822e+01, 4.4390635942e+03, 8.4680722718e+00, 0.0, 0.0),
-    mug_(4.2629382158e-08, 8.8144402122e-01, 9.6918097636e+01, 0.0),
-    kappa_(2.03684e-01, -2.3168e-04, 0.0, 0.0, 0.0, 0.0),
+    mu_("mu", -6.9645853822e+01, 4.4390635942e+03, 8.4680722718e+00, 0.0, 0.0),
+    mug_("mug", 4.2629382158e-08, 8.8144402122e-01, 9.6918097636e+01, 0.0),
+    kappa_("kappa", 2.03684e-01, -2.3168e-04, 0.0, 0.0, 0.0, 0.0),
     kappag_
     (
+        "kappag",
        -5.664925956707e+02,
         8.896721676320e-01,
        -2.849783998688e+09,
@@ -101,6 +106,7 @@ Foam::IDEA::IDEA()
     ),
     sigma_
     (
+        "sigma",
         618.074,
         8.3846525429e-03,
        -1.0044759047e+01,
@@ -115,18 +121,18 @@ Foam::IDEA::IDEA()
 Foam::IDEA::IDEA
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
index 34fd147210..0fd9333847 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
@@ -59,15 +59,15 @@ SourceFiles
 #define IDEA_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -84,18 +84,18 @@ class IDEA
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -116,18 +116,18 @@ public:
         IDEA
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C
index 3147ca35f3..c30e16af3d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C
@@ -53,25 +53,43 @@ Foam::MB::MB()
         0.3807,
         1.7713e+4
     ),
-    rho_(76.6099633, 0.257, 554.5, 0.2772),
-    pv_(107.51, -8112.9, -12.77, 9.2919e-06, 2.0),
-    hl_(554.5, 508307.794738233, 0.392, 0.0, 0.0, 0.0),
-    Cp_(1135.77394182096, 2.89818178257762, 0.0, 0.0, 0.0, 0.0),
-    h_(-5255966.14542938, 1135.77394182096, 1.44909089128881, 0.0, 0.0, 0.0),
-    Cpg_(875.329227575808, 2849.22600922327, 1570.0, 2029.70636327142, 678.3),
+    rho_("rho", 76.6099633, 0.257, 554.5, 0.2772),
+    pv_("pv", 107.51, -8112.9, -12.77, 9.2919e-06, 2.0),
+    hl_("hl", 554.5, 508307.794738233, 0.392, 0.0, 0.0, 0.0),
+    Cp_("Cp", 1135.77394182096, 2.89818178257762, 0.0, 0.0, 0.0, 0.0),
+    h_
+    (
+        "h",
+        -5255966.14542938,
+        1135.77394182096,
+        1.44909089128881,
+        0.0,
+        0.0,
+        0.0
+    ),
+    Cpg_
+    (
+        "Cpg",
+        875.329227575808,
+        2849.22600922327,
+        1570.0,
+        2029.70636327142,
+        678.3
+    ),
     B_
     (
+        "B",
         0.00220496803188,
        -2.42184210783978,
        -401045.695318849,
        -2.85079259397061e+17,
        -3.57377145486767e+19
     ),
-    mu_(-12.206, 1141.7, 0.15014, 0.0, 0.0),
-    mug_(3.733e-07, 0.6177, 256.5, 0.0),
-    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),
+    mu_("mu", -12.206, 1141.7, 0.15014, 0.0, 0.0),
+    mug_("mug", 3.733e-07, 0.6177, 256.5, 0.0),
+    kappa_("kappa", 0.2298, -0.0003002, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 1333.1, 0.9962, 12317000000.0, 0.0),
+    sigma_("sigma", 554.5, 0.064084, 1.2418, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 102.133, 28.0) // note: Same as nHeptane
 {}
 
@@ -79,18 +97,18 @@ Foam::MB::MB()
 Foam::MB::MB
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
index d86a89e7f8..5d57e7fb5a 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
@@ -36,16 +36,16 @@ SourceFiles
 #define MB_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class MB
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         MB
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C
index b1389adb79..1521f802f7 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C
@@ -53,11 +53,12 @@ Foam::N2::N2()
         0.0403,
         9.0819e+3
     ),
-    rho_(88.8716136, 0.28479, 126.1, 0.2925),
-    pv_(59.826, -1097.6, -8.6689, 0.046346, 1.0),
-    hl_(126.10, 336617.405582923, 1.201, -1.4811, 0.7085, 0.0),
+    rho_("rho", 88.8716136, 0.28479, 126.1, 0.2925),
+    pv_("pv", 59.826, -1097.6, -8.6689, 0.046346, 1.0),
+    hl_("hl", 126.10, 336617.405582923, 1.201, -1.4811, 0.7085, 0.0),
     Cp_
     (
+        "Cp",
        -1192.26101235097,
         125.187406296852,
        -1.66702363104162,
@@ -67,6 +68,7 @@ Foam::N2::N2()
     ),
     h_
     (
+        "h",
        -5480656.55276541,
        -1192.26101235097,
         62.5937031484258,
@@ -74,20 +76,29 @@ Foam::N2::N2()
         0.00189815806382523,
         0.0
     ),
-    Cpg_(1038.94481330763, 307.52123938031, 1701.6, 3.69351038766331, 909.79),
+    Cpg_
+    (
+        "Cpg",
+        1038.94481330763,
+        307.52123938031,
+        1701.6,
+        3.69351038766331,
+        909.79
+    ),
     B_
     (
+        "B",
         0.00166702363104162,
        -0.533661740558292,
        -2182.12322410223,
         2873563218390.8,
        -165274505604341.0
     ),
-    mu_(-32.165, 496.9, 3.9069, -1.08e-21, 10.0),
-    mug_(7.632e-07, 0.58823, 67.75, 0.0),
-    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),
+    mu_("mu", -32.165, 496.9, 3.9069, -1.08e-21, 10.0),
+    mug_("mug", 7.632e-07, 0.58823, 67.75, 0.0),
+    kappa_("kappa", 0.7259, -0.016728, 0.00016215, -5.7605e-07, 0.0, 0.0),
+    kappag_("kappag", 0.000351, 0.7652, 25.767, 0.0),
+    sigma_("sigma", 126.10, 0.02898, 1.2457, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 28.014, 28.0) // note: Same as nHeptane
 {}
 
@@ -95,18 +106,18 @@ Foam::N2::N2()
 Foam::N2::N2
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
index 770082c171..dc8bafcd06 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
@@ -36,16 +36,16 @@ SourceFiles
 #define N2_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class N2
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         N2
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C
index 202b00dc54..8fe5321051 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C
@@ -53,12 +53,13 @@ Foam::aC10H7CH3::aC10H7CH3()
         0.3478,
         2.0176e+4
     ),
-    rho_(60.92559, 0.22408, 772.04, 0.25709),
-    pv_(73.716, -9103.2, -7.2253, 2.062e-06, 2),
-    hl_(772.04, 511744.022503516, 0.4164, 0, 0, 0),
-    Cp_(965.893108298172, 1.16216596343179, 0.00298523206751055, 0, 0, 0),
+    rho_("rho", 60.92559, 0.22408, 772.04, 0.25709),
+    pv_("pv", 73.716, -9103.2, -7.2253, 2.062e-06, 2),
+    hl_("hl", 772.04, 511744.022503516, 0.4164, 0, 0, 0),
+    Cp_("Cp", 965.893108298172, 1.16216596343179, 0.00298523206751055, 0, 0, 0),
     h_
     (
+        "h",
         38161.6838138517,
         965.893108298172,
         0.581082981715893,
@@ -66,20 +67,29 @@ Foam::aC10H7CH3::aC10H7CH3()
         0,
         0
     ),
-    Cpg_(743.389592123769, 2703.5864978903, 1548.5, 2031.64556962025, 722.06),
+    Cpg_
+    (
+        "Cpg",
+        743.389592123769,
+        2703.5864978903,
+        1548.5,
+        2031.64556962025,
+        722.06
+    ),
     B_
     (
+        "B",
         0.00205555555555556,
        -3.34423347398031,
        -931153.305203938,
         1.87601969057665e+18,
        -2.06448663853727e+21
     ),
-    mu_(-93.6, 5784, 12, 0, 0),
-    mug_(2.5672e-06, 0.3566, 825.54, 0),
-    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),
+    mu_("mu", -93.6, 5784, 12, 0, 0),
+    mug_("mug", 2.5672e-06, 0.3566, 825.54, 0),
+    kappa_("kappa", 0.19758, -0.0001796, 0, 0, 0, 0),
+    kappag_("kappag", 0.3911, -0.1051, -213.52, 2318300),
+    sigma_("sigma", 772.04, 0.076, 1.33, 0, 0, 0),
     D_("D", 147.18, 20.1, 142.2, 28) // note: Same as nHeptane
 {}
 
@@ -87,18 +97,18 @@ Foam::aC10H7CH3::aC10H7CH3()
 Foam::aC10H7CH3::aC10H7CH3
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
index e0241ecae5..5b4dd2642c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
@@ -36,16 +36,16 @@ SourceFiles
 #define aC10H7CH3_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class aC10H7CH3
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         aC10H7CH3
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C
index abd42f8b01..b7ee58f8ed 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C
@@ -53,12 +53,22 @@ Foam::bC10H7CH3::bC10H7CH3()
         0.3459,
         1.987e+4
     ),
-    rho_(67.36014, 0.23843, 761, 0.2559),
-    pv_(134.31, -12103, -16.195, 6.9659e-06, 2),
-    hl_(761.0, 513150.492264416, 0.4044, 0.0, 0.0, 0.0),
-    Cp_(811.322081575246, 2.30225035161744, 0.0008628691983122, 0.0, 0.0, 0.0),
+    rho_("rho", 67.36014, 0.23843, 761, 0.2559),
+    pv_("pv", 134.31, -12103, -16.195, 6.9659e-06, 2),
+    hl_("hl", 761.0, 513150.492264416, 0.4044, 0.0, 0.0, 0.0),
+    Cp_
+    (
+        "Cp",
+        811.322081575246,
+        2.30225035161744,
+        0.0008628691983122,
+        0.0,
+        0.0,
+        0.0
+    ),
     h_
     (
+        "h",
         45001.2311880177,
         811.322081575246,
         1.15112517580872,
@@ -66,20 +76,29 @@ Foam::bC10H7CH3::bC10H7CH3()
         0.0,
         0.0
     ),
-    Cpg_(760.126582278481, 2699.08579465542, 1564.1, 1994.51476793249, 727.49),
+    Cpg_
+    (
+        "Cpg",
+        760.126582278481,
+        2699.08579465542,
+        1564.1,
+        1994.51476793249,
+        727.49
+    ),
     B_
     (
+        "B",
         0.00229430379746835,
        -3.53720112517581,
        -1067158.93108298,
         2.29746835443038e+18,
        -2.68438818565401e+21
     ),
-    mu_(-63.276, 4219, 7.5549, 0.0, 0.0),
-    mug_(2.1791e-06, 0.3717, 712.53, 0.0),
-    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),
+    mu_("mu", -63.276, 4219, 7.5549, 0.0, 0.0),
+    mug_("mug", 2.1791e-06, 0.3717, 712.53, 0.0),
+    kappa_("kappa", 0.1962, -0.00018414, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", 0.4477, -0.1282, -345.89, 2340100),
+    sigma_("sigma", 761.0, 0.066442, 1.2634, 0.0, 0.0, 0.0),
     D_("D", 147.18, 20.1, 142.2, 28) // note: Same as nHeptane
 {}
 
@@ -87,18 +106,18 @@ Foam::bC10H7CH3::bC10H7CH3()
 Foam::bC10H7CH3::bC10H7CH3
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS6& surfaceTension,
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS6& surfaceTension,
     const Function2s::APIdiffCoef& vapourDiffusivity
 )
 :
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
index 3affa8b40f..c24366e280 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
@@ -36,16 +36,16 @@ SourceFiles
 #define bC10H7CH3_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
-#include "APIdiffCoefThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
+#include "APIdiffCoef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,18 +62,18 @@ class bC10H7CH3
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS6 sigma_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS6 sigma_;
         Function2s::APIdiffCoef D_;
 
 
@@ -94,18 +94,18 @@ public:
         bC10H7CH3
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS6& surfaceTension,
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS6& surfaceTension,
             const Function2s::APIdiffCoef& vapourDiffusivity
         );
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.C
index 3e9a4f315a..afcfb9de2a 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.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
@@ -53,11 +53,12 @@ Foam::iC3H8O::iC3H8O()
         0.6689,
         2.3575e+4
     ),
-    rho_(70.91328, 0.26475, 508.31, 0.243),
-    pv_(92.935, -8177.1, -10.031, 3.9988e-06, 2.0),
-    hl_(508.31, 948149.627263046, 0.087, 0.3007, 0.0, 0.0),
+    rho_("rho", 70.91328, 0.26475, 508.31, 0.243),
+    pv_("pv", 92.935, -8177.1, -10.031, 3.9988e-06, 2.0),
+    hl_("hl", 508.31, 948149.627263046, 0.087, 0.3007, 0.0, 0.0),
     Cp_
     (
+        "Cp",
         7760.91586794462,
        -68.3672790202343,
         0.241380457933972,
@@ -67,6 +68,7 @@ Foam::iC3H8O::iC3H8O()
     ),
     h_
     (
+        "h",
        -6227786.27583977,
         7760.91586794462,
        -34.1836395101172,
@@ -74,40 +76,49 @@ Foam::iC3H8O::iC3H8O()
        -5.87643104366347e-05,
         0.0
     ),
-    Cpg_(789.73642172524, 3219.8482428115, 1124, 1560.83599574015, 460.0),
+    Cpg_
+    (
+        "Cpg",
+        789.73642172524,
+        3219.8482428115,
+        1124,
+        1560.83599574015,
+        460.0
+    ),
     B_
     (
+        "B",
         0.000502529286474973,
        -0.104665867944622,
        -717185.83599574,
         3.3047124600639e+18,
        -1.43270766773163e+21
     ),
-    mu_(-8.23, 2282.2, -0.98495, 0.0, 0.0),
-    mug_(1.993e-07, 0.7233, 178.0, 0.0),
-    kappa_(0.2029, -0.0002278, 0.0, 0.0, 0.0, 0.0),
-    kappag_(-80.642, -1.4549, -604.42, 0.0),
-    sigma_(0.03818, -3.818e-05, -6.51e-08, 0.0, 0.0, 0.0),
-    D_(4.75e-10, 1.75, 0.0, 0.0, 0.0)
+    mu_("mu", -8.23, 2282.2, -0.98495, 0.0, 0.0),
+    mug_("mug", 1.993e-07, 0.7233, 178.0, 0.0),
+    kappa_("kappa", 0.2029, -0.0002278, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -80.642, -1.4549, -604.42, 0.0),
+    sigma_("sigma", 0.03818, -3.818e-05, -6.51e-08, 0.0, 0.0, 0.0),
+    D_("D", 4.75e-10, 1.75, 0.0, 0.0, 0.0)
 {}
 
 
 Foam::iC3H8O::iC3H8O
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS0& surfaceTension,
-    const thermophysicalFunctions::NSRDS1& vapourDiffusivity
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS0& surfaceTension,
+    const Function1s::NSRDS1& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H
index 8a3afc488b..21df60bb35 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.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
@@ -36,15 +36,15 @@ SourceFiles
 #define iC3H8O_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,19 +61,19 @@ class iC3H8O
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS0 sigma_;
-        thermophysicalFunctions::NSRDS1 D_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS0 sigma_;
+        Function1s::NSRDS1 D_;
 
 public:
 
@@ -92,19 +92,19 @@ public:
         iC3H8O
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS0& surfaceTension,
-            const thermophysicalFunctions::NSRDS1& vapourDiffusivity
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS0& surfaceTension,
+            const Function1s::NSRDS1& vapourDiffusivity
         );
 
         //- Construct from dictionary
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
index 253f663423..7868015cdf 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.C
@@ -39,19 +39,19 @@ namespace Foam
 Foam::liquid::liquid(const dictionary& dict)
 :
     liquidProperties(dict),
-    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))
+    rho_(Function1<scalar>::New("rho", dict)),
+    pv_(Function1<scalar>::New("pv", dict)),
+    hl_(Function1<scalar>::New("hl", dict)),
+    Cp_(Function1<scalar>::New("Cp", dict)),
+    h_(Function1<scalar>::New("h", dict)),
+    Cpg_(Function1<scalar>::New("Cpg", dict)),
+    B_(Function1<scalar>::New("B", dict)),
+    mu_(Function1<scalar>::New("mu", dict)),
+    mug_(Function1<scalar>::New("mug", dict)),
+    kappa_(Function1<scalar>::New("kappa", dict)),
+    kappag_(Function1<scalar>::New("kappag", dict)),
+    sigma_(Function1<scalar>::New("sigma", dict)),
+    D_(Function1<scalar>::New("D", dict))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.H
index 01b46a1d15..8353f1c54f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquid/liquid.H
@@ -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
@@ -37,7 +37,7 @@ SourceFiles
 #define liquid_H
 
 #include "liquidProperties.H"
-#include "thermophysicalFunction.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,19 +54,19 @@ class liquid
 {
     // Private Data
 
-        autoPtr<thermophysicalFunction> rho_;
-        autoPtr<thermophysicalFunction> pv_;
-        autoPtr<thermophysicalFunction> hl_;
-        autoPtr<thermophysicalFunction> Cp_;
-        autoPtr<thermophysicalFunction> h_;
-        autoPtr<thermophysicalFunction> Cpg_;
-        autoPtr<thermophysicalFunction> B_;
-        autoPtr<thermophysicalFunction> mu_;
-        autoPtr<thermophysicalFunction> mug_;
-        autoPtr<thermophysicalFunction> kappa_;
-        autoPtr<thermophysicalFunction> kappag_;
-        autoPtr<thermophysicalFunction> sigma_;
-        autoPtr<thermophysicalFunction> D_;
+        autoPtr<Function1<scalar>> rho_;
+        autoPtr<Function1<scalar>> pv_;
+        autoPtr<Function1<scalar>> hl_;
+        autoPtr<Function1<scalar>> Cp_;
+        autoPtr<Function1<scalar>> h_;
+        autoPtr<Function1<scalar>> Cpg_;
+        autoPtr<Function1<scalar>> B_;
+        autoPtr<Function1<scalar>> mu_;
+        autoPtr<Function1<scalar>> mug_;
+        autoPtr<Function1<scalar>> kappa_;
+        autoPtr<Function1<scalar>> kappag_;
+        autoPtr<Function1<scalar>> sigma_;
+        autoPtr<Function1<scalar>> D_;
 
 
 public:
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
index 61a3331b6d..ea0ab34a62 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.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
@@ -119,7 +119,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
         InfoInFunction << "Constructing liquidProperties" << endl;
     }
 
-    // If the type is not specified use the entry name as the liquid type name
+    // If the type is not specified use the name as the liquid type name
     const word& liquidPropertiesTypeName =
         dict.found("type") ? dict.lookup("type") : dict.dictName();
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
index 6b9e0fa375..51b16357f7 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "thermophysicalFunction.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 inline Foam::scalar Foam::liquidProperties::limit(const scalar T) const
@@ -139,7 +137,7 @@ inline void Foam::liquidProperties::readIfPresent
 {
     if (dict.found(name))
     {
-        f = Func(dict.subDict(name));
+        f = Func(name, dict.subDict(name));
     }
 }
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.C
index efb22b4855..bde3dddc23 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.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
@@ -53,11 +53,12 @@ Foam::nC3H8O::nC3H8O()
         0.6279,
         2.4557e+4
     ),
-    rho_(75.300288, 0.272, 536.71, 0.2494),
-    pv_(77.46, -7960, -7.5235, 3e-07, 2.0),
-    hl_(536.71, 1098242.8115016, 0.647, -0.783, 0.613, 0.0),
+    rho_("rho", 75.300288, 0.272, 536.71, 0.2494),
+    pv_("pv", 77.46, -7960, -7.5235, 3e-07, 2.0),
+    hl_("hl", 536.71, 1098242.8115016, 0.647, -0.783, 0.613, 0.0),
     Cp_
     (
+        "Cp",
         216.320553780618,
         18.5203674121406,
        -0.0751797124600639,
@@ -67,6 +68,7 @@ Foam::nC3H8O::nC3H8O()
     ),
     h_
     (
+        "h",
        -5533091.96851587,
         216.320553780618,
         9.26018370607029,
@@ -74,40 +76,49 @@ Foam::nC3H8O::nC3H8O()
         3.16160809371672e-05,
         0.0
     ),
-    Cpg_(961.794462193823, 3467.78487752929, 1542, 2046.72523961661, 649),
+    Cpg_
+    (
+        "Cpg",
+        961.794462193823,
+        3467.78487752929,
+        1542,
+        2046.72523961661,
+        649
+    ),
     B_
     (
+        "B",
         0.000933506389776358,
        -1.09325079872204,
        -531649.361022364,
        -2.32627795527157e+17,
        -3.81888977635783e+20
     ),
-    mu_(0.571, 1521, -2.0894, 0.0, 0.0),
-    mug_(7.942e-07, 0.5491, 415.8, 0.0),
-    kappa_(0.204, -0.000169, 0.0, 0.0, 0.0, 0.0),
-    kappag_(-613.84, 0.7927, -1157400000.0, 0.0),
-    sigma_(0.04533, -6.88e-05, -1.6e-08, 0.0, 0.0, 0.0),
-    D_(4.75e-10, 1.75, 0.0, 0.0, 0.0) // note: same as iC3H8O
+    mu_("mu", 0.571, 1521, -2.0894, 0.0, 0.0),
+    mug_("mug", 7.942e-07, 0.5491, 415.8, 0.0),
+    kappa_("kappa", 0.204, -0.000169, 0.0, 0.0, 0.0, 0.0),
+    kappag_("kappag", -613.84, 0.7927, -1157400000.0, 0.0),
+    sigma_("sigma", 0.04533, -6.88e-05, -1.6e-08, 0.0, 0.0, 0.0),
+    D_("D", 4.75e-10, 1.75, 0.0, 0.0, 0.0) // note: same as iC3H8O
 {}
 
 
 Foam::nC3H8O::nC3H8O
 (
     const liquidProperties& l,
-    const thermophysicalFunctions::NSRDS5& density,
-    const thermophysicalFunctions::NSRDS1& vapourPressure,
-    const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-    const thermophysicalFunctions::NSRDS0& heatCapacity,
-    const thermophysicalFunctions::NSRDS0& enthalpy,
-    const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-    const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-    const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-    const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-    const thermophysicalFunctions::NSRDS0& thermalConductivity,
-    const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-    const thermophysicalFunctions::NSRDS0& surfaceTension,
-    const thermophysicalFunctions::NSRDS1& vapourDiffusivity
+    const Function1s::NSRDS5& density,
+    const Function1s::NSRDS1& vapourPressure,
+    const Function1s::NSRDS6& heatOfVapourisation,
+    const Function1s::NSRDS0& heatCapacity,
+    const Function1s::NSRDS0& enthalpy,
+    const Function1s::NSRDS7& idealGasHeatCapacity,
+    const Function1s::NSRDS4& secondVirialCoeff,
+    const Function1s::NSRDS1& dynamicViscosity,
+    const Function1s::NSRDS2& vapourDynamicViscosity,
+    const Function1s::NSRDS0& thermalConductivity,
+    const Function1s::NSRDS2& vapourThermalConductivity,
+    const Function1s::NSRDS0& surfaceTension,
+    const Function1s::NSRDS1& vapourDiffusivity
 )
 :
     liquidProperties(l),
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H
index d2058a25d9..01ef01d7e2 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.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
@@ -36,15 +36,15 @@ SourceFiles
 #define nC3H8O_H
 
 #include "liquidProperties.H"
-#include "NSRDS0ThermophysicalFunction.H"
-#include "NSRDS1ThermophysicalFunction.H"
-#include "NSRDS2ThermophysicalFunction.H"
-#include "NSRDS3ThermophysicalFunction.H"
-#include "NSRDS4ThermophysicalFunction.H"
-#include "NSRDS5ThermophysicalFunction.H"
-#include "NSRDS6ThermophysicalFunction.H"
-#include "NSRDS7ThermophysicalFunction.H"
-#include "NSRDS14ThermophysicalFunction.H"
+#include "NSRDS0.H"
+#include "NSRDS1.H"
+#include "NSRDS2.H"
+#include "NSRDS3.H"
+#include "NSRDS4.H"
+#include "NSRDS5.H"
+#include "NSRDS6.H"
+#include "NSRDS7.H"
+#include "NSRDS14.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,19 +61,19 @@ class nC3H8O
 {
     // Private Data
 
-        thermophysicalFunctions::NSRDS5 rho_;
-        thermophysicalFunctions::NSRDS1 pv_;
-        thermophysicalFunctions::NSRDS6 hl_;
-        thermophysicalFunctions::NSRDS0 Cp_;
-        thermophysicalFunctions::NSRDS0 h_;
-        thermophysicalFunctions::NSRDS7 Cpg_;
-        thermophysicalFunctions::NSRDS4 B_;
-        thermophysicalFunctions::NSRDS1 mu_;
-        thermophysicalFunctions::NSRDS2 mug_;
-        thermophysicalFunctions::NSRDS0 kappa_;
-        thermophysicalFunctions::NSRDS2 kappag_;
-        thermophysicalFunctions::NSRDS0 sigma_;
-        thermophysicalFunctions::NSRDS1 D_;
+        Function1s::NSRDS5 rho_;
+        Function1s::NSRDS1 pv_;
+        Function1s::NSRDS6 hl_;
+        Function1s::NSRDS0 Cp_;
+        Function1s::NSRDS0 h_;
+        Function1s::NSRDS7 Cpg_;
+        Function1s::NSRDS4 B_;
+        Function1s::NSRDS1 mu_;
+        Function1s::NSRDS2 mug_;
+        Function1s::NSRDS0 kappa_;
+        Function1s::NSRDS2 kappag_;
+        Function1s::NSRDS0 sigma_;
+        Function1s::NSRDS1 D_;
 
 public:
 
@@ -92,19 +92,19 @@ public:
         nC3H8O
         (
             const liquidProperties& l,
-            const thermophysicalFunctions::NSRDS5& density,
-            const thermophysicalFunctions::NSRDS1& vapourPressure,
-            const thermophysicalFunctions::NSRDS6& heatOfVapourisation,
-            const thermophysicalFunctions::NSRDS0& heatCapacity,
-            const thermophysicalFunctions::NSRDS0& enthalpy,
-            const thermophysicalFunctions::NSRDS7& idealGasHeatCapacity,
-            const thermophysicalFunctions::NSRDS4& secondVirialCoeff,
-            const thermophysicalFunctions::NSRDS1& dynamicViscosity,
-            const thermophysicalFunctions::NSRDS2& vapourDynamicViscosity,
-            const thermophysicalFunctions::NSRDS0& thermalConductivity,
-            const thermophysicalFunctions::NSRDS2& vapourThermalConductivity,
-            const thermophysicalFunctions::NSRDS0& surfaceTension,
-            const thermophysicalFunctions::NSRDS1& vapourDiffusivity
+            const Function1s::NSRDS5& density,
+            const Function1s::NSRDS1& vapourPressure,
+            const Function1s::NSRDS6& heatOfVapourisation,
+            const Function1s::NSRDS0& heatCapacity,
+            const Function1s::NSRDS0& enthalpy,
+            const Function1s::NSRDS7& idealGasHeatCapacity,
+            const Function1s::NSRDS4& secondVirialCoeff,
+            const Function1s::NSRDS1& dynamicViscosity,
+            const Function1s::NSRDS2& vapourDynamicViscosity,
+            const Function1s::NSRDS0& thermalConductivity,
+            const Function1s::NSRDS2& vapourThermalConductivity,
+            const Function1s::NSRDS0& surfaceTension,
+            const Function1s::NSRDS1& vapourDiffusivity
         );
 
         //- Construct from dictionary