diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H b/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H
index b4b886be76..831d5cf8da 100644
--- a/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H
@@ -19,7 +19,7 @@ volScalarField rho
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),
-    thermo.rho()
+    thermo.renameRho()
 );
 
 volScalarField& p = thermo.p();
diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H
index 8108df0ce6..7f9762d8cc 100644
--- a/applications/solvers/combustion/XiFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/createFields.H
@@ -19,7 +19,7 @@ volScalarField rho
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),
-    thermo.rho()
+    thermo.renameRho()
 );
 
 volScalarField& p = thermo.p();
diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H
index 0acb35c0c4..3b919a0e53 100644
--- a/applications/solvers/combustion/chemFoam/createFields.H
+++ b/applications/solvers/combustion/chemFoam/createFields.H
@@ -43,7 +43,7 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        thermo.rho()
+        thermo.renameRho()
     );
 
     volScalarField Rspecific
diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H
index b941718b71..fd45d6dd9a 100644
--- a/applications/solvers/compressible/rhoCentralFoam/createFields.H
+++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H
@@ -34,7 +34,7 @@ volScalarField rho
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),
-    thermo.rho()
+    thermo.renameRho()
 );
 
 volVectorField rhoU
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
index cac828a677..6916ac0ece 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
@@ -19,7 +19,7 @@ volScalarField rho
         IOobject::READ_IF_PRESENT,
         IOobject::AUTO_WRITE
     ),
-    thermo.rho()
+    thermo.renameRho()
 );
 
 Info<< "Reading field U\n" << endl;
diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H
index 6882864ebb..773ce7a3a6 100644
--- a/applications/solvers/heatTransfer/thermoFoam/createFields.H
+++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H
@@ -14,7 +14,7 @@ volScalarField rho
         IOobject::NO_READ,
         IOobject::NO_WRITE
     ),
-    thermo.rho()
+    thermo.renameRho()
 );
 
 volScalarField& p = thermo.p();
diff --git a/applications/solvers/lagrangian/rhoParticleFoam/createFields.H b/applications/solvers/lagrangian/rhoParticleFoam/createFields.H
index dc0edcb1d1..16a6ab54cf 100644
--- a/applications/solvers/lagrangian/rhoParticleFoam/createFields.H
+++ b/applications/solvers/lagrangian/rhoParticleFoam/createFields.H
@@ -18,7 +18,7 @@ volScalarField rho
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),
-    thermo.rho()
+    thermo.renameRho()
 );
 
 Info<< "\nReading field U\n" << endl;
diff --git a/applications/solvers/modules/fluid/compressibleVoF/compressibleTwoPhaseMixture/compressibleTwoPhaseMixture.C b/applications/solvers/modules/fluid/compressibleVoF/compressibleTwoPhaseMixture/compressibleTwoPhaseMixture.C
index a3f6cb4956..d08edb623e 100644
--- a/applications/solvers/modules/fluid/compressibleVoF/compressibleTwoPhaseMixture/compressibleTwoPhaseMixture.C
+++ b/applications/solvers/modules/fluid/compressibleVoF/compressibleTwoPhaseMixture/compressibleTwoPhaseMixture.C
@@ -79,7 +79,7 @@ Foam::compressibleTwoPhaseMixture::compressibleTwoPhaseMixture
     (
         IOobject
         (
-            "thermo:rho",
+            "rho",
             U.mesh().time().timeName(),
             U.mesh(),
             IOobject::NO_READ,
diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C
index f022446b7d..f2ac15c4bd 100644
--- a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C
+++ b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C
@@ -130,7 +130,7 @@ void Foam::fv::compressible::VoFCavitation::addSup
     if (fieldName == "p_rgh")
     {
         const volScalarField::Internal& rho =
-            mesh().lookupObject<volScalarField>("thermo:rho");
+            mesh().lookupObject<volScalarField>("rho");
 
         const volScalarField::Internal& gh =
             mesh().lookupObject<volScalarField>("gh");
diff --git a/applications/solvers/modules/fluid/isothermalFluid/isothermalFluid.C b/applications/solvers/modules/fluid/isothermalFluid/isothermalFluid.C
index 6da3efdead..f43bc2f3e1 100644
--- a/applications/solvers/modules/fluid/isothermalFluid/isothermalFluid.C
+++ b/applications/solvers/modules/fluid/isothermalFluid/isothermalFluid.C
@@ -79,7 +79,7 @@ Foam::solvers::isothermalFluid::isothermalFluid
             IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE
         ),
-        thermo.rho()
+        thermo.renameRho()
     ),
 
     dpdt
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C
index 9e5b31f59f..aac8b8baea 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C
@@ -113,7 +113,7 @@ Foam::compressibleMultiphaseMixture::compressibleMultiphaseMixture
     (
         IOobject
         (
-            "thermo:rho",
+            "rho",
             U.mesh().time().timeName(),
             U.mesh(),
             IOobject::NO_READ,
diff --git a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.H b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.H
index 5e2a425f3d..6e3dc264c7 100644
--- a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.H
+++ b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ Usage
 
         field           s.water;
         alphaPhi        alphaRhoPhi.water;
-        rho             thermo:rho.water;
+        rho             rho.water;
     }
     \endverbatim
 
diff --git a/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C
index e60b783bb4..4003bed7a2 100644
--- a/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C
+++ b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C
@@ -793,7 +793,7 @@ Foam::regionModels::momentumSurfaceFilm::momentumSurfaceFilm
         IOobject
         (
             // Must have same name as rho to enable mapping
-            IOobject::groupName("thermo:rho", phaseName_),
+            IOobject::groupName("rho", phaseName_),
             time().timeName(),
             regionMesh(),
             IOobject::NO_READ,
diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C
index 28b5f10344..2855d99921 100644
--- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C
+++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C
@@ -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
diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
index 20647d8de9..f0251dbceb 100644
--- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
@@ -114,6 +114,11 @@ public:
 
         // Fields derived from thermodynamic state variables
 
+            //- Rename the thermodynamic density field if stored and return
+            //  This is used by solvers which create a separate continuity rho
+            //  [kg/m^3]
+            virtual tmp<volScalarField> renameRho() = 0;
+
             //- Gamma = Cp/Cv []
             virtual tmp<volScalarField> gamma() const = 0;
 
diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo.C b/src/thermophysicalModels/basic/psiThermo/psiThermo.C
index d4ff804a63..3caa1f77f1 100644
--- a/src/thermophysicalModels/basic/psiThermo/psiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/psiThermo.C
@@ -115,6 +115,12 @@ Foam::tmp<Foam::scalarField> Foam::psiThermo::implementation::rho
 }
 
 
+Foam::tmp<Foam::volScalarField> Foam::psiThermo::implementation::renameRho()
+{
+    return rho();
+}
+
+
 Foam::tmp<Foam::volScalarField> Foam::psiThermo::implementation::rho0() const
 {
     return p().oldTime()*psi_.oldTime();
diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo.H b/src/thermophysicalModels/basic/psiThermo/psiThermo.H
index 33f3df4a27..eba01d9b9c 100644
--- a/src/thermophysicalModels/basic/psiThermo/psiThermo.H
+++ b/src/thermophysicalModels/basic/psiThermo/psiThermo.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
@@ -108,6 +108,10 @@ public:
             //- Density for patch [kg/m^3]
             virtual tmp<scalarField> rho(const label patchi) const = 0;
 
+            //- Return the thermodynamic density field [kg/m^3]
+            //  This is used by solvers which create a separate continuity rho
+            virtual tmp<volScalarField> renameRho() = 0;
+
             //- Old-time density [kg/m^3]
             virtual tmp<volScalarField> rho0() const = 0;
 
@@ -171,6 +175,10 @@ public:
             //- Density for patch [kg/m^3]
             virtual tmp<scalarField> rho(const label patchi) const;
 
+            //- Return the thermodynamic density field [kg/m^3]
+            //  This is used by solvers which create a separate continuity rho
+            virtual tmp<volScalarField> renameRho();
+
             //- Old-time density [kg/m^3]
             virtual tmp<volScalarField> rho0() const;
 
diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C
index 3c82cb282b..ef6b04ca44 100644
--- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C
@@ -46,7 +46,7 @@ Foam::rhoThermo::implementation::implementation
     (
         IOobject
         (
-            phasePropertyName("thermo:rho", phaseName),
+            phasePropertyName("rho", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -125,6 +125,13 @@ Foam::tmp<Foam::scalarField> Foam::rhoThermo::implementation::rho
 }
 
 
+Foam::tmp<Foam::volScalarField> Foam::rhoThermo::implementation::renameRho()
+{
+    rho_.rename(phasePropertyName("thermo:rho"));
+    return rho_;
+}
+
+
 Foam::volScalarField& Foam::rhoThermo::implementation::rho()
 {
     return rho_;
diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H
index 6bac87c146..5d9f6c0020 100644
--- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H
+++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.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
@@ -104,6 +104,10 @@ public:
             //- Density for patch [kg/m^3]
             virtual tmp<scalarField> rho(const label patchi) const = 0;
 
+            //- Rename and return the thermodynamic density field [kg/m^3]
+            //  This is used by solvers which create a separate continuity rho
+            virtual tmp<volScalarField> renameRho() = 0;
+
             //- Return non-const access to the local density field [kg/m^3]
             virtual volScalarField& rho() = 0;
 
@@ -141,7 +145,7 @@ protected:
     // Protected data
 
         //- Density field [kg/m^3]
-        //  Named 'thermo:rho' to avoid (potential) conflict with solver density
+        //  Named 'rho' to avoid (potential) conflict with solver density
         volScalarField rho_;
 
         //- Compressibility [s^2/m^2]
@@ -176,6 +180,10 @@ public:
             //- Density for patch [kg/m^3]
             virtual tmp<scalarField> rho(const label patchi) const;
 
+            //- Rename and return the thermodynamic density field [kg/m^3]
+            //  This is used by solvers which create a separate continuity rho
+            virtual tmp<volScalarField> renameRho();
+
             //- Return non-const access to the local density field [kg/m^3]
             virtual volScalarField& rho();
 
diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/fvSchemes
index d74dd778c9..e944a6e4d7 100644
--- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/fvSchemes
@@ -37,9 +37,9 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/fvSchemes
index d74dd778c9..e944a6e4d7 100644
--- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/fvSchemes
@@ -37,9 +37,9 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes
index 39fa1cfe11..5e9f368149 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes
index 39fa1cfe11..5e9f368149 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes
index 39fa1cfe11..5e9f368149 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels
index cc8a2e57e6..dd61f56d55 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels
@@ -23,7 +23,7 @@ waterSink
     massFlowRate    -21.86682;
 
     phase           water;
-    rho             thermo:rho.water;
+    rho             rho.water;
 
     fieldValues
     {
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSchemes
index 39fa1cfe11..5e9f368149 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvModels b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvModels
index 52cfb580a6..9a0deea5e4 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvModels
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvModels
@@ -24,7 +24,7 @@ massSource
     massFlowRate    1e-3;
 
     phase           air1;
-    rho             thermo:rho.air1;
+    rho             rho.air1;
 
     fieldValues
     {
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSchemes
index 84af8499e3..bd791b45a7 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
 
     "div\(alphaPhi.*,f.*\)"         Gauss upwind;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels
index 81d711b964..cc55742fa1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels
@@ -23,7 +23,7 @@ waterSource
     massFlowRate    30.785654;
 
     phase           water;
-    rho             thermo:rho.water;
+    rho             rho.water;
 
     fieldValues
     {
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSchemes
index 39fa1cfe11..5e9f368149 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSchemes
index 39fa1cfe11..5e9f368149 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/fvSchemes
index d74dd778c9..e944a6e4d7 100644
--- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/fvSchemes
@@ -37,9 +37,9 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/modules/compressibleVoF/ballValve/0/p_rgh b/tutorials/modules/compressibleVoF/ballValve/0/p_rgh
index d7df51e940..b57bcf1955 100644
--- a/tutorials/modules/compressibleVoF/ballValve/0/p_rgh
+++ b/tutorials/modules/compressibleVoF/ballValve/0/p_rgh
@@ -26,19 +26,16 @@ boundaryField
     {
         type            prghTotalPressure;
         p0              uniform 1.18e5;
-        rho             thermo:rho;
     }
     lowerOutlet
     {
         type            prghEntrainmentPressure;
         p0              $internalField;
-        rho             thermo:rho;
     }
     upperOutlet
     {
         type            prghEntrainmentPressure;
         p0              $internalField;
-        rho             thermo:rho;
     }
     wall
     {
diff --git a/tutorials/modules/compressibleVoF/ballValve/system/fvSchemes b/tutorials/modules/compressibleVoF/ballValve/system/fvSchemes
index a67295721f..610de57c32 100644
--- a/tutorials/modules/compressibleVoF/ballValve/system/fvSchemes
+++ b/tutorials/modules/compressibleVoF/ballValve/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(rhoPhi,k)   Gauss upwind;
     div(rhoPhi,epsilon) Gauss upwind;
     div(phi,p)      Gauss upwind;
-    div(((thermo:rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/modules/compressibleVoF/climbingRod/0/p_rgh b/tutorials/modules/compressibleVoF/climbingRod/0/p_rgh
index fb2fb64265..08d74e4e86 100644
--- a/tutorials/modules/compressibleVoF/climbingRod/0/p_rgh
+++ b/tutorials/modules/compressibleVoF/climbingRod/0/p_rgh
@@ -29,7 +29,6 @@ boundaryField
     {
         type            prghTotalPressure;
         p0              $internalField;
-        rho             thermo:rho;
     }
 
     #includeEtc "caseDicts/setConstraintTypes"
diff --git a/tutorials/modules/compressibleVoF/climbingRod/system/fvSchemes b/tutorials/modules/compressibleVoF/climbingRod/system/fvSchemes
index 5103b786db..7ff41630b5 100644
--- a/tutorials/modules/compressibleVoF/climbingRod/system/fvSchemes
+++ b/tutorials/modules/compressibleVoF/climbingRod/system/fvSchemes
@@ -36,12 +36,12 @@ divSchemes
 
     div(alphaRhoPhi.liquid,sigma.liquid) Gauss linearUpwind grad(sigma);
 
-    div(((alpha.liquid*thermo:rho.liquid)*sigma.liquid))   Gauss linear;
-    div((((alpha.liquid*thermo:rho.liquid)*nuM)*grad(U)))   Gauss linear;
-    div((((alpha.liquid*thermo:rho.liquid)*(mu.liquid|thermo:rho.liquid))*dev2(T(grad(U))))) Gauss linear;
+    div(((alpha.liquid*rho.liquid)*sigma.liquid))   Gauss linear;
+    div((((alpha.liquid*rho.liquid)*nuM)*grad(U)))   Gauss linear;
+    div((((alpha.liquid*rho.liquid)*(mu.liquid|rho.liquid))*dev2(T(grad(U))))) Gauss linear;
 
-    div((((alpha.air*thermo:rho.air)*nuEff.air)*dev2(T(grad(U))))) Gauss linear;
-    div((((alpha.liquid*thermo:rho.liquid)*nuEff.liquid)*dev2(T(grad(U))))) Gauss linear;
+    div((((alpha.air*rho.air)*nuEff.air)*dev2(T(grad(U))))) Gauss linear;
+    div((((alpha.liquid*rho.liquid)*nuEff.liquid)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/modules/compressibleVoF/cylinder/0/p_rgh b/tutorials/modules/compressibleVoF/cylinder/0/p_rgh
index 8698ff1009..0c765ff95b 100644
--- a/tutorials/modules/compressibleVoF/cylinder/0/p_rgh
+++ b/tutorials/modules/compressibleVoF/cylinder/0/p_rgh
@@ -29,7 +29,6 @@ boundaryField
     {
         type            prghTotalPressure;
         p0              $internalField;
-        rho             thermo:rho;
     }
 
     "region0_to_wallFilm_.*"
diff --git a/tutorials/modules/compressibleVoF/cylinder/constant/cloudProperties b/tutorials/modules/compressibleVoF/cylinder/constant/cloudProperties
index 2cd0748a44..fc5331c95b 100644
--- a/tutorials/modules/compressibleVoF/cylinder/constant/cloudProperties
+++ b/tutorials/modules/compressibleVoF/cylinder/constant/cloudProperties
@@ -37,7 +37,7 @@ solution
 
     interpolationSchemes
     {
-        thermo:rho.air  cell;
+        rho.air  cell;
         U               cellPoint;
         mu.air          cell;
         T.air           cell;
diff --git a/tutorials/modules/compressibleVoF/cylinder/system/fvSchemes b/tutorials/modules/compressibleVoF/cylinder/system/fvSchemes
index 4767af30c4..0d7d1c0432 100644
--- a/tutorials/modules/compressibleVoF/cylinder/system/fvSchemes
+++ b/tutorials/modules/compressibleVoF/cylinder/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,p)      Gauss upwind;
     div(rhoPhi,K)   Gauss upwind;
 
-    div(((thermo:rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/modules/compressibleVoF/damBreak/0/p_rgh b/tutorials/modules/compressibleVoF/damBreak/0/p_rgh
index 0871a3eb96..71a3671bff 100644
--- a/tutorials/modules/compressibleVoF/damBreak/0/p_rgh
+++ b/tutorials/modules/compressibleVoF/damBreak/0/p_rgh
@@ -41,7 +41,6 @@ boundaryField
     {
         type            prghTotalPressure;
         p0              $internalField;
-        rho             thermo:rho;
     }
 
     defaultFaces
diff --git a/tutorials/modules/compressibleVoF/damBreak/system/fvSchemes b/tutorials/modules/compressibleVoF/damBreak/system/fvSchemes
index 5f48f4f2a1..9dbe1506f2 100644
--- a/tutorials/modules/compressibleVoF/damBreak/system/fvSchemes
+++ b/tutorials/modules/compressibleVoF/damBreak/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(rhoPhi,epsilon) Gauss upwind;
     div(rhoPhi,omega)   Gauss upwind;
 
-    div(((thermo:rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/modules/compressibleVoF/depthCharge2D/system/fvSchemes b/tutorials/modules/compressibleVoF/depthCharge2D/system/fvSchemes
index 1fd98f02e3..27525c071d 100644
--- a/tutorials/modules/compressibleVoF/depthCharge2D/system/fvSchemes
+++ b/tutorials/modules/compressibleVoF/depthCharge2D/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,p)      Gauss upwind;
     div(phi,k)      Gauss upwind;
 
-    div(((thermo:rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/modules/compressibleVoF/depthCharge3D/system/fvSchemes b/tutorials/modules/compressibleVoF/depthCharge3D/system/fvSchemes
index 1fd98f02e3..27525c071d 100644
--- a/tutorials/modules/compressibleVoF/depthCharge3D/system/fvSchemes
+++ b/tutorials/modules/compressibleVoF/depthCharge3D/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,p)      Gauss upwind;
     div(phi,k)      Gauss upwind;
 
-    div(((thermo:rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/modules/compressibleVoF/plateFilm/0/p_rgh b/tutorials/modules/compressibleVoF/plateFilm/0/p_rgh
index 18ede2934c..9618b9f2c6 100644
--- a/tutorials/modules/compressibleVoF/plateFilm/0/p_rgh
+++ b/tutorials/modules/compressibleVoF/plateFilm/0/p_rgh
@@ -35,7 +35,6 @@ boundaryField
     {
         type            prghTotalPressure;
         p0              $internalField;
-        rho             thermo:rho;
     }
 
     #includeEtc "caseDicts/setConstraintTypes"
diff --git a/tutorials/modules/compressibleVoF/plateFilm/system/fvSchemes b/tutorials/modules/compressibleVoF/plateFilm/system/fvSchemes
index 4767af30c4..0d7d1c0432 100644
--- a/tutorials/modules/compressibleVoF/plateFilm/system/fvSchemes
+++ b/tutorials/modules/compressibleVoF/plateFilm/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,p)      Gauss upwind;
     div(rhoPhi,K)   Gauss upwind;
 
-    div(((thermo:rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/modules/compressibleVoF/sloshingTank2D/system/fvSchemes b/tutorials/modules/compressibleVoF/sloshingTank2D/system/fvSchemes
index 9c3c2f5fe9..2271bc4c13 100644
--- a/tutorials/modules/compressibleVoF/sloshingTank2D/system/fvSchemes
+++ b/tutorials/modules/compressibleVoF/sloshingTank2D/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(rhoPhi,K)  Gauss linear;
     div(phi,p)     Gauss linear;
 
-    div(((thermo:rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
index af150129bd..e0177c94de 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh
@@ -41,7 +41,6 @@ boundaryField
     {
         type            prghTotalPressure;
         p0              uniform 1e5;
-        rho             thermo:rho;
     }
 
     defaultFaces
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index a69b8e4dc6..7a7af8b8df 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(rhoPhi,T)  Gauss upwind;
     div(rhoPhi,K)  Gauss upwind;
     div(phi,p)      Gauss upwind;
-    div(((thermo:rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh b/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh
index 2c910ad5d1..de85196e3d 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh
@@ -31,7 +31,6 @@ boundaryField
     atmosphere
     {
         type            prghTotalPressure;
-        rho             rho;
         psi             none;
         gamma           1;
         p0              uniform 0;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh
index 964035f0ea..25d378edfe 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh
@@ -23,7 +23,6 @@ boundaryField
     atmosphere
     {
         type            prghTotalPressure;
-        rho             rho;
         psi             none;
         gamma           1;
         p0              uniform 0;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes
index 2b658a2665..33d4a28047 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes
@@ -38,10 +38,10 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,k.*\)"      Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes
index 68bec82c47..9789eb74ec 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes
@@ -39,12 +39,12 @@ divSchemes
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,f.*\)"      Gauss upwind;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss linearUpwind limited;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss linearUpwind limited;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited;
     "div\(phi.*,kappai.*\)"         Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)"  Gauss upwind;
     "div\(phim,(k|epsilon)m\)"      Gauss upwind;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/0/p_rgh
index 12aad34523..f383e43a86 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/0/p_rgh
@@ -31,7 +31,7 @@ boundaryField
         p0              $internalField;
         U               U.gas;
         phi             phi.gas;
-        rho             thermo:rho.gas;
+        rho             rho.gas;
         value           $internalField;
     }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes
index c06c406b95..5cdc288013 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes
@@ -36,13 +36,13 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
     div(alphaRhoPhi.solids,Theta.solids) Gauss limitedLinear 1;
 
     "div\(alphaRhoPhi.*,(k|epsilon).*\)"  Gauss limitedLinear 1;
 
-    div((((alpha.gas*thermo:rho.gas)*nuEff.gas)*dev2(T(grad(U.gas))))) Gauss linear;
+    div((((alpha.gas*rho.gas)*nuEff.gas)*dev2(T(grad(U.gas))))) Gauss linear;
 
     divDevTau(U.solids)             Gauss linear;
 }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
index 0f6cdf41a4..1ac169aee3 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
@@ -38,12 +38,12 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
     "div\(alphaRhoPhi.*,(k|epsilon).*\)"  Gauss limitedLinear 1;
     "div\(phim,(k|epsilon)m\)"      Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
index 8090892bfa..99c704bbc5 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
@@ -37,12 +37,12 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
     "div\(alphaRhoPhi.*,(k|epsilon).*\)"  Gauss limitedLinear 1;
     "div\(phim,(k|epsilon)m\)"      Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/fvModels b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/fvModels
index 6decf79290..4cab0aa4f7 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/fvModels
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/fvModels
@@ -23,7 +23,7 @@ massSource
     massFlowRate    6e-7;
 
     phase           air1;
-    rho             thermo:rho.air1;
+    rho             rho.air1;
 
     fieldValues
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes
index ae59d97aa4..0a3c6dd58b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)"    Gauss limitedLinear 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
index 84d77f9e61..b469f284ec 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
@@ -36,13 +36,13 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
     div(alphaRhoPhi.particles,Theta.particles) Gauss limitedLinear 1;
 
     "div\(alphaRhoPhi.*,(k|epsilon).*\)"  Gauss limitedLinear 1;
 
-    div((((alpha.air*thermo:rho.air)*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
+    div((((alpha.air*rho.air)*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
 
     divDevTau(U.particles)          Gauss linear;
 }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/fvSchemes
index 8a120a2841..d1c62b4a3f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/fvSchemes
@@ -39,11 +39,11 @@ divSchemes
     "div\(alphaRhoPhi.*,(h|e|k|epsilon).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
 
-    div(alphaRhoPhi.water,(p|thermo:rho.water)) Gauss limitedLinear 1;
+    div(alphaRhoPhi.water,(p|rho.water)) Gauss limitedLinear 1;
 
-    div((((alpha.water*thermo:rho.water)*nuEff.water)*dev2(T(grad(U.water))))) Gauss linear;
+    div((((alpha.water*rho.water)*nuEff.water)*dev2(T(grad(U.water))))) Gauss linear;
 
-    div((((thermo:rho.particles*nut.particles)*dev2(T(grad(U.particles))))+(((thermo:rho.particles*lambda.particles)*div(phi.particles))*I)))  Gauss linear;
+    div((((rho.particles*nut.particles)*dev2(T(grad(U.particles))))+(((rho.particles*lambda.particles)*div(phi.particles))*I)))  Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig
index 493669c426..633636beb6 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig
@@ -129,11 +129,11 @@ functions
 
         objects
         (
-            thermo:rho.gas
+            rho.gas
             mu.gas
             psi.gas
             kappa.gas
-            thermo:rho.liquid
+            rho.liquid
             mu.liquid
             psi.liquid
             kappa.liquid
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes
index b0d85a4b24..cd6491a111 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes
@@ -38,11 +38,11 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss linearUpwind limited;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss linearUpwind limited;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)"  Gauss linearUpwind limited;
     "div\(phim,(k|epsilon)m\)"      Gauss linearUpwind limited;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
index 0f144dd0cd..75c9523ac2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
@@ -38,12 +38,12 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss linearUpwind limited;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss linearUpwind limited;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited;
     "div\(phi.*,kappai.*\)"         Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)"  Gauss linearUpwind limited;
     "div\(phim,(k|epsilon)m\)"      Gauss linearUpwind limited;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes
index ce1139b149..d47a8848fd 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes
@@ -39,11 +39,11 @@ divSchemes
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss linearUpwind limited;
     "div\(alphaPhi.*,f.*\)"         Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss linearUpwind limited;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss linearUpwind limited;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)"  Gauss linearUpwind limited;
     "div\(phim,(k|epsilon)m\)"      Gauss linearUpwind limited;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes
index ce1139b149..d47a8848fd 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes
@@ -39,11 +39,11 @@ divSchemes
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss linearUpwind limited;
     "div\(alphaPhi.*,f.*\)"         Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss linearUpwind limited;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss linearUpwind limited;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)"  Gauss linearUpwind limited;
     "div\(phim,(k|epsilon)m\)"      Gauss linearUpwind limited;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/0/p_rgh
index 018da71872..9143c32a69 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/0/p_rgh
@@ -25,7 +25,7 @@ boundaryField
         p0              $internalField;
         U               U.air;
         phi             phi.air;
-        rho             thermo:rho.air;
+        rho             rho.air;
         value           $internalField;
     }
     walls
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels
index 36f4ca8c0e..5adb523846 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels
@@ -30,7 +30,7 @@ massSource
     }
 
     phase           water;
-    rho             thermo:rho.water;
+    rho             rho.water;
 
     fieldValues
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes
index e77d81557d..d4ebbb4908 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes
@@ -36,9 +36,9 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
index 5d5232eee7..415e3d2624 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
@@ -30,7 +30,7 @@ boundaryField
         p0              $internalField;
         U               U.air;
         phi             phi.air;
-        rho             thermo:rho.air;
+        rho             rho.air;
         value           $internalField;
     }
     walls
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 8fd1497ce9..45e7b3cf2c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -38,10 +38,10 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
index b3332c86aa..fde93126ec 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
@@ -65,9 +65,9 @@ totalMass
             mesh().lookupObject<volScalarField>("alpha.liquid");
 
         const volScalarField& rhoGas =
-            mesh().lookupObject<volScalarField>("thermo:rho.gas");
+            mesh().lookupObject<volScalarField>("rho.gas");
         const volScalarField& rhoLiquid =
-            mesh().lookupObject<volScalarField>("thermo:rho.liquid");
+            mesh().lookupObject<volScalarField>("rho.liquid");
 
         const scalarField& v = mesh().V();
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
index d74dd778c9..e944a6e4d7 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
@@ -37,9 +37,9 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
index d74dd778c9..e944a6e4d7 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
@@ -37,9 +37,9 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
index 04b73f213e..7ac132b1cb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@@ -40,9 +40,9 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/p_rgh
index e64ce29dec..64906fb7eb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/0/p_rgh
@@ -43,7 +43,7 @@ boundaryField
         p0              $internalField;
         U               U.air;
         phi             phi.air;
-        rho             thermo:rho.air;
+        rho             rho.air;
         value           $internalField;
     }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
index bd5e77b58a..4ee38f178c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
@@ -34,9 +34,9 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index 4fd693d65d..4300dde9e2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -36,9 +36,9 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    div((((alpha.air*thermo:rho.air)*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
+    div((((alpha.air*rho.air)*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/fvModels b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/fvModels
index dcba54c7a1..ff758813dc 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/fvModels
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/fvModels
@@ -24,7 +24,7 @@ massSource
     );
 
     phase           air;
-    rho             thermo:rho.air;
+    rho             rho.air;
 
     massFlowRate
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes
index c833bbffd8..33e37f4a2f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes
@@ -38,9 +38,9 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index bd5e77b58a..4ee38f178c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -34,9 +34,9 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2DMRF/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2DMRF/system/fvSchemes
index bd5e77b58a..4ee38f178c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2DMRF/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2DMRF/system/fvSchemes
@@ -34,9 +34,9 @@ divSchemes
 
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/fvModels b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/fvModels
index 50c93b13fb..10cbe12899 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/fvModels
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/fvModels
@@ -24,7 +24,7 @@ massSource
     );
 
     phase           steam;
-    rho             thermo:rho.steam;
+    rho             rho.steam;
 
     massFlowRate
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes
index 2f688e248b..d7cd5cfdfe 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes
@@ -37,12 +37,12 @@ divSchemes
     "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1;
 
     "div\(alphaRhoPhi.*,(k|epsilon).*\)"  Gauss limitedLinear 1;
     "div\(phim,(k|epsilon)m\)"      Gauss limitedLinear 1;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/U.vapor b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/U.vapor
index 9792e887f4..22cecf2433 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/U.vapor
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/U.vapor
@@ -25,7 +25,7 @@ boundaryField
     {
         type            flowRateInletVelocity;
         massFlowRate    2.173893e-07;
-        rho             thermo:rho.vapor;
+        rho             rho.vapor;
         profile         laminarBL;
         value           $internalField;
     }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/p_rgh
index b0576592c5..7f6fa64432 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/p_rgh
@@ -32,7 +32,7 @@ boundaryField
         type            prghTotalPressure;
         U               U.vapor;
         phi             phi.vapor;
-        rho             thermo:rho.vapor;
+        rho             rho.vapor;
         p0              uniform 1e5;
         value           $internalField;
     }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes
index cd19648bbe..4d61e622bd 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes
@@ -38,12 +38,12 @@ divSchemes
     "div\(alphaRhoPhi.*,(k|epsilon|h|e).*\)"          Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"              Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,Y.*\)"              Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)"         Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)"         Gauss limitedLinear 1;
 
     "div\(alphaPhi.*,f.*\)"                 Gauss upwind;
     "div\(fAlphaPhi.*,kappa.*\)"            Gauss linearUpwind limited;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/U.vapor b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/U.vapor
index 9792e887f4..22cecf2433 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/U.vapor
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/U.vapor
@@ -25,7 +25,7 @@ boundaryField
     {
         type            flowRateInletVelocity;
         massFlowRate    2.173893e-07;
-        rho             thermo:rho.vapor;
+        rho             rho.vapor;
         profile         laminarBL;
         value           $internalField;
     }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/p_rgh
index b0576592c5..7f6fa64432 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/p_rgh
@@ -32,7 +32,7 @@ boundaryField
         type            prghTotalPressure;
         U               U.vapor;
         phi             phi.vapor;
-        rho             thermo:rho.vapor;
+        rho             rho.vapor;
         p0              uniform 1e5;
         value           $internalField;
     }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes
index cd19648bbe..4d61e622bd 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes
@@ -38,12 +38,12 @@ divSchemes
     "div\(alphaRhoPhi.*,(k|epsilon|h|e).*\)"          Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,K.*\)"              Gauss limitedLinear 1;
     "div\(alphaRhoPhi.*,Y.*\)"              Gauss limitedLinear 1;
-    "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)"         Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,\(p\|rho.*\)\)"         Gauss limitedLinear 1;
 
     "div\(alphaPhi.*,f.*\)"                 Gauss upwind;
     "div\(fAlphaPhi.*,kappa.*\)"            Gauss linearUpwind limited;
 
-    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+    "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
 
 laplacianSchemes