diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 6a6eb7f57b..d99e56209d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -50,15 +50,15 @@ namespace Foam
 {
     defineTypeNameAndDebug(hexRef8, 0);
 
-    // Reduction class. If x and y are not equal assign value.
+    //- Reduction class. If x and y are not equal assign value.
     template< int value >
     class ifEqEqOp
     {
         public:
         void operator()( label& x, const label& y ) const
         {
-            x = (x==y) ? x:value; 
-        }   
+            x = (x==y) ? x:value;
+        }
     };
 }
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 5055e5502f..dff0859c53 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -27,6 +27,7 @@ Class
 
 Description
     Templated base class for kinematic cloud
+
     - Kinematic only
       - Dispersion model
       - Drag model
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index e25318d9c1..2063f9e673 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -27,7 +27,9 @@ Class
 
 Description
     Kinematic parcel class with one/two-way coupling with the continuous
-    phase. Sub-models include:
+    phase.
+
+    Sub-models include:
     - drag
     - break-up
     - wall interactions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index be42e0c0dd..98c017adcd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -27,6 +27,7 @@ Class
 
 Description
     Cone injection
+
     - User specifies
       - time of start of injection
       - injector position
diff --git a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H
index 09e1030cdb..445e19da0b 100644
--- a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H
+++ b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H
@@ -26,15 +26,15 @@ Class
     Foam::edgeFaceCirculator
 
 Description
-    Walks from starting face around edge. Implicit
-    description of edge:
+    Walks from starting face around edge.
+
+    Implicit description of edge:
     - face
     - index in face. edge is always between f[index] and f[index+1]
     - direction (cell to walk into)
 
-    Use as:
-
-        1) in-place:
+    -# Use in-place: \n
+        @code
             edgeFaceCirculator circ(..);
             // Optionally rotate to beginning: circ.setCanonical();
 
@@ -45,9 +45,10 @@ Description
                 ++circ;
             }
             while (circ != circ.end());
+        @endcode
 
-        2) like STL iterator:
-
+    -# Use like STL iterator: \n
+        @code
             edgeFaceCirculator circ(..);
             for
             (
@@ -58,6 +59,7 @@ Description
             {
                 Info<< "face:" << iter.face() << endl;
             }
+        @endcode
 
 
 SourceFiles
diff --git a/src/turbulenceModels/LES/compressible/LESModel/LESModel.H b/src/turbulenceModels/LES/compressible/LESModel/LESModel.H
index 905b7df7e3..ecef2d8f77 100644
--- a/src/turbulenceModels/LES/compressible/LESModel/LESModel.H
+++ b/src/turbulenceModels/LES/compressible/LESModel/LESModel.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Namespace
-    Foam::compressible
+    Foam::compressible::LESModels
 
 Description
     Namespace for compressible LES models.
diff --git a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
index 2a1d5e4801..57576bf5e5 100644
--- a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::DeardorffDiffStress
+    Foam::incompressible::LESModels::DeardorffDiffStress
 
 Description
     Differential SGS Stress Equation Model for incompressible flows
diff --git a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
index f465c2d413..388606f284 100644
--- a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::GenEddyVisc
+    Foam::incompressible::LESModels::GenEddyVisc
 
 Description
     General base class for all incompressible models that can be implemented
diff --git a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
index 93305ea411..eb6cc7e906 100644
--- a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::GenSGSStress
+    Foam::incompressible::LESModels::GenSGSStress
 
 Description
     General base class for all incompressible models that directly
diff --git a/src/turbulenceModels/LES/incompressible/LESModel/LESModel.H b/src/turbulenceModels/LES/incompressible/LESModel/LESModel.H
index 302efc5cf1..e1374ed286 100644
--- a/src/turbulenceModels/LES/incompressible/LESModel/LESModel.H
+++ b/src/turbulenceModels/LES/incompressible/LESModel/LESModel.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Namespace
-    Foam::incompressible
+    Foam::incompressible::LESModels
 
 Description
     Namespace for incompressible LES models.
diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
index 4d10fd99f6..f58b6e224b 100644
--- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
+++ b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::LRRDiffStress
+    Foam::incompressible::LESModels::LRRDiffStress
 
 Description
     Differential SGS Stress Equation Model for incompressible flows.
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
index 3a5f09eeaa..f86578934e 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::Smagorinsky
+    Foam::incompressible::LESModels::Smagorinsky
 
 Description
     The Isochoric Smagorinsky Model for incompressible flows.
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
index 886a5be4cd..7c780da1e1 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
+++ b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::Smagorinsky2
+    Foam::incompressible::LESModels::Smagorinsky2
 
 Description
     The Isochoric Smagorinsky Model for incompressible flows
diff --git a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
index a6a9d12ca6..523da4611c 100644
--- a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::SpalartAllmaras
+    Foam::incompressible::LESModels::SpalartAllmaras
 
 Description
     SpalartAllmaras for incompressible flows
diff --git a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
index ced250056f..223487b7d0 100644
--- a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::dynMixedSmagorinsky
+    Foam::incompressible::LESModels::dynMixedSmagorinsky
 
 Description
     The Mixed Isochoric Smagorinsky Model for incompressible flows.
diff --git a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
index 24484a23c5..b680174e69 100644
--- a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::dynOneEqEddy
+    Foam::incompressible::LESModels::dynOneEqEddy
 
 Description
     One Equation Eddy Viscosity Model for incompressible flows.
diff --git a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
index 601381e80d..d155d45a58 100644
--- a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
+++ b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::dynSmagorinsky
+    Foam::incompressible::LESModels::dynSmagorinsky
 
 Description
     The Isochoric dynamic Smagorinsky Model for incompressible flows.
@@ -56,7 +56,7 @@ Description
         m = delta^2*(4*||F(D)||^2 - F(||D||^2))
         L = dev(F(U*U) - F(U)*F(U))
         M = delta^2*(F(||D||*dev(D)) - 4*||F(D)||*F(dev(D)))
-    @verbatim
+    @endverbatim
 
 SourceFiles
     dynSmagorinsky.C
diff --git a/src/turbulenceModels/LES/incompressible/laminar/laminar.H b/src/turbulenceModels/LES/incompressible/laminar/laminar.H
index 86c2ba342a..648e0b8229 100644
--- a/src/turbulenceModels/LES/incompressible/laminar/laminar.H
+++ b/src/turbulenceModels/LES/incompressible/laminar/laminar.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::laminar
+    Foam::incompressible::LESModels::laminar
 
 Description
     LES model for laminar incompressible flow.
diff --git a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
index f698747d16..960b6f185e 100644
--- a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
+++ b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::locDynOneEqEddy
+    Foam::incompressible::LESModels::locDynOneEqEddy
 
 Description
     Localised Dynamic One Equation Eddy Viscosity Model for incompressible
diff --git a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
index 9a18dcb00a..7fa3f0c9ec 100644
--- a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
+++ b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::mixedSmagorinsky
+    Foam::incompressible::LESModels::mixedSmagorinsky
 
 Description
     The mixed Isochoric Smagorinsky Model for incompressible flows.
diff --git a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
index 1e3802b723..632530b205 100644
--- a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::oneEqEddy
+    Foam::incompressible::LESModels::oneEqEddy
 
 Description
     One Equation Eddy Viscosity Model for incompressible flows
diff --git a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
index 6e8b151872..079d38a4a2 100644
--- a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
+++ b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::scaleSimilarity
+    Foam::incompressible::LESModels::scaleSimilarity
 
 Description
     General base class for all scale similarity models
diff --git a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
index 1053cb272c..dd6b4e68b0 100644
--- a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
+++ b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::spectEddyVisc
+    Foam::incompressible::LESModels::spectEddyVisc
 
 Description
     The Isochoric spectral Eddy Viscosity Model for incompressible flows.
diff --git a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
index f488b823fb..6903765f6b 100644
--- a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
+++ b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::vanDriestDelta
+    Foam::incompressible::LESModels::vanDriestDelta
 
 Description
     Simple cube-root of cell volume delta used in incompressible LES models.
diff --git a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
index 2008b7bfc1..687e30a6a6 100644
--- a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LES::nuSgsWallFunctionFvPatchScalarField
+    Foam::incompressible::LESModels::nuSgsWallFunctionFvPatchScalarField
 
 Description
     wall function boundary condition for incompressible flows
diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.H b/src/turbulenceModels/RAS/compressible/LRR/LRR.H
index b479b7ee3c..553b11be96 100644
--- a/src/turbulenceModels/RAS/compressible/LRR/LRR.H
+++ b/src/turbulenceModels/RAS/compressible/LRR/LRR.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::LRR
+    Foam::compressible::RASModels::LRR
 
 Description
     Launder, Reece and Rodi Reynolds-stress turbulence model for
diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index dbe974a1d1..2be69e96b5 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::LaunderGibsonRSTM
+    Foam::compressible::RASModels::LaunderGibsonRSTM
 
 Description
     Launder-Gibson Reynolds stress turbulence model for compressible flows.
diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
index 7c7372e07d..731e0cdb02 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::LaunderSharmaKE
+    Foam::compressible::RASModels::LaunderSharmaKE
 
 Description
     Launder and Sharma low-Reynolds k-epsilon turbulence model for
diff --git a/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H b/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
index 2e98a4359e..47feaebe18 100644
--- a/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
+++ b/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Namespace
-    Foam::compressible::RAS
+    Foam::compressible::RASModels
 
 Description
     Namespace for compressible RAS turbulence models.
diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
index a1d2148dd7..5063615ccb 100644
--- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::RNGkEpsilon
+    Foam::compressible::RASModels::RNGkEpsilon
 
 Description
     Renormalisation group k-epsilon turbulence model for compressible flows.
diff --git a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
index 9b6880eff1..da3aa6fc2e 100644
--- a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::SpalartAllmaras
+    Foam::compressible::RASModels::SpalartAllmaras
 
 Description
     Spalart-Allmaras one-eqn mixing-length model for compressible
diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
index b6b2b1dab7..d42bc73a66 100644
--- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::kEpsilon
+    Foam::compressible::RASModels::kEpsilon
 
 Description
     Standard k-epsilon turbulence model for compressible flows
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
index fe65b3fad2..4836d02611 100644
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::kOmegaSST
+    Foam::compressible::RASModels::kOmegaSST
 
 Description
     Implementation of the k-omega-SST turbulence model for compressible flows.
diff --git a/src/turbulenceModels/RAS/compressible/laminar/laminar.H b/src/turbulenceModels/RAS/compressible/laminar/laminar.H
index dd965be3d8..dda7f73117 100644
--- a/src/turbulenceModels/RAS/compressible/laminar/laminar.H
+++ b/src/turbulenceModels/RAS/compressible/laminar/laminar.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::laminar
+    Foam::compressible::RASModels::laminar
 
 Description
     Dummy turbulence model for laminar compressible flow.
diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
index 676c7becc2..0eb770f083 100644
--- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::realizableKE
+    Foam::compressible::RASModels::realizableKE
 
 Description
     Realizable k-epsilon turbulence model for compressible flows.
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
index 759bd5c4fd..7c8e561793 100644
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RAS::mutStandardRoughWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::mutStandardRoughWallFunctionFvPatchScalarField
 
 Description
     Wall function boundary condition for rough walls
diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
index 28a032bdc0..45b3df83e8 100644
--- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
+++ b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::LRR
+    Foam::incompressible::RASModels::LRR
 
 Description
     Launder, Reece and Rodi Reynolds-stress turbulence model for
diff --git a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
index 8a9fe369e6..f0e8a0ba59 100644
--- a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::LamBremhorstKE
+    Foam::incompressible::RASModels::LamBremhorstKE
 
 Description
     Lam and Bremhorst low-Reynolds number k-epsilon turbulence model
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 96a2daec83..73169b389f 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::LaunderGibsonRSTM
+    Foam::incompressible::RASModels::LaunderGibsonRSTM
 
 Description
     Launder-Gibson Reynolds stress turbulence model for incompressible flows.
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
index 1441215769..a16a1d8f3a 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::LaunderSharmaKE
+    Foam::incompressible::RASModels::LaunderSharmaKE
 
 Description
     Launder and Sharma low-Reynolds k-epsilon turbulence model for
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
index 1a9bbde798..005c825775 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::LienCubicKE
+    Foam::incompressible::RASModels::LienCubicKE
 
 Description
     Lien cubic non-linear k-epsilon turbulence model for incompressible flows.
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
index e86e555ece..3fac316cdf 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::LienCubicKELowRe
+    Foam::incompressible::RASModels::LienCubicKELowRe
 
 Description
     Lien cubic non-linear low-Reynolds k-epsilon turbulence models for
diff --git a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index c7bbf5e51a..59efb82c98 100644
--- a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::LienLeschzinerLowRe
+    Foam::incompressible::RASModels::LienLeschzinerLowRe
 
 Description
     Lien and Leschziner low-Reynolds k-epsilon turbulence model for
diff --git a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
index 7f25e712ef..7f8f6ebc8f 100644
--- a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::NonlinearKEShih
+    Foam::incompressible::RASModels::NonlinearKEShih
 
 Description
     Shih's quadratic non-linear k-epsilon turbulence model for
diff --git a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
index dcfd584c61..8c675a8fc1 100644
--- a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
+++ b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::QZeta
+    Foam::incompressible::RASModels::QZeta
 
 Description
     Gibson and Dafa'Alla's q-zeta two-equation low-Re turbulence model
diff --git a/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H b/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
index 8ba1fedcbc..345565fbab 100644
--- a/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
+++ b/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Namespace
-    Foam::incompressible
+    Foam::incompressible::RASModels
 
 Description
     Namespace for incompressible RAS turbulence models.
diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
index f028ea8041..960d0a344d 100644
--- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::RNGkEpsilon
+    Foam::incompressible::RASModels::RNGkEpsilon
 
 Description
     Renormalisation group k-epsilon turbulence model for incompressible flows.
diff --git a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
index 5266de28eb..39cb3977e0 100644
--- a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::SpalartAllmaras
+    Foam::incompressible::RASModels::SpalartAllmaras
 
 Description
     Spalart-Allmaras 1-eqn mixing-length model for incompressible external
diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
index 4fe07f3679..5ac0d5a461 100644
--- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::kEpsilon
+    Foam::incompressible::RASModels::kEpsilon
 
 Description
     Standard k-epsilon turbulence model for incompressible flows.
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
index f106b02800..ef44b6a9ac 100644
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::kOmegaSST
+    Foam::incompressible::RASModels::kOmegaSST
 
 Description
     Implementation of the k-omega-SST turbulence model for incompressible
diff --git a/src/turbulenceModels/RAS/incompressible/laminar/laminar.H b/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
index eaa183746b..7f07045aa3 100644
--- a/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
+++ b/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::laminar
+    Foam::incompressible::RASModels::laminar
 
 Description
     Dummy turbulence model for laminar incompressible flow.
diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
index 43ca0b5894..d3587b2f51 100644
--- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::realizableKE
+    Foam::incompressible::RASModels::realizableKE
 
 Description
     Realizable k-epsilon turbulence model for incompressible flows.
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
index f82d7aeb0f..df3007b10f 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::nutStandardRoughWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::nutStandardRoughWallFunctionFvPatchScalarField
 
 Description
     Wall function boundary condition for rough walls
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
index 5180a3ec45..f4042e7f5f 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::nutStandardWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::nutStandardWallFunctionFvPatchScalarField
 
 Description
     Wall function boundary condition for walls
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
index 4e7f108dd1..218599b59c 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RAS::nutWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::nutWallFunctionFvPatchScalarField
 
 Description
     Wall function boundary condition for walls