diff --git a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
index dc81aeda82..058258ba95 100644
--- a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
+++ b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
@@ -5,7 +5,7 @@ namespace Foam
 template<class Type>
 tmp<SurfaceField<Type>> interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const surfaceScalarField& dir,
     const word& reconFieldName = word::null
 )
diff --git a/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
index 2b678f246b..870ff729df 100644
--- a/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
@@ -56,7 +56,7 @@ Description
 template<class Type>
 void zeroCells
 (
-    GeometricField<Type, fvPatchField, volMesh>& vf,
+    VolField<Type>& vf,
     const labelList& cells
 )
 {
diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C
index 91c0f0dfc8..af8ff9c307 100644
--- a/applications/test/volField/Test-volField.C
+++ b/applications/test/volField/Test-volField.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
     #include "createPhi.H"
 
-    GeometricField<symmTensor, fvPatchField, volMesh> st
+    VolField<symmTensor> st
     (
         IOobject
         (
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 9e2a0f8cb7..a196c4be92 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -129,7 +129,7 @@ void subsetVolFields
     const label patchi,
     const Type& exposedValue,
     const word GeomVolType,
-    PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
+    PtrList<VolField<Type>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -144,7 +144,7 @@ void subsetVolFields
 
             Info<< "Subsetting field " << fieldName << endl;
 
-            GeometricField<Type, fvPatchField, volMesh> volField
+            VolField<Type> volField
             (
                 *iter(),
                 baseMesh
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 0bab9a1f28..aaf42ba9d9 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -52,7 +52,7 @@ void subsetVolFields
 (
     const fvMeshSubset& subsetter,
     const wordList& fieldNames,
-    PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
+    PtrList<VolField<Type>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -63,7 +63,7 @@ void subsetVolFields
 
         Info<< "Subsetting field " << fieldName << endl;
 
-        GeometricField<Type, fvPatchField, volMesh> fld
+        VolField<Type> fld
         (
             IOobject
             (
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
index 84d643573b..fe9dc25f39 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
@@ -146,10 +146,10 @@ public:
 
         //- Decompose volume field
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<VolField<Type>>
         decomposeField
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field
+            const VolField<Type>& field
         ) const;
 
         //- Decompose surface field
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
index 56426d992d..5419967ff3 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
@@ -86,7 +86,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvFieldDecomposer::decomposeField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     // Create dummy patch fields
@@ -106,9 +106,9 @@ Foam::fvFieldDecomposer::decomposeField
     }
 
     // Create the processor field with the dummy patch fields
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tresF
+    tmp<VolField<Type>> tresF
     (
-        new GeometricField<Type, fvPatchField, volMesh>
+        new VolField<Type>
         (
             IOobject
             (
@@ -125,11 +125,11 @@ Foam::fvFieldDecomposer::decomposeField
             patchFields
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& resF = tresF.ref();
+    VolField<Type>& resF = tresF.ref();
 
     // Change the patch fields to the correct type using a mapper constructor
     // (with reference to the now correct internal field)
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
         Boundary& bf = resF.boundaryFieldRef();
     forAll(bf, procPatchi)
     {
diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
index e0b98a3665..436a92fef5 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
+++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
@@ -152,16 +152,16 @@ public:
 
         //- Reconstruct volume field
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<VolField<Type>>
         reconstructFvVolumeField
         (
             const IOobject& fieldIoObject,
-            const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
+            const PtrList<VolField<Type>>&
         ) const;
 
         //- Read and reconstruct volume field
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<VolField<Type>>
         reconstructFvVolumeField(const IOobject& fieldIoObject) const;
 
 
diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
index 979274dfa6..8cf2eb4774 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
@@ -142,7 +142,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvFieldReconstructor::reconstructFvVolumeField
 (
     const IOobject& fieldIoObject,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& procFields
+    const PtrList<VolField<Type>>& procFields
 ) const
 {
     // Create the internalField
@@ -153,7 +153,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
 
     forAll(procFields, proci)
     {
-        const GeometricField<Type, fvPatchField, volMesh>& procField =
+        const VolField<Type>& procField =
             procFields[proci];
 
         // Set the cell values in the reconstructed field
@@ -240,9 +240,9 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
     }
 
     // Construct and return the field
-    return tmp<GeometricField<Type, fvPatchField, volMesh>>
+    return tmp<VolField<Type>>
     (
-        new GeometricField<Type, fvPatchField, volMesh>
+        new VolField<Type>
         (
             fieldIoObject,
             completeMesh_,
@@ -261,7 +261,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
     const IOobject& fieldIoObject
 ) const
 {
-    PtrList<GeometricField<Type, fvPatchField, volMesh>>
+    PtrList<VolField<Type>>
         procFields(procMeshes_.size());
 
     forAll(procMeshes_, proci)
@@ -269,7 +269,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
         procFields.set
         (
             proci,
-            new GeometricField<Type, fvPatchField, volMesh>
+            new VolField<Type>
             (
                 IOobject
                 (
@@ -507,7 +507,7 @@ void Foam::fvFieldReconstructor::reconstructFvVolumeFields
 )
 {
     const word& fieldClassName =
-        GeometricField<Type, fvPatchField, volMesh>::typeName;
+        VolField<Type>::typeName;
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index 2fd6b23fcb..d77a31051a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -40,16 +40,16 @@ using namespace Foam;
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 volField
 (
     const fvMeshSubset& meshSubsetter,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     if (meshSubsetter.hasSubMesh())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh>> tfld
+        tmp<VolField<Type>> tfld
         (
             meshSubsetter.interpolate(vf)
         );
@@ -300,7 +300,7 @@ void writePatchField
 template<class Type>
 void ensightField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const ensightMesh& eMesh,
     const fileName& postProcPath,
     const word& prepend,
@@ -717,7 +717,7 @@ void ensightPointField
 template<class Type>
 void ensightField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const ensightMesh& eMesh,
     const fileName& postProcPath,
     const word& prepend,
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
index 09a35f4c55..ceeb690c96 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
@@ -229,7 +229,7 @@ void Foam::ensightVolField
     partsList.writeField
     (
         os,
-        GeometricField<Type, fvPatchField, volMesh>
+        VolField<Type>
         (
             fieldObject,
             mesh
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
index 6188b4f9b7..2e4234f2c6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
@@ -123,7 +123,7 @@ public:
         tmp<Field<Type>> getPatchField
         (
             const bool nearCellValue,
-            const GeometricField<Type, fvPatchField, volMesh>& vfld,
+            const VolField<Type>& vfld,
             const label patchi
         ) const;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
index 7933eb1ef1..e3c7dd7e17 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
@@ -68,7 +68,7 @@ template<class Type>
 Foam::tmp<Field<Type>> Foam::tecplotWriter::getPatchField
 (
     const bool nearCellValue,
-    const GeometricField<Type, fvPatchField, volMesh>& vfld,
+    const VolField<Type>& vfld,
     const label patchi
 ) const
 {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
index aeb5956552..41967fb23b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ public:
         void write
         (
             const volPointInterpolation&,
-            const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
+            const UPtrList<const VolField<Type>>&
         );
 };
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
index 72bbc1e63f..7738ce4b1f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ template<class Type>
 void Foam::internalWriter::write
 (
     const volPointInterpolation& pInterp,
-    const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
+    const UPtrList<const VolField<Type>>& flds
 )
 {
     forAll(flds, i)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H
index e1ba9e8ad9..feb08c91d5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H
@@ -114,7 +114,7 @@ public:
         template<class Type>
         void write
         (
-            const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
+            const UPtrList<const VolField<Type>>&
         );
 
         //- Write pointFields
@@ -132,7 +132,7 @@ public:
         void write
         (
             const PrimitivePatchInterpolation<primitivePatch>&,
-            const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
+            const UPtrList<const VolField<Type>>&
         );
 };
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C
index 2c9f9b7878..acd583e52f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C
@@ -31,12 +31,12 @@ License
 template<class Type>
 void Foam::patchWriter::write
 (
-    const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
+    const UPtrList<const VolField<Type>>& flds
 )
 {
     forAll(flds, fieldi)
     {
-        const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldi];
+        const VolField<Type>& fld = flds[fieldi];
 
         os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '
             << nFaces_ << " float" << std::endl;
@@ -96,12 +96,12 @@ template<class Type>
 void Foam::patchWriter::write
 (
     const PrimitivePatchInterpolation<primitivePatch>& pInter,
-    const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
+    const UPtrList<const VolField<Type>>& flds
 )
 {
     forAll(flds, fieldi)
     {
-        const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldi];
+        const VolField<Type>& fld = flds[fieldi];
 
         os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '
             << nPoints_ << " float" << std::endl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H
index 97448d2a18..aa78cf6fe8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H
@@ -79,7 +79,7 @@ namespace vtkWriteOps
     (
         std::ostream&,
         const bool binary,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const PointField<Type>&,
         const vtkMesh&
     );
@@ -101,7 +101,7 @@ namespace vtkWriteOps
         std::ostream&,
         const bool binary,
         const volPointInterpolation&,
-        const PtrList<GeometricField<Type, fvPatchField, volMesh>>&,
+        const PtrList<VolField<Type>>&,
         const vtkMesh&
     );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C
index 5206a212ac..26b7c530c9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C
@@ -97,7 +97,7 @@ void Foam::vtkWriteOps::write
 (
     std::ostream& os,
     const bool binary,
-    const GeometricField<Type, fvPatchField, volMesh>& vvf,
+    const VolField<Type>& vvf,
     const PointField<Type>& pvf,
     const vtkMesh& vMesh
 )
@@ -147,7 +147,7 @@ void Foam::vtkWriteOps::write
     std::ostream& os,
     const bool binary,
     const volPointInterpolation& pInterp,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds,
+    const PtrList<VolField<Type>>& flds,
     const vtkMesh& vMesh
 )
 {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
index 21115084c0..e0453478c7 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
@@ -534,7 +534,7 @@ class vtkPVFoam
             template<class Type>
             void convertVolFieldBlock
             (
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 autoPtr<PointField<Type>>&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
@@ -545,7 +545,7 @@ class vtkPVFoam
             template<class Type>
             void convertVolInternalFieldBlock
             (
-                const typename GeometricField<Type, fvPatchField, volMesh>
+                const typename VolField<Type>
                     ::Internal&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
@@ -556,7 +556,7 @@ class vtkPVFoam
             template<class Type>
             void convertVolInternalField
             (
-                const typename GeometricField<Type, fvPatchField, volMesh>
+                const typename VolField<Type>
                     ::Internal&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
@@ -579,7 +579,7 @@ class vtkPVFoam
             template<class Type>
             void convertSurfaceField
             (
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
                 const label datasetNo,
@@ -652,7 +652,7 @@ class vtkPVFoam
             void convertPointField
             (
                 const PointField<Type>&,
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
                 const label datasetNo,
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H
index 4d835097c1..d51df62c3d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H
@@ -187,7 +187,7 @@ void Foam::vtkPVFoam::convertPointFieldBlock
            convertPointField
            (
                ptf,
-               GeometricField<Type, fvPatchField, volMesh>::null(),
+               VolField<Type>::null(),
                output,
                range,
                datasetNo,
@@ -202,7 +202,7 @@ template<class Type>
 void Foam::vtkPVFoam::convertPointField
 (
     const PointField<Type>& ptf,
-    const GeometricField<Type, fvPatchField, volMesh>& tf,
+    const VolField<Type>& tf,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const label datasetNo,
@@ -232,7 +232,7 @@ void Foam::vtkPVFoam::convertPointField
     // Note: using the name of the original volField
     // not the name generated by the interpolation "volPointInterpolate(<name>)"
 
-    if (&tf != &GeometricField<Type, fvPatchField, volMesh>::null())
+    if (&tf != &VolField<Type>::null())
     {
         pointData->SetName(tf.name().c_str());
     }
@@ -285,7 +285,7 @@ void Foam::vtkPVFoam::convertPointField
     // continue insertion from here
     label i = nPoints;
 
-    if (&tf != &GeometricField<Type, fvPatchField, volMesh>::null())
+    if (&tf != &VolField<Type>::null())
     {
         forAll(addPointCellLabels, apI)
         {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H
index 7a793ebeff..1ba7a2dddd 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H
@@ -45,7 +45,7 @@ InClass
 template<class Type>
 void Foam::vtkPVFoam::convertSurfaceField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& tf,
+    const VolField<Type>& tf,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const label datasetNo,
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
index 58dd0b081c..487d5835db 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
@@ -59,14 +59,14 @@ void Foam::vtkPVFoam::convertVolFields
         if
         (
             iter()->headerClassName()
-         != GeometricField<Type, fvPatchField, volMesh>::typeName
+         != VolField<Type>::typeName
         )
         {
             continue;
         }
 
         // Load field
-        GeometricField<Type, fvPatchField, volMesh> tf
+        VolField<Type> tf
         (
             *iter(),
             mesh
@@ -282,14 +282,14 @@ void Foam::vtkPVFoam::convertVolInternalFields
         if
         (
             iter()->headerClassName()
-         != GeometricField<Type, fvPatchField, volMesh>::Internal::typeName
+         != VolField<Type>::Internal::typeName
         )
         {
             continue;
         }
 
         // Load field
-        typename GeometricField<Type, fvPatchField, volMesh>::Internal tf
+        typename VolField<Type>::Internal tf
         (
             *iter(),
             mesh
@@ -328,7 +328,7 @@ void Foam::vtkPVFoam::convertVolInternalFields
 template<class Type>
 void Foam::vtkPVFoam::convertVolFieldBlock
 (
-    const GeometricField<Type, fvPatchField, volMesh>& tf,
+    const VolField<Type>& tf,
     autoPtr<PointField<Type>>& ptfPtr,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
@@ -370,7 +370,7 @@ void Foam::vtkPVFoam::convertVolFieldBlock
 template<class Type>
 void Foam::vtkPVFoam::convertVolInternalFieldBlock
 (
-    const typename GeometricField<Type, fvPatchField, volMesh>::Internal& tf,
+    const typename VolField<Type>::Internal& tf,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const List<polyDecomp>& decompLst
@@ -398,7 +398,7 @@ void Foam::vtkPVFoam::convertVolInternalFieldBlock
 template<class Type>
 void Foam::vtkPVFoam::convertVolInternalField
 (
-    const typename GeometricField<Type, fvPatchField, volMesh>::Internal& tf,
+    const typename VolField<Type>::Internal& tf,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const label datasetNo,
diff --git a/applications/utilities/preProcessing/mapFields/meshToMesh0.H b/applications/utilities/preProcessing/mapFields/meshToMesh0.H
index fa985563a5..c88479e2b2 100644
--- a/applications/utilities/preProcessing/mapFields/meshToMesh0.H
+++ b/applications/utilities/preProcessing/mapFields/meshToMesh0.H
@@ -267,7 +267,7 @@ public:
             void interpolateField
             (
                 Field<Type>&,
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 const labelList& adr,
                 const scalarListList& weights
             ) const;
@@ -277,7 +277,7 @@ public:
             void interpolateField
             (
                 Field<Type>&,
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 const labelListList& adr,
                 const scalarListList& weights
             ) const;
@@ -288,7 +288,7 @@ public:
             void interpolateField
             (
                 Field<Type>&,
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 const labelList& adr,
                 const vectorField& centres
             )const;
@@ -299,7 +299,7 @@ public:
             void interpolateInternalField
             (
                 Field<Type>&,
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 order=INTERPOLATE
             ) const;
 
@@ -307,7 +307,7 @@ public:
             void interpolateInternalField
             (
                 Field<Type>&,
-                const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+                const tmp<VolField<Type>>&,
                 order=INTERPOLATE
             ) const;
 
@@ -316,32 +316,32 @@ public:
             template<class Type>
             void interpolate
             (
-                GeometricField<Type, fvPatchField, volMesh>&,
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                VolField<Type>&,
+                const VolField<Type>&,
                 order=INTERPOLATE
             ) const;
 
             template<class Type>
             void interpolate
             (
-                GeometricField<Type, fvPatchField, volMesh>&,
-                const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+                VolField<Type>&,
+                const tmp<VolField<Type>>&,
                 order=INTERPOLATE
             ) const;
 
 
             //- Interpolate volume field
             template<class Type>
-            tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
+            tmp<VolField<Type>> interpolate
             (
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 order=INTERPOLATE
             ) const;
 
             template<class Type>
-            tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
+            tmp<VolField<Type>> interpolate
             (
-                const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+                const tmp<VolField<Type>>&,
                 order=INTERPOLATE
             ) const;
 };
diff --git a/applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C b/applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C
index 4c5b398503..8feb9a1b32 100644
--- a/applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C
+++ b/applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C
@@ -57,7 +57,7 @@ template<class Type>
 void Foam::meshToMesh0::interpolateField
 (
     Field<Type>& toF,
-    const GeometricField<Type, fvPatchField, volMesh>& fromVf,
+    const VolField<Type>& fromVf,
     const labelListList& adr,
     const scalarListList& weights
 ) const
@@ -83,7 +83,7 @@ template<class Type>
 void Foam::meshToMesh0::interpolateField
 (
     Field<Type>& toF,
-    const GeometricField<Type, fvPatchField, volMesh>& fromVf,
+    const VolField<Type>& fromVf,
     const labelList& adr,
     const scalarListList& weights
 ) const
@@ -117,7 +117,7 @@ template<class Type>
 void Foam::meshToMesh0::interpolateField
 (
     Field<Type>& toF,
-    const GeometricField<Type, fvPatchField, volMesh>& fromVf,
+    const VolField<Type>& fromVf,
     const labelList& adr,
     const vectorField& centres
 ) const
@@ -139,7 +139,7 @@ template<class Type>
 void Foam::meshToMesh0::interpolateInternalField
 (
     Field<Type>& toF,
-    const GeometricField<Type, fvPatchField, volMesh>& fromVf,
+    const VolField<Type>& fromVf,
     meshToMesh0::order ord
 ) const
 {
@@ -216,7 +216,7 @@ template<class Type>
 void Foam::meshToMesh0::interpolateInternalField
 (
     Field<Type>& toF,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
+    const tmp<VolField<Type>>& tfromVf,
     meshToMesh0::order ord
 ) const
 {
@@ -228,14 +228,14 @@ void Foam::meshToMesh0::interpolateInternalField
 template<class Type>
 void Foam::meshToMesh0::interpolate
 (
-    GeometricField<Type, fvPatchField, volMesh>& toVf,
-    const GeometricField<Type, fvPatchField, volMesh>& fromVf,
+    VolField<Type>& toVf,
+    const VolField<Type>& fromVf,
     meshToMesh0::order ord
 ) const
 {
     interpolateInternalField(toVf, fromVf, ord);
 
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
         Boundary& toVfBf = toVf.boundaryFieldRef();
 
     forAll(toMesh_.boundaryMesh(), patchi)
@@ -322,8 +322,8 @@ void Foam::meshToMesh0::interpolate
 template<class Type>
 void Foam::meshToMesh0::interpolate
 (
-    GeometricField<Type, fvPatchField, volMesh>& toVf,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
+    VolField<Type>& toVf,
+    const tmp<VolField<Type>>& tfromVf,
     meshToMesh0::order ord
 ) const
 {
@@ -336,7 +336,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh0::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& fromVf,
+    const VolField<Type>& fromVf,
     meshToMesh0::order ord
 ) const
 {
@@ -380,9 +380,9 @@ Foam::meshToMesh0::interpolate
 
 
     // Create the complete field from the pieces
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ttoF
+    tmp<VolField<Type>> ttoF
     (
-        new GeometricField<Type, fvPatchField, volMesh>
+        new VolField<Type>
         (
             IOobject
             (
@@ -408,11 +408,11 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::meshToMesh0::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
+    const tmp<VolField<Type>>& tfromVf,
     meshToMesh0::order ord
 ) const
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tint =
+    tmp<VolField<Type>> tint =
         interpolate(tfromVf(), ord);
     tfromVf.clear();
 
diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C b/applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C
index 408aa31ee0..40cb4fd77a 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C
+++ b/applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C
@@ -36,9 +36,9 @@ namespace Foam
 {
 
 template<class Type>
-void evaluateConstraintTypes(GeometricField<Type, fvPatchField, volMesh>& fld)
+void evaluateConstraintTypes(VolField<Type>& fld)
 {
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
         Boundary& fldBf = fld.boundaryFieldRef();
 
     if
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 7168a3dc39..0b3e9ea4ed 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -101,7 +101,7 @@ bool setCellFieldType
             }
         }
 
-        typename GeometricField<Type, fvPatchField, volMesh>::
+        typename VolField<Type>::
             Boundary& fieldBf = field.boundaryFieldRef();
 
         forAll(field.boundaryField(), patchi)
diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H
index 497b1d4499..b05dbbd939 100644
--- a/src/conversion/ensight/part/ensightParts.H
+++ b/src/conversion/ensight/part/ensightParts.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
@@ -140,7 +140,7 @@ public:
         void writeField
         (
             ensightFile&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/conversion/ensight/part/ensightPartsTemplates.C b/src/conversion/ensight/part/ensightPartsTemplates.C
index 6b4b59410f..90303c09de 100644
--- a/src/conversion/ensight/part/ensightPartsTemplates.C
+++ b/src/conversion/ensight/part/ensightPartsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ template<class Type>
 void Foam::ensightParts::writeField
 (
     ensightFile& os,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     // find offset to patch parts (ie, the first face data)
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
index bca4b6ad30..8837f25c9b 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
@@ -86,8 +86,8 @@ class fvMeshAdder
         (
             const mapAddedPolyMesh& meshMap,
 
-            GeometricField<Type, fvPatchField, volMesh>& fld,
-            const GeometricField<Type, fvPatchField, volMesh>& fldToAdd
+            VolField<Type>& fld,
+            const VolField<Type>& fldToAdd
         );
 
         //- Update single surfaceField.
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
index f2c76f9858..c149e1aec2 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
@@ -36,8 +36,8 @@ void Foam::fvMeshAdder::MapVolField
 (
     const mapAddedPolyMesh& meshMap,
 
-    GeometricField<Type, fvPatchField, volMesh>& fld,
-    const GeometricField<Type, fvPatchField, volMesh>& fldToAdd
+    VolField<Type>& fld,
+    const VolField<Type>& fldToAdd
 )
 {
     const fvMesh& mesh = fld.mesh();
@@ -62,7 +62,7 @@ void Foam::fvMeshAdder::MapVolField
     // Patch fields from old mesh
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
     Boundary& bfld = fld.boundaryFieldRef();
 
     {
@@ -256,37 +256,37 @@ void Foam::fvMeshAdder::MapVolFields
     const fvMesh& meshToAdd
 )
 {
-    HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fields
+    HashTable<const VolField<Type>*> fields
     (
         mesh.objectRegistry::lookupClass
-        <GeometricField<Type, fvPatchField, volMesh>>
+        <VolField<Type>>
         ()
     );
 
-    HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fieldsToAdd
+    HashTable<const VolField<Type>*> fieldsToAdd
     (
         meshToAdd.objectRegistry::lookupClass
-        <GeometricField<Type, fvPatchField, volMesh>>
+        <VolField<Type>>
         ()
     );
 
     for
     (
-        typename HashTable<const GeometricField<Type, fvPatchField, volMesh>*>::
+        typename HashTable<const VolField<Type>*>::
             iterator fieldIter = fields.begin();
         fieldIter != fields.end();
         ++fieldIter
     )
     {
-        GeometricField<Type, fvPatchField, volMesh>& fld =
-            const_cast<GeometricField<Type, fvPatchField, volMesh>&>
+        VolField<Type>& fld =
+            const_cast<VolField<Type>&>
             (
                 *fieldIter()
             );
 
         if (fieldsToAdd.found(fld.name()))
         {
-            const GeometricField<Type, fvPatchField, volMesh>& fldToAdd =
+            const VolField<Type>& fldToAdd =
                 *fieldsToAdd[fld.name()];
 
             if (debug)
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
index 30660d85c6..fcd2472e3e 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
@@ -253,10 +253,10 @@ public:
 
             //- Map volume field
             template<class Type>
-            static tmp<GeometricField<Type, fvPatchField, volMesh>>
+            static tmp<VolField<Type>>
             interpolate
             (
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 const fvMesh& sMesh,
                 const labelList& patchMap,
                 const labelList& cellMap,
@@ -264,10 +264,10 @@ public:
             );
 
             template<class Type>
-            tmp<GeometricField<Type, fvPatchField, volMesh>>
+            tmp<VolField<Type>>
             interpolate
             (
-                const GeometricField<Type, fvPatchField, volMesh>&
+                const VolField<Type>&
             ) const;
 
             //- Map surface field. Optionally negates value if flipping
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index e8ffc42f97..aca8a03992 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -38,7 +38,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvMeshSubset::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const fvMesh& sMesh,
     const labelList& patchMap,
     const labelList& cellMap,
@@ -80,9 +80,9 @@ Foam::fvMeshSubset::interpolate
         }
     }
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tresF
+    tmp<VolField<Type>> tresF
     (
-        new GeometricField<Type, fvPatchField, volMesh>
+        new VolField<Type>
         (
             IOobject
             (
@@ -99,13 +99,13 @@ Foam::fvMeshSubset::interpolate
             patchFields
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& resF = tresF.ref();
+    VolField<Type>& resF = tresF.ref();
 
 
     // 2. Change the fvPatchFields to the correct type using a mapper
     //  constructor (with reference to the now correct internal field)
 
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
         Boundary& bf = resF.boundaryFieldRef();
 
     forAll(bf, patchi)
@@ -158,7 +158,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvMeshSubset::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return interpolate
diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
index 0ffc16f9b7..f52cc98b2e 100644
--- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
+++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
@@ -127,7 +127,7 @@ public:
             template<class Type>
             bool constrain
             (
-                GeometricField<Type, fvPatchField, volMesh>& field
+                VolField<Type>& field
             ) const;
 
 
diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C
index b862f95241..7fe571a991 100644
--- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ bool Foam::fvConstraints::constrain(fvMatrix<Type>& eqn) const
 template<class Type>
 bool Foam::fvConstraints::constrain
 (
-    GeometricField<Type, fvPatchField, volMesh>& field
+    VolField<Type>& field
 ) const
 {
     const word& fieldName = field.name();
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
index bd03cddd42..2d1fcd006f 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
@@ -113,7 +113,7 @@ protected:
         template<class Type, class ... AlphaRhoFieldTypes>
         tmp<fvMatrix<Type>> source
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field,
+            const VolField<Type>& field,
             const word& fieldName,
             const dimensionSet& ds,
             const AlphaRhoFieldTypes& ... alphaRhos
@@ -154,7 +154,7 @@ public:
         >
         inline static dimensionSet sourceDims
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field,
+            const VolField<Type>& field,
             const dimensionSet& ds,
             const AlphaRhoFieldType& alphaRho,
             const AlphaRhoFieldTypes& ... alphaRhos
@@ -165,7 +165,7 @@ public:
         template<class Type>
         inline static dimensionSet sourceDims
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field,
+            const VolField<Type>& field,
             const dimensionSet& ds
         );
 
@@ -280,14 +280,14 @@ public:
             template<class Type>
             tmp<fvMatrix<Type>> source
             (
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for an equation with a specified name
             template<class Type>
             tmp<fvMatrix<Type>> source
             (
-                const GeometricField<Type, fvPatchField, volMesh>& field,
+                const VolField<Type>& field,
                 const word& fieldName
             ) const;
 
@@ -296,7 +296,7 @@ public:
             tmp<fvMatrix<Type>> source
             (
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for a compressible equation with a specified name
@@ -304,7 +304,7 @@ public:
             tmp<fvMatrix<Type>> source
             (
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field,
+                const VolField<Type>& field,
                 const word& fieldName
             ) const;
 
@@ -314,7 +314,7 @@ public:
             (
                 const volScalarField& alpha,
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for a phase equation with a specified name
@@ -323,7 +323,7 @@ public:
             (
                 const volScalarField& alpha,
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field,
+                const VolField<Type>& field,
                 const word& fieldName
             ) const;
 
@@ -333,7 +333,7 @@ public:
             (
                 const volScalarField& alpha,
                 const geometricOneField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for a phase equation
@@ -342,7 +342,7 @@ public:
             (
                 const geometricOneField& alpha,
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for a phase equation
@@ -351,21 +351,21 @@ public:
             (
                 const geometricOneField& alpha,
                 const geometricOneField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for an equation with a second time derivative
             template<class Type>
             tmp<fvMatrix<Type>> d2dt2
             (
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for an equation with a second time derivative
             template<class Type>
             tmp<fvMatrix<Type>> d2dt2
             (
-                const GeometricField<Type, fvPatchField, volMesh>& field,
+                const VolField<Type>& field,
                 const word& fieldName
             ) const;
 
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C b/src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C
index ef5511534b..92e6795dad 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C
@@ -28,7 +28,7 @@ License
 template<class Type, class AlphaRhoFieldType, class ... AlphaRhoFieldTypes>
 Foam::dimensionSet Foam::fvModel::sourceDims
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const dimensionSet& ds,
     const AlphaRhoFieldType& alphaRho,
     const AlphaRhoFieldTypes& ... alphaRhos
@@ -41,7 +41,7 @@ Foam::dimensionSet Foam::fvModel::sourceDims
 template<class Type>
 Foam::dimensionSet Foam::fvModel::sourceDims
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const dimensionSet& ds
 )
 {
@@ -54,7 +54,7 @@ Foam::dimensionSet Foam::fvModel::sourceDims
 template<class Type, class ... AlphaRhoFieldTypes>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName,
     const dimensionSet& ds,
     const AlphaRhoFieldTypes& ... alphaRhos
@@ -84,7 +84,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(field, field.name());
@@ -94,7 +94,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName
 ) const
 {
@@ -106,7 +106,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(rho, field, field.name());
@@ -117,7 +117,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName
 ) const
 {
@@ -130,7 +130,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(alpha, rho, field, field.name());
@@ -142,7 +142,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName
 ) const
 {
@@ -155,7 +155,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
     const geometricOneField& alpha,
     const geometricOneField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(field, field.name());
@@ -167,7 +167,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
     const volScalarField& alpha,
     const geometricOneField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     volScalarField one
@@ -194,7 +194,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 (
     const geometricOneField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(rho, field, field.name());
@@ -206,7 +206,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::d2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->d2dt2(field, field.name());
@@ -216,7 +216,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::d2dt2
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::d2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName
 ) const
 {
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
index a9decb7c14..2f544e4d55 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
@@ -85,7 +85,7 @@ class fvModels
         template<class Type, class ... AlphaRhoFieldTypes>
         tmp<fvMatrix<Type>> source
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field,
+            const VolField<Type>& field,
             const word& fieldName,
             const dimensionSet& ds,
             const AlphaRhoFieldTypes& ... alphaRhos
@@ -144,14 +144,14 @@ public:
             template<class Type>
             tmp<fvMatrix<Type>> source
             (
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for an equation with a specified name
             template<class Type>
             tmp<fvMatrix<Type>> source
             (
-                const GeometricField<Type, fvPatchField, volMesh>& field,
+                const VolField<Type>& field,
                 const word& fieldName
             ) const;
 
@@ -160,7 +160,7 @@ public:
             tmp<fvMatrix<Type>> source
             (
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for a compressible equation with a specified name
@@ -168,7 +168,7 @@ public:
             tmp<fvMatrix<Type>> source
             (
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field,
+                const VolField<Type>& field,
                 const word& fieldName
             ) const;
 
@@ -178,7 +178,7 @@ public:
             (
                 const volScalarField& alpha,
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for a phase equation with a specified name
@@ -187,7 +187,7 @@ public:
             (
                 const volScalarField& alpha,
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field,
+                const VolField<Type>& field,
                 const word& fieldName
             ) const;
 
@@ -197,7 +197,7 @@ public:
             (
                 const volScalarField& alpha,
                 const geometricOneField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for a phase equation
@@ -206,7 +206,7 @@ public:
             (
                 const geometricOneField& alpha,
                 const volScalarField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for a phase equation
@@ -215,21 +215,21 @@ public:
             (
                 const geometricOneField& alpha,
                 const geometricOneField& rho,
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for an equation with a second time derivative
             template<class Type>
             tmp<fvMatrix<Type>> d2dt2
             (
-                const GeometricField<Type, fvPatchField, volMesh>& field
+                const VolField<Type>& field
             ) const;
 
             //- Return source for an equation with a second time derivative
             template<class Type>
             tmp<fvMatrix<Type>> d2dt2
             (
-                const GeometricField<Type, fvPatchField, volMesh>& field,
+                const VolField<Type>& field,
                 const word& fieldName
             ) const;
 
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C b/src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C
index f0f10ff168..c97e957e2f 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C
@@ -28,7 +28,7 @@ License
 template<class Type, class ... AlphaRhoFieldTypes>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName,
     const dimensionSet& ds,
     const AlphaRhoFieldTypes& ... alphaRhos
@@ -75,7 +75,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(field, field.name());
@@ -85,7 +85,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName
 ) const
 {
@@ -97,7 +97,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(rho, field, field.name());
@@ -108,7 +108,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName
 ) const
 {
@@ -121,7 +121,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(alpha, rho, field, field.name());
@@ -133,7 +133,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName
 ) const
 {
@@ -146,7 +146,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
     const geometricOneField& alpha,
     const geometricOneField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(field, field.name());
@@ -158,7 +158,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
     const volScalarField& alpha,
     const geometricOneField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     volScalarField one
@@ -185,7 +185,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 (
     const geometricOneField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->source(rho, field, field.name());
@@ -197,7 +197,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::d2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     return this->d2dt2(field, field.name());
@@ -207,7 +207,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::d2dt2
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::d2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const VolField<Type>& field,
     const word& fieldName
 ) const
 {
diff --git a/src/finiteVolume/cfdTools/general/levelSet/levelSet.H b/src/finiteVolume/cfdTools/general/levelSet/levelSet.H
index af54f03d9b..0a9a069f7a 100644
--- a/src/finiteVolume/cfdTools/general/levelSet/levelSet.H
+++ b/src/finiteVolume/cfdTools/general/levelSet/levelSet.H
@@ -73,13 +73,13 @@ tmp<Field<Type>> levelSetAverage
 
 //- As the above overload, but both in cells and on patch faces
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> levelSetAverage
+tmp<VolField<Type>> levelSetAverage
 (
     const volScalarField& levelC,
     const pointScalarField& levelP,
-    const GeometricField<Type, fvPatchField, volMesh>& positiveC,
+    const VolField<Type>& positiveC,
     const PointField<Type>& positiveP,
-    const GeometricField<Type, fvPatchField, volMesh>& negativeC,
+    const VolField<Type>& negativeC,
     const PointField<Type>& negativeP
 );
 
diff --git a/src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C b/src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C
index 2b166fdddf..6b79e5a44b 100644
--- a/src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C
+++ b/src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C
@@ -175,24 +175,24 @@ Foam::levelSetAverage
 (
     const volScalarField& levelC,
     const pointScalarField& levelP,
-    const GeometricField<Type, fvPatchField, volMesh>& positiveC,
+    const VolField<Type>& positiveC,
     const PointField<Type>& positiveP,
-    const GeometricField<Type, fvPatchField, volMesh>& negativeC,
+    const VolField<Type>& negativeC,
     const PointField<Type>& negativeP
 )
 {
     const fvMesh& mesh = levelC.mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tResult
+    tmp<VolField<Type>> tResult
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             positiveC.name() + ":levelSetAverage",
             mesh,
             dimensioned<Type>("0", positiveC.dimensions(), Zero)
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& result = tResult.ref();
+    VolField<Type>& result = tResult.ref();
 
     result.primitiveFieldRef() =
         levelSetAverage
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 91565765d8..0e70671ce5 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -135,8 +135,8 @@ template<class Type>
 const Foam::cyclicFvPatchField<Type>&
 Foam::cyclicFvPatchField<Type>::nbrPatchField() const
 {
-    const GeometricField<Type, fvPatchField, volMesh>& fld =
-    static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
+    const VolField<Type>& fld =
+    static_cast<const VolField<Type>&>
     (
         this->primitiveField()
     );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 50784945db..ad07318392 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -184,9 +184,9 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
     );
     scalar deltaT = this->db().time().deltaTValue();
 
-    const GeometricField<Type, fvPatchField, volMesh>& field =
+    const VolField<Type>& field =
         this->db().objectRegistry::template
-        lookupObject<GeometricField<Type, fvPatchField, volMesh>>
+        lookupObject<VolField<Type>>
         (
             this->internalField().name()
         );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index dc1a42c4d4..1515154dc6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,9 +98,9 @@ void Foam::outletMappedUniformInletFvPatchField<Type>::updateCoeffs()
         return;
     }
 
-    const GeometricField<Type, fvPatchField, volMesh>& f
+    const VolField<Type>& f
     (
-        dynamic_cast<const GeometricField<Type, fvPatchField, volMesh>&>
+        dynamic_cast<const VolField<Type>&>
         (
             this->internalField()
         )
diff --git a/src/finiteVolume/fields/volFields/volFields.C b/src/finiteVolume/fields/volFields/volFields.C
index a2a1b0f173..87da8dbd0a 100644
--- a/src/finiteVolume/fields/volFields/volFields.C
+++ b/src/finiteVolume/fields/volFields/volFields.C
@@ -58,8 +58,8 @@ defineTemplateTypeNameAndDebug(volTensorField, 0);
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<>
-tmp<GeometricField<scalar, fvPatchField, volMesh>>
-GeometricField<scalar, fvPatchField, volMesh>::component
+tmp<VolField<scalar>>
+VolField<scalar>::component
 (
     const direction
 ) const
@@ -69,10 +69,10 @@ GeometricField<scalar, fvPatchField, volMesh>::component
 
 
 template<>
-void GeometricField<scalar, fvPatchField, volMesh>::replace
+void VolField<scalar>::replace
 (
     const direction,
-    const GeometricField<scalar, fvPatchField, volMesh>& gsf
+    const VolField<scalar>& gsf
 )
 {
     *this == gsf;
diff --git a/src/finiteVolume/fields/volFields/volFields.H b/src/finiteVolume/fields/volFields/volFields.H
index aeb75f1e96..bb341bd2d7 100644
--- a/src/finiteVolume/fields/volFields/volFields.H
+++ b/src/finiteVolume/fields/volFields/volFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,17 +49,17 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<>
-tmp<GeometricField<scalar, fvPatchField, volMesh>>
-GeometricField<scalar, fvPatchField, volMesh>::component
+tmp<VolField<scalar>>
+VolField<scalar>::component
 (
     const direction
 ) const;
 
 template<>
-void GeometricField<scalar, fvPatchField, volMesh>::replace
+void VolField<scalar>::replace
 (
     const direction,
-    const GeometricField<scalar, fvPatchField, volMesh>& sf
+    const VolField<scalar>& sf
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/volFields/volFieldsFwd.H b/src/finiteVolume/fields/volFields/volFieldsFwd.H
index 51a57fb3f2..8d712c2e5f 100644
--- a/src/finiteVolume/fields/volFields/volFieldsFwd.H
+++ b/src/finiteVolume/fields/volFields/volFieldsFwd.H
@@ -57,13 +57,12 @@ using VolField = GeometricField<Type, fvPatchField, volMesh>;
 template<class Type>
 using VolInternalField = typename VolField<Type>::Internal;
 
-typedef GeometricField<label, fvPatchField, volMesh> volLabelField;
-typedef GeometricField<scalar, fvPatchField, volMesh> volScalarField;
-typedef GeometricField<vector, fvPatchField, volMesh> volVectorField;
-typedef GeometricField<sphericalTensor, fvPatchField, volMesh>
-    volSphericalTensorField;
-typedef GeometricField<symmTensor, fvPatchField, volMesh> volSymmTensorField;
-typedef GeometricField<tensor, fvPatchField, volMesh> volTensorField;
+typedef VolField<label> volLabelField;
+typedef VolField<scalar> volScalarField;
+typedef VolField<vector> volVectorField;
+typedef VolField<sphericalTensor> volSphericalTensorField;
+typedef VolField<symmTensor> volSymmTensorField;
+typedef VolField<tensor> volTensorField;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C
index a1764fd856..595a998277 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C
@@ -45,7 +45,7 @@ tmp<SurfaceField<Type>>
 boundedConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField& phi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return scheme_().interpolate(phi, vf);
@@ -57,7 +57,7 @@ tmp<SurfaceField<Type>>
 boundedConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return scheme_().flux(faceFlux, vf);
@@ -69,7 +69,7 @@ tmp<fvMatrix<Type>>
 boundedConvectionScheme<Type>::fvmDiv
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return
@@ -79,11 +79,11 @@ boundedConvectionScheme<Type>::fvmDiv
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 boundedConvectionScheme<Type>::fvcDiv
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
index a5f7be5ab4..ee472b49c4 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
@@ -100,25 +100,25 @@ public:
         tmp<SurfaceField<Type>> interpolate
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         tmp<SurfaceField<Type>> flux
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         tmp<fvMatrix<Type>> fvmDiv
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
+        tmp<VolField<Type>> fvcDiv
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index 605d36f475..b11c639acf 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -163,25 +163,25 @@ public:
         interpolate
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const = 0;
 
         virtual tmp<SurfaceField<Type>> flux
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const = 0;
 
         virtual tmp<fvMatrix<Type>> fvmDiv
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
+        virtual tmp<VolField<Type>> fvcDiv
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const = 0;
 
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
index da90e4f89d..5c645d946a 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
@@ -52,7 +52,7 @@ tmp<SurfaceField<Type>>
 gaussConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return tinterpScheme_().interpolate(vf);
@@ -64,7 +64,7 @@ tmp<SurfaceField<Type>>
 gaussConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return faceFlux*interpolate(faceFlux, vf);
@@ -76,7 +76,7 @@ tmp<fvMatrix<Type>>
 gaussConvectionScheme<Type>::fvmDiv
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     tmp<surfaceScalarField> tweights = tinterpScheme_().weights(vf);
@@ -116,14 +116,14 @@ gaussConvectionScheme<Type>::fvmDiv
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 gaussConvectionScheme<Type>::fvcDiv
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tConvection
+    tmp<VolField<Type>> tConvection
     (
         fvc::surfaceIntegrate(flux(faceFlux, vf))
     );
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
index c1ea9a6149..1245deeb4c 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
@@ -107,25 +107,25 @@ public:
         tmp<SurfaceField<Type>> interpolate
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         tmp<SurfaceField<Type>> flux
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         tmp<fvMatrix<Type>> fvmDiv
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
+        tmp<VolField<Type>> fvcDiv
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C
index eae65cf417..8d975b2b5a 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C
@@ -44,7 +44,7 @@ tmp<SurfaceField<Type>>
 multivariateGaussConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return gaussConvectionScheme<Type>
@@ -61,7 +61,7 @@ tmp<SurfaceField<Type>>
 multivariateGaussConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return gaussConvectionScheme<Type>
@@ -78,7 +78,7 @@ tmp<fvMatrix<Type>>
 multivariateGaussConvectionScheme<Type>::fvmDiv
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return gaussConvectionScheme<Type>
@@ -91,11 +91,11 @@ multivariateGaussConvectionScheme<Type>::fvmDiv
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 multivariateGaussConvectionScheme<Type>::fvcDiv
 (
     const surfaceScalarField& faceFlux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return gaussConvectionScheme<Type>
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
index 82bb504d0b..54df8c7f9a 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
@@ -101,25 +101,25 @@ public:
         tmp<SurfaceField<Type>> interpolate
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         tmp<SurfaceField<Type>> flux
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         tmp<fvMatrix<Type>> fvmDiv
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
+        tmp<VolField<Type>> fvcDiv
         (
             const surfaceScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 };
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
index 87b5fbbc18..ff74f97308 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,10 +40,10 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 EulerD2dt2Scheme<Type>::fvcD2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT2
@@ -67,7 +67,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
         const volScalarField::Internal VV0(mesh().V() + mesh().V0());
         const volScalarField::Internal V0V00(mesh().V0() + mesh().V00());
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             d2dt2name,
             halfRdeltaT2*
@@ -89,7 +89,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
     }
     else
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             d2dt2name,
             rDeltaT2*
@@ -104,11 +104,11 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 EulerD2dt2Scheme<Type>::fvcD2dt2
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT2
@@ -143,7 +143,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
             )
         );
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             d2dt2name,
             quarterRdeltaT2*
@@ -190,7 +190,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
         const volScalarField rhoRho0(rho + rho.oldTime());
         const volScalarField rho0Rho00(rho.oldTime() +rho.oldTime().oldTime());
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             d2dt2name,
             halfRdeltaT2*
@@ -208,7 +208,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 EulerD2dt2Scheme<Type>::fvmD2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -268,7 +268,7 @@ tmp<fvMatrix<Type>>
 EulerD2dt2Scheme<Type>::fvmD2dt2
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -328,7 +328,7 @@ tmp<fvMatrix<Type>>
 EulerD2dt2Scheme<Type>::fvmD2dt2
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
index eb739f9fdc..e31800b9ab 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,32 +89,32 @@ public:
             return fv::d2dt2Scheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
+        tmp<VolField<Type>> fvcD2dt2
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
+        tmp<VolField<Type>> fvcD2dt2
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         tmp<fvMatrix<Type>> fvmD2dt2
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         tmp<fvMatrix<Type>> fvmD2dt2
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         tmp<fvMatrix<Type>> fvmD2dt2
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index 4b427f8e87..79d769f8a4 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,32 +132,32 @@ public:
             return mesh_;
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
+        virtual tmp<VolField<Type>> fvcD2dt2
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
+        virtual tmp<VolField<Type>> fvcD2dt2
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<fvMatrix<Type>> fvmD2dt2
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<fvMatrix<Type>> fvmD2dt2
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<fvMatrix<Type>> fvmD2dt2
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
index 7befac962c..5b143331d1 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,13 +40,13 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 steadyStateD2dt2Scheme<Type>::fvcD2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    return GeometricField<Type, fvPatchField, volMesh>::New
+    return VolField<Type>::New
     (
         "d2dt2("+vf.name()+')',
         mesh(),
@@ -61,14 +61,14 @@ steadyStateD2dt2Scheme<Type>::fvcD2dt2
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 steadyStateD2dt2Scheme<Type>::fvcD2dt2
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    return GeometricField<Type, fvPatchField, volMesh>::New
+    return VolField<Type>::New
     (
         "d2dt2("+rho.name()+','+vf.name()+')',
         mesh(),
@@ -86,7 +86,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 steadyStateD2dt2Scheme<Type>::fvmD2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -107,7 +107,7 @@ tmp<fvMatrix<Type>>
 steadyStateD2dt2Scheme<Type>::fvmD2dt2
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -128,7 +128,7 @@ tmp<fvMatrix<Type>>
 steadyStateD2dt2Scheme<Type>::fvmD2dt2
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
index 189a163f54..b1f1b07d13 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,32 +88,32 @@ public:
             return fv::d2dt2Scheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
+        tmp<VolField<Type>> fvcD2dt2
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
+        tmp<VolField<Type>> fvcD2dt2
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         tmp<fvMatrix<Type>> fvmD2dt2
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         tmp<fvMatrix<Type>> fvmD2dt2
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         tmp<fvMatrix<Type>> fvmD2dt2
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 4135de5bee..d532dcdb7d 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -142,7 +142,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::CofrDeltaT() const
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -154,9 +154,9 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
+        tmp<VolField<Type>> tdtdt
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 mesh(),
@@ -177,9 +177,9 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 mesh(),
@@ -197,10 +197,10 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField rDeltaT(CorDeltaT());
@@ -209,9 +209,9 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT()*
@@ -228,9 +228,9 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*(vf - vf.oldTime())
@@ -241,11 +241,11 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField rDeltaT(CorDeltaT());
@@ -254,9 +254,9 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT()*rho.value()*
@@ -273,9 +273,9 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*rho*(vf - vf.oldTime())
@@ -286,11 +286,11 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField rDeltaT(CorDeltaT());
@@ -299,9 +299,9 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT()*
@@ -321,9 +321,9 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime())
@@ -334,12 +334,12 @@ CoEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CoEulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField rDeltaT(CorDeltaT());
@@ -348,9 +348,9 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT()*
@@ -378,9 +378,9 @@ CoEulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT
@@ -398,7 +398,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 CoEulerDdtScheme<Type>::fvmDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -434,7 +434,7 @@ tmp<fvMatrix<Type>>
 CoEulerDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -471,7 +471,7 @@ tmp<fvMatrix<Type>>
 CoEulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -511,7 +511,7 @@ CoEulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -552,7 +552,7 @@ template<class Type>
 tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
 CoEulerDdtScheme<Type>::fvcDdtUfCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -576,7 +576,7 @@ template<class Type>
 tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
 CoEulerDdtScheme<Type>::fvcDdtPhiCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -601,7 +601,7 @@ tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
 CoEulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -613,7 +613,7 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
      && Uf.dimensions() == dimDensity*dimVelocity
     )
     {
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -668,7 +668,7 @@ tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
 CoEulerDdtScheme<Type>::fvcDdtPhiCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -680,7 +680,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
      && phi.dimensions() == rho.dimensions()*dimFlux
     )
     {
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -739,7 +739,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
 template<class Type>
 tmp<surfaceScalarField> CoEulerDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&
+    const VolField<Type>&
 )
 {
     return surfaceScalarField::New
@@ -754,7 +754,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::meshPhi
 template<class Type>
 tmp<scalarField> CoEulerDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&,
+    const VolField<Type>&,
     const label patchi
 )
 {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
index d2d875e0e1..01312417fa 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
@@ -114,95 +114,95 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         );
 
@@ -217,7 +217,7 @@ public:
 template<>
 tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtUfCorr
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& U,
+    const VolField<scalar>& U,
     const SurfaceField<scalar>& Uf
 );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 13cba1a08f..c5c1351b89 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -341,14 +341,14 @@ CrankNicolsonDdtScheme<Type>::CrankNicolsonDdtScheme
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + dt.name() + ')',
             dt.dimensions()
@@ -356,9 +356,9 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
     const word ddtName("ddt(" + dt.name() + ')');
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
+    tmp<VolField<Type>> tdtdt
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             ddtName,
             mesh(),
@@ -398,14 +398,14 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + vf.name() + ')',
             vf.dimensions()
@@ -440,7 +440,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             (
@@ -464,7 +464,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
                  - offCentre_(ddt0());
         }
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDtCoef*(vf - vf.oldTime()) - offCentre_(ddt0())
@@ -474,15 +474,15 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + rho.name() + ',' + vf.name() + ')',
             rho.dimensions()*vf.dimensions()
@@ -517,7 +517,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             (
@@ -541,7 +541,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
                  - offCentre_(ddt0());
         }
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDtCoef*rho*(vf - vf.oldTime()) - offCentre_(ddt0())
@@ -551,15 +551,15 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + rho.name() + ',' + vf.name() + ')',
             rho.dimensions()*vf.dimensions()
@@ -598,7 +598,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             (
@@ -627,7 +627,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             ) - offCentre_(ddt0());
         }
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDtCoef*(rho*vf - rho.oldTime()*vf.oldTime()) - offCentre_(ddt0())
@@ -637,16 +637,16 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 CrankNicolsonDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + alpha.name() + ',' + rho.name() + ',' + vf.name() + ')',
             alpha.dimensions()*rho.dimensions()*vf.dimensions()
@@ -696,7 +696,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             (
@@ -734,7 +734,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             ) - offCentre_(ddt0());
         }
 
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDtCoef
@@ -752,11 +752,11 @@ template<class Type>
 tmp<fvMatrix<Type>>
 CrankNicolsonDdtScheme<Type>::fvmDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + vf.name() + ')',
             vf.dimensions()
@@ -835,11 +835,11 @@ tmp<fvMatrix<Type>>
 CrankNicolsonDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + rho.name() + ',' + vf.name() + ')',
             rho.dimensions()*vf.dimensions()
@@ -917,11 +917,11 @@ tmp<fvMatrix<Type>>
 CrankNicolsonDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + rho.name() + ',' + vf.name() + ')',
             rho.dimensions()*vf.dimensions()
@@ -1008,11 +1008,11 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddt0(" + alpha.name() + ',' + rho.name() + ',' + vf.name() + ')',
             alpha.dimensions()*rho.dimensions()*vf.dimensions()
@@ -1117,12 +1117,12 @@ template<class Type>
 tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
 CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddtCorrDdt0(" + U.name() + ')',
             U.dimensions()
@@ -1170,12 +1170,12 @@ template<class Type>
 tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
 CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
-    DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-        ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+    DDt0Field<VolField<Type>>& ddt0 =
+        ddt0_<VolField<Type>>
         (
             "ddtCorrDdt0(" + U.name() + ')',
             U.dimensions()
@@ -1225,7 +1225,7 @@ tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
 CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -1235,8 +1235,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
      && Uf.dimensions() == rho.dimensions()*dimVelocity
     )
     {
-        DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-            ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+        DDt0Field<VolField<Type>>& ddt0 =
+            ddt0_<VolField<Type>>
             (
                 "ddtCorrDdt0(" + rho.name() + ',' + U.name() + ')',
                 rho.dimensions()*U.dimensions()
@@ -1251,7 +1251,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
 
         dimensionedScalar rDtCoef = rDtCoef_(ddt0);
 
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -1296,8 +1296,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
      && Uf.dimensions() == rho.dimensions()*dimVelocity
     )
     {
-        DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-            ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+        DDt0Field<VolField<Type>>& ddt0 =
+            ddt0_<VolField<Type>>
             (
                 "ddtCorrDdt0(" + U.name() + ')',
                 U.dimensions()
@@ -1363,7 +1363,7 @@ tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
 CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -1373,8 +1373,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
      && phi.dimensions() == rho.dimensions()*dimFlux
     )
     {
-        DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-            ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+        DDt0Field<VolField<Type>>& ddt0 =
+            ddt0_<VolField<Type>>
             (
                 "ddtCorrDdt0(" + rho.name() + ',' + U.name() + ')',
                 rho.dimensions()*U.dimensions()
@@ -1389,7 +1389,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
 
         dimensionedScalar rDtCoef = rDtCoef_(ddt0);
 
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -1430,8 +1430,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
      && phi.dimensions() == rho.dimensions()*dimFlux
     )
     {
-        DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
-            ddt0_<GeometricField<Type, fvPatchField, volMesh>>
+        DDt0Field<VolField<Type>>& ddt0 =
+            ddt0_<VolField<Type>>
             (
                 "ddtCorrDdt0(" + U.name() + ')',
                 U.dimensions()
@@ -1488,7 +1488,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
 template<class Type>
 tmp<surfaceScalarField> CrankNicolsonDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     DDt0Field<surfaceScalarField>& meshPhi0 = ddt0_<surfaceScalarField>
@@ -1514,7 +1514,7 @@ tmp<surfaceScalarField> CrankNicolsonDdtScheme<Type>::meshPhi
 template<class Type>
 tmp<scalarField> CrankNicolsonDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const label patchi
 )
 {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index b1de6113c0..894e6370fe 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -228,95 +228,95 @@ public:
             return ocCoeff_->value(mesh().time().value());
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         );
 
@@ -331,7 +331,7 @@ public:
 template<>
 tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtUfCorr
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& U,
+    const VolField<scalar>& U,
     const SurfaceField<scalar>& Uf
 );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index da145524aa..e6f725e1d0 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -41,7 +41,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -53,9 +53,9 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
+        tmp<VolField<Type>> tdtdt
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 mesh(),
@@ -75,7 +75,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             mesh(),
@@ -92,10 +92,10 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 EulerDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -104,7 +104,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDeltaT*
@@ -120,7 +120,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDeltaT*(vf - vf.oldTime())
@@ -130,11 +130,11 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -143,7 +143,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDeltaT*rho*
@@ -159,7 +159,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDeltaT*rho*(vf - vf.oldTime())
@@ -169,11 +169,11 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -182,7 +182,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDeltaT*
@@ -201,7 +201,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime())
@@ -211,12 +211,12 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 EulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -225,7 +225,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDeltaT*
@@ -252,7 +252,7 @@ EulerDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return GeometricField<Type, fvPatchField, volMesh>::New
+        return VolField<Type>::New
         (
             ddtName,
             rDeltaT
@@ -288,7 +288,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 EulerDdtScheme<Type>::fvmDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -324,7 +324,7 @@ tmp<fvMatrix<Type>>
 EulerDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -361,7 +361,7 @@ tmp<fvMatrix<Type>>
 EulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -401,7 +401,7 @@ EulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -442,7 +442,7 @@ template<class Type>
 tmp<typename EulerDdtScheme<Type>::fluxFieldType>
 EulerDdtScheme<Type>::fvcDdtUfCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -466,7 +466,7 @@ template<class Type>
 tmp<typename EulerDdtScheme<Type>::fluxFieldType>
 EulerDdtScheme<Type>::fvcDdtPhiCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -491,7 +491,7 @@ tmp<typename EulerDdtScheme<Type>::fluxFieldType>
 EulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -503,7 +503,7 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
      && Uf.dimensions() == rho.dimensions()*dimVelocity
     )
     {
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -558,7 +558,7 @@ tmp<typename EulerDdtScheme<Type>::fluxFieldType>
 EulerDdtScheme<Type>::fvcDdtPhiCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -570,7 +570,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
      && phi.dimensions() == rho.dimensions()*dimFlux
     )
     {
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -629,7 +629,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
 template<class Type>
 tmp<surfaceScalarField> EulerDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&
+    const VolField<Type>&
 )
 {
     return mesh().phi();
@@ -639,7 +639,7 @@ tmp<surfaceScalarField> EulerDdtScheme<Type>::meshPhi
 template<class Type>
 tmp<scalarField> EulerDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&,
+    const VolField<Type>&,
     const label patchi
 )
 {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
index 3be752b38d..d1c2520442 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
@@ -85,33 +85,33 @@ public:
 
         using ddtScheme<Type>::mesh;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         virtual tmp<SurfaceField<Type>> fvcDdt
@@ -121,64 +121,64 @@ public:
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         );
 
@@ -193,7 +193,7 @@ public:
 template<>
 tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtUfCorr
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& U,
+    const VolField<scalar>& U,
     const SurfaceField<scalar>& Uf
 );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index ac5d085b98..c8bb6aabd3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -146,7 +146,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -158,9 +158,9 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
+        tmp<VolField<Type>> tdtdt
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 mesh(),
@@ -180,9 +180,9 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 mesh(),
@@ -200,10 +200,10 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 SLTSDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField rDeltaT(SLrDeltaT());
@@ -212,9 +212,9 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT()*(vf() - vf.oldTime()()*mesh().V0()/mesh().V()),
@@ -227,9 +227,9 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*(vf - vf.oldTime())
@@ -240,11 +240,11 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField rDeltaT(SLrDeltaT());
@@ -253,9 +253,9 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT()*rho*(vf() - vf.oldTime()()*mesh().V0()/mesh().V()),
@@ -268,9 +268,9 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*rho*(vf - vf.oldTime())
@@ -281,11 +281,11 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField rDeltaT(SLrDeltaT());
@@ -294,9 +294,9 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT()*
@@ -315,9 +315,9 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime())
@@ -328,12 +328,12 @@ SLTSDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 SLTSDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField rDeltaT(SLrDeltaT());
@@ -342,9 +342,9 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT()*
@@ -368,9 +368,9 @@ SLTSDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT
@@ -387,7 +387,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 SLTSDdtScheme<Type>::fvmDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -423,7 +423,7 @@ tmp<fvMatrix<Type>>
 SLTSDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -460,7 +460,7 @@ tmp<fvMatrix<Type>>
 SLTSDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -500,7 +500,7 @@ SLTSDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -541,7 +541,7 @@ template<class Type>
 tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
 SLTSDdtScheme<Type>::fvcDdtUfCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -566,7 +566,7 @@ template<class Type>
 tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
 SLTSDdtScheme<Type>::fvcDdtPhiCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -591,7 +591,7 @@ tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
 SLTSDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -603,7 +603,7 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
      && Uf.dimensions() == dimDensity*dimVelocity
     )
     {
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -658,7 +658,7 @@ tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
 SLTSDdtScheme<Type>::fvcDdtPhiCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -670,7 +670,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
      && phi.dimensions() == rho.dimensions()*dimFlux
     )
     {
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -729,7 +729,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
 template<class Type>
 tmp<surfaceScalarField> SLTSDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&
+    const VolField<Type>&
 )
 {
     return surfaceScalarField::New
@@ -744,7 +744,7 @@ tmp<surfaceScalarField> SLTSDdtScheme<Type>::meshPhi
 template<class Type>
 tmp<scalarField> SLTSDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&,
+    const VolField<Type>&,
     const label patchi
 )
 {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
index 17d92e8ca0..c5a398ae50 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
@@ -116,95 +116,95 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         );
 
@@ -219,7 +219,7 @@ public:
 template<>
 tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtUfCorr
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& U,
+    const VolField<scalar>& U,
     const SurfaceField<scalar>& Uf
 );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index ccd5265436..cc97507502 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -72,7 +72,7 @@ scalar backwardDdtScheme<Type>::deltaT0_(const GeoField& vf) const
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -91,9 +91,9 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
+        tmp<VolField<Type>> tdtdt
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 mesh(),
@@ -115,9 +115,9 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 mesh(),
@@ -135,10 +135,10 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 backwardDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -154,9 +154,9 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*
@@ -181,9 +181,9 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*
@@ -199,11 +199,11 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -219,9 +219,9 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*rho*
@@ -246,9 +246,9 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*rho*
@@ -264,11 +264,11 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -284,9 +284,9 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*
@@ -314,9 +314,9 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*
@@ -332,12 +332,12 @@ backwardDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 backwardDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -353,9 +353,9 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*
@@ -393,9 +393,9 @@ backwardDdtScheme<Type>::fvcDdt
     }
     else
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        return tmp<VolField<Type>>
         (
-            GeometricField<Type, fvPatchField, volMesh>::New
+            VolField<Type>::New
             (
                 ddtName,
                 rDeltaT*
@@ -415,7 +415,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 backwardDdtScheme<Type>::fvmDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -467,7 +467,7 @@ tmp<fvMatrix<Type>>
 backwardDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -518,7 +518,7 @@ tmp<fvMatrix<Type>>
 backwardDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -573,7 +573,7 @@ backwardDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -637,7 +637,7 @@ template<class Type>
 tmp<typename backwardDdtScheme<Type>::fluxFieldType>
 backwardDdtScheme<Type>::fvcDdtUfCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -673,7 +673,7 @@ template<class Type>
 tmp<typename backwardDdtScheme<Type>::fluxFieldType>
 backwardDdtScheme<Type>::fvcDdtPhiCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -708,7 +708,7 @@ tmp<typename backwardDdtScheme<Type>::fluxFieldType>
 backwardDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -727,12 +727,12 @@ backwardDdtScheme<Type>::fvcDdtUfCorr
      && Uf.dimensions() == rho.dimensions()*dimVelocity
     )
     {
-        const GeometricField<Type, fvPatchField, volMesh> rhoU0
+        const VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
 
-        const GeometricField<Type, fvPatchField, volMesh> rhoU00
+        const VolField<Type> rhoU00
         (
             rho.oldTime().oldTime()*U.oldTime().oldTime()
         );
@@ -801,7 +801,7 @@ tmp<typename backwardDdtScheme<Type>::fluxFieldType>
 backwardDdtScheme<Type>::fvcDdtPhiCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -820,12 +820,12 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
      && phi.dimensions() == rho.dimensions()*dimFlux
     )
     {
-        const GeometricField<Type, fvPatchField, volMesh> rhoU0
+        const VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
 
-        const GeometricField<Type, fvPatchField, volMesh> rhoU00
+        const VolField<Type> rhoU00
         (
             rho.oldTime().oldTime()*U.oldTime().oldTime()
         );
@@ -880,7 +880,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
 template<class Type>
 tmp<surfaceScalarField> backwardDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const scalar deltaT = deltaT_();
@@ -903,7 +903,7 @@ tmp<surfaceScalarField> backwardDdtScheme<Type>::meshPhi
 template<class Type>
 tmp<scalarField> backwardDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const label patchi
 )
 {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
index e221ec2252..b36d0db366 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
@@ -117,95 +117,95 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         );
 
@@ -220,7 +220,7 @@ public:
 template<>
 tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtUfCorr
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& U,
+    const VolField<scalar>& U,
     const SurfaceField<scalar>& Uf
 );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
index a90dba8c01..3af46bdb6a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
@@ -42,7 +42,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -53,10 +53,10 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 boundedDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return scheme_.ref().fvcDdt(vf);
@@ -64,11 +64,11 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return scheme_.ref().fvcDdt(rho, vf);
@@ -76,11 +76,11 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return scheme_.ref().fvcDdt(rho, vf) - fvc::ddt(rho)*vf;
@@ -88,12 +88,12 @@ boundedDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 boundedDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return scheme_.ref().fvcDdt(alpha, rho, vf) - fvc::ddt(alpha, rho)*vf;
@@ -104,7 +104,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 boundedDdtScheme<Type>::fvmDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return scheme_.ref().fvmDdt(vf);
@@ -116,7 +116,7 @@ tmp<fvMatrix<Type>>
 boundedDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return scheme_.ref().fvmDdt(rho, vf);
@@ -128,7 +128,7 @@ tmp<fvMatrix<Type>>
 boundedDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return scheme_.ref().fvmDdt(rho, vf) - fvm::Sp(fvc::ddt(rho), vf);
@@ -141,7 +141,7 @@ boundedDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return
@@ -154,7 +154,7 @@ template<class Type>
 tmp<typename boundedDdtScheme<Type>::fluxFieldType>
 boundedDdtScheme<Type>::fvcDdtUfCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -166,7 +166,7 @@ template<class Type>
 tmp<typename boundedDdtScheme<Type>::fluxFieldType>
 boundedDdtScheme<Type>::fvcDdtPhiCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -179,7 +179,7 @@ tmp<typename boundedDdtScheme<Type>::fluxFieldType>
 boundedDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -192,7 +192,7 @@ tmp<typename boundedDdtScheme<Type>::fluxFieldType>
 boundedDdtScheme<Type>::fvcDdtPhiCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -203,7 +203,7 @@ boundedDdtScheme<Type>::fvcDdtPhiCorr
 template<class Type>
 tmp<surfaceScalarField> boundedDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return scheme_.ref().meshPhi(vf);
@@ -213,7 +213,7 @@ tmp<surfaceScalarField> boundedDdtScheme<Type>::meshPhi
 template<class Type>
 tmp<scalarField> boundedDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const label patchi
 )
 {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
index 6ac130866c..414e574e1f 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
@@ -98,95 +98,95 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         );
 
@@ -201,7 +201,7 @@ public:
 template<>
 tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtUfCorr
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& U,
+    const VolField<scalar>& U,
     const SurfaceField<scalar>& Uf
 );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index ea71379529..2a4313fe9f 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -93,18 +93,18 @@ ddtScheme<Type>::~ddtScheme()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> ddtScheme<Type>::fvcDdt
+tmp<VolField<Type>> ddtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     NotImplemented;
 
-    return tmp<GeometricField<Type, fvPatchField, volMesh>>
+    return tmp<VolField<Type>>
     (
-        GeometricField<Type, fvPatchField, volMesh>::null()
+        VolField<Type>::null()
     );
 }
 
@@ -114,7 +114,7 @@ tmp<fvMatrix<Type>> ddtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     NotImplemented;
@@ -150,7 +150,7 @@ tmp<SurfaceField<Type>> ddtScheme<Type>::fvcDdt
 template<class Type>
 tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi,
     const fluxFieldType& phiCorr
 )
@@ -204,7 +204,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 template<class Type>
 tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi,
     const fluxFieldType& phiCorr,
     const volScalarField& rho
@@ -217,7 +217,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 template<class Type>
 tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -228,7 +228,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 template<class Type>
 tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi,
     const volScalarField& rho
 )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index fc96b63d43..eec876a8d2 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -132,33 +132,33 @@ public:
             return mesh_;
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<SurfaceField<Type>> fvcDdt
@@ -168,40 +168,40 @@ public:
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) = 0;
 
         typedef SurfaceField<typename flux<Type>::type> fluxFieldType;
 
         virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi,
             const fluxFieldType& phiCorr
         );
 
         virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi,
             const fluxFieldType& phiCorr,
             const volScalarField& rho
@@ -209,51 +209,51 @@ public:
 
         virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi,
             const volScalarField& rho
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         ) = 0;
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         ) = 0;
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         ) = 0;
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         ) = 0;
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         ) = 0;
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index 8c421116f0..cab3a53bc7 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -54,7 +54,7 @@ const surfaceScalarField& localEulerDdtScheme<Type>::localRDeltaTf() const
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
@@ -62,9 +62,9 @@ localEulerDdtScheme<Type>::fvcDdt
 {
     const word ddtName("ddt(" + dt.name() + ')');
 
-    return tmp<GeometricField<Type, fvPatchField, volMesh>>
+    return tmp<VolField<Type>>
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             ddtName,
             mesh(),
@@ -81,19 +81,19 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 localEulerDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField& rDeltaT = localRDeltaT();
 
     const word ddtName("ddt(" + vf.name() + ')');
 
-    return tmp<GeometricField<Type, fvPatchField, volMesh>>
+    return tmp<VolField<Type>>
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             ddtName,
             rDeltaT*(vf - vf.oldTime())
@@ -103,20 +103,20 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField& rDeltaT = localRDeltaT();
 
     const word ddtName("ddt(" + rho.name() + ',' + vf.name() + ')');
 
-    return tmp<GeometricField<Type, fvPatchField, volMesh>>
+    return tmp<VolField<Type>>
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             ddtName,
             rDeltaT*rho*(vf - vf.oldTime())
@@ -126,20 +126,20 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField& rDeltaT = localRDeltaT();
 
     const word ddtName("ddt(" + rho.name() + ',' + vf.name() + ')');
 
-    return tmp<GeometricField<Type, fvPatchField, volMesh>>
+    return tmp<VolField<Type>>
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             ddtName,
             rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime())
@@ -149,21 +149,21 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 localEulerDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const volScalarField& rDeltaT = localRDeltaT();
 
     const word ddtName("ddt("+alpha.name()+','+rho.name()+','+vf.name()+')');
 
-    return tmp<GeometricField<Type, fvPatchField, volMesh>>
+    return tmp<VolField<Type>>
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             ddtName,
             rDeltaT
@@ -199,7 +199,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 localEulerDdtScheme<Type>::fvmDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -227,7 +227,7 @@ tmp<fvMatrix<Type>>
 localEulerDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -256,7 +256,7 @@ tmp<fvMatrix<Type>>
 localEulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -287,7 +287,7 @@ localEulerDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -319,7 +319,7 @@ localEulerDdtScheme<Type>::fvmDdt
 template<class Type>
 tmp<surfaceScalarField> localEulerDdtScheme<Type>::fvcDdtPhiCoeff
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi,
     const fluxFieldType& phiCorr
 )
@@ -364,7 +364,7 @@ template<class Type>
 tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
 localEulerDdtScheme<Type>::fvcDdtUfCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -397,7 +397,7 @@ template<class Type>
 tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
 localEulerDdtScheme<Type>::fvcDdtPhiCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -430,7 +430,7 @@ tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
 localEulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -442,7 +442,7 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
      && Uf.dimensions() == dimDensity*dimVelocity
     )
     {
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -515,7 +515,7 @@ tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
 localEulerDdtScheme<Type>::fvcDdtPhiCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -527,7 +527,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
      && phi.dimensions() == rho.dimensions()*dimFlux
     )
     {
-        GeometricField<Type, fvPatchField, volMesh> rhoU0
+        VolField<Type> rhoU0
         (
             rho.oldTime()*U.oldTime()
         );
@@ -604,7 +604,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
 template<class Type>
 tmp<surfaceScalarField> localEulerDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&
+    const VolField<Type>&
 )
 {
     return surfaceScalarField::New
@@ -619,7 +619,7 @@ tmp<surfaceScalarField> localEulerDdtScheme<Type>::meshPhi
 template<class Type>
 tmp<scalarField> localEulerDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&,
+    const VolField<Type>&,
     const label patchi
 )
 {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
index f4f672816b..f4c51be407 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
@@ -152,33 +152,33 @@ public:
 
         using ddtScheme<Type>::mesh;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         virtual tmp<SurfaceField<Type>> fvcDdt
@@ -188,26 +188,26 @@ public:
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
@@ -216,45 +216,45 @@ public:
 
         // virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
         // (
-        //     const GeometricField<Type, fvPatchField, volMesh>& U,
+        //     const VolField<Type>& U,
         //     const fluxFieldType& phi,
         //     const fluxFieldType& phiCorr
         // );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         );
 
@@ -269,7 +269,7 @@ public:
 template<>
 tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtUfCorr
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& U,
+    const VolField<scalar>& U,
     const SurfaceField<scalar>& Uf
 );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index 6e11c2e3cf..f0e92331f7 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -40,13 +40,13 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const dimensioned<Type>& dt
 )
 {
-    return GeometricField<Type, fvPatchField, volMesh>::New
+    return VolField<Type>::New
     (
         "ddt("+dt.name()+')',
         mesh(),
@@ -61,13 +61,13 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    return GeometricField<Type, fvPatchField, volMesh>::New
+    return VolField<Type>::New
     (
         "ddt("+vf.name()+')',
         mesh(),
@@ -82,14 +82,14 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    return GeometricField<Type, fvPatchField, volMesh>::New
+    return VolField<Type>::New
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh(),
@@ -104,14 +104,14 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    return GeometricField<Type, fvPatchField, volMesh>::New
+    return VolField<Type>::New
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh(),
@@ -126,15 +126,15 @@ steadyStateDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 steadyStateDdtScheme<Type>::fvcDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    return GeometricField<Type, fvPatchField, volMesh>::New
+    return VolField<Type>::New
     (
         "ddt("+alpha.name()+','+rho.name()+','+vf.name()+')',
         mesh(),
@@ -152,7 +152,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 steadyStateDdtScheme<Type>::fvmDdt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return tmp<fvMatrix<Type>>
@@ -171,7 +171,7 @@ tmp<fvMatrix<Type>>
 steadyStateDdtScheme<Type>::fvmDdt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return tmp<fvMatrix<Type>>
@@ -190,7 +190,7 @@ tmp<fvMatrix<Type>>
 steadyStateDdtScheme<Type>::fvmDdt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return tmp<fvMatrix<Type>>
@@ -210,7 +210,7 @@ steadyStateDdtScheme<Type>::fvmDdt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return tmp<fvMatrix<Type>>
@@ -228,7 +228,7 @@ template<class Type>
 tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
 steadyStateDdtScheme<Type>::fvcDdtUfCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -250,7 +250,7 @@ template<class Type>
 tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
 steadyStateDdtScheme<Type>::fvcDdtPhiCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -273,7 +273,7 @@ tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
 steadyStateDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -296,7 +296,7 @@ tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
 steadyStateDdtScheme<Type>::fvcDdtPhiCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const fluxFieldType& phi
 )
 {
@@ -317,7 +317,7 @@ steadyStateDdtScheme<Type>::fvcDdtPhiCorr
 template<class Type>
 tmp<surfaceScalarField> steadyStateDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return surfaceScalarField::New
@@ -332,7 +332,7 @@ tmp<surfaceScalarField> steadyStateDdtScheme<Type>::meshPhi
 template<class Type>
 tmp<scalarField> steadyStateDdtScheme<Type>::meshPhi
 (
-    const GeometricField<Type, fvPatchField, volMesh>&,
+    const VolField<Type>&,
     const label patchi
 )
 {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
index 77db3d4ae7..a542ea88db 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
@@ -88,95 +88,95 @@ public:
             return fv::ddtScheme<Type>::mesh();
         }
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensioned<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
+        virtual tmp<VolField<Type>> fvcDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
         (
             const volScalarField& alpha,
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
         (
             const volScalarField& rho,
-            const GeometricField<Type, fvPatchField, volMesh>& U,
+            const VolField<Type>& U,
             const fluxFieldType& phi
         );
 
         virtual tmp<surfaceScalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         virtual tmp<scalarField> meshPhi
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const label patchi
         );
 
@@ -191,7 +191,7 @@ public:
 template<>
 tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtUfCorr
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& U,
+    const VolField<scalar>& U,
     const SurfaceField<scalar>& Uf
 );
 
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index 4d4b0cfb23..f5043296f1 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ public:
             <typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
         > fvcDiv
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
 
diff --git a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
index ce4760a182..8f9b311aa5 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ tmp
 >
 gaussDivScheme<Type>::fvcDiv
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp
diff --git a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
index 3a1b7eec98..455263f649 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ public:
             <typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
         > fvcDiv
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
index dac5be6f1b..1b2b932953 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
@@ -41,7 +41,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 average
 (
     const SurfaceField<Type>& ssf
@@ -49,9 +49,9 @@ average
 {
     const fvMesh& mesh = ssf.mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
+    tmp<VolField<Type>> taverage
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             "average("+ssf.name()+')',
             mesh,
@@ -64,7 +64,7 @@ average
         return taverage;
     }
 
-    GeometricField<Type, fvPatchField, volMesh>& av = taverage.ref();
+    VolField<Type>& av = taverage.ref();
 
     av.primitiveFieldRef() =
     (
@@ -72,7 +72,7 @@ average
        /surfaceSum(mesh.magSf())().primitiveField()
     );
 
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
     Boundary& bav = av.boundaryFieldRef();
 
     forAll(bav, patchi)
@@ -87,13 +87,13 @@ average
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 average
 (
     const tmp<SurfaceField<Type>>& tssf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
+    tmp<VolField<Type>> taverage
     (
         fvc::average(tssf())
     );
@@ -103,10 +103,10 @@ average
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 average
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vtf
+    const VolField<Type>& vtf
 )
 {
     return fvc::average(linearInterpolate(vtf));
@@ -114,13 +114,13 @@ average
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 average
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvtf
+    const tmp<VolField<Type>>& tvtf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
+    tmp<VolField<Type>> taverage
     (
         fvc::average(tvtf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.H b/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
index cc838eaae8..4a2abcb816 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.H
@@ -52,14 +52,14 @@ namespace fvc
 {
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> average
+    tmp<VolField<Type>> average
     (
         const SurfaceField<Type>&
     );
 
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> average
+    tmp<VolField<Type>> average
     (
         const tmp<SurfaceField<Type>>&
     );
@@ -67,16 +67,16 @@ namespace fvc
 
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> average
+    tmp<VolField<Type>> average
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> average
+    tmp<VolField<Type>> average
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index c79421d538..8f74660465 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -88,7 +88,7 @@ Foam::fvc::cellReduce
     const Type& nullValue
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
+    tmp<VolField<Type>> tvf
     (
         cellReduce
         (
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
index 56cd6978c3..aa558cb442 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
@@ -50,7 +50,7 @@ namespace Foam
 namespace fvc
 {
     template<class Type, class CombineOp>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
+    tmp<VolField<Type>> cellReduce
     (
         const SurfaceField<Type>&,
         const CombineOp& cop,
@@ -58,7 +58,7 @@ namespace fvc
     );
 
     template<class Type, class CombineOp>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
+    tmp<VolField<Type>> cellReduce
     (
         const tmp<SurfaceField<Type>>&,
         const CombineOp& cop,
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCurl.C b/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
index 646d8adefd..50fa66e667 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCurl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,20 +40,20 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 curl
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     word nameCurlVf = "curl(" + vf.name() + ')';
 
     // Gausses theorem curl
-    // tmp<GeometricField<Type, fvPatchField, volMesh>> tcurlVf =
+    // tmp<VolField<Type>> tcurlVf =
     //     fvc::surfaceIntegrate(vf.mesh().Sf() ^ fvc::interpolate(vf));
 
     // Calculate curl as the Hodge dual of the skew-symmetric part of grad
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tcurlVf =
+    tmp<VolField<Type>> tcurlVf =
         2.0*(*skew(fvc::grad(vf, nameCurlVf)));
 
     tcurlVf.ref().rename(nameCurlVf);
@@ -63,13 +63,13 @@ curl
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 curl
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Curl(fvc::curl(tvf()));
+    tmp<VolField<Type>> Curl(fvc::curl(tvf()));
     tvf.clear();
     return Curl;
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCurl.H b/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
index 9d332349bb..1fee93fce1 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCurl.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,15 +51,15 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> curl
+    tmp<VolField<Type>> curl
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> curl
+    tmp<VolField<Type>> curl
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
index 3baced9757..10d34549e7 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
@@ -40,10 +40,10 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 d2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::d2dt2Scheme<Type>::New
@@ -55,11 +55,11 @@ d2dt2
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 d2dt2
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::d2dt2Scheme<Type>::New
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
index c6b4bb361d..b8c2d111e3 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,16 +50,16 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> d2dt2
+    tmp<VolField<Type>> d2dt2
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> d2dt2
+    tmp<VolField<Type>> d2dt2
     (
         const volScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDDt.C b/src/finiteVolume/finiteVolume/fvc/fvcDDt.C
index 45cf6712ee..104b91f8cc 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDDt.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDDt.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,14 +40,14 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 DDt
 (
     const surfaceScalarField& phi,
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddtDivPhiPsi
+    tmp<VolField<Type>> ddtDivPhiPsi
         = fvc::ddt(psi) + fvc::div(phi, psi);
 
     if (phi.mesh().moving())
@@ -62,14 +62,14 @@ DDt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 DDt
 (
     const tmp<surfaceScalarField>& tphi,
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> DDtPsi
+    tmp<VolField<Type>> DDtPsi
     (
         fvc::DDt(tphi(), psi)
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDDt.H b/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
index 109a391a48..7af41ee3df 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDDt.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,17 +51,17 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> DDt
+    tmp<VolField<Type>> DDt
     (
         const surfaceScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> DDt
+    tmp<VolField<Type>> DDt
     (
         const tmp<surfaceScalarField>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
index eb2506e3ba..84760cfdd3 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C
@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
     const dimensioned<Type> dt,
@@ -56,10 +56,10 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -71,11 +71,11 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -87,11 +87,11 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -103,11 +103,11 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
     const one&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return ddt(vf);
@@ -115,12 +115,12 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -138,12 +138,12 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
     const one&,
     const one&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return ddt(vf);
@@ -151,12 +151,12 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
     const one&,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return ddt(rho, vf);
@@ -164,12 +164,12 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 ddt
 (
     const volScalarField& alpha,
     const one&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return ddt(alpha, vf);
@@ -195,7 +195,7 @@ template<class Type>
 tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -211,7 +211,7 @@ template<class Type>
 tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const GeometricField
     <
         typename flux<Type>::type,
@@ -232,7 +232,7 @@ template<class Type>
 tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const GeometricField
     <
         typename flux<Type>::type,
@@ -258,7 +258,7 @@ tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const SurfaceField<Type>& Uf
 )
 {
@@ -275,7 +275,7 @@ tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const GeometricField
     <
         typename flux<Type>::type,
@@ -297,7 +297,7 @@ tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& U,
+    const VolField<Type>& U,
     const GeometricField
     <
         typename flux<Type>::type,
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.H b/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
index 2346c29c55..b1a259582b 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.H
@@ -54,69 +54,69 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
         const dimensioned<Type>,
         const fvMesh&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
         const dimensionedScalar&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
         const volScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
         const one&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
         const volScalarField&,
         const volScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
         const one&,
         const one&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
         const one&,
         const volScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
+    tmp<VolField<Type>> ddt
     (
         const volScalarField&,
         const one&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
@@ -137,7 +137,7 @@ namespace fvc
     >
     ddtCorr
     (
-        const GeometricField<Type, fvPatchField, volMesh>& U,
+        const VolField<Type>& U,
         const SurfaceField<Type>& Uf
     );
 
@@ -153,7 +153,7 @@ namespace fvc
     >
     ddtCorr
     (
-        const GeometricField<Type, fvPatchField, volMesh>& U,
+        const VolField<Type>& U,
         const GeometricField
         <
             typename Foam::flux<Type>::type,
@@ -174,7 +174,7 @@ namespace fvc
     >
     ddtCorr
     (
-        const GeometricField<Type, fvPatchField, volMesh>& U,
+        const VolField<Type>& U,
         const GeometricField
         <
             typename Foam::flux<Type>::type,
@@ -197,7 +197,7 @@ namespace fvc
     ddtCorr
     (
         const volScalarField& rho,
-        const GeometricField<Type, fvPatchField, volMesh>& U,
+        const VolField<Type>& U,
         const SurfaceField<Type>& Uf
     );
 
@@ -214,7 +214,7 @@ namespace fvc
     ddtCorr
     (
         const volScalarField& rho,
-        const GeometricField<Type, fvPatchField, volMesh>& U,
+        const VolField<Type>& U,
         const GeometricField
         <
             typename Foam::flux<Type>::type,
@@ -236,7 +236,7 @@ namespace fvc
     ddtCorr
     (
         const volScalarField& rho,
-        const GeometricField<Type, fvPatchField, volMesh>& U,
+        const VolField<Type>& U,
         const GeometricField
         <
             typename Foam::flux<Type>::type,
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDiv.C b/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
index db7c304215..fbd9aa9819 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDiv.C
@@ -42,13 +42,13 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const SurfaceField<Type>& ssf
 )
 {
-    return GeometricField<Type, fvPatchField, volMesh>::New
+    return VolField<Type>::New
     (
         "div("+ssf.name()+')',
         fvc::surfaceIntegrate(ssf)
@@ -57,13 +57,13 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const tmp<SurfaceField<Type>>& tssf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Div(fvc::div(tssf()));
+    tmp<VolField<Type>> Div(fvc::div(tssf()));
     tssf.clear();
     return Div;
 }
@@ -79,7 +79,7 @@ tmp
 >
 div
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -100,12 +100,12 @@ tmp
 >
 div
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvvf,
+    const tmp<VolField<Type>>& tvvf,
     const word& name
 )
 {
     typedef typename innerProduct<vector, Type>::type DivType;
-    tmp<GeometricField<DivType, fvPatchField, volMesh>> Div
+    tmp<VolField<DivType>> Div
     (
         fvc::div(tvvf(), name)
     );
@@ -123,7 +123,7 @@ tmp
 >
 div
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvc::div(vf, "div("+vf.name()+')');
@@ -140,22 +140,22 @@ tmp
 >
 div
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvvf
+    const tmp<VolField<Type>>& tvvf
 )
 {
     typedef typename innerProduct<vector, Type>::type DivType;
-    tmp<GeometricField<DivType, fvPatchField, volMesh>> Div(fvc::div(tvvf()));
+    tmp<VolField<DivType>> Div(fvc::div(tvvf()));
     tvvf.clear();
     return Div;
 }
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const surfaceScalarField& flux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -169,15 +169,15 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
+    tmp<VolField<Type>> Div
     (
         fvc::div(tflux(), vf, name)
     );
@@ -187,15 +187,15 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const surfaceScalarField& flux,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
+    tmp<VolField<Type>> Div
     (
         fvc::div(flux, tvf(), name)
     );
@@ -205,15 +205,15 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
+    tmp<VolField<Type>> Div
     (
         fvc::div(tflux(), tvf(), name)
     );
@@ -224,11 +224,11 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const surfaceScalarField& flux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvc::div
@@ -239,14 +239,14 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
+    tmp<VolField<Type>> Div
     (
         fvc::div(tflux(), vf)
     );
@@ -256,14 +256,14 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const surfaceScalarField& flux,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
+    tmp<VolField<Type>> Div
     (
         fvc::div(flux, tvf())
     );
@@ -273,14 +273,14 @@ div
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Div
+    tmp<VolField<Type>> Div
     (
         fvc::div(tflux(), tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDiv.H b/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
index e80ff41f76..1c7309dda4 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcDiv.H
@@ -51,13 +51,13 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const SurfaceField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const tmp<SurfaceField<Type>>&
     );
@@ -70,7 +70,7 @@ namespace fvc
         <typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
     > div
     (
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
@@ -81,7 +81,7 @@ namespace fvc
         <typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
     > div
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word& name
     );
 
@@ -93,7 +93,7 @@ namespace fvc
         <typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
     > div
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
@@ -103,69 +103,69 @@ namespace fvc
         <typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
     > div
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const surfaceScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const tmp<surfaceScalarField>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const tmp<surfaceScalarField>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word& name
     );
 
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const surfaceScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const tmp<surfaceScalarField>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> div
+    tmp<VolField<Type>> div
     (
         const tmp<surfaceScalarField>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
index 037a324cf8..16418c0240 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
@@ -60,14 +60,14 @@ namespace fvc
     tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
     template<class Type>
     tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         Istream& schemeData
     );
 
@@ -75,7 +75,7 @@ namespace fvc
     tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
@@ -83,7 +83,7 @@ namespace fvc
     tmp<SurfaceField<Type>> flux
     (
         const tmp<surfaceScalarField>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
@@ -91,7 +91,7 @@ namespace fvc
     tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word& name
     );
 
@@ -99,7 +99,7 @@ namespace fvc
     tmp<SurfaceField<Type>> flux
     (
         const tmp<surfaceScalarField>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word& name
     );
 
@@ -108,28 +108,28 @@ namespace fvc
     tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<SurfaceField<Type>> flux
     (
         const tmp<surfaceScalarField>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
     template<class Type>
     tmp<SurfaceField<Type>> flux
     (
         const tmp<surfaceScalarField>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C b/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
index dfd16f7b89..186345fe18 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
@@ -44,7 +44,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     Istream& schemeData
 )
 {
@@ -62,7 +62,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -75,7 +75,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -93,7 +93,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
@@ -111,7 +111,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
@@ -130,7 +130,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvc::flux
@@ -145,7 +145,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<SurfaceField<Type>> Flux
@@ -162,7 +162,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     tmp<SurfaceField<Type>> Flux
@@ -179,7 +179,7 @@ tmp<SurfaceField<Type>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     tmp<SurfaceField<Type>> Flux
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
index 50d9c4c846..863b0705db 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcGrad.C
@@ -71,7 +71,7 @@ grad
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> Grad
+    tmp<VolField<GradType>> Grad
     (
         fvc::grad(tssf())
     );
@@ -90,7 +90,7 @@ tmp
 >
 grad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -112,7 +112,7 @@ tmp
 >
 grad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
@@ -141,7 +141,7 @@ tmp
 >
 grad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvc::grad(vf, "grad(" + vf.name() + ')');
@@ -158,11 +158,11 @@ tmp
 >
 grad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> Grad
+    tmp<VolField<GradType>> Grad
     (
         fvc::grad(tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
index 447fcbeb29..94f026a005 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcGrad.H
@@ -77,7 +77,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
@@ -88,7 +88,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word& name
     );
 
@@ -99,7 +99,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
@@ -109,7 +109,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
index ceece1df94..d3997ad2cd 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
@@ -40,10 +40,10 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -56,14 +56,14 @@ laplacian
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(tvf(), name)
     );
@@ -73,10 +73,10 @@ laplacian
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvc::laplacian(vf, "laplacian(" + vf.name() + ')');
@@ -84,13 +84,13 @@ laplacian
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(tvf())
     );
@@ -102,11 +102,11 @@ laplacian
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const dimensioned<GType>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -128,15 +128,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const dimensioned<GType>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(gamma, tvf(), name)
     );
@@ -146,11 +146,11 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const dimensioned<GType>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
@@ -171,14 +171,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const dimensioned<GType>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(gamma, tvf())
     );
@@ -190,11 +190,11 @@ laplacian
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<GType>& gamma,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -207,15 +207,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const tmp<VolField<GType>>& tgamma,
+    const VolField<Type>& vf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(tgamma(), vf, name)
     );
@@ -225,15 +225,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const VolField<GType>& gamma,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(gamma, tvf(), name)
     );
@@ -243,15 +243,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<GType>>& tgamma,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(tgamma(), tvf(), name)
     );
@@ -262,11 +262,11 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<GType>& gamma,
+    const VolField<Type>& vf
 )
 {
     return fvc::laplacian
@@ -279,11 +279,11 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const tmp<VolField<GType>>& tgamma,
+    const VolField<Type>& vf
 )
 {
     return fvc::laplacian
@@ -296,11 +296,11 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const VolField<GType>& gamma,
+    const tmp<VolField<Type>>& tvf
 )
 {
     return fvc::laplacian
@@ -313,11 +313,11 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<GType>>& tgamma,
+    const tmp<VolField<Type>>& tvf
 )
 {
     return fvc::laplacian
@@ -332,11 +332,11 @@ laplacian
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -349,15 +349,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(tgamma(), vf, name)
     );
@@ -367,15 +367,15 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(gamma, tvf(), name)
     );
@@ -385,14 +385,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+tmp<VolField<Type>> laplacian
 (
     const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(tgamma(), tvf(), name)
     );
@@ -403,11 +403,11 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvc::laplacian
@@ -420,14 +420,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(tgamma(), vf)
     );
@@ -437,14 +437,14 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(gamma, tvf())
     );
@@ -454,13 +454,13 @@ laplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+tmp<VolField<Type>> laplacian
 (
     const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
+    tmp<VolField<Type>> Laplacian
     (
         fvc::laplacian(tgamma(), tvf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
index 8d614e9628..f15b4b8b16 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,182 +52,182 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const dimensioned<GType>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const dimensioned<GType>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const dimensioned<GType>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const dimensioned<GType>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const GeometricField<GType, fvPatchField, volMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<GType>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const tmp<VolField<GType>>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const GeometricField<GType, fvPatchField, volMesh>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const VolField<GType>&,
+        const tmp<VolField<Type>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<GType>>&,
+        const tmp<VolField<Type>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const GeometricField<GType, fvPatchField, volMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<GType>&,
+        const VolField<Type>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const tmp<VolField<GType>>&,
+        const VolField<Type>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const GeometricField<GType, fvPatchField, volMesh>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const VolField<GType>&,
+        const tmp<VolField<Type>>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<GType>>&,
+        const tmp<VolField<Type>>&
     );
 
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
     template<class Type, class GType>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
+    tmp<VolField<Type>> laplacian
     (
         const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
index ac849aae8d..46caf32a58 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace fvc
 template<class Type>
 tmp<volScalarField> magSqrGradGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<volScalarField> tMagSqrGradGrad
@@ -65,7 +65,7 @@ template<class Type>
 tmp<volScalarField>
 magSqrGradGrad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     tmp<volScalarField> tMagSqrGradGrad(fvc::magSqrGradGrad(tvf()));
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
index 65847af7c5..f44db4e620 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMagSqrGradGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,13 +53,13 @@ namespace fvc
     template<class Type>
     tmp<volScalarField> magSqrGradGrad
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<volScalarField> magSqrGradGrad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
index 849dc41d5d..576bd29a2c 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
@@ -61,9 +61,9 @@ reconstruct
 
     surfaceVectorField SfHat(mesh.Sf()/mesh.magSf());
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> treconField
+    tmp<VolField<GradType>> treconField
     (
-        GeometricField<GradType, fvPatchField, volMesh>::New
+        VolField<GradType>::New
         (
             "volIntegrate("+ssf.name()+')',
             mesh,
@@ -99,7 +99,7 @@ reconstruct
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> tvf
+    tmp<VolField<GradType>> tvf
     (
         fvc::reconstruct(tssf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
index 89d286c6f3..78947a38d3 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
@@ -62,9 +62,9 @@ reconstruct
     const volVectorField& C = mesh.C();
     const surfaceVectorField& Cf = mesh.Cf();
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> treconField
+    tmp<VolField<GradType>> treconField
     (
-        GeometricField<GradType, fvPatchField, volMesh>::New
+        VolField<GradType>::New
         (
             "reconstruct("+ssf.name()+')',
             mesh,
@@ -128,7 +128,7 @@ reconstruct
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> tvf
+    tmp<VolField<GradType>> tvf
     (
         fvc::reconstruct(tssf())
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
index 6f3cae66ba..aae3439bb6 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C
@@ -43,7 +43,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 snGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -59,7 +59,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 snGrad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
@@ -76,7 +76,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 snGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvc::snGrad(vf, "snGrad(" + vf.name() + ')');
@@ -87,7 +87,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 snGrad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     tmp<SurfaceField<Type>> SnGrad
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
index 8514508f9e..37607df624 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H
@@ -53,27 +53,27 @@ namespace fvc
     template<class Type>
     tmp<SurfaceField<Type>> snGrad
     (
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
     template<class Type>
     tmp<SurfaceField<Type>> snGrad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+        const tmp<VolField<Type>>&,
         const word& name
     );
 
     template<class Type>
     tmp<SurfaceField<Type>> snGrad
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<SurfaceField<Type>> snGrad
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSup.C b/src/finiteVolume/finiteVolume/fvc/fvcSup.C
index 5fbb5f492e..27b81c022d 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSup.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSup.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,22 +39,22 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 Su
 (
-    const GeometricField<Type, fvPatchField, volMesh>& su,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& su,
+    const VolField<Type>& vf
 )
 {
     return su;
 }
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 Su
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const tmp<VolField<Type>>& tsu,
+    const VolField<Type>& vf
 )
 {
     return tsu;
@@ -62,22 +62,22 @@ Su
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 Sp
 (
     const volScalarField& sp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return sp*vf;
 }
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 Sp
 (
     const tmp<volScalarField>& tsp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return tsp*vf;
@@ -85,11 +85,11 @@ Sp
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 Sp
 (
     const dimensionedScalar& sp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return sp*vf;
@@ -97,22 +97,22 @@ Sp
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 SuSp
 (
     const volScalarField& sp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return sp*vf;
 }
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 SuSp
 (
     const tmp<volScalarField>& tsp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return tsp*vf;
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSup.H b/src/finiteVolume/finiteVolume/fvc/fvcSup.H
index 25155a06ca..8eac64d3f6 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSup.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSup.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,59 +52,59 @@ namespace fvc
    // Explicit source
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>> Su
+        tmp<VolField<Type>> Su
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&,
+            const VolField<Type>&
         );
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>> Su
+        tmp<VolField<Type>> Su
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const tmp<VolField<Type>>&,
+            const VolField<Type>&
         );
 
 
     // Implicit source
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>> Sp
+        tmp<VolField<Type>> Sp
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>> Sp
+        tmp<VolField<Type>> Sp
         (
             const tmp<volScalarField>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>> Sp
+        tmp<VolField<Type>> Sp
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
     // Implicit/Explicit source depending on sign of coefficient
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>> SuSp
+        tmp<VolField<Type>> SuSp
         (
             const volScalarField&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>> SuSp
+        tmp<VolField<Type>> SuSp
         (
             const tmp<volScalarField>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index b5af30b09c..b4cdb2fcdd 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -77,7 +77,7 @@ void surfaceIntegrate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 surfaceIntegrate
 (
     const SurfaceField<Type>& ssf
@@ -85,9 +85,9 @@ surfaceIntegrate
 {
     const fvMesh& mesh = ssf.mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
+    tmp<VolField<Type>> tvf
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             "surfaceIntegrate("+ssf.name()+')',
             mesh,
@@ -100,7 +100,7 @@ surfaceIntegrate
             extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
+    VolField<Type>& vf = tvf.ref();
 
     surfaceIntegrate(vf.primitiveFieldRef(), ssf);
     vf.correctBoundaryConditions();
@@ -110,13 +110,13 @@ surfaceIntegrate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 surfaceIntegrate
 (
     const tmp<SurfaceField<Type>>& tssf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
+    tmp<VolField<Type>> tvf
     (
         fvc::surfaceIntegrate(tssf())
     );
@@ -126,7 +126,7 @@ surfaceIntegrate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 surfaceSum
 (
     const SurfaceField<Type>& ssf
@@ -134,9 +134,9 @@ surfaceSum
 {
     const fvMesh& mesh = ssf.mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
+    tmp<VolField<Type>> tvf
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             "surfaceSum("+ssf.name()+')',
             mesh,
@@ -144,7 +144,7 @@ surfaceSum
             extrapolatedCalculatedFvPatchField<Type>::typeName
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
+    VolField<Type>& vf = tvf.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -175,12 +175,12 @@ surfaceSum
 
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
+tmp<VolField<Type>> surfaceSum
 (
     const tmp<SurfaceField<Type>>& tssf
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf = surfaceSum(tssf());
+    tmp<VolField<Type>> tvf = surfaceSum(tssf());
     tssf.clear();
     return tvf;
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
index 232617bc21..6e9925a5e9 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H
@@ -60,27 +60,27 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>>
+    tmp<VolField<Type>>
     surfaceIntegrate
     (
         const SurfaceField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>>
+    tmp<VolField<Type>>
     surfaceIntegrate
     (
         const tmp<SurfaceField<Type>>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
+    tmp<VolField<Type>> surfaceSum
     (
         const SurfaceField<Type>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
+    tmp<VolField<Type>> surfaceSum
     (
         const tmp<SurfaceField<Type>>&
     );
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
index 2263de2536..a157c1b4d9 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ template<class Type>
 tmp<Field<Type>>
 volumeIntegrate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return vf.mesh().V()*vf.primitiveField();
@@ -54,7 +54,7 @@ template<class Type>
 tmp<Field<Type>>
 volumeIntegrate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     tmp<Field<Type>> tvivf = tvf().mesh().V()*tvf().primitiveField();
@@ -84,7 +84,7 @@ template<class Type>
 dimensioned<Type>
 domainIntegrate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return dimensioned<Type>
@@ -99,7 +99,7 @@ domainIntegrate
 template<class Type>
 dimensioned<Type> domainIntegrate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     dimensioned<Type> integral = domainIntegrate(tvf());
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
index b5a6e7f7d0..6e6e5fa640 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,13 +57,13 @@ namespace fvc
     template<class Type>
     tmp<Field<Type>> volumeIntegrate
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<Field<Type>> volumeIntegrate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
 
@@ -83,13 +83,13 @@ namespace fvc
     template<class Type>
     dimensioned<Type> domainIntegrate
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     dimensioned<Type> domainIntegrate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+        const tmp<VolField<Type>>&
     );
 
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
index 00723348c3..3350689e26 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
@@ -44,7 +44,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 d2dt2
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::d2dt2Scheme<Type>::New
@@ -60,7 +60,7 @@ tmp<fvMatrix<Type>>
 d2dt2
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::d2dt2Scheme<Type>::New
@@ -76,7 +76,7 @@ tmp<fvMatrix<Type>>
 d2dt2
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::d2dt2Scheme<Type>::New
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
index 9f0f8a941b..8e1bea0b39 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
@@ -54,20 +54,20 @@ namespace fvm
     tmp<fvMatrix<Type>> d2dt2
     (
         const dimensionedScalar&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> d2dt2
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> d2dt2
     (
         const volScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDdt.C b/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
index e5007162c3..20b8b03ba3 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDdt.C
@@ -44,7 +44,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 ddt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -60,7 +60,7 @@ tmp<fvMatrix<Type>>
 ddt
 (
     const dimensionedScalar& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -76,7 +76,7 @@ tmp<fvMatrix<Type>>
 ddt
 (
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -92,7 +92,7 @@ tmp<fvMatrix<Type>>
 ddt
 (
     const one&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return ddt(vf);
@@ -105,7 +105,7 @@ ddt
 (
     const volScalarField& alpha,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -128,7 +128,7 @@ ddt
 (
     const one&,
     const one&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return ddt(vf);
@@ -141,7 +141,7 @@ ddt
 (
     const one&,
     const volScalarField& rho,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return ddt(rho, vf);
@@ -154,7 +154,7 @@ ddt
 (
     const volScalarField& alpha,
     const one&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return ddt(alpha, vf);
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDdt.H b/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
index 0231f3afd3..b245398446 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDdt.H
@@ -54,28 +54,28 @@ namespace fvm
     template<class Type>
     tmp<fvMatrix<Type>> ddt
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> ddt
     (
         const dimensionedScalar&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> ddt
     (
         const volScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> ddt
     (
         const one&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
@@ -83,7 +83,7 @@ namespace fvm
     (
         const volScalarField&,
         const volScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
@@ -91,7 +91,7 @@ namespace fvm
     (
         const one&,
         const one&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
@@ -99,7 +99,7 @@ namespace fvm
     (
         const one&,
         const volScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
@@ -107,7 +107,7 @@ namespace fvm
     (
         const volScalarField&,
         const one&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDiv.C b/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
index 0ba4eaa4c6..23183bf941 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDiv.C
@@ -45,7 +45,7 @@ tmp<fvMatrix<Type>>
 div
 (
     const surfaceScalarField& flux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -62,7 +62,7 @@ tmp<fvMatrix<Type>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -77,7 +77,7 @@ tmp<fvMatrix<Type>>
 div
 (
     const surfaceScalarField& flux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvm::div(flux, vf, "div("+flux.name()+','+vf.name()+')');
@@ -88,7 +88,7 @@ tmp<fvMatrix<Type>>
 div
 (
     const tmp<surfaceScalarField>& tflux,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> Div(fvm::div(tflux(), vf));
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmDiv.H b/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
index ff0a099c21..04e0fbb30f 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmDiv.H
@@ -56,7 +56,7 @@ namespace fvm
     tmp<fvMatrix<Type>> div
     (
         const surfaceScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
@@ -64,7 +64,7 @@ namespace fvm
     tmp<fvMatrix<Type>> div
     (
         const tmp<surfaceScalarField>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word& name
     );
 
@@ -73,14 +73,14 @@ namespace fvm
     tmp<fvMatrix<Type>> div
     (
         const surfaceScalarField&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> div
     (
         const tmp<surfaceScalarField>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
index 6bbf6ffbe2..de33a0f2cd 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
@@ -45,7 +45,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 laplacian
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -70,7 +70,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 laplacian
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     surfaceScalarField Gamma
@@ -100,7 +100,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const zero&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -116,7 +116,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const zero&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return tmp<fvMatrix<Type>>
@@ -131,7 +131,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const one&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -144,7 +144,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const one&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvm::laplacian(vf);
@@ -156,7 +156,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const dimensioned<GType>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -182,7 +182,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const dimensioned<GType>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
@@ -208,8 +208,8 @@ template<class Type, class GType>
 tmp<fvMatrix<Type>>
 laplacian
 (
-    const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<GType>& gamma,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -225,8 +225,8 @@ template<class Type, class GType>
 tmp<fvMatrix<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const tmp<VolField<GType>>& tgamma,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -240,8 +240,8 @@ template<class Type, class GType>
 tmp<fvMatrix<Type>>
 laplacian
 (
-    const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<GType>& gamma,
+    const VolField<Type>& vf
 )
 {
     return fvm::laplacian
@@ -257,8 +257,8 @@ template<class Type, class GType>
 tmp<fvMatrix<Type>>
 laplacian
 (
-    const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const tmp<VolField<GType>>& tgamma,
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tLaplacian(fvm::laplacian(tgamma(), vf));
@@ -274,7 +274,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -291,7 +291,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
@@ -306,7 +306,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return fvm::laplacian
@@ -323,7 +323,7 @@ tmp<fvMatrix<Type>>
 laplacian
 (
     const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tGamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tLaplacian(fvm::laplacian(tGamma(), vf));
@@ -338,8 +338,8 @@ template<class Type>
 tmp<fvMatrix<Type>>
 laplacianCorrection
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<scalar>& gamma,
+    const VolField<Type>& vf
 )
 {
     return fvm::laplacianCorrection(fvc::interpolate(gamma), vf);
@@ -350,8 +350,8 @@ template<class Type>
 tmp<fvMatrix<Type>>
 laplacianCorrection
 (
-    const tmp<GeometricField<scalar, fvPatchField, volMesh>>& tgamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const tmp<VolField<scalar>>& tgamma,
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tLaplacianCorrection
@@ -370,7 +370,7 @@ tmp<fvMatrix<Type>>
 laplacianCorrection
 (
     const SurfaceField<scalar>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return correction
@@ -390,7 +390,7 @@ tmp<fvMatrix<Type>>
 laplacianCorrection
 (
     const tmp<SurfaceField<scalar>>& tGamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tLaplacianCorrection
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
index cbd1797ae9..d596bfd318 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
@@ -56,14 +56,14 @@ namespace fvm
     template<class Type>
     tmp<fvMatrix<Type>> laplacian
     (
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> laplacian
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
 
@@ -71,7 +71,7 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const zero&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
@@ -79,7 +79,7 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const zero&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
 
@@ -87,7 +87,7 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const one&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
@@ -95,7 +95,7 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const one&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
 
@@ -103,7 +103,7 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const dimensioned<GType>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
@@ -111,39 +111,39 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const dimensioned<GType>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
 
     template<class Type, class GType>
     tmp<fvMatrix<Type>> laplacian
     (
-        const GeometricField<GType, fvPatchField, volMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<GType>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type, class GType>
     tmp<fvMatrix<Type>> laplacian
     (
-        const GeometricField<GType, fvPatchField, volMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<GType>&,
+        const VolField<Type>&
     );
 
 
     template<class Type, class GType>
     tmp<fvMatrix<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const tmp<VolField<GType>>&,
+        const VolField<Type>&,
         const word&
     );
 
     template<class Type, class GType>
     tmp<fvMatrix<Type>> laplacian
     (
-        const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const tmp<VolField<GType>>&,
+        const VolField<Type>&
     );
 
 
@@ -151,7 +151,7 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
@@ -159,7 +159,7 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const VolField<Type>&,
         const word&
     );
 
@@ -167,29 +167,29 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacian
     (
         const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type, class GType>
     tmp<fvMatrix<Type>> laplacian
     (
         const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
 
     template<class Type>
     tmp<fvMatrix<Type>> laplacianCorrection
     (
-        const GeometricField<scalar, fvPatchField, volMesh>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<scalar>&,
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> laplacianCorrection
     (
-        const tmp<GeometricField<scalar, fvPatchField, volMesh>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const tmp<VolField<scalar>>&,
+        const VolField<Type>&
     );
 
 
@@ -197,14 +197,14 @@ namespace fvm
     tmp<fvMatrix<Type>> laplacianCorrection
     (
         const SurfaceField<scalar>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> laplacianCorrection
     (
         const tmp<SurfaceField<scalar>>&,
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.C b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
index 9ff2a5ca3b..c4eab3be8f 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.C
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Su
 (
     const DimensionedField<Type, volMesh>& su,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const fvMesh& mesh = vf.mesh();
@@ -60,7 +60,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Su
 (
     const tmp<DimensionedField<Type, volMesh>>& tsu,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm = fvm::Su(tsu(), vf);
@@ -73,8 +73,8 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Su
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const tmp<VolField<Type>>& tsu,
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm = fvm::Su(tsu(), vf);
@@ -88,7 +88,7 @@ Foam::zeroField
 Foam::fvm::Su
 (
     const zero&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return zeroField();
@@ -100,7 +100,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
     const volScalarField::Internal& sp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const fvMesh& mesh = vf.mesh();
@@ -126,7 +126,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
     const tmp<volScalarField::Internal>& tsp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm = fvm::Sp(tsp(), vf);
@@ -140,7 +140,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
     const tmp<volScalarField>& tsp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm = fvm::Sp(tsp(), vf);
@@ -154,7 +154,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
     const dimensionedScalar& sp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const fvMesh& mesh = vf.mesh();
@@ -180,7 +180,7 @@ Foam::zeroField
 Foam::fvm::Sp
 (
     const zero&,
-    const GeometricField<Type, fvPatchField, volMesh>&
+    const VolField<Type>&
 )
 {
     return zeroField();
@@ -192,7 +192,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
     const volScalarField::Internal& susp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const fvMesh& mesh = vf.mesh();
@@ -221,7 +221,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
     const tmp<volScalarField::Internal>& tsusp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm = fvm::SuSp(tsusp(), vf);
@@ -235,7 +235,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
     const tmp<volScalarField>& tsusp,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm = fvm::SuSp(tsusp(), vf);
@@ -249,7 +249,7 @@ Foam::zeroField
 Foam::fvm::SuSp
 (
     const zero&,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     return zeroField();
@@ -261,7 +261,7 @@ Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::S
 (
     const Pair<tmp<volScalarField::Internal>>& s,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm = fvm::Sp(s[1], vf) + s[0];
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.H b/src/finiteVolume/finiteVolume/fvm/fvmSup.H
index da4120181d..5969146730 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmSup.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.H
@@ -57,28 +57,28 @@ namespace fvm
         tmp<fvMatrix<Type>> Su
         (
             const DimensionedField<Type, volMesh>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> Su
         (
             const tmp<DimensionedField<Type, volMesh>>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> Su
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const tmp<VolField<Type>>&,
+            const VolField<Type>&
         );
 
         template<class Type>
         zeroField Su
         (
             const zero&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
@@ -88,21 +88,21 @@ namespace fvm
         tmp<fvMatrix<Type>> Sp
         (
             const volScalarField::Internal&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> Sp
         (
             const tmp<volScalarField::Internal>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> Sp
         (
             const tmp<volScalarField>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
@@ -110,7 +110,7 @@ namespace fvm
         tmp<fvMatrix<Type>> Sp
         (
             const dimensionedScalar&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
@@ -118,7 +118,7 @@ namespace fvm
         zeroField Sp
         (
             const zero&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
@@ -128,28 +128,28 @@ namespace fvm
         tmp<fvMatrix<Type>> SuSp
         (
             const volScalarField::Internal&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> SuSp
         (
             const tmp<volScalarField::Internal>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> SuSp
         (
             const tmp<volScalarField>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         template<class Type>
         zeroField SuSp
         (
             const zero&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
@@ -159,7 +159,7 @@ namespace fvm
         tmp<fvMatrix<Type>> S
         (
             const Pair<tmp<volScalarField::Internal>>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
index cdd08db6a0..2a76af77ac 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::tmp
 >
 Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vtf,
+    const VolField<Type>& vtf,
     const word& name
 ) const
 {
@@ -58,9 +58,9 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
         mesh
     );
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> tlsGrad
+    tmp<VolField<GradType>> tlsGrad
     (
-        GeometricField<GradType, fvPatchField, volMesh>::New
+        VolField<GradType>::New
         (
             name,
             mesh,
@@ -73,7 +73,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
-    GeometricField<GradType, fvPatchField, volMesh>& lsGrad = tlsGrad.ref();
+    VolField<GradType>& lsGrad = tlsGrad.ref();
     Field<GradType>& lsGradIf = lsGrad;
 
     const extendedCentredCellToCellStencil& stencil = lsv.stencil();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
index 7c97df41a8..0592681974 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vsf,
+            const VolField<Type>& vsf,
             const word& name
         ) const;
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
index 92d50a9612..3a0f876fbc 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::tmp
 >
 Foam::fv::fourthGrad<Type>::calcGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vsf,
+    const VolField<Type>& vsf,
     const word& name
 ) const
 {
@@ -61,24 +61,24 @@ Foam::fv::fourthGrad<Type>::calcGrad
 
     // Assemble the second-order least-square gradient
     // Calculate the second-order least-square gradient
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> tsecondfGrad
+    tmp<VolField<GradType>> tsecondfGrad
       = leastSquaresGrad<Type>(mesh).grad
         (
             vsf,
             "leastSquaresGrad(" + vsf.name() + ")"
         );
-    const GeometricField<GradType, fvPatchField, volMesh>& secondfGrad =
+    const VolField<GradType>& secondfGrad =
         tsecondfGrad();
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> tfGrad
+    tmp<VolField<GradType>> tfGrad
     (
-        GeometricField<GradType, fvPatchField, volMesh>::New
+        VolField<GradType>::New
         (
             name,
             secondfGrad
         )
     );
-    GeometricField<GradType, fvPatchField, volMesh>& fGrad = tfGrad.ref();
+    VolField<GradType>& fGrad = tfGrad.ref();
 
     const vectorField& C = mesh.C();
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
index 38ae863a13..8e326dc3b2 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vsf,
+            const VolField<Type>& vsf,
             const word& name
         ) const;
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index 20f07efa4d..6aef4c0d4e 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -48,9 +48,9 @@ Foam::fv::gaussGrad<Type>::gradf
 
     const fvMesh& mesh = ssf.mesh();
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> tgGrad
+    tmp<VolField<GradType>> tgGrad
     (
-        GeometricField<GradType, fvPatchField, volMesh>::New
+        VolField<GradType>::New
         (
             name,
             mesh,
@@ -63,7 +63,7 @@ Foam::fv::gaussGrad<Type>::gradf
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
-    GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad.ref();
+    VolField<GradType>& gGrad = tgGrad.ref();
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -115,17 +115,17 @@ Foam::tmp
 >
 Foam::fv::gaussGrad<Type>::calcGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vsf,
+    const VolField<Type>& vsf,
     const word& name
 ) const
 {
     typedef typename outerProduct<vector, Type>::type GradType;
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> tgGrad
+    tmp<VolField<GradType>> tgGrad
     (
         gradf(tinterpScheme_().interpolate(vsf), name)
     );
-    GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad.ref();
+    VolField<GradType>& gGrad = tgGrad.ref();
 
     correctBoundaryConditions(vsf, gGrad);
 
@@ -136,7 +136,7 @@ Foam::fv::gaussGrad<Type>::calcGrad
 template<class Type>
 void Foam::fv::gaussGrad<Type>::correctBoundaryConditions
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vsf,
+    const VolField<Type>& vsf,
     GeometricField
     <
         typename outerProduct<vector, Type>::type, fvPatchField, volMesh
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
index c40d67d975..dbf38e7017 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
@@ -130,7 +130,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vsf,
+            const VolField<Type>& vsf,
             const word& name
         ) const;
 
@@ -138,7 +138,7 @@ public:
         // snGrad functions
         static void correctBoundaryConditions
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             GeometricField
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>&
         );
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 1c9ed61101..4c7bbfbe02 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -92,7 +92,7 @@ Foam::tmp
 >
 Foam::fv::gradScheme<Type>::grad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vsf,
+    const VolField<Type>& vsf,
     const word& name
 ) const
 {
@@ -184,7 +184,7 @@ Foam::tmp
 >
 Foam::fv::gradScheme<Type>::grad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vsf
+    const VolField<Type>& vsf
 ) const
 {
     return grad(vsf, "grad(" + vsf.name() + ')');
@@ -203,7 +203,7 @@ Foam::tmp
 >
 Foam::fv::gradScheme<Type>::grad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvsf
+    const tmp<VolField<Type>>& tvsf
 ) const
 {
     typedef typename outerProduct<vector, Type>::type GradType;
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
index be38e3397b..54ebbbd115 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const word& name
         ) const = 0;
 
@@ -146,7 +146,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > grad
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const word& name
         ) const;
 
@@ -159,7 +159,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > grad
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         //- Calculate and return the grad of the given field
@@ -171,7 +171,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > grad
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         ) const;
 };
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index 51a0e536b6..97d968f75b 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::tmp
 >
 Foam::fv::leastSquaresGrad<Type>::calcGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vsf,
+    const VolField<Type>& vsf,
     const word& name
 ) const
 {
@@ -54,9 +54,9 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
 
     const fvMesh& mesh = vsf.mesh();
 
-    tmp<GeometricField<GradType, fvPatchField, volMesh>> tlsGrad
+    tmp<VolField<GradType>> tlsGrad
     (
-        GeometricField<GradType, fvPatchField, volMesh>::New
+        VolField<GradType>::New
         (
             name,
             mesh,
@@ -69,7 +69,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
             extrapolatedCalculatedFvPatchField<GradType>::typeName
         )
     );
-    GeometricField<GradType, fvPatchField, volMesh>& lsGrad = tlsGrad.ref();
+    VolField<GradType>& lsGrad = tlsGrad.ref();
 
     // Get reference to least square vectors
     const leastSquaresVectors& lsv = leastSquaresVectors::New(mesh);
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
index 2ef991c5a9..ec8d0e8219 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vsf,
+            const VolField<Type>& vsf,
             const word& name
         ) const;
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.C
index d849930972..26f935d77e 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ Foam::tmp
 >
 Foam::fv::cellLimitedGrad<Type, Limiter>::calcGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vsf,
+    const VolField<Type>& vsf,
     const word& name
 ) const
 {
@@ -119,7 +119,7 @@ Foam::fv::cellLimitedGrad<Type, Limiter>::calcGrad
     }
 
 
-    const typename GeometricField<Type, fvPatchField, volMesh>::Boundary& bsf =
+    const typename VolField<Type>::Boundary& bsf =
         vsf.boundaryField();
 
     forAll(bsf, patchi)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
index 8a15dfbe36..143c0b08e5 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vsf,
+            const VolField<Type>& vsf,
             const word& name
         ) const;
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
index 6bfb438c43..fd73c21b4e 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vsf,
+            const VolField<Type>& vsf,
             const word& name
         ) const;
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
index 395d8db71b..735c65b69b 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vsf,
+            const VolField<Type>& vsf,
             const word& name
         ) const
         {
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
index c533ca2f84..e9e29d057f 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > calcGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vsf,
+            const VolField<Type>& vsf,
             const word& name
         ) const;
 };
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
index 3581fbe9bf..6c131b2025 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
@@ -47,7 +47,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacianUncorrected
 (
     const surfaceScalarField& gammaMagSf,
     const surfaceScalarField& deltaCoeffs,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     tmp<fvMatrix<Type>> tfvm
@@ -93,7 +93,7 @@ tmp<SurfaceField<Type>>
 gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
 (
     const surfaceVectorField& SfGammaCorr,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const fvMesh& mesh = this->mesh();
@@ -125,15 +125,15 @@ gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 gaussLaplacianScheme<Type, GType>::fvcLaplacian
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const fvMesh& mesh = this->mesh();
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian
+    tmp<VolField<Type>> tLaplacian
     (
         fvc::div(this->tsnGradScheme_().snGrad(vf)*mesh.magSf())
     );
@@ -149,7 +149,7 @@ tmp<fvMatrix<Type>>
 gaussLaplacianScheme<Type, GType>::fvmLaplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const fvMesh& mesh = this->mesh();
@@ -192,11 +192,11 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 gaussLaplacianScheme<Type, GType>::fvcLaplacian
 (
     const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     const fvMesh& mesh = this->mesh();
@@ -209,7 +209,7 @@ gaussLaplacianScheme<Type, GType>::fvcLaplacian
     );
     const surfaceVectorField SfGammaCorr(SfGamma - SfGammaSn*Sn);
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian
+    tmp<VolField<Type>> tLaplacian
     (
         fvc::div
         (
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
index 6eecd57666..92774b5adf 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
@@ -61,7 +61,7 @@ class gaussLaplacianScheme
         tmp<SurfaceField<Type>> gammaSnGradCorr
         (
             const surfaceVectorField& SfGammaCorr,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         //- Disallow default bitwise copy construction
@@ -114,24 +114,24 @@ public:
         (
             const surfaceScalarField& gammaMagSf,
             const surfaceScalarField& deltaCoeffs,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
+        tmp<VolField<Type>> fvcLaplacian
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
         tmp<fvMatrix<Type>> fvmLaplacian
         (
             const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
-        tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
+        tmp<VolField<Type>> fvcLaplacian
         (
             const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 };
 
@@ -145,15 +145,15 @@ template<>                                                                     \
 tmp<fvMatrix<Type>> gaussLaplacianScheme<Type, scalar>::fvmLaplacian           \
 (                                                                              \
     const SurfaceField<scalar>&,                 \
-    const GeometricField<Type, fvPatchField, volMesh>&                         \
+    const VolField<Type>&                         \
 );                                                                             \
                                                                                \
 template<>                                                                     \
-tmp<GeometricField<Type, fvPatchField, volMesh>>                               \
+tmp<VolField<Type>>                               \
 gaussLaplacianScheme<Type, scalar>::fvcLaplacian                               \
 (                                                                              \
     const SurfaceField<scalar>&,                 \
-    const GeometricField<Type, fvPatchField, volMesh>&                         \
+    const VolField<Type>&                         \
 );
 
 
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
index 72e496d3fb..781723e00f 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
@@ -37,7 +37,7 @@ Foam::tmp<Foam::fvMatrix<Foam::Type>>                                          \
 Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian         \
 (                                                                              \
     const SurfaceField<scalar>& gamma,           \
-    const GeometricField<Type, fvPatchField, volMesh>& vf                      \
+    const VolField<Type>& vf                      \
 )                                                                              \
 {                                                                              \
     const fvMesh& mesh = this->mesh();                                         \
@@ -92,12 +92,12 @@ Foam::tmp<Foam::GeometricField<Foam::Type, Foam::fvPatchField, Foam::volMesh>> \
 Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvcLaplacian         \
 (                                                                              \
     const SurfaceField<scalar>& gamma,           \
-    const GeometricField<Type, fvPatchField, volMesh>& vf                      \
+    const VolField<Type>& vf                      \
 )                                                                              \
 {                                                                              \
     const fvMesh& mesh = this->mesh();                                         \
                                                                                \
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian                \
+    tmp<VolField<Type>> tLaplacian                \
     (                                                                          \
         fvc::div(gamma*this->tsnGradScheme_().snGrad(vf)*mesh.magSf())         \
     );                                                                         \
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index 4612d0538a..9646bc6e47 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,8 +96,8 @@ template<class Type, class GType>
 tmp<fvMatrix<Type>>
 laplacianScheme<Type, GType>::fvmLaplacian
 (
-    const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<GType>& gamma,
+    const VolField<Type>& vf
 )
 {
     return fvmLaplacian(tinterpGammaScheme_().interpolate(gamma)(), vf);
@@ -105,11 +105,11 @@ laplacianScheme<Type, GType>::fvmLaplacian
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvPatchField, volMesh>>
+tmp<VolField<Type>>
 laplacianScheme<Type, GType>::fvcLaplacian
 (
-    const GeometricField<GType, fvPatchField, volMesh>& gamma,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<GType>& gamma,
+    const VolField<Type>& vf
 )
 {
     return fvcLaplacian(tinterpGammaScheme_().interpolate(gamma)(), vf);
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index af1f0d8082..baa064a432 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,30 +173,30 @@ public:
         virtual tmp<fvMatrix<Type>> fvmLaplacian
         (
             const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
         virtual tmp<fvMatrix<Type>> fvmLaplacian
         (
-            const GeometricField<GType, fvPatchField, volMesh>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<GType>&,
+            const VolField<Type>&
         );
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
+        virtual tmp<VolField<Type>> fvcLaplacian
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
+        virtual tmp<VolField<Type>> fvcLaplacian
         (
             const GeometricField<GType, fvsPatchField, surfaceMesh>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
+        virtual tmp<VolField<Type>> fvcLaplacian
         (
-            const GeometricField<GType, fvPatchField, volMesh>&,
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<GType>&,
+            const VolField<Type>&
         );
 };
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
index 96957afd2b..5127c1a74c 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
@@ -97,7 +97,7 @@ public:
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> deltaCoeffs
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return this->mesh().nonOrthDeltaCoeffs();
@@ -113,7 +113,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
index fca273e0d9..4740083e56 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C
@@ -43,7 +43,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fv::correctedSnGrad<Type>::fullGradCorrection
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const fvMesh& mesh = this->mesh();
@@ -69,7 +69,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fv::correctedSnGrad<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
index a1c59a9864..39fac0de5a 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
@@ -93,7 +93,7 @@ public:
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> deltaCoeffs
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return this->mesh().nonOrthDeltaCoeffs();
@@ -110,13 +110,13 @@ public:
         tmp<SurfaceField<Type>>
         fullGradCorrection
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         //- Return the explicit correction to the correctedSnGrad
         //  for the given field using the gradients of the field components
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
+        correction(const VolField<Type>&) const;
 };
 
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
index 0e70e19ab9..d80881a5cb 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C
@@ -40,7 +40,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const fvMesh& mesh = this->mesh();
@@ -119,7 +119,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fv::faceCorrectedSnGrad<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
index 50f214a5f8..efb29f8b4c 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
@@ -93,7 +93,7 @@ public:
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> deltaCoeffs
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return this->mesh().nonOrthDeltaCoeffs();
@@ -110,13 +110,13 @@ public:
         tmp<SurfaceField<Type>>
         fullGradCorrection
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         //- Return the explicit correction to the faceCorrectedSnGrad
         //  for the given field using the gradients of the field components
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
+        correction(const VolField<Type>&) const;
 };
 
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
index 161faf9501..b36d3e92ee 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
@@ -78,7 +78,7 @@ limitedSnGrad<Type>::~limitedSnGrad()
 template<class Type>
 tmp<surfaceScalarField> limitedSnGrad<Type>::deltaCoeffs
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return correctedScheme_->deltaCoeffs(vf);
@@ -89,7 +89,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 limitedSnGrad<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const SurfaceField<Type> corr
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
index 4b95883b01..c956c9b1f4 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
@@ -131,7 +131,7 @@ public:
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> deltaCoeffs
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         //- Return true if this scheme uses an explicit correction
@@ -143,7 +143,7 @@ public:
         //- Return the explicit correction to the limitedSnGrad
         //  for the given field
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
+        correction(const VolField<Type>&) const;
 
 
     // Member Operators
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
index c658db60be..3feac9404a 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
@@ -53,7 +53,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 orthogonalSnGrad<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>&
+    const VolField<Type>&
 ) const
 {
     NotImplemented;
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
index 1a17dd282f..2ca6ffbc41 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
@@ -89,7 +89,7 @@ public:
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> deltaCoeffs
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return this->mesh().deltaCoeffs();
@@ -104,7 +104,7 @@ public:
         //- Return the explicit correction to the orthogonalSnGrad
         //  for the given field
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
+        correction(const VolField<Type>&) const;
 
 
     // Member Operators
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.C
index 703e6ceb4d..a42b63c32b 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.C
@@ -67,7 +67,7 @@ phaseStabilisedSnGrad<Type>::~phaseStabilisedSnGrad()
 template<class Type>
 tmp<surfaceScalarField> phaseStabilisedSnGrad<Type>::deltaCoeffs
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return correctedScheme_->deltaCoeffs(vf);
@@ -78,7 +78,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 phaseStabilisedSnGrad<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const SurfaceField<Type> corr
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.H
index 118fd56fa1..65705329a3 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.H
@@ -85,7 +85,7 @@ public:
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> deltaCoeffs
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const;
 
         //- Return true if this scheme uses an explicit correction
@@ -97,7 +97,7 @@ public:
         //- Return the explicit correction to the phaseStabilisedSnGrad
         //  for the given field
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
+        correction(const VolField<Type>&) const;
 
 
     // Member Operators
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 3ed8074677..a0073f1ec3 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -99,7 +99,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 snGradScheme<Type>::snGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const tmp<surfaceScalarField>& tdeltaCoeffs,
     const word& snGradName
 )
@@ -156,7 +156,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 snGradScheme<Type>::sndGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& sndGradName
 )
 {
@@ -168,7 +168,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 snGradScheme<Type>::snGrad
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     tmp<SurfaceField<Type>> tsf
@@ -189,7 +189,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 snGradScheme<Type>::snGrad
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 ) const
 {
     tmp<SurfaceField<Type>> tsf
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index 605467e9ff..03395989ae 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -125,7 +125,7 @@ public:
         static tmp<SurfaceField<Type>>
         snGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const tmp<surfaceScalarField>&,
             const word& snGradName = "snGrad"
         );
@@ -134,14 +134,14 @@ public:
         static tmp<SurfaceField<Type>>
         sndGrad
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const word& snGradName = "sndGrad"
         );
 
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> deltaCoeffs
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const = 0;
 
         //- Return true if this scheme uses an explicit correction
@@ -153,7 +153,7 @@ public:
         //- Return the explicit correction to the snGrad
         //  for the given field
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>&) const
+        correction(const VolField<Type>&) const
         {
             return tmp<SurfaceField<Type>>
             (
@@ -164,14 +164,14 @@ public:
         //- Return the snGrad of the given cell field
         //  with explicit correction
         virtual tmp<SurfaceField<Type>>
-        snGrad(const GeometricField<Type, fvPatchField, volMesh>&) const;
+        snGrad(const VolField<Type>&) const;
 
         //- Return the snGrad of the given tmp cell field
         //  with explicit correction
         tmp<SurfaceField<Type>>
         snGrad
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         ) const;
 
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
index 96ba8a1739..f06be5bb9a 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
@@ -53,7 +53,7 @@ template<class Type>
 tmp<SurfaceField<Type>>
 uncorrectedSnGrad<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>&
+    const VolField<Type>&
 ) const
 {
     NotImplemented;
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
index 9e0db3b404..8baa817c71 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
@@ -88,7 +88,7 @@ public:
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> deltaCoeffs
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return this->mesh().nonOrthDeltaCoeffs();
@@ -103,7 +103,7 @@ public:
         //- Return the explicit correction to the uncorrectedSnGrad
         //  for the given field
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
+        correction(const VolField<Type>&) const;
 
 
     // Member Operators
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 54e16d656a..7ee7d67d95 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -190,7 +190,7 @@ void Foam::fvMatrix<Type>::setValue
     scalarField& Diag = diag();
 
     Field<Type>& psi =
-        const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_)
+        const_cast<VolField<Type>&>(psi_)
        .primitiveFieldRef();
 
     psi[celli] = value;
@@ -264,7 +264,7 @@ void Foam::fvMatrix<Type>::setValue
 )
 {
     Field<Type>& psi =
-        const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_)
+        const_cast<VolField<Type>&>(psi_)
        .primitiveFieldRef();
 
     psi[celli] = (1 - fraction)*psi[celli] + fraction*value;
@@ -283,7 +283,7 @@ void Foam::fvMatrix<Type>::setValue
 template<class Type>
 Foam::fvMatrix<Type>::fvMatrix
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi,
+    const VolField<Type>& psi,
     const dimensionSet& ds
 )
 :
@@ -326,8 +326,8 @@ Foam::fvMatrix<Type>::fvMatrix
     }
 
     // Update the boundary coefficients of psi without changing its event No.
-    GeometricField<Type, fvPatchField, volMesh>& psiRef =
-       const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_);
+    VolField<Type>& psiRef =
+       const_cast<VolField<Type>&>(psi_);
 
     label currentStatePsi = psiRef.eventNo();
     psiRef.boundaryFieldRef().updateCoeffs();
@@ -421,7 +421,7 @@ Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
 template<class Type>
 Foam::fvMatrix<Type>::fvMatrix
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi,
+    const VolField<Type>& psi,
     Istream& is
 )
 :
@@ -761,7 +761,7 @@ void Foam::fvMatrix<Type>::relax()
 template<class Type>
 void Foam::fvMatrix<Type>::boundaryManipulate
 (
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
         Boundary& bFields
 )
 {
@@ -866,9 +866,9 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvMatrix<Type>::H() const
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tHphi
+    tmp<VolField<Type>> tHphi
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             "H(" + psi_.name() + ')',
             psi_.mesh(),
@@ -876,7 +876,7 @@ Foam::fvMatrix<Type>::H() const
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& Hphi = tHphi.ref();
+    VolField<Type>& Hphi = tHphi.ref();
 
     // Loop over field components
     for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
@@ -1189,7 +1189,7 @@ void Foam::fvMatrix<Type>::operator+=
 template<class Type>
 void Foam::fvMatrix<Type>::operator+=
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
+    const tmp<VolField<Type>>& tsu
 )
 {
     operator+=(tsu());
@@ -1222,7 +1222,7 @@ void Foam::fvMatrix<Type>::operator-=
 template<class Type>
 void Foam::fvMatrix<Type>::operator-=
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
+    const tmp<VolField<Type>>& tsu
 )
 {
     operator-=(tsu());
@@ -1592,7 +1592,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const fvMatrix<Type>& A,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
+    const tmp<VolField<Type>>& tsu
 )
 {
     checkMethod(A, tsu(), "==");
@@ -1633,7 +1633,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator==
 (
     const tmp<fvMatrix<Type>>& tA,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
+    const tmp<VolField<Type>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "==");
@@ -1798,7 +1798,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const fvMatrix<Type>& A,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
+    const tmp<VolField<Type>>& tsu
 )
 {
     checkMethod(A, tsu(), "+");
@@ -1839,7 +1839,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
     const tmp<fvMatrix<Type>>& tA,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
+    const tmp<VolField<Type>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "+");
@@ -1879,7 +1879,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
+    const tmp<VolField<Type>>& tsu,
     const fvMatrix<Type>& A
 )
 {
@@ -1920,7 +1920,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator+
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
+    const tmp<VolField<Type>>& tsu,
     const tmp<fvMatrix<Type>>& tA
 )
 {
@@ -2017,7 +2017,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const fvMatrix<Type>& A,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
+    const tmp<VolField<Type>>& tsu
 )
 {
     checkMethod(A, tsu(), "-");
@@ -2058,7 +2058,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
     const tmp<fvMatrix<Type>>& tA,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu
+    const tmp<VolField<Type>>& tsu
 )
 {
     checkMethod(tA(), tsu(), "-");
@@ -2100,7 +2100,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
+    const tmp<VolField<Type>>& tsu,
     const fvMatrix<Type>& A
 )
 {
@@ -2144,7 +2144,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tsu,
+    const tmp<VolField<Type>>& tsu,
     const tmp<fvMatrix<Type>>& tA
 )
 {
@@ -2465,9 +2465,9 @@ Foam::operator&
     const DimensionedField<Type, volMesh>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tMphi
+    tmp<VolField<Type>> tMphi
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             "M&" + psi.name(),
             psi.mesh(),
@@ -2475,7 +2475,7 @@ Foam::operator&
             extrapolatedCalculatedFvPatchScalarField::typeName
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& Mphi = tMphi.ref();
+    VolField<Type>& Mphi = tMphi.ref();
 
     // Loop over field components
     if (M.hasDiag())
@@ -2510,7 +2510,7 @@ Foam::operator&
     const tmp<DimensionedField<Type, volMesh>>& tpsi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = M & tpsi();
+    tmp<VolField<Type>> tMpsi = M & tpsi();
     tpsi.clear();
     return tMpsi;
 }
@@ -2520,10 +2520,10 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::operator&
 (
     const fvMatrix<Type>& M,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tpsi
+    const tmp<VolField<Type>>& tpsi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = M & tpsi();
+    tmp<VolField<Type>> tMpsi = M & tpsi();
     tpsi.clear();
     return tMpsi;
 }
@@ -2536,7 +2536,7 @@ Foam::operator&
     const DimensionedField<Type, volMesh>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = tM() & psi;
+    tmp<VolField<Type>> tMpsi = tM() & psi;
     tM.clear();
     return tMpsi;
 }
@@ -2549,7 +2549,7 @@ Foam::operator&
     const tmp<DimensionedField<Type, volMesh>>& tpsi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = tM() & tpsi();
+    tmp<VolField<Type>> tMpsi = tM() & tpsi();
     tM.clear();
     tpsi.clear();
     return tMpsi;
@@ -2560,10 +2560,10 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::operator&
 (
     const tmp<fvMatrix<Type>>& tM,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tpsi
+    const tmp<VolField<Type>>& tpsi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tMpsi = tM() & tpsi();
+    tmp<VolField<Type>> tMpsi = tM() & tpsi();
     tM.clear();
     tpsi.clear();
     return tMpsi;
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 1757882389..1734957fae 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -60,45 +60,45 @@ template<class Type>
 class fvMatrix;
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
+tmp<VolField<Type>> operator&
 (
     const fvMatrix<Type>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
+tmp<VolField<Type>> operator&
 (
     const fvMatrix<Type>&,
     const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
+tmp<VolField<Type>> operator&
 (
     const fvMatrix<Type>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    const tmp<VolField<Type>>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
+tmp<VolField<Type>> operator&
 (
     const tmp<fvMatrix<Type>>&,
     const DimensionedField<Type, volMesh>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
+tmp<VolField<Type>> operator&
 (
     const tmp<fvMatrix<Type>>&,
     const tmp<DimensionedField<Type, volMesh>>&
 );
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> operator&
+tmp<VolField<Type>> operator&
 (
     const tmp<fvMatrix<Type>>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    const tmp<VolField<Type>>&
 );
 
 template<class Type>
@@ -119,9 +119,9 @@ class fvMatrix
 {
     // Private Data
 
-        //- Const reference to GeometricField<Type, fvPatchField, volMesh>
+        //- Const reference to VolField<Type>
         //  Converted into a non-const reference at the point of solution.
-        const GeometricField<Type, fvPatchField, volMesh>& psi_;
+        const VolField<Type>& psi_;
 
         //- Dimension set
         dimensionSet dimensions_;
@@ -262,7 +262,7 @@ public:
         //- Construct given a field to solve for
         fvMatrix
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const dimensionSet&
         );
 
@@ -273,7 +273,7 @@ public:
         fvMatrix(const tmp<fvMatrix<Type>>&);
 
         //- Construct from Istream given field to solve for
-        fvMatrix(const GeometricField<Type, fvPatchField, volMesh>&, Istream&);
+        fvMatrix(const VolField<Type>&, Istream&);
 
         //- Clone
         tmp<fvMatrix<Type>> clone() const;
@@ -287,15 +287,15 @@ public:
 
         // Access
 
-            GeometricField<Type, fvPatchField, volMesh>& psi()
+            VolField<Type>& psi()
             {
-                return const_cast<GeometricField<Type, fvPatchField, volMesh>&>
+                return const_cast<VolField<Type>&>
                 (
                     psi_
                 );
             }
 
-            const GeometricField<Type, fvPatchField, volMesh>& psi() const
+            const VolField<Type>& psi() const
             {
                 return psi_;
             }
@@ -393,7 +393,7 @@ public:
             //- Manipulate based on a boundary field
             void boundaryManipulate
             (
-                typename GeometricField<Type, fvPatchField, volMesh>::
+                typename VolField<Type>::
                     Boundary& values
             );
 
@@ -444,7 +444,7 @@ public:
             tmp<volScalarField::Internal> Sp() const;
 
             //- Return the H operation source
-            tmp<GeometricField<Type, fvPatchField, volMesh>> H() const;
+            tmp<VolField<Type>> H() const;
 
             //- Return H(1)
             tmp<volScalarField> H1() const;
@@ -477,7 +477,7 @@ public:
         );
         void operator+=
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         );
 
         void operator-=
@@ -490,7 +490,7 @@ public:
         );
         void operator-=
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         );
 
         void operator+=(const dimensioned<Type>&);
@@ -512,32 +512,32 @@ public:
 
     // Friend operators
 
-        friend tmp<GeometricField<Type, fvPatchField, volMesh>>
+        friend tmp<VolField<Type>>
         operator& <Type>
         (
             const fvMatrix<Type>&,
             const DimensionedField<Type, volMesh>&
         );
 
-        friend tmp<GeometricField<Type, fvPatchField, volMesh>>
+        friend tmp<VolField<Type>>
         operator& <Type>
         (
             const fvMatrix<Type>&,
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         );
 
-        friend tmp<GeometricField<Type, fvPatchField, volMesh>>
+        friend tmp<VolField<Type>>
         operator& <Type>
         (
             const tmp<fvMatrix<Type>>&,
             const DimensionedField<Type, volMesh>&
         );
 
-        friend tmp<GeometricField<Type, fvPatchField, volMesh>>
+        friend tmp<VolField<Type>>
         operator& <Type>
         (
             const tmp<fvMatrix<Type>>&,
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         );
 
 
@@ -664,7 +664,7 @@ template<class Type>
 tmp<fvMatrix<Type>> operator==
 (
     const fvMatrix<Type>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    const tmp<VolField<Type>>&
 );
 
 template<class Type>
@@ -685,7 +685,7 @@ template<class Type>
 tmp<fvMatrix<Type>> operator==
 (
     const tmp<fvMatrix<Type>>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    const tmp<VolField<Type>>&
 );
 
 template<class Type>
@@ -778,7 +778,7 @@ template<class Type>
 tmp<fvMatrix<Type>> operator+
 (
     const fvMatrix<Type>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    const tmp<VolField<Type>>&
 );
 
 template<class Type>
@@ -799,7 +799,7 @@ template<class Type>
 tmp<fvMatrix<Type>> operator+
 (
     const tmp<fvMatrix<Type>>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    const tmp<VolField<Type>>&
 );
 
 template<class Type>
@@ -819,7 +819,7 @@ tmp<fvMatrix<Type>> operator+
 template<class Type>
 tmp<fvMatrix<Type>> operator+
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+    const tmp<VolField<Type>>&,
     const fvMatrix<Type>&
 );
 
@@ -840,7 +840,7 @@ tmp<fvMatrix<Type>> operator+
 template<class Type>
 tmp<fvMatrix<Type>> operator+
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+    const tmp<VolField<Type>>&,
     const tmp<fvMatrix<Type>>&
 );
 
@@ -921,7 +921,7 @@ template<class Type>
 tmp<fvMatrix<Type>> operator-
 (
     const fvMatrix<Type>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    const tmp<VolField<Type>>&
 );
 
 template<class Type>
@@ -942,7 +942,7 @@ template<class Type>
 tmp<fvMatrix<Type>> operator-
 (
     const tmp<fvMatrix<Type>>&,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+    const tmp<VolField<Type>>&
 );
 
 template<class Type>
@@ -962,7 +962,7 @@ tmp<fvMatrix<Type>> operator-
 template<class Type>
 tmp<fvMatrix<Type>> operator-
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+    const tmp<VolField<Type>>&,
     const fvMatrix<Type>&
 );
 
@@ -983,7 +983,7 @@ tmp<fvMatrix<Type>> operator-
 template<class Type>
 tmp<fvMatrix<Type>> operator-
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
+    const tmp<VolField<Type>>&,
     const tmp<fvMatrix<Type>>&
 );
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index 4fc8147f8c..5b12d81f38 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -115,8 +115,8 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solveSegregated
             << endl;
     }
 
-    GeometricField<Type, fvPatchField, volMesh>& psi =
-       const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_);
+    VolField<Type>& psi =
+       const_cast<VolField<Type>&>(psi_);
 
     SolverPerformance<Type> solverPerfVec
     (
@@ -231,8 +231,8 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solveCoupled
             << endl;
     }
 
-    GeometricField<Type, fvPatchField, volMesh>& psi =
-       const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_);
+    VolField<Type>& psi =
+       const_cast<VolField<Type>&>(psi_);
 
     LduMatrix<Type, scalar, scalar> coupledMatrix(psi.mesh());
     coupledMatrix.diag() = diag();
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 4acf18eb14..7b7bdf5603 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,8 +100,8 @@ Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::fvSolver::solve
     const dictionary& solverControls
 )
 {
-    GeometricField<scalar, fvPatchField, volMesh>& psi =
-        const_cast<GeometricField<scalar, fvPatchField, volMesh>&>
+    VolField<scalar>& psi =
+        const_cast<VolField<scalar>&>
         (fvMat_.psi());
 
     scalarField saveDiag(fvMat_.diag());
@@ -149,8 +149,8 @@ Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
             << endl;
     }
 
-    GeometricField<scalar, fvPatchField, volMesh>& psi =
-       const_cast<GeometricField<scalar, fvPatchField, volMesh>&>(psi_);
+    VolField<scalar>& psi =
+       const_cast<VolField<scalar>&>(psi_);
 
     scalarField saveDiag(diag());
     addBoundaryDiag(diag(), 0);
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
index 25892f5d2e..5ff3e5ee36 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
@@ -83,7 +83,7 @@ public:
         (
             const distributionMap& map,
             const labelListList& stencil,
-            const GeometricField<Type, fvPatchField, volMesh>& fld,
+            const VolField<Type>& fld,
             const List<List<WeightType>>& stencilWeights
         );
 };
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
index 8da4f289be..6b9b09f8f5 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
@@ -41,7 +41,7 @@ Foam::tmp
 (
     const distributionMap& map,
     const labelListList& stencil,
-    const GeometricField<Type, fvPatchField, volMesh>& fld,
+    const VolField<Type>& fld,
     const List<List<WeightType>>& stencilWeights
 )
 {
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
index 94a88c3d9f..65861fbd13 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
@@ -96,7 +96,7 @@ public:
         template<class Type>
         void collectData
         (
-            const GeometricField<Type, fvPatchField, volMesh>& fld,
+            const VolField<Type>& fld,
             List<List<Type>>& stencilFld
         ) const
         {
@@ -121,7 +121,7 @@ public:
             >
         > weightedSum
         (
-            const GeometricField<Type, fvPatchField, volMesh>& fld,
+            const VolField<Type>& fld,
             const List<List<WeightType>>& stencilWeights
         ) const
         {
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
index 4ca245a4a7..2fbdaec0a4 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
@@ -98,13 +98,13 @@ public:
     // Member Functions
 
         //- Use map to get the data into stencil order
-        template<class T>
+        template<class Type>
         static void collectData
         (
             const distributionMap& map,
             const labelListList& stencil,
-            const GeometricField<T, fvPatchField, volMesh>& fld,
-            List<List<T>>& stencilFld
+            const VolField<Type>& fld,
+            List<List<Type>>& stencilFld
         );
 
         //- Sum vol field contributions to create face values
@@ -114,7 +114,7 @@ public:
         (
             const distributionMap& map,
             const labelListList& stencil,
-            const GeometricField<Type, fvPatchField, volMesh>& fld,
+            const VolField<Type>& fld,
             const List<List<scalar>>& stencilWeights
         );
 };
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
index 4dadf2b9c4..7e004fec3e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
@@ -32,7 +32,7 @@ void Foam::extendedCellToFaceStencil::collectData
 (
     const distributionMap& map,
     const labelListList& stencil,
-    const GeometricField<Type, fvPatchField, volMesh>& fld,
+    const VolField<Type>& fld,
     List<List<Type>>& stencilFld
 )
 {
@@ -86,7 +86,7 @@ Foam::extendedCellToFaceStencil::weightedSum
 (
     const distributionMap& map,
     const labelListList& stencil,
-    const GeometricField<Type, fvPatchField, volMesh>& fld,
+    const VolField<Type>& fld,
     const List<List<scalar>>& stencilWeights
 )
 {
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
index 4785cb840c..35a99b6ec4 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
@@ -92,11 +92,11 @@ public:
         void compact();
 
         //- Use map to get the data into stencil order
-        template<class T>
+        template<class Type>
         void collectData
         (
-            const GeometricField<T, fvPatchField, volMesh>& fld,
-            List<List<T>>& stencilFld
+            const VolField<Type>& fld,
+            List<List<Type>>& stencilFld
         ) const
         {
             extendedCellToFaceStencil::collectData
@@ -112,7 +112,7 @@ public:
         template<class Type>
         tmp<SurfaceField<Type>> weightedSum
         (
-            const GeometricField<Type, fvPatchField, volMesh>& fld,
+            const VolField<Type>& fld,
             const List<List<scalar>>& stencilWeights
         ) const
         {
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
index 63792918d0..a582d5eb96 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
@@ -177,7 +177,7 @@ public:
         tmp<SurfaceField<Type>> weightedSum
         (
             const surfaceScalarField& phi,
-            const GeometricField<Type, fvPatchField, volMesh>& fld,
+            const VolField<Type>& fld,
             const List<List<scalar>>& ownWeights,
             const List<List<scalar>>& neiWeights
         ) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
index 1c3ce276cf..e6c6ad5e84 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
@@ -32,7 +32,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::extendedUpwindCellToFaceStencil::weightedSum
 (
     const surfaceScalarField& phi,
-    const GeometricField<Type, fvPatchField, volMesh>& fld,
+    const VolField<Type>& fld,
     const List<List<scalar>>& ownWeights,
     const List<List<scalar>>& neiWeights
 ) const
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
index f547212e04..62854055f1 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
@@ -110,7 +110,7 @@ public:
 
         //- Sum surface field contributions to create cell values
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>> weightedSum
+        tmp<VolField<Type>> weightedSum
         (
             const SurfaceField<Type>& fld,
             const List<List<scalar>>& stencilWeights
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
index c4acabcb15..9ac55a08bd 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
@@ -82,7 +82,7 @@ public:
 
         //- Sum surface field contributions to create cell values
         template<class Type>
-        static tmp<GeometricField<Type, fvPatchField, volMesh>> weightedSum
+        static tmp<VolField<Type>> weightedSum
         (
             const distributionMap& map,
             const labelListList& stencil,
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
index a2b491182a..fd65693af9 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
@@ -93,9 +93,9 @@ Foam::extendedFaceToCellStencil::weightedSum
     List<List<Type>> stencilFld;
     collectData(map, stencil, fld, stencilFld);
 
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tsfCorr
+    tmp<VolField<Type>> tsfCorr
     (
-        GeometricField<Type, fvPatchField, volMesh>::New
+        VolField<Type>::New
         (
             fld.name(),
             mesh,
@@ -107,7 +107,7 @@ Foam::extendedFaceToCellStencil::weightedSum
             )
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& sf = tsfCorr.ref();
+    VolField<Type>& sf = tsfCorr.ref();
 
     // cells
     forAll(sf, celli)
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
index 6b63350e68..c8dcf0742b 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
@@ -200,10 +200,10 @@ public:
         //- Map volField. Internal field set to average, patch fields straight
         //  copies.
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<VolField<Type>>
         interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
index c7c058d86b..96a5e3e990 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
@@ -36,9 +36,9 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
+tmp<VolField<Type>> singleCellFvMesh::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     // 1. Create the complete field with dummy patch fields
@@ -59,9 +59,9 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
     }
 
     // Create the complete field from the pieces
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tresF
+    tmp<VolField<Type>> tresF
     (
-        new GeometricField<Type, fvPatchField, volMesh>
+        new VolField<Type>
         (
             IOobject
             (
@@ -77,13 +77,13 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
             patchFields
         )
     );
-    GeometricField<Type, fvPatchField, volMesh>& resF = tresF.ref();
+    VolField<Type>& resF = tresF.ref();
 
 
     // 2. Change the fvPatchFields to the correct type using a mapper
     //  constructor (with reference to the now correct internal field)
 
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
         Boundary& bf = resF.boundaryFieldRef();
 
     if (agglomerate())
diff --git a/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMesh.H b/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMesh.H
index f3925e1e50..de6eb7579e 100644
--- a/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMesh.H
+++ b/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMesh.H
@@ -78,16 +78,16 @@ public:
                 template<class Type>
                 void mapSrcToTgt
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field,
-                    GeometricField<Type, fvPatchField, volMesh>& result
+                    const VolField<Type>& field,
+                    VolField<Type>& result
                 ) const;
 
                 //- Interpolate a field with a defined operation. The initial
                 //  values of the result are set to zero.
                 template<class Type>
-                tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
+                tmp<VolField<Type>> mapSrcToTgt
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field
+                    const VolField<Type>& field
                 ) const;
 };
 
diff --git a/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C b/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C
index a4fef34ca3..a5796025a7 100644
--- a/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C
+++ b/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C
@@ -32,13 +32,13 @@ License
 template<class Type>
 void Foam::fvMeshToFvMesh::mapSrcToTgt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field,
-    GeometricField<Type, fvPatchField, volMesh>& result
+    const VolField<Type>& field,
+    VolField<Type>& result
 ) const
 {
     meshToMesh::mapSrcToTgt(field, result.primitiveFieldRef());
 
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
         Boundary& resultBf = result.boundaryFieldRef();
 
     forAll(srcToTgtPatchIDs(), i)
@@ -83,7 +83,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvMeshToFvMesh::mapSrcToTgt
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const VolField<Type>& field
 ) const
 {
     const fvMesh& tgtMesh = static_cast<const fvMesh&>(meshToMesh::tgtMesh());
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
index 5f82300c01..ea2e8270b1 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
@@ -33,7 +33,7 @@ License
 template<class Type>
 Foam::interpolation<Type>::interpolation
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 :
     psi_(psi),
@@ -47,7 +47,7 @@ template<class Type>
 Foam::autoPtr<Foam::interpolation<Type>> Foam::interpolation<Type>::New
 (
     const word& interpolationType,
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 {
     typename dictionaryConstructorTable::iterator cstrIter =
@@ -71,7 +71,7 @@ template<class Type>
 Foam::autoPtr<Foam::interpolation<Type>> Foam::interpolation<Type>::New
 (
     const dictionary& interpolationSchemes,
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 {
     return New(word(interpolationSchemes.lookup(psi.name())), psi);
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
index 06741776f3..a700253908 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
@@ -59,7 +59,7 @@ protected:
     // Protected data
 
         //- The vol field to interpolate
-        const GeometricField<Type, fvPatchField, volMesh>& psi_;
+        const VolField<Type>& psi_;
 
         //- Reference to the mesh
         const polyMesh& mesh_;
@@ -79,7 +79,7 @@ public:
             interpolation,
             dictionary,
             (
-                const GeometricField<Type, fvPatchField, volMesh>& psi
+                const VolField<Type>& psi
             ),
             (psi)
         );
@@ -91,14 +91,14 @@ public:
         static autoPtr<interpolation<Type>> New
         (
             const word& interpolationType,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         //- Return a reference to the selected interpolation scheme
         static autoPtr<interpolation<Type>> New
         (
             const dictionary& interpolationSchemes,
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
 
@@ -107,7 +107,7 @@ public:
         //- Construct from components
         interpolation
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
 
@@ -119,7 +119,7 @@ public:
     // Member Functions
 
         //- Return the field to be interpolated
-        const GeometricField<Type, fvPatchField, volMesh>& psi() const
+        const VolField<Type>& psi() const
         {
             return psi_;
         }
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.C b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.C
index 4704f6f642..df459b6df3 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 template<class Type>
 Foam::interpolationCell<Type>::interpolationCell
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 :
     fieldInterpolation<Type, interpolationCell<Type>>(psi)
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
index 122cdfcc06..a63150d881 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ public:
         //- Construct from components
         interpolationCell
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
index 9bdb31a513..2a416106b4 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 template<class Type>
 Foam::interpolationCellPatchConstrained<Type>::interpolationCellPatchConstrained
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 :
     fieldInterpolation<Type, interpolationCellPatchConstrained<Type>>(psi)
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H
index 78745b0f74..3cecaa0c73 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ public:
         //- Construct from components
         interpolationCellPatchConstrained
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.C
index 307015945d..eb84fdd274 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.C
@@ -31,7 +31,7 @@ License
 template<class Type>
 Foam::interpolationCellPoint<Type>::interpolationCellPoint
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 :
     fieldInterpolation<Type, interpolationCellPoint<Type>>(psi),
@@ -45,7 +45,7 @@ Foam::interpolationCellPoint<Type>::interpolationCellPoint
 template<class Type>
 Foam::interpolationCellPoint<Type>::interpolationCellPoint
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi,
+    const VolField<Type>& psi,
     tmp<PointField<Type>> psip
 )
 :
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
index 41751eb87d..2599ae3e2a 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
@@ -62,13 +62,13 @@ public:
         //- Construct from components
         interpolationCellPoint
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         //- Construct from components
         interpolationCellPoint
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi,
+            const VolField<Type>& psi,
             tmp<PointField<Type>> psip
         );
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
index 98b79073a0..6a3b4e4d21 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
@@ -36,7 +36,7 @@ License
 template<class Type>
 Foam::interpolationCellPointFace<Type>::interpolationCellPointFace
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 :
     fieldInterpolation<Type, interpolationCellPointFace<Type>>(psi),
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H
index cf86eef4f8..60554a485d 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H
@@ -87,7 +87,7 @@ public:
         //- Construct from components
         interpolationCellPointFace
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
index 65d1dc556b..553031b5e8 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
@@ -36,7 +36,7 @@ template<class TYPE>
 Foam::tmp<Foam::GeometricField<TYPE, Foam::pointPatchField, Foam::pointMesh>>
 Foam::interpolationCellPointWallModified<Type>::calcPointField
 (
-    const GeometricField<TYPE, fvPatchField, volMesh>& psi
+    const VolField<TYPE>& psi
 ) const
 {
     FatalErrorInFunction
@@ -324,7 +324,7 @@ template<class Type>
 Foam::interpolationCellPointWallModified<Type>::
 interpolationCellPointWallModified
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 :
     interpolationCellPoint<Type>(psi, calcPointField(psi))
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
index 9f8382b751..2f0df28657 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
@@ -64,7 +64,7 @@ class interpolationCellPointWallModified
         template <class TYPE>
         tmp<PointField<TYPE>> calcPointField
         (
-            const GeometricField<TYPE, fvPatchField, volMesh>& psi
+            const VolField<TYPE>& psi
         ) const;
 
         //- Compute the point field for a vector type
@@ -82,7 +82,7 @@ public:
         //- Construct from components
         interpolationCellPointWallModified
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 };
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.C b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.C
index 3e9932d3fc..1331af61a2 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.C
@@ -31,7 +31,7 @@ License
 template<class Type>
 Foam::interpolationPointMVC<Type>::interpolationPointMVC
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 :
     fieldInterpolation<Type, interpolationPointMVC<Type>>(psi),
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
index a858062010..d24e2582b4 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
@@ -62,7 +62,7 @@ public:
         //- Construct from components
         interpolationPointMVC
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationVolPointInterpolation/interpolationVolPointInterpolation.C b/src/finiteVolume/interpolation/interpolation/interpolationVolPointInterpolation/interpolationVolPointInterpolation.C
index 2e3f0b8930..78ca17ceb5 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationVolPointInterpolation/interpolationVolPointInterpolation.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationVolPointInterpolation/interpolationVolPointInterpolation.C
@@ -32,7 +32,7 @@ template<class Type>
 Foam::interpolationVolPointInterpolation<Type>::
 interpolationVolPointInterpolation
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi
+    const VolField<Type>& psi
 )
 :
     psip_
@@ -51,7 +51,7 @@ template<class Type>
 Foam::interpolationVolPointInterpolation<Type>::
 interpolationVolPointInterpolation
 (
-    const GeometricField<Type, fvPatchField, volMesh>& psi,
+    const VolField<Type>& psi,
     tmp<PointField<Type>> psip
 )
 :
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationVolPointInterpolation/interpolationVolPointInterpolation.H b/src/finiteVolume/interpolation/interpolation/interpolationVolPointInterpolation/interpolationVolPointInterpolation.H
index 35344eee22..0fb2ea6225 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationVolPointInterpolation/interpolationVolPointInterpolation.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationVolPointInterpolation/interpolationVolPointInterpolation.H
@@ -67,13 +67,13 @@ public:
         //- Construct from components
         interpolationVolPointInterpolation
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi
+            const VolField<Type>& psi
         );
 
         //- Construct from components
         interpolationVolPointInterpolation
         (
-            const GeometricField<Type, fvPatchField, volMesh>& psi,
+            const VolField<Type>& psi,
             tmp<PointField<Type>> psip
         );
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/blendedSchemeBase/blendedSchemeBase.H b/src/finiteVolume/interpolation/surfaceInterpolation/blendedSchemeBase/blendedSchemeBase.H
index aa946e06cf..c850caa5ef 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/blendedSchemeBase/blendedSchemeBase.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/blendedSchemeBase/blendedSchemeBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ public:
         //- Return the face-based blending factor
         virtual tmp<surfaceScalarField> blendingFactor
         (
-             const GeometricField<Type, fvPatchField, volMesh>& vf
+             const VolField<Type>& vf
         ) const = 0;
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
index 0372def648..ea2f82eae8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ template<class Type>
 inline Foam::tmp<Foam::volScalarField>
 Foam::limitFuncs::magSqr<Type>::operator()
 (
-    const GeometricField<Type, fvPatchField, volMesh>& phi
+    const VolField<Type>& phi
 ) const
 {
     return Foam::magSqr(phi);
@@ -75,7 +75,7 @@ template<class Type>
 inline Foam::tmp<Foam::volScalarField>
 Foam::limitFuncs::rhoMagSqr<Type>::operator()
 (
-    const GeometricField<Type, fvPatchField, volMesh>& phi
+    const VolField<Type>& phi
 ) const
 {
     const volScalarField& rho =
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
index 903fa34111..76f49fec4d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitFuncs.H
@@ -71,9 +71,9 @@ public:
     null()
     {}
 
-    inline tmp<GeometricField<Type, fvPatchField, volMesh>> operator()
+    inline tmp<VolField<Type>> operator()
     (
-        const GeometricField<Type, fvPatchField, volMesh>& phi
+        const VolField<Type>& phi
     ) const
     {
         return phi;
@@ -91,7 +91,7 @@ public:
 
     inline tmp<volScalarField> operator()
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     ) const;
 };
 
@@ -124,7 +124,7 @@ public:
 
     inline tmp<volScalarField> operator()
     (
-        const GeometricField<Type, fvPatchField, volMesh>&
+        const VolField<Type>&
     ) const;
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 4faf0acfa8..c5b9f1606b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -33,22 +33,17 @@ License
 template<class Type, class Limiter, template<class> class LimitFunc>
 void Foam::LimitedScheme<Type, Limiter, LimitFunc>::calcLimiter
 (
-    const GeometricField<Type, fvPatchField, volMesh>& phi,
+    const VolField<Type>& phi,
     surfaceScalarField& limiterField
 ) const
 {
     const fvMesh& mesh = this->mesh();
 
-    tmp<GeometricField<typename Limiter::phiType, fvPatchField, volMesh>>
-        tlPhi = LimitFunc<Type>()(phi);
+    tmp<VolField<typename Limiter::phiType>> tlPhi = LimitFunc<Type>()(phi);
+    const VolField<typename Limiter::phiType>& lPhi = tlPhi();
 
-    const GeometricField<typename Limiter::phiType, fvPatchField, volMesh>&
-        lPhi = tlPhi();
-
-    tmp<GeometricField<typename Limiter::gradPhiType, fvPatchField, volMesh>>
-        tgradc(fvc::grad(lPhi));
-    const GeometricField<typename Limiter::gradPhiType, fvPatchField, volMesh>&
-        gradc = tgradc();
+    tmp<VolField<typename Limiter::gradPhiType>> tgradc(fvc::grad(lPhi));
+    const VolField<typename Limiter::gradPhiType>& gradc = tgradc();
 
     const surfaceScalarField& CDweights = mesh.surfaceInterpolation::weights();
 
@@ -76,7 +71,7 @@ void Foam::LimitedScheme<Type, Limiter, LimitFunc>::calcLimiter
         );
     }
 
-    const typename GeometricField<Type, fvPatchField, volMesh>::Boundary&
+    const typename VolField<Type>::Boundary&
         bPhi = phi.boundaryField();
 
     surfaceScalarField::Boundary& bLim =
@@ -140,7 +135,7 @@ template<class Type, class Limiter, template<class> class LimitFunc>
 Foam::tmp<Foam::surfaceScalarField>
 Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
 (
-    const GeometricField<Type, fvPatchField, volMesh>& phi
+    const VolField<Type>& phi
 ) const
 {
     const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
index d7436c2d49..75e26e0ef7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
@@ -71,7 +71,7 @@ class LimitedScheme
         //- Calculate the limiter
         void calcLimiter
         (
-            const GeometricField<Type, fvPatchField, volMesh>& phi,
+            const VolField<Type>& phi,
             surfaceScalarField& limiterField
         ) const;
 
@@ -131,7 +131,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> limiter
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
index 26cccb85fd..d43e98ffe1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ template<class Type, class PhiLimiter>
 Foam::tmp<Foam::surfaceScalarField>
 Foam::PhiScheme<Type, PhiLimiter>::limiter
 (
-    const GeometricField<Type, fvPatchField, volMesh>& phi
+    const VolField<Type>& phi
 ) const
 {
     const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
index f67a172014..1be781d498 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
@@ -117,7 +117,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> limiter
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
index bf4c5f6334..53dec4ade8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
@@ -117,7 +117,7 @@ public:
         //- Return the face-based blending factor
         virtual tmp<surfaceScalarField> blendingFactor
         (
-             const GeometricField<Type, fvPatchField, volMesh>& vf
+             const VolField<Type>& vf
         ) const
         {
             return surfaceScalarField::New
@@ -131,7 +131,7 @@ public:
         //- Return the interpolation limiter
         virtual tmp<surfaceScalarField> limiter
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return surfaceScalarField::New
@@ -145,7 +145,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             return
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
index aa66cf6313..c9431a3908 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
@@ -118,7 +118,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             return tLimiter_().weights
@@ -138,7 +138,7 @@ public:
         //- Return the explicit correction to the face-interpolate
         //  for the given field
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>& vf) const
+        correction(const VolField<Type>& vf) const
         {
             return tLimiter_().limiter(vf)*tInterp_().correction(vf);
         }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index 3fb64fd1dc..bef89c898c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,7 +140,7 @@ template<class Type>
 Foam::tmp<Foam::surfaceScalarField>
 Foam::limitedSurfaceInterpolationScheme<Type>::weights
 (
-    const GeometricField<Type, fvPatchField, volMesh>& phi,
+    const VolField<Type>& phi,
     const surfaceScalarField& CDweights,
     tmp<surfaceScalarField> tLimiter
 ) const
@@ -183,7 +183,7 @@ template<class Type>
 Foam::tmp<Foam::surfaceScalarField>
 Foam::limitedSurfaceInterpolationScheme<Type>::weights
 (
-    const GeometricField<Type, fvPatchField, volMesh>& phi
+    const VolField<Type>& phi
 ) const
 {
     return this->weights
@@ -198,7 +198,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::limitedSurfaceInterpolationScheme<Type>::flux
 (
-    const GeometricField<Type, fvPatchField, volMesh>& phi
+    const VolField<Type>& phi
 ) const
 {
     return faceFlux_*this->interpolate(phi);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
index c858e695df..81bd1ed266 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
@@ -159,14 +159,14 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> limiter
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const = 0;
 
         //- Return the interpolation weighting factors for the given field,
         //  by limiting the given weights with the given limiter
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const surfaceScalarField& CDweights,
             tmp<surfaceScalarField> tLimiter
         ) const;
@@ -174,14 +174,14 @@ public:
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         //- Return the interpolation weighting factors
         virtual tmp<SurfaceField<Type>>
         flux
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
index 8bd98e9a4d..db00a476c8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
@@ -101,7 +101,7 @@ public:
         //- Return the interpolation limiter
         virtual tmp<surfaceScalarField> limiter
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return surfaceScalarField::New
@@ -121,7 +121,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return weights();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
index 1b307a1492..ac37d6ff9e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ public:
 
         tmp<surfaceInterpolationScheme<Type>> operator()
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field
+            const VolField<Type>& field
         ) const
         {
             return surfaceInterpolationScheme<Type>::New
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
index 1948c5fc90..fcb8695e20 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ public:
 
                 fieldScheme
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field,
+                    const VolField<Type>& field,
                     const surfaceScalarField& weights
                 )
                 :
@@ -119,7 +119,7 @@ public:
                 //- Return the interpolation weighting factors
                 tmp<surfaceScalarField> weights
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>&
+                    const VolField<Type>&
                 ) const
                 {
                     return weights_;
@@ -128,7 +128,7 @@ public:
 
         tmp<surfaceInterpolationScheme<Type>> operator()
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field
+            const VolField<Type>& field
         ) const
         {
             return tmp<surfaceInterpolationScheme<Type>>
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
index a602ef5eb4..6ed71cdb69 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ public:
 
                 fieldScheme
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field,
+                    const VolField<Type>& field,
                     const surfaceScalarField& weights
                 )
                 :
@@ -121,7 +121,7 @@ public:
                 //- Return the interpolation weighting factors
                 tmp<surfaceScalarField> weights
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>&
+                    const VolField<Type>&
                 ) const
                 {
                     return weights_;
@@ -130,7 +130,7 @@ public:
 
         tmp<surfaceInterpolationScheme<Type>> operator()
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field
+            const VolField<Type>& field
         ) const
         {
             return tmp<surfaceInterpolationScheme<Type>>
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
index 3e2057833a..7b67777a25 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,14 +58,14 @@ public:
     //- fieldTable
     class fieldTable
     :
-        public HashTable<const GeometricField<Type, fvPatchField, volMesh>*>
+        public HashTable<const VolField<Type>*>
     {
     public:
 
         fieldTable()
         {}
 
-        void add(const GeometricField<Type, fvPatchField, volMesh>& f)
+        void add(const VolField<Type>& f)
         {
             this->insert(f.name(), &f);
         }
@@ -173,7 +173,7 @@ public:
 
                 fieldScheme
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field
+                    const VolField<Type>& field
                 )
                 :
                     surfaceInterpolationScheme<Type>(field.mesh())
@@ -185,13 +185,13 @@ public:
                 //- Return the interpolation weighting factors
                 virtual tmp<surfaceScalarField> weights
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field
+                    const VolField<Type>& field
                 ) const = 0;
         };
 
         virtual tmp<surfaceInterpolationScheme<Type>> operator()
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field
+            const VolField<Type>& field
         ) const = 0;
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
index 681d11d7d4..4a4caf1722 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ public:
 
                 fieldScheme
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field,
+                    const VolField<Type>& field,
                     const surfaceScalarField& faceFlux
                 )
                 :
@@ -125,7 +125,7 @@ public:
                 //- Return the interpolation weighting factors
                 tmp<surfaceScalarField> weights
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>&
+                    const VolField<Type>&
                 ) const
                 {
                     return pos0(faceFlux_);
@@ -134,7 +134,7 @@ public:
 
         tmp<surfaceInterpolationScheme<Type>> operator()
         (
-            const GeometricField<Type, fvPatchField, volMesh>& field
+            const VolField<Type>& field
         ) const
         {
             return tmp<surfaceInterpolationScheme<Type>>
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
index 7abc903f5c..a093ce326c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
@@ -107,7 +107,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index d666e4e091..5bd4a20e5e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -181,7 +181,7 @@ public:
         //- Return the face-based blending factor
         virtual tmp<surfaceScalarField> blendingFactor
         (
-             const GeometricField<Type, fvPatchField, volMesh>& vf
+             const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = this->mesh();
@@ -229,7 +229,7 @@ public:
         tmp<surfaceScalarField>
         weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             surfaceScalarField bf(blendingFactor(vf));
@@ -245,7 +245,7 @@ public:
         tmp<SurfaceField<Type>>
         interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             surfaceScalarField bf(blendingFactor(vf));
@@ -268,7 +268,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             surfaceScalarField bf(blendingFactor(vf));
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
index e048657c16..4d687863df 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
@@ -96,7 +96,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return
@@ -114,7 +114,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             return 0.25*linearUpwind<Type>::correction(vf);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
index cb4b98e692..be88df1409 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
@@ -114,7 +114,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
index 37859b91c8..05e218f57b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
@@ -114,7 +114,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index ad51508e4e..602ad8be8f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -191,7 +191,7 @@ public:
         //- Return the face-based blending factor
         virtual tmp<surfaceScalarField> blendingFactor
         (
-             const GeometricField<Type, fvPatchField, volMesh>& vf
+             const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = this->mesh();
@@ -257,7 +257,7 @@ public:
         tmp<surfaceScalarField>
         weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             surfaceScalarField bf(blendingFactor(vf));
@@ -273,7 +273,7 @@ public:
         tmp<SurfaceField<Type>>
         interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             surfaceScalarField bf(blendingFactor(vf));
@@ -296,7 +296,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             surfaceScalarField bf(blendingFactor(vf));
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
index 1d910df489..5ec7096f18 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
@@ -121,7 +121,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index ed8c0f969a..448dda68cf 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -105,7 +105,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/deferred/deferred.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/deferred/deferred.H
index 7443925509..f47b067220 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/deferred/deferred.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/deferred/deferred.H
@@ -123,7 +123,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             return SurfaceField<Type>::New
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/downwind/downwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/downwind/downwind.H
index eada511753..93690b3d8c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/downwind/downwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/downwind/downwind.H
@@ -114,7 +114,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return neg(faceFlux_);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
index e73bf30a46..c0f19f830a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
@@ -164,7 +164,7 @@ public:
         tmp<surfaceScalarField>
         weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             return
@@ -178,7 +178,7 @@ public:
         tmp<SurfaceField<Type>>
         interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             return
@@ -199,7 +199,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             if (tScheme1_().corrected())
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
index 8999a95561..cf21410f62 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
@@ -100,7 +100,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<scalar, fvPatchField, volMesh>&
+            const VolField<scalar>&
         ) const
         {
             NotImplemented;
@@ -112,7 +112,7 @@ public:
         virtual tmp<SurfaceField<scalar>>
         interpolate
         (
-            const GeometricField<scalar, fvPatchField, volMesh>& vf
+            const VolField<scalar>& vf
         ) const
         {
             return 1.0/(reverseLinear<scalar>(vf.mesh()).interpolate(1.0/vf));
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
index 05a0315bcd..0e568f490e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
@@ -133,7 +133,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             surfaceScalarField blendingFactor
@@ -149,7 +149,7 @@ public:
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
         tmp<SurfaceField<Type>>
-        interpolate(const GeometricField<Type, fvPatchField, volMesh>& vf) const
+        interpolate(const VolField<Type>& vf) const
         {
             surfaceScalarField blendingFactor
             (
@@ -174,7 +174,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             surfaceScalarField blendingFactor
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
index a90b6790ac..c038a00c15 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
@@ -90,7 +90,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return this->mesh().surfaceInterpolation::weights();
@@ -106,7 +106,7 @@ public:
 
 template<class Type>
 tmp<SurfaceField<Type>>
-linearInterpolate(const GeometricField<Type, fvPatchField, volMesh>& vf)
+linearInterpolate(const VolField<Type>& vf)
 {
     return surfaceInterpolationScheme<Type>::interpolate
     (
@@ -118,7 +118,7 @@ linearInterpolate(const GeometricField<Type, fvPatchField, volMesh>& vf)
 
 template<class Type>
 tmp<SurfaceField<Type>>
-linearInterpolate(const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf)
+linearInterpolate(const tmp<VolField<Type>>& tvf)
 {
     tmp<SurfaceField<Type>> tinterp =
         linearInterpolate(tvf());
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
index 2b98d72cd0..8cef8890fd 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
@@ -107,7 +107,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindTemplates.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindTemplates.C
index bd1c4c5d8d..e876f75491 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindTemplates.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindTemplates.C
@@ -70,7 +70,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::linearUpwind<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
index 71f6b70aca..0c5e91cec3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
@@ -107,7 +107,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindVTemplates.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindVTemplates.C
index 15a64c780e..76a8a9b000 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindVTemplates.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindVTemplates.C
@@ -90,7 +90,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::linearUpwindV<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
index 98adefbccf..0a63f8a5e9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
@@ -123,7 +123,7 @@ public:
         //- Return the face-based blending factor
         virtual tmp<surfaceScalarField> blendingFactor
         (
-             const GeometricField<Type, fvPatchField, volMesh>& vf
+             const VolField<Type>& vf
         ) const
         {
             return
@@ -137,7 +137,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const surfaceScalarField& blendingFactor =
@@ -155,7 +155,7 @@ public:
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
         tmp<SurfaceField<Type>>
-        interpolate(const GeometricField<Type, fvPatchField, volMesh>& vf) const
+        interpolate(const VolField<Type>& vf) const
         {
             const surfaceScalarField& blendingFactor =
             (
@@ -184,7 +184,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const surfaceScalarField& blendingFactor =
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
index 16726593dd..38f4d6e439 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
@@ -103,7 +103,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             NotImplemented;
@@ -115,7 +115,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = vf.mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
index 130e269d47..9529573aed 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
@@ -98,7 +98,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             NotImplemented;
@@ -110,7 +110,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = vf.mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
index cd8ee7af8e..bb44edb4dc 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             tmp<surfaceScalarField> taw
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.C
index 128bdd05e5..8e804d4e5d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.C
@@ -34,7 +34,7 @@ template<class Type>
 inline Foam::tmp<Foam::surfaceScalarField>
 Foam::outletStabilised<Type>::weights
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     tmp<surfaceScalarField> tw = tScheme_().weights(vf);
@@ -83,7 +83,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 inline Foam::outletStabilised<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     if (tScheme_().corrected())
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index e276fef659..029567f8e3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -117,7 +117,7 @@ public:
         //- Return the interpolation weighting factors
         inline tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const;
 
         //- Return true if this scheme uses an explicit correction
@@ -131,7 +131,7 @@ public:
         inline virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/phaseStabilised/phaseStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/phaseStabilised/phaseStabilised.H
index bffeed37d3..b4bcd3b272 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/phaseStabilised/phaseStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/phaseStabilised/phaseStabilised.H
@@ -103,7 +103,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const;
 
         //- Return true if this scheme uses an explicit correction
@@ -117,7 +117,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/phaseStabilised/phaseStabilisedTemplates.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/phaseStabilised/phaseStabilisedTemplates.C
index 4897b075bc..7badd8513b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/phaseStabilised/phaseStabilisedTemplates.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/phaseStabilised/phaseStabilisedTemplates.C
@@ -98,7 +98,7 @@ Foam::phaseStabilised<Type>::phaseStabilised
 template<class Type>
 Foam::tmp<Foam::surfaceScalarField> Foam::phaseStabilised<Type>::weights
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const surfaceScalarField lambdaf(this->lambdaf());
@@ -110,7 +110,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::phaseStabilised<Type>::correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     if (tScheme_().corrected())
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
index a26bb51238..8bd4b57ea3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C
@@ -35,7 +35,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::pointLinear<Type>::
 correction
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
index 8dc8fb4e29..ab7fdc5931 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
@@ -108,7 +108,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
index 843facde01..de56cb531e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
@@ -91,7 +91,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             const fvMesh& mesh = this->mesh();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
index 3244a38246..d9ce29dd65 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
@@ -107,7 +107,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             return tScheme_().weights(vf);
@@ -124,7 +124,7 @@ public:
         tmp<SurfaceField<Type>>
         skewCorrection
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             const fvMesh& mesh = this->mesh();
@@ -174,7 +174,7 @@ public:
         virtual tmp<SurfaceField<Type>>
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const
         {
             if
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weighted/weighted.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weighted/weighted.H
index 33957019f3..5385458717 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weighted/weighted.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weighted/weighted.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ public:
         //- Return the interpolation weighting factors
         tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const
         {
             return weights_;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
index 5c40e43be8..313c839aac 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.C
@@ -94,7 +94,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const surfaceScalarField& faceFlux,
     Istream& schemeData
 )
@@ -102,7 +102,7 @@ Foam::fvc::interpolate
     if (surfaceInterpolation::debug)
     {
         InfoInFunction
-            << "interpolating GeometricField<Type, fvPatchField, volMesh> "
+            << "interpolating VolField<Type> "
             << vf.name() << endl;
     }
 
@@ -114,7 +114,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const surfaceScalarField& faceFlux,
     const word& name
 )
@@ -122,7 +122,7 @@ Foam::fvc::interpolate
     if (surfaceInterpolation::debug)
     {
         InfoInFunction
-            << "interpolating GeometricField<Type, fvPatchField, volMesh> "
+            << "interpolating VolField<Type> "
             << vf.name() << " using " << name << endl;
     }
 
@@ -133,7 +133,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const surfaceScalarField& faceFlux,
     const word& name
 )
@@ -150,7 +150,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const tmp<surfaceScalarField>& tFaceFlux,
     const word& name
 )
@@ -167,7 +167,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const tmp<surfaceScalarField>& tFaceFlux,
     const word& name
 )
@@ -186,14 +186,14 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     Istream& schemeData
 )
 {
     if (surfaceInterpolation::debug)
     {
         InfoInFunction
-            << "interpolating GeometricField<Type, fvPatchField, volMesh> "
+            << "interpolating VolField<Type> "
             << vf.name() << endl;
     }
 
@@ -204,14 +204,14 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name
 )
 {
     if (surfaceInterpolation::debug)
     {
         InfoInFunction
-            << "interpolating GeometricField<Type, fvPatchField, volMesh> "
+            << "interpolating VolField<Type> "
             << vf.name() << " using " << name
             << endl;
     }
@@ -223,7 +223,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const word& name
 )
 {
@@ -240,13 +240,13 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     if (surfaceInterpolation::debug)
     {
         InfoInFunction
-            << "interpolating GeometricField<Type, fvPatchField, volMesh> "
+            << "interpolating VolField<Type> "
             << vf.name() << " using run-time selected scheme"
             << endl;
     }
@@ -259,7 +259,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvc::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     tmp<SurfaceField<Type>> tsf =
@@ -321,13 +321,13 @@ Foam::tmp
 Foam::fvc::dotInterpolate
 (
     const surfaceVectorField& Sf,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 )
 {
     if (surfaceInterpolation::debug)
     {
         InfoInFunction
-            << "interpolating GeometricField<Type, fvPatchField, volMesh> "
+            << "interpolating VolField<Type> "
             << vf.name() << " using run-time selected scheme"
             << endl;
     }
@@ -353,7 +353,7 @@ Foam::tmp
 Foam::fvc::dotInterpolate
 (
     const surfaceVectorField& Sf,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 )
 {
     tmp
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
index ee1766a99f..de5738a4b7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H
@@ -90,7 +90,7 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const GeometricField<Type, fvPatchField, volMesh>& tvf,
+        const VolField<Type>& tvf,
         const surfaceScalarField& faceFlux,
         Istream& schemeData
     );
@@ -99,7 +99,7 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const GeometricField<Type, fvPatchField, volMesh>& tvf,
+        const VolField<Type>& tvf,
         const surfaceScalarField& faceFlux,
         const word& name
     );
@@ -108,7 +108,7 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+        const tmp<VolField<Type>>& tvf,
         const surfaceScalarField& faceFlux,
         const word& name
     );
@@ -117,7 +117,7 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const GeometricField<Type, fvPatchField, volMesh>& tvf,
+        const VolField<Type>& tvf,
         const tmp<surfaceScalarField>& faceFlux,
         const word& name
     );
@@ -126,7 +126,7 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+        const tmp<VolField<Type>>& tvf,
         const tmp<surfaceScalarField>& faceFlux,
         const word& name
     );
@@ -136,7 +136,7 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const GeometricField<Type, fvPatchField, volMesh>& tvf,
+        const VolField<Type>& tvf,
         Istream& schemeData
     );
 
@@ -144,7 +144,7 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const GeometricField<Type, fvPatchField, volMesh>& tvf,
+        const VolField<Type>& tvf,
         const word& name
     );
 
@@ -152,7 +152,7 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+        const tmp<VolField<Type>>& tvf,
         const word& name
     );
 
@@ -161,14 +161,14 @@ namespace fvc
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const GeometricField<Type, fvPatchField, volMesh>& tvf
+        const VolField<Type>& tvf
     );
 
     //- Interpolate tmp field onto faces using 'interpolate(\<name\>)'
     template<class Type>
     static tmp<SurfaceField<Type>> interpolate
     (
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+        const tmp<VolField<Type>>& tvf
     );
 
 
@@ -208,7 +208,7 @@ namespace fvc
     > dotInterpolate
     (
         const surfaceVectorField& Sf,
-        const GeometricField<Type, fvPatchField, volMesh>& tvf
+        const VolField<Type>& tvf
     );
 
     //- Interpolate tmp field onto faces
@@ -226,7 +226,7 @@ namespace fvc
     > dotInterpolate
     (
         const surfaceVectorField& Sf,
-        const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+        const tmp<VolField<Type>>& tvf
     );
 }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 0d1f3b8697..6edfe694d4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -138,7 +138,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const tmp<surfaceScalarField>& tlambdas,
     const tmp<surfaceScalarField>& tys
 )
@@ -226,7 +226,7 @@ Foam::tmp
 Foam::surfaceInterpolationScheme<Type>::dotInterpolate
 (
     const SFType& Sf,
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const tmp<surfaceScalarField>& tlambdas
 )
 {
@@ -309,7 +309,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const tmp<surfaceScalarField>& tlambdas
 )
 {
@@ -330,7 +330,7 @@ Foam::tmp
 Foam::surfaceInterpolationScheme<Type>::dotInterpolate
 (
     const surfaceVectorField& Sf,
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     if (surfaceInterpolation::debug)
@@ -375,7 +375,7 @@ Foam::tmp
 Foam::surfaceInterpolationScheme<Type>::dotInterpolate
 (
     const surfaceVectorField& Sf,
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 ) const
 {
     tmp
@@ -396,7 +396,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     if (surfaceInterpolation::debug)
@@ -425,7 +425,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::surfaceInterpolationScheme<Type>::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 ) const
 {
     tmp<SurfaceField<Type>> tinterpVf
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index 33c13a9909..61d90836b9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -146,7 +146,7 @@ public:
         static tmp<SurfaceField<Type>>
         interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const tmp<surfaceScalarField>&,
             const tmp<surfaceScalarField>&
         );
@@ -166,7 +166,7 @@ public:
         dotInterpolate
         (
             const SFType& Sf,
-            const GeometricField<Type, fvPatchField, volMesh>& vf,
+            const VolField<Type>& vf,
             const tmp<surfaceScalarField>& tlambdas
         );
 
@@ -175,14 +175,14 @@ public:
         static tmp<SurfaceField<Type>>
         interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>&,
+            const VolField<Type>&,
             const tmp<surfaceScalarField>&
         );
 
         //- Return the interpolation weighting factors for the given field
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const = 0;
 
         //- Return true if this scheme uses an explicit correction
@@ -194,7 +194,7 @@ public:
         //- Return the explicit correction to the face-interpolate
         //  for the given field
         virtual tmp<SurfaceField<Type>>
-        correction(const GeometricField<Type, fvPatchField, volMesh>&) const
+        correction(const VolField<Type>&) const
         {
             return tmp<SurfaceField<Type>>
             (
@@ -217,7 +217,7 @@ public:
         dotInterpolate
         (
             const surfaceVectorField& Sf,
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const VolField<Type>& vf
         ) const;
 
         //- Return the face-interpolate of the given tmp cell field
@@ -234,20 +234,20 @@ public:
         dotInterpolate
         (
             const surfaceVectorField& Sf,
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         ) const;
 
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
         virtual tmp<SurfaceField<Type>>
-        interpolate(const GeometricField<Type, fvPatchField, volMesh>&) const;
+        interpolate(const VolField<Type>&) const;
 
         //- Return the face-interpolate of the given tmp cell field
         //  with explicit correction
         tmp<SurfaceField<Type>>
         interpolate
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         ) const;
 
 
@@ -271,7 +271,7 @@ tmp
 surfaceInterpolationScheme<scalar>::dotInterpolate
 (
     const surfaceVectorField& Sf,
-    const GeometricField<scalar, fvPatchField, volMesh>&
+    const VolField<scalar>&
 ) const;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
index 5b88696c33..93a7bd281e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ Foam::tmp
 Foam::surfaceInterpolationScheme<Foam::scalar>::dotInterpolate
 (
     const surfaceVectorField& Sf,
-    const GeometricField<scalar, fvPatchField, volMesh>&
+    const VolField<scalar>&
 ) const
 {
     NotImplemented;
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index b6f3caba65..28de401d53 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -126,14 +126,14 @@ void Foam::volPointInterpolation::addSeparated
 template<class Type>
 void Foam::volPointInterpolation::interpolateInternalField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     PointField<Type>& pf
 ) const
 {
     if (debug)
     {
         Pout<< "volPointInterpolation::interpolateInternalField("
-            << "const GeometricField<Type, fvPatchField, volMesh>&, "
+            << "const VolField<Type>&, "
             << "PointField<Type>&) : "
             << "interpolating field from cells to points"
             << endl;
@@ -163,7 +163,7 @@ void Foam::volPointInterpolation::interpolateInternalField
 template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::volPointInterpolation::flatBoundaryField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     const fvMesh& mesh = vf.mesh();
@@ -210,7 +210,7 @@ Foam::tmp<Foam::Field<Type>> Foam::volPointInterpolation::flatBoundaryField
 template<class Type>
 void Foam::volPointInterpolation::interpolateBoundaryField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     PointField<Type>& pf
 ) const
 {
@@ -328,7 +328,7 @@ void Foam::volPointInterpolation::interpolateBoundaryField
 template<class Type>
 void Foam::volPointInterpolation::interpolateBoundaryField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     PointField<Type>& pf,
     const bool overrideFixedValue
 ) const
@@ -345,14 +345,14 @@ void Foam::volPointInterpolation::interpolateBoundaryField
 template<class Type>
 void Foam::volPointInterpolation::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     PointField<Type>& pf
 ) const
 {
     if (debug)
     {
         Pout<< "volPointInterpolation::interpolate("
-            << "const GeometricField<Type, fvPatchField, volMesh>&, "
+            << "const VolField<Type>&, "
             << "PointField<Type>&) : "
             << "interpolating field from cells to points"
             << endl;
@@ -369,7 +369,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const wordList& patchFieldTypes
 ) const
 {
@@ -400,7 +400,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
+    const tmp<VolField<Type>>& tvf,
     const wordList& patchFieldTypes
 ) const
 {
@@ -416,7 +416,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name,
     const bool cache
 ) const
@@ -506,7 +506,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return interpolate(vf, "volPointInterpolate(" + vf.name() + ')', false);
@@ -517,7 +517,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 ) const
 {
     // Construct tmp<pointField>
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index 65588e1a93..049d9a4fc0 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -117,7 +117,7 @@ public:
         template<class Type>
         tmp<PointField<Type>> interpolate
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         //- Interpolate tmp<volField> using inverse distance weighting
@@ -125,7 +125,7 @@ public:
         template<class Type>
         tmp<PointField<Type>> interpolate
         (
-            const tmp<GeometricField<Type, fvPatchField, volMesh>>&
+            const tmp<VolField<Type>>&
         ) const;
 
 
@@ -136,7 +136,7 @@ public:
             template<class Type>
             void interpolateUnconstrained
             (
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 PointField<Type>&
             ) const;
 
@@ -145,7 +145,7 @@ public:
             template<class Type>
             void interpolate
             (
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 PointField<Type>&
             ) const;
 
@@ -154,7 +154,7 @@ public:
             template<class Type>
             tmp<PointField<Type>> interpolate
             (
-                const GeometricField<Type, fvPatchField, volMesh>&,
+                const VolField<Type>&,
                 const word& name,
                 const bool cache
             ) const;
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolationTemplates.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolationTemplates.C
index 0505547cb4..2db94fa65f 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolationTemplates.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolationTemplates.C
@@ -38,14 +38,14 @@ License
 template<class Type>
 void Foam::volPointInterpolation::interpolateUnconstrained
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     PointField<Type>& pf
 ) const
 {
     if (debug)
     {
         Pout<< "volPointInterpolation::interpolateUnconstrained("
-            << "const GeometricField<Type, fvPatchField, volMesh>&, "
+            << "const VolField<Type>&, "
             << "PointField<Type>&) : "
             << "interpolating field from cells to points"
             << endl;
@@ -80,9 +80,9 @@ void Foam::volPointInterpolation::interpolateUnconstrained
     }
 
     // Get the boundary neighbour field
-    const typename GeometricField<Type, fvPatchField, volMesh>::Boundary vfBnf
+    const typename VolField<Type>::Boundary vfBnf
     (
-        GeometricField<Type, fvPatchField, volMesh>::null(),
+        VolField<Type>::null(),
         vf.boundaryField().boundaryNeighbourField()
     );
 
@@ -138,7 +138,7 @@ void Foam::volPointInterpolation::interpolateUnconstrained
 template<class Type>
 void Foam::volPointInterpolation::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     PointField<Type>& pf
 ) const
 {
@@ -153,7 +153,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const VolField<Type>& vf,
     const word& name,
     const bool cache
 ) const
@@ -241,7 +241,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vf
+    const VolField<Type>& vf
 ) const
 {
     return interpolate(vf, "volPointInterpolate(" + vf.name() + ')', false);
@@ -252,7 +252,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::volPointInterpolation::interpolate
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
+    const tmp<VolField<Type>>& tvf
 ) const
 {
     tmp<PointField<Type>> tpf =
diff --git a/src/fvConstraints/limitMag/limitMag.C b/src/fvConstraints/limitMag/limitMag.C
index e8900121e7..ed349b0d6b 100644
--- a/src/fvConstraints/limitMag/limitMag.C
+++ b/src/fvConstraints/limitMag/limitMag.C
@@ -56,7 +56,7 @@ void Foam::fv::limitMag::readCoeffs()
 template<class Type>
 inline bool Foam::fv::limitMag::constrainType
 (
-    GeometricField<Type, fvPatchField, volMesh>& psi
+    VolField<Type>& psi
 ) const
 {
     const scalar maxSqrPsi = sqr(max_);
@@ -80,7 +80,7 @@ inline bool Foam::fv::limitMag::constrainType
     // handle boundaries in the case of 'all'
     if (set_.selectionMode() == fvCellSet::selectionModeType::all)
     {
-        typename GeometricField<Type, fvPatchField, volMesh>::Boundary& psibf =
+        typename VolField<Type>::Boundary& psibf =
             psi.boundaryFieldRef();
 
         forAll(psibf, patchi)
diff --git a/src/fvConstraints/limitMag/limitMag.H b/src/fvConstraints/limitMag/limitMag.H
index 6e4ec4bd51..ef7c4eca38 100644
--- a/src/fvConstraints/limitMag/limitMag.H
+++ b/src/fvConstraints/limitMag/limitMag.H
@@ -89,7 +89,7 @@ class limitMag
         template<class Type>
         inline bool constrainType
         (
-            GeometricField<Type, fvPatchField, volMesh>& psi
+            VolField<Type>& psi
         ) const;
 
 
diff --git a/src/fvMeshTopoChangers/meshToMesh/MeshToMeshMapGeometricFields.H b/src/fvMeshTopoChangers/meshToMesh/MeshToMeshMapGeometricFields.H
index d09eee4429..c14807b2cd 100644
--- a/src/fvMeshTopoChangers/meshToMesh/MeshToMeshMapGeometricFields.H
+++ b/src/fvMeshTopoChangers/meshToMesh/MeshToMeshMapGeometricFields.H
@@ -47,9 +47,9 @@ namespace Foam
 {
 
 template<class Type>
-void evaluateConstraintTypes(GeometricField<Type, fvPatchField, volMesh>& fld)
+void evaluateConstraintTypes(VolField<Type>& fld)
 {
-    typename GeometricField<Type, fvPatchField, volMesh>::
+    typename VolField<Type>::
         Boundary& fldBf = fld.boundaryFieldRef();
 
     if
@@ -135,23 +135,23 @@ void MeshToMeshMapVolFields
     const fvMeshToFvMesh& mapper
 )
 {
-    HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fields
+    HashTable<const VolField<Type>*> fields
     (
         mesh.objectRegistry::template
-            lookupClass<GeometricField<Type, fvPatchField, volMesh>>()
+            lookupClass<VolField<Type>>()
     );
 
     // Deleted old time fields
     for
     (
-        typename HashTable<const GeometricField<Type, fvPatchField, volMesh>*>::
+        typename HashTable<const VolField<Type>*>::
             iterator fieldIter = fields.begin();
         fieldIter != fields.end();
         ++fieldIter
     )
     {
-        GeometricField<Type, fvPatchField, volMesh>& field =
-            const_cast<GeometricField<Type, fvPatchField, volMesh>&>
+        VolField<Type>& field =
+            const_cast<VolField<Type>&>
             (*fieldIter());
 
         field.clearOldTimes();
@@ -160,19 +160,19 @@ void MeshToMeshMapVolFields
     fields =
     (
         mesh.objectRegistry::template
-            lookupClass<GeometricField<Type, fvPatchField, volMesh>>()
+            lookupClass<VolField<Type>>()
     );
 
     for
     (
-        typename HashTable<const GeometricField<Type, fvPatchField, volMesh>*>::
+        typename HashTable<const VolField<Type>*>::
             iterator fieldIter = fields.begin();
         fieldIter != fields.end();
         ++fieldIter
     )
     {
-        GeometricField<Type, fvPatchField, volMesh>& field =
-            const_cast<GeometricField<Type, fvPatchField, volMesh>&>
+        VolField<Type>& field =
+            const_cast<VolField<Type>&>
             (*fieldIter());
 
         if (fvMeshToFvMesh::debug)
diff --git a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
index 2b2c682f7b..cf4f5b63f0 100644
--- a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
+++ b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
@@ -66,7 +66,7 @@ void Foam::fv::phaseLimitStabilisation::addSupType
     const word& fieldName
 ) const
 {
-    const GeometricField<Type, fvPatchField, volMesh>& psi = eqn.psi();
+    const VolField<Type>& psi = eqn.psi();
 
     uniformDimensionedScalarField& rate =
         mesh().lookupObjectRef<uniformDimensionedScalarField>(rateName_);
diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
index 4ebb6614b3..7bce76ef40 100644
--- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
+++ b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
@@ -98,9 +98,9 @@ void Foam::fv::semiImplicitSource::addSupType
 
     const scalar t = mesh().time().userTimeValue();
 
-    const GeometricField<Type, fvPatchField, volMesh>& psi = eqn.psi();
+    const VolField<Type>& psi = eqn.psi();
 
-    typename GeometricField<Type, fvPatchField, volMesh>::Internal Su
+    typename VolField<Type>::Internal Su
     (
         IOobject
         (
diff --git a/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index 0417eed391..d293e28d08 100644
--- a/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -152,7 +152,7 @@ bool Foam::AveragingMethod<Type>::write(const bool write) const
     Field<scalar> pointVolume(mesh_.nPoints(), 0);
 
     // output fields
-    GeometricField<Type, fvPatchField, volMesh> cellValue
+    VolField<Type> cellValue
     (
         IOobject
         (
@@ -163,7 +163,7 @@ bool Foam::AveragingMethod<Type>::write(const bool write) const
         mesh_,
         dimensioned<Type>("zero", dimless, Zero)
     );
-    GeometricField<GradType, fvPatchField, volMesh> cellGrad
+    VolField<GradType> cellGrad
     (
         IOobject
         (
diff --git a/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Basic/Basic.C b/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Basic/Basic.C
index 282be2c746..e9ca0fcb6f 100644
--- a/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Basic/Basic.C
+++ b/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Basic/Basic.C
@@ -66,7 +66,7 @@ Foam::AveragingMethods::Basic<Type>::~Basic()
 template<class Type>
 void Foam::AveragingMethods::Basic<Type>::updateGrad()
 {
-    GeometricField<Type, fvPatchField, volMesh> tempData
+    VolField<Type> tempData
     (
         IOobject
         (
diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H
index 69d98c03f8..680ed2e638 100644
--- a/src/sampling/probes/patchProbes.H
+++ b/src/sampling/probes/patchProbes.H
@@ -70,7 +70,7 @@ class patchProbes
         template<class Type>
         void sampleAndWrite
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
@@ -96,7 +96,7 @@ class patchProbes
         template<class Type>
         tmp<Field<Type>> sample
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
 
diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C
index 56ff87e989..6eedc1a957 100644
--- a/src/sampling/probes/patchProbesTemplates.C
+++ b/src/sampling/probes/patchProbesTemplates.C
@@ -33,7 +33,7 @@ License
 template<class Type>
 void Foam::patchProbes::sampleAndWrite
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 )
 {
     Field<Type> values(sample(vField));
@@ -96,13 +96,13 @@ void Foam::patchProbes::sampleAndWrite
         (
             iter != objectRegistry::end()
          && iter()->type()
-         == GeometricField<Type, fvPatchField, volMesh>::typeName
+         == VolField<Type>::typeName
         )
         {
             sampleAndWrite
             (
                 mesh_.lookupObject
-                <GeometricField<Type, fvPatchField, volMesh>>
+                <VolField<Type>>
                 (
                     fields[fieldi]
                 )
@@ -148,7 +148,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::patchProbes::sample
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 ) const
 {
     const Type unsetVal(-vGreat*pTraits<Type>::one);
@@ -187,7 +187,7 @@ Foam::patchProbes::sample(const word& fieldName) const
 {
     return sample
     (
-        mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh>>
+        mesh_.lookupObject<VolField<Type>>
         (
             fieldName
         )
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 46c14cc6d9..0e5514e52f 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -158,7 +158,7 @@ private:
         template<class Type>
         void sampleAndWrite
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         );
 
 
@@ -251,7 +251,7 @@ public:
         template<class Type>
         tmp<Field<Type>> sample
         (
-            const GeometricField<Type, fvPatchField, volMesh>&
+            const VolField<Type>&
         ) const;
 
         //- Sample a single vol field on all sample locations
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index c65d325519..99d4785a97 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -66,7 +66,7 @@ public:
 template<class Type>
 void Foam::probes::sampleAndWrite
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 )
 {
     Field<Type> values(sample(vField));
@@ -126,13 +126,13 @@ void Foam::probes::sampleAndWrite(const fieldGroup<Type>& fields)
         (
             iter != objectRegistry::end()
          && iter()->type()
-         == GeometricField<Type, fvPatchField, volMesh>::typeName
+         == VolField<Type>::typeName
         )
         {
             sampleAndWrite
             (
                 mesh_.lookupObject
-                <GeometricField<Type, fvPatchField, volMesh>>
+                <VolField<Type>>
                 (
                     fields[fieldi]
                 )
@@ -175,7 +175,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::probes::sample
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 ) const
 {
     const Type unsetVal(-vGreat*pTraits<Type>::one);
@@ -233,7 +233,7 @@ Foam::probes::sample(const word& fieldName) const
 {
     return sample
     (
-        mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh>>
+        mesh_.lookupObject<VolField<Type>>
         (
             fieldName
         )
diff --git a/src/sampling/sampledSurface/sampledIsoSurfaceSurface/sampledIsoSurfaceSurface.H b/src/sampling/sampledSurface/sampledIsoSurfaceSurface/sampledIsoSurfaceSurface.H
index 4cd5d289c9..912fbe3196 100644
--- a/src/sampling/sampledSurface/sampledIsoSurfaceSurface/sampledIsoSurfaceSurface.H
+++ b/src/sampling/sampledSurface/sampledIsoSurfaceSurface/sampledIsoSurfaceSurface.H
@@ -79,7 +79,7 @@ private:
         template<class Type>
         tmp<Field<Type>> sampleField
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vField
+            const VolField<Type>& vField
         ) const;
 
         //- Interpolate field to the surface's points
diff --git a/src/sampling/sampledSurface/sampledIsoSurfaceSurface/sampledIsoSurfaceSurfaceTemplates.C b/src/sampling/sampledSurface/sampledIsoSurfaceSurface/sampledIsoSurfaceSurfaceTemplates.C
index 09fa12b399..dda9e902f1 100644
--- a/src/sampling/sampledSurface/sampledIsoSurfaceSurface/sampledIsoSurfaceSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledIsoSurfaceSurface/sampledIsoSurfaceSurfaceTemplates.C
@@ -32,7 +32,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::sampledSurfaces::sampledIsoSurfaceSurface::sampleField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 ) const
 {
     update();
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
index 8c5f0f2916..e43fc3eafe 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
@@ -107,7 +107,7 @@ class patch
         template<class Type>
         tmp<Field<Type>> sampleField
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vField
+            const VolField<Type>& vField
         ) const;
 
         //- Sample surface field on faces
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
index 9699bbc36a..8409b2db11 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
@@ -31,7 +31,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::sampledSurfaces::patch::sampleField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 ) const
 {
     // One value per face
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
index 394b1abdf3..f2ecea19b4 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
@@ -70,7 +70,7 @@ class patchInternalField
         template<class Type>
         tmp<Field<Type>> sampleField
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vField
+            const VolField<Type>& vField
         ) const;
 
         template<class Type>
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
index 6d13a6cf6e..48bf34a8b3 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
@@ -33,7 +33,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::sampledSurfaces::patchInternalField::sampleField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 ) const
 {
     // One value per face
diff --git a/src/sampling/sampledSurface/sampledThresholdCellFaces/sampledThresholdCellFaces.H b/src/sampling/sampledSurface/sampledThresholdCellFaces/sampledThresholdCellFaces.H
index 40ffc054e9..d9658dd582 100644
--- a/src/sampling/sampledSurface/sampledThresholdCellFaces/sampledThresholdCellFaces.H
+++ b/src/sampling/sampledSurface/sampledThresholdCellFaces/sampledThresholdCellFaces.H
@@ -115,7 +115,7 @@ class thresholdCellFaces
         template<class Type>
         tmp<Field<Type>> sampleField
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vField
+            const VolField<Type>& vField
         ) const;
 
 
diff --git a/src/sampling/sampledSurface/sampledThresholdCellFaces/sampledThresholdCellFacesTemplates.C b/src/sampling/sampledSurface/sampledThresholdCellFaces/sampledThresholdCellFacesTemplates.C
index 31130d36f5..4a5ef26e79 100644
--- a/src/sampling/sampledSurface/sampledThresholdCellFaces/sampledThresholdCellFacesTemplates.C
+++ b/src/sampling/sampledSurface/sampledThresholdCellFaces/sampledThresholdCellFacesTemplates.C
@@ -32,7 +32,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::sampledSurfaces::thresholdCellFaces::sampleField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 ) const
 {
     // Recreate geometry if time has changed
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index 67c9641b2a..b9c09f3df2 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,7 +158,7 @@ private:
         template<class Type>
         tmp<Field<Type>> sampleField
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vField
+            const VolField<Type>& vField
         ) const;
 
 
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
index 1aa8a2370e..37f21ff580 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::sampledSurfaces::triSurfaceMesh::sampleField
 (
-    const GeometricField<Type, fvPatchField, volMesh>& vField
+    const VolField<Type>& vField
 ) const
 {
     // One value per face
diff --git a/src/surfaceFilmModels/surfaceFilm/surfaceFilmTemplates.C b/src/surfaceFilmModels/surfaceFilm/surfaceFilmTemplates.C
index c92b8fae58..d6977045b0 100644
--- a/src/surfaceFilmModels/surfaceFilm/surfaceFilmTemplates.C
+++ b/src/surfaceFilmModels/surfaceFilm/surfaceFilmTemplates.C
@@ -87,7 +87,7 @@ template<class Type>
 void Foam::surfaceFilm::toRegion
 (
     Field<Type>& rf,
-    const typename GeometricField<Type, fvPatchField, volMesh>::Boundary& pBf
+    const typename VolField<Type>::Boundary& pBf
 ) const
 {
     forAll(intCoupledPatchIDs_, i)
diff --git a/src/twoPhaseModels/interfaceCompression/MPLIC/MPLIC.C b/src/twoPhaseModels/interfaceCompression/MPLIC/MPLIC.C
index 88df22b1f6..d7fc6c1e35 100644
--- a/src/twoPhaseModels/interfaceCompression/MPLIC/MPLIC.C
+++ b/src/twoPhaseModels/interfaceCompression/MPLIC/MPLIC.C
@@ -228,7 +228,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::MPLIC::surfaceAlpha
 
 Foam::tmp<Foam::surfaceScalarField> Foam::MPLIC::interpolate
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& vf
+    const VolField<scalar>& vf
 ) const
 {
     tmp<surfaceScalarField> tvff(upwind<scalar>(mesh(), phi_).interpolate(vf));
diff --git a/src/twoPhaseModels/interfaceCompression/MPLIC/MPLIC.H b/src/twoPhaseModels/interfaceCompression/MPLIC/MPLIC.H
index 584e8f6ac3..35490a1720 100644
--- a/src/twoPhaseModels/interfaceCompression/MPLIC/MPLIC.H
+++ b/src/twoPhaseModels/interfaceCompression/MPLIC/MPLIC.H
@@ -143,7 +143,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<scalar, fvPatchField, volMesh>&
+            const VolField<scalar>&
         ) const
         {
             NotImplemented;
@@ -154,7 +154,7 @@ public:
         //- Return the face-interpolate of the given cell field
         virtual tmp<surfaceScalarField> interpolate
         (
-            const GeometricField<scalar, fvPatchField, volMesh>& vf
+            const VolField<scalar>& vf
         ) const;
 
 
diff --git a/src/twoPhaseModels/interfaceCompression/MPLIC/MPLICU.C b/src/twoPhaseModels/interfaceCompression/MPLIC/MPLICU.C
index a5165a8237..0b92418809 100644
--- a/src/twoPhaseModels/interfaceCompression/MPLIC/MPLICU.C
+++ b/src/twoPhaseModels/interfaceCompression/MPLIC/MPLICU.C
@@ -42,7 +42,7 @@ namespace Foam
 
 Foam::tmp<Foam::surfaceScalarField> Foam::MPLICU::interpolate
 (
-    const GeometricField<scalar, fvPatchField, volMesh>& vf
+    const VolField<scalar>& vf
 ) const
 {
     tmp<surfaceScalarField> tvff(upwind<scalar>(mesh(), phi_).interpolate(vf));
diff --git a/src/twoPhaseModels/interfaceCompression/MPLIC/MPLICU.H b/src/twoPhaseModels/interfaceCompression/MPLIC/MPLICU.H
index f9708e0751..6746780b99 100644
--- a/src/twoPhaseModels/interfaceCompression/MPLIC/MPLICU.H
+++ b/src/twoPhaseModels/interfaceCompression/MPLIC/MPLICU.H
@@ -113,7 +113,7 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<scalar, fvPatchField, volMesh>& vf
+            const VolField<scalar>& vf
         ) const
         {
             NotImplemented;
@@ -124,7 +124,7 @@ public:
         //- Return the face-interpolate of the given cell field
         virtual tmp<surfaceScalarField> interpolate
         (
-            const GeometricField<scalar, fvPatchField, volMesh>& vf
+            const VolField<scalar>& vf
         ) const;