diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 98906f927d1a4d16b1b08757bb6e6dc4fe536a36..0eb9f7f349f78778dc53ffa5d5de1466ccf8747c 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,21 +33,18 @@ Description
     \em Walls a zeroGradient boundary condition, the
     \c system/changeDictionaryDict would contain the following:
     \verbatim
-    dictionaryReplacement
+    p                           // field to change
     {
-        p                           // field to change
+        boundaryField
         {
-            boundaryField
+            ".*Wall"            // entry to change
             {
-                ".*Wall"            // entry to change
-                {
-                    type            zeroGradient;
-                }
-                movingWall          // entry to change
-                {
-                    type            fixedValue;
-                    value           uniform 123.45;
-                }
+                type            zeroGradient;
+            }
+            movingWall          // entry to change
+            {
+                type            fixedValue;
+                value           uniform 123.45;
             }
         }
     }
@@ -56,17 +53,20 @@ Description
 
 Usage
 
-    - changeDictionary [OPTION]
+    changeDictionary [OPTION]
+
+    \param -subDict \n
+    Specify the subDict name of the replacements dictionary.
 
     \param -literalRE \n
-    Do not interpret regular expressions or patchGroups;
-    treat them as any other keyword.
+    Do not interpret regular expressions or patchGroups; treat them as any
+    other keyword.
 
     \param -enableFunctionEntries \n
-    By default all dictionary preprocessing of fields is disabled
+    Enable function entries (default: disabled)
 
     \param -disablePatchGroups \n
-    By default all keys are also checked for being patchGroups
+    Disable the default checking for keys being patchGroups
 
 \*---------------------------------------------------------------------------*/
 
@@ -89,7 +89,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Extract groupPatch (= shortcut) info from boundary file info
+// Extract groupPatch info from boundary file info
 HashTable<wordList, word> extractPatchGroups(const dictionary& boundaryDict)
 {
     HashTable<wordList, word> groupToPatch;
@@ -268,7 +268,6 @@ bool merge
 
             if (entryPtr)
             {
-
                 // Mark thisDict entry as having been match for wildcard
                 // handling later on.
                 thisKeysSet.erase(entryPtr->keyword());
@@ -386,6 +385,12 @@ int main(int argc, char *argv[])
 {
     #include "addDictOption.H"
     argList::addOption
+    (
+        "subDict",
+        "name",
+        "specify the subDict name of the replacements dictionary"
+    );
+    argList::addOption
     (
         "instance",
         "name",
@@ -479,7 +484,16 @@ int main(int argc, char *argv[])
     #include "setSystemMeshDictionaryIO.H"
     IOdictionary dict(dictIO);
 
-    const dictionary& replaceDicts = dict.subDict("dictionaryReplacement");
+    const dictionary* replaceDictsPtr = &dict;
+
+    if (args.optionFound("subDict"))
+    {
+        word subDictName(args.optionLookup("subDict")());
+        replaceDictsPtr = &dict.subDict(subDictName);
+    }
+
+    const dictionary& replaceDicts = *replaceDictsPtr;
+
     Info<< "Read dictionary " << dict.name()
         << " with replacements for dictionaries "
         << replaceDicts.toc() << endl;
@@ -514,6 +528,7 @@ int main(int argc, char *argv[])
         )
     );
     const_cast<word&>(IOPtrList<entry>::typeName) = oldTypeName;
+
     // Fake type back to what was in field
     const_cast<word&>(dictList.type()) = dictList.headerClassName();
 
@@ -632,6 +647,7 @@ int main(int argc, char *argv[])
             );
 
             const_cast<word&>(IOdictionary::typeName) = oldTypeName;
+
             // Fake type back to what was in field
             const_cast<word&>(fieldDict.type()) = fieldDict.headerClassName();
 
@@ -652,9 +668,7 @@ int main(int argc, char *argv[])
 
     entry::disableFunctionEntries = oldFlag;
 
-    Info<< endl;
-
-    Info<< "End\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
index 34a2be07d27bcfefe2e68f5b2aeaafb00ebb49bd..59da3161e77f01e3cde83987bc76a451d33bd9be 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
@@ -14,75 +14,72 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    ".*"
     {
-        ".*"
-        {
-            type            mappedPatch;
-        }
+        type            mappedPatch;
     }
+}
 
-    T
-    {
-        internalField   uniform 300;
+T
+{
+    internalField   uniform 300;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
+            type            zeroGradient;
+        }
 
-            minY
-            {
-                type            fixedValue;
-                value           uniform 500;
-            }
+        minY
+        {
+            type            fixedValue;
+            value           uniform 500;
         }
     }
+}
 
-    rho
-    {
-        internalField   uniform 8000;
+rho
+{
+    internalField   uniform 8000;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
-
+            type            zeroGradient;
         }
+
     }
+}
 
-    K
-    {
-        internalField   uniform 80;
+K
+{
+    internalField   uniform 80;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
-
+            type            zeroGradient;
         }
+
     }
+}
 
-    cp
-    {
-        internalField   uniform 450;
+cp
+{
+    internalField   uniform 450;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
-
+            type            zeroGradient;
         }
+
     }
 }
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
index 3ed912733e8a36d3f7015efd3ad4e136475a5dac..ea9fb0d68279b013691194ed4cb6fae5cf3e4bee 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
@@ -14,450 +14,447 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+p
 {
-    p
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    U
+U
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
-            baffleWall
-            {
-                type                activePressureForceBaffleVelocity;
-                cyclicPatch         baffleCyclic_half0;
-                orientation         1;
-                openingTime         0.01;
-                maxOpenFractionDelta 0.1;
-                openFraction        0;
-                minThresholdValue   8000;
-                forceBased          0;
-                value               uniform (0 0 0);
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type            fixedValue;
+            value           uniform (0 0 0);
+        }
+        baffleWall
+        {
+            type                activePressureForceBaffleVelocity;
+            cyclicPatch         baffleCyclic_half0;
+            orientation         1;
+            openingTime         0.01;
+            maxOpenFractionDelta 0.1;
+            openFraction        0;
+            minThresholdValue   8000;
+            forceBased          0;
+            value               uniform (0 0 0);
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    epsilon
+epsilon
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.1;
-            }
-            baffleWall
-            {
-                type            epsilonWallFunction;
-                value           uniform 1e-5;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type            epsilonWallFunction;
+            value           uniform 0.1;
+        }
+        baffleWall
+        {
+            type            epsilonWallFunction;
+            value           uniform 1e-5;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    k
+k
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        kqRWallFunction;
-                value       uniform 1.5;
-         }
-            baffleWall
-            {
-                type        kqRWallFunction;
-                value       uniform 1.5;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        kqRWallFunction;
+            value       uniform 1.5;
+     }
+        baffleWall
+        {
+            type        kqRWallFunction;
+            value       uniform 1.5;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    Su
+Su
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    Xi
+Xi
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform 1;
-            }
-             baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 1;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform 1;
+        }
+         baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 1;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    T
+T
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform 300;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 300;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform 300;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 300;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    Tu
+Tu
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform 300;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 300;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform 300;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 300;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    b
+b
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform 1;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 1;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform 1;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 1;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    ft
+ft
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 0.06024096;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 0.06024096;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
+}
 
-    Aw
+Aw
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform 0.0;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 0.0;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform 0.0;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 0.0;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
-    B
+}
+B
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform (0 0 0 0 0 0);
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform (0 0 0 0 0 0);
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform (0 0 0 0 0 0);
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform (0 0 0 0 0 0);
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
-    betav
+}
+betav
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform 0;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 0;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform 0;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 0;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
-    CR
+}
+CR
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform (0 0 0 0 0 0);
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform (0 0 0 0 0 0);
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform (0 0 0 0 0 0);
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform (0 0 0 0 0 0);
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
-    CT
+}
+CT
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform (0 0 0 0 0 0);
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform (0 0 0 0 0 0);
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform (0 0 0 0 0 0);
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform (0 0 0 0 0 0);
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
-    Nv
+}
+Nv
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform 0;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 0;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform 0;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 0;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
-    nsv
+}
+nsv
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform (0 0 0 0 0 0);
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform (0 0 0 0 0 0);
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform (0 0 0 0 0 0);
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform (0 0 0 0 0 0);
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
-    Lobs
+}
+Lobs
+{
+    boundaryField
     {
-        boundaryField
-        {
-            blockedFaces
-            {
-                type        zeroGradient;
-                value       uniform 0;
-            }
-            baffleWall
-            {
-                type        zeroGradient;
-                value       uniform 0;
-            }
-            baffleCyclic_half0
-            {
-                type        cyclic;
-            }
-            baffleCyclic_half1
-            {
-                type        cyclic;
-            }
+        blockedFaces
+        {
+            type        zeroGradient;
+            value       uniform 0;
+        }
+        baffleWall
+        {
+            type        zeroGradient;
+            value       uniform 0;
+        }
+        baffleCyclic_half0
+        {
+            type        cyclic;
+        }
+        baffleCyclic_half1
+        {
+            type        cyclic;
         }
     }
 }
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
index edf40660b6f46dc7375e64b1bb2b62a6837bdbb4..ffc76ba61d89f79674c76e034b590d4e29a6aeee 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
@@ -14,16 +14,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    region0_to_filmRegion_coupledWall
     {
-        region0_to_filmRegion_coupledWall
-        {
-            samplePatch    region0_to_pyrolysisRegion_coupledWall;
-        }
+        samplePatch    region0_to_pyrolysisRegion_coupledWall;
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
index a77ceae77458e419c76196f604c1a17fdb7ff533..925c3f7429c7f64c599667ecb9c0cc640882766c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
@@ -14,157 +14,154 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+U
 {
-    U
-    {
-        internalField   uniform (0.001 0 0);
+    internalField   uniform (0.001 0 0);
 
-        boundaryField
+    boundaryField
+    {
+        minX
         {
-            minX
-            {
-                type            fixedValue;
-                value           uniform (0.001 0 0);
-            }
+            type            fixedValue;
+            value           uniform (0.001 0 0);
+        }
 
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform (0 0 0);
-            }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform (0 0 0);
+        }
 
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
+        ".*"
+        {
+            type            fixedValue;
+            value           uniform (0 0 0);
         }
     }
+}
+
+T
+{
+    internalField   uniform 300;
 
-    T
+    boundaryField
     {
-        internalField   uniform 300;
-
-        boundaryField
-        {
-            minX
-            {
-                type            fixedValue;
-                value           uniform 300;
-            }
-
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 300;
-            }
-
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-
-            "bottomWater_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     fluidThermo;
-                value           uniform 300;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 300;
+        }
+
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 300;
+        }
+
+        ".*"
+        {
+            type            zeroGradient;
+            value           uniform 300;
+        }
+
+        "bottomWater_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            value           uniform 300;
         }
     }
+}
 
-    epsilon
-    {
-        internalField   uniform 0.01;
+epsilon
+{
+    internalField   uniform 0.01;
 
-        boundaryField
+    boundaryField
+    {
+        minX
         {
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.01;
-            }
+            type            fixedValue;
+            value           uniform 0.01;
+        }
 
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.01;
-            }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.01;
+        }
 
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+        ".*"
+        {
+            type            epsilonWallFunction;
+            value           uniform 0.01;
         }
     }
+}
 
-    k
-    {
-        internalField   uniform 0.1;
+k
+{
+    internalField   uniform 0.1;
 
-        boundaryField
+    boundaryField
+    {
+        minX
         {
-            minX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.1;
-            }
+            type            inletOutlet;
+            inletValue      uniform 0.1;
+        }
 
-            maxX
-            {
-                type            zeroGradient;
-                value           uniform 0.1;
-            }
+        maxX
+        {
+            type            zeroGradient;
+            value           uniform 0.1;
+        }
 
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+        ".*"
+        {
+            type            kqRWallFunction;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
-    {
-        internalField   uniform 0;
+p_rgh
+{
+    internalField   uniform 0;
 
-        boundaryField
+    boundaryField
+    {
+        minX
         {
-            minX
-            {
-                type            zeroGradient;
-                value           uniform 0;
-            }
+            type            zeroGradient;
+            value           uniform 0;
+        }
 
-            maxX
-            {
-                type            fixedValue;
-                value           uniform 0;
-            }
+        maxX
+        {
+            type            fixedValue;
+            value           uniform 0;
+        }
 
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 0;
-            }
+        ".*"
+        {
+            type            fixedFluxPressure;
+            value           uniform 0;
         }
     }
+}
 
-    p
-    {
-        internalField   uniform 0;
+p
+{
+    internalField   uniform 0;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0;
-            }
+            type            calculated;
+            value           uniform 0;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index eb3a65b0dcb523985f0850f5f0f5220b045888df..2a58a037c1d89c2f4b3f9a6b64b302abcbc94e06 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -14,58 +14,55 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minY
     {
-        minY
+        type            patch;
+    }
+    minZ
+    {
+        type            patch;
+    }
+    maxZ
+    {
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            type            patch;
+            type            zeroGradient;
+            value           uniform 300;
         }
-        minZ
+        "heater_to_.*"
         {
-            type            patch;
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
-        maxZ
+
+        heater_to_leftSolid
         {
-            type            patch;
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            thicknessLayers (1e-3);
+            kappaLayers     (5e-4);
+            value           uniform 300;
         }
-    }
 
-    T
-    {
-        internalField   uniform 300;
-
-        boundaryField
+        minY
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "heater_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
-
-            heater_to_leftSolid
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                thicknessLayers (1e-3);
-                kappaLayers     (5e-4);
-                value           uniform 300;
-            }
-
-            minY
-            {
-                type            fixedValue;
-                value           uniform 500;
-            }
+            type            fixedValue;
+            value           uniform 500;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 815b0bad6b81a2492c735692dc2df5d6f6219eee..a3132386a8770e566960b37927a6a96a60bf7ca3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -14,48 +14,45 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
+        type            patch;
+    }
+    maxZ
+    {
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            type            patch;
+            type            zeroGradient;
+            value           uniform 300;
         }
-        maxZ
+        "leftSolid_to_.*"
         {
-            type            patch;
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
-    }
 
-    T
-    {
-        internalField   uniform 300;
-
-        boundaryField
+        leftSolid_to_heater
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "leftSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
-
-            leftSolid_to_heater
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                thicknessLayers (1e-3);
-                kappaLayers     (5e-4);
-                value           uniform 300;
-            }
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            thicknessLayers (1e-3);
+            kappaLayers     (5e-4);
+            value           uniform 300;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index c30bffb777a63cef2ad13a252627e26dbc725799..236a6006e48b4a0019889c00e21e66d4c56a87da 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -14,38 +14,35 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
+        {
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "rightSolid_to_.*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "rightSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index a653992d95d2467028872ef17a25f7b38d5a9870..a0a316a8e660393553be46e8d3c256b9dc62f9a6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -14,155 +14,152 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+U
 {
-    U
+    internalField   uniform (0.1 0 0);
+
+    boundaryField
     {
-        internalField   uniform (0.1 0 0);
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
-            minX
-            {
-                type            fixedValue;
-                value           uniform (0.1 0 0);
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform (0 0 0);
-                value           uniform (0.1 0 0);
-            }
+        ".*"
+        {
+            type            fixedValue;
+            value           uniform (0 0 0);
+        }
+        minX
+        {
+            type            fixedValue;
+            value           uniform (0.1 0 0);
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform (0 0 0);
+            value           uniform (0.1 0 0);
         }
     }
+}
+
+T
+{
+    internalField   uniform 300;
 
-    T
+    boundaryField
     {
-        internalField   uniform 300;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            zeroGradient;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 300;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 300;
-                value           uniform 300;
-            }
-
-            "topAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     fluidThermo;
-                value           uniform 300;
-            }
+        ".*"
+        {
+            type            zeroGradient;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 300;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 300;
+            value           uniform 300;
+        }
+
+        "topAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            value           uniform 300;
         }
     }
+}
+
+epsilon
+{
+    internalField   uniform 0.01;
 
-    epsilon
+    boundaryField
     {
-        internalField   uniform 0.01;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.01;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.01;
-                value           uniform 0.01;
-            }
+        ".*"
+        {
+            type            epsilonWallFunction;
+            value           uniform 0.01;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.01;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.01;
+            value           uniform 0.01;
         }
     }
+}
+
+k
+{
+    internalField   uniform 0.1;
 
-    k
+    boundaryField
     {
-        internalField   uniform 0.1;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.1;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.1;
-                value           uniform 0.1;
-            }
+        ".*"
+        {
+            type            kqRWallFunction;
+            value           uniform 0.1;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.1;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.1;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
-    {
-        internalField   uniform 1e5;
+p_rgh
+{
+    internalField   uniform 1e5;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            fixedValue;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            fixedValue;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
-    {
-        internalField   uniform 1e5;
+p
+{
+    internalField   uniform 1e5;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            calculated;
+            value           uniform 1e5;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index d04fa16ac1ca55aaf39723dcb99965211529c73b..70e25632bfe96e39a12e2c0c934bb04b2f366186 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -14,110 +14,107 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minX
     {
-        minX
-        {
-            type            wall;
-        }
-        maxX
-        {
-            type            wall;
-        }
+        type            wall;
     }
-
-    U
+    maxX
     {
-        internalField   uniform (0.01 0 0);
+        type            wall;
+    }
+}
+
+U
+{
+    internalField   uniform (0.01 0 0);
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
+            type            fixedValue;
+            value           uniform (0 0 0);
         }
     }
+}
 
-    T
-    {
-        internalField   uniform 300;
+T
+{
+    internalField   uniform 300;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
+            type            zeroGradient;
+        }
 
-            "bottomAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     fluidThermo;
-                value           uniform 300;
-            }
+        "bottomAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            value           uniform 300;
         }
     }
+}
 
-    epsilon
-    {
-        // Set the value on all bc to non-zero. Not used in simulation
-        // since zeroGradient; only used in initialisation.
-        internalField   uniform 0.01;
+epsilon
+{
+    // Set the value on all bc to non-zero. Not used in simulation
+    // since zeroGradient; only used in initialisation.
+    internalField   uniform 0.01;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+            type            epsilonWallFunction;
+            value           uniform 0.01;
         }
     }
+}
 
-    k
-    {
-        internalField   uniform 0.1;
+k
+{
+    internalField   uniform 0.1;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+            type            kqRWallFunction;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
-    {
-        internalField   uniform 1e5;
+p_rgh
+{
+    internalField   uniform 1e5;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
-    {
-        internalField   uniform 1e5;
+p
+{
+    internalField   uniform 1e5;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index 38a07d287c2bd2bdaf72f2bd076f5a19b6720297..9e75fe5900e9210ddd8f95e59a049a85f9be465a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -14,47 +14,44 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minY
     {
-        minY
-        {
-            type            patch;
-        }
-        minZ
+        type            patch;
+    }
+    minZ
+    {
+        type            patch;
+    }
+    maxZ
+    {
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            type            patch;
+            type            zeroGradient;
+            value           uniform 300;
         }
-        maxZ
+        "heater_to_.*"
         {
-            type            patch;
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
-    }
-
-    T
-    {
-        internalField   uniform 300;
-
-        boundaryField
+        minY
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "heater_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
-            minY
-            {
-                type            fixedValue;
-                value           uniform 500;
-            }
+            type            fixedValue;
+            value           uniform 500;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index fcfcbf0fd949d4db585ecb9e8de8bb83b124bc39..e097e4bbe73de63594fb3cd113160d575bb5b64a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -14,38 +14,35 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
+        {
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "leftSolid_to_.*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "leftSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index c30bffb777a63cef2ad13a252627e26dbc725799..236a6006e48b4a0019889c00e21e66d4c56a87da 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -14,38 +14,35 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
+        {
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "rightSolid_to_.*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "rightSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index a653992d95d2467028872ef17a25f7b38d5a9870..a0a316a8e660393553be46e8d3c256b9dc62f9a6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -14,155 +14,152 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+U
 {
-    U
+    internalField   uniform (0.1 0 0);
+
+    boundaryField
     {
-        internalField   uniform (0.1 0 0);
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
-            minX
-            {
-                type            fixedValue;
-                value           uniform (0.1 0 0);
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform (0 0 0);
-                value           uniform (0.1 0 0);
-            }
+        ".*"
+        {
+            type            fixedValue;
+            value           uniform (0 0 0);
+        }
+        minX
+        {
+            type            fixedValue;
+            value           uniform (0.1 0 0);
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform (0 0 0);
+            value           uniform (0.1 0 0);
         }
     }
+}
+
+T
+{
+    internalField   uniform 300;
 
-    T
+    boundaryField
     {
-        internalField   uniform 300;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            zeroGradient;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 300;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 300;
-                value           uniform 300;
-            }
-
-            "topAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     fluidThermo;
-                value           uniform 300;
-            }
+        ".*"
+        {
+            type            zeroGradient;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 300;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 300;
+            value           uniform 300;
+        }
+
+        "topAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            value           uniform 300;
         }
     }
+}
+
+epsilon
+{
+    internalField   uniform 0.01;
 
-    epsilon
+    boundaryField
     {
-        internalField   uniform 0.01;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.01;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.01;
-                value           uniform 0.01;
-            }
+        ".*"
+        {
+            type            epsilonWallFunction;
+            value           uniform 0.01;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.01;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.01;
+            value           uniform 0.01;
         }
     }
+}
+
+k
+{
+    internalField   uniform 0.1;
 
-    k
+    boundaryField
     {
-        internalField   uniform 0.1;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.1;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.1;
-                value           uniform 0.1;
-            }
+        ".*"
+        {
+            type            kqRWallFunction;
+            value           uniform 0.1;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.1;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.1;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
-    {
-        internalField   uniform 1e5;
+p_rgh
+{
+    internalField   uniform 1e5;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            fixedValue;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            fixedValue;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
-    {
-        internalField   uniform 1e5;
+p
+{
+    internalField   uniform 1e5;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            calculated;
+            value           uniform 1e5;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index 3883588c67c66b66a086ef5dafc5f7e33a70b76e..e49858a25bd0288f79be55085f673f93def8e426 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -14,176 +14,171 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minX
     {
-        minX
-        {
-            type            wall;
-        }
-        maxX
-        {
-            type            wall;
-        }
+        type            wall;
     }
+    maxX
+    {
+        type            wall;
+    }
+}
 
-    U
+U
+{
+    internalField   uniform (0.01 0 0);
+    boundaryField
     {
-        internalField   uniform (0.01 0 0);
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
+            type            fixedValue;
+            value           uniform (0 0 0);
         }
     }
+}
 
-    T
+T
+{
+    internalField   uniform 300;
+    boundaryField
     {
-        internalField   uniform 300;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
+            type            zeroGradient;
+        }
 
-            "bottomAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappaMethod     fluidThermo;
-                QrNbr           none;
-                Qr              Qr;
-                value           uniform 300;
-            }
+        "bottomAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            QrNbr           none;
+            Qr              Qr;
+            value           uniform 300;
         }
     }
+}
 
-    epsilon
+epsilon
+{
+    internalField   uniform 0.01;
+    boundaryField
     {
-        internalField   uniform 0.01;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+            type            epsilonWallFunction;
+            value           uniform 0.01;
         }
     }
+}
 
-    k
+k
+{
+    internalField   uniform 0.1;
+    boundaryField
     {
-        internalField   uniform 0.1;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+            type            kqRWallFunction;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
+p_rgh
+{
+    internalField   uniform 1e5;
+    boundaryField
     {
-        internalField   uniform 1e5;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
+p
+{
+    internalField   uniform 1e5;
+    boundaryField
     {
-        internalField   uniform 1e5;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
         }
     }
+}
 
-    Qr
+Qr
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  lookup;
-                Qro             uniform 0;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
+            type            greyDiffusiveRadiationViewFactor;
+            emissivityMode  lookup;
+            Qro             uniform 0;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
 
-            "bottomAir_to_.*"
-            {
-                type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  solidRadiation;
-                Qro             uniform 0;
-                value           uniform 0;
-            }
+        "bottomAir_to_.*"
+        {
+            type            greyDiffusiveRadiationViewFactor;
+            emissivityMode  solidRadiation;
+            Qro             uniform 0;
+            value           uniform 0;
         }
     }
+}
 
-    G
+G
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            MarshakRadiation;
-                emissivityMode  lookup;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
+            type            MarshakRadiation;
+            emissivityMode  lookup;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
 
-            "bottomAir_to_.*"
-            {
-                type            MarshakRadiation;
-                emissivityMode  solidRadiation;
-                value           uniform 0;
-            }
+        "bottomAir_to_.*"
+        {
+            type            MarshakRadiation;
+            emissivityMode  solidRadiation;
+            value           uniform 0;
         }
     }
+}
 
-    IDefault
+IDefault
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            greyDiffusiveRadiation;
-                emissivityMode  lookup;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
+            type            greyDiffusiveRadiation;
+            emissivityMode  lookup;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
 
-            "bottomAir_to_.*"
-            {
-                type            greyDiffusiveRadiation;
-                emissivityMode  solidRadiation;
-                value           uniform 0;
-            }
+        "bottomAir_to_.*"
+        {
+            type            greyDiffusiveRadiation;
+            emissivityMode  solidRadiation;
+            value           uniform 0;
         }
     }
-
-
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
index 6f3fbc138e1372709b8e645e36c5b4b5e40805da..d654d223718799b481ff6f45383e6d6a38c4ca3b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
@@ -14,68 +14,65 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minY
     {
-        minY
+        type            patch;
+    }
+    minZ
+    {
+        type            patch;
+    }
+    maxZ
+    {
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            type            patch;
+            type            zeroGradient;
+            value           uniform 300;
         }
-        minZ
+
+        heater_to_topAir
         {
-            type            patch;
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
         }
-        maxZ
+
+        heater_to_bottomAir
         {
-            type            patch;
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
         }
-    }
 
-    T
-    {
-        internalField   uniform 300;
-
-        boundaryField
+        "heater_to_.*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-
-            heater_to_topAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                value           uniform 300;
-            }
-
-            heater_to_bottomAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                value           uniform 300;
-            }
-
-            "heater_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
-            minY
-            {
-                type            fixedValue;
-                value           uniform 500;
-            }
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
+        }
+        minY
+        {
+            type            fixedValue;
+            value           uniform 500;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
index 1ca402cad2f1418fbcb6101c3bd53fbef50a03f2..8cda0f66e009e91f3545bdbc79e1a58921b8a239 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
@@ -14,59 +14,56 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
+            type            zeroGradient;
+            value           uniform 300;
+        }
 
-            leftSolid_to_topAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                value           uniform 300;
-            }
+        leftSolid_to_topAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
 
-            leftSolid_to_bottomAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                value           uniform 300;
-            }
+        leftSolid_to_bottomAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
 
-            "leftSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
+        "leftSolid_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
index afd25cdaa7278edee3793d03daaebfab679f6a29..a6a455047ce05169a5eca02b5a445de673ce6c7c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@@ -14,59 +14,56 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
+            type            zeroGradient;
+            value           uniform 300;
+        }
 
-            rightSolid_to_topAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                value           uniform 300;
-            }
+        rightSolid_to_topAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
 
-            rightSolid_to_bottomAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                value           uniform 300;
-            }
+        rightSolid_to_bottomAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
 
-            "rightSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappaMethod     solidThermo;
-                value           uniform 300;
-            }
+        "rightSolid_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index 1e08e32ba3ddb6a3df8a3bc2b449af8bebed3e2f..81d906dbd9b5537612f3bf1d89b9ebcb7296721c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -14,219 +14,216 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+U
 {
-    U
+    internalField   uniform (0.1 0 0);
+    boundaryField
     {
-        internalField   uniform (0.1 0 0);
-        boundaryField
-        {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
-            minX
-            {
-                type            fixedValue;
-                value           uniform (0.1 0 0);
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform (0 0 0);
-                value           uniform (0.1 0 0);
-            }
+        ".*"
+        {
+            type            fixedValue;
+            value           uniform (0 0 0);
+        }
+        minX
+        {
+            type            fixedValue;
+            value           uniform (0.1 0 0);
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform (0 0 0);
+            value           uniform (0.1 0 0);
         }
     }
+}
 
-    T
+T
+{
+    internalField   uniform 300;
+    boundaryField
     {
-        internalField   uniform 300;
-        boundaryField
-        {
-            ".*"
-            {
-                type            zeroGradient;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 300;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 300;
-                value           uniform 300;
-            }
-
-            "topAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappaMethod     fluidThermo;
-                QrNbr           none;
-                Qr              Qr;
-                value           uniform 300;
-            }
+        ".*"
+        {
+            type            zeroGradient;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 300;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 300;
+            value           uniform 300;
+        }
+
+        "topAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            QrNbr           none;
+            Qr              Qr;
+            value           uniform 300;
         }
     }
+}
 
-    epsilon
+epsilon
+{
+    internalField   uniform 0.01;
+    boundaryField
     {
-        internalField   uniform 0.01;
-        boundaryField
-        {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.01;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.01;
-                value           uniform 0.01;
-            }
+        ".*"
+        {
+            type            epsilonWallFunction;
+            value           uniform 0.01;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.01;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.01;
+            value           uniform 0.01;
         }
     }
+}
 
-    k
+k
+{
+    internalField   uniform 0.1;
+    boundaryField
     {
-        internalField   uniform 0.1;
-        boundaryField
-        {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
-
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.1;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.1;
-                value           uniform 0.1;
-            }
+        ".*"
+        {
+            type            kqRWallFunction;
+            value           uniform 0.1;
+        }
+
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.1;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.1;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
+p_rgh
+{
+    internalField   uniform 1e5;
+    boundaryField
     {
-        internalField   uniform 1e5;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            fixedValue;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            fixedValue;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
+p
+{
+    internalField   uniform 1e5;
+    boundaryField
     {
-        internalField   uniform 1e5;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            calculated;
+            value           uniform 1e5;
         }
     }
+}
 
-    Qr
+Qr
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
-        {
-            ".*"
-            {
-                type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  lookup;
-                Qro             uniform 0;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
-
-            "topAir_to_.*"
-            {
-                type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  solidRadiation;
-                Qro             uniform 0;
-                value           uniform 0;
-            }
+        ".*"
+        {
+            type            greyDiffusiveRadiationViewFactor;
+            emissivityMode  lookup;
+            Qro             uniform 0;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
+
+        "topAir_to_.*"
+        {
+            type            greyDiffusiveRadiationViewFactor;
+            emissivityMode  solidRadiation;
+            Qro             uniform 0;
+            value           uniform 0;
         }
     }
+}
 
-    G
+G
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
-        {
-            ".*"
-            {
-                type            MarshakRadiation;
-                emissivityMode  lookup;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
-
-            "topAir_to_.*"
-            {
-                type            MarshakRadiation;
-                emissivityMode  solidRadiation;
-                value           uniform 0;
-            }
+        ".*"
+        {
+            type            MarshakRadiation;
+            emissivityMode  lookup;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
+
+        "topAir_to_.*"
+        {
+            type            MarshakRadiation;
+            emissivityMode  solidRadiation;
+            value           uniform 0;
         }
     }
+}
 
-    IDefault
+IDefault
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
-        {
-            ".*"
-            {
-                type            greyDiffusiveRadiation;
-                emissivityMode  lookup;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
-
-            "topAir_to_.*"
-            {
-                type            greyDiffusiveRadiation;
-                emissivityMode  solidRadiation;
-                value           uniform 0;
-            }
+        ".*"
+        {
+            type            greyDiffusiveRadiation;
+            emissivityMode  lookup;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
+
+        "topAir_to_.*"
+        {
+            type            greyDiffusiveRadiation;
+            emissivityMode  solidRadiation;
+            value           uniform 0;
         }
     }
 }
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
index f179288734c2a338aab3cc50651f48faa6352029..86d018e1d8cba5a7c033d84506e41cc60920b2a8 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
@@ -14,15 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+mirrorMeshDict
 {
-    mirrorMeshDict
+    pointAndNormalDict
     {
-        pointAndNormalDict
-        {
-            basePoint       (0 0 0);
-            normalVector    (0 -1 0);
-        }
+        basePoint       (0 0 0);
+        normalVector    (0 -1 0);
     }
 }
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
index 799d18406934437765cc12ce54c7a77b8971bd64..58b6919f81b46430a720ee715b723372a528f288 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
@@ -14,15 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+mirrorMeshDict
 {
-    mirrorMeshDict
+    pointAndNormalDict
     {
-        pointAndNormalDict
-        {
-            basePoint       (0 0 0);
-            normalVector    (-1 0 0);
-        }
+        basePoint       (0 0 0);
+        normalVector    (-1 0 0);
     }
 }
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
index f179288734c2a338aab3cc50651f48faa6352029..86d018e1d8cba5a7c033d84506e41cc60920b2a8 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
@@ -14,15 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+mirrorMeshDict
 {
-    mirrorMeshDict
+    pointAndNormalDict
     {
-        pointAndNormalDict
-        {
-            basePoint       (0 0 0);
-            normalVector    (0 -1 0);
-        }
+        basePoint       (0 0 0);
+        normalVector    (0 -1 0);
     }
 }
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
index dd3d9cae114234f72a045fd3c2c574ad5db7291a..15e462fbf3df1876edc496c0a9a5a0f82ece90db 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
@@ -14,57 +14,54 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+T
 {
-    T
+    boundaryField
     {
-        boundaryField
+        wallFilm
         {
-            wallFilm
-            {
-                type            mapped;
-                field       Tsf;
-                average         300;
-                setAverage      no;
-                value           uniform 300;
-            }
+            type            mapped;
+            field       Tsf;
+            average         300;
+            setAverage      no;
+            value           uniform 300;
         }
     }
+}
 
-    U
+U
+{
+    boundaryField
     {
-        boundaryField
+        wallFilm
         {
-            wallFilm
-            {
-                type            mapped;
-                field       Usf;
-                average         (0 0 0);
-                setAverage      no;
-                value           uniform (0 0 0);
-            }
+            type            mapped;
+            field       Usf;
+            average         (0 0 0);
+            setAverage      no;
+            value           uniform (0 0 0);
         }
     }
+}
 
-    "nut"
+"nut"
+{
+    boundaryField
     {
-        boundaryField
+        wallFilm
         {
-            wallFilm
-            {
-                value           uniform 0;
-            }
+            value           uniform 0;
         }
     }
+}
 
-    "alphat"
+"alphat"
+{
+    boundaryField
     {
-        boundaryField
+        wallFilm
         {
-            wallFilm
-            {
-                value           uniform 0;
-            }
+            value           uniform 0;
         }
     }
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
index 908f3c60e1fe83fa7798c1d431f46a6f6c872b9c..4f313de959b31c5b66043ea241016debadd73773 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
@@ -14,182 +14,179 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+alphat
 {
-    alphat
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    epsilon
+}
+epsilon
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    G
+}
+G
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    H2O
+}
+H2O
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    k
+}
+k
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    nut
+}
+nut
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    N2
+}
+N2
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    O2
+}
+O2
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    p
+}
+p
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    T
+}
+T
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform 0;
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform 0;
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform 0;
         }
     }
-    U
+}
+U
+{
+    boundaryField
     {
-        boundaryField
-        {
-            cycLeft
-            {
-                type            cyclic;
-                value           uniform (0 0 0);
-            }
-            cycRight
-            {
-                type            cyclic;
-                value           uniform (0 0 0);
-            }
+        cycLeft
+        {
+            type            cyclic;
+            value           uniform (0 0 0);
+        }
+        cycRight
+        {
+            type            cyclic;
+            value           uniform (0 0 0);
         }
     }
 }
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
index 4ffe6871510e5c2e9cba3596fe5d63533eabe94e..bbd62e5d84016add754f40ca4583015494dbe894 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
@@ -14,32 +14,29 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+p_rgh
 {
-    p_rgh
+    boundaryField
     {
-        boundaryField
+        porous_half0
         {
-            porous_half0
-            {
-                type            porousBafflePressure;
-                patchType       cyclic;
-                D               700;
-                I               500;
-                length          1.05;
-                jump            uniform 0;
-                value           uniform 0;
-            }
-            porous_half1
-            {
-                type            porousBafflePressure;
-                patchType       cyclic;
-                D               700;
-                I               500;
-                length          1.05;
-                jump            uniform 0;
-                value           uniform 0;
-            }
+            type            porousBafflePressure;
+            patchType       cyclic;
+            D               700;
+            I               500;
+            length          1.05;
+            jump            uniform 0;
+            value           uniform 0;
+        }
+        porous_half1
+        {
+            type            porousBafflePressure;
+            patchType       cyclic;
+            D               700;
+            I               500;
+            length          1.05;
+            jump            uniform 0;
+            value           uniform 0;
         }
     }
 }