diff --git a/etc/templates/axisymmetricJet/constant/turbulenceProperties b/etc/templates/axisymmetricJet/constant/turbulenceProperties
index dc0e00cc54..f0add28ce4 100644
--- a/etc/templates/axisymmetricJet/constant/turbulenceProperties
+++ b/etc/templates/axisymmetricJet/constant/turbulenceProperties
@@ -14,6 +14,38 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+    printCoeffs         on;
+}
+
+LES
+{
+    LESModel            SpalartAllmarasDDES;
+    delta               cubeRootVol;
+
+    turbulence          on;
+    printCoeffs         on;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/etc/templates/axisymmetricJet/system/fvSchemes b/etc/templates/axisymmetricJet/system/fvSchemes
index ddcdf027dc..81fab71cd5 100644
--- a/etc/templates/axisymmetricJet/system/fvSchemes
+++ b/etc/templates/axisymmetricJet/system/fvSchemes
@@ -39,8 +39,7 @@ divSchemes
     div(phi,k)      $turbulence;
     div(phi,omega)  $turbulence;
     div(phi,epsilon) $turbulence;
-
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -62,6 +61,12 @@ fluxRequired
 {
     default         no;
     p               ;
+    p_rgh           ;
+}
+
+wallDist
+{
+    method meshWave;
 }
 
 // ************************************************************************* //
diff --git a/etc/templates/closedVolume/constant/turbulenceProperties b/etc/templates/closedVolume/constant/turbulenceProperties
index dc0e00cc54..dbb800fa40 100644
--- a/etc/templates/closedVolume/constant/turbulenceProperties
+++ b/etc/templates/closedVolume/constant/turbulenceProperties
@@ -14,6 +14,38 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel            kEpsilon;
+
+    turbulence          on;
+    printCoeffs         on;
+}
+
+LES
+{
+    LESModel            SpalartAllmarasDDES;
+    delta               cubeRootVol;
+
+    turbulence          on;
+    printCoeffs         on;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/etc/templates/closedVolume/system/fvSchemes b/etc/templates/closedVolume/system/fvSchemes
index bd2779fb8b..99b68a83fe 100644
--- a/etc/templates/closedVolume/system/fvSchemes
+++ b/etc/templates/closedVolume/system/fvSchemes
@@ -42,7 +42,7 @@ divSchemes
 
     div(phi,T)      $turbulence;
 
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -63,7 +63,12 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    p_rgh             ;
+    p_rgh           ;
+}
+
+wallDist
+{
+    method meshWave;
 }
 
 // ************************************************************************* //
diff --git a/etc/templates/closedVolumeRotating/README b/etc/templates/closedVolumeRotating/README
index d238875658..693cee7bd9 100644
--- a/etc/templates/closedVolumeRotating/README
+++ b/etc/templates/closedVolumeRotating/README
@@ -4,4 +4,4 @@ Overview
 + Can be used for MRF or AMI simulations
 + Setup to run the simpleFoam solver
 + Set up is like inflowOutflowRotating but without inlet and outlet
-+ See $FOAM_ETC/templates/closedVolumeRotating/README for details of use
++ See $FOAM_ETC/templates/closedVolume/README for details of use
\ No newline at end of file
diff --git a/etc/templates/axisymmetricJet/constant/RASProperties b/etc/templates/closedVolumeRotating/constant/MRFProperties
similarity index 83%
rename from etc/templates/axisymmetricJet/constant/RASProperties
rename to etc/templates/closedVolumeRotating/constant/MRFProperties
index fefd567beb..34fef0cc71 100644
--- a/etc/templates/axisymmetricJet/constant/RASProperties
+++ b/etc/templates/closedVolumeRotating/constant/MRFProperties
@@ -10,14 +10,17 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    location    "constant";
+    object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        kOmegaSST;
+MRF1
+{
+    cellZone    rotatingZone;
+    active      yes;
 
-turbulence      on;
-
-printCoeffs     on;
+    #include "rotatingZoneProperties"
+}
 
 // ************************************************************************* //
diff --git a/etc/templates/closedVolumeRotating/constant/RASProperties b/etc/templates/closedVolumeRotating/constant/RASProperties
deleted file mode 100644
index fefd567beb..0000000000
--- a/etc/templates/closedVolumeRotating/constant/RASProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-// ************************************************************************* //
diff --git a/etc/templates/closedVolumeRotating/constant/turbulenceProperties b/etc/templates/closedVolumeRotating/constant/turbulenceProperties
index dc0e00cc54..f0add28ce4 100644
--- a/etc/templates/closedVolumeRotating/constant/turbulenceProperties
+++ b/etc/templates/closedVolumeRotating/constant/turbulenceProperties
@@ -14,6 +14,38 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+    printCoeffs         on;
+}
+
+LES
+{
+    LESModel            SpalartAllmarasDDES;
+    delta               cubeRootVol;
+
+    turbulence          on;
+    printCoeffs         on;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/etc/templates/closedVolumeRotating/system/fvOptions b/etc/templates/closedVolumeRotating/system/fvOptions
deleted file mode 100644
index 2d6dfa8e56..0000000000
--- a/etc/templates/closedVolumeRotating/system/fvOptions
+++ /dev/null
@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      fvOptions;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-MRF1
-{
-    type            MRFSource;
-    selectionMode   cellZone;
-    cellZone        rotatingZone;
-    active          yes;
-
-    MRFSourceCoeffs
-    {
-        #include "${FOAM_CASE}/constant/rotatingZoneProperties"
-    }
-}
-
-// ************************************************************************* //
diff --git a/etc/templates/closedVolumeRotating/system/fvSchemes b/etc/templates/closedVolumeRotating/system/fvSchemes
index ddcdf027dc..89a953f42f 100644
--- a/etc/templates/closedVolumeRotating/system/fvSchemes
+++ b/etc/templates/closedVolumeRotating/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
     div(phi,omega)  $turbulence;
     div(phi,epsilon) $turbulence;
 
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -64,4 +64,9 @@ fluxRequired
     p               ;
 }
 
+wallDist
+{
+    method meshWave;
+}
+
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflow/constant/RASProperties b/etc/templates/inflowOutflow/constant/RASProperties
deleted file mode 100644
index fefd567beb..0000000000
--- a/etc/templates/inflowOutflow/constant/RASProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-// ************************************************************************* //
diff --git a/etc/templates/inflowOutflow/constant/turbulenceProperties b/etc/templates/inflowOutflow/constant/turbulenceProperties
index dc0e00cc54..f0add28ce4 100644
--- a/etc/templates/inflowOutflow/constant/turbulenceProperties
+++ b/etc/templates/inflowOutflow/constant/turbulenceProperties
@@ -14,6 +14,38 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+    printCoeffs         on;
+}
+
+LES
+{
+    LESModel            SpalartAllmarasDDES;
+    delta               cubeRootVol;
+
+    turbulence          on;
+    printCoeffs         on;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflow/system/fvSchemes b/etc/templates/inflowOutflow/system/fvSchemes
index ddcdf027dc..89a953f42f 100644
--- a/etc/templates/inflowOutflow/system/fvSchemes
+++ b/etc/templates/inflowOutflow/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
     div(phi,omega)  $turbulence;
     div(phi,epsilon) $turbulence;
 
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -64,4 +64,9 @@ fluxRequired
     p               ;
 }
 
+wallDist
+{
+    method meshWave;
+}
+
 // ************************************************************************* //
diff --git a/etc/templates/closedVolume/constant/RASProperties b/etc/templates/inflowOutflowRotating/constant/MRFProperties
similarity index 83%
rename from etc/templates/closedVolume/constant/RASProperties
rename to etc/templates/inflowOutflowRotating/constant/MRFProperties
index 496ee3b41c..34fef0cc71 100644
--- a/etc/templates/closedVolume/constant/RASProperties
+++ b/etc/templates/inflowOutflowRotating/constant/MRFProperties
@@ -10,14 +10,17 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    location    "constant";
+    object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        kEpsilon;
+MRF1
+{
+    cellZone    rotatingZone;
+    active      yes;
 
-turbulence      on;
-
-printCoeffs     on;
+    #include "rotatingZoneProperties"
+}
 
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflowRotating/constant/RASProperties b/etc/templates/inflowOutflowRotating/constant/RASProperties
deleted file mode 100644
index fefd567beb..0000000000
--- a/etc/templates/inflowOutflowRotating/constant/RASProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-// ************************************************************************* //
diff --git a/etc/templates/inflowOutflowRotating/constant/turbulenceProperties b/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
index dc0e00cc54..f0add28ce4 100644
--- a/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
+++ b/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
@@ -14,6 +14,38 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+    printCoeffs         on;
+}
+
+LES
+{
+    LESModel            SpalartAllmarasDDES;
+    delta               cubeRootVol;
+
+    turbulence          on;
+    printCoeffs         on;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflowRotating/system/fvOptions b/etc/templates/inflowOutflowRotating/system/fvOptions
deleted file mode 100644
index 2d6dfa8e56..0000000000
--- a/etc/templates/inflowOutflowRotating/system/fvOptions
+++ /dev/null
@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      fvOptions;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-MRF1
-{
-    type            MRFSource;
-    selectionMode   cellZone;
-    cellZone        rotatingZone;
-    active          yes;
-
-    MRFSourceCoeffs
-    {
-        #include "${FOAM_CASE}/constant/rotatingZoneProperties"
-    }
-}
-
-// ************************************************************************* //
diff --git a/etc/templates/inflowOutflowRotating/system/fvSchemes b/etc/templates/inflowOutflowRotating/system/fvSchemes
index ddcdf027dc..89a953f42f 100644
--- a/etc/templates/inflowOutflowRotating/system/fvSchemes
+++ b/etc/templates/inflowOutflowRotating/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
     div(phi,omega)  $turbulence;
     div(phi,epsilon) $turbulence;
 
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -64,4 +64,9 @@ fluxRequired
     p               ;
 }
 
+wallDist
+{
+    method meshWave;
+}
+
 // ************************************************************************* //