diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index 90c4889f03b6e7e10fe1d6473e4a545c4baaadc3..a53125aaf2afbbef2baec87a7077affe2dc52799 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -5,6 +5,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 4bfff36b1d79e9bb14de6b4330f740a09f0933a4..24aaca3b46326be1c8d80b7cf69809d1b152dba3 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.C
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    R 
+    R
 
 Description
     Calculates and writes the Reynolds stress R for the current time step.
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        turbulence->R()
+        RASModel->R()
     );
 
     R.write();
diff --git a/applications/utilities/postProcessing/turbulence/R/createFields.H b/applications/utilities/postProcessing/turbulence/R/createFields.H
index 3e75357892b4976297954705c7f5695ed3ae9781..d069c4545db5789774099457c72b280146f082f5 100644
--- a/applications/utilities/postProcessing/turbulence/R/createFields.H
+++ b/applications/utilities/postProcessing/turbulence/R/createFields.H
@@ -16,7 +16,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASmodel> turbulence
+    autoPtr<incompressible::RASModel> RASModel
     (
-        incompressible::RASmodel::New(U, phi, laminarTransport)
+        incompressible::RASModel::New(U, phi, laminarTransport)
     );
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index 458b040fcbbc8a107e2af389fc6e9a08438f80e9..be60a20b9f4548d0983a8e22bf3cb3eaa1c6ec0b 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -5,5 +5,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
     -lincompressibleTransportModels
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
index 3e75357892b4976297954705c7f5695ed3ae9781..d069c4545db5789774099457c72b280146f082f5 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
@@ -16,7 +16,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASmodel> turbulence
+    autoPtr<incompressible::RASModel> RASModel
     (
-        incompressible::RASmodel::New(U, phi, laminarTransport)
+        incompressible::RASModel::New(U, phi, laminarTransport)
     );
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index da081e38ff926a8dc6311e0e1903dca3a2ef5eb9..344998b6cb049cb81257713aa9bfd6a3a6417953 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -36,7 +36,7 @@ Source files:
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,13 +68,13 @@ int main(int argc, char *argv[])
         // Cache the turbulence fields
 
         Info<< "\nRetrieving field k from turbulence model" << endl;
-        const volScalarField k = turbulence->k();
+        const volScalarField k = RASModel->k();
 
         Info<< "\nRetrieving field epsilon from turbulence model" << endl;
-        const volScalarField epsilon = turbulence->epsilon();
+        const volScalarField epsilon = RASModel->epsilon();
 
         Info<< "\nRetrieving field R from turbulence model" << endl;
-        const volSymmTensorField R = turbulence->R();
+        const volSymmTensorField R = RASModel->R();
 
         // Check availability of tubulence fields
 
diff --git a/applications/utilities/postProcessing/wall/wallGradU/Make/options b/applications/utilities/postProcessing/wall/wallGradU/Make/options
index 882657bf9f2be1a55a12519fc59c4b9d9cff2aed..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/Make/options
+++ b/applications/utilities/postProcessing/wall/wallGradU/Make/options
@@ -1,9 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
-    -I$(LIB_SRC)/transportModels
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleRASmodels \
-    -lincompressibleTransportModels \
     -lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
index 90487c0c5a6ab7965b9db14ac9be1d408ffd28fc..7ce8973b6e781995107ef85bf3c52861e1c0a852 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
+++ b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
@@ -31,7 +31,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "incompressible/RASmodel/RASmodel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index 525ab7dffdfb75368f2a06e4b8de8f340ac974bd..e68277e853cf074c3b1c31314dfa986f0f42731a 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 EXE_LIBS = \
-    -lcompressibleRASmodels \
+    -lcompressibleRASModels \
     -lcombustionThermophysicalModels \
     -lfiniteVolume \
     -lspecie \
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
index ee9f92cd45f28a84b0b094b32321bc82923d47ce..64eac51eaad8af1042699d1fec496c497dd68b6a 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
@@ -31,9 +31,9 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-autoPtr<compressible::RASmodel> turbulence
+autoPtr<compressible::RASModel> RASModel
 (
-    compressible::RASmodel::New
+    compressible::RASModel::New
     (
         rho,
         U,
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
index 250d5ba4c42026c65876e6090802c1060fc345f0..8126dccf4104f0e6e2488c660bc05cb6e05a53e9 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASmodel/RASmodel.H"
+#include "compressible/RASModel/RASModel.H"
 #include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 #       include "createFields.H"
 
         surfaceScalarField heatFlux =
-            fvc::interpolate(turbulence->alphaEff())*fvc::snGrad(h);
+            fvc::interpolate(RASModel->alphaEff())*fvc::snGrad(h);
 
         const surfaceScalarField::GeometricBoundaryField& patchHeatFlux =
             heatFlux.boundaryField();
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index 882657bf9f2be1a55a12519fc59c4b9d9cff2aed..2a417f954936f537595fba5fa461a73a81650574 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels
 
 EXE_LIBS = \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/createFields.H b/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
index 3e75357892b4976297954705c7f5695ed3ae9781..d069c4545db5789774099457c72b280146f082f5 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
+++ b/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
@@ -16,7 +16,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASmodel> turbulence
+    autoPtr<incompressible::RASModel> RASModel
     (
-        incompressible::RASmodel::New(U, phi, laminarTransport)
+        incompressible::RASModel::New(U, phi, laminarTransport)
     );
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index fce77b77561f7271195bd67ef9076577eed2026a..3d8a34682669e38658b0901994188d385f5c93d7 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
 #       include "createFields.H"
 
-        volSymmTensorField Reff(turbulence->devReff());
+        volSymmTensorField Reff(RASModel->devReff());
 
         volVectorField wallShearStress
         (
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/Make/options b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
index d1465c1a7cfec5f034a5657306f447f79c91a85e..b624a502aafca2f682fcb86716f990f2301df87b 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
@@ -5,6 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleLESmodels \
+    -lincompressibleLESModels \
     -lincompressibleTransportModels \
     -lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/createFields.H b/applications/utilities/postProcessing/wall/yPlusLES/createFields.H
index 8f89b373bb1c500bbcfe9b67a1892a408ec8706a..83fb26a1d7bf476a2679fc031685289813d7a178 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/createFields.H
+++ b/applications/utilities/postProcessing/wall/yPlusLES/createFields.H
@@ -16,9 +16,9 @@ volVectorField U
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<incompressible::LESmodel> sgsModel
+autoPtr<incompressible::LESModel> sgsModel
 (
-    incompressible::LESmodel::New(U, phi, laminarTransport)
+    incompressible::LESModel::New(U, phi, laminarTransport)
 );
 
 volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
index 942e8a21459e95d683f3d1062e2df626e0158520..64e594918bc8ab85e6821b5a1fa9331e3bcb422d 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
+++ b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/LESmodel/LESmodel.H"
+#include "incompressible/LESModel/LESModel.H"
 #include "nearWallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
 
         singlePhaseTransportModel laminarTransport(U, phi);
 
-        autoPtr<incompressible::LESmodel> sgsModel
+        autoPtr<incompressible::LESModel> sgsModel
         (
-            incompressible::LESmodel::New(U, phi, laminarTransport)
+            incompressible::LESModel::New(U, phi, laminarTransport)
         );
 
         volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
index 882657bf9f2be1a55a12519fc59c4b9d9cff2aed..2a417f954936f537595fba5fa461a73a81650574 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels
 
 EXE_LIBS = \
-    -lincompressibleRASmodels \
+    -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index 68ac0529f6766e8410676268c50c79ef95941111..64eb7d6bfe64488d863a483f3d0e09543b22ab29 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASmodel/RASmodel.H"
+#include "incompressible/RASModel/RASModel.H"
 #include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
 
         singlePhaseTransportModel laminarTransport(U, phi);
 
-        autoPtr<incompressible::RASmodel> turbulence
+        autoPtr<incompressible::RASModel> RASModel
         (
-            incompressible::RASmodel::New(U, phi, laminarTransport)
+            incompressible::RASModel::New(U, phi, laminarTransport)
         );
 
         const fvPatchList& patches = mesh.boundary();
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 
             if (typeid(currPatch) == typeid(wallFvPatch))
             {
-                yPlus.boundaryField()[patchi] = turbulence->yPlus(patchi);
+                yPlus.boundaryField()[patchi] = RASModel->yPlus(patchi);
                 const scalarField& Yp = yPlus.boundaryField()[patchi];
 
                 Info<< "Patch " << patchi