diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
index d03622d29a285b0e386bf5da0dc6de5d631091d6..0234af55c118417af7ffbf8e9bb75c19597acaf2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -25,7 +25,7 @@ constSolidThermoCoeffs
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
     K   K   [1  1 -3 -1 0 0 0] 80;
 
-    //- radiative properties
+    //- radiation properties
     kappa kappa [0 -1 0 0 0 0 0]            0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 0;
@@ -37,21 +37,19 @@ constSolidThermoCoeffs
 
 isotropicKSolidThermoCoeffs
 {
-
     //- thermo properties
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
     KValues             (80 40);
 
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
     HfValues            (0 0);
-
 }
 
 
@@ -81,10 +79,10 @@ directionalKSolidThermoCoeffs
     //- chemical properties
     HfValues            (1 1);
 
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (1 1);
-    sigmaSValues         (1 1);
+    sigmaSValues        (1 1);
 }
 
 solidComponents
@@ -94,26 +92,26 @@ solidComponents
 
 pmmaCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.1;
     }
-    thermoProperties
+    thermodynamics
     {
         Hf      0;
         C0      1462; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+    density
     {
         rho     1114.0;
     }
@@ -121,26 +119,29 @@ pmmaCoeffs
 
 charCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.0;
     }
-    thermoProperties
+
+    thermodynamics
     {
         Hf      0;
         C0      611.0;; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+
+    density
     {
         rho     11.5;
     }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
index 9bf5dc34670b2ab5e4be8048a73faeba92fd1abb..c1968e1bb02c22c82e51e53e080e67f9aa0c87fe 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
@@ -27,7 +27,7 @@ constSolidThermoCoeffs
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
     K   K   [1  1 -3 -1 0 0 0] 80;
 
-    //- radiative properties
+    //- radiation properties
     kappa kappa [0 -1 0 0 0 0 0]            0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 1;
@@ -39,22 +39,19 @@ constSolidThermoCoeffs
 
 isotropicKSolidThermoCoeffs
 {
-
     //- thermo properties
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
     KValues             (80 40);
 
-
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
     HfValues            (1 1);
-
 }
 
 
@@ -84,7 +81,7 @@ directionalKSolidThermoCoeffs
     //- chemical properties
     HfValues            (1 1);
 
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (1 1);
     sigmaSValues         (1 1);
@@ -97,26 +94,29 @@ solidComponents
 
 pmmaCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.1;
     }
-    thermoProperties
+
+    thermodynamics
     {
         Hf      0;
         C0      1462; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+
+    density
     {
         rho     1114.0;
     }
@@ -124,26 +124,29 @@ pmmaCoeffs
 
 charCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.0;
     }
-    thermoProperties
+
+    thermodynamics
     {
         Hf      0;
         C0      611.0;; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+
+    density
     {
         rho     11.5;
     }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
index 5d187a22e97e9ddd9e196aff37b299e89a6a5147..42cfac6c97cbfdde3ac086ba3ea66f65ede6abd0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -27,7 +27,7 @@ constSolidThermoCoeffs
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
     K   K   [1  1 -3 -1 0 0 0] 80;
 
-    //- radiative properties
+    //- radiation properties
     kappa kappa [0 -1 0 0 0 0 0]            0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 1;
@@ -39,21 +39,19 @@ constSolidThermoCoeffs
 
 isotropicKSolidThermoCoeffs
 {
-
     //- thermo properties
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
     KValues             (80 40);
 
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
     HfValues            (1 1);
-
 }
 
 
@@ -83,10 +81,10 @@ directionalKSolidThermoCoeffs
     //- chemical properties
     HfValues            (1 1);
 
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (1 1);
-    sigmaSValues         (1 1);
+    sigmaSValues        (1 1);
 }
 
 solidComponents
@@ -96,26 +94,26 @@ solidComponents
 
 pmmaCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.1;
     }
-    thermoProperties
+    thermodynamics
     {
         Hf      0;
         C0      1462; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+    density
     {
         rho     1114.0;
     }
@@ -123,26 +121,26 @@ pmmaCoeffs
 
 charCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.0;
     }
-    thermoProperties
+    thermodynamics
     {
         Hf      0;
         C0      611.0;; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+    density
     {
         rho     11.5;
     }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
index 6a996263882cd4eba788cd1d22c511f1edbea197..8433d0e842c612e31ec26354dc74f6397eaa3c29 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -27,7 +27,7 @@ constSolidThermoCoeffs
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
     K   K   [1  1 -3 -1 0 0 0] 80;
 
-    //- radiative properties
+    //- radiation properties
     kappa kappa [0 -1 0 0 0 0 0]            0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 1;
@@ -39,22 +39,19 @@ constSolidThermoCoeffs
 
 isotropicKSolidThermoCoeffs
 {
-
     //- thermo properties
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
     KValues             (80 40);
 
-
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
     HfValues            (1 1);
-
 }
 
 
@@ -84,7 +81,7 @@ directionalKSolidThermoCoeffs
     //- chemical properties
     HfValues            (1 1);
 
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (1 1);
     sigmaSValues         (1 1);
@@ -97,26 +94,29 @@ solidComponents
 
 pmmaCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.1;
     }
-    thermoProperties
+
+    thermodynamics
     {
         Hf      0;
         C0      1462; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+
+    density
     {
         rho     1114.0;
     }
@@ -124,26 +124,29 @@ pmmaCoeffs
 
 charCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.0;
     }
-    thermoProperties
+
+    thermodynamics
     {
         Hf      0;
         C0      611.0; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+
+    density
     {
         rho     11.5;
     }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
index 08de18bfc63d2e8f010a149975f66cbd90eeac7f..0c8cf4597f12442c230ceaceafb504c764386324 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
@@ -27,7 +27,7 @@ constSolidThermoCoeffs
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
     K   K   [1  1 -3 -1 0 0 0] 80;
 
-    //- radiative properties
+    //- radiation properties
     kappa kappa [0 -1 0 0 0 0 0]            0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 0.5;
@@ -39,22 +39,19 @@ constSolidThermoCoeffs
 
 isotropicKSolidThermoCoeffs
 {
-
     //- thermo properties
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
     KValues             (80 40);
 
-
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
     HfValues            (1 1);
-
 }
 
 
@@ -84,7 +81,7 @@ directionalKSolidThermoCoeffs
     //- chemical properties
     HfValues            (1 1);
 
-    //- radiative properties
+    //- radiation properties
     emissivityValues    (1 1);
     kappaValues         (1 1);
     sigmaSValues         (1 1);
@@ -97,26 +94,29 @@ solidComponents
 
 pmmaCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.1;
     }
-    thermoProperties
+
+    thermodynamics
     {
         Hf      0;
         C0      1462; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+
+    density
     {
         rho     1114.0;
     }
@@ -124,26 +124,29 @@ pmmaCoeffs
 
 charCoeffs
 {
-    transportProperties
+    transport
     {
         K0      0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
-    radiativeProperties
+
+    radiation
     {
         sigmaS      0.0;
         kappa       0.0;
         emissivity  0.0;
     }
-    thermoProperties
+
+    thermodynamics
     {
         Hf      0;
         C0      611.0;; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }
-    densityProperties
+
+    density
     {
         rho     11.5;
     }