diff --git a/etc/controlDict b/etc/controlDict
index f06bbbd961..a76ef3c335 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -520,7 +520,7 @@ DebugSwitches
     kOmega              0;
     kOmegaSST           0;
     kOmegaSSTSAS        0;
-    kQRWallFunction     0;
+    kqRWallFunction     0;
     kinematicCloud      0;
     labelField          0;
     labelList           0;
diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
index 56644ea6d3..d042bb65d7 100644
--- a/src/turbulenceModels/compressible/RAS/Make/files
+++ b/src/turbulenceModels/compressible/RAS/Make/files
@@ -29,8 +29,8 @@ $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarFiel
 omegaWallFunctions = $(wallFunctions)/omegaWallFunctions
 $(omegaWallFunctions)/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
 
-kQRWallFunctions = $(wallFunctions)/kQRWallFunctions
-$(kQRWallFunctions)/kQRWallFunction/kQRWallFunctionFvPatchFields.C
+kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
+$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
 
 /* Patch fields */
 derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 60a8e9c9e3..5893f2072e 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -115,7 +115,9 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
     // Lookup Cmu corresponding to the turbulence model selected
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
+    const scalar Cmu =
+        rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
+
     const scalar Cmu25 = pow(Cmu, 0.25);
 
     const fvPatchField<scalar>& kp =
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
index 8286c1b149..60b3ab17e3 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "kQRWallFunctionFvPatchField.H"
+#include "kqRWallFunctionFvPatchField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -43,11 +43,11 @@ namespace RASModels
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void kQRWallFunctionFvPatchField<Type>::checkType()
+void kqRWallFunctionFvPatchField<Type>::checkType()
 {
     if (!isA<wallFvPatch>(this->patch()))
     {
-        FatalErrorIn("kQRWallFunctionFvPatchField::checkType()")
+        FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << this->patch().name()
             << " must be wall" << nl
@@ -60,7 +60,7 @@ void kQRWallFunctionFvPatchField<Type>::checkType()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -73,9 +73,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
-    const kQRWallFunctionFvPatchField& ptf,
+    const kqRWallFunctionFvPatchField& ptf,
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -88,7 +88,7 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -102,9 +102,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
-    const kQRWallFunctionFvPatchField& tkqrwfpf
+    const kqRWallFunctionFvPatchField& tkqrwfpf
 )
 :
     zeroGradientFvPatchField<Type>(tkqrwfpf)
@@ -114,9 +114,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
-    const kQRWallFunctionFvPatchField& tkqrwfpf,
+    const kqRWallFunctionFvPatchField& tkqrwfpf,
     const DimensionedField<Type, volMesh>& iF
 )
 :
@@ -129,7 +129,7 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void kQRWallFunctionFvPatchField<Type>::evaluate
+void kqRWallFunctionFvPatchField<Type>::evaluate
 (
     const Pstream::commsTypes commsType
 )
@@ -139,7 +139,7 @@ void kQRWallFunctionFvPatchField<Type>::evaluate
 
 
 template<class Type>
-void kQRWallFunctionFvPatchField<Type>::write(Ostream& os) const
+void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
 {
     zeroGradientFvPatchField<Type>::write(os);
     this->writeEntry("value", os);
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index cacb704e32..60baa36ff4 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -23,19 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RASModels::kQRWallFunctionFvPatchField
+    Foam::compressible::RASModels::kqRWallFunctionFvPatchField
 
 Description
     Boundary condition for turbulence k, Q, and R when using wall functions.
     Simply acts as a zero gradient condition.
 
 SourceFiles
-    kQRWallFunctionFvPatchField.C
+    kqRWallFunctionFvPatchField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef kQRWallFunctionFvPatchField_H
-#define kQRWallFunctionFvPatchField_H
+#ifndef kqRWallFunctionFvPatchField_H
+#define kqRWallFunctionFvPatchField_H
 
 #include "zeroGradientFvPatchField.H"
 
@@ -49,11 +49,11 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                Class kQRWallFunctionFvPatchField Declaration
+                Class kqRWallFunctionFvPatchField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-class kQRWallFunctionFvPatchField
+class kqRWallFunctionFvPatchField
 :
     public zeroGradientFvPatchField<Type>
 {
@@ -67,20 +67,20 @@ class kQRWallFunctionFvPatchField
 public:
 
     //- Runtime type information
-    TypeName("compressible::kQRWallFunction");
+    TypeName("compressible::kqRWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
@@ -88,20 +88,20 @@ public:
         );
 
         //- Construct by mapping given
-        // kQRWallFunctionFvPatchField
+        // kqRWallFunctionFvPatchField
         //  onto a new patch
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
-            const kQRWallFunctionFvPatchField&,
+            const kqRWallFunctionFvPatchField&,
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
-            const kQRWallFunctionFvPatchField&
+            const kqRWallFunctionFvPatchField&
         );
 
         //- Construct and return a clone
@@ -109,14 +109,14 @@ public:
         {
             return tmp<fvPatchField<Type> >
             (
-                new kQRWallFunctionFvPatchField(*this)
+                new kqRWallFunctionFvPatchField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
-            const kQRWallFunctionFvPatchField&,
+            const kqRWallFunctionFvPatchField&,
             const DimensionedField<Type, volMesh>&
         );
 
@@ -128,7 +128,7 @@ public:
         {
             return tmp<fvPatchField<Type> >
             (
-                new kQRWallFunctionFvPatchField(*this, iF)
+                new kqRWallFunctionFvPatchField(*this, iF)
             );
         }
 
@@ -160,7 +160,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "kQRWallFunctionFvPatchField.C"
+#   include "kqRWallFunctionFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
index 684b60c05c..e25b7ff023 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "kQRWallFunctionFvPatchFields.H"
+#include "kqRWallFunctionFvPatchFields.H"
 #include "fvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
@@ -40,7 +40,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFields(kQRWallFunction);
+makePatchFields(kqRWallFunction);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
index 5f9bd57445..bd72c6a732 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
@@ -24,10 +24,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef kQRWallFunctionFvPatchFields_H
-#define kQRWallFunctionFvPatchFields_H
+#ifndef kqRWallFunctionFvPatchFields_H
+#define kqRWallFunctionFvPatchFields_H
 
-#include "kQRWallFunctionFvPatchField.H"
+#include "kqRWallFunctionFvPatchField.H"
 #include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,7 +41,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeFieldTypedefs(kQRWallFunction)
+makePatchTypeFieldTypedefs(kqRWallFunction)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files
index d5736d3064..ffa915402d 100644
--- a/src/turbulenceModels/incompressible/RAS/Make/files
+++ b/src/turbulenceModels/incompressible/RAS/Make/files
@@ -10,7 +10,7 @@ SpalartAllmaras/SpalartAllmaras.C
 LRR/LRR.C
 LaunderGibsonRSTM/LaunderGibsonRSTM.C
 LaunderSharmaKE/LaunderSharmaKE.C
-QZeta/QZeta.C
+qZeta/qZeta.C
 LienCubicKE/LienCubicKE.C
 LienCubicKELowRe/LienCubicKELowRe.C
 NonlinearKEShih/NonlinearKEShih.C
@@ -33,8 +33,8 @@ $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarFiel
 omegaWallFunctions = $(wallFunctions)/omegaWallFunctions
 $(omegaWallFunctions)/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
 
-kQRWallFunctions = $(wallFunctions)/kQRWallFunctions
-$(kQRWallFunctions)/kQRWallFunction/kQRWallFunctionFvPatchFields.C
+kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
+$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
 
 
 /* Patch fields */
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
index 54b2e4f7b8..e76437f83d 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "kQRWallFunctionFvPatchField.H"
+#include "kqRWallFunctionFvPatchField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -43,11 +43,11 @@ namespace RASModels
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void kQRWallFunctionFvPatchField<Type>::checkType()
+void kqRWallFunctionFvPatchField<Type>::checkType()
 {
     if (!isA<wallFvPatch>(this->patch()))
     {
-        FatalErrorIn("kQRWallFunctionFvPatchField::checkType()")
+        FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << this->patch().name()
             << " must be wall" << nl
@@ -60,7 +60,7 @@ void kQRWallFunctionFvPatchField<Type>::checkType()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -73,9 +73,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
-    const kQRWallFunctionFvPatchField& ptf,
+    const kqRWallFunctionFvPatchField& ptf,
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -88,7 +88,7 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -102,9 +102,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
-    const kQRWallFunctionFvPatchField& tkqrwfpf
+    const kqRWallFunctionFvPatchField& tkqrwfpf
 )
 :
     zeroGradientFvPatchField<Type>(tkqrwfpf)
@@ -114,9 +114,9 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 
 
 template<class Type>
-kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
 (
-    const kQRWallFunctionFvPatchField& tkqrwfpf,
+    const kqRWallFunctionFvPatchField& tkqrwfpf,
     const DimensionedField<Type, volMesh>& iF
 )
 :
@@ -129,7 +129,7 @@ kQRWallFunctionFvPatchField<Type>::kQRWallFunctionFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void kQRWallFunctionFvPatchField<Type>::evaluate
+void kqRWallFunctionFvPatchField<Type>::evaluate
 (
     const Pstream::commsTypes commsType
 )
@@ -139,7 +139,7 @@ void kQRWallFunctionFvPatchField<Type>::evaluate
 
 
 template<class Type>
-void kQRWallFunctionFvPatchField<Type>::write(Ostream& os) const
+void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
 {
     zeroGradientFvPatchField<Type>::write(os);
     this->writeEntry("value", os);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index 1a6c6df194..b97a56239e 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -23,19 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::kQRWallFunctionFvPatchField
+    Foam::incompressible::RASModels::kqRWallFunctionFvPatchField
 
 Description
     Boundary condition for turbulence k, Q, and R when using wall functions.
     Simply acts as a zero gradient condition.
 
 SourceFiles
-    kQRWallFunctionFvPatchField.C
+    kqRWallFunctionFvPatchField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef kQRWallFunctionFvPatchField_H
-#define kQRWallFunctionFvPatchField_H
+#ifndef kqRWallFunctionFvPatchField_H
+#define kqRWallFunctionFvPatchField_H
 
 #include "zeroGradientFvPatchField.H"
 
@@ -49,11 +49,11 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                Class kQRWallFunctionFvPatchField Declaration
+                Class kqRWallFunctionFvPatchField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-class kQRWallFunctionFvPatchField
+class kqRWallFunctionFvPatchField
 :
     public zeroGradientFvPatchField<Type>
 {
@@ -67,20 +67,20 @@ class kQRWallFunctionFvPatchField
 public:
 
     //- Runtime type information
-    TypeName("kQRWallFunction");
+    TypeName("kqRWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
@@ -88,20 +88,20 @@ public:
         );
 
         //- Construct by mapping given
-        // kQRWallFunctionFvPatchField
+        // kqRWallFunctionFvPatchField
         //  onto a new patch
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
-            const kQRWallFunctionFvPatchField&,
+            const kqRWallFunctionFvPatchField&,
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
-            const kQRWallFunctionFvPatchField&
+            const kqRWallFunctionFvPatchField&
         );
 
         //- Construct and return a clone
@@ -109,14 +109,14 @@ public:
         {
             return tmp<fvPatchField<Type> >
             (
-                new kQRWallFunctionFvPatchField(*this)
+                new kqRWallFunctionFvPatchField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        kQRWallFunctionFvPatchField
+        kqRWallFunctionFvPatchField
         (
-            const kQRWallFunctionFvPatchField&,
+            const kqRWallFunctionFvPatchField&,
             const DimensionedField<Type, volMesh>&
         );
 
@@ -128,7 +128,7 @@ public:
         {
             return tmp<fvPatchField<Type> >
             (
-                new kQRWallFunctionFvPatchField(*this, iF)
+                new kqRWallFunctionFvPatchField(*this, iF)
             );
         }
 
@@ -160,7 +160,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "kQRWallFunctionFvPatchField.C"
+#   include "kqRWallFunctionFvPatchField.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
index ae99aa59fd..903f35dc43 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "kQRWallFunctionFvPatchFields.H"
+#include "kqRWallFunctionFvPatchFields.H"
 #include "fvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
@@ -40,7 +40,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFields(kQRWallFunction);
+makePatchFields(kqRWallFunction);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
index 989bec8418..39cc173c33 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
@@ -24,10 +24,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef kQRWallFunctionFvPatchFields_H
-#define kQRWallFunctionFvPatchFields_H
+#ifndef kqRWallFunctionFvPatchFields_H
+#define kqRWallFunctionFvPatchFields_H
 
-#include "kQRWallFunctionFvPatchField.H"
+#include "kqRWallFunctionFvPatchField.H"
 #include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,7 +41,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeFieldTypedefs(kQRWallFunction)
+makePatchTypeFieldTypedefs(kqRWallFunction)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //