diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index dde37093dd..7edc833945 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -48,7 +48,8 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(fvMeshDistribute, 0);
+
+defineTypeNameAndDebug(fvMeshDistribute, 0);
 
 //- Less function class that can be used for sorting processor patches
 class lessProcPatches
@@ -3016,37 +3017,15 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     // we also need to adapt our constructMaps.
     repatch(newPatchID, constructFaceMap);
 
-    // Bit of hack: processorFvPatchField does not get reset since created
-    // from nothing so explicitly reset.
-    initPatchFields<volScalarField, processorFvPatchField<scalar>>
-    (
-        Zero
-    );
-    initPatchFields<volVectorField, processorFvPatchField<vector>>
-    (
-        Zero
-    );
-    initPatchFields
-    <
-        volSphericalTensorField,
-        processorFvPatchField<sphericalTensor>
-    >
-    (
-        Zero
-    );
-    initPatchFields<volSymmTensorField, processorFvPatchField<symmTensor>>
-    (
-        Zero
-    );
-    initPatchFields<volTensorField, processorFvPatchField<tensor>>
-    (
-        Zero
-    );
-
+    // Correct processor patch fields
+    correctProcessorPatchFields<volScalarField>();
+    correctProcessorPatchFields<volVectorField>();
+    correctProcessorPatchFields<volSphericalTensorField>();
+    correctProcessorPatchFields<volSymmTensorField>();
+    correctProcessorPatchFields<volTensorField>();
 
     mesh_.setInstance(mesh_.time().timeName());
 
-
     // Print a bit
     if (debug)
     {
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index e2003cceee..11f66b165d 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -133,16 +133,9 @@ class fvMeshDistribute
                 const PtrList<Field<T>>& oldFlds
             );
 
-            //- Init patch fields of certain type
-            template<class GeoField, class PatchFieldType>
-            void initPatchFields
-            (
-                const typename GeoField::value_type& initVal
-            );
-
-            //- Call correctBoundaryConditions on fields
+            //- Correct processor patch fields
             template<class GeoField>
-            void correctBoundaryConditions();
+            void correctProcessorPatchFields();
 
             //- Delete all processor patches. Move any processor faces into
             //  patchi.
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index 300686a33d..6f5886878a 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "mapPolyMesh.H"
+#include "processorFvPatchField.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -235,13 +236,11 @@ void Foam::fvMeshDistribute::mapExposedFaces
 }
 
 
-template<class GeoField, class PatchFieldType>
-void Foam::fvMeshDistribute::initPatchFields
-(
-    const typename GeoField::value_type& initVal
-)
+template<class GeoField>
+void Foam::fvMeshDistribute::correctProcessorPatchFields()
 {
-    // Init patch fields of certain type
+    typedef processorFvPatchField<typename GeoField::value_type>
+        processorPatchFieldType;
 
     HashTable<GeoField*> flds
     (
@@ -254,14 +253,6 @@ void Foam::fvMeshDistribute::initPatchFields
 
         typename GeoField::Boundary& bfld = fld.boundaryFieldRef();
 
-        // forAll(bfld, patchi)
-        // {
-        //     if (isA<PatchFieldType>(bfld[patchi]))
-        //     {
-        //         bfld[patchi] == initVal;
-        //     }
-        // }
-
         if
         (
             Pstream::defaultCommsType == Pstream::commsTypes::blocking
@@ -272,7 +263,7 @@ void Foam::fvMeshDistribute::initPatchFields
 
             forAll(bfld, patchi)
             {
-                if (isA<PatchFieldType>(bfld[patchi]))
+                if (isA<processorPatchFieldType>(bfld[patchi]))
                 {
                     bfld[patchi].initEvaluate(Pstream::defaultCommsType);
                 }
@@ -290,7 +281,7 @@ void Foam::fvMeshDistribute::initPatchFields
 
             forAll(bfld, patchi)
             {
-                if (isA<PatchFieldType>(bfld[patchi]))
+                if (isA<processorPatchFieldType>(bfld[patchi]))
                 {
                     bfld[patchi].evaluate(Pstream::defaultCommsType);
                 }
@@ -303,7 +294,7 @@ void Foam::fvMeshDistribute::initPatchFields
 
             forAll(patchSchedule, patchEvali)
             {
-                if (isA<PatchFieldType>(bfld[patchEvali]))
+                if (isA<processorPatchFieldType>(bfld[patchEvali]))
                 {
                     if (patchSchedule[patchEvali].init)
                     {
@@ -322,24 +313,6 @@ void Foam::fvMeshDistribute::initPatchFields
 }
 
 
-template<class GeoField>
-void Foam::fvMeshDistribute::correctBoundaryConditions()
-{
-    // correctBoundaryConditions patch fields of certain type
-
-    HashTable<GeoField*> flds
-    (
-        mesh_.objectRegistry::lookupClass<GeoField>()
-    );
-
-    forAllIter(typename HashTable<GeoField*>, flds, iter)
-    {
-        const GeoField& fld = *iter();
-        fld.correctBoundaryConditions();
-    }
-}
-
-
 template<class GeoField>
 void Foam::fvMeshDistribute::sendFields
 (