diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/thermophysicalProperties.solid b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/thermophysicalProperties.solid
index a306b8b1a6..6965784cde 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/thermophysicalProperties.solid
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/thermophysicalProperties.solid
@@ -20,10 +20,10 @@ thermoType
     type            heSolidThermo;
     mixture         pureMixture;
     transport       constIso;
-    thermo          hConst;
+    thermo          eConst;
     equationOfState rhoConst;
     specie          specie;
-    energy          sensibleEnthalpy;
+    energy          sensibleInternalEnergy;
 }
 
 mixture
@@ -39,7 +39,7 @@ mixture
     thermodynamics
     {
         Hf              0;
-        Cp              1900;
+        Cv              1900;
     }
     transport
     {
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches
index 64f4fc625e..b935ef9090 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches
@@ -8,7 +8,7 @@
 
 T
 {
-    type   compressible::thermalBaffle1D<hConstSolidThermoPhysics>;
+    type   compressible::thermalBaffle1D<eConstSolidThermoPhysics>;
 
     thickness       uniform 0.005;  // thickness [m]
     Qs              uniform 100;    // heat flux [W/m^2]
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
index f7a92ca6b0..56218d2593 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
@@ -17,7 +17,7 @@ transport
 thermodynamics
 {
     Hf              0;
-    Cp              10;
+    Cv              10;
 }
 equationOfState
 {
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
index 573d92dd6c..bd69fbf87f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
@@ -12,10 +12,10 @@ thermoType
     type            heSolidThermo;
     mixture         pureMixture;
     transport       constIso;
-    thermo          hConst;
+    thermo          eConst;
     equationOfState rhoConst;
     specie          specie;
-    energy          sensibleEnthalpy;
+    energy          sensibleInternalEnergy;
 }
 
 mixture
@@ -31,7 +31,7 @@ mixture
     thermodynamics
     {
         Hf              0;
-        Cp              ${Cp};
+        Cv              ${Cv};
     }
     equationOfState
     {
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
index cba95e9556..0ef5b62fde 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
@@ -20,7 +20,7 @@ thickness           0.02;
 
 Kappa               0.01;
 
-Cp                  15;
+Cv                  15;
 
 rho                 80;
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
index 00dbf9f966..e47c2dbb6c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
@@ -33,7 +33,7 @@ gradSchemes
 laplacianSchemes
 {
     default             none;
-    laplacian(alpha,h)  Gauss linear uncorrected;
+    laplacian(alpha,e)  Gauss linear uncorrected;
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
index cac732345f..fe251480ae 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    h
+    e
     {
         solver           PCG;
         smoother         GaussSeidel;
@@ -31,7 +31,7 @@ nNonOrthCorr        0;
 
 relaxationFactors
 {
-    h       1;
+    e       1;
 }
 
 // ************************************************************************* //