diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
index dd74be1133a46b9ff97ad2064ed6cc089baf8d8d..7e8969b3078e2322a1a0b322509d596eb333ca63 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
@@ -23,13 +23,7 @@ boundaryField
     //- Set patchGroups for constraint patches
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
 
-    ground
-    {
-        type            fixedValue;
-        value           uniform 265;
-    }
-
-    igloo_region0
+    wall
     {
         type            fixedValue;
         value           uniform 265;
@@ -43,8 +37,7 @@ boundaryField
 
     twoFridgeFreezers_herring_1
     {
-        type            fixedValue;
-        value           uniform 303;
+        $twoFridgeFreezers_seal_0;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
index f1a91fe9714a2a5299bc4a09327c18ac9df13324..03d53ee7ed6204637a49f2c048c169f6a52a7efb 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
@@ -23,25 +23,7 @@ boundaryField
     //- Set patchGroups for constraint patches
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
 
-    ground
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    igloo_region0
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    twoFridgeFreezers_seal_0
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    twoFridgeFreezers_herring_1
+    wall
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
index b75802e0e81c67886d7640dda6eff85934947043..e36fe920fca9129567de3e086d9304c174333b7a 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
@@ -24,25 +24,7 @@ boundaryField
     //- Set patchGroups for constraint patches
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
 
-    ground
-    {
-        type            epsilonWallFunction;
-        value           uniform 0.01;
-    }
-
-    igloo_region0
-    {
-        type            epsilonWallFunction;
-        value           uniform 0.01;
-    }
-
-    twoFridgeFreezers_seal_0
-    {
-        type            epsilonWallFunction;
-        value           uniform 0.01;
-    }
-
-    twoFridgeFreezers_herring_1
+    wall
     {
         type            epsilonWallFunction;
         value           uniform 0.01;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
index 04edc9d0d718ca3ad5d6c5030f7988a9571fde1a..0d889ec8f851f20eb41b7231500003ea9474167a 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
@@ -24,25 +24,7 @@ boundaryField
     //- Set patchGroups for constraint patches
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
 
-    ground
-    {
-        type            kqRWallFunction;
-        value           uniform 0.1;
-    }
-
-    igloo_region0
-    {
-        type            kqRWallFunction;
-        value           uniform 0.1;
-    }
-
-    twoFridgeFreezers_seal_0
-    {
-        type            kqRWallFunction;
-        value           uniform 0.1;
-    }
-
-    twoFridgeFreezers_herring_1
+    wall
     {
         type            kqRWallFunction;
         value           uniform 0.1;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat
index 5c82ad4a5580eb46a966f9a8bcc4b1030a435732..44f2524e7fe1831c0d373adcc6586c9fff364f8c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat
@@ -24,28 +24,7 @@ boundaryField
     //- Set patchGroups for constraint patches
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
 
-    ground
-    {
-        type            kappatJayatillekeWallFunction;
-        Prt             0.85;
-        value           uniform 0;
-    }
-
-    igloo_region0
-    {
-        type            kappatJayatillekeWallFunction;
-        Prt             0.85;
-        value           uniform 0;
-    }
-
-    twoFridgeFreezers_seal_0
-    {
-        type            kappatJayatillekeWallFunction;
-        Prt             0.85;
-        value           uniform 0;
-    }
-
-    twoFridgeFreezers_herring_1
+    wall
     {
         type            kappatJayatillekeWallFunction;
         Prt             0.85;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
index b8dae4d50fbd4d2ede26b7377332d56ee79e78fd..42472f31f0e68965ee9a1ad13f6601fa5b0fccd3 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
@@ -24,25 +24,7 @@ boundaryField
     //- Set patchGroups for constraint patches
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
 
-    ground
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
-    igloo_region0
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
-    twoFridgeFreezers_seal_0
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-
-    twoFridgeFreezers_herring_1
+    wall
     {
         type            nutkWallFunction;
         value           uniform 0;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index 19bfa3d347bb90bc7845cd7e598947c04de99f63..5a2eb19619103fb42215271895f29e7570444dad 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
@@ -23,25 +23,7 @@ boundaryField
     //- Set patchGroups for constraint patches
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
 
-    ground
-    {
-        type            calculated;
-        value           $internalField;
-    }
-
-    igloo_region0
-    {
-        type            calculated;
-        value           $internalField;
-    }
-
-    twoFridgeFreezers_seal_0
-    {
-        type            calculated;
-        value           $internalField;
-    }
-
-    twoFridgeFreezers_herring_1
+    wall
     {
         type            calculated;
         value           $internalField;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
index e39f2ab7cec1a5b80d80c8ba492fe66bf148105c..69ceeb45df80d6666aa57b7a0d5ace5a82eba0c2 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
@@ -23,28 +23,7 @@ boundaryField
     //- Set patchGroups for constraint patches
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
 
-    ground
-    {
-        type            fixedFluxPressure;
-        rho             rhok;
-        value           uniform 0;
-    }
-
-    igloo_region0
-    {
-        type            fixedFluxPressure;
-        rho             rhok;
-        value           uniform 0;
-    }
-
-    twoFridgeFreezers_seal_0
-    {
-        type            fixedFluxPressure;
-        rho             rhok;
-        value           uniform 0;
-    }
-
-    twoFridgeFreezers_herring_1
+    wall
     {
         type            fixedFluxPressure;
         rho             rhok;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
index 57de714b2f21d69799a5ac2742c90c6cae941e47..c854ce532d428bb89c9389ccb5b1a3085f262077 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
@@ -78,7 +78,8 @@ boundary
 
     ground
     {
-        type wall;
+        type        wall;
+        inGroups    (wall);
         faces
         (
             (0 3 2 1)
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
index 590a482d4a0ab0771e23f9cf7b5f5c20c7c442c2..31ca07d47d105adc96770c8f2667ff9a10b655ea 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
@@ -15,6 +15,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+libs
+(
+    "libincompressibleTurbulenceModel.so"
+    "libincompressibleRASModels.so"
+    "libincompressibleTransportModels.so"
+);
+
 application     buoyantBoussinesqSimpleFoam;
 
 startFrom       startTime;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
index 09e2478dbb33706da812b761e393eb4e280df091..7c420218539e58612ac150f681086e87a7ed50c6 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 6;
+numberOfSubdomains 2;
 
-method          hierarchical;
+method          scotch;
 
 simpleCoeffs
 {
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index bc90ed1c2b5ff900402f1dc5e704347fddf8f3f7..c5e80f8d1a3715a2600d25caa26d4fb32be862cf 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -148,12 +148,28 @@ castellatedMeshControls
                     level (3 3);
                 }
             }
+
+            // Optional specification of patch type (default is wall). No
+            // constraint types (cyclic, symmetry) etc. are allowed.
+            patchInfo
+            {
+                type        wall;
+                inGroups    (wall);
+            }
         }
 
         "iglo.*"
         {
             // Surface-wise min and max refinement level
             level (1 1);
+
+            // Optional specification of patch type (default is wall). No
+            // constraint types (cyclic, symmetry) etc. are allowed.
+            patchInfo
+            {
+                type        wall;
+                inGroups    (wall);
+            }
         }
     }