diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon
index 1b7c6c0d70a42a55f17e2b579fa12cf5403e1412..698ff247d3588ecf485750ed392cd0745e137d2c 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon
@@ -23,13 +23,13 @@ boundaryField
 {
     movingWall
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k
index 64ea0ca8fbd25e149a023c3c3ecee9af977197a8..8f645b088c807cbc6b2215416a42a7e5e316c791 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.00325;
 
@@ -23,16 +23,14 @@ boundaryField
 {
     movingWall
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 0;
     }
-
     fixedWalls
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 0;
     }
-
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
index 3aaa8e77f82971aa58a9b96e84e20178a824085a..a0f4c473102445c3741b8324de193086abc82af1 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -1 0 0 0 0 ];
+dimensions      [1 -1 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -26,13 +26,11 @@ boundaryField
         type            mutWallFunction;
         value           uniform 0;
     }
-
     fixedWalls
     {
         type            mutWallFunction;
         value           uniform 0;
     }
-
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega
index fa4f022f0140184baac96f3b5198908e796c1cf2..863c2292b647b2cee86d4fe26c990f3677ed9502 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 -1 0 0 0 0 ];
+dimensions      [0 0 -1 0 0 0 0];
 
 internalField   uniform 2.6;
 
@@ -23,16 +23,14 @@ boundaryField
 {
     movingWall
     {
-        type            omegaWallFunction;
+        type            compressible::omegaWallFunction;
         value           uniform 0;
     }
-
     fixedWalls
     {
-        type            omegaWallFunction;
+        type            compressible::omegaWallFunction;
         value           uniform 0;
     }
-
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
index d02b85fec4397d8da50129dd6d2374b56619abe6..f7638810ff7a4d465637cea0b9f7caca2680d98f 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture         air 1 28.9 1007 0 1.84e-05 0.7;
 
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
index 6009ab2e41fce778c6727190423c93de7cf226ab..5784dfae929e92896e6c4c76f76f76d44e143ce5 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,22 +21,425 @@ internalField   uniform 300;
 
 boundaryField
 {
-    floor           
+    floor
     {
         type            fixedValue;
-        value           uniform 300;
+        value           nonuniform List<scalar> 
+400
+(
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+600
+600
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+600
+600
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+300
+)
+;
     }
-
-    ceiling         
+    ceiling
     {
         type            fixedValue;
         value           uniform 300;
     }
-
-    fixedWalls      
+    fixedWalls
     {
         type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/thermophysicalProperties
index f826516c2ebc44480f764103bbcc05c3f2e83efd..fb233e2de3b1b75cced36021ada8f28f58c58802 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture         air 1 28.9 1000 0 1.8e-05 0.7;