diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
index 1630207fd9..c61cba1ad1 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
@@ -1,4 +1,4 @@
 wclean libso phaseModel
 wclean libso interfacialModels
-wclean libso kineticTheoryModel
+wclean libso kineticTheoryModels
 wclean
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
index 88829476ed..8314bfa069 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
@@ -3,5 +3,5 @@ set -x
 
 wmake libso phaseModel
 wmake libso interfacialModels
-wmake libso kineticTheoryModel
+wmake libso kineticTheoryModels
 wmake
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
index d6ec6fb0f4..70a5d744ec 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
@@ -56,14 +56,13 @@ class Ergun
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("Ergun");
 
 
     // Constructors
 
-
         //- Construct from components
         Ergun
         (
@@ -74,9 +73,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~Ergun();
+    //- Destructor
+    virtual ~Ergun();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
index bb7fad923f..ab4deae049 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
@@ -56,7 +56,7 @@ class Gibilaro
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("Gibilaro");
 
@@ -73,9 +73,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~Gibilaro();
+    //- Destructor
+    virtual ~Gibilaro();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
index a720dce1f0..c9c38df2be 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
@@ -26,7 +26,7 @@ Class
     Foam::GidaspowErgunWenYu
 
 Description
-    D. Gidaspow, Multiphase flow and fluidization, 
+    D. Gidaspow, Multiphase flow and fluidization,
         Academic Press, New York, 1994.
 
 SourceFiles
@@ -54,7 +54,7 @@ class GidaspowErgunWenYu
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("GidaspowErgunWenYu");
 
@@ -71,9 +71,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~GidaspowErgunWenYu();
+    //- Destructor
+    virtual ~GidaspowErgunWenYu();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
index 1a7a69a3e4..fba0841f0e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
@@ -31,10 +31,10 @@ Description
     Int. J. Multiphase Flow, Vol. 22, Suppl, pp. 21-66 (1996)
     Eq. 86-87, p. 40
 
-    This is identical to the Wen and Yu, Rowe model Table 3.6 p.56  in 
+    This is identical to the Wen and Yu, Rowe model Table 3.6 p.56  in
     the Ph.D. thesis of Berend van Wachem
-    'Derivation, Implementation and Validation 
-                    of 
+    'Derivation, Implementation and Validation
+                    of
           Computer Simulation Models
          for Gas-Solid Fluidized Beds'
 
@@ -80,9 +80,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~GidaspowSchillerNaumann();
+    //- Destructor
+    virtual ~GidaspowSchillerNaumann();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
index 7be3a8080c..401667fb1a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
@@ -52,7 +52,7 @@ class SchillerNaumann
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("SchillerNaumann");
 
@@ -69,9 +69,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~SchillerNaumann();
+    //- Destructor
+    virtual ~SchillerNaumann();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
index 5011d11165..fcb961c5c8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
@@ -27,7 +27,7 @@ Class
 
 Description
     Syamlal, M., Rogers, W. and O'Brien, T. J. (1993) MFIX documentation,
-    Theory Guide. Technical Note DOE/METC-94/1004. Morgantown, West Virginia, 
+    Theory Guide. Technical Note DOE/METC-94/1004. Morgantown, West Virginia,
     USA.
 
 SourceFiles
@@ -55,7 +55,7 @@ class SyamlalOBrien
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("SyamlalOBrien");
 
@@ -72,9 +72,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~SyamlalOBrien();
+    //- Destructor
+    virtual ~SyamlalOBrien();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
index ccde851554..e527635d0b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
@@ -83,9 +83,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~WenYu();
+    //- Destructor
+    virtual ~WenYu();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index 7a69e13688..6d398380ad 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~dragModel();
+    //- Destructor
+    virtual ~dragModel();
 
 
     // Selectors
@@ -118,7 +117,7 @@ public:
         //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
         // ********************************** NB ! *****************************
         // for numerical reasons alpha and beta has been
-        // extracted from the dragFunction K, 
+        // extracted from the dragFunction K,
         // so you MUST divide K by alpha*beta when implemnting the drag function
         // ********************************** NB ! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/Make/files
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/options
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/Make/options
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/options
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Gidaspow/GidaspowConductivity.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
similarity index 97%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Gidaspow/GidaspowConductivity.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
index 26998b1ff0..72fad2c0d2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Gidaspow/GidaspowConductivity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
@@ -63,9 +63,8 @@ public:
         GidaspowConductivity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~GidaspowConductivity();
+    //- Destructor
+    virtual ~GidaspowConductivity();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
similarity index 97%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
index f63099ae96..f4acdca5b0 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
@@ -52,7 +52,7 @@ class HrenyaSinclairConductivity
 {
 
         dictionary coeffsDict_;
-    
+
         //- characteristic length of geometry
         dimensionedScalar L_;
 
@@ -68,9 +68,8 @@ public:
         HrenyaSinclairConductivity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~HrenyaSinclairConductivity();
+    //- Destructor
+    virtual ~HrenyaSinclairConductivity();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Syamlal/SyamlalConductivity.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
similarity index 95%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Syamlal/SyamlalConductivity.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
index 156ef2254d..8ca7fd9520 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Syamlal/SyamlalConductivity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
@@ -53,8 +53,8 @@ class SyamlalConductivity
 
 public:
 
-        //- Runtime type information
-        TypeName("Syamlal");
+    //- Runtime type information
+    TypeName("Syamlal");
 
 
     // Constructors
@@ -63,9 +63,8 @@ public:
         SyamlalConductivity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~SyamlalConductivity();
+    //- Destructor
+    virtual ~SyamlalConductivity();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/conductivityModel/conductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/conductivityModel/conductivityModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
similarity index 98%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/conductivityModel/conductivityModel.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 1e948098ec..e7ef83fcf8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/conductivityModel/conductivityModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -97,9 +97,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~conductivityModel();
+    //- Destructor
+    virtual ~conductivityModel();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/conductivityModel/newConductivityModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
similarity index 94%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
index 624aeb63a6..07b34bd914 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
@@ -53,8 +53,8 @@ class JohnsonJacksonFrictionalStress
 
 public:
 
-        //- Runtime type information
-        TypeName("JohnsonJackson");
+    //- Runtime type information
+    TypeName("JohnsonJackson");
 
 
     // Constructors
@@ -63,9 +63,8 @@ public:
         JohnsonJacksonFrictionalStress(const dictionary& dict);
 
 
-    // Destructor
-
-        ~JohnsonJacksonFrictionalStress();
+    //- Destructor
+    virtual ~JohnsonJacksonFrictionalStress();
 
 
     // Member functions
@@ -79,7 +78,7 @@ public:
             const dimensionedScalar& eta,
             const dimensionedScalar& p
         ) const;
-        
+
         virtual tmp<volScalarField> frictionalPressurePrime
         (
             const volScalarField& alpha,
@@ -96,7 +95,7 @@ public:
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volTensorField& D,
-            const dimensionedScalar& phi            
+            const dimensionedScalar& phi
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
similarity index 96%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
index c055bcb830..82774b25a5 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
@@ -63,9 +63,8 @@ public:
         SchaefferFrictionalStress(const dictionary& dict);
 
 
-    // Destructor
-
-        ~SchaefferFrictionalStress();
+    //- Destructor
+    virtual ~SchaefferFrictionalStress();
 
 
     // Member functions
@@ -96,7 +95,7 @@ public:
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volTensorField& D,
-            const dimensionedScalar& phi            
+            const dimensionedScalar& phi
         ) const;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
similarity index 97%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index 70cda0c8ff..c3e29ba4ad 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -97,9 +97,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~frictionalStressModel();
+    //- Destructor
+    virtual ~frictionalStressModel();
 
 
     // Member Functions
@@ -130,7 +129,7 @@ public:
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volTensorField& D,
-            const dimensionedScalar& phi            
+            const dimensionedScalar& phi
         ) const = 0;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/Lun/LunPressure.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
similarity index 96%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/Lun/LunPressure.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
index f04932ba89..c089adb9b2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/Lun/LunPressure.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
@@ -53,8 +53,8 @@ class LunPressure
 
 public:
 
-        //- Runtime type information
-        TypeName("Lun");
+    //- Runtime type information
+    TypeName("Lun");
 
 
     // Constructors
@@ -63,9 +63,8 @@ public:
         LunPressure(const dictionary& dict);
 
 
-    // Destructor
-
-        ~LunPressure();
+    //- Destructor
+    virtual ~LunPressure();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
similarity index 95%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
index 8f85a41028..1c3828653d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
@@ -53,19 +53,18 @@ class SyamlalRogersOBrienPressure
 
 public:
 
-        //- Runtime type information
-        TypeName("SyamlalRogersOBrien");
+    //- Runtime type information
+    TypeName("SyamlalRogersOBrien");
+
 
     // Constructors
 
-
         //- Construct from components
         SyamlalRogersOBrienPressure(const dictionary& dict);
 
 
-    // Destructor
-
-        ~SyamlalRogersOBrienPressure();
+    //- Destructor
+    virtual ~SyamlalRogersOBrienPressure();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/granularPressureModel/granularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/granularPressureModel/granularPressureModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
similarity index 98%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/granularPressureModel/granularPressureModel.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index d92c11e717..86f1b02b89 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -97,9 +97,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~granularPressureModel();
+    //- Destructor
+    virtual ~granularPressureModel();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/granularPressureModel/granularPressureModel/newGranularPressureModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
similarity index 99%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/kineticTheoryModel/kineticTheoryModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index b47091432d..b544a1a903 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -65,7 +65,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
     equilibrium_(kineticTheoryProperties_.lookup("equilibrium")),
     viscosityModel_
     (
-        viscosityModel::New
+        kineticTheoryModels::viscosityModel::New
         (
             kineticTheoryProperties_
         )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
similarity index 97%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/kineticTheoryModel/kineticTheoryModel.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 56e87b2818..917a447191 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -43,13 +43,12 @@ SourceFiles
 #include "radialModel.H"
 #include "granularPressureModel.H"
 #include "frictionalStressModel.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-    //class viscosityModel;
-
 /*---------------------------------------------------------------------------*\
                            Class kineticTheoryModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -79,7 +78,7 @@ class kineticTheoryModel
         //- use generation == dissipation
         Switch equilibrium_;
 
-        autoPtr<viscosityModel> viscosityModel_;
+        autoPtr<kineticTheoryModels::viscosityModel> viscosityModel_;
 
         autoPtr<conductivityModel> conductivityModel_;
 
@@ -152,9 +151,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~kineticTheoryModel();
+    //- Destructor
+    virtual ~kineticTheoryModel();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
similarity index 95%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
index 1b907856d5..f729939c34 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
@@ -53,8 +53,8 @@ class CarnahanStarlingRadial
 
 public:
 
-        //- Runtime type information
-        TypeName("CarnahanStarling");
+    //- Runtime type information
+    TypeName("CarnahanStarling");
 
 
     // Constructors
@@ -63,9 +63,8 @@ public:
         CarnahanStarlingRadial(const dictionary& dict);
 
 
-    // Destructor
-
-        ~CarnahanStarlingRadial();
+    //- Destructor
+    virtual ~CarnahanStarlingRadial();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/Gidaspow/GidaspowRadial.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/Gidaspow/GidaspowRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
similarity index 95%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/Gidaspow/GidaspowRadial.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
index 768d74cb31..d395f29ffb 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/Gidaspow/GidaspowRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
@@ -53,8 +53,8 @@ class GidaspowRadial
 
 public:
 
-        //- Runtime type information
-        TypeName("Gidaspow");
+    //- Runtime type information
+    TypeName("Gidaspow");
 
 
     // Constructors
@@ -63,9 +63,8 @@ public:
         GidaspowRadial(const dictionary& dict);
 
 
-    // Destructor
-
-        ~GidaspowRadial();
+    //- Destructor
+    virtual ~GidaspowRadial();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/LunSavage/LunSavageRadial.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
similarity index 95%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/LunSavage/LunSavageRadial.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
index 5bfe459d51..342dbcac4a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/LunSavage/LunSavageRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
@@ -53,8 +53,8 @@ class LunSavageRadial
 
 public:
 
-        //- Runtime type information
-        TypeName("LunSavage");
+    //- Runtime type information
+    TypeName("LunSavage");
 
 
     // Constructors
@@ -63,9 +63,8 @@ public:
         LunSavageRadial(const dictionary& dict);
 
 
-    // Destructor
-
-        ~LunSavageRadial();
+    //- Destructor
+    virtual ~LunSavageRadial();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/SinclairJackson/SinclairJacksonRadial.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
similarity index 95%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/SinclairJackson/SinclairJacksonRadial.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
index bf75f674bc..597d513bb6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/SinclairJackson/SinclairJacksonRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
@@ -53,8 +53,8 @@ class SinclairJacksonRadial
 
 public:
 
-        //- Runtime type information
-        TypeName("SinclairJackson");
+    //- Runtime type information
+    TypeName("SinclairJackson");
 
 
     // Constructors
@@ -63,9 +63,8 @@ public:
         SinclairJacksonRadial(const dictionary& dict);
 
 
-    // Destructor
-
-        ~SinclairJacksonRadial();
+    //- Destructor
+    virtual ~SinclairJacksonRadial();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/radialModel/newRadialModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/radialModel/radialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/radialModel/radialModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
similarity index 98%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/radialModel/radialModel.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
index 5a8d67b2d6..288e24f806 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/radialModel/radialModel/radialModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -97,9 +97,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~radialModel();
+    //- Destructor
+    virtual ~radialModel();
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
similarity index 89%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Gidaspow/GidaspowViscosity.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index 8ff563de79..4db268d88f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -31,16 +31,21 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(GidaspowViscosity, 0);
-
     addToRunTimeSelectionTable(viscosityModel, GidaspowViscosity, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::GidaspowViscosity::GidaspowViscosity(const dictionary& dict)
+Foam::kineticTheoryModels::GidaspowViscosity::GidaspowViscosity
+(
+    const dictionary& dict
+)
 :
     viscosityModel(dict)
 {}
@@ -48,13 +53,14 @@ Foam::GidaspowViscosity::GidaspowViscosity(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::GidaspowViscosity::~GidaspowViscosity()
+Foam::kineticTheoryModels::GidaspowViscosity::~GidaspowViscosity()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::GidaspowViscosity::mua
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::GidaspowViscosity::mua
 (
     const volScalarField& alpha,
     const volScalarField& Theta,
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
similarity index 93%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Gidaspow/GidaspowViscosity.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
index 90bcd5c7f1..3039571db6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Gidaspow/GidaspowViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class GidaspowViscosity Declaration
@@ -53,19 +55,17 @@ class GidaspowViscosity
 
 public:
 
-        //- Runtime type information
-        TypeName("Gidaspow");
+    //- Runtime type information
+    TypeName("Gidaspow");
 
     // Constructors
 
-
         //- Construct from components
         GidaspowViscosity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~GidaspowViscosity();
+    //- Destructor
+    virtual ~GidaspowViscosity();
 
 
     // Member functions
@@ -84,6 +84,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
similarity index 90%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index 8673aafac2..8306617a39 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -31,6 +31,8 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(HrenyaSinclairViscosity, 0);
 
@@ -41,11 +43,11 @@ namespace Foam
         dictionary
     );
 }
-
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::HrenyaSinclairViscosity::HrenyaSinclairViscosity
+Foam::kineticTheoryModels::HrenyaSinclairViscosity::HrenyaSinclairViscosity
 (
     const dictionary& dict
 )
@@ -58,13 +60,14 @@ Foam::HrenyaSinclairViscosity::HrenyaSinclairViscosity
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::HrenyaSinclairViscosity::~HrenyaSinclairViscosity()
+Foam::kineticTheoryModels::HrenyaSinclairViscosity::~HrenyaSinclairViscosity()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::HrenyaSinclairViscosity::mua
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::HrenyaSinclairViscosity::mua
 (
     const volScalarField& alpha,
     const volScalarField& Theta,
@@ -76,7 +79,7 @@ Foam::tmp<Foam::volScalarField> Foam::HrenyaSinclairViscosity::mua
 {
     const scalar sqrtPi = sqrt(mathematicalConstant::pi);
 
-    volScalarField lamda = 
+    volScalarField lamda =
         scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_;
 
     return rhoa*da*sqrt(Theta)*
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
similarity index 92%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
index dc9eeaabde..8d8545ec0b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class HrenyaSinclairViscosity Declaration
@@ -50,17 +52,18 @@ class HrenyaSinclairViscosity
 :
     public viscosityModel
 {
+    // Private data
 
         dictionary coeffsDict_;
-    
+
         //- characteristic length of geometry
         dimensionedScalar L_;
 
 
 public:
 
-        //- Runtime type information
-        TypeName("HrenyaSinclair");
+    //- Runtime type information
+    TypeName("HrenyaSinclair");
 
 
     // Constructors
@@ -69,9 +72,8 @@ public:
         HrenyaSinclairViscosity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~HrenyaSinclairViscosity();
+    //- Destructor
+    virtual ~HrenyaSinclairViscosity();
 
 
     // Member functions
@@ -90,6 +92,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
similarity index 89%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Syamlal/SyamlalViscosity.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index 1c7134a9b3..936d09a35f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -31,16 +31,21 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(SyamlalViscosity, 0);
-
     addToRunTimeSelectionTable(viscosityModel, SyamlalViscosity, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::SyamlalViscosity::SyamlalViscosity(const dictionary& dict)
+Foam::kineticTheoryModels::SyamlalViscosity::SyamlalViscosity
+(
+    const dictionary& dict
+)
 :
     viscosityModel(dict)
 {}
@@ -48,13 +53,13 @@ Foam::SyamlalViscosity::SyamlalViscosity(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::SyamlalViscosity::~SyamlalViscosity()
+Foam::kineticTheoryModels::SyamlalViscosity::~SyamlalViscosity()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::SyamlalViscosity::mua
+Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::SyamlalViscosity::mua
 (
     const volScalarField& alpha,
     const volScalarField& Theta,
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
similarity index 93%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Syamlal/SyamlalViscosity.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
index be03a60d79..f2f893d417 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/Syamlal/SyamlalViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class SyamlalViscosity Declaration
@@ -53,8 +55,9 @@ class SyamlalViscosity
 
 public:
 
-        //- Runtime type information
-        TypeName("Syamlal");
+    //- Runtime type information
+    TypeName("Syamlal");
+
 
     // Constructors
 
@@ -62,9 +65,8 @@ public:
         SyamlalViscosity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~SyamlalViscosity();
+    //- Destructor
+    virtual ~SyamlalViscosity();
 
 
     // Member functions
@@ -83,6 +85,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
similarity index 89%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/none/noneViscosity.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index f317c9c616..44bde3c389 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/none/noneViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -30,16 +30,17 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(noneViscosity, 0);
-
     addToRunTimeSelectionTable(viscosityModel, noneViscosity, dictionary);
 }
-
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::noneViscosity::noneViscosity(const dictionary& dict)
+Foam::kineticTheoryModels::noneViscosity::noneViscosity(const dictionary& dict)
 :
     viscosityModel(dict)
 {}
@@ -47,13 +48,13 @@ Foam::noneViscosity::noneViscosity(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::noneViscosity::~noneViscosity()
+Foam::kineticTheoryModels::noneViscosity::~noneViscosity()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::noneViscosity::mua
+Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mua
 (
     const volScalarField& alpha,
     const volScalarField& Theta,
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
similarity index 93%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/none/noneViscosity.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
index 4c9b9d9171..6ef9e5ead5 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/none/noneViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class noneViscosity Declaration
@@ -53,19 +55,18 @@ class noneViscosity
 
 public:
 
-        //- Runtime type information
-        TypeName("none");
+    //- Runtime type information
+    TypeName("none");
+
 
     // Constructors
 
-
         //- Construct from components
         noneViscosity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~noneViscosity();
+    //- Destructor
+    virtual ~noneViscosity();
 
 
     // Member functions
@@ -84,6 +85,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
similarity index 93%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/newViscosityModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
index 696c05dd62..03b754079a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/newViscosityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
@@ -28,16 +28,17 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::viscosityModel> Foam::viscosityModel::New
+Foam::autoPtr<Foam::kineticTheoryModels::viscosityModel>
+Foam::kineticTheoryModels::viscosityModel::New
 (
     const dictionary& dict
 )
 {
     word viscosityModelType(dict.lookup("viscosityModel"));
 
-    Info<< "Selecting viscosityModel " 
+    Info<< "Selecting viscosityModel "
         << viscosityModelType << endl;
-        
+
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(viscosityModelType);
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/viscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
similarity index 91%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/viscosityModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
index daec6118d8..8db84fdd90 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/viscosityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
@@ -29,15 +29,18 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(viscosityModel, 0);
     defineRunTimeSelectionTable(viscosityModel, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::viscosityModel::viscosityModel
+Foam::kineticTheoryModels::viscosityModel::viscosityModel
 (
     const dictionary& dict
 )
@@ -48,7 +51,7 @@ Foam::viscosityModel::viscosityModel
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::viscosityModel::~viscosityModel()
+Foam::kineticTheoryModels::viscosityModel::~viscosityModel()
 {}
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
similarity index 96%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/viscosityModel.H
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index 43f60493b2..e311fc4d33 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/viscosityModel/viscosityModel/viscosityModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -44,6 +44,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class viscosityModel Declaration
@@ -99,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~viscosityModel();
+    //- Destructor
+    virtual ~viscosityModel();
 
 
     // Member Functions
@@ -120,6 +121,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.H
index b4c89c9628..3b430fc053 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~phaseModel();
+    //- Destructor
+    virtual ~phaseModel();
 
 
     // Member Functions
@@ -131,7 +130,7 @@ public:
         {
             return U_;
         }
-    
+
         const surfaceScalarField& phi() const
         {
             return *phiPtr_;
diff --git a/bin/foamTemplates/foamTemplate.H b/bin/foamTemplates/foamTemplate.H
index 0d87bcda9c..a0e71678d1 100644
--- a/bin/foamTemplates/foamTemplate.H
+++ b/bin/foamTemplates/foamTemplate.H
@@ -107,9 +107,8 @@ public:
         static autoPtr<className> New();
 
 
-    // Destructor
-
-        ~className();
+    //- Destructor
+    ~className();
 
 
     // Member Functions