diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index d865fa8c2b..3e1c92a108 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -121,9 +121,9 @@ const Foam::dimensionedVector& Foam::SRF::SRFModel::omega() const
 Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::SRF::SRFModel::Fcoriolis() const
 {
-    return tmp<DimensionedField<vector, volMesh>>
+    return tmp<volVectorField::Internal>
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
@@ -142,9 +142,9 @@ Foam::SRF::SRFModel::Fcoriolis() const
 Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::SRF::SRFModel::Fcentrifugal() const
 {
-    return tmp<DimensionedField<vector, volMesh>>
+    return tmp<volVectorField::Internal>
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
index 998bb12f33..c07aad3837 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
@@ -162,13 +162,13 @@ public:
             const dimensionedVector& omega() const;
 
             //- Return the coriolis force
-            tmp<DimensionedField<vector, volMesh>> Fcoriolis() const;
+            tmp<volVectorField::Internal> Fcoriolis() const;
 
             //- Return the centrifugal force
-            tmp<DimensionedField<vector, volMesh>> Fcentrifugal() const;
+            tmp<volVectorField::Internal> Fcentrifugal() const;
 
             //- Source term component for momentum equation
-            tmp<DimensionedField<vector, volMesh>> Su() const;
+            tmp<volVectorField::Internal> Su() const;
 
             //- Return velocity vector from positions
             vectorField velocity(const vectorField& positions) const;
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.C b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
index eba28b2b45..4080273ff6 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
@@ -99,7 +99,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
-    const DimensionedField<scalar, volMesh>& sp,
+    const volScalarField::Internal& sp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -125,7 +125,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tsp,
+    const tmp<volScalarField::Internal>& tsp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -191,7 +191,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
-    const DimensionedField<scalar, volMesh>& susp,
+    const volScalarField::Internal& susp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -220,7 +220,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tsusp,
+    const tmp<volScalarField::Internal>& tsusp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.H b/src/finiteVolume/finiteVolume/fvm/fvmSup.H
index 7a82b7e138..e360211fcb 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.H
@@ -86,14 +86,14 @@ namespace fvm
         template<class Type>
         tmp<fvMatrix<Type>> Sp
         (
-            const DimensionedField<scalar, volMesh>&,
+            const volScalarField::Internal&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> Sp
         (
-            const tmp<DimensionedField<scalar, volMesh>>&,
+            const tmp<volScalarField::Internal>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
@@ -126,14 +126,14 @@ namespace fvm
         template<class Type>
         tmp<fvMatrix<Type>> SuSp
         (
-            const DimensionedField<scalar, volMesh>&,
+            const volScalarField::Internal&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> SuSp
         (
-            const tmp<DimensionedField<scalar, volMesh>>&,
+            const tmp<volScalarField::Internal>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 91ec6420f8..fd586598b8 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -1177,7 +1177,7 @@ void Foam::fvMatrix<Type>::operator-=
 template<class Type>
 void Foam::fvMatrix<Type>::operator*=
 (
-    const DimensionedField<scalar, volMesh>& dsf
+    const volScalarField::Internal& dsf
 )
 {
     dimensions_ *= dsf.dimensions();
@@ -1207,7 +1207,7 @@ void Foam::fvMatrix<Type>::operator*=
 template<class Type>
 void Foam::fvMatrix<Type>::operator*=
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tdsf
+    const tmp<volScalarField::Internal>& tdsf
 )
 {
     operator*=(tdsf());
@@ -2160,7 +2160,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const DimensionedField<scalar, volMesh>& dsf,
+    const volScalarField::Internal& dsf,
     const fvMatrix<Type>& A
 )
 {
@@ -2172,7 +2172,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tdsf,
+    const tmp<volScalarField::Internal>& tdsf,
     const fvMatrix<Type>& A
 )
 {
@@ -2196,7 +2196,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const DimensionedField<scalar, volMesh>& dsf,
+    const volScalarField::Internal& dsf,
     const tmp<fvMatrix<Type>>& tA
 )
 {
@@ -2208,7 +2208,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tdsf,
+    const tmp<volScalarField::Internal>& tdsf,
     const tmp<fvMatrix<Type>>& tA
 )
 {
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 1d08ff7532..590c3e324e 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -471,8 +471,8 @@ public:
         void operator+=(const zero&);
         void operator-=(const zero&);
 
-        void operator*=(const DimensionedField<scalar, volMesh>&);
-        void operator*=(const tmp<DimensionedField<scalar, volMesh>>&);
+        void operator*=(const volScalarField::Internal&);
+        void operator*=(const tmp<volScalarField::Internal>&);
         void operator*=(const tmp<volScalarField>&);
 
         void operator*=(const dimensioned<scalar>&);
@@ -993,14 +993,14 @@ tmp<fvMatrix<Type>> operator-
 template<class Type>
 tmp<fvMatrix<Type>> operator*
 (
-    const DimensionedField<scalar, volMesh>&,
+    const volScalarField::Internal&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
 tmp<fvMatrix<Type>> operator*
 (
-    const tmp<DimensionedField<scalar, volMesh>>&,
+    const tmp<volScalarField::Internal>&,
     const fvMatrix<Type>&
 );
 
@@ -1014,14 +1014,14 @@ tmp<fvMatrix<Type>> operator*
 template<class Type>
 tmp<fvMatrix<Type>> operator*
 (
-    const DimensionedField<scalar, volMesh>&,
+    const volScalarField::Internal&,
     const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
 tmp<fvMatrix<Type>> operator*
 (
-    const tmp<DimensionedField<scalar, volMesh>>&,
+    const tmp<volScalarField::Internal>&,
     const tmp<fvMatrix<Type>>&
 );
 
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index afc5bad15f..1720cc157d 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -193,7 +193,7 @@ void Foam::fv::meanVelocityForce::addSup
     const label fieldi
 )
 {
-    DimensionedField<vector, volMesh> Su
+    volVectorField::Internal Su
     (
         IOobject
         (
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index bdcf3e1758..c48eccb11e 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -26,7 +26,6 @@ License
 #include "SemiImplicitSource.H"
 #include "fvMesh.H"
 #include "fvMatrices.H"
-#include "DimensionedField.H"
 #include "fvmSup.H"
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
@@ -142,7 +141,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 
     const GeometricField<Type, fvPatchField, volMesh>& psi = eqn.psi();
 
-    DimensionedField<Type, volMesh> Su
+    typename GeometricField<Type, fvPatchField, volMesh>::Internal Su
     (
         IOobject
         (
@@ -164,7 +163,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 
     UIndirectList<Type>(Su, cells_) = injectionRate_[fieldi].first()/VDash_;
 
-    DimensionedField<scalar, volMesh> Sp
+    volScalarField::Internal Sp
     (
         IOobject
         (
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
index 58650773be..6c4a936ac7 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
@@ -101,7 +101,7 @@ class DSMCCloud
         volScalarField sigmaTcRMax_;
 
         //- A field holding the remainder from the previous collision selections
-        DimensionedField<scalar, volMesh> collisionSelectionRemainder_;
+        volScalarField::Internal collisionSelectionRemainder_;
 
         //- Heat flux at surface field
         volScalarField q_;
diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H
index 20658beffb..dd568d1a93 100644
--- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H
+++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H
@@ -73,13 +73,13 @@ public:
         // Source terms
 
             //- Return const reference to momentum source
-            inline tmp<DimensionedField<vector, volMesh>> UTrans() const;
+            inline tmp<volVectorField::Internal> UTrans() const;
 
             //- Return tmp momentum source term
             inline tmp<fvVectorMatrix> SU(volVectorField& U) const;
 
             //- Sensible enthalpy transfer [J/kg]
-            inline tmp<DimensionedField<scalar, volMesh>> hsTrans() const;
+            inline tmp<volScalarField::Internal> hsTrans() const;
 
             //- Return sensible enthalpy source term [J/kg/m3/s]
             inline tmp<fvScalarMatrix> Sh(volScalarField& hs) const;
@@ -93,15 +93,15 @@ public:
             ) const;
 
             //- Return total mass transfer [kg/m3]
-            inline tmp<DimensionedField<scalar, volMesh>> rhoTrans() const;
+            inline tmp<volScalarField::Internal> rhoTrans() const;
 
             //- Return tmp total mass source for carrier phase
             //  - fully explicit
-            inline tmp<DimensionedField<scalar, volMesh>> Srho() const;
+            inline tmp<volScalarField::Internal> Srho() const;
 
             //- Return tmp total mass source for carrier phase specie i
             //  - fully explicit
-            inline tmp<DimensionedField<scalar, volMesh>> Srho
+            inline tmp<volScalarField::Internal> Srho
             (
                 const label i
             ) const;
diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
index c476221ece..38883fb78b 100644
--- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
+++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
@@ -30,9 +30,9 @@ License
 Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::coalCloudList::UTrans() const
 {
-    tmp<DimensionedField<vector, volMesh>> tfld
+    tmp<volVectorField::Internal> tfld
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
@@ -47,7 +47,7 @@ Foam::coalCloudList::UTrans() const
         )
     );
 
-    DimensionedField<vector, volMesh>& fld = tfld.ref();
+    volVectorField::Internal& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -78,9 +78,9 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::coalCloudList::SU
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::hsTrans() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tfld
+    tmp<volScalarField::Internal> tfld
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -95,7 +95,7 @@ Foam::coalCloudList::hsTrans() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld.ref();
+    volScalarField::Internal& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -144,9 +144,9 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::coalCloudList::SYi
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::rhoTrans() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tfld
+    tmp<volScalarField::Internal> tfld
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -161,7 +161,7 @@ Foam::coalCloudList::rhoTrans() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld.ref();
+    volScalarField::Internal& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -180,9 +180,9 @@ Foam::coalCloudList::rhoTrans() const
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::Srho() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tfld
+    tmp<volScalarField::Internal> tfld
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -197,7 +197,7 @@ Foam::coalCloudList::Srho() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld.ref();
+    volScalarField::Internal& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -214,9 +214,9 @@ Foam::coalCloudList::Srho
     const label i
 ) const
 {
-    tmp<DimensionedField<scalar, volMesh>> tfld
+    tmp<volScalarField::Internal> tfld
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -231,7 +231,7 @@ Foam::coalCloudList::Srho
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld.ref();
+    volScalarField::Internal& fld = tfld.ref();
 
     forAll(*this, j)
     {
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 373875d095..1b13722c5e 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -356,7 +356,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     UIntegrator_(NULL),
     UTrans_
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
@@ -372,7 +372,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     ),
     UCoeff_
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -438,7 +438,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     UIntegrator_(c.UIntegrator_->clone()),
     UTrans_
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
@@ -454,7 +454,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     ),
     UCoeff_
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 42c3aee5f1..c891dda802 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -228,10 +228,10 @@ protected:
         // Sources
 
             //- Momentum
-            autoPtr<DimensionedField<vector, volMesh>> UTrans_;
+            autoPtr<volVectorField::Internal> UTrans_;
 
             //- Coefficient for carrier phase U equation
-            autoPtr<DimensionedField<scalar, volMesh>> UCoeff_;
+            autoPtr<volScalarField::Internal> UCoeff_;
 
 
         // Initialisation
@@ -464,17 +464,17 @@ public:
                 // Momentum
 
                     //- Return reference to momentum source
-                    inline DimensionedField<vector, volMesh>& UTrans();
+                    inline volVectorField::Internal& UTrans();
 
                     //- Return const reference to momentum source
-                    inline const DimensionedField<vector, volMesh>&
+                    inline const volVectorField::Internal&
                         UTrans() const;
 
                      //- Return coefficient for carrier phase U equation
-                    inline DimensionedField<scalar, volMesh>& UCoeff();
+                    inline volScalarField::Internal& UCoeff();
 
                     //- Return const coefficient for carrier phase U equation
-                    inline const DimensionedField<scalar, volMesh>&
+                    inline const volScalarField::Internal&
                         UCoeff() const;
 
                     //- Return tmp momentum source term
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 53b6c71316..ce92455169 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -431,7 +431,7 @@ Foam::KinematicCloud<CloudType>::SU(volVectorField& U) const
     {
         if (solution_.semiImplicit("U"))
         {
-            const DimensionedField<scalar, volMesh>
+            const volScalarField::Internal
                 Vdt(mesh_.V()*this->db().time().deltaT());
 
             return UTrans()/Vdt - fvm::Sp(UCoeff()/Vdt, U) + UCoeff()/Vdt*U;
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 4d042fb2a6..e3acc3bea1 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -121,7 +121,7 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
         rhoTrans_.set
         (
             i,
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -165,7 +165,7 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
         rhoTrans_.set
         (
             i,
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -290,7 +290,7 @@ void Foam::ReactingCloud<CloudType>::relaxSources
 {
     CloudType::relaxSources(cloudOldTime);
 
-    typedef DimensionedField<scalar, volMesh> dsfType;
+    typedef volScalarField::Internal dsfType;
 
     forAll(rhoTrans_, fieldi)
     {
@@ -306,7 +306,7 @@ void Foam::ReactingCloud<CloudType>::scaleSources()
 {
     CloudType::scaleSources();
 
-    typedef DimensionedField<scalar, volMesh> dsfType;
+    typedef volScalarField::Internal dsfType;
 
     forAll(rhoTrans_, fieldi)
     {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index f7d66a0663..87ece436d9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -118,7 +118,7 @@ protected:
         // Sources
 
             //- Mass transfer fields - one per carrier phase specie
-            PtrList<DimensionedField<scalar, volMesh>> rhoTrans_;
+            PtrList<volScalarField::Internal> rhoTrans_;
 
 
     // Protected Member Functions
@@ -230,15 +230,15 @@ public:
                 //- Mass
 
                     //- Return reference to mass source for field i
-                    inline DimensionedField<scalar, volMesh>&
+                    inline volScalarField::Internal&
                         rhoTrans(const label i);
 
                     //- Return const access to mass source fields
-                    inline const PtrList<DimensionedField<scalar, volMesh>>&
+                    inline const PtrList<volScalarField::Internal>&
                         rhoTrans() const;
 
                     //- Return reference to mass source fields
-                    inline PtrList<DimensionedField<scalar, volMesh>>&
+                    inline PtrList<volScalarField::Internal>&
                         rhoTrans();
 
                     //- Return mass source term for specie i - specie eqn
@@ -249,12 +249,12 @@ public:
                     ) const;
 
                     //- Return tmp mass source for field i - fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh>>
+                    inline tmp<volScalarField::Internal>
                         Srho(const label i) const;
 
                     //- Return tmp total mass source for carrier phase
                     //  - fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh>> Srho() const;
+                    inline tmp<volScalarField::Internal> Srho() const;
 
                     //- Return total mass source term [kg/m3/s]
                     inline tmp<fvScalarMatrix> Srho(volScalarField& rho) const;
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 73d8565849..2dff7d3a55 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -157,9 +157,9 @@ template<class CloudType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::ReactingCloud<CloudType>::Srho(const label i) const
 {
-    tmp<DimensionedField<scalar, volMesh>> tRhoi
+    tmp<volScalarField::Internal> tRhoi
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -194,9 +194,9 @@ template<class CloudType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::ReactingCloud<CloudType>::Srho() const
 {
-    tmp<DimensionedField<scalar, volMesh>> trhoTrans
+    tmp<volScalarField::Internal> trhoTrans
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index f2aa3eb699..f0340d0b0b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -60,7 +60,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
     {
         radAreaP_.reset
         (
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -77,7 +77,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
 
         radT4_.reset
         (
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -94,7 +94,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
 
         radAreaPT4_.reset
         (
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -165,7 +165,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
     radAreaPT4_(NULL),
     hsTrans_
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -181,7 +181,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
     ),
     hsCoeff_
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -235,7 +235,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
     radAreaPT4_(NULL),
     hsTrans_
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -251,7 +251,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
     ),
     hsCoeff_
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -270,7 +270,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
     {
         radAreaP_.reset
         (
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -287,7 +287,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
 
         radT4_.reset
         (
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -304,7 +304,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
 
         radAreaPT4_.reset
         (
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 441c6d671a..e1d0ee6f32 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -133,22 +133,22 @@ protected:
             Switch radiation_;
 
             //- Radiation sum of parcel projected areas
-            autoPtr<DimensionedField<scalar, volMesh>> radAreaP_;
+            autoPtr<volScalarField::Internal> radAreaP_;
 
             //- Radiation sum of parcel temperature^4
-            autoPtr<DimensionedField<scalar, volMesh>> radT4_;
+            autoPtr<volScalarField::Internal> radT4_;
 
             //- Radiation sum of parcel projected areas * temperature^4
-            autoPtr<DimensionedField<scalar, volMesh>> radAreaPT4_;
+            autoPtr<volScalarField::Internal> radAreaPT4_;
 
 
         // Sources
 
             //- Sensible enthalpy transfer [J/kg]
-            autoPtr<DimensionedField<scalar, volMesh>> hsTrans_;
+            autoPtr<volScalarField::Internal> hsTrans_;
 
             //- Coefficient for carrier phase hs equation [W/K]
-            autoPtr<DimensionedField<scalar, volMesh>> hsCoeff_;
+            autoPtr<volScalarField::Internal> hsCoeff_;
 
 
     // Protected Member Functions
@@ -257,23 +257,23 @@ public:
                 inline bool radiation() const;
 
                 //- Radiation sum of parcel projected areas [m2]
-                inline DimensionedField<scalar, volMesh>& radAreaP();
+                inline volScalarField::Internal& radAreaP();
 
                 //- Radiation sum of parcel projected areas [m2]
-                inline const DimensionedField<scalar, volMesh>&
+                inline const volScalarField::Internal&
                     radAreaP() const;
 
                 //- Radiation sum of parcel temperature^4 [K4]
-                inline DimensionedField<scalar, volMesh>& radT4();
+                inline volScalarField::Internal& radT4();
 
                 //- Radiation sum of parcel temperature^4 [K4]
-                inline const DimensionedField<scalar, volMesh>& radT4() const;
+                inline const volScalarField::Internal& radT4() const;
 
                 //- Radiation sum of parcel projected area*temperature^4 [m2K4]
-                inline DimensionedField<scalar, volMesh>& radAreaPT4();
+                inline volScalarField::Internal& radAreaPT4();
 
                 //- Radiation sum of parcel temperature^4 [m2K4]
-                inline const DimensionedField<scalar, volMesh>&
+                inline const volScalarField::Internal&
                     radAreaPT4() const;
 
 
@@ -282,17 +282,17 @@ public:
                 // Enthalpy
 
                     //- Sensible enthalpy transfer [J/kg]
-                    inline DimensionedField<scalar, volMesh>& hsTrans();
+                    inline volScalarField::Internal& hsTrans();
 
                     //- Sensible enthalpy transfer [J/kg]
-                    inline const DimensionedField<scalar, volMesh>&
+                    inline const volScalarField::Internal&
                         hsTrans() const;
 
                     //- Return coefficient for carrier phase hs equation
-                    inline DimensionedField<scalar, volMesh>& hsCoeff();
+                    inline volScalarField::Internal& hsCoeff();
 
                     //- Return const coefficient for carrier phase hs equation
-                    inline const DimensionedField<scalar, volMesh>&
+                    inline const volScalarField::Internal&
                         hsCoeff() const;
 
                     //- Return sensible enthalpy source term [J/kg/m3/s]
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index 46187ebad7..e61c2e9901 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -236,7 +236,7 @@ Foam::ThermoCloud<CloudType>::Sh(volScalarField& hs) const
         if (this->solution().semiImplicit("h"))
         {
             const volScalarField Cp(thermo_.thermo().Cp());
-            const DimensionedField<scalar, volMesh>
+            const volScalarField::Internal
                 Vdt(this->mesh().V()*this->db().time().deltaT());
 
             return
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index 7d509a0ca0..bfd963079d 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -161,7 +161,7 @@ void reactingOneDim::updatePhiGas()
 
         const volScalarField& HsiGas = tHsiGas();
 
-        const DimensionedField<scalar, volMesh>& RRiGas =
+        const volScalarField::Internal& RRiGas =
             solidChemistry_->RRg(gasI);
 
         surfaceScalarField::Boundary& phiGasBf =
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 99625d1bdc..f06b44f0ee 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -1101,11 +1101,11 @@ void kinematicSingleLayer::info()
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho() const
+tmp<volScalarField::Internal> kinematicSingleLayer::Srho() const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -1123,14 +1123,14 @@ tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho
+tmp<volScalarField::Internal> kinematicSingleLayer::Srho
 (
     const label i
 ) const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -1148,11 +1148,11 @@ tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Sh() const
+tmp<volScalarField::Internal> kinematicSingleLayer::Sh() const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
index 8266374472..2a51b92701 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
@@ -510,16 +510,16 @@ public:
             // Mapped into primary region
 
                 //- Return total mass source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Srho() const;
+                virtual tmp<volScalarField::Internal> Srho() const;
 
                 //- Return mass source for specie i - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Srho
+                virtual tmp<volScalarField::Internal> Srho
                 (
                     const label i
                 ) const;
 
                 //- Return enthalpy source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Sh() const;
+                virtual tmp<volScalarField::Internal> Sh() const;
 
 
         // I-O
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
index 4f65dc8d17..d4f5d8781e 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
@@ -244,11 +244,11 @@ const volScalarField& noFilm::cloudDiameterTrans() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> noFilm::Srho() const
+tmp<volScalarField::Internal> noFilm::Srho() const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -266,11 +266,11 @@ tmp<DimensionedField<scalar, volMesh>> noFilm::Srho() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> noFilm::Srho(const label i) const
+tmp<volScalarField::Internal> noFilm::Srho(const label i) const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -288,11 +288,11 @@ tmp<DimensionedField<scalar, volMesh>> noFilm::Srho(const label i) const
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> noFilm::Sh() const
+tmp<volScalarField::Internal> noFilm::Sh() const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
index 755e691456..20e115fecf 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
@@ -167,16 +167,16 @@ public:
             // Mapped into primary region
 
                 //- Return total mass source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Srho() const;
+                virtual tmp<volScalarField::Internal> Srho() const;
 
                 //- Return mass source for specie i - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Srho
+                virtual tmp<volScalarField::Internal> Srho
                 (
                     const label i
                 ) const;
 
                 //- Return enthalpy source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Sh() const;
+                virtual tmp<volScalarField::Internal> Sh() const;
 };
 
 
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
index 57d1f97915..a504a76507 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
@@ -89,28 +89,28 @@ Foam::scalar surfaceFilmModel::CourantNumber() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> surfaceFilmModel::Srho() const
+tmp<volScalarField::Internal> surfaceFilmModel::Srho() const
 {
     NotImplemented;
 
-    return tmp<DimensionedField<scalar, volMesh>>(NULL);
+    return tmp<volScalarField::Internal>(NULL);
 }
 
 
-tmp<DimensionedField<scalar, volMesh>>
+tmp<volScalarField::Internal>
 surfaceFilmModel::Srho(const label) const
 {
     NotImplemented;
 
-    return tmp<DimensionedField<scalar, volMesh>>(NULL);
+    return tmp<volScalarField::Internal>(NULL);
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> surfaceFilmModel::Sh() const
+tmp<volScalarField::Internal> surfaceFilmModel::Sh() const
 {
     NotImplemented;
 
-    return tmp<DimensionedField<scalar, volMesh>>(NULL);
+    return tmp<volScalarField::Internal>(NULL);
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
index 9e5198bcd4..9d4360d8ce 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
@@ -219,16 +219,16 @@ public:
             // Mapped into primary region
 
                 //- Return total mass source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Srho() const;
+                virtual tmp<volScalarField::Internal> Srho() const;
 
                 //- Return mass source for specie i - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Srho
+                virtual tmp<volScalarField::Internal> Srho
                 (
                     const label i
                 ) const;
 
                 //- Return enthalpy source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Sh() const;
+                virtual tmp<volScalarField::Internal> Sh() const;
 };
 
 
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index d15f78aff5..23c43f6a11 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -738,11 +738,11 @@ void thermoSingleLayer::info()
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho() const
+tmp<volScalarField::Internal> thermoSingleLayer::Srho() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tSrho
+    tmp<volScalarField::Internal> tSrho
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -785,16 +785,16 @@ tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho() const
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho
+tmp<volScalarField::Internal> thermoSingleLayer::Srho
 (
     const label i
 ) const
 {
     const label vapId = thermo_.carrierId(filmThermo_->name());
 
-    tmp<DimensionedField<scalar, volMesh>> tSrho
+    tmp<volScalarField::Internal> tSrho
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -840,11 +840,11 @@ tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho
 }
 
 
-tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Sh() const
+tmp<volScalarField::Internal> thermoSingleLayer::Sh() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tSh
+    tmp<volScalarField::Internal> tSh
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index 8265c3400f..cbf5717f11 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -389,16 +389,16 @@ public:
             // Mapped into primary region
 
                 //- Return total mass source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Srho() const;
+                virtual tmp<volScalarField::Internal> Srho() const;
 
                 //- Return mass source for specie i - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Srho
+                virtual tmp<volScalarField::Internal> Srho
                 (
                     const label i
                 ) const;
 
                 //- Return enthalpy source - Eulerian phase only
-                virtual tmp<DimensionedField<scalar, volMesh>> Sh() const;
+                virtual tmp<volScalarField::Internal> Sh() const;
 
 
        // I-O
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
index eb927e71b2..c91c2975fd 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
@@ -39,9 +39,7 @@ SourceFiles
 #include "IOdictionary.H"
 #include "Switch.H"
 #include "scalarField.H"
-#include "volFieldsFwd.H"
-#include "volMesh.H"
-#include "DimensionedField.H"
+#include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,14 +80,14 @@ protected:
         const scalar deltaTChemIni_;
 
         //- Latest estimation of integration step
-        DimensionedField<scalar, volMesh> deltaTChem_;
+        volScalarField::Internal deltaTChem_;
 
 
     // Protected Member Functions
 
         //- Return non-const access to the latest estimation of integration
         //  step, e.g. for multi-chemistry model
-        inline DimensionedField<scalar, volMesh>& deltaTChem();
+        inline volScalarField::Internal& deltaTChem();
 
         //- Correct function - updates due to mesh changes
         void correct();
@@ -127,7 +125,7 @@ public:
         inline Switch chemistry() const;
 
         //- Return the latest estimation of integration step
-        inline const DimensionedField<scalar, volMesh>& deltaTChem() const;
+        inline const volScalarField::Internal& deltaTChem() const;
 
 
         // Functions to be derived in derived classes
@@ -135,19 +133,19 @@ public:
             // Fields
 
                 //- Return const access to chemical source terms [kg/m3/s]
-                virtual const DimensionedField<scalar, volMesh>& RR
+                virtual const volScalarField::Internal& RR
                 (
                     const label i
                 ) const = 0;
 
                 //- Return access to chemical source terms [kg/m3/s]
-                virtual DimensionedField<scalar, volMesh>& RR
+                virtual volScalarField::Internal& RR
                 (
                     const label i
                 ) = 0;
 
                 //- Return reaction rate of the speciei in reactioni
-                virtual tmp<DimensionedField<scalar, volMesh>> calculateRR
+                virtual tmp<volScalarField::Internal> calculateRR
                 (
                     const label reactioni,
                     const label speciei
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index 8831e064e9..c0a28da1c3 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -63,7 +63,7 @@ Foam::chemistryModel<CompType, ThermoType>::chemistryModel
         RR_.set
         (
             fieldi,
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -649,9 +649,9 @@ Foam::chemistryModel<CompType, ThermoType>::calculateRR
         this->thermo().rho()
     );
 
-    tmp<DimensionedField<scalar, volMesh>> tRR
+    tmp<volScalarField::Internal> tRR
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -666,7 +666,7 @@ Foam::chemistryModel<CompType, ThermoType>::calculateRR
         )
     );
 
-    DimensionedField<scalar, volMesh>& RR = tRR.ref();
+    volScalarField::Internal& RR = tRR.ref();
 
     const scalarField& T = this->thermo().T();
     const scalarField& p = this->thermo().p();
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
index a4832d64b3..f5ee5f6f3d 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
@@ -40,9 +40,8 @@ SourceFiles
 
 #include "Reaction.H"
 #include "ODESystem.H"
-#include "volFieldsFwd.H"
+#include "volFields.H"
 #include "simpleMatrix.H"
-#include "DimensionedField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -101,7 +100,7 @@ protected:
         scalar Treact_;
 
         //- List of reaction rate per specie [kg/m3/s]
-        PtrList<DimensionedField<scalar, volMesh>> RR_;
+        PtrList<volScalarField::Internal> RR_;
 
         //- Temporary concentration field
         mutable scalarField c_;
@@ -114,7 +113,7 @@ protected:
 
         //- Write access to chemical source terms
         //  (e.g. for multi-chemistry model)
-        inline PtrList<DimensionedField<scalar, volMesh>>& RR();
+        inline PtrList<volScalarField::Internal>& RR();
 
 
 public:
@@ -203,19 +202,19 @@ public:
         // basicChemistryModel.H)
 
             //- Return const access to the chemical source terms for specie, i
-            inline const DimensionedField<scalar, volMesh>& RR
+            inline const volScalarField::Internal& RR
             (
                 const label i
             ) const;
 
             //- Return non const access to chemical source terms [kg/m3/s]
-            virtual DimensionedField<scalar, volMesh>& RR
+            virtual volScalarField::Internal& RR
             (
                 const label i
             );
 
             //- Return reaction rate of the speciei in reactionI
-            virtual tmp<DimensionedField<scalar, volMesh>> calculateRR
+            virtual tmp<volScalarField::Internal> calculateRR
             (
                 const label reactionI,
                 const label speciei
diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
index bf5b738ffc..3032cca499 100644
--- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
+++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
@@ -281,11 +281,11 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::P1::Rp() const
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::P1::Ru() const
 {
-    const DimensionedField<scalar, volMesh>& G =
+    const volScalarField::Internal& G =
         G_();
-    const DimensionedField<scalar, volMesh> E =
+    const volScalarField::Internal E =
         absorptionEmission_->ECont()()();
-    const DimensionedField<scalar, volMesh> a =
+    const volScalarField::Internal a =
         absorptionEmission_->aCont()()();
 
     return a*G - E;
diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.H b/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
index f25467d5a9..38cdd4fcfa 100644
--- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
+++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
@@ -122,7 +122,7 @@ public:
             virtual tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            virtual tmp<DimensionedField<scalar, volMesh>> Ru() const;
+            virtual tmp<volScalarField::Internal> Ru() const;
 };
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index b41056add0..d1cdcad666 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -493,14 +493,14 @@ Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::fvDOM::Ru() const
 {
 
-    const DimensionedField<scalar, volMesh>& G =
+    const volScalarField::Internal& G =
         G_();
 
-    const DimensionedField<scalar, volMesh> E =
+    const volScalarField::Internal E =
         absorptionEmission_->ECont()()();
 
     // Only include continuous phase absorption
-    const DimensionedField<scalar, volMesh> a =
+    const volScalarField::Internal a =
         absorptionEmission_->aCont()()();
 
     return a*G - E;
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
index 5ce925904c..08823fa28b 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
@@ -200,7 +200,7 @@ public:
             virtual tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            virtual tmp<DimensionedField<scalar, volMesh>> Ru() const;
+            virtual tmp<volScalarField::Internal> Ru() const;
 
 
         // Access
diff --git a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C
index c3233d5ebd..ccfe900a46 100644
--- a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C
+++ b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C
@@ -107,9 +107,9 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::noRadiation::Rp() const
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::noRadiation::Ru() const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
diff --git a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
index dde1edfe3f..69692aa6ab 100644
--- a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
+++ b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
@@ -95,7 +95,7 @@ public:
             tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            tmp<DimensionedField<scalar, volMesh>> Ru() const;
+            tmp<volScalarField::Internal> Ru() const;
 };
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C
index 740b9a94bb..37c0f0e440 100644
--- a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C
+++ b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C
@@ -108,9 +108,9 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::opaqueSolid::Rp() const
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::opaqueSolid::Ru() const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
diff --git a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
index 7fdc3b0bb5..e5b89f588e 100644
--- a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
+++ b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
@@ -96,7 +96,7 @@ public:
             tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            tmp<DimensionedField<scalar, volMesh>> Ru() const;
+            tmp<volScalarField::Internal> Ru() const;
 };
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
index fea1013e61..7b46c38736 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
@@ -45,8 +45,7 @@ SourceFiles
 #include "IOdictionary.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
-#include "volFieldsFwd.H"
-#include "DimensionedField.H"
+#include "volFields.H"
 #include "fvMatricesFwd.H"
 #include "Switch.H"
 
@@ -222,7 +221,7 @@ public:
             virtual tmp<volScalarField> Rp() const = 0;
 
             //- Source term component (constant)
-            virtual tmp<DimensionedField<scalar, volMesh>> Ru() const = 0;
+            virtual tmp<volScalarField::Internal> Ru() const = 0;
 
             //- Energy source term
             virtual tmp<fvScalarMatrix> Sh(fluidThermo& thermo) const;
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index ad524373d6..d768cd3942 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -704,9 +704,9 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::viewFactor::Rp() const
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::radiation::viewFactor::Ru() const
 {
-    return tmp<DimensionedField<scalar, volMesh>>
+    return tmp<volScalarField::Internal>
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
index ce63ea3092..86d244339c 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
@@ -162,7 +162,7 @@ public:
             virtual tmp<volScalarField> Rp() const;
 
             //- Source term component (constant)
-            virtual tmp<DimensionedField<scalar, volMesh>> Ru() const;
+            virtual tmp<volScalarField::Internal> Ru() const;
 
 
     // Access
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
index 8d6899d495..1e0d946903 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
@@ -58,7 +58,7 @@ const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::basicSolidChemistryModel::RR(const label i) const
 {
     NotImplemented;
-    return (DimensionedField<scalar, volMesh>::null());
+    return (volScalarField::Internal::null());
 }
 
 
@@ -67,11 +67,11 @@ Foam::basicSolidChemistryModel::RR(const label i)
 {
     NotImplemented;
 
-    return dynamic_cast<DimensionedField<scalar, volMesh>&>
+    return dynamic_cast<volScalarField::Internal&>
     (
-        const_cast<DimensionedField<scalar, volMesh>& >
+        const_cast<volScalarField::Internal& >
         (
-            DimensionedField<scalar, volMesh>::null()
+            volScalarField::Internal::null()
         )
     );
 }
@@ -86,11 +86,11 @@ Foam::basicSolidChemistryModel::calculateRR
 {
     NotImplemented;
 
-    return dynamic_cast<tmp<DimensionedField<scalar, volMesh>>&>
+    return dynamic_cast<tmp<volScalarField::Internal>&>
     (
-        const_cast<DimensionedField<scalar, volMesh>& >
+        const_cast<volScalarField::Internal& >
         (
-            DimensionedField<scalar, volMesh>::null()
+            volScalarField::Internal::null()
         )
     );
 }
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
index 752debc230..5c3afee373 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
@@ -120,25 +120,25 @@ public:
         inline const solidReactionThermo& solidThermo() const;
 
         //- Return total gases mass source term [kg/m3/s]
-        virtual tmp<DimensionedField<scalar, volMesh>> RRg() const = 0;
+        virtual tmp<volScalarField::Internal> RRg() const = 0;
 
         //- Return total solids mass source term [kg/m3/s]
-        virtual tmp<DimensionedField<scalar, volMesh>> RRs() const = 0;
+        virtual tmp<volScalarField::Internal> RRs() const = 0;
 
         //- Return chemical source terms for solids [kg/m3/s]
-        virtual const DimensionedField<scalar, volMesh>& RRs
+        virtual const volScalarField::Internal& RRs
         (
             const label i
         ) const = 0;
 
         //- Return chemical source terms for gases [kg/m3/s]
-        virtual const DimensionedField<scalar, volMesh>& RRg
+        virtual const volScalarField::Internal& RRg
         (
             const label i
         ) const = 0;
 
         //- Returns the reaction rate of the speciei in reactionI
-        virtual tmp<DimensionedField<scalar, volMesh>> calculateRR
+        virtual tmp<volScalarField::Internal> calculateRR
         (
             const label reactionI,
             const label speciei
@@ -162,13 +162,13 @@ public:
         virtual void calculate() = 0;
 
         //- Return const access to the total source terms
-        virtual const DimensionedField<scalar, volMesh>& RR
+        virtual const volScalarField::Internal& RR
         (
             const label i
         ) const;
 
         //- Return non-const access to the total source terms
-        virtual DimensionedField<scalar, volMesh>& RR(const label i);
+        virtual volScalarField::Internal& RR(const label i);
 };
 
 
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index e889e25645..be5ab642cb 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -121,7 +121,7 @@ pyrolysisChemistryModel
         RRg_.set
         (
             fieldi,
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
index c9d2a89fe1..8e1581fd0d 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
@@ -79,13 +79,13 @@ protected:
         label nSpecie_;
 
         //- List of reaction rate per gas [kg/m3/s]
-        PtrList<DimensionedField<scalar, volMesh>> RRg_;
+        PtrList<volScalarField::Internal> RRg_;
 
 
     // Protected Member Functions
 
         //- Write access to source terms for gases
-        inline PtrList<DimensionedField<scalar, volMesh>>& RRg();
+        inline PtrList<volScalarField::Internal>& RRg();
 
 
 private:
@@ -180,13 +180,13 @@ public:
         // Chemistry model functions
 
             //- Return const access to the chemical source terms for gases
-            inline const DimensionedField<scalar, volMesh>& RRg
+            inline const volScalarField::Internal& RRg
             (
                 const label i
             ) const;
 
             //- Return total gas source term
-            inline tmp<DimensionedField<scalar, volMesh>> RRg() const;
+            inline tmp<volScalarField::Internal> RRg() const;
 
             //- Return sensible enthalpy for gas i [J/Kg]
             virtual tmp<volScalarField> gasHs
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
index b14770004d..0132bc2585 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
@@ -79,9 +79,9 @@ inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::
 RRg() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tRRg
+    tmp<volScalarField::Internal> tRRg
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -98,7 +98,7 @@ RRg() const
 
     if (this->chemistry_)
     {
-        DimensionedField<scalar, volMesh>& RRg = tRRg.ref();
+        volScalarField::Internal& RRg = tRRg.ref();
         for (label i=0; i < nGases_; i++)
         {
             RRg += RRg_[i];
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index 9ef8c5af58..c7c07a760f 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -64,7 +64,7 @@ solidChemistryModel
         RRs_.set
         (
             fieldi,
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
index b19a5ead6f..f3692027ce 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
@@ -41,8 +41,7 @@ SourceFiles
 
 #include "Reaction.H"
 #include "ODESystem.H"
-#include "volFieldsFwd.H"
-#include "DimensionedField.H"
+#include "volFields.H"
 #include "simpleMatrix.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -90,7 +89,7 @@ protected:
         label nReaction_;
 
         //- List of reaction rate per solid [kg/m3/s]
-        PtrList<DimensionedField<scalar, volMesh>> RRs_;
+        PtrList<volScalarField::Internal> RRs_;
 
         //- List of active reacting cells
         List<bool> reactingCells_;
@@ -99,7 +98,7 @@ protected:
     // Protected Member Functions
 
         //- Write access to source terms for solids
-        inline PtrList<DimensionedField<scalar, volMesh>>& RRs();
+        inline PtrList<volScalarField::Internal>& RRs();
 
         //- Set reacting status of cell, celli
         void setCellReacting(const label celli, const bool active);
@@ -179,13 +178,13 @@ public:
         // Solid Chemistry model functions
 
             //- Return const access to the chemical source terms for solids
-            inline const DimensionedField<scalar, volMesh>& RRs
+            inline const volScalarField::Internal& RRs
             (
                 const label i
             ) const;
 
             //- Return total solid source term
-            inline tmp<DimensionedField<scalar, volMesh>> RRs() const;
+            inline tmp<volScalarField::Internal> RRs() const;
 
             //- Solve the reaction system for the given time step
             //  and return the characteristic time
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
index 43a343b5f8..ebbd2ffd37 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
@@ -66,9 +66,9 @@ template<class CompType, class SolidThermo>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::solidChemistryModel<CompType, SolidThermo>::RRs() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tRRs
+    tmp<volScalarField::Internal> tRRs
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -85,7 +85,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::RRs() const
 
     if (this->chemistry_)
     {
-        DimensionedField<scalar, volMesh>& RRs = tRRs.ref();
+        volScalarField::Internal& RRs = tRRs.ref();
         for (label i=0; i < nSolids_; i++)
         {
             RRs += RRs_[i];