diff --git a/src/thermophysicalModels/specie/include/reactionTypes.H b/src/thermophysicalModels/specie/include/reactionTypes.H
index 531c9760bf1783a33d7a9f001906370ee9bb63b6..6ea8803c79d2071bdbe0af57095127df7ef3a93f 100644
--- a/src/thermophysicalModels/specie/include/reactionTypes.H
+++ b/src/thermophysicalModels/specie/include/reactionTypes.H
@@ -37,7 +37,7 @@ Description
 #include "Reaction.H"
 
 #include "icoPolynomial.H"
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 #include "polynomialTransport.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
index 2b85b224747d1657f80d868b583331307be3b6e4..502958b505b8459b9d3245656e3a7767038a84f3 100644
--- a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
+++ b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
@@ -41,7 +41,7 @@ Description
 #include "constTransport.H"
 
 #include "icoPolynomial.H"
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 #include "polynomialTransport.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,7 +58,7 @@ namespace Foam
         <
             specieThermo
             <
-                polynomialThermo
+                hPolynomialThermo
                 <
                     icoPolynomial<8>,
                     8
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
index 89cf9875d037aa6bc17c131113ee0edb14cd644f..6d982155c7d48f30f671585112e5d1ecc105430a 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
@@ -46,7 +46,7 @@ Description
 #include "perfectGas.H"
 
 #include "polynomialTransport.H"
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 #include "icoPolynomial.H"
 
 #include "addToRunTimeSelectionTable.H"
diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
similarity index 89%
rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C
rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index c764426bbece5b913f6c6386ddaa8884ded89270..294a96005a397a24e43c2e87d9643083aa90bb5a 100644
--- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -24,13 +24,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 #include "IOstreams.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo(Istream& is)
+Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo(Istream& is)
 :
     EquationOfState(is),
     Hf_(readScalar(is)),
@@ -47,7 +47,7 @@ template<class EquationOfState, int PolySize>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const polynomialThermo<EquationOfState, PolySize>& pt
+    const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
     os  << static_cast<const EquationOfState&>(pt) << tab
@@ -59,7 +59,7 @@ Foam::Ostream& Foam::operator<<
 
     os.check
     (
-        "operator<<(Ostream& os, const polynomialThermo<EquationOfState>& pt)"
+        "operator<<(Ostream& os, const hPolynomialThermo<EquationOfState>& pt)"
     );
 
     return os;
diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
similarity index 69%
rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H
rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
index 5f76a826d7735ea915038a937db2cbb27209d9ef..ec3c752f24bc7273dfd7b9460f7429fd6018b603 100644
--- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::polynomialThermo
+    Foam::hPolynomialThermo
 
 Description
     Thermodynamics package templated on the equation of state, using polynomial
@@ -32,13 +32,13 @@ Description
     Polynomials for h and s derived from cp
 
 SourceFiles
-    polynomialThermoI.H
-    polynomialThermo.C
+    hPolynomialThermoI.H
+    hPolynomialThermo.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef polynomialThermo_H
-#define polynomialThermo_H
+#ifndef hPolynomialThermo_H
+#define hPolynomialThermo_H
 
 #include "scalar.H"
 #include "Polynomial.H"
@@ -51,50 +51,50 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 template<class EquationOfState, int PolySize>
-class polynomialThermo;
+class hPolynomialThermo;
 
 template<class EquationOfState, int PolySize>
-inline polynomialThermo<EquationOfState, PolySize> operator+
+inline hPolynomialThermo<EquationOfState, PolySize> operator+
 (
-    const polynomialThermo<EquationOfState, PolySize>&,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&,
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 template<class EquationOfState, int PolySize>
-inline polynomialThermo<EquationOfState, PolySize> operator-
+inline hPolynomialThermo<EquationOfState, PolySize> operator-
 (
-    const polynomialThermo<EquationOfState, PolySize>&,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&,
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 template<class EquationOfState, int PolySize>
-inline polynomialThermo<EquationOfState, PolySize> operator*
+inline hPolynomialThermo<EquationOfState, PolySize> operator*
 (
     const scalar,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 template<class EquationOfState, int PolySize>
-inline polynomialThermo<EquationOfState, PolySize> operator==
+inline hPolynomialThermo<EquationOfState, PolySize> operator==
 (
-    const polynomialThermo<EquationOfState, PolySize>&,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&,
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 template<class EquationOfState, int PolySize>
 Ostream& operator<<
 (
     Ostream&,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 
 /*---------------------------------------------------------------------------*\
-                      Class polynomialThermo Declaration
+                      Class hPolynomialThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class EquationOfState, int PolySize>
-class polynomialThermo
+class hPolynomialThermo
 :
     public EquationOfState
 {
@@ -119,7 +119,7 @@ class polynomialThermo
     // Private member functions
 
         //- Construct from components
-        inline polynomialThermo
+        inline hPolynomialThermo
         (
             const EquationOfState& pt,
             const scalar Hf,
@@ -135,10 +135,10 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        polynomialThermo(Istream& is);
+        hPolynomialThermo(Istream& is);
 
         //- Construct as a named copy
-        inline polynomialThermo(const word&, const polynomialThermo&);
+        inline hPolynomialThermo(const word&, const hPolynomialThermo&);
 
 
     // Member Functions
@@ -161,34 +161,34 @@ public:
 
     // Member operators
 
-        inline void operator+=(const polynomialThermo&);
-        inline void operator-=(const polynomialThermo&);
+        inline void operator+=(const hPolynomialThermo&);
+        inline void operator-=(const hPolynomialThermo&);
 
 
     // Friend operators
 
-        friend polynomialThermo operator+ <EquationOfState, PolySize>
+        friend hPolynomialThermo operator+ <EquationOfState, PolySize>
         (
-            const polynomialThermo&,
-            const polynomialThermo&
+            const hPolynomialThermo&,
+            const hPolynomialThermo&
         );
 
-        friend polynomialThermo operator- <EquationOfState, PolySize>
+        friend hPolynomialThermo operator- <EquationOfState, PolySize>
         (
-            const polynomialThermo&,
-            const polynomialThermo&
+            const hPolynomialThermo&,
+            const hPolynomialThermo&
         );
 
-        friend polynomialThermo operator* <EquationOfState, PolySize>
+        friend hPolynomialThermo operator* <EquationOfState, PolySize>
         (
             const scalar,
-            const polynomialThermo&
+            const hPolynomialThermo&
         );
 
-        friend polynomialThermo operator== <EquationOfState, PolySize>
+        friend hPolynomialThermo operator== <EquationOfState, PolySize>
         (
-            const polynomialThermo&,
-            const polynomialThermo&
+            const hPolynomialThermo&,
+            const hPolynomialThermo&
         );
 
 
@@ -197,7 +197,7 @@ public:
         friend Ostream& operator<< <EquationOfState, PolySize>
         (
             Ostream&,
-            const polynomialThermo&
+            const hPolynomialThermo&
         );
 };
 
@@ -208,10 +208,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "polynomialThermoI.H"
+#include "hPolynomialThermoI.H"
 
 #ifdef NoRepository
-#   include "polynomialThermo.C"
+#   include "hPolynomialThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
similarity index 75%
rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H
rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
index 28e80c5d5fc6741abf56786622d59e858db4bfe6..1382c6f3ecea86c65370e60741630ad03d3eabab 100644
--- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
@@ -24,12 +24,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
+inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 (
     const EquationOfState& pt,
     const scalar Hf,
@@ -51,10 +51,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
+inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 (
     const word& name,
-    const polynomialThermo& pt
+    const hPolynomialThermo& pt
 )
 :
     EquationOfState(name, pt),
@@ -69,7 +69,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::cp
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::cp
 (
     const scalar T
 ) const
@@ -79,7 +79,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::cp
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::h
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::h
 (
     const scalar T
 ) const
@@ -89,7 +89,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::h
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hs
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::hs
 (
     const scalar T
 ) const
@@ -99,7 +99,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hs
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hc()
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::hc()
 const
 {
     return Hf_*this->W();
@@ -107,7 +107,7 @@ const
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::s
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
 (
     const scalar T
 ) const
@@ -119,9 +119,9 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::s
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator+=
+inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator+=
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt
+    const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
     scalar molr1 = this->nMoles();
@@ -140,9 +140,9 @@ inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator+=
 
 
 template<class EquationOfState, int PolySize>
-inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator-=
+inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator-=
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt
+    const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
     scalar molr1 = this->nMoles();
@@ -163,10 +163,10 @@ inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator-=
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+
+inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator+
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt1,
-    const polynomialThermo<EquationOfState, PolySize>& pt2
+    const hPolynomialThermo<EquationOfState, PolySize>& pt1,
+    const hPolynomialThermo<EquationOfState, PolySize>& pt2
 )
 {
     EquationOfState eofs
@@ -177,7 +177,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+
 
     scalar molr1 = pt1.nMoles()/eofs.nMoles();
     scalar molr2 = pt2.nMoles()/eofs.nMoles();
-    return polynomialThermo<EquationOfState, PolySize>
+    return hPolynomialThermo<EquationOfState, PolySize>
     (
         eofs,
         molr1*pt1.Hf_ + molr2*pt2.Hf_,
@@ -190,10 +190,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator-
+inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator-
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt1,
-    const polynomialThermo<EquationOfState, PolySize>& pt2
+    const hPolynomialThermo<EquationOfState, PolySize>& pt1,
+    const hPolynomialThermo<EquationOfState, PolySize>& pt2
 )
 {
     EquationOfState eofs
@@ -204,7 +204,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator-
 
     scalar molr1 = pt1.nMoles()/eofs.nMoles();
     scalar molr2 = pt2.nMoles()/eofs.nMoles();
-    return polynomialThermo<EquationOfState, PolySize>
+    return hPolynomialThermo<EquationOfState, PolySize>
     (
         eofs,
         molr1*pt1.Hf_ - molr2*pt2.Hf_,
@@ -217,13 +217,13 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator-
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator*
+inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator*
 (
     const scalar s,
-    const polynomialThermo<EquationOfState, PolySize>& pt
+    const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
-    return polynomialThermo<EquationOfState, PolySize>
+    return hPolynomialThermo<EquationOfState, PolySize>
     (
         s*static_cast<const EquationOfState&>(pt),
         pt.Hf_,
@@ -236,10 +236,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator*
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator==
+inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator==
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt1,
-    const polynomialThermo<EquationOfState, PolySize>& pt2
+    const hPolynomialThermo<EquationOfState, PolySize>& pt1,
+    const hPolynomialThermo<EquationOfState, PolySize>& pt2
 )
 {
     return pt2 - pt1;