diff --git a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H
index 584be00b5e..a332be8284 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H
@@ -29,7 +29,7 @@ if (mesh.changing())
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H
index a49eebc7ea..a206c943cd 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H
@@ -29,7 +29,7 @@ if (mesh.changing())
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index c67ccb8558..3561e0c21f 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -57,7 +57,7 @@
                     ),
                     solidRegions[i],
                     dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
-                    zeroGradientFvPatchSymmTensorField::typeName
+                    fvPatchFieldBase::zeroGradientType()
                 )
             );
 
diff --git a/applications/solvers/heatTransfer/solidFoam/createFields.H b/applications/solvers/heatTransfer/solidFoam/createFields.H
index 15f9bc5b89..85fc531010 100644
--- a/applications/solvers/heatTransfer/solidFoam/createFields.H
+++ b/applications/solvers/heatTransfer/solidFoam/createFields.H
@@ -34,7 +34,7 @@ if (!thermo.isotropic())
             ),
             mesh,
             dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
-            zeroGradientFvPatchSymmTensorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     volSymmTensorField& aniAlpha = *taniAlpha;
diff --git a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
index ed9c1cf119..8c692c1378 100644
--- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
@@ -24,7 +24,7 @@ if (mesh.changing())
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
index 15ad317bbd..e1181ad8e8 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
             ),
             mesh,
             dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index 4cf685ac88..fd44a95fa2 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
             ),
             mesh,
             dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
diff --git a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
index b4fe66c5c4..c31a1ea19a 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
+++ b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
             ),
             mesh,
             dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
diff --git a/applications/solvers/multiphase/MPPICInterFoam/createFields.H b/applications/solvers/multiphase/MPPICInterFoam/createFields.H
index d6ed1cee07..1c93103b6e 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/createFields.H
+++ b/applications/solvers/multiphase/MPPICInterFoam/createFields.H
@@ -64,8 +64,7 @@ volScalarField mu
         mesh,
         IOobject::READ_IF_PRESENT
     ),
-    mixture.mu(),
-    calculatedFvPatchScalarField::typeName
+    mixture.mu()
 );
 
 
@@ -139,7 +138,7 @@ volScalarField alphac
     ),
     mesh,
     dimensionedScalar(dimless, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );
 alphac.oldTime();
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H
index a602fd4843..0e23e02ebf 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H
@@ -1,7 +1,7 @@
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     for (label i=0; i<p.boundaryField().size(); i++)
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
index 71e6bd708f..c468f145e9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@@ -140,7 +140,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
         ),
         mesh,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     curTimeIndex_(-1)
 {
diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
index fe72321c03..bbec48e812 100644
--- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
+++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
@@ -105,8 +105,7 @@ incompressibleTwoPhaseInteractingMixture
             U_.db()
         ),
         U_.mesh(),
-        dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero)
     )
 {
     correct();
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
index 2cdf9d7626..dc36b96e6a 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -48,7 +48,7 @@ Foam::wordList Foam::relativeVelocityModel::UdmPatchFieldTypes() const
     wordList UdmTypes
     (
         U.boundaryField().size(),
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     forAll(U.boundaryField(), i)
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
index 8f49f07ad5..34bccb8193 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
@@ -119,8 +119,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture
             U.db()
         ),
         U.mesh(),
-        dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
     ),
 
     nuModel1_
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
index 658a8bcaf7..7df3631b04 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
@@ -27,7 +27,7 @@
     wordList pcorrTypes
     (
         p_rgh.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     for (label i=0; i<p_rgh.boundaryField().size(); i++)
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index f5c7886eb2..c0790b9698 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -76,7 +76,7 @@
                 mesh
             ),
             fluid.dragCoeff(phase, dragCoeffs())/phase.rho(),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         dragCoeffi.correctBoundaryConditions();
 
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index 2c4b032e15..1e2cec4467 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -41,7 +41,6 @@ Description
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
 #include "fvCFD.H"
-#include "zeroGradientFvPatchFields.H"
 #include "Random.H"
 
 using namespace Foam;
@@ -93,7 +92,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     Info<< "Writing one field "
         << one.name() << " in " << runTime.timeName() << endl;
@@ -131,8 +130,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
     );
     Info<< "Writing surface one field "
         << surfaceOne.name() << " in " << runTime.timeName() << endl;
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 80fe365213..dd34e6608d 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -41,7 +41,6 @@ Description
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
 #include "Random.H"
-#include "zeroGradientFvPatchFields.H"
 #include "calculatedPointPatchFields.H"
 #include "pointConstraints.H"
 #include "fvCFD.H"
@@ -99,7 +98,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     Info<< "Writing one field "
         << one.name() << " in " << runTime.timeName() << endl;
@@ -137,8 +136,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
     );
     Info<< "Writing surface one field "
         << surfaceOne.name() << " in " << runTime.timeName() << endl;
@@ -157,8 +155,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         pointMesh::New(mesh),
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedPointPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
     );
     pointX.primitiveFieldRef() = mesh.points().component(0);
     pointX.correctBoundaryConditions();
diff --git a/applications/test/mappedPatch/Test-MappedPatch.C b/applications/test/mappedPatch/Test-MappedPatch.C
index b01995d89a..c54fb26426 100644
--- a/applications/test/mappedPatch/Test-MappedPatch.C
+++ b/applications/test/mappedPatch/Test-MappedPatch.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
     wordList patchFieldTypes
     (
         mesh.boundaryMesh().size(),
-        calculatedFvPatchVectorField::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     forAll(mesh.boundaryMesh(), patchi)
diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C
index 80960234ab..8979532bbd 100644
--- a/applications/test/volField/Test-volField.C
+++ b/applications/test/volField/Test-volField.C
@@ -185,7 +185,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensioned<symmTensor>(dimless, symmTensor::one),
-        zeroGradientFvPatchSymmTensorField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     volTensorField tensf
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensioned<tensor>(dimless, tensor(1,2,3,4,5,6,7,8,9)),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     SolverPerformance<symmTensor> sP =
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index d2e9024d75..48c0a68a63 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -98,8 +98,8 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
             IOobject::NO_WRITE
         ),
         mesh_,
-        dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, 1.0),
+        fvPatchFieldBase::zeroGradientType()
     );
 
     const conformationSurfaces& geometry = geometryToConformTo_;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 02de7ee380..ce24d32602 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -1098,7 +1098,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
             ),
             mesh,
             dimensionedScalar(dimLength, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         scalarField& cellSize = targetCellSize.primitiveFieldRef();
@@ -1124,7 +1124,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar(dimLength, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
         // );
 
         // targetCellVolume.primitiveFieldRef() = pow3(cellSize);
@@ -1143,7 +1143,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar(dimVolume, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
         // );
 
         // actualCellVolume.primitiveFieldRef() = mesh.cellVolumes();
@@ -1162,7 +1162,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar(dimLength, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
         // );
 
         // equivalentCellSize.primitiveFieldRef() = pow
@@ -1240,11 +1240,12 @@ void Foam::conformalVoronoiMesh::writeCellAlignments
 //            mesh.polyMesh::instance(),
 //            mesh,
 //            IOobject::NO_READ,
-//            IOobject::AUTO_WRITE
+//            IOobject::NO_WRITE,
+//            IOobject::NO_REGISTER
 //        ),
 //        mesh,
 //        tensor::I,
-//        zeroGradientFvPatchTensorField::typeName
+//        fvPatchFieldBase::zeroGradientType()
 //    );
 //
 //    tensorField& cellAlignment = cellAlignments.primitiveFieldRef();
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
index d229823c2b..e2bc74dfb6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
@@ -79,8 +79,8 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
                 IOobject::NO_WRITE
             ),
             bMesh,
-            dimensionedScalar("weight", dimless, 1e-2),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, 1e-2),
+            fvPatchFieldBase::zeroGradientType()
         );
 
         meshSearch cellSearch(bMesh, polyMesh::FACE_PLANES);
diff --git a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
index 690fba9c5e..c16334b9e3 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
@@ -2,7 +2,6 @@
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "polyMeshTools.H"
-#include "zeroGradientFvPatchFields.H"
 #include "syncTools.H"
 #include "tetrahedron.H"
 #include "regionSplit.H"
@@ -138,8 +137,7 @@ void writeSurfaceField
             IOobject::NO_REGISTER
         ),
         mesh,
-        dimensionedScalar(dimless, Zero),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar(dimless, Zero)
     );
     fld.primitiveFieldRef() = faceData;
     //fld.correctBoundaryConditions();
@@ -197,8 +195,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
         );
         //- Take max
         maxFaceToCell(nonOrthoAngle, cellNonOrthoAngle);
@@ -235,7 +232,7 @@ void Foam::writeFields
             wordList                                // wanted bc types
             (
                 mesh.boundary().size(),
-                calculatedFvPatchScalarField::typeName
+                fvPatchFieldBase::calculatedType()
             ),
             mesh.weights().boundaryField().types()  // current bc types
         );
@@ -283,8 +280,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
         );
         //- Take max
         maxFaceToCell(faceSkewness, cellSkewness);
@@ -321,7 +317,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         cellDeterminant.primitiveFieldRef() =
             primitiveMeshTools::cellDeterminant
@@ -356,7 +352,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
 
@@ -391,7 +387,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         aspectRatio.ref().field() = cellAspectRatio(mesh);
@@ -421,7 +417,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         const cellShapeList& cellShapes = mesh.cellShapes();
         forAll(cellShapes, cellI)
@@ -449,8 +445,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimVolume, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimVolume, Zero)
         );
         V.ref() = mesh.V();
         Info<< "    Writing cell volume to " << V.name() << endl;
@@ -480,8 +475,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
         );
         //- Take min
         minFaceToCell(faceVolumeRatio, cellVolumeRatio);
@@ -516,7 +510,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar("minTetVolume", dimless, GREAT),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
 
@@ -582,7 +576,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar("minPyrVolume", dimless, GREAT),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         // Get owner and neighbour pyr volumes
@@ -654,8 +648,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
         );
 
         regionSplit rs(mesh);
@@ -705,8 +698,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(scalar(-1)),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1)
         );
 
         const cellZoneMesh& czs = mesh.cellZones();
@@ -744,8 +736,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(scalar(-1)),
-            calculatedFvsPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1)
         );
 
         faceZone.primitiveFieldRef() =
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 5cdc1a16c3..65203557dd 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -100,7 +100,7 @@ label addPatch
             mesh,
             pp,
             dictionary(),   // do not set specialised patchFields
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
             true            // parallel sync'ed addition
         );
     }
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index bdd0489184..f19b1f1b07 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -1028,7 +1028,7 @@ int main(int argc, char *argv[])
                                 mesh,
                                 ppPtr(),
                                 patchDict.subOrEmptyDict("patchFields"),
-                                calculatedFvPatchScalarField::typeName,
+                                fvPatchFieldBase::calculatedType(),
                                 true
                             );
                         }
@@ -1079,7 +1079,7 @@ int main(int argc, char *argv[])
                                 mesh,
                                 ppPtr(),
                                 patchDict.subOrEmptyDict("patchFields"),
-                                calculatedFvPatchScalarField::typeName,
+                                fvPatchFieldBase::calculatedType(),
                                 true
                             );
                         }
@@ -1108,7 +1108,7 @@ int main(int argc, char *argv[])
                         mesh,
                         ppPtr(),
                         patchDict.subOrEmptyDict("patchFields"),
-                        calculatedFvPatchScalarField::typeName,
+                        fvPatchFieldBase::calculatedType(),
                         true
                     );
                 }
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 48c28c3ce3..b35202a4ad 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -76,25 +76,14 @@ tmp<volScalarField> createScalarField
     const labelUList& elems
 )
 {
-    tmp<volScalarField> tfld
+    auto tfld = volScalarField::New
     (
-        new volScalarField
-        (
-            IOobject
-            (
-                name,
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                IOobject::NO_REGISTER
-            ),
-            mesh,
-            dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
-        )
+        name,
+        mesh,
+        dimensionedScalar(dimless, Zero),
+        fvPatchFieldBase::zeroGradientType()
     );
-    volScalarField& fld = tfld.ref();
+    auto& fld = tfld.ref();
 
     forAll(fld, celli)
     {
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 5a8c6c5697..6dcd2f1199 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -114,7 +114,6 @@ Description
 #include "ReadFields.H"
 #include "mappedWallPolyPatch.H"
 #include "fvMeshTools.H"
-#include "zeroGradientFvPatchFields.H"
 #include "processorMeshes.H"
 
 using namespace Foam;
@@ -1055,7 +1054,7 @@ labelList addRegionPatches
             mesh,
             patch1,
             dictionary(),   //optional per field value
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
             true            //validBoundary
         );
 
@@ -1076,7 +1075,7 @@ labelList addRegionPatches
             mesh,
             patch2,
             dictionary(),   //optional per field value
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
             true            //validBoundary
         );
 
@@ -1433,7 +1432,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         forAll(cellRegion, celli)
         {
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
index 3d0cae7c28..56924ebad3 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,6 @@ License
 #include "domainDecompositionDryRun.H"
 #include "foamVtkInternalMeshWriter.H"
 #include "volFields.H"
-#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -51,8 +50,8 @@ void Foam::domainDecompositionDryRun::writeVolField
             IOobject::NO_REGISTER
         ),
         this->mesh(),
-        dimensionedScalar("cellDist", dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
     );
 
     forAll(procIds, celli)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
index 8b432d5032..eb93da2682 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,6 @@ License
 #include "domainDecomposition.H"
 #include "foamVtkInternalMeshWriter.H"
 #include "volFields.H"
-#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -52,8 +51,8 @@ void Foam::domainDecomposition::writeVolField
             IOobject::NO_REGISTER
         ),
         this->mesh(),
-        dimensionedScalar("cellDist", dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
     );
 
     forAll(procIds, celli)
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 9223893474..4f87ea6d94 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,7 +69,6 @@ Usage
 #include "faceCoupleInfo.H"
 #include "fvMeshAdder.H"
 #include "polyTopoChange.H"
-#include "zeroGradientFvPatchFields.H"
 #include "topoSet.H"
 #include "regionProperties.H"
 #include "fvMeshTools.H"
@@ -421,8 +420,8 @@ void writeDistribution
                 IOobject::NO_REGISTER
             ),
             masterMesh,
-            dimensionedScalar("cellDist", dimless, -1),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1),
+            fvPatchFieldBase::zeroGradientType()
         );
 
         forAll(cellDecomposition, celli)
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 5f960cf1a4..c29210a46f 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,7 +90,6 @@ Usage
 #include "globalIndex.H"
 #include "loadOrCreateMesh.H"
 #include "processorFvPatchField.H"
-#include "zeroGradientFvPatchFields.H"
 #include "topoSet.H"
 #include "regionProperties.H"
 
@@ -418,8 +417,8 @@ void writeDecomposition
             IOobject::NO_REGISTER
         ),
         mesh,
-        dimensionedScalar(name, dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
     );
 
     forAll(procCells, celli)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H
index daa27d275e..fdf2e3d48d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H
@@ -96,7 +96,7 @@ tmp<VolumeField<Type>> makeZeroGradientField
             df.mesh(),
             df.dimensions(),
             std::move(df.field()),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         tfield.ref().oriented() = df.oriented();
@@ -130,7 +130,7 @@ tmp<VolumeField<Type>> makeZeroGradientField
             df.mesh(),
             df.dimensions(),
             std::move(df.primitiveFieldRef(false)),  // No update accessTime
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         tfield.ref().oriented() = df.oriented();
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
index b5ca41b69e..7408c22c0b 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
@@ -52,7 +52,7 @@ volScalarField y
     ),
     mesh,
     dimensionedScalar(dimLength, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );
 y.primitiveFieldRef() = wallDist::New(mesh).y().primitiveField();
 y.correctBoundaryConditions();
@@ -88,7 +88,7 @@ volScalarField mask
     ),
     mesh,
     dimensionedScalar(dimless, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 4cf128963e..d4f8b7d985 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -57,8 +57,7 @@ Foam::LESdelta::LESdelta
             IOobject::NO_WRITE
         ),
         turbulence.mesh(),
-        dimensionedScalar(name, dimLength, SMALL),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimLength, SMALL)
     )
 {}
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
index 038a037c73..f0b284fb76 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
@@ -59,8 +59,7 @@ Foam::anisotropicFilter::anisotropicFilter
             mesh
         ),
         mesh,
-        dimensionedVector(dimLength*dimLength, Zero),
-        calculatedFvPatchVectorField::typeName
+        dimensionedVector(dimLength*dimLength, Zero)
     )
 {
     for (direction d=0; d<vector::nComponents; d++)
@@ -99,8 +98,7 @@ Foam::anisotropicFilter::anisotropicFilter
             mesh
         ),
         mesh,
-        dimensionedVector(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedVector(dimLength*dimLength, Zero)
     )
 {
     for (direction d=0; d<vector::nComponents; d++)
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
index a9e2816eb8..d93867b016 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
@@ -55,8 +55,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, scalar widthCoeff)
             mesh
         ),
         mesh,
-        dimensionedScalar(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimLength*dimLength, Zero)
     )
 {
     coeff_.ref() = pow(mesh.V(), 2.0/3.0)/widthCoeff_;
@@ -79,8 +78,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, const dictionary& bd)
             mesh
         ),
         mesh,
-        dimensionedScalar(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimLength*dimLength, Zero)
     )
 {
     coeff_.ref() = pow(mesh.V(), 2.0/3.0)/widthCoeff_;
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
index ad74cdb688..0a6a0b5d11 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
@@ -99,7 +99,7 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
                 ->found(patchFieldTypes[i])
         )
         {
-            patchFieldTypes[i] = calculatedFvPatchField<symmTensor>::typeName;
+            patchFieldTypes[i] = fvPatchFieldBase::calculatedType();
         }
     }
 
diff --git a/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C b/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
index b6bcc5f85a..93340446e4 100644
--- a/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
+++ b/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
@@ -58,7 +58,7 @@ Foam::faMeshSubset::interpolate
             patchi,
             faPatchField<Type>::New
             (
-                calculatedFaPatchField<Type>::typeName,
+                faPatchFieldBase::calculatedType(),
                 sMesh.boundary()[patchi],
                 DimensionedField<Type, areaMesh>::null()
             )
@@ -165,7 +165,7 @@ Foam::faMeshSubset::interpolate
             patchi,
             faePatchField<Type>::New
             (
-                calculatedFaePatchField<Type>::typeName,
+                faePatchFieldBase::calculatedType(),
                 sMesh.boundary()[patchi],
                 DimensionedField<Type, edgeMesh>::null()
             )
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
index 9ab1276224..53eadce916 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
@@ -114,7 +114,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
                 d2dt2IOobject,
                 mesh(),
                 dimensioned<Type>(dt.dimensions()/dimTime/dimTime, Zero),
-                calculatedFaPatchField<Type>::typeName
+                faPatchFieldBase::calculatedType()
             )
         );
     }
diff --git a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
index cd75c7d092..e557edfc56 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
@@ -83,7 +83,7 @@ EulerFaDdtScheme<Type>::facDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchField<Type>::typeName
+        faPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
index da042c24e5..81a0178e61 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
@@ -122,7 +122,7 @@ backwardFaDdtScheme<Type>::facDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchField<Type>::typeName
+        faPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
index 140e452e3e..73b342d5df 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
@@ -105,7 +105,7 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt
         ddtIOobject,
         mesh(),
         dimensionedScalar(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchScalarField::typeName
+        faPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
index 9553e0c365..f62a3dfc06 100644
--- a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
+++ b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
@@ -20,7 +20,7 @@ if (LTS)
             ),
             mesh,
             dimensionedScalar("one", dimless/dimTime, 1),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index b01c194353..2b16e0a36c 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -59,7 +59,7 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
             ),
             mesh(),
             dimensionedScalar(cofrDeltaT.dimensions(), Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
@@ -189,7 +189,7 @@ CoEulerDdtScheme<Type>::fvcDdt
                 ddtIOobject,
                 mesh(),
                 dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-                calculatedFvPatchField<Type>::typeName
+                fvPatchFieldBase::calculatedType()
             )
         );
     }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index 584b9b8426..b94f628cad 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -81,7 +81,7 @@ EulerDdtScheme<Type>::fvcDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index ecf7d1955f..61e3186cdf 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -109,7 +109,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
             ),
             mesh(),
             dimensionedScalar(dimless/dimTime, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
@@ -194,7 +194,7 @@ SLTSDdtScheme<Type>::fvcDdt
                 ddtIOobject,
                 mesh(),
                 dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-                calculatedFvPatchField<Type>::typeName
+                fvPatchFieldBase::calculatedType()
             )
         );
     }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index 3b2e28a08a..ef0f0aedf3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -122,7 +122,7 @@ backwardDdtScheme<Type>::fvcDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index df63268dd1..5050258462 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -74,7 +74,7 @@ localEulerDdtScheme<Type>::fvcDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index 0e99366aa8..73488db5a0 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -60,7 +60,7 @@ Foam::fvc::cellReduce
             ),
             mesh,
             dimensioned<Type>("initialValue", ssf.dimensions(), nullValue),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
index d5fab1f5fd..3c175eadf1 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
@@ -76,7 +76,7 @@ reconstruct
                 IOobject::NO_WRITE
             ),
             inv(surfaceSum(SfHat*mesh.Sf()))&surfaceSum(SfHat*ssf),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
index bef4d0cd20..593b8f8eeb 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
@@ -69,7 +69,7 @@ tmp<volScalarField> reconstructMag(const surfaceScalarField& ssf)
             ),
             mesh,
             dimensionedScalar(ssf.dimensions()/dimArea, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     scalarField& rf = treconField.ref();
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
index 729e2f5d35..e587837083 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
@@ -78,7 +78,7 @@ reconstruct
             ),
             mesh,
             dimensioned<GradType>(ssf.dimensions()/dimArea, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index 5627daadc8..e77a073169 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -101,7 +101,7 @@ surfaceIntegrate
             ),
             mesh,
             dimensioned<Type>(ssf.dimensions()/dimVol, Zero),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
@@ -152,7 +152,7 @@ surfaceSum
             ),
             mesh,
             dimensioned<Type>(ssf.dimensions(), Zero),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
index a97dab0be0..1376f122ff 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
@@ -76,7 +76,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
             ),
             mesh,
             dimensioned<GradType>(vtf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GradFieldType& lsGrad = tlsGrad.ref();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index ac103096b9..5ca762df67 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -66,7 +66,7 @@ Foam::fv::gaussGrad<Type>::gradf
             ),
             mesh,
             dimensioned<GradType>(ssf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GradFieldType& gGrad = tgGrad.ref();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index 44e781ce2c..d492be0eb3 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -72,7 +72,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
             ),
             mesh,
             dimensioned<GradType>(vsf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GradFieldType& lsGrad = tlsGrad.ref();
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
index 32cf1d0013..8d5da86172 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
@@ -78,7 +78,7 @@ Foam::fvMeshSubset::interpolate
                 patchi,
                 fvPatchField<Type>::New
                 (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                     sMesh.boundary()[patchi],
                     DimensionedField<Type, volMesh>::null()
                 )
@@ -259,7 +259,7 @@ Foam::fvMeshSubset::interpolate
                 patchi,
                 fvsPatchField<Type>::New
                 (
-                    calculatedFvsPatchField<Type>::typeName,
+                    fvsPatchFieldBase::calculatedType(),
                     sMesh.boundary()[patchi],
                     DimensionedField<Type, surfaceMesh>::null()
                 )
@@ -446,7 +446,7 @@ Foam::fvMeshSubset::interpolate
                 patchi,
                 pointPatchField<Type>::New
                 (
-                    calculatedPointPatchField<Type>::typeName,
+                    pointPatchFieldBase::calculatedType(),
                     sMesh.boundary()[patchi],
                     DimensionedField<Type, pointMesh>::null()
                 )
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
index c2b3626511..767a08ff88 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
@@ -53,7 +53,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
             patchi,
             fvPatchField<Type>::New
             (
-                calculatedFvPatchField<Type>::typeName,
+                fvPatchFieldBase::calculatedType(),
                 boundary()[patchi],
                 DimensionedField<Type, volMesh>::null()
             )
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
index ca2eee0c0f..e79ce51ac8 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
@@ -94,7 +94,7 @@ Foam::nearWallDist::nearWallDist(const Foam::fvMesh& mesh)
     (
         mesh.boundary(),
         mesh.V(),           // Dummy internal field,
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
     ),
     mesh_(mesh)
 {
@@ -125,7 +125,7 @@ void Foam::nearWallDist::correct()
                 patchi,
                 fvPatchField<scalar>::New
                 (
-                    calculatedFvPatchScalarField::typeName,
+                    fvPatchFieldBase::calculatedType(),
                     bnd[patchi],
                     V
                 )
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
index 497a1cb22d..825c54056e 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
@@ -82,7 +82,7 @@ Foam::nearWallDistNoSearch::nearWallDistNoSearch(const Foam::fvMesh& mesh)
     (
         mesh.boundary(),
         mesh.V(),           // Dummy internal field
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
     ),
     mesh_(mesh)
 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index 123ab26b0f..1ff282b22e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -235,7 +235,7 @@ public:
                 ),
                 mesh,
                 dimensionedScalar(dimless, Zero),
-                extrapolatedCalculatedFvPatchScalarField::typeName
+                fvPatchFieldBase::extrapolatedCalculatedType()
             );
 
             scalarField sumPhi
diff --git a/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C b/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
index 209a76b23a..aee5fecc8d 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
+++ b/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
@@ -75,7 +75,7 @@ void Foam::functionObjects::nearWallFields::createFields
                         io,
                         fld,
                         patchSet_.toc(),
-                        calculatedFvPatchField<Type>::typeName
+                        fvPatchFieldBase::calculatedType()
                     )
                 );
 
diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index 1ae36dff36..22861c8052 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -143,7 +143,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::pressure::rhoScale
                 IOobject::NO_REGISTER
             ),
             p,
-            fvPatchField<scalar>::calculatedType()
+            fvPatchFieldBase::calculatedType()
         );
     }
 
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 0a37d11ecb..3b55fda4d5 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -121,7 +121,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
             IOobject::NO_READ
         ),
         alpha,
-        fvPatchField<scalar>::calculatedType()
+        fvPatchFieldBase::calculatedType()
     );
 
     volScalarField backgroundAlpha
@@ -134,7 +134,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
             IOobject::NO_READ
         ),
         alpha,
-        fvPatchField<scalar>::calculatedType()
+        fvPatchFieldBase::calculatedType()
     );
 
 
diff --git a/src/functionObjects/field/writeCellCentres/writeCellCentres.C b/src/functionObjects/field/writeCellCentres/writeCellCentres.C
index 6ab11c3956..430e2d726c 100644
--- a/src/functionObjects/field/writeCellCentres/writeCellCentres.C
+++ b/src/functionObjects/field/writeCellCentres/writeCellCentres.C
@@ -77,7 +77,7 @@ bool Foam::functionObjects::writeCellCentres::write()
     (
         IOobject
         (
-            "C",
+            mesh_.C().name(),
             time_.timeName(),
             mesh_,
             IOobject::NO_READ,
@@ -85,11 +85,11 @@ bool Foam::functionObjects::writeCellCentres::write()
             IOobject::NO_REGISTER
         ),
         mesh_.C(),
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     Log << type() << " " << name() << " write:" << nl
-        << "    writing cell-volumes field " << C.name()
+        << "    writing cell-centres field " << C.name()
         << " to " << time_.timeName() << endl;
 
     C.write();
diff --git a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
index 3575033041..b805364f88 100644
--- a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
+++ b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
@@ -86,11 +86,13 @@ bool Foam::functionObjects::writeCellVolumes::write()
         ),
         mesh_,
         dimensionedScalar(mesh_.V().dimensions(), Zero),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     V.ref() = mesh_.V();
 
+    // Without correctBoundaryConditions() - boundary faces have zero volume
+
     Log << type() << " " << name() << " write:" << nl
         << "    writing cell-volumes field " << V.name()
         << " to " << time_.timeName() << endl;
diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C
index 0118ee1705..c13f858e35 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@@ -28,7 +28,6 @@ License
 #include "electricPotential.H"
 #include "fvc.H"
 #include "fvm.H"
-#include "calculatedFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -95,7 +94,7 @@ Foam::functionObjects::electricPotential::sigma() const
         (
             sigmaIO,
             tsigma,
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
         );
     }
 
@@ -104,7 +103,7 @@ Foam::functionObjects::electricPotential::sigma() const
         sigmaIO,
         mesh_,
         sigma_,
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
@@ -142,7 +141,7 @@ Foam::functionObjects::electricPotential::epsilonm() const
         (
             epsilonrIO,
             epsilon0*tepsilonr,
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
         );
     }
 
@@ -151,7 +150,7 @@ Foam::functionObjects::electricPotential::epsilonm() const
         epsilonrIO,
         mesh_,
         epsilon0*epsilonr_,
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
@@ -359,7 +358,7 @@ bool Foam::functionObjects::electricPotential::write()
                 IOobject::NO_REGISTER
             ),
             -fvc::grad(eV),
-            calculatedFvPatchField<vector>::typeName
+            fvPatchFieldBase::calculatedType()
         );
 
         Log << tab << E.name() << endl;
@@ -382,7 +381,7 @@ bool Foam::functionObjects::electricPotential::write()
                 IOobject::NO_REGISTER
             ),
             -tsigma*fvc::grad(eV),
-            calculatedFvPatchField<vector>::typeName
+            fvPatchFieldBase::calculatedType()
         );
 
         Log << tab << eJ().name() << endl;
@@ -405,7 +404,7 @@ bool Foam::functionObjects::electricPotential::write()
                 IOobject::NO_REGISTER
             ),
             fvc::div(tepsilonm*E),
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
         );
 
         Log << tab << erho().name() << endl;
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 63d6b54b97..6f891187c9 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -95,7 +95,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
                         dimEnergy/dimMass/dimTemperature,
                         CpRef
                     ),
-                    extrapolatedCalculatedFvPatchScalarField::typeName
+                    fvPatchFieldBase::extrapolatedCalculatedType()
                 );
             }
             else
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 48bc7d5acc..c8e1505048 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -533,7 +533,7 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
             ),
             mesh_,
             dimensionedScalar(dimless/dimTime, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
@@ -571,7 +571,7 @@ Foam::KinematicCloud<CloudType>::theta() const
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C
index e61404fb01..8cbf9c4693 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C
@@ -91,13 +91,13 @@ Foam::PatchCollisionDensity<CloudType>::PatchCollisionDensity
     (
         this->owner().mesh().boundary(),
         volScalarField::Internal::null(),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     ),
     collisionDensity0_
     (
         this->owner().mesh().boundary(),
         volScalarField::Internal::null(),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     ),
     time0_(this->owner().mesh().time().value())
 {
diff --git a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
index fbec058fd8..384f0f16f4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
+++ b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
@@ -110,7 +110,7 @@ createZeroBoundaryPtr
         (
             mesh.boundary(),
             mesh.V()*pTraits<Type>::zero,  // Dummy internal field,
-            wordList(bm.size(), calculatedFvPatchField<Type>::typeName),
+            wordList(bm.size(), fvPatchFieldBase::calculatedType()),
             actualPatchTypes
         )
     );
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C b/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
index b845b0c38f..caa7884053 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
+++ b/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
@@ -87,7 +87,7 @@ Foam::fvFieldDecomposer::decomposeField
             patchi,
             fvPatchField<Type>::New
             (
-                calculatedFvPatchField<Type>::typeName,
+                fvPatchFieldBase::calculatedType(),
                 procMesh_.boundary()[patchi],
                 DimensionedField<Type, volMesh>::null()
             )
@@ -260,7 +260,7 @@ Foam::fvFieldDecomposer::decomposeField
             patchi,
             fvsPatchField<Type>::New
             (
-                calculatedFvsPatchField<Type>::typeName,
+                fvsPatchFieldBase::calculatedType(),
                 procMesh_.boundary()[patchi],
                 DimensionedField<Type, surfaceMesh>::null()
             )
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C
index efe44cab08..7f1270c587 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C
@@ -155,7 +155,7 @@ Foam::phaseModel::phaseModel
         wordList phiTypes
         (
             U_.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
         );
 
         forAll(U_.boundaryField(), i)
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
index fc654b05c1..69d2927d87 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
@@ -221,8 +221,7 @@ Foam::multiphaseInterSystem::multiphaseInterSystem
             mesh_
         ),
         mesh_,
-        dimensionedScalar(dimViscosity*dimDensity, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimViscosity*dimDensity, Zero)
     ),
     phaseNames_(get<wordList>("phases")),
     phi_
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index 9bd6eb3a1b..4e75adec97 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -85,7 +85,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::phi(const volVectorField& U) const
         wordList phiTypes
         (
             U.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
         );
 
         forAll(U.boundaryField(), i)
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C
index 1538419c7d..195feedd54 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C
@@ -154,7 +154,7 @@ Foam::phaseModel::phaseModel
         wordList phiTypes
         (
             U_.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
         );
 
         forAll(U_.boundaryField(), i)
diff --git a/src/regionFaModels/liquidFilm/liquidFilmBase.C b/src/regionFaModels/liquidFilm/liquidFilmBase.C
index 6ca3919b05..a10af1c3a8 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmBase.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmBase.C
@@ -188,8 +188,7 @@ liquidFilmBase::liquidFilmBase
             primaryMesh()
         ),
         primaryMesh(),
-        dimensionedScalar(dimMass, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimMass, Zero)
     ),
 
     momentumSource_
@@ -201,8 +200,7 @@ liquidFilmBase::liquidFilmBase
             primaryMesh()
         ),
         primaryMesh(),
-        dimensionedVector(dimPressure, Zero),
-        calculatedFvPatchField<vector>::typeName
+        dimensionedVector(dimPressure, Zero)
     ),
 
     pnSource_
@@ -214,8 +212,7 @@ liquidFilmBase::liquidFilmBase
             primaryMesh()
         ),
         primaryMesh(),
-        dimensionedScalar(dimPressure, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimPressure, Zero)
     ),
 
     energySource_
@@ -227,8 +224,7 @@ liquidFilmBase::liquidFilmBase
             primaryMesh()
         ),
         primaryMesh(),
-        dimensionedScalar(dimEnergy, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimEnergy, Zero)
     ),
 
     addedMassTotal_(0),
diff --git a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
index 9ef569e71a..cb4f11c297 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
@@ -218,8 +218,7 @@ liquidFilmModel::liquidFilmModel
             IOobject::NO_WRITE
         ),
         primaryMesh(),
-        dimensionedScalar(dimMass, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimMass, Zero)
     ),
 
     cloudDiameterTrans_
@@ -233,8 +232,7 @@ liquidFilmModel::liquidFilmModel
             IOobject::NO_WRITE
         ),
         primaryMesh(),
-        dimensionedScalar(dimLength, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimLength, Zero)
     ),
 
     turbulence_(filmTurbulenceModel::New(*this, dict)),
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
index 548db2857f..92d35fc01f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
@@ -275,7 +275,7 @@ tmp<volScalarField> constantFilmThermo::rho() const
             ),
             film().regionMesh(),
             dimensionedScalar(dimDensity, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index f5065fccdc..bded086e11 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -258,7 +258,7 @@ tmp<volScalarField> liquidFilmThermo::rho() const
             ),
             film().regionMesh(),
             dimensionedScalar(dimDensity, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index fd2bbc8de7..e91094ada8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -86,7 +86,7 @@ tmp<volVectorField> laminar::Us() const
             ),
             filmModel_.regionMesh(),
             dimensionedVector(dimVelocity, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C
index 028801ca1b..adde5edb2d 100644
--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@@ -634,7 +634,7 @@ Foam::meshToMesh::mapSrcToTgt
                 tgtPatchi,
                 fvPatchField<Type>::New
                 (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                     tgtMesh.boundary()[tgtPatchi],
                     DimensionedField<Type, volMesh>::null()
                 )
@@ -865,7 +865,7 @@ Foam::meshToMesh::mapTgtToSrc
                 srcPatchi,
                 fvPatchField<Type>::New
                 (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                     srcMesh.boundary()[srcPatchi],
                     DimensionedField<Type, volMesh>::null()
                 )
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
index e7f3cd40c3..3b55b76d94 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
@@ -484,8 +484,8 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::tc() const
                 IOobject::NO_REGISTER
             ),
             this->mesh(),
-            dimensionedScalar("small", dimTime, SMALL),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimTime, SMALL),
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index c8072b8154..7aca57b922 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -208,7 +208,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
             ),
             mesh(),
             dimensionedScalar(dimless/dimLength, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index 031e67d69a..b4fc2fc425 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -156,7 +156,7 @@ calc(const label propertyId) const
             ),
             mesh(),
             dimensionedScalar(dimless/dimLength, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index 4ad68c9825..5275ca3017 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -113,8 +113,7 @@ Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
             U_.db()
         ),
         U_.mesh(),
-        dimensionedScalar(dimViscosity, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimViscosity, Zero)
     )
 {
     calcNu();
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
index cba71aeb3e..ff56a961d8 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
@@ -71,8 +71,7 @@ functions
                     IOobject::NO_READ
                 ),
                 mesh(),
-                dimensionedVector(dimless/dimLength, Zero),
-                calculatedFvPatchField<vector>::typeName
+                dimensionedVector(dimless/dimLength, Zero)
             );
 
             Cc2.primitiveFieldRef() = Cc.primitiveField();
@@ -102,8 +101,7 @@ functions
                     IOobject::NO_READ
                 ),
                 mesh(),
-                dimensionedScalar(dimless, Zero),
-                calculatedFvPatchField<scalar>::typeName
+                dimensionedScalar(dimless, Zero)
             );
 
             volScalarField magError
@@ -116,8 +114,7 @@ functions
                     IOobject::NO_READ
                 ),
                 mesh(),
-                dimensionedScalar(dimless, Zero),
-                calculatedFvPatchField<scalar>::typeName
+                dimensionedScalar(dimless, Zero)
             );
 
             const dimensionedScalar root2(dimless/sqr(dimLength), Foam::sqrt(2.0));