diff --git a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
similarity index 89%
rename from src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C
rename to src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
index fc73f457e..8e66570e1 100644
--- a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "eddyDiffusivity.H"
+#include "EddyDiffusivity.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-void Foam::eddyDiffusivity<BasicTurbulenceModel>::correctNut()
+void Foam::EddyDiffusivity<BasicTurbulenceModel>::correctNut()
 {
     alphat_ = this->rho_*this->nut()/Prt_;
     alphat_.correctBoundaryConditions();
@@ -38,7 +38,7 @@ void Foam::eddyDiffusivity<BasicTurbulenceModel>::correctNut()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-Foam::eddyDiffusivity<BasicTurbulenceModel>::eddyDiffusivity
+Foam::EddyDiffusivity<BasicTurbulenceModel>::EddyDiffusivity
 (
     const word& type,
     const geometricOneField& alpha,
@@ -92,8 +92,8 @@ Foam::eddyDiffusivity<BasicTurbulenceModel>::eddyDiffusivity
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::eddyDiffusivity<BasicTurbulenceModel> >
-Foam::eddyDiffusivity<BasicTurbulenceModel>::New
+Foam::autoPtr<Foam::EddyDiffusivity<BasicTurbulenceModel> >
+Foam::EddyDiffusivity<BasicTurbulenceModel>::New
 (
     const volScalarField& rho,
     const volVectorField& U,
@@ -102,9 +102,9 @@ Foam::eddyDiffusivity<BasicTurbulenceModel>::New
     const word& propertiesName
 )
 {
-    return autoPtr<eddyDiffusivity>
+    return autoPtr<EddyDiffusivity>
     (
-        static_cast<eddyDiffusivity*>(
+        static_cast<EddyDiffusivity*>(
         BasicTurbulenceModel::New
         (
             rho,
@@ -120,7 +120,7 @@ Foam::eddyDiffusivity<BasicTurbulenceModel>::New
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-bool Foam::eddyDiffusivity<BasicTurbulenceModel>::read()
+bool Foam::EddyDiffusivity<BasicTurbulenceModel>::read()
 {
     if (BasicTurbulenceModel::read())
     {
diff --git a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
similarity index 94%
rename from src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H
rename to src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
index 0913da846..4b04ca83d 100644
--- a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::eddyDiffusivity
+    Foam::EddyDiffusivity
 
 Description
     Templated abstract base class for single-phase compressible
     turbulence models.
 
 SourceFiles
-    eddyDiffusivity.C
+    EddyDiffusivity.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef eddyDiffusivity_H
-#define eddyDiffusivity_H
+#ifndef EddyDiffusivity_H
+#define EddyDiffusivity_H
 
 #include "CompressibleTurbulenceModel.H"
 
@@ -44,11 +44,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-               Class eddyDiffusivity Declaration
+               Class EddyDiffusivity Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class BasicTurbulenceModel>
-class eddyDiffusivity
+class EddyDiffusivity
 :
     public BasicTurbulenceModel
 {
@@ -81,7 +81,7 @@ public:
     // Constructors
 
         //- Construct
-        eddyDiffusivity
+        EddyDiffusivity
         (
             const word& type,
             const geometricOneField& alpha,
@@ -97,7 +97,7 @@ public:
     // Selectors
 
         //- Return a reference to the selected turbulence model
-        static autoPtr<eddyDiffusivity> New
+        static autoPtr<EddyDiffusivity> New
         (
             const volScalarField& rho,
             const volVectorField& U,
@@ -108,7 +108,7 @@ public:
 
 
     //- Destructor
-    virtual ~eddyDiffusivity()
+    virtual ~EddyDiffusivity()
     {}
 
 
@@ -167,7 +167,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "eddyDiffusivity.C"
+#   include "EddyDiffusivity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
similarity index 88%
rename from src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C
rename to src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
index 5b25fe8d8..8c6ac1165 100644
--- a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "thermalDiffusivity.H"
+#include "ThermalDiffusivity.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class TransportModel>
-Foam::thermalDiffusivity<TransportModel>::thermalDiffusivity
+Foam::ThermalDiffusivity<TransportModel>::ThermalDiffusivity
 (
     const word& type,
     const geometricOneField& alpha,
@@ -57,8 +57,8 @@ Foam::thermalDiffusivity<TransportModel>::thermalDiffusivity
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class TransportModel>
-Foam::autoPtr<Foam::thermalDiffusivity<TransportModel> >
-Foam::thermalDiffusivity<TransportModel>::New
+Foam::autoPtr<Foam::ThermalDiffusivity<TransportModel> >
+Foam::ThermalDiffusivity<TransportModel>::New
 (
     const volScalarField& rho,
     const volVectorField& U,
@@ -67,9 +67,9 @@ Foam::thermalDiffusivity<TransportModel>::New
     const word& propertiesName
 )
 {
-    return autoPtr<thermalDiffusivity>
+    return autoPtr<ThermalDiffusivity>
     (
-        static_cast<thermalDiffusivity*>(
+        static_cast<ThermalDiffusivity*>(
         CompressibleTurbulenceModel<transportModel>::New
         (
             rho,
@@ -86,7 +86,7 @@ Foam::thermalDiffusivity<TransportModel>::New
 
 template<class BasicTurbulenceModel>
 Foam::tmp<Foam::volScalarField>
-Foam::thermalDiffusivity<BasicTurbulenceModel>::alphat() const
+Foam::ThermalDiffusivity<BasicTurbulenceModel>::alphat() const
 {
     return tmp<volScalarField>
     (
@@ -109,7 +109,7 @@ Foam::thermalDiffusivity<BasicTurbulenceModel>::alphat() const
 
 template<class BasicTurbulenceModel>
 Foam::tmp<Foam::scalarField>
-Foam::thermalDiffusivity<BasicTurbulenceModel>::alphat
+Foam::ThermalDiffusivity<BasicTurbulenceModel>::alphat
 (
     const label patchi
 ) const
diff --git a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
similarity index 93%
rename from src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H
rename to src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
index b62cfa2e9..4c6328be1 100644
--- a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermalDiffusivity
+    Foam::ThermalDiffusivity
 
 Description
     Templated abstract base class for single-phase compressible
     turbulence models.
 
 SourceFiles
-    thermalDiffusivity.C
+    ThermalDiffusivity.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef thermalDiffusivity_H
-#define thermalDiffusivity_H
+#ifndef ThermalDiffusivity_H
+#define ThermalDiffusivity_H
 
 #include "CompressibleTurbulenceModel.H"
 
@@ -44,11 +44,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-               Class thermalDiffusivity Declaration
+               Class ThermalDiffusivity Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class TransportModel>
-class thermalDiffusivity
+class ThermalDiffusivity
 :
     public CompressibleTurbulenceModel<TransportModel>
 {
@@ -63,7 +63,7 @@ public:
     // Constructors
 
         //- Construct
-        thermalDiffusivity
+        ThermalDiffusivity
         (
             const word& type,
             const geometricOneField& alpha,
@@ -79,7 +79,7 @@ public:
     // Selectors
 
         //- Return a reference to the selected turbulence model
-        static autoPtr<thermalDiffusivity> New
+        static autoPtr<ThermalDiffusivity> New
         (
             const volScalarField& rho,
             const volVectorField& U,
@@ -90,7 +90,7 @@ public:
 
 
     //- Destructor
-    virtual ~thermalDiffusivity()
+    virtual ~ThermalDiffusivity()
     {}
 
 
@@ -166,7 +166,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "thermalDiffusivity.C"
+#   include "ThermalDiffusivity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index 646fbed66..63d700d3a 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -153,10 +153,10 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
 
     const label patchI = patch().index();
 
-    const LESModel<eddyDiffusivity<compressible::turbulenceModel> >& turbModel =
+    const LESModel<EddyDiffusivity<compressible::turbulenceModel> >& turbModel =
     db().lookupObject
     <
-        LESModel<eddyDiffusivity<compressible::turbulenceModel> >
+        LESModel<EddyDiffusivity<compressible::turbulenceModel> >
     >   (
             IOobject::groupName
             (
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index 12839d7c6..a2720aa79 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -56,7 +56,7 @@ License
         );                                                                     \
                                                                                \
                                                                                \
-        typedef RASModel<eddyDiffusivity<Transport##BaseModel> >               \
+        typedef RASModel<EddyDiffusivity<Transport##BaseModel> >               \
             RAS##Transport##BaseModel;                                         \
                                                                                \
         defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0);     \
@@ -72,7 +72,7 @@ License
         );                                                                     \
                                                                                \
                                                                                \
-        typedef LESModel<eddyDiffusivity<Transport##BaseModel> >               \
+        typedef LESModel<EddyDiffusivity<Transport##BaseModel> >               \
             LES##Transport##BaseModel;                                         \
                                                                                \
         defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0);     \
@@ -90,7 +90,7 @@ License
 
 
 #define makeTemplatedTurbulenceModel(BaseModel, SType, Type)                   \
-    typedef Foam::SType##Models::Type<Foam::eddyDiffusivity<Foam::BaseModel> > \
+    typedef Foam::SType##Models::Type<Foam::EddyDiffusivity<Foam::BaseModel> > \
         Type##SType##BaseModel;                                                \
     defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0);            \
                                                                                \
@@ -98,7 +98,7 @@ License
     {                                                                          \
         namespace SType##Models                                                \
         {                                                                      \
-            typedef Type<eddyDiffusivity<BaseModel> > Type##SType##BaseModel;  \
+            typedef Type<EddyDiffusivity<BaseModel> > Type##SType##BaseModel;  \
                                                                                \
             addToRunTimeSelectionTable                                         \
             (                                                                  \
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index 7725dee97..b8e70ca47 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -43,8 +43,8 @@ SourceFiles
 #define turbulentFluidThermoModel_H
 
 #include "SpecificCompressibleTurbulenceModel.H"
-#include "thermalDiffusivity.H"
-#include "eddyDiffusivity.H"
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
 #include "RASModel.H"
 #include "LESModel.H"
 #include "fluidThermo.H"
@@ -55,16 +55,16 @@ namespace Foam
 {
     namespace compressible
     {
-        typedef thermalDiffusivity<fluidThermo> turbulenceModel;
+        typedef ThermalDiffusivity<fluidThermo> turbulenceModel;
 
         typedef SpecificCompressibleTurbulenceModel
         <
-            RASModel<eddyDiffusivity<turbulenceModel> >
+            RASModel<EddyDiffusivity<turbulenceModel> >
         > RASModel;
 
         typedef SpecificCompressibleTurbulenceModel
         <
-            LESModel<eddyDiffusivity<turbulenceModel> >
+            LESModel<EddyDiffusivity<turbulenceModel> >
         > LESModel;
     }
 }
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index ec6a3eb4d..cfd29dba9 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -28,8 +28,8 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
-#include "thermalDiffusivity.H"
-#include "eddyDiffusivity.H"
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
 
 #include "laminar.H"
 #include "RASModel.H"
@@ -42,17 +42,17 @@ makeBaseTurbulenceModel
     geometricOneField,
     volScalarField,
     compressibleTurbulenceModel,
-    thermalDiffusivity,
+    ThermalDiffusivity,
     fluidThermo
 );
 
 #define makeRASModel(Type)                                                     \
     makeTemplatedTurbulenceModel                                               \
-    (fluidThermothermalDiffusivity, RAS, Type)
+    (fluidThermoThermalDiffusivity, RAS, Type)
 
 #define makeLESModel(Type)                                                     \
     makeTemplatedTurbulenceModel                                               \
-    (fluidThermothermalDiffusivity, LES, Type)
+    (fluidThermoThermalDiffusivity, LES, Type)
 
 
 // -------------------------------------------------------------------------- //