diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C
index 1e7706caae..5c64356994 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,7 +185,11 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat
     const tmp<scalarField> tnuw = turbModel.nu(patchi);
     const scalarField& nuw = tnuw();
 
-    const tmp<scalarField> talphaw = phase.thermo().alpha(patchi);
+    const tmp<scalarField> talphaw
+    (
+        phase.thermo().kappa().boundaryField()[patchi]
+       /phase.thermo().Cp().boundaryField()[patchi]
+    );
     const scalarField& alphaw = talphaw();
 
     const tmp<volScalarField> tk = turbModel.k();
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index f87ab5c8c7..3e5952d0d7 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -356,7 +356,12 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
 
                 const rhoThermo& lThermo = liquid.thermo();
 
-                const scalarField& alphaw = lThermo.alpha(patchi);
+                const tmp<scalarField> talphaw
+                (
+                    lThermo.kappa().boundaryField()[patchi]
+                   /lThermo.Cp().boundaryField()[patchi]
+                );
+                const scalarField& alphaw = talphaw();
 
                 const tmp<volScalarField> tk = turbModel.k();
                 const volScalarField& k = tk();
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C
index c22c2afedb..b5c9b0607e 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -280,7 +280,7 @@ template<class BasePhaseModel>
 Foam::tmp<Foam::scalarField>
 Foam::StationaryPhaseModel<BasePhaseModel>::kappaEff(const label patchi) const
 {
-    return this->thermo().kappa(patchi);
+    return this->thermo().kappa().boundaryField()[patchi];
 }
 
 
@@ -318,7 +318,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::divq(volScalarField& he) const
 
     return -fvm::laplacian
     (
-        fvc::interpolate(alpha)*fvc::interpolate(this->thermo().alpha()),
+        fvc::interpolate(alpha)*fvc::interpolate(this->thermo().alphahe()),
         he
     );
 }
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/solidDisplacementThermo.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/solidDisplacementThermo.C
index f131937f91..85ea6ddbdb 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/solidDisplacementThermo.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/solidDisplacementThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -399,7 +399,13 @@ Foam::tmp<Foam::scalarField> Foam::solidDisplacementThermo::THE
 }
 
 
-Foam::tmp<Foam::volScalarField> Foam::solidDisplacementThermo::Cp() const
+const Foam::volScalarField& Foam::solidDisplacementThermo::Cp() const
+{
+    return Cp_;
+}
+
+
+const Foam::volScalarField& Foam::solidDisplacementThermo::Cv() const
 {
     return Cp_;
 }
@@ -415,12 +421,6 @@ Foam::tmp<Foam::scalarField> Foam::solidDisplacementThermo::Cp
 }
 
 
-Foam::tmp<Foam::volScalarField> Foam::solidDisplacementThermo::Cv() const
-{
-    return Cp_;
-}
-
-
 Foam::tmp<Foam::scalarField> Foam::solidDisplacementThermo::Cv
 (
     const scalarField& T,
@@ -447,21 +447,12 @@ Foam::tmp<Foam::scalarField> Foam::solidDisplacementThermo::Cpv
 }
 
 
-Foam::tmp<Foam::volScalarField> Foam::solidDisplacementThermo::kappa() const
+const Foam::volScalarField& Foam::solidDisplacementThermo::kappa() const
 {
     return kappa_;
 }
 
 
-Foam::tmp<Foam::scalarField> Foam::solidDisplacementThermo::kappa
-(
-    const label patchi
-) const
-{
-    return kappa_.boundaryField()[patchi];
-}
-
-
 Foam::tmp<Foam::volScalarField> Foam::solidDisplacementThermo::alphahe() const
 {
     NotImplemented;
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/solidDisplacementThermo.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/solidDisplacementThermo.H
index 6c0f67e502..663e5c2554 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/solidDisplacementThermo.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/solidDisplacementThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,10 +168,16 @@ public:
             virtual const volScalarField& he() const;
 
             //- Heat capacity at constant pressure [J/kg/K]
-            virtual tmp<volScalarField> Cp() const;
+            virtual const volScalarField& Cp() const;
 
             //- Heat capacity at constant volume [J/kg/K]
-            virtual tmp<volScalarField> Cv() const;
+            virtual const volScalarField& Cv() const;
+
+
+        // Access to transport state variables
+
+            //- Thermal diffusivity for temperature of mixture [W/m/K]
+            virtual const volScalarField& kappa() const;
 
 
         // Fields derived from thermodynamic state variables
@@ -302,12 +308,6 @@ public:
 
         // Fields derived from transport state variables
 
-            //- Thermal diffusivity for temperature of mixture [W/m/K]
-            virtual tmp<volScalarField> kappa() const;
-
-            //- Thermal diffusivity for temperature of mixture for patch [W/m/K]
-            virtual tmp<scalarField> kappa(const label patchi) const;
-
             //- Thermal diffusivity for energy of mixture [kg/m/s]
             virtual tmp<volScalarField> alphahe() const;
 
diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 19f22a0b8d..170cae2268 100644
--- a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -171,7 +171,11 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
     const tmp<scalarField> tnuw = turbModel.nu(patchi);
     const scalarField& nuw = tnuw();
 
-    const tmp<scalarField> talphaw = ttm.thermo().alpha(patchi);
+    const tmp<scalarField> talphaw
+    (
+        ttm.thermo().kappa().boundaryField()[patchi]
+       /ttm.thermo().Cp().boundaryField()[patchi]
+    );
     const scalarField& alphaw = talphaw();
 
     scalarField& alphatw = *this;
diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index 722300841b..2697f27811 100644
--- a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
 
         const fvPatchScalarField& hep = thermo.he().boundaryField()[patchi];
 
-        qDot = thermo.alpha().boundaryField()[patchi]*hep.snGrad();
+        qDot = thermo.alphahe(patchi)*hep.snGrad();
     }
     else
     {
diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index e09bcdcdfb..b9f36f71c8 100644
--- a/src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
             const fluidThermo& thermo =
                 mesh.lookupObject<fluidThermo>(fluidThermoName);
 
-            return thermo.kappa(patchi);
+            return thermo.kappa().boundaryField()[patchi];
         }
     }
     else if (mesh.foundObject<solidThermo>(physicalProperties::typeName))
@@ -116,7 +116,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
         }
         else
         {
-            return thermo.kappa(patchi);
+            return thermo.kappa().boundaryField()[patchi];
         }
     }
     else
diff --git a/src/ThermophysicalTransportModels/laminar/Fourier/Fourier.C b/src/ThermophysicalTransportModels/laminar/Fourier/Fourier.C
index f82e512e06..62a627ba7d 100644
--- a/src/ThermophysicalTransportModels/laminar/Fourier/Fourier.C
+++ b/src/ThermophysicalTransportModels/laminar/Fourier/Fourier.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ Fourier<BasicThermophysicalTransportModel>::divq(volScalarField& he) const
     // Return heat flux source as an implicit energy correction
     // to the temperature gradient flux
     return
-        -correction(fvm::laplacian(this->alpha()*thermo.alpha(), he))
+        -correction(fvm::laplacian(this->alpha()*thermo.alphahe(), he))
         -fvc::laplacian(this->alpha()*thermo.kappa(), thermo.T());
 }
 
diff --git a/src/ThermophysicalTransportModels/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H
index a5815c4f07..393a4805c0 100644
--- a/src/ThermophysicalTransportModels/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H
+++ b/src/ThermophysicalTransportModels/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
         //  of mixture for patch [W/m/K]
         virtual tmp<scalarField> kappaEff(const label patchi) const
         {
-            return this->thermo().kappa(patchi);
+            return this->thermo().kappa().boundaryField()[patchi];
         }
 
         //- Effective thermal turbulent diffusivity of mixture [kg/m/s]
diff --git a/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.C b/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.C
index 64b700b509..214b51bc53 100644
--- a/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.C
+++ b/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ unityLewisFourier<BasicThermophysicalTransportModel>::q() const
             "q",
             this->momentumTransport().alphaRhoPhi().group()
         ),
-       -fvc::interpolate(this->alpha()*this->thermo().alpha())
+       -fvc::interpolate(this->alpha()*this->thermo().alphahe())
        *fvc::snGrad(this->thermo().he())
     );
 }
@@ -109,7 +109,7 @@ tmp<fvScalarMatrix>
 unityLewisFourier<BasicThermophysicalTransportModel>::
 divq(volScalarField& he) const
 {
-    return -fvm::laplacian(this->alpha()*this->thermo().alpha(), he);
+    return -fvm::laplacian(this->alpha()*this->thermo().alphahe(), he);
 }
 
 
diff --git a/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.H b/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.H
index 29abda7c0c..b97b8cb083 100644
--- a/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.H
+++ b/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
             return volScalarField::New
             (
                 "DEff",
-                this->thermo().alpha()
+                this->thermo().kappa()/this->thermo().Cp()
             );
         }
 
@@ -125,7 +125,9 @@ public:
             const label patchi
         ) const
         {
-            return this->thermo().alpha(patchi);
+            return
+                this->thermo().kappa().boundaryField()[patchi]
+               /this->thermo().Cp().boundaryField()[patchi];
         }
 
         //- Return the heat flux [W/m^2]
diff --git a/src/ThermophysicalTransportModels/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H b/src/ThermophysicalTransportModels/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H
index 05a461ec4f..a67deed171 100644
--- a/src/ThermophysicalTransportModels/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H
+++ b/src/ThermophysicalTransportModels/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,7 +185,7 @@ public:
             return volScalarField::New
             (
                 "DEff",
-                this->thermo().alpha() + alphat()
+                this->thermo().kappa()/this->thermo().Cp() + alphat()
             );
         }
 
@@ -197,7 +197,10 @@ public:
             const label patchi
         ) const
         {
-            return this->thermo().alpha(patchi) + alphat(patchi);
+            return
+                this->thermo().kappa().boundaryField()[patchi]
+               /this->thermo().Cp().boundaryField()[patchi]
+              + alphat(patchi);
         }
 
         //- Return the heat flux [W/m^2]
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index 40add7c0ed..57a107cd3b 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,8 +166,13 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
     const volScalarField& k = tk();
     const tmp<scalarField> tnuw = turbModel.nu(patchi);
     const scalarField& nuw = tnuw();
-    const tmp<scalarField> talpha = ttm.thermo().alpha(patchi);
-    const scalarField& alphaw = talpha();
+
+    const tmp<scalarField> talphaw
+    (
+        ttm.thermo().kappa().boundaryField()[patchi]
+       /ttm.thermo().Cp().boundaryField()[patchi]
+    );
+    const scalarField& alphaw = talphaw();
 
     const scalar Cmu25 = pow(Cmu_, 0.25);
 
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index d05edde07d..48e88ef16d 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ void thermalBaffle::solveEnergy()
     volScalarField& Q = tQ.ref();
 
     volScalarField rho("rho", thermo_->rho());
-    volScalarField alpha("alpha", thermo_->alpha());
+    volScalarField alphahe(thermo_->alphahe());
 
 
     // If region is one-dimension variable thickness
@@ -106,7 +106,7 @@ void thermalBaffle::solveEnergy()
 
                 rho[cellId] *= delta_.value()/thickness_[localFacei];
 
-                alpha[cellId] *= delta_.value()/thickness_[localFacei];
+                alphahe[cellId] *= delta_.value()/thickness_[localFacei];
             }
         }
     }
@@ -117,8 +117,8 @@ void thermalBaffle::solveEnergy()
 
     fvScalarMatrix hEqn
     (
-        fvm::ddt(rho, h_)
-      - fvm::laplacian(alpha, h_)
+        fvm::ddt(rho, he_)
+      - fvm::laplacian(alphahe, he_)
      ==
         Q
     );
@@ -127,7 +127,7 @@ void thermalBaffle::solveEnergy()
     {
         surfaceScalarField phiMesh
         (
-            fvc::interpolate(rho*h_)*regionMesh().phi()
+            fvc::interpolate(rho*he_)*regionMesh().phi()
         );
 
         hEqn -= fvc::div(phiMesh);
@@ -155,7 +155,7 @@ thermalBaffle::thermalBaffle
     thermalBaffleModel(modelType, mesh, dict),
     nNonOrthCorr_(solution().lookup<label>("nNonOrthCorr")),
     thermo_(solidThermo::New(regionMesh())),
-    h_(thermo_->he()),
+    he_(thermo_->he()),
     Qs_
     (
         IOobject
@@ -205,7 +205,7 @@ thermalBaffle::thermalBaffle
     thermalBaffleModel(modelType, mesh),
     nNonOrthCorr_(solution().lookup<label>("nNonOrthCorr")),
     thermo_(solidThermo::New(regionMesh())),
-    h_(thermo_->he()),
+    he_(thermo_->he()),
     Qs_
     (
         IOobject
@@ -328,14 +328,14 @@ void thermalBaffle::info()
     forAll(coupledPatches, i)
     {
         const label patchi = coupledPatches[i];
-        const fvPatchScalarField& ph = h_.boundaryField()[patchi];
+        const fvPatchScalarField& phe = he_.boundaryField()[patchi];
         const word patchName = regionMesh().boundary()[patchi].name();
         Info<< indent << "Q : " << patchName << indent <<
             gSum
             (
                 mag(regionMesh().Sf().boundaryField()[patchi])
-              * ph.snGrad()
-              * thermo_->alpha().boundaryField()[patchi]
+               *phe.snGrad()
+               *thermo_->alphahe(patchi)
             ) << endl;
     }
 }
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
index 08928ce2a2..aad6766ee9 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ protected:
             autoPtr<solidThermo> thermo_;
 
             //- Enthalpy/internal energy
-            volScalarField& h_;
+            volScalarField& he_;
 
 
         // Source term fields
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index 0960bbb1f8..da8d95727d 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -302,18 +302,18 @@ Foam::basicThermo::implementation::implementation
         mesh
     ),
 
-    alpha_
+    kappa_
     (
         IOobject
         (
-            phasePropertyName("thermo:alpha", phaseName),
+            phasePropertyName("thermo:kappa", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero)
+        dimensionedScalar(dimEnergy/dimTime/dimLength/dimTemperature, Zero)
     ),
 
     dpdt_(lookupOrDefault<Switch>("dpdt", true))
@@ -395,18 +395,9 @@ Foam::volScalarField& Foam::basicThermo::implementation::T()
 }
 
 
-const Foam::volScalarField& Foam::basicThermo::implementation::alpha() const
+const Foam::volScalarField& Foam::basicThermo::implementation::kappa() const
 {
-    return alpha_;
-}
-
-
-const Foam::scalarField& Foam::basicThermo::implementation::alpha
-(
-    const label patchi
-) const
-{
-    return alpha_.boundaryField()[patchi];
+    return kappa_;
 }
 
 
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index 2241a692f8..2104b30ecb 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,11 +113,11 @@ protected:
 
     // Protected Member Functions
 
-        //- Return the enthalpy/internal energy field boundary types
+        //- Enthalpy/internal energy field boundary types
         //  by interrogating the temperature field boundary types
         wordList heBoundaryTypes();
 
-        //- Return the enthalpy/internal energy field boundary base types
+        //- Enthalpy/internal energy field boundary base types
         //  by interrogating the temperature field boundary types
         wordList heBoundaryBaseTypes();
 
@@ -147,7 +147,7 @@ public:
 
     // Static Member Functions
 
-        //- Return the name of a property for a given phase
+        //- Name of a property for a given phase
         static word phasePropertyName(const word& name, const word& phaseName)
         {
             return IOobject::groupName(name, phaseName);
@@ -194,16 +194,16 @@ public:
 
     // Member Functions
 
-        //- Return the dictionary
+        //- Properties dictionary
         virtual const IOdictionary& properties() const = 0;
 
-        //- Access the dictionary
+        //- Non-const access the properties dictionary
         virtual IOdictionary& properties() = 0;
 
-        //- Return the phase name
+        //- Phase name
         virtual const word& phaseName() const = 0;
 
-        //- Return the name of a property for a given phase
+        //- Name of a property for a given phase
         word phasePropertyName(const word& name) const
         {
             return phasePropertyName(name, phaseName());
@@ -229,7 +229,7 @@ public:
         //- Update properties
         virtual void correct() = 0;
 
-        //- Return the name of the thermo physics
+        //- Name of the thermo physics
         virtual word thermoName() const = 0;
 
         //- Return true if the equation of state is incompressible
@@ -362,10 +362,16 @@ public:
             ) const = 0;
 
             //- Heat capacity at constant pressure [J/kg/K]
-            virtual tmp<volScalarField> Cp() const = 0;
+            virtual const volScalarField& Cp() const = 0;
 
             //- Heat capacity at constant volume [J/kg/K]
-            virtual tmp<volScalarField> Cv() const = 0;
+            virtual const volScalarField& Cv() const = 0;
+
+
+        // Access to transport state variables
+
+            //- Thermal conductivity of mixture [W/m/K]
+            virtual const volScalarField& kappa() const = 0;
 
 
         // Fields derived from thermodynamic state variables
@@ -402,28 +408,12 @@ public:
             ) const = 0;
 
 
-        // Access to transport state variables
-
-            //- Thermal diffusivity for enthalpy of mixture [kg/m/s]
-            virtual const volScalarField& alpha() const = 0;
-
-            //- Thermal diffusivity for enthalpy of mixture for patch [kg/m/s]
-            virtual const scalarField& alpha(const label patchi) const = 0;
-
-
         // Fields derived from transport state variables
 
-            //- Thermal diffusivity for temperature of mixture [W/m/K]
-            virtual tmp<volScalarField> kappa() const = 0;
-
-            //- Thermal diffusivity for temperature of mixture
-            //  for patch [W/m/K]
-            virtual tmp<scalarField> kappa(const label patchi) const = 0;
-
-            //- Thermal diffusivity for energy of mixture [kg/m/s]
+            //- Thermal diffusivity of energy of mixture [kg/m/s]
             virtual tmp<volScalarField> alphahe() const = 0;
 
-            //- Thermal diffusivity for energy of mixture for patch [kg/m/s]
+            //- Thermal diffusivity of energy of mixture for patch [kg/m/s]
             virtual tmp<scalarField> alphahe(const label patchi) const = 0;
 };
 
@@ -450,8 +440,8 @@ protected:
             //- Temperature [K]
             volScalarField T_;
 
-            //- Laminar thermal diffusivity [kg/m/s]
-            volScalarField alpha_;
+            //- Thermal conductivity [W/m/K]
+            volScalarField kappa_;
 
 
         //- Should the dpdt term be included in the enthalpy equation
@@ -482,19 +472,19 @@ public:
 
     // Member Functions
 
-        //- Return the dictionary
+        //- Properties dictionary
         virtual const IOdictionary& properties() const
         {
             return *this;
         }
 
-        //- Access the dictionary
+        //- Non-const access the properties dictionary
         virtual IOdictionary& properties()
         {
             return *this;
         }
 
-        //- Phase-name
+        //- Phase name
         virtual const word& phaseName() const
         {
             return phaseName_;
@@ -519,12 +509,8 @@ public:
 
         // Access to transport state variables
 
-            //- Return the thermal diffusivity for enthalpy of mixture [kg/m/s]
-            virtual const volScalarField& alpha() const;
-
-            //- Return the thermal diffusivity for enthalpy of mixture for
-            //  patch [kg/m/s]
-            virtual const scalarField& alpha(const label patchi) const;
+            //- Thermal conductivity of mixture [W/m/K]
+            virtual const volScalarField& kappa() const;
 
 
         //- Read thermophysical properties dictionary
diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
index 5e5c2334b5..c67751617c 100644
--- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,29 +148,30 @@ public:
 
         // Fields derived from transport state variables
 
-            //- Effective thermal turbulent diffusivity for temperature
-            //  of mixture [W/m/K]
+            //- Effective thermal turbulent conductivity of mixture
+            //  for patch [W/m/K]
             virtual tmp<volScalarField> kappaEff
             (
                 const volScalarField&
             ) const = 0;
 
-            //- Effective thermal turbulent diffusivity for temperature
-            //  of mixture for patch [W/m/K]
+            //- Effective thermal turbulent conductivity of mixture
+            //  for patch [W/m/K]
             virtual tmp<scalarField> kappaEff
             (
                 const scalarField& alphat,
                 const label patchi
             ) const = 0;
 
-            //- Effective thermal turbulent diffusivity of mixture [kg/m/s]
+            //- Effective turbulent thermal diffusivity of energy
+            //  of mixture [kg/m/s]
             virtual tmp<volScalarField> alphaEff
             (
                 const volScalarField& alphat
             ) const = 0;
 
-            //- Effective thermal turbulent diffusivity of mixture
-            //  for patch [kg/m/s]
+            //- Effective turbulent thermal diffusivity of energy
+            //  of mixture for patch [kg/m/s]
             virtual tmp<scalarField> alphaEff
             (
                 const scalarField& alphat,
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index 3d9a323d08..961c310e25 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -670,44 +670,17 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::W
 }
 
 
-template<class BasicThermo, class MixtureType>
-Foam::tmp<Foam::volScalarField>
-Foam::heThermo<BasicThermo, MixtureType>::kappa() const
-{
-    return volScalarField::New("kappa", Cp_*this->alpha_);
-}
-
-
-template<class BasicThermo, class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::kappa
-(
-    const label patchi
-) const
-{
-    return
-        Cp
-        (
-            this->T_.boundaryField()[patchi],
-            patchi
-        )*this->alpha_.boundaryField()[patchi];
-}
-
-
 template<class BasicThermo, class MixtureType>
 Foam::tmp<Foam::volScalarField>
 Foam::heThermo<BasicThermo, MixtureType>::alphahe() const
 {
     if (MixtureType::thermoType::enthalpy())
     {
-        return volScalarField::New("alphahe", this->alpha_);
+        return volScalarField::New("alphahe", this->kappa_/Cp_);
     }
     else
     {
-        return volScalarField::New
-        (
-            "alphahe",
-            this->gamma()*this->alpha_
-        );
+        return volScalarField::New("alphahe", this->kappa_/Cv_);
     }
 }
 
@@ -718,16 +691,11 @@ Foam::heThermo<BasicThermo, MixtureType>::alphahe(const label patchi) const
 {
     if (MixtureType::thermoType::enthalpy())
     {
-        return this->alpha_.boundaryField()[patchi];
+        return this->kappa_.boundaryField()[patchi]/Cp_.boundaryField()[patchi];
     }
     else
     {
-        return
-            this->gamma
-            (
-                this->T_.boundaryField()[patchi],
-                patchi
-            )*this->alpha_.boundaryField()[patchi];
+        return this->kappa_.boundaryField()[patchi]/Cv_.boundaryField()[patchi];
     }
 }
 
@@ -739,7 +707,7 @@ Foam::heThermo<BasicThermo, MixtureType>::kappaEff
     const volScalarField& alphat
 ) const
 {
-    return volScalarField::New("kappaEff", Cp_*(this->alpha_ + alphat));
+    return volScalarField::New("kappaEff", this->kappa_ + Cp_*alphat);
 }
 
 
@@ -752,12 +720,8 @@ Foam::heThermo<BasicThermo, MixtureType>::kappaEff
 ) const
 {
     return
-        Cp
-        (
-            this->T_.boundaryField()[patchi],
-            patchi
-        )
-       *(this->alpha_.boundaryField()[patchi] + alphat);
+        this->kappa_.boundaryField()[patchi]
+      + Cp(this->T_.boundaryField()[patchi], patchi)*alphat;
 }
 
 
@@ -770,14 +734,14 @@ Foam::heThermo<BasicThermo, MixtureType>::alphaEff
 {
     if (MixtureType::thermoType::enthalpy())
     {
-        return volScalarField::New("alphaEff", this->alpha_ + alphat);
+        return volScalarField::New("alphaEff", this->kappa_/Cp_ + alphat);
     }
     else
     {
         return volScalarField::New
         (
             "alphaEff",
-            this->gamma()*(this->alpha_ + alphat)
+            (this->kappa_ + Cp_*alphat)/Cv_
         );
     }
 }
@@ -793,16 +757,17 @@ Foam::heThermo<BasicThermo, MixtureType>::alphaEff
 {
     if (MixtureType::thermoType::enthalpy())
     {
-        return (this->alpha_.boundaryField()[patchi] + alphat);
+        return
+            this->kappa_.boundaryField()[patchi]/Cp_.boundaryField()[patchi]
+          + alphat;
     }
     else
     {
         return
-            this->gamma
-            (
-                this->T_.boundaryField()[patchi],
-                patchi
-            )*(this->alpha_.boundaryField()[patchi] + alphat);
+        (
+            this->kappa_.boundaryField()[patchi]
+          + Cp_.boundaryField()[patchi]*alphat
+        )/Cv_.boundaryField()[patchi];
     }
 }
 
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.H b/src/thermophysicalModels/basic/heThermo/heThermo.H
index 66b6301bd3..b5682060a4 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.H
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -198,13 +198,13 @@ public:
             }
 
             //- Heat capacity at constant pressure [J/kg/K]
-            virtual tmp<volScalarField> Cp() const
+            virtual const volScalarField& Cp() const
             {
                 return Cp_;
             }
 
             //- Heat capacity at constant volume [J/kg/K]
-            virtual tmp<volScalarField> Cv() const
+            virtual const volScalarField& Cv() const
             {
                 return Cv_;
             }
@@ -354,41 +354,35 @@ public:
 
         // Fields derived from transport state variables
 
-            //- Thermal diffusivity for temperature of mixture [W/m/K]
-            virtual tmp<volScalarField> kappa() const;
-
-            //- Thermal diffusivity for temperature of mixture for patch [W/m/K]
-            virtual tmp<scalarField> kappa(const label patchi) const;
-
-            //- Thermal diffusivity for energy of mixture [kg/m/s]
+            //- Thermal diffusivity of energy of mixture [kg/m/s]
             virtual tmp<volScalarField> alphahe() const;
 
-            //- Thermal diffusivity for energy of mixture for patch [kg/m/s]
+            //- Thermal diffusivity of energy of mixture for patch [kg/m/s]
             virtual tmp<scalarField> alphahe(const label patchi) const;
 
-            //- Effective thermal turbulent diffusivity for temperature
-            //  of mixture [W/m/K]
+            //- Effective thermal turbulent conductivity of mixture [W/m/K]
             virtual tmp<volScalarField> kappaEff
             (
                 const volScalarField&
             ) const;
 
-            //- Effective thermal turbulent diffusivity for temperature
-            //  of mixture for patch [W/m/K]
+            //- Effective thermal turbulent conductivity of mixture
+            //  for patch [W/m/K]
             virtual tmp<scalarField> kappaEff
             (
                 const scalarField& alphat,
                 const label patchi
             ) const;
 
-            //- Effective thermal turbulent diffusivity of mixture [kg/m/s]
+            //- Effective turbulent thermal diffusivity of energy
+            //  of mixture [kg/m/s]
             virtual tmp<volScalarField> alphaEff
             (
                 const volScalarField& alphat
             ) const;
 
-            //- Effective thermal turbulent diffusivity of mixture
-            //  for patch [kg/m/s]
+            //- Effective turbulent thermal diffusivity of energy
+            //  of mixture for patch [kg/m/s]
             virtual tmp<scalarField> alphaEff
             (
                 const scalarField& alphat,
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
index df6c1ba357..8777509a4d 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::calculate()
     scalarField& CvCells = this->Cv_.primitiveFieldRef();
     scalarField& psiCells = this->psi_.primitiveFieldRef();
     scalarField& muCells = this->mu_.primitiveFieldRef();
-    scalarField& alphaCells = this->alpha_.primitiveFieldRef();
+    scalarField& kappaCells = this->kappa_.primitiveFieldRef();
 
     forAll(TCells, celli)
     {
@@ -60,9 +60,8 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::calculate()
         psiCells[celli] = thermoMixture.psi(pCells[celli], TCells[celli]);
 
         muCells[celli] = transportMixture.mu(pCells[celli], TCells[celli]);
-        alphaCells[celli] =
-            transportMixture.kappa(pCells[celli], TCells[celli])
-           /CpCells[celli];
+        kappaCells[celli] =
+            transportMixture.kappa(pCells[celli], TCells[celli]);
     }
 
     volScalarField::Boundary& pBf =
@@ -86,8 +85,8 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::calculate()
     volScalarField::Boundary& muBf =
         this->mu_.boundaryFieldRef();
 
-    volScalarField::Boundary& alphaBf =
-        this->alpha_.boundaryFieldRef();
+    volScalarField::Boundary& kappaBf =
+        this->kappa_.boundaryFieldRef();
 
     forAll(this->T_.boundaryField(), patchi)
     {
@@ -98,7 +97,7 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::calculate()
         fvPatchScalarField& ppsi = psiBf[patchi];
         fvPatchScalarField& phe = heBf[patchi];
         fvPatchScalarField& pmu = muBf[patchi];
-        fvPatchScalarField& palpha = alphaBf[patchi];
+        fvPatchScalarField& pkappa = kappaBf[patchi];
 
         if (pT.fixesValue())
         {
@@ -119,9 +118,7 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::calculate()
                 ppsi[facei] = thermoMixture.psi(pp[facei], pT[facei]);
 
                 pmu[facei] = transportMixture.mu(pp[facei], pT[facei]);
-                palpha[facei] =
-                    transportMixture.kappa(pp[facei], pT[facei])
-                   /pCp[facei];
+                pkappa[facei] = transportMixture.kappa(pp[facei], pT[facei]);
             }
         }
         else
@@ -143,9 +140,7 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::calculate()
                 ppsi[facei] = thermoMixture.psi(pp[facei], pT[facei]);
 
                 pmu[facei] = transportMixture.mu(pp[facei], pT[facei]);
-                palpha[facei] =
-                    transportMixture.kappa(pp[facei], pT[facei])
-                   /pCp[facei];
+                pkappa[facei] = transportMixture.kappa(pp[facei], pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
index 0f7c8ca852..89880f98cf 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ void Foam::heRhoThermo<BasicRhoThermo, MixtureType>::calculate()
     scalarField& psiCells = this->psi_.primitiveFieldRef();
     scalarField& rhoCells = this->rho_.primitiveFieldRef();
     scalarField& muCells = this->mu_.primitiveFieldRef();
-    scalarField& alphaCells = this->alpha_.primitiveFieldRef();
+    scalarField& kappaCells = this->kappa_.primitiveFieldRef();
 
     forAll(TCells, celli)
     {
@@ -62,9 +62,8 @@ void Foam::heRhoThermo<BasicRhoThermo, MixtureType>::calculate()
         rhoCells[celli] = thermoMixture.rho(pCells[celli], TCells[celli]);
 
         muCells[celli] = transportMixture.mu(pCells[celli], TCells[celli]);
-        alphaCells[celli] =
-            transportMixture.kappa(pCells[celli], TCells[celli])
-           /thermoMixture.Cp(pCells[celli], TCells[celli]);
+        kappaCells[celli] =
+            transportMixture.kappa(pCells[celli], TCells[celli]);
     }
 
     volScalarField::Boundary& pBf =
@@ -91,8 +90,8 @@ void Foam::heRhoThermo<BasicRhoThermo, MixtureType>::calculate()
     volScalarField::Boundary& muBf =
         this->mu_.boundaryFieldRef();
 
-    volScalarField::Boundary& alphaBf =
-        this->alpha_.boundaryFieldRef();
+    volScalarField::Boundary& kappaBf =
+        this->kappa_.boundaryFieldRef();
 
     forAll(this->T_.boundaryField(), patchi)
     {
@@ -104,7 +103,7 @@ void Foam::heRhoThermo<BasicRhoThermo, MixtureType>::calculate()
         fvPatchScalarField& prho = rhoBf[patchi];
         fvPatchScalarField& phe = heBf[patchi];
         fvPatchScalarField& pmu = muBf[patchi];
-        fvPatchScalarField& palpha = alphaBf[patchi];
+        fvPatchScalarField& pkappa = kappaBf[patchi];
 
         if (pT.fixesValue())
         {
@@ -126,9 +125,7 @@ void Foam::heRhoThermo<BasicRhoThermo, MixtureType>::calculate()
                 prho[facei] = thermoMixture.rho(pp[facei], pT[facei]);
 
                 pmu[facei] = transportMixture.mu(pp[facei], pT[facei]);
-                palpha[facei] =
-                    transportMixture.kappa(pp[facei], pT[facei])
-                   /thermoMixture.Cp(pp[facei], pT[facei]);
+                pkappa[facei] = transportMixture.kappa(pp[facei], pT[facei]);
             }
         }
         else
@@ -151,9 +148,7 @@ void Foam::heRhoThermo<BasicRhoThermo, MixtureType>::calculate()
                 prho[facei] = thermoMixture.rho(pp[facei], pT[facei]);
 
                 pmu[facei] = transportMixture.mu(pp[facei], pT[facei]);
-                palpha[facei] =
-                    transportMixture.kappa(pp[facei], pT[facei])
-                   /thermoMixture.Cp(pp[facei], pT[facei]);
+                pkappa[facei] = transportMixture.kappa(pp[facei], pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
index ca3dee4958..d15dc463f4 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -256,7 +256,7 @@ public:
         // with inheritance of virtual functions in heThermo
 
             //- Heat capacity at constant pressure for patch [J/kg/K]
-            virtual tmp<volScalarField> Cp() const = 0;
+            virtual const volScalarField& Cp() const = 0;
 
             //- Heat capacity at constant pressure for patch [J/kg/K]
             virtual tmp<scalarField> Cp
@@ -266,7 +266,7 @@ public:
             ) const = 0;
 
             //- Heat capacity at constant volume [J/kg/K]
-            virtual tmp<volScalarField> Cv() const = 0;
+            virtual const volScalarField& Cv() const = 0;
 
             //- Heat capacity at constant volume for patch [J/kg/K]
             virtual tmp<scalarField> Cv
@@ -274,12 +274,6 @@ public:
                 const scalarField& T,
                 const label patchi
             ) const = 0;
-
-            //- Thermal diffusivity for temperature of mixture [W/m/K]
-            virtual tmp<volScalarField> kappa() const = 0;
-
-            //- Thermal diffusivity for temperature of mixture for patch [W/m/K]
-            virtual tmp<scalarField> kappa(const label patchi) const = 0;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index 236bc8c847..5da07ed776 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::calculate()
     scalarField& CvCells = this->Cv_.primitiveFieldRef();
     scalarField& psiCells = this->psi_.primitiveFieldRef();
     scalarField& muCells = this->mu_.primitiveFieldRef();
-    scalarField& alphaCells = this->alpha_.primitiveFieldRef();
+    scalarField& kappaCells = this->kappa_.primitiveFieldRef();
 
     forAll(TCells, celli)
     {
@@ -64,9 +64,8 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::calculate()
         psiCells[celli] = thermoMixture.psi(pCells[celli], TCells[celli]);
 
         muCells[celli] = transportMixture.mu(pCells[celli], TCells[celli]);
-        alphaCells[celli] =
-            transportMixture.kappa(pCells[celli], TCells[celli])
-           /CpCells[celli];
+        kappaCells[celli] =
+            transportMixture.kappa(pCells[celli], TCells[celli]);
 
         TuCells[celli] = this->cellReactants(celli).THE
         (
@@ -103,8 +102,8 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::calculate()
     volScalarField::Boundary& muBf =
         this->mu_.boundaryFieldRef();
 
-    volScalarField::Boundary& alphaBf =
-        this->alpha_.boundaryFieldRef();
+    volScalarField::Boundary& kappaBf =
+        this->kappa_.boundaryFieldRef();
 
     forAll(this->T_.boundaryField(), patchi)
     {
@@ -117,7 +116,7 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::calculate()
         fvPatchScalarField& phe = heBf[patchi];
         fvPatchScalarField& pheu = heuBf[patchi];
         fvPatchScalarField& pmu = muBf[patchi];
-        fvPatchScalarField& palpha = alphaBf[patchi];
+        fvPatchScalarField& pkappa = kappaBf[patchi];
 
         if (pT.fixesValue())
         {
@@ -137,9 +136,7 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::calculate()
                 pCv[facei] = thermoMixture.Cv(pp[facei], pT[facei]);
                 ppsi[facei] = thermoMixture.psi(pp[facei], pT[facei]);
                 pmu[facei] = transportMixture.mu(pp[facei], pT[facei]);
-                palpha[facei] =
-                    transportMixture.kappa(pp[facei], pT[facei])
-                   /pCp[facei];
+                pkappa[facei] = transportMixture.kappa(pp[facei], pT[facei]);
             }
         }
         else
@@ -160,9 +157,7 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::calculate()
                 pCv[facei] = thermoMixture.Cv(pp[facei], pT[facei]);
                 ppsi[facei] = thermoMixture.psi(pp[facei], pT[facei]);
                 pmu[facei] = transportMixture.mu(pp[facei], pT[facei]);
-                palpha[facei] =
-                    transportMixture.kappa(pp[facei], pT[facei])
-                   /pCp[facei];
+                pkappa[facei] = transportMixture.kappa(pp[facei], pT[facei]);
 
                 pTu[facei] =
                     this->patchFaceReactants(patchi, facei)
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
index 0b4f4e412f..5c98aadf15 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::calculate()
     scalarField& CpCells = this->Cp_.primitiveFieldRef();
     scalarField& CvCells = this->Cv_.primitiveFieldRef();
     scalarField& rhoCells = this->rho_.primitiveFieldRef();
-    scalarField& alphaCells = this->alpha_.primitiveFieldRef();
+    scalarField& kappaCells = this->kappa_.primitiveFieldRef();
 
     forAll(TCells, celli)
     {
@@ -61,9 +61,8 @@ void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::calculate()
         CvCells[celli] = thermoMixture.Cv(pCells[celli], TCells[celli]);
         rhoCells[celli] = thermoMixture.rho(pCells[celli], TCells[celli]);
 
-        alphaCells[celli] =
-            transportMixture.kappa(pCells[celli], TCells[celli])
-           /thermoMixture.Cv(pCells[celli], TCells[celli]);
+        kappaCells[celli] =
+            transportMixture.kappa(pCells[celli], TCells[celli]);
     }
 
 
@@ -84,8 +83,8 @@ void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::calculate()
     volScalarField::Boundary& rhoBf =
         this->rho_.boundaryFieldRef();
 
-    volScalarField::Boundary& alphaBf =
-        this->alpha_.boundaryFieldRef();
+    volScalarField::Boundary& kappaBf =
+        this->kappa_.boundaryFieldRef();
 
     forAll(this->T_.boundaryField(), patchi)
     {
@@ -95,7 +94,7 @@ void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::calculate()
         fvPatchScalarField& pCp = CpBf[patchi];
         fvPatchScalarField& pCv = CvBf[patchi];
         fvPatchScalarField& prho = rhoBf[patchi];
-        fvPatchScalarField& palpha = alphaBf[patchi];
+        fvPatchScalarField& pkappa = kappaBf[patchi];
 
         if (pT.fixesValue())
         {
@@ -115,9 +114,7 @@ void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::calculate()
                 pCp[facei] = thermoMixture.Cp(pp[facei], pT[facei]);
                 pCv[facei] = thermoMixture.Cv(pp[facei], pT[facei]);
 
-                palpha[facei] =
-                    transportMixture.kappa(pp[facei], pT[facei])
-                   /thermoMixture.Cv(pp[facei], pT[facei]);
+                pkappa[facei] = transportMixture.kappa(pp[facei], pT[facei]);
             }
         }
         else
@@ -138,14 +135,12 @@ void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::calculate()
                 pCp[facei] = thermoMixture.Cp(pp[facei], pT[facei]);
                 pCv[facei] = thermoMixture.Cv(pp[facei], pT[facei]);
 
-                palpha[facei] =
-                    transportMixture.kappa(pp[facei], pT[facei])
-                   /thermoMixture.Cv(pp[facei], pT[facei]);
+                pkappa[facei] = transportMixture.kappa(pp[facei], pT[facei]);
             }
         }
     }
 
-    this->alpha_.correctBoundaryConditions();
+    this->kappa_.correctBoundaryConditions();
 }
 
 
@@ -359,7 +354,15 @@ Foam::heSolidThermo<BasicSolidThermo, MixtureType>::divq
       - (
             isotropic()
           ?   fvc::laplacian(this->kappa(), this->T_)
-            + correction(fvm::laplacian(this->alpha(), e))
+            + correction
+              (
+                  fvm::laplacian
+                  (
+                      this->kappa()/this->Cv(),
+                      e,
+                      "laplacian(alphae,e)"
+                  )
+              )
           :   fvc::laplacian(KappaLocal(), this->T_)
             + correction
               (
@@ -367,7 +370,7 @@ Foam::heSolidThermo<BasicSolidThermo, MixtureType>::divq
                   (
                       KappaLocal()/this->Cv(),
                       e,
-                      "laplacian(" + this->alpha().name() + ",e)"
+                      "laplacian(alphae,e)"
                   )
               )
         );
diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/cloudProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/cloudProperties
index 3cd56b821b..992c8ac6bd 100644
--- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/cloudProperties
+++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/cloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/cloudProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/cloudProperties
index 14b6bb1cee..8727509f94 100644
--- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/cloudProperties
+++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/cloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/cloudProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/cloudProperties
index 27b05362e4..f516c754e3 100644
--- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/cloudProperties
+++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/cloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/cloudProperties
index b94962407c..fdb1104f6b 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/cloudProperties
+++ b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/cloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/cloudProperties
index 8ede63fb4e..44cf7e3566 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/cloudProperties
+++ b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/cloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/cloudProperties
index 048341a114..5952666090 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/cloudProperties
+++ b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/cloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/coalCloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/coalCloudProperties
index 9274255213..b1263b0d8b 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/coalCloudProperties
+++ b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/coalCloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
         G               cell;
     }
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/limestoneCloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/limestoneCloudProperties
index 891c0a2dae..67e4f5e60b 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/limestoneCloudProperties
+++ b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/limestoneCloudProperties
@@ -39,7 +39,7 @@ solution
         thermo:mu       cell;
         U               cellPoint;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
         T               cell;
         G               cell;
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/cloudProperties
index 733bc762f0..e873ac9258 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/cloudProperties
+++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/cloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/cloudProperties
index cf1ec86e39..400e9b2245 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/cloudProperties
+++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/cloudProperties
@@ -45,7 +45,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/cloudProperties
index da181cd7d3..f6d54a2a79 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/cloudProperties
+++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/cloudProperties
@@ -45,7 +45,7 @@ solution
         thermo:mu       cell;
         T               cell;
         Cp              cell;
-        kappa           cell;
+        thermo:kappa    cell;
         p               cell;
     }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
index 0f8139f01c..6e5746d5ab 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
@@ -32,7 +32,7 @@ gradSchemes
 laplacianSchemes
 {
     default             none;
-    laplacian(alpha,e)  Gauss linear uncorrected;
+    laplacian(alphahe,e)  Gauss linear uncorrected;
 }
 
 
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/cloudProperties b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/cloudProperties
index 3fe7c75ee9..eed87b971c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/cloudProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/constant/cloudProperties
@@ -42,7 +42,7 @@ solution
         thermo:mu.air   cell;
         T.air           cell;
         Cp.air          cell;
-        kappa           cell;
+        thermo:kappa.air cell;
         p               cell;
     }