diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C
index af38397fb3..8dd73a6272 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C
@@ -162,7 +162,11 @@ void Foam::fv::VoFClouds::preUpdateMesh()
 }
 
 
-void Foam::fv::VoFClouds::updateMesh(const polyTopoChangeMap&)
+void Foam::fv::VoFClouds::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::VoFClouds::mapMesh(const polyMeshMap& map)
 {}
 
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H
index 1256d6fb49..ed5c571da1 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H
@@ -148,8 +148,11 @@ public:
             //- Prepare for mesh update
             virtual void preUpdateMesh();
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
index 75410a533e..2cb983a7f9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@@ -222,12 +222,18 @@ void Foam::fv::VoFSolidificationMeltingSource::correct()
 }
 
 
-void Foam::fv::VoFSolidificationMeltingSource::updateMesh
+void Foam::fv::VoFSolidificationMeltingSource::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    set_.updateMesh(map);
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::VoFSolidificationMeltingSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
index 384bd456d1..3ad77e8564 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
@@ -190,8 +190,11 @@ public:
 
         // Mesh motion
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C
index 3924f0aa8f..dd63abf084 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C
@@ -153,7 +153,13 @@ void Foam::fv::VoFSurfaceFilm::addSup
 }
 
 
-void Foam::fv::VoFSurfaceFilm::updateMesh(const polyTopoChangeMap&)
+void Foam::fv::VoFSurfaceFilm::topoChange(const polyTopoChangeMap&)
+{
+    NotImplemented;
+}
+
+
+void Foam::fv::VoFSurfaceFilm::mapMesh(const polyMeshMap& map)
 {
     NotImplemented;
 }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H
index 3a2d71b54d..6f25b0b197 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H
@@ -135,8 +135,11 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
index 4e04df9008..17b6d87a98 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
@@ -207,7 +207,11 @@ void Foam::fv::VoFTurbulenceDamping::addSup
 }
 
 
-void Foam::fv::VoFTurbulenceDamping::updateMesh(const polyTopoChangeMap&)
+void Foam::fv::VoFTurbulenceDamping::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::VoFTurbulenceDamping::mapMesh(const polyMeshMap& map)
 {}
 
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
index 92a125d479..c2faeabcc6 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
@@ -174,8 +174,11 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
index 7fb3bec588..1150e4149d 100644
--- a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
+++ b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
@@ -202,7 +202,11 @@ void Foam::fv::VoFTurbulenceDamping::addSup
 }
 
 
-void Foam::fv::VoFTurbulenceDamping::updateMesh(const polyTopoChangeMap&)
+void Foam::fv::VoFTurbulenceDamping::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::VoFTurbulenceDamping::mapMesh(const polyMeshMap& map)
 {}
 
 
diff --git a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
index 0d10cef578..f80178999a 100644
--- a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
+++ b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
@@ -173,8 +173,11 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C
index 5f389e06b4..366d4307bb 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C
@@ -304,7 +304,11 @@ void Foam::fv::interfaceTurbulenceDamping::addSup
 }
 
 
-void Foam::fv::interfaceTurbulenceDamping::updateMesh(const polyTopoChangeMap&)
+void Foam::fv::interfaceTurbulenceDamping::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::interfaceTurbulenceDamping::mapMesh(const polyMeshMap& map)
 {}
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H
index 9e8906baee..674bdb13c4 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H
@@ -194,8 +194,11 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C
index 001d6b08c1..aedf57a0fc 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C
@@ -235,13 +235,17 @@ void Foam::fv::phaseTurbulenceStabilisation::addSup
 }
 
 
-void Foam::fv::phaseTurbulenceStabilisation::updateMesh
+void Foam::fv::phaseTurbulenceStabilisation::topoChange
 (
     const polyTopoChangeMap&
 )
 {}
 
 
+void Foam::fv::phaseTurbulenceStabilisation::mapMesh(const polyMeshMap& map)
+{}
+
+
 void Foam::fv::phaseTurbulenceStabilisation::distribute
 (
     const polyDistributionMap&
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H
index 74938b74cf..be0e699cad 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H
@@ -164,8 +164,11 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index a7fcf709a5..fedbf67e17 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
         autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, inflate);
 
         Info<< "Mapping fields" << nl << endl;
-        mesh.updateMesh(map);
+        mesh.topoChange(map);
 
         // Move mesh (since morphing does not do this)
         if (map().hasMotionPoints())
@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
         }
 
         // Update numbering of cells/vertices.
-        faceRemover.updateMesh(map);
+        faceRemover.topoChange(map);
 
 
         Info<< "Writing fields" << nl << endl;
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 1d570f533e..3b1a03d73d 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
 
             // Update fields
             Info<< nl << "-- mapping mesh data" << endl;
-            mesh.updateMesh(map);
+            mesh.topoChange(map);
 
             // Inflate mesh
             if (map().hasMotionPoints())
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
 
             // Update numbering of cells/vertices.
             Info<< nl << "-- mapping hexRef8 data" << endl;
-            meshCutter.updateMesh(map);
+            meshCutter.topoChange(map);
         }
 
 
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 4cf0cac8f4..ef6b064ac3 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -1075,7 +1075,7 @@ int main(int argc, char *argv[])
         meshMod.changeMesh(subsetter.subMesh(), false);
 
     // Update fields
-    subsetter.subMesh().updateMesh(map);
+    subsetter.subMesh().topoChange(map);
 
     // Fix faces that get mapped to zero-sized patches (these don't get any
     // value)
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 4e8d11efef..2a5501b814 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -521,7 +521,7 @@ void subsetMesh
     }
 
     // Update topology on cellRemover
-    cellRemover.updateMesh(map());
+    cellRemover.topoChange(map());
 
     // Update refLevel for removed cells.
     const labelList& cellMap = map().cellMap();
@@ -547,7 +547,7 @@ void subsetMesh
     }
 
     // Update cutCells for removed cells.
-    cutCells.updateMesh(map());
+    cutCells.topoChange(map());
 }
 
 
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 14857e23a8..4d699aa3c6 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -108,7 +108,7 @@ label mergePatchFaces
             map = meshMod.changeMesh(mesh, false, true);
 
             // Update fields
-            mesh.updateMesh(map);
+            mesh.topoChange(map);
 
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
@@ -264,7 +264,7 @@ label mergePatchFaces
             map = meshMod.changeMesh(mesh, false, true);
 
             // Update fields
-            mesh.updateMesh(map);
+            mesh.topoChange(map);
 
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
@@ -317,7 +317,7 @@ label mergeEdges(const scalar minCos, polyMesh& mesh)
         autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false, true);
 
         // Update fields
-        mesh.updateMesh(map);
+        mesh.topoChange(map);
 
         // Move mesh (since morphing does not do this)
         if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
index f70d27f45a..fefbac70ef 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
@@ -461,7 +461,7 @@ void Foam::cellSplitter::setRefinement
 }
 
 
-void Foam::cellSplitter::updateMesh(const polyTopoChangeMap& map)
+void Foam::cellSplitter::topoChange(const polyTopoChangeMap& map)
 {
     // Create copy since we're deleting entries. Only if both cell and added
     // point get mapped do they get inserted.
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
index 0133517d3d..0c141af14a 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
@@ -123,7 +123,7 @@ public:
             );
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
 
         // Access
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 2d6ba45b5b..96b90ae6be 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -537,7 +537,7 @@ int main(int argc, char *argv[])
             mesh.movePoints(map().preMotionPoints());
         }
 
-        cutter.updateMesh(map());
+        cutter.topoChange(map());
 
         if (!overwrite)
         {
@@ -610,7 +610,7 @@ int main(int argc, char *argv[])
         }
 
         // Not implemented yet:
-        // cutter.updateMesh(map());
+        // cutter.topoChange(map());
 
 
         if (!overwrite)
@@ -654,7 +654,7 @@ int main(int argc, char *argv[])
             mesh.movePoints(map().preMotionPoints());
         }
 
-        cutter.updateMesh(map());
+        cutter.topoChange(map());
 
         if (!overwrite)
         {
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index 4748bb82ca..458fa3f428 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -145,10 +145,10 @@ int main(int argc, char *argv[])
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.topoChange(map);
 
     // Update numbering of cells/vertices.
-    meshCutter.updateMesh(map);
+    meshCutter.topoChange(map);
 
     // Optionally inflate mesh
     if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 14f9cb35be..d791339ca2 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
     }
 
     // Update stored labels on meshCutter.
-    cutter.updateMesh(map());
+    cutter.topoChange(map());
 
     Info<< "Finished refining" << endl;
 
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index 4e05e714ca..1d04f6fed5 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
 
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
-    mesh.updateMesh(map);
+    mesh.topoChange(map);
 
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
     }
 
     // Update numbering of cells/vertices.
-    faceRemover.updateMesh(map);
+    faceRemover.topoChange(map);
 
     if (!overwrite)
     {
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index f49b285b45..743f20e10a 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -693,10 +693,10 @@ int main(int argc, char *argv[])
         }
 
         // Update stored labels on meshCutter
-        cutter.updateMesh(map());
+        cutter.topoChange(map());
 
         // Update cellSet
-        cellsToCut.updateMesh(map());
+        cellsToCut.topoChange(map());
 
         Info<< "Remaining:" << cellsToCut.size() << endl;
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 83abc00ae2..143b62ebcf 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -424,7 +424,7 @@ int main(int argc, char *argv[])
             autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
             // Update fields
-            mesh.updateMesh(map);
+            mesh.topoChange(map);
 
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
@@ -708,7 +708,7 @@ int main(int argc, char *argv[])
             mesh
         );
 
-        layerExtrude.updateMesh
+        layerExtrude.topoChange
         (
             map(),
             identity(extrudePatch.size()),
@@ -884,7 +884,7 @@ int main(int argc, char *argv[])
             autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
             // Update fields
-            mesh.updateMesh(map);
+            mesh.topoChange(map);
 
             // Update stored data
             updateFaceLabels(map(), frontPatchFaces);
@@ -1016,7 +1016,7 @@ int main(int argc, char *argv[])
         autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
         // Update fields
-        mesh.updateMesh(map);
+        mesh.topoChange(map);
 
         // Update local data
         updateCellSet(map(), addedCellsSet);
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index d0b046992c..055b9871e1 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2312,7 +2312,7 @@ int main(int argc, char *argv[])
 
 
     // Update numbering on extruder.
-    extruder.updateMesh(shellMap);
+    extruder.topoChange(shellMap);
 
 
     // Calculate offsets from shell mesh back to original mesh
@@ -2659,7 +2659,7 @@ int main(int argc, char *argv[])
         addBafflesMap = meshMod.changeMesh(mesh, false);
 
         // Update fields
-        mesh.updateMesh(addBafflesMap);
+        mesh.topoChange(addBafflesMap);
 
 
 //XXXXXX
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
index c6ec0c19fb..4e21580c87 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
     // Create a mesh from topo changes.
     autoPtr<polyTopoChangeMap> map = meshMod().changeMesh(mesh(), false);
 
-    mesh().updateMesh(map);
+    mesh().topoChange(map);
 
     {
         edgeCollapser collapser(mesh());
@@ -304,7 +304,7 @@ int main(int argc, char *argv[])
         autoPtr<polyTopoChangeMap> map
             = meshModCollapse.changeMesh(mesh(), false);
 
-        mesh().updateMesh(map);
+        mesh().topoChange(map);
     }
 
     if (!overwrite)
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
index c5049bbcaa..44542e4adb 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
@@ -119,7 +119,7 @@ public:
         void setRefinement(polyTopoChange&);
 
         //- Force recalculation of locally stored data on topological change
-        void updateMesh(const polyTopoChangeMap&)
+        void topoChange(const polyTopoChangeMap&)
         {}
 
         //- Force recalculation of locally stored data for mesh distribution
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index b253d60933..570a6d562e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -246,10 +246,10 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
                 );
 
                 // Update fields
-                mesh_.updateMesh(map);
+                mesh_.topoChange(map);
 
                 // Update numbering of cells/vertices.
-                meshCutter_.updateMesh(map);
+                meshCutter_.topoChange(map);
 
                 {
                     // Map volumeStatus
@@ -355,11 +355,11 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
                 );
 
                 // Update fields
-                mesh_.updateMesh(map);
+                mesh_.topoChange(map);
 
                 // Update numbering of cells/vertices.
-                meshCutter_.updateMesh(map);
-                cellRemover.updateMesh(map);
+                meshCutter_.topoChange(map);
+                cellRemover.topoChange(map);
 
                 {
                     // Map volumeStatus
@@ -947,10 +947,10 @@ Foam::backgroundMeshDecomposition::distribute
         );
 
         // Update fields
-        mesh_.updateMesh(map);
+        mesh_.topoChange(map);
 
         // Update numbering of cells/vertices.
-        meshCutter_.updateMesh(map);
+        meshCutter_.topoChange(map);
 
         Info<< "    Background mesh refined from "
             << returnReduce(map().nOldCells(), sumOp<label>())
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
index 62c38c9f28..9b86f2453c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
             autoPtr<polyTopoChangeMap> map =
                 meshMod.changeMesh(pMesh, false);
 
-            pMesh.updateMesh(map);
+            pMesh.topoChange(map);
         }
     }
 
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index bd1b2cdb33..6367b43d62 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -799,7 +799,7 @@ int main(int argc, char *argv[])
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.topoChange(map);
 
 
 
diff --git a/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C b/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
index 2a3dc5c514..9d5d936278 100644
--- a/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.topoChange(map);
 
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index 6efe0e2422..6a2664ab34 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
         labelList(0),           // oldPatchNMeshPoints,
         autoPtr<scalarField>()  // oldCellVolumesPtr
     );
-    refData.updateMesh(map);
+    refData.topoChange(map);
     refData.write();
 
     Info<< "End" << endl;
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
index aaf17be06e..d2559840b6 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
@@ -512,7 +512,7 @@ int main(int argc, char *argv[])
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.topoChange(map);
 
     // Optionally inflate mesh
     if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index b4f828068e..774269044c 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -1003,7 +1003,7 @@ int main(int argc, char *argv[])
 
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.topoChange(map);
 
     // Update proc maps
     if
@@ -1319,7 +1319,7 @@ int main(int argc, char *argv[])
                 {
                     cellSet cs(*iter());
                     Info<< "    " << cs.name() << endl;
-                    cs.updateMesh(map());
+                    cs.topoChange(map());
                     cs.instance() = mesh.facesInstance();
                     cs.write();
                 }
@@ -1335,7 +1335,7 @@ int main(int argc, char *argv[])
                 {
                     faceSet fs(*iter());
                     Info<< "    " << fs.name() << endl;
-                    fs.updateMesh(map());
+                    fs.topoChange(map());
                     fs.instance() = mesh.facesInstance();
                     fs.write();
                 }
@@ -1351,7 +1351,7 @@ int main(int argc, char *argv[])
                 {
                     pointSet ps(*iter());
                     Info<< "    " << ps.name() << endl;
-                    ps.updateMesh(map());
+                    ps.topoChange(map());
                     ps.instance() = mesh.facesInstance();
                     ps.write();
                 }
diff --git a/applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C b/applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C
index 365c09b5a9..8d4fb34c4b 100644
--- a/applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C
+++ b/applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh, false);
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.topoChange(map);
 
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
     Info<< "Writing mesh to time " << runTime.timeName() << endl;
     mesh.write();
 
-    refData.updateMesh(map);
+    refData.topoChange(map);
     refData.write();
 
     Info<< "End\n" << endl;
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index f97e4091d1..730f7cec07 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -769,7 +769,7 @@ void createAndWriteRegion
     Info<< "Mapping fields" << endl;
 
     // Map existing fields
-    newMesh().updateMesh(map());
+    newMesh().topoChange(map());
 
     // Add subsetted fields
     subsetVolFields<volScalarField>
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C
index e7385fcce9..12ca65baf5 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.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
@@ -168,7 +168,7 @@ int Foam::vtkPVFoam::setTime(int nRequest, const double requestTimes[])
 }
 
 
-void Foam::vtkPVFoam::updateMeshPartsStatus()
+void Foam::vtkPVFoam::topoChangePartsStatus()
 {
     if (debug)
     {
@@ -509,7 +509,7 @@ void Foam::vtkPVFoam::Update
     reader_->UpdateProgress(0.1);
 
     // Set up mesh parts selection(s)
-    updateMeshPartsStatus();
+    topoChangePartsStatus();
 
     reader_->UpdateProgress(0.15);
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
index e43b2cc853..c0c66c4423 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.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
@@ -340,7 +340,7 @@ class vtkPVFoam
         // Update information helper functions
 
             //- Update the mesh parts selected in the GUI
-            void updateMeshPartsStatus();
+            void topoChangePartsStatus();
 
             //- Internal mesh info
             void updateInfoInternalMesh(vtkDataArraySelection*);
diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
index 963191de4f..95ec0e964c 100644
--- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
@@ -179,9 +179,22 @@ void ${typeName}FvModel${SourceType}::addSup
 }
 
 
-void ${typeName}FvModel${SourceType}::updateMesh(const polyTopoChangeMap& map)
+bool ${typeName}FvModel${SourceType}::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void ${typeName}FvModel${SourceType}::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void ${typeName}FvModel${SourceType}::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -194,13 +207,6 @@ void ${typeName}FvModel${SourceType}::distribute
 }
 
 
-bool ${typeName}FvModel${SourceType}::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H
index a2fcc682c6..34c6780bb2 100644
--- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H
+++ b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H
@@ -114,14 +114,17 @@ public:
 
         // Mesh motion
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
-
-            //- Update for mesh motion
-            virtual bool movePoints();
 };
 
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.C
index e55c1f26a9..1d3d3f99d8 100644
--- a/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.C
+++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.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
@@ -25,7 +25,7 @@ License
 
 #include "smoothDelta.H"
 #include "addToRunTimeSelectionTable.H"
-#include "FaceCellWave.H"
+#include "FvFaceCellWave.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -43,47 +43,43 @@ namespace LESModels
 
 void Foam::LESModels::smoothDelta::setChangedFaces
 (
-    const polyMesh& mesh,
+    const fvMesh& mesh,
     const volScalarField& delta,
-    DynamicList<label>& changedFaces,
+    DynamicList<labelPair>& changedFaces,
     DynamicList<deltaData>& changedFacesInfo
 )
 {
-    for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
+    forAll(mesh.owner(), facei)
     {
-        scalar ownDelta = delta[mesh.faceOwner()[facei]];
-
-        scalar neiDelta = delta[mesh.faceNeighbour()[facei]];
+        const scalar ownDelta = delta[mesh.owner()[facei]];
+        const scalar neiDelta = delta[mesh.neighbour()[facei]];
 
         // Check if owner delta much larger than neighbour delta or vice versa
-
-        if (ownDelta > maxDeltaRatio_ * neiDelta)
+        if (ownDelta > maxDeltaRatio_*neiDelta)
         {
-            changedFaces.append(facei);
+            changedFaces.append(labelPair(-1, facei));
             changedFacesInfo.append(deltaData(ownDelta));
         }
-        else if (neiDelta > maxDeltaRatio_ * ownDelta)
+        else if (neiDelta > maxDeltaRatio_*ownDelta)
         {
-            changedFaces.append(facei);
+            changedFaces.append(labelPair(-1, facei));
             changedFacesInfo.append(deltaData(neiDelta));
         }
     }
 
-    // Insert all faces of coupled patches no matter what. Let FaceCellWave
+    // Insert all faces of coupled patches no matter what. Let FvFaceCellWave
     // sort it out.
-    forAll(mesh.boundaryMesh(), patchi)
+    forAll(mesh.boundary(), patchi)
     {
-        const polyPatch& patch = mesh.boundaryMesh()[patchi];
+        const fvPatch& patch = mesh.boundary()[patchi];
 
         if (patch.coupled())
         {
             forAll(patch, patchFacei)
             {
-                label meshFacei = patch.start() + patchFacei;
+                const scalar ownDelta = delta[patch.faceCells()[patchFacei]];
 
-                scalar ownDelta = delta[mesh.faceOwner()[meshFacei]];
-
-                changedFaces.append(meshFacei);
+                changedFaces.append(labelPair(patchi, patchFacei));
                 changedFacesInfo.append(deltaData(ownDelta));
             }
         }
@@ -101,32 +97,40 @@ void Foam::LESModels::smoothDelta::calcDelta()
     const volScalarField& geometricDelta = geometricDelta_();
 
     // Fill changed faces with info
-    DynamicList<label> changedFaces(mesh.nFaces()/100 + 100);
+    DynamicList<labelPair> changedFaces(mesh.nFaces()/100 + 100);
     DynamicList<deltaData> changedFacesInfo(changedFaces.size());
-
     setChangedFaces(mesh, geometricDelta, changedFaces, changedFacesInfo);
 
     // Set initial field on cells.
     List<deltaData> cellDeltaData(mesh.nCells());
-
     forAll(geometricDelta, celli)
     {
         cellDeltaData[celli] = geometricDelta[celli];
     }
 
     // Set initial field on faces.
-    List<deltaData> faceDeltaData(mesh.nFaces());
-
+    List<deltaData> internalFaceDeltaData(mesh.nInternalFaces());
+    List<List<deltaData>> patchFaceDeltaData
+    (
+        FvFaceCellWave<deltaData>::template
+        sizesListList<List<List<deltaData>>>
+        (
+            FvFaceCellWave<deltaData>::template
+            listListSizes(mesh.boundary()),
+            deltaData()
+        )
+    );
 
     // Propagate information over whole domain.
-    FaceCellWave<deltaData, scalar> deltaCalc
+    FvFaceCellWave<deltaData, scalar> deltaCalc
     (
         mesh,
         changedFaces,
         changedFacesInfo,
-        faceDeltaData,
+        internalFaceDeltaData,
+        patchFaceDeltaData,
         cellDeltaData,
-        mesh.globalData().nTotalCells()+1,  // max iterations
+        mesh.globalData().nTotalCells() + 1,  // max iterations
         maxDeltaRatio_
     );
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.H
index 9427c26261..4bd205ceb8 100644
--- a/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.H
+++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.H
@@ -59,7 +59,11 @@ public:
     //- Public member class used by mesh-wave to propagate the delta-ratio
     class deltaData
     {
-        scalar delta_;
+        // Private Member Data
+
+            //-
+            scalar delta_;
+
 
         // Private Member Functions
 
@@ -90,13 +94,14 @@ public:
 
             // Access
 
-            scalar delta() const
-            {
-                return delta_;
-            }
+                //-
+                scalar delta() const
+                {
+                    return delta_;
+                }
 
 
-            // Needed by FaceCellWave
+            // Needed by FvFaceCellWave
 
                 //- Check whether origin has been changed at all or
                 //  still contains original (invalid) value.
@@ -108,7 +113,7 @@ public:
                 template<class TrackingData>
                 inline bool sameGeometry
                 (
-                    const polyMesh&,
+                    const fvMesh&,
                     const deltaData&,
                     const scalar,
                     TrackingData& td
@@ -118,7 +123,7 @@ public:
                 template<class TrackingData>
                 inline void transform
                 (
-                    const polyPatch& patch,
+                    const fvPatch& patch,
                     const label patchFacei,
                     const transformer& transform,
                     TrackingData& td
@@ -128,9 +133,9 @@ public:
                 template<class TrackingData>
                 inline bool updateCell
                 (
-                    const polyMesh&,
+                    const fvMesh&,
                     const label thisCelli,
-                    const label neighbourFacei,
+                    const labelPair& neighbourPatchAndFacei,
                     const deltaData& neighbourInfo,
                     const scalar tol,
                     TrackingData& td
@@ -140,8 +145,8 @@ public:
                 template<class TrackingData>
                 inline bool updateFace
                 (
-                    const polyMesh&,
-                    const label thisFacei,
+                    const fvMesh&,
+                    const labelPair& thisPatchAndFacei,
                     const label neighbourCelli,
                     const deltaData& neighbourInfo,
                     const scalar tol,
@@ -152,8 +157,8 @@ public:
                 template<class TrackingData>
                 inline bool updateFace
                 (
-                    const polyMesh&,
-                    const label thisFacei,
+                    const fvMesh&,
+                    const labelPair& thisPatchAndFacei,
                     const deltaData& neighbourInfo,
                     const scalar tol,
                     TrackingData& td
@@ -165,18 +170,14 @@ public:
 
             // Member Operators
 
-                // Needed for List IO
                 inline bool operator==(const deltaData&) const;
 
                 inline bool operator!=(const deltaData&) const;
 
+
             // IOstream Operators
 
-                friend Ostream& operator<<
-                (
-                    Ostream& os,
-                    const deltaData& wDist
-                )
+                friend Ostream& operator<<(Ostream& os, const deltaData& wDist)
                 {
                     return os << wDist.delta_;
                 }
@@ -201,24 +202,24 @@ private:
         // Calculate the delta values
         void calcDelta();
 
-        //- Fill changedFaces (with face labels) and changedFacesInfo
-        //  (with delta).
+        //- Fill changedPatchAndFaces (with patch and face labels) and
+        //  changedFacesInfo (with delta).
         //  This is the initial set of faces from which to start the waves.
         //  Since there might be lots of places with delta jumps we can follow
         //  various strategies for this initial 'seed'.
-        //  - start from single cell/face and let FaceCellWave pick up all
+        //  - start from single cell/face and let FvFaceCellWave pick up all
         //    others from there. might be quite a few waves before everything
         //    settles.
         //  - start from all faces. Lots of initial transfers.
         //  We do something in between:
         //  - start from all faces where there is a jump. Since we cannot easily
         //    determine this across coupled patches (cyclic, processor)
-        //    introduce all faces of these and let FaceCellWave sort it out.
+        //    introduce all faces of these and let FvFaceCellWave sort it out.
         void setChangedFaces
         (
-            const polyMesh& mesh,
+            const fvMesh& mesh,
             const volScalarField& delta,
-            DynamicList<label>& changedFaces,
+            DynamicList<labelPair>& changedPatchAndFaces,
             DynamicList<deltaData>& changedFacesInfo
         );
 
diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
index e45b5fe9b0..b336702ca2 100644
--- a/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
+++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "smoothDelta.H"
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class TrackingData>
@@ -53,7 +55,9 @@ inline bool Foam::LESModels::smoothDelta::deltaData::update
     else
     {
         // Neighbour is not too big for me or change is too small
-        // Nothing changed.
+        // ...
+
+        // Nothing changed
         return false;
     }
 }
@@ -88,7 +92,7 @@ inline bool Foam::LESModels::smoothDelta::deltaData::valid
 template<class TrackingData>
 inline bool Foam::LESModels::smoothDelta::deltaData::sameGeometry
 (
-    const polyMesh&,
+    const fvMesh&,
     const deltaData&,
     const scalar,
     TrackingData& td
@@ -101,7 +105,7 @@ inline bool Foam::LESModels::smoothDelta::deltaData::sameGeometry
 template<class TrackingData>
 inline void Foam::LESModels::smoothDelta::deltaData::transform
 (
-    const polyPatch& patch,
+    const fvPatch& patch,
     const label patchFacei,
     const transformer& transform,
     TrackingData& td
@@ -112,9 +116,9 @@ inline void Foam::LESModels::smoothDelta::deltaData::transform
 template<class TrackingData>
 inline bool Foam::LESModels::smoothDelta::deltaData::updateCell
 (
-    const polyMesh&,
-    const label,
+    const fvMesh&,
     const label,
+    const labelPair&,
     const deltaData& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
@@ -128,8 +132,8 @@ inline bool Foam::LESModels::smoothDelta::deltaData::updateCell
 template<class TrackingData>
 inline bool Foam::LESModels::smoothDelta::deltaData::updateFace
 (
-    const polyMesh&,
-    const label,
+    const fvMesh&,
+    const labelPair&,
     const label,
     const deltaData& neighbourWallInfo,
     const scalar tol,
@@ -144,8 +148,8 @@ inline bool Foam::LESModels::smoothDelta::deltaData::updateFace
 template<class TrackingData>
 inline bool Foam::LESModels::smoothDelta::deltaData::updateFace
 (
-    const polyMesh&,
-    const label,
+    const fvMesh&,
+    const labelPair&,
     const deltaData& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
index 0667f27b73..1f1373df0f 100644
--- a/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
+++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
@@ -25,8 +25,8 @@ License
 
 #include "vanDriestDelta.H"
 #include "wallFvPatch.H"
-#include "patchDistWave.H"
-#include "wallPointYPlus.H"
+#include "fvPatchDistWave.H"
+#include "fvWallPointYPlus.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -79,23 +79,21 @@ void Foam::LESModels::vanDriestDelta::calcDelta()
         }
     }
 
-    scalar cutOff = wallPointYPlus::yPlusCutOff;
-    wallPointYPlus::yPlusCutOff = 500;
+    scalar cutOff = fvWallPointYPlus::yPlusCutOff;
+    fvWallPointYPlus::yPlusCutOff = 500;
     volScalarField y
     (
         volScalarField::New("y", mesh, dimensionedScalar(dimLength, great))
     );
-    patchDistWave::wave<wallPointYPlus, fvPatchField>
+    fvPatchDistWave::wave<fvWallPointYPlus>
     (
         mesh,
         mesh.boundaryMesh().findPatchIDs<wallPolyPatch>(),
         ystar.boundaryField(),
-        y.primitiveFieldRef(),
-        y.boundaryFieldRef(),
-        ystar.primitiveFieldRef(),
-        ystar.boundaryFieldRef()
+        y,
+        ystar
     );
-    wallPointYPlus::yPlusCutOff = cutOff;
+    fvWallPointYPlus::yPlusCutOff = cutOff;
 
     delta_ = min
     (
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 9bf955af91..192a2fbae3 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -582,6 +582,9 @@ $(polyTopoChangeMap)/faceMapper/faceMapper.C
 $(polyTopoChangeMap)/cellMapper/cellMapper.C
 $(polyTopoChangeMap)/mapAddedPolyMesh.C
 
+polyMeshMap = $(polyMesh)/polyMeshMap
+$(polyMeshMap)/polyMeshMap.C
+
 polyDistributionMap = $(polyMesh)/polyDistributionMap
 $(polyDistributionMap)/distributionMap.C
 $(polyDistributionMap)/distributionMapBase.C
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
index e329228dbf..d456d959fd 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
@@ -128,17 +128,6 @@ bool Foam::IOOutputFilter<OutputFilter>::write(const bool write)
 }
 
 
-template<class OutputFilter>
-void Foam::IOOutputFilter<OutputFilter>::updateMesh
-(
-    const polyTopoChangeMap& map
-)
-{
-    read();
-    OutputFilter::updateMesh(map);
-}
-
-
 template<class OutputFilter>
 void Foam::IOOutputFilter<OutputFilter>::movePoints(const polyMesh& mesh)
 {
@@ -147,4 +136,26 @@ void Foam::IOOutputFilter<OutputFilter>::movePoints(const polyMesh& mesh)
 }
 
 
+template<class OutputFilter>
+void Foam::IOOutputFilter<OutputFilter>::topoChange
+(
+    const polyTopoChangeMap& map
+)
+{
+    read();
+    OutputFilter::topoChange(map);
+}
+
+
+template<class OutputFilter>
+void Foam::IOOutputFilter<OutputFilter>::mapMesh
+(
+    const polyMeshMap& map
+)
+{
+    read();
+    OutputFilter::mapMesh(map);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
index a14a144b00..247db7bdb5 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
@@ -51,6 +51,7 @@ namespace Foam
 
 // Forward declaration of classes
 class polyTopoChangeMap;
+class polyMeshMap;
 
 /*---------------------------------------------------------------------------*\
                        Class IOOutputFilter Declaration
@@ -125,12 +126,15 @@ public:
         //- Sample and write
         virtual bool write(const bool write = true);
 
-        //- Update for changes of mesh
-        virtual void updateMesh(const polyTopoChangeMap& map);
-
-        //- Update for changes of mesh
+        //- Update topology using the given map
         virtual void movePoints(const polyMesh& mesh);
 
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap& map);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index d9d42b9c9c..2e4087c459 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -156,12 +156,16 @@ Foam::scalar Foam::functionObject::timeToNextWrite()
 }
 
 
-void Foam::functionObject::updateMesh(const polyTopoChangeMap&)
-{}
-
-
 void Foam::functionObject::movePoints(const polyMesh&)
 {}
 
 
+void Foam::functionObject::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::functionObject::mapMesh(const polyMeshMap&)
+{}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 44770208f9..b3aae74707 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -133,6 +133,7 @@ namespace Foam
 class Time;
 class polyMesh;
 class polyTopoChangeMap;
+class polyMeshMap;
 
 /*---------------------------------------------------------------------------*\
                        Class functionObject Declaration
@@ -238,12 +239,15 @@ public:
         //  time. Returns the write time, or vGreat.
         virtual scalar timeToNextWrite();
 
-        //- Update for changes of mesh
-        virtual void updateMesh(const polyTopoChangeMap& map);
-
-        //- Update for changes of mesh
+        //- Update topology using the given map
         virtual void movePoints(const polyMesh& mesh);
 
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap& map);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index f1993313fc..8a2e609246 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -844,18 +844,6 @@ bool Foam::functionObjectList::read()
 }
 
 
-void Foam::functionObjectList::updateMesh(const polyTopoChangeMap& map)
-{
-    if (execution_)
-    {
-        forAll(*this, oi)
-        {
-            operator[](oi).updateMesh(map);
-        }
-    }
-}
-
-
 void Foam::functionObjectList::movePoints(const polyMesh& mesh)
 {
     if (execution_)
@@ -868,4 +856,28 @@ void Foam::functionObjectList::movePoints(const polyMesh& mesh)
 }
 
 
+void Foam::functionObjectList::topoChange(const polyTopoChangeMap& map)
+{
+    if (execution_)
+    {
+        forAll(*this, oi)
+        {
+            operator[](oi).topoChange(map);
+        }
+    }
+}
+
+
+void Foam::functionObjectList::mapMesh(const polyMeshMap& map)
+{
+    if (execution_)
+    {
+        forAll(*this, oi)
+        {
+            operator[](oi).mapMesh(map);
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 196edbe3e9..850bbd3d38 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -53,6 +53,7 @@ namespace Foam
 {
 
 class polyTopoChangeMap;
+class polyMeshMap;
 class argList;
 
 /*---------------------------------------------------------------------------*\
@@ -154,7 +155,7 @@ public:
 
 
     //- Destructor
-    ~functionObjectList();
+    virtual ~functionObjectList();
 
 
     // Member Functions
@@ -272,11 +273,14 @@ public:
         //- Return the time to the next write
         scalar timeToNextWrite();
 
-        //- Update for changes of mesh
-        void updateMesh(const polyTopoChangeMap& map);
+        //- Update topology using the given map
+        virtual void movePoints(const polyMesh& mesh);
 
-        //- Update for changes of mesh
-        void movePoints(const polyMesh& mesh);
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap& map);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
 
     // Member Operators
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
index f39c7edfc8..664bed605d 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
@@ -26,6 +26,7 @@ License
 #include "timeControlFunctionObject.H"
 #include "polyMesh.H"
 #include "polyTopoChangeMap.H"
+#include "polyMeshMap.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -197,18 +198,6 @@ bool Foam::functionObjects::timeControl::read(const dictionary& dict)
 }
 
 
-void Foam::functionObjects::timeControl::updateMesh
-(
-    const polyTopoChangeMap& map
-)
-{
-    if (active())
-    {
-        foPtr_->updateMesh(map);
-    }
-}
-
-
 void Foam::functionObjects::timeControl::movePoints(const polyMesh& mesh)
 {
     if (active())
@@ -218,4 +207,28 @@ void Foam::functionObjects::timeControl::movePoints(const polyMesh& mesh)
 }
 
 
+void Foam::functionObjects::timeControl::topoChange
+(
+    const polyTopoChangeMap& map
+)
+{
+    if (active())
+    {
+        foPtr_->topoChange(map);
+    }
+}
+
+
+void Foam::functionObjects::timeControl::mapMesh
+(
+    const polyMeshMap& map
+)
+{
+    if (active())
+    {
+        foPtr_->mapMesh(map);
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
index 59852cdcb0..9522760cc7 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
@@ -162,12 +162,15 @@ public:
             //- Read and set the function object if its data have changed
             virtual bool read(const dictionary&);
 
-            //- Update for changes of mesh
-            virtual void updateMesh(const polyTopoChangeMap& map);
-
-            //- Update for changes of mesh
+            //- Update topology using the given map
             virtual void movePoints(const polyMesh& mesh);
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap& map);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.C b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
index b761c3ed3f..783d4eb7ff 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.C
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
@@ -321,7 +321,7 @@ void Foam::meshObject::distribute
 
 
 template<class Mesh>
-void Foam::meshObject::updateMesh
+void Foam::meshObject::topoChange
 (
     objectRegistry& obr,
     const polyTopoChangeMap& map
@@ -334,7 +334,7 @@ void Foam::meshObject::updateMesh
 
     if (meshObject::debug)
     {
-        Pout<< "meshObject::updateMesh(objectRegistry&, "
+        Pout<< "meshObject::topoChange(objectRegistry&, "
                "const polyTopoChangeMap& map) : updating " << Mesh::typeName
             << " meshObjects for region " << obr.name() << endl;
     }
@@ -352,7 +352,53 @@ void Foam::meshObject::updateMesh
             {
                 Pout<< "    Updating " << iter()->name() << endl;
             }
-            dynamic_cast<UpdateableMeshObject<Mesh>*>(iter())->updateMesh(map);
+            dynamic_cast<UpdateableMeshObject<Mesh>*>(iter())->topoChange(map);
+        }
+        else
+        {
+            if (meshObject::debug)
+            {
+                Pout<< "    Destroying " << iter()->name() << endl;
+            }
+            obr.checkOut(*iter());
+        }
+    }
+}
+
+
+template<class Mesh>
+void Foam::meshObject::mapMesh
+(
+    objectRegistry& obr,
+    const polyMeshMap& map
+)
+{
+    HashTable<GeometricMeshObject<Mesh>*> meshObjects
+    (
+        obr.lookupClass<GeometricMeshObject<Mesh>>()
+    );
+
+    if (meshObject::debug)
+    {
+        Pout<< "meshObject::mapMesh(objectRegistry&, "
+               "const polyMeshMap& map) : updating " << Mesh::typeName
+            << " meshObjects for region " << obr.name() << endl;
+    }
+
+    forAllIter
+    (
+        typename HashTable<GeometricMeshObject<Mesh>*>,
+        meshObjects,
+        iter
+    )
+    {
+        if (isA<UpdateableMeshObject<Mesh>>(*iter()))
+        {
+            if (meshObject::debug)
+            {
+                Pout<< "    Updating " << iter()->name() << endl;
+            }
+            dynamic_cast<UpdateableMeshObject<Mesh>*>(iter())->mapMesh(map);
         }
         else
         {
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.H b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
index e231cc7657..fc41065b36 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.H
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
@@ -51,13 +51,13 @@ Description
     - TopologicalMeshObject: mesh object to be deleted on topology change
     - GeometricMeshObject: mesh object to be deleted on geometry change
     - MoveableMeshObject: mesh object to be updated in movePoints
-    - UpdateableMeshObject: mesh object to be updated in updateMesh or
+    - UpdateableMeshObject: mesh object to be updated in topoChange or
         movePoints
     - PatchMeshObject: mesh object to be additionally updated patch changes
 
 Note
     movePoints must be provided for MeshObjects of type MoveableMeshObject
-    and both movePoints and updateMesh functions must exist, provided for
+    and both movePoints and topoChange functions must exist, provided for
     MeshObjects of type UpdateableMeshObject.
 
 SourceFiles
@@ -77,6 +77,7 @@ namespace Foam
 
 // Forward declarations
 class polyTopoChangeMap;
+class polyMeshMap;
 class polyDistributionMap;
 
 /*---------------------------------------------------------------------------*\
@@ -173,7 +174,10 @@ public:
         static void movePoints(objectRegistry&);
 
         template<class Mesh>
-        static void updateMesh(objectRegistry&, const polyTopoChangeMap&);
+        static void topoChange(objectRegistry&, const polyTopoChangeMap&);
+
+        template<class Mesh>
+        static void mapMesh(objectRegistry&, const polyMeshMap&);
 
         template<class Mesh>
         static void distribute(objectRegistry&, const polyDistributionMap&);
@@ -321,7 +325,9 @@ public:
         DistributeableMeshObject<Mesh>(typeName, io)
     {}
 
-    virtual void updateMesh(const polyTopoChangeMap& map) = 0;
+    virtual void topoChange(const polyTopoChangeMap& map) = 0;
+
+    virtual void mapMesh(const polyMeshMap& map) = 0;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
index 5f8fba847e..7faa63ab22 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.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
@@ -156,7 +156,7 @@ void Foam::pointBoundaryMesh::movePoints(const pointField& p)
 }
 
 
-void Foam::pointBoundaryMesh::updateMesh()
+void Foam::pointBoundaryMesh::topoChange()
 {
     PstreamBuffers pBufs(Pstream::defaultCommsType);
 
@@ -168,14 +168,14 @@ void Foam::pointBoundaryMesh::updateMesh()
     {
         forAll(*this, patchi)
         {
-            operator[](patchi).initUpdateMesh(pBufs);
+            operator[](patchi).initTopoChange(pBufs);
         }
 
         pBufs.finishedSends();
 
         forAll(*this, patchi)
         {
-            operator[](patchi).updateMesh(pBufs);
+            operator[](patchi).topoChange(pBufs);
         }
     }
     else if (Pstream::defaultCommsType == Pstream::commsTypes::scheduled)
@@ -191,11 +191,11 @@ void Foam::pointBoundaryMesh::updateMesh()
 
             if (patchSchedule[patchEvali].init)
             {
-                operator[](patchi).initUpdateMesh(pBufs);
+                operator[](patchi).initTopoChange(pBufs);
             }
             else
             {
-                operator[](patchi).updateMesh(pBufs);
+                operator[](patchi).topoChange(pBufs);
             }
         }
     }
@@ -227,7 +227,7 @@ void Foam::pointBoundaryMesh::shuffle
     pointPatchList::shuffle(newToOld);
     if (validBoundary)
     {
-        updateMesh();
+        topoChange();
     }
 }
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
index 277a659624..bd7a27ff6e 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.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
@@ -103,14 +103,14 @@ public:
         void movePoints(const pointField&);
 
         //- Correct pointBoundaryMesh after topology update
-        void updateMesh();
+        void topoChange();
 
         //- Create pointBoundaryMesh from polyBoundaryMesh
         void reset(const polyBoundaryMesh&);
 
         //- Reorders patches. Ordering does not have to be done in
         //  ascending or descending order. Reordering has to be unique.
-        //  (is shuffle). If validBoundary calls updateMesh()
+        //  (is shuffle). If validBoundary calls topoChange()
         //  after reordering to recalculate data (so call needs to be parallel
         //  sync in that case)
         void shuffle(const labelUList& newToOld, const bool validBoundary);
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.C b/src/OpenFOAM/meshes/pointMesh/pointMesh.C
index 0de250b65f..0173f98997 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.C
@@ -90,30 +90,6 @@ void Foam::pointMesh::reset(const bool validBoundary)
 }
 
 
-void Foam::pointMesh::updateMesh(const polyTopoChangeMap& map)
-{
-    if (debug)
-    {
-        Pout<< "pointMesh::updateMesh(const polyTopoChangeMap&): "
-            << "Updating for topology changes." << endl;
-        Pout<< endl;
-    }
-    boundary_.updateMesh();
-}
-
-
-void Foam::pointMesh::distribute(const polyDistributionMap& map)
-{
-    if (debug)
-    {
-        Pout<< "pointMesh::distribute(const polyDistributionMap&): "
-            << "Distribute." << endl;
-        Pout<< endl;
-    }
-    boundary_.updateMesh();
-}
-
-
 bool Foam::pointMesh::movePoints()
 {
     if (debug)
@@ -128,6 +104,42 @@ bool Foam::pointMesh::movePoints()
 }
 
 
+void Foam::pointMesh::topoChange(const polyTopoChangeMap& map)
+{
+    if (debug)
+    {
+        Pout<< "pointMesh::topoChange(const polyTopoChangeMap&): "
+            << "Topology change." << endl;
+        Pout<< endl;
+    }
+    boundary_.topoChange();
+}
+
+
+void Foam::pointMesh::mapMesh(const polyMeshMap& map)
+{
+    if (debug)
+    {
+        Pout<< "pointMesh::mapMesh(const polyMeshMap&): "
+            << "Mesh mapping." << endl;
+        Pout<< endl;
+    }
+    boundary_.topoChange();
+}
+
+
+void Foam::pointMesh::distribute(const polyDistributionMap& map)
+{
+    if (debug)
+    {
+        Pout<< "pointMesh::distribute(const polyDistributionMap&): "
+            << "Distribute." << endl;
+        Pout<< endl;
+    }
+    boundary_.topoChange();
+}
+
+
 void Foam::pointMesh::reorderPatches
 (
     const labelUList& newToOld,
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.H b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
index 90e443acfb..d12cb7d415 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
@@ -118,15 +118,18 @@ public:
 
         // Mesh callbacks
 
+            //- Move points
+            virtual bool movePoints();
+
             //- Update the mesh corresponding to given map
-            virtual void updateMesh(const polyTopoChangeMap&);
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Move points
-            virtual bool movePoints();
-
             //- Reordered/removed trailing patches. If validBoundary call is
             //  parallel synced and all add the same patch with same settings
             virtual void reorderPatches
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
index 0d71af3e4a..7ae9eae6f6 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.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
@@ -77,10 +77,10 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField&) = 0;
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&) = 0;
+        virtual void initTopoChange(PstreamBuffers&) = 0;
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&) = 0;
+        virtual void topoChange(PstreamBuffers&) = 0;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
index 1f59e5a1b9..ff2e413561 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.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
@@ -62,16 +62,16 @@ void Foam::cyclicPointPatch::movePoints(PstreamBuffers&, const pointField&)
 {}
 
 
-void Foam::cyclicPointPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::cyclicPointPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    facePointPatch::initUpdateMesh(pBufs);
+    facePointPatch::initTopoChange(pBufs);
     cyclicPointPatch::initCalcGeometry(pBufs);
 }
 
 
-void Foam::cyclicPointPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::cyclicPointPatch::topoChange(PstreamBuffers& pBufs)
 {
-    facePointPatch::updateMesh(pBufs);
+    facePointPatch::topoChange(pBufs);
     cyclicPointPatch::calcGeometry(pBufs);
 }
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
index f3ea14973f..e58f02da0b 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.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
@@ -82,10 +82,10 @@ class cyclicPointPatch
         virtual void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
index 637f078580..f64e6bcdaa 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.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
@@ -88,16 +88,16 @@ void Foam::processorPointPatch::movePoints(PstreamBuffers&, const pointField&)
 {}
 
 
-void Foam::processorPointPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::processorPointPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    facePointPatch::initUpdateMesh(pBufs);
+    facePointPatch::initTopoChange(pBufs);
     processorPointPatch::initCalcGeometry(pBufs);
 }
 
 
-void Foam::processorPointPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::processorPointPatch::topoChange(PstreamBuffers& pBufs)
 {
-    facePointPatch::updateMesh(pBufs);
+    facePointPatch::topoChange(pBufs);
     processorPointPatch::calcGeometry(pBufs);
 }
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
index 30c1259caf..9598672114 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.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
@@ -81,10 +81,10 @@ class processorPointPatch
         virtual void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
         //- Disallow default bitwise copy construction
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.C
index 41ed0dbcc2..3d1edfc8c6 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.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
@@ -66,13 +66,13 @@ void facePointPatch::movePoints(PstreamBuffers&, const pointField&)
 {}
 
 
-void facePointPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void facePointPatch::initTopoChange(PstreamBuffers& pBufs)
 {
     facePointPatch::initCalcGeometry(pBufs);
 }
 
 
-void facePointPatch::updateMesh(PstreamBuffers&)
+void facePointPatch::topoChange(PstreamBuffers&)
 {}
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
index 5a4767ec22..d0f15861ff 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.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
@@ -79,10 +79,10 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
index 6677bfdf5e..4aeffeaf0f 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.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
@@ -86,11 +86,11 @@ protected:
         {}
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&)
+        virtual void initTopoChange(PstreamBuffers&)
         {}
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&)
+        virtual void topoChange(PstreamBuffers&)
         {}
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 0006eb4459..ae8df070b4 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1784,7 +1784,7 @@ Foam::globalMeshData::globalMeshData(const polyMesh& mesh)
     sharedEdgeLabelsPtr_(nullptr),
     sharedEdgeAddrPtr_(nullptr)
 {
-    updateMesh();
+    topoChange();
 }
 
 
@@ -2761,7 +2761,7 @@ void Foam::globalMeshData::movePoints(const pointField& newPoints)
 }
 
 
-void Foam::globalMeshData::updateMesh()
+void Foam::globalMeshData::topoChange()
 {
     // Clear out old data
     clearOut();
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 8cfd3d44e4..c979a5ab6e 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -626,7 +626,7 @@ public:
             //- Change global mesh data given a topological change. Does a
             //  full parallel analysis to determine shared points and
             //  boundaries.
-            void updateMesh();
+            void topoChange();
 
 
     // Member Operators
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index f53e23dade..6a80f59854 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.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
@@ -1056,7 +1056,7 @@ void Foam::polyBoundaryMesh::movePoints(const pointField& p)
 }
 
 
-void Foam::polyBoundaryMesh::updateMesh()
+void Foam::polyBoundaryMesh::topoChange()
 {
     nbrEdgesPtr_.clear();
     patchIDPtr_.clear();
@@ -1072,14 +1072,14 @@ void Foam::polyBoundaryMesh::updateMesh()
     {
         forAll(*this, patchi)
         {
-            operator[](patchi).initUpdateMesh(pBufs);
+            operator[](patchi).initTopoChange(pBufs);
         }
 
         pBufs.finishedSends();
 
         forAll(*this, patchi)
         {
-            operator[](patchi).updateMesh(pBufs);
+            operator[](patchi).topoChange(pBufs);
         }
     }
     else if (Pstream::defaultCommsType == Pstream::commsTypes::scheduled)
@@ -1095,11 +1095,11 @@ void Foam::polyBoundaryMesh::updateMesh()
 
             if (patchSchedule[patchEvali].init)
             {
-                operator[](patchi).initUpdateMesh(pBufs);
+                operator[](patchi).initTopoChange(pBufs);
             }
             else
             {
-                operator[](patchi).updateMesh(pBufs);
+                operator[](patchi).topoChange(pBufs);
             }
         }
     }
@@ -1123,7 +1123,7 @@ void Foam::polyBoundaryMesh::renamePatches
 
     if (validBoundary)
     {
-        updateMesh();
+        topoChange();
     }
 }
 
@@ -1149,7 +1149,7 @@ void Foam::polyBoundaryMesh::reorderPatches
 
     if (validBoundary)
     {
-        updateMesh();
+        topoChange();
     }
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index da1429a14b..037e97dbb2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.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
@@ -219,16 +219,16 @@ public:
         void movePoints(const pointField&);
 
         //- Correct polyBoundaryMesh after topology update
-        void updateMesh();
+        void topoChange();
 
-        //- Rename the patches. If validBoundary is set this calls updateMesh()
+        //- Rename the patches. If validBoundary is set this calls topoChange()
         //  after reordering to recalculate data (so the call needs to be
         //  parallel synchronised).
         void renamePatches(const wordUList& newNames, const bool validBoundary);
 
         //- Reorders the patches. Ordering does not have to be done in
         //  ascending or descending order. Reordering has to be unique (is a
-        //  shuffle). If validBoundary is set this calls updateMesh() after
+        //  shuffle). If validBoundary is set this calls topoChange() after
         //  reordering to recalculate data (so the call needs to be parallel
         //  synchronised).
         void reorderPatches
diff --git a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMap.H b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMap.H
index 95eab374f0..0d30d2b5f9 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMap.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMap.H
@@ -551,19 +551,12 @@ public:
             //  storage (local data first, then non-local data)
             void printLayout(Ostream& os) const;
 
-            //- Correct for topo change.
-            void updateMesh(const polyTopoChangeMap&)
-            {
-                notImplemented
-                (
-                    "distributionMap::updateMesh(const polyTopoChangeMap&)"
-                );
-            }
 
     // Member Operators
 
         void operator=(const distributionMap&);
 
+
     // IOstream Operators
 
         //- Read dictionary from Istream
@@ -571,7 +564,6 @@ public:
 
         //- Write dictionary to Ostream
         friend Ostream& operator<<(Ostream&, const distributionMap&);
-
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMapBase.H b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMapBase.H
index 95ea2af1bf..eb87084593 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMapBase.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMapBase.H
@@ -81,11 +81,9 @@ SourceFiles
 namespace Foam
 {
 
-class polyTopoChangeMap;
 class globalIndex;
 class PstreamBuffers;
 
-
 // Forward declaration of friend functions and operators
 
 class distributionMapBase;
@@ -455,12 +453,6 @@ public:
             //  storage (local data first, then non-local data)
             void printLayout(Ostream& os) const;
 
-            //- Correct for topo change.
-            void updateMesh(const polyTopoChangeMap&)
-            {
-                NotImplemented;
-            }
-
 
     // Member Operators
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/lagrangianDistributionMap.H b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/lagrangianDistributionMap.H
index c611fc4561..4fcde4a8db 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/lagrangianDistributionMap.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/lagrangianDistributionMap.H
@@ -42,8 +42,6 @@ SourceFiles
 namespace Foam
 {
 
-class polyTopoChangeMap;
-
 /*---------------------------------------------------------------------------*\
                    Class lagrangianDistributionMap Declaration
 \*---------------------------------------------------------------------------*/
@@ -102,12 +100,6 @@ public:
             {
                 particleMap_.distribute(lst);
             }
-
-            //- Correct for topo change.
-            void updateMesh(const polyTopoChangeMap&)
-            {
-                NotImplemented;
-            }
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/polyDistributionMap.H b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/polyDistributionMap.H
index bfdc481cb8..5e51ab84d9 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/polyDistributionMap.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/polyDistributionMap.H
@@ -48,10 +48,8 @@ SourceFiles
 namespace Foam
 {
 
-class polyTopoChangeMap;
 class polyMesh;
 
-
 // Forward declaration of friend functions and operators
 
 class polyDistributionMap;
@@ -277,13 +275,6 @@ public:
             void distributePatchIndices(labelList& patchIDs) const;
 
 
-            //- Correct for topo change.
-            void updateMesh(const polyTopoChangeMap&)
-            {
-                NotImplemented;
-            }
-
-
     // Member Operators
 
         void operator=(const polyDistributionMap&);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 034e0569de..8b2cc10812 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.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
@@ -321,7 +321,7 @@ Foam::polyMesh::polyMesh(const IOobject& io)
     }
 
     // Calculate topology for the patches (processor-processor comms etc.)
-    boundary_.updateMesh();
+    boundary_.topoChange();
 
     // Calculate the geometry for the patches (transformation tensors etc.)
     boundary_.calcGeometry();
@@ -750,7 +750,7 @@ void Foam::polyMesh::resetPrimitives
         // processor-processor comms.
 
         // Calculate topology for the patches (processor-processor comms etc.)
-        boundary_.updateMesh();
+        boundary_.topoChange();
 
         // Calculate the geometry for the patches (transformation tensors etc.)
         boundary_.calcGeometry();
@@ -939,7 +939,7 @@ void Foam::polyMesh::addPatches
     if (validBoundary)
     {
         // Calculate topology for the patches (processor-processor comms etc.)
-        boundary_.updateMesh();
+        boundary_.topoChange();
 
         // Calculate the geometry for the patches (transformation tensors etc.)
         boundary_.calcGeometry();
@@ -1119,7 +1119,7 @@ void Foam::polyMesh::addPatch
 
     if (validBoundary)
     {
-        boundary_.updateMesh();
+        boundary_.topoChange();
     }
 
     // Warn mesh objects
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index a89a1ea445..5f6dd6f3c3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -64,6 +64,7 @@ namespace Foam
 // Forward declaration of classes
 class globalMeshData;
 class polyTopoChangeMap;
+class polyMeshMap;
 class polyDistributionMap;
 class polyMeshTetDecomposition;
 class treeDataCell;
@@ -606,8 +607,11 @@ public:
             //  time directories
             virtual readUpdateState readUpdate();
 
-            //- Update the mesh topology from the given map
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap& map);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index c3b446dd2f..0da0f9abc3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.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
@@ -84,7 +84,7 @@ void Foam::polyMesh::clearAddressing(const bool isMeshUpdate)
 
     if (isMeshUpdate)
     {
-        // Part of a mesh update. Keep meshObjects that have an updateMesh
+        // Part of a mesh update. Keep meshObjects that have an topoChange
         // callback
         meshObject::clearUpto
         <
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 8338e414e0..3472587a3b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -660,7 +660,7 @@ Foam::polyMesh::polyMesh
     if (syncPar)
     {
         // Calculate topology for the patches (processor-processor comms etc.)
-        boundary_.updateMesh();
+        boundary_.topoChange();
 
         // Calculate the geometry for the patches (transformation tensors etc.)
         boundary_.calcGeometry();
@@ -941,7 +941,7 @@ Foam::polyMesh::polyMesh
     if (syncPar)
     {
         // Calculate topology for the patches (processor-processor comms etc.)
-        boundary_.updateMesh();
+        boundary_.topoChange();
 
         // Calculate the geometry for the patches (transformation tensors etc.)
         boundary_.calcGeometry();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 26d5fb5e26..fbc63abfe0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.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
@@ -264,7 +264,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         // data.
 
         // Calculate topology for the patches (processor-processor comms etc.)
-        boundary_.updateMesh();
+        boundary_.topoChange();
 
         // Calculate the geometry for the patches (transformation tensors etc.)
         boundary_.calcGeometry();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshMap/polyMeshMap.C b/src/OpenFOAM/meshes/polyMesh/polyMeshMap/polyMeshMap.C
new file mode 100644
index 0000000000..ef069b7b26
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshMap/polyMeshMap.C
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polyMeshMap.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::polyMeshMap::polyMeshMap()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshMap/polyMeshMap.H b/src/OpenFOAM/meshes/polyMesh/polyMeshMap/polyMeshMap.H
new file mode 100644
index 0000000000..2415671db8
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshMap/polyMeshMap.H
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::polyMeshMap
+
+Description
+    Class containing mesh-to-mesh mapping information.
+
+SourceFiles
+    polyMeshMap.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef polyMeshMap_H
+#define polyMeshMap_H
+
+#include "polyMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                       Class polyMeshMap Declaration
+\*---------------------------------------------------------------------------*/
+
+class polyMeshMap
+{
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        polyMeshMap();
+
+        //- Disallow default bitwise copy construction
+        polyMeshMap(const polyMeshMap&) = delete;
+
+
+    // Member Functions
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index cb15985b72..17829b6b20 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
@@ -36,7 +36,7 @@ Description
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::polyMesh::updateMesh(const polyTopoChangeMap& map)
+void Foam::polyMesh::topoChange(const polyTopoChangeMap& map)
 {
     if (debug)
     {
@@ -46,7 +46,7 @@ void Foam::polyMesh::updateMesh(const polyTopoChangeMap& map)
     }
 
     // Update boundaryMesh (note that patches themselves already ok)
-    boundary_.updateMesh();
+    boundary_.topoChange();
 
     // Update zones
     pointZones_.clearAddressing();
@@ -62,7 +62,7 @@ void Foam::polyMesh::updateMesh(const polyTopoChangeMap& map)
     // Update parallel data
     if (globalMeshDataPtr_.valid())
     {
-        globalMeshDataPtr_->updateMesh();
+        globalMeshDataPtr_->topoChange();
     }
 
     setInstance(time().timeName());
@@ -116,14 +116,21 @@ void Foam::polyMesh::updateMesh(const polyTopoChangeMap& map)
         }
     }
 
-    meshObject::updateMesh<polyMesh>(*this, map);
-    meshObject::updateMesh<pointMesh>(*this, map);
+    meshObject::topoChange<polyMesh>(*this, map);
+    meshObject::topoChange<pointMesh>(*this, map);
 
     // Reset valid directions (could change by faces put into empty patches)
     geometricD_ = Zero;
     solutionD_ = Zero;
 
-    const_cast<Time&>(time()).functionObjects().updateMesh(map);
+    const_cast<Time&>(time()).functionObjects().topoChange(map);
+}
+
+
+void Foam::polyMesh::mapMesh(const polyMeshMap& map)
+{
+    meshObject::mapMesh<polyMesh>(*this, map);
+    meshObject::mapMesh<pointMesh>(*this, map);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index 42d4d7d7b9..7913b98934 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.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
@@ -148,10 +148,10 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField&) = 0;
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&) = 0;
+        virtual void initTopoChange(PstreamBuffers&) = 0;
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&) = 0;
+        virtual void topoChange(PstreamBuffers&) = 0;
 
         //- Write a patch in OBJ format
         static void writeOBJ
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 7e7d14130f..e16cd2a80b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.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
@@ -103,15 +103,15 @@ void Foam::cyclicPolyPatch::movePoints
 }
 
 
-void Foam::cyclicPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::cyclicPolyPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    polyPatch::initUpdateMesh(pBufs);
+    polyPatch::initTopoChange(pBufs);
 }
 
 
-void Foam::cyclicPolyPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::cyclicPolyPatch::topoChange(PstreamBuffers& pBufs)
 {
-    polyPatch::updateMesh(pBufs);
+    polyPatch::topoChange(pBufs);
     deleteDemandDrivenData(coupledPointsPtr_);
     deleteDemandDrivenData(coupledEdgesPtr_);
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index d5c6f6a1b8..d38227c4f6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.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
@@ -132,10 +132,10 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
         //- Reset the patch name
         virtual void rename(const wordList& newNames);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index ed574066c8..4e9ba0167d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.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
@@ -318,9 +318,9 @@ void Foam::processorPolyPatch::movePoints
 }
 
 
-void Foam::processorPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::processorPolyPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    polyPatch::initUpdateMesh(pBufs);
+    polyPatch::initTopoChange(pBufs);
 
     if (Pstream::parRun())
     {
@@ -365,10 +365,10 @@ void Foam::processorPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
 }
 
 
-void Foam::processorPolyPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::processorPolyPatch::topoChange(PstreamBuffers& pBufs)
 {
     // For completeness
-    polyPatch::updateMesh(pBufs);
+    polyPatch::topoChange(pBufs);
 
     nbrPointsPtr_.clear();
     nbrEdgesPtr_.clear();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index b4adca8c28..1bd4729772 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.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
@@ -112,10 +112,10 @@ protected:
         void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index 7e7e56d3a6..3507a6765c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -238,16 +238,16 @@ void Foam::processorCyclicPolyPatch::movePoints
 }
 
 
-void Foam::processorCyclicPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::processorCyclicPolyPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    processorPolyPatch::initUpdateMesh(pBufs);
+    processorPolyPatch::initTopoChange(pBufs);
 }
 
 
-void Foam::processorCyclicPolyPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::processorCyclicPolyPatch::topoChange(PstreamBuffers& pBufs)
 {
      referPatchID_ = -1;
-     processorPolyPatch::updateMesh(pBufs);
+     processorPolyPatch::topoChange(pBufs);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
index 42dad546a5..5c3c3ff2c2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
@@ -98,10 +98,10 @@ protected:
         void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index 96110966c2..ff0af6a1ee 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.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
@@ -60,7 +60,7 @@ void Foam::polyPatch::movePoints(PstreamBuffers&, const pointField& p)
 }
 
 
-void Foam::polyPatch::updateMesh(PstreamBuffers&)
+void Foam::polyPatch::topoChange(PstreamBuffers&)
 {
     primitivePatch::clearGeom();
     clearAddressing();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 2e84840715..105043acc3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.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
@@ -113,11 +113,11 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField& p);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&)
+        virtual void initTopoChange(PstreamBuffers&)
         {}
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
         //- Clear geometry
         virtual void clearGeom();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyTopoChangeMap/mapAddedPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyTopoChangeMap/mapAddedPolyMesh.H
index 5785fb6df4..3db792e73d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyTopoChangeMap/mapAddedPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyTopoChangeMap/mapAddedPolyMesh.H
@@ -227,7 +227,7 @@ public:
 
         // Edit
 
-            void updateMesh(const polyTopoChangeMap&)
+            void topoChange(const polyTopoChangeMap&)
             {
                 NotImplemented;
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 25b076711c..c162ac08b2 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -30,6 +30,7 @@ License
 #include "primitiveMesh.H"
 #include "demandDrivenData.H"
 #include "polyTopoChangeMap.H"
+#include "polyMeshMap.H"
 #include "syncTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -386,7 +387,7 @@ void Foam::faceZone::resetAddressing
 }
 
 
-void Foam::faceZone::updateMesh(const polyTopoChangeMap& map)
+void Foam::faceZone::topoChange(const polyTopoChangeMap& map)
 {
     clearAddressing();
 
@@ -416,6 +417,12 @@ void Foam::faceZone::updateMesh(const polyTopoChangeMap& map)
 }
 
 
+void Foam::faceZone::mapMesh(const polyMeshMap&)
+{
+    NotImplemented;
+}
+
+
 bool Foam::faceZone::checkDefinition(const bool report) const
 {
     return zone::checkDefinition(meshZones().mesh().faces().size(), report);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 26e4324f9d..bbc7e9cc24 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -51,6 +51,7 @@ namespace Foam
 {
 
 class polyTopoChangeMap;
+class polyMeshMap;
 
 // Forward declaration of friend functions and operators
 
@@ -290,8 +291,11 @@ public:
         //- Correct patch after moving points
         virtual void movePoints(const pointField&);
 
-        //- Update for changes in topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index 8961d617c6..0643f5664c 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -435,7 +435,7 @@ void Foam::attachDetach::setRefinement(polyTopoChange& ref) const
 }
 
 
-void Foam::attachDetach::updateMesh(const polyTopoChangeMap&)
+void Foam::attachDetach::topoChange(const polyTopoChangeMap&)
 {
     // Mesh has changed topologically.  Update local topological data
     const polyMesh& mesh = topoChanger().mesh();
diff --git a/src/dynamicMesh/attachDetach/attachDetach.H b/src/dynamicMesh/attachDetach/attachDetach.H
index a4833b6711..c3416c1936 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.H
+++ b/src/dynamicMesh/attachDetach/attachDetach.H
@@ -214,7 +214,7 @@ public:
         virtual void modifyMotionPoints(pointField& motionPoints) const;
 
         //- Force recalculation of locally stored data on topological change
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Get reference to trigger times
         const scalarField& triggerTimes() const
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
index 760b04d3ac..29424d0a52 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.C
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.C
@@ -903,7 +903,7 @@ void Foam::createShellMesh::setRefinement
 }
 
 
-void Foam::createShellMesh::updateMesh(const polyTopoChangeMap& map)
+void Foam::createShellMesh::topoChange(const polyTopoChangeMap& map)
 {
     inplaceReorder(map.reverseCellMap(), cellToFaceMap_);
     inplaceReorder(map.reverseFaceMap(), faceToFaceMap_);
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.H b/src/dynamicMesh/createShellMesh/createShellMesh.H
index fa5abff7da..2b41fd18c7 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.H
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.H
@@ -195,7 +195,7 @@ public:
     // Member Operators
 
             //- Update any locally stored mesh information.
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 };
 
 
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index ef8656dc0e..75b03895b2 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -341,7 +341,7 @@ void extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
         );
 
         // Update numbering on extruder.
-        extruder.updateMesh(map);
+        extruder.topoChange(map);
 
         this->setInstance(this->thisDb().time().constant());
         this->write();
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index feb715e8af..92fdf0e89c 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -562,7 +562,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::fvMeshDistribute::repatch
 
 
     // Do mapping of fields from one patchField to the other ourselves since
-    // is currently not supported by updateMesh.
+    // is currently not supported by topoChange.
 
     // Store boundary fields (we only do this for surfaceFields)
     PtrList<FieldField<fvsPatchField, scalar>> sFlds;
@@ -1308,11 +1308,11 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::fvMeshDistribute::doRemoveCells
 
 void Foam::fvMeshDistribute::mapFields(const polyTopoChangeMap& map)
 {
-    meshObject::updateMesh<polyMesh>(mesh_, map);
-    meshObject::updateMesh<pointMesh>(mesh_, map);
+    meshObject::topoChange<polyMesh>(mesh_, map);
+    meshObject::topoChange<pointMesh>(mesh_, map);
     mesh_.mapFields(map);
-    meshObject::updateMesh<fvMesh>(mesh_, map);
-    meshObject::updateMesh<lduMesh>(mesh_, map);
+    meshObject::topoChange<fvMesh>(mesh_, map);
+    meshObject::topoChange<lduMesh>(mesh_, map);
 }
 
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index 458247c80c..88baed22d2 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -431,11 +431,11 @@ void Foam::layerAdditionRemoval::setRefinement(polyTopoChange& ref) const
 }
 
 
-void Foam::layerAdditionRemoval::updateMesh(const polyTopoChangeMap&)
+void Foam::layerAdditionRemoval::topoChange(const polyTopoChangeMap&)
 {
     if (debug)
     {
-        Pout<< "layerAdditionRemoval::updateMesh(const polyTopoChangeMap&) "
+        Pout<< "layerAdditionRemoval::topoChange(const polyTopoChangeMap&) "
             << "for object " << name() << " : "
             << "Clearing addressing on external request";
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
index 11c30f6888..c022593cca 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
@@ -185,7 +185,7 @@ public:
         virtual void modifyMotionPoints(pointField& motionPoints) const;
 
         //- Force recalculation of locally stored data on topological change
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
         // Edit
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index 5f14d041ab..a4d427af19 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -829,7 +829,7 @@ void Foam::boundaryCutter::setRefinement
 }
 
 
-void Foam::boundaryCutter::updateMesh(const polyTopoChangeMap& map)
+void Foam::boundaryCutter::topoChange(const polyTopoChangeMap& map)
 {
     // Update stored labels for mesh change.
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
index 1be1ec8719..0de8f35cc1 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
@@ -150,7 +150,7 @@ public:
             );
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
 
         // Access
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index 5f5b02bedc..129895caf4 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -1264,7 +1264,7 @@ void Foam::meshCutAndRemove::setRefinement
 }
 
 
-void Foam::meshCutAndRemove::updateMesh(const polyTopoChangeMap& map)
+void Foam::meshCutAndRemove::topoChange(const polyTopoChangeMap& map)
 {
     // Update stored labels for mesh change.
     {
@@ -1287,7 +1287,7 @@ void Foam::meshCutAndRemove::updateMesh(const polyTopoChangeMap& map)
                  && (newCelli != celli || newAddedFacei != addedFacei)
                 )
                 {
-                    Pout<< "meshCutAndRemove::updateMesh :"
+                    Pout<< "meshCutAndRemove::topoChange :"
                         << " updating addedFace for cell " << celli
                         << " from " << addedFacei
                         << " to " << newAddedFacei
@@ -1332,7 +1332,7 @@ void Foam::meshCutAndRemove::updateMesh(const polyTopoChangeMap& map)
                  && (e != newE || newAddedPointi != addedPointi)
                 )
                 {
-                    Pout<< "meshCutAndRemove::updateMesh :"
+                    Pout<< "meshCutAndRemove::topoChange :"
                         << " updating addedPoints for edge " << e
                         << " from " << addedPointi
                         << " to " << newAddedPointi
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
index aa167d3a69..b93c86ac82 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
@@ -207,7 +207,7 @@ public:
             );
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
 
         // Access
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index 9284013365..b62030208a 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -995,7 +995,7 @@ void Foam::meshCutter::setRefinement
 }
 
 
-void Foam::meshCutter::updateMesh(const polyTopoChangeMap& map)
+void Foam::meshCutter::topoChange(const polyTopoChangeMap& map)
 {
     // Update stored labels for mesh change.
 
@@ -1021,7 +1021,7 @@ void Foam::meshCutter::updateMesh(const polyTopoChangeMap& map)
                  && (newCelli != celli || newAddedCelli != addedCelli)
                 )
                 {
-                    Pout<< "meshCutter::updateMesh :"
+                    Pout<< "meshCutter::topoChange :"
                         << " updating addedCell for cell " << celli
                         << " from " << addedCelli
                         << " to " << newAddedCelli << endl;
@@ -1054,7 +1054,7 @@ void Foam::meshCutter::updateMesh(const polyTopoChangeMap& map)
                  && (newCelli != celli || newAddedFacei != addedFacei)
                 )
                 {
-                    Pout<< "meshCutter::updateMesh :"
+                    Pout<< "meshCutter::topoChange :"
                         << " updating addedFace for cell " << celli
                         << " from " << addedFacei
                         << " to " << newAddedFacei
@@ -1099,7 +1099,7 @@ void Foam::meshCutter::updateMesh(const polyTopoChangeMap& map)
                  && (e != newE || newAddedPointi != addedPointi)
                 )
                 {
-                    Pout<< "meshCutter::updateMesh :"
+                    Pout<< "meshCutter::topoChange :"
                         << " updating addedPoints for edge " << e
                         << " from " << addedPointi
                         << " to " << newAddedPointi
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
index bdd9f5d234..b12c3b2b3e 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
@@ -284,7 +284,7 @@ public:
             void setRefinement(const cellCuts& cuts, polyTopoChange& meshMod);
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
 
         // Access
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index e20ad63a6d..baaa7e168f 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -338,7 +338,7 @@ void Foam::multiDirRefinement::refineHex8
             << mesh.time().timeName() << endl;
     }
 
-    hexRefiner.updateMesh(map);
+    hexRefiner.topoChange(map);
 
     // Collect all cells originating from same old cell (original + 7 extra)
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
index e963b49387..7260bf384b 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
@@ -177,7 +177,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
         }
 
         // Update stored refinement pattern
-        meshRefiner_.updateMesh(map());
+        meshRefiner_.topoChange(map());
 
         // Write resulting mesh
         if (writeMesh_)
@@ -207,7 +207,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
         );
 
         // Get all added cells from cellCutter (already in new numbering
-        // from meshRefiner.updateMesh call) and add to global list of added
+        // from meshRefiner.topoChange call) and add to global list of added
         const Map<label>& addedNow = meshRefiner_.addedCells();
 
         forAllConstIter(Map<label>, addedNow, iter)
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index b2ddd97c57..45f16b2311 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -321,15 +321,15 @@ void Foam::undoableMeshCutter::setRefinement
 }
 
 
-void Foam::undoableMeshCutter::updateMesh(const polyTopoChangeMap& map)
+void Foam::undoableMeshCutter::topoChange(const polyTopoChangeMap& map)
 {
     // Update mesh cutter for new labels.
-    meshCutter::updateMesh(map);
+    meshCutter::topoChange(map);
 
     // No need to update cell walker for new labels since does not store any.
 
     // Update faceRemover for new labels
-    faceRemover_.updateMesh(map);
+    faceRemover_.topoChange(map);
 
     if (undoable_)
     {
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
index 387d764eaf..8bfc6b70c2 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
@@ -33,7 +33,7 @@ Description
     Undo list: contains a refinement tree (of type splitCell; cell labels are
     of no consequence) and a list of visible splitCells, i.e. the top of the
     tree (where the cell labels are valid). Now every cell added gets put on
-    the tree and every updateMesh action updates the labels of visible
+    the tree and every topoChange action updates the labels of visible
     splitcells.
 
     We can now ask this structure for a list of visible split cells or the list
@@ -175,7 +175,7 @@ public:
 
             //- Update stored refinement pattern for changes to mesh. Only
             //  call if undoable set.
-            void updateMesh(const polyTopoChangeMap& map);
+            void topoChange(const polyTopoChangeMap& map);
 
             //- Calculate split faces from current liveCells. Only
             //  call if undoable set.
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index 67ab114cb6..1638629eb5 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -368,7 +368,7 @@ Foam::motionSmootherAlgo::motionSmootherAlgo
     paramDict_(paramDict),
     isInternalPoint_(mesh_.nPoints(), 1)
 {
-    updateMesh();
+    topoChange();
 }
 
 
@@ -1032,7 +1032,7 @@ bool Foam::motionSmootherAlgo::scaleMesh
 }
 
 
-void Foam::motionSmootherAlgo::updateMesh()
+void Foam::motionSmootherAlgo::topoChange()
 {
     const pointBoundaryMesh& patches = pMesh_.boundary();
 
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
index f04aec3d49..5b8ad056a9 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.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
@@ -420,7 +420,7 @@ public:
             void movePoints();
 
             //- Update for new mesh topology
-            void updateMesh();
+            void topoChange();
 
 
             //- Check mesh with mesh settings in dict. Collects incorrect faces
diff --git a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
index 9665354156..002695f58e 100644
--- a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
@@ -140,7 +140,7 @@ void Foam::componentDisplacementMotionSolver::movePoints(const pointField& p)
 }
 
 
-void Foam::componentDisplacementMotionSolver::updateMesh
+void Foam::componentDisplacementMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
@@ -198,6 +198,13 @@ void Foam::componentDisplacementMotionSolver::updateMesh
 }
 
 
+void Foam::componentDisplacementMotionSolver::mapMesh(const polyMeshMap& map)
+{
+    points0_ == mesh().points().component(cmpt_);
+    pointDisplacement_ == Zero;
+}
+
+
 void Foam::componentDisplacementMotionSolver::distribute
 (
     const polyDistributionMap& map
diff --git a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
index 3a4d4b8886..651d20c875 100644
--- a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
@@ -126,7 +126,10 @@ public:
         virtual void movePoints(const pointField&);
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C
index a6241a4ada..f28c3f790f 100644
--- a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C
@@ -105,15 +105,22 @@ void Foam::componentVelocityMotionSolver::movePoints(const pointField& p)
 }
 
 
-void Foam::componentVelocityMotionSolver::updateMesh
+void Foam::componentVelocityMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    // pointMesh already updates pointFields.
+    // fvMesh updates pointFields.
 }
 
 
+void Foam::componentVelocityMotionSolver::mapMesh
+(
+    const polyMeshMap& map
+)
+{}
+
+
 void Foam::componentVelocityMotionSolver::distribute
 (
     const polyDistributionMap& map
diff --git a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
index eef0ff94b0..3557252005 100644
--- a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
@@ -118,7 +118,10 @@ public:
         virtual void movePoints(const pointField&);
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C
index 905f6c4d67..89df5a0e5b 100644
--- a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,4 +64,13 @@ Foam::displacementMotionSolver::~displacementMotionSolver()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::displacementMotionSolver::mapMesh(const polyMeshMap& map)
+{
+    points0MotionSolver::mapMesh(map);
+    pointDisplacement_ == Zero;
+}
+
+
 // ************************************************************************* //
diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H
index 362dc0f35d..ad9a45f6e9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,6 +99,9 @@ public:
             return pointDisplacement_;
         }
 
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
+
 
     // Member Operators
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index b536706794..15dd37e245 100644
--- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -556,7 +556,7 @@ void Foam::displacementLayeredMotionMotionSolver::solve()
 }
 
 
-void Foam::displacementLayeredMotionMotionSolver::updateMesh
+void Foam::displacementLayeredMotionMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
@@ -566,7 +566,7 @@ void Foam::displacementLayeredMotionMotionSolver::updateMesh
         << "    Needs to be updated and tested."
         << exit(FatalError);
 
-    displacementMotionSolver::updateMesh(map);
+    displacementMotionSolver::topoChange(map);
 
     const vectorField displacement(this->newPoints() - points0_);
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
index b19a61bafe..314902cde9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
@@ -146,7 +146,7 @@ public:
         virtual void solve();
 
         //- Update topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
index 6c84c5cab3..7aaaf2856d 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
@@ -151,12 +151,18 @@ void Foam::points0MotionSolver::movePoints(const pointField&)
 {}
 
 
-void Foam::points0MotionSolver::updateMesh(const polyTopoChangeMap& map)
+void Foam::points0MotionSolver::topoChange(const polyTopoChangeMap& map)
 {
     NotImplemented;
 }
 
 
+void Foam::points0MotionSolver::mapMesh(const polyMeshMap& map)
+{
+    points0_ == mesh().points();
+}
+
+
 void Foam::points0MotionSolver::distribute
 (
     const polyDistributionMap& map
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
index e6286b25f9..53fe73bba7 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
@@ -106,7 +106,10 @@ public:
         virtual void movePoints(const pointField&);
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.C
index 3165a7863c..d1b4361fc9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.C
@@ -180,7 +180,7 @@ Foam::tmp<Foam::pointField> Foam::solidBodyMotionSolver::curPoints() const
 }
 
 
-void Foam::solidBodyMotionSolver::updateMesh(const polyTopoChangeMap& map)
+void Foam::solidBodyMotionSolver::topoChange(const polyTopoChangeMap& map)
 {
     // pointMesh already updates pointFields
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.H
index 11d1edc0df..02b2e7b7b3 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.H
@@ -63,7 +63,7 @@ class solidBodyMotionSolver
         //- Flag to indicate whether all cells should move
         bool moveAllCells_;
 
-        //- Cache the current transform for updateMesh
+        //- Cache the current transform for topoChange
         mutable septernion transform_;
 
 
@@ -100,7 +100,7 @@ public:
         {}
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index a106b6a23e..ec358cb2b9 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.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
@@ -24,6 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "motionSolverList.H"
+#include "polyMesh.H"
+#include "dictionaryEntry.H"
 #include "twoDPointCorrector.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
index d431b6e28b..d74b43e710 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
@@ -37,8 +37,7 @@ SourceFiles
 
 #include "pointField.H"
 #include "Time.H"
-#include "polyMesh.H"
-#include "dictionaryEntry.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,6 +47,7 @@ namespace Foam
 // Forward class declarations
 class polyMesh;
 class polyTopoChangeMap;
+class polyMeshMap;
 class polyDistributionMap;
 
 /*---------------------------------------------------------------------------*\
@@ -148,11 +148,14 @@ public:
         virtual void movePoints(const pointField&) = 0;
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&) = 0;
+        virtual void topoChange(const polyTopoChangeMap&) = 0;
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&) = 0;
 
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&) = 0;
+
         //- Optionally write motion state information for restart
         virtual bool write() const;
 };
diff --git a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.C b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.C
index ed490aa568..7801e286df 100644
--- a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.C
+++ b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "motionSolverList.H"
+#include "polyMesh.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -95,20 +96,20 @@ void Foam::motionSolverList::solve()
 }
 
 
-void Foam::motionSolverList::movePoints(const pointField& points)
+void Foam::motionSolverList::topoChange(const polyTopoChangeMap& map)
 {
     forAll(motionSolvers_, i)
     {
-        motionSolvers_[i].movePoints(points);
+        motionSolvers_[i].topoChange(map);
     }
 }
 
 
-void Foam::motionSolverList::updateMesh(const polyTopoChangeMap& map)
+void Foam::motionSolverList::mapMesh(const polyMeshMap& map)
 {
     forAll(motionSolvers_, i)
     {
-        motionSolvers_[i].updateMesh(map);
+        motionSolvers_[i].mapMesh(map);
     }
 }
 
@@ -125,4 +126,13 @@ void Foam::motionSolverList::distribute
 }
 
 
+void Foam::motionSolverList::movePoints(const pointField& points)
+{
+    forAll(motionSolvers_, i)
+    {
+        motionSolvers_[i].movePoints(points);
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H
index 30b1161a63..2c9cf0e139 100644
--- a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H
+++ b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H
@@ -90,7 +90,10 @@ public:
         virtual void movePoints(const pointField&);
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
index 2837caa674..0eebbd71e1 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
@@ -73,12 +73,16 @@ void Foam::velocityMotionSolver::movePoints(const pointField& p)
 }
 
 
-void Foam::velocityMotionSolver::updateMesh(const polyTopoChangeMap& map)
+void Foam::velocityMotionSolver::topoChange(const polyTopoChangeMap& map)
 {
-    // pointMesh updates pointFields.
+    // fvMesh updates pointFields.
 }
 
 
+void Foam::velocityMotionSolver::mapMesh(const polyMeshMap& map)
+{}
+
+
 void Foam::velocityMotionSolver::distribute(const polyDistributionMap&)
 {}
 
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
index 8f756f0b75..ebb230f6c8 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
@@ -109,7 +109,10 @@ public:
         virtual void movePoints(const pointField&);
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 63f6ec00c0..ecb4c529ae 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -483,7 +483,7 @@ void Foam::perfectInterface::modifyMotionPoints(pointField& motionPoints) const
 }
 
 
-void Foam::perfectInterface::updateMesh(const polyTopoChangeMap& map)
+void Foam::perfectInterface::topoChange(const polyTopoChangeMap& map)
 {
     // Mesh has changed topologically.  Update local topological data
     const polyMesh& mesh = topoChanger().mesh();
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.H b/src/dynamicMesh/perfectInterface/perfectInterface.H
index 455fafdbc6..aec10f8881 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.H
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.H
@@ -138,7 +138,7 @@ public:
         virtual void modifyMotionPoints(pointField& motionPoints) const;
 
         //- Force recalculation of locally stored data on topological change
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
index 63fe3dd026..ee4ea2f64d 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
@@ -88,7 +88,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::polyMeshFilter::copyMesh(const fvMesh& mesh)
     const polyTopoChangeMap& map = mapPtr();
 
     // Update fields
-    meshCopy().updateMesh(map);
+    meshCopy().topoChange(map);
     if (map.hasMotionPoints())
     {
         meshCopy().movePoints(map.preMotionPoints());
@@ -382,7 +382,7 @@ Foam::label Foam::polyMeshFilter::filterFaces
         const polyTopoChangeMap& newMap = newMapPtr();
 
         // Update fields
-        newMesh.updateMesh(newMap);
+        newMesh.topoChange(newMap);
         if (newMap.hasMotionPoints())
         {
             newMesh.movePoints(newMap.preMotionPoints());
@@ -499,7 +499,7 @@ Foam::label Foam::polyMeshFilter::filterEdges
     const polyTopoChangeMap& newMap = newMapPtr();
 
     // Update fields
-    newMesh.updateMesh(newMap);
+    newMesh.topoChange(newMap);
     if (newMap.hasMotionPoints())
     {
         newMesh.movePoints(newMap.preMotionPoints());
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
index 2efa2f3f3d..51bba643f1 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
@@ -39,7 +39,7 @@ void Foam::polyMeshFilter::updateSets(const polyTopoChangeMap& map)
     forAllIter(typename HashTable<const SetType*>, sets, iter)
     {
         SetType& set = const_cast<SetType&>(*iter());
-        set.updateMesh(map);
+        set.topoChange(map);
         set.sync(map.mesh());
     }
 
@@ -58,7 +58,7 @@ void Foam::polyMeshFilter::updateSets(const polyTopoChangeMap& map)
         {
             // Not in memory. Load it.
             SetType set(*iter());
-            set.updateMesh(map);
+            set.topoChange(map);
 
             set.write();
         }
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
index ca3b8926c6..1b7d32bf52 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
@@ -167,7 +167,7 @@ public:
         virtual void modifyMotionPoints(pointField& motionPoints) const = 0;
 
         //- Force recalculation of locally stored data on topological change
-        virtual void updateMesh(const polyTopoChangeMap&) = 0;
+        virtual void topoChange(const polyTopoChangeMap&) = 0;
 
 
         // Activation and deactivation
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index aea03db590..ded81ec193 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -1719,7 +1719,7 @@ void Foam::addPatchCellLayer::setRefinement
 }
 
 
-void Foam::addPatchCellLayer::updateMesh
+void Foam::addPatchCellLayer::topoChange
 (
     const polyTopoChangeMap& map,
     const labelList& faceMap,   // new to old patch faces
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index 63ce8a8a8e..e3b289d59b 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -384,7 +384,7 @@ public:
             //- Update any locally stored mesh information. Gets additional
             //  map from new to old patch (since patch needs to be
             //  recreated since has to be on outside).
-            void updateMesh
+            void topoChange
             (
                 const polyTopoChangeMap&,
                 const labelList& faceMap,   // new to old patch faces
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 2ad8543621..2f5ea9bea1 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -785,7 +785,7 @@ void Foam::combineFaces::setRefinement
 }
 
 
-void Foam::combineFaces::updateMesh(const polyTopoChangeMap& map)
+void Foam::combineFaces::topoChange(const polyTopoChangeMap& map)
 {
     if (undoable_)
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
index 3b066f8d2c..a08e688574 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
@@ -192,7 +192,7 @@ public:
             );
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
             //- Play commands into polyTopoChange to reinsert original faces.
             //  No other topo changes can be done in between setRefinement and
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
index d67b6534f9..23b29deb8f 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
@@ -206,7 +206,7 @@ void Foam::duplicatePoints::setRefinement
 }
 
 
-void Foam::duplicatePoints::updateMesh(const polyTopoChangeMap& map)
+void Foam::duplicatePoints::topoChange(const polyTopoChangeMap& map)
 {
     forAll(duplicates_, masterI)
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
index 2154ea104f..573a61dcbf 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
@@ -106,7 +106,7 @@ public:
             );
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
index ec44c07224..ae443c88d7 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
@@ -142,7 +142,7 @@ public:
             ) const;
 
             //- Update stored quantities for new mesh labels.
-            void updateMesh(const polyTopoChangeMap&)
+            void topoChange(const polyTopoChangeMap&)
             {}
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 013f49fd30..85662abdb2 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -4116,7 +4116,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
     }
 
     // Extend pointLevels and cellLevels for the new cells. Could also be done
-    // in updateMesh but saves passing cellAddedCells out of this routine.
+    // in topoChange but saves passing cellAddedCells out of this routine.
 
     // Check
     if (debug)
@@ -4234,15 +4234,15 @@ void Foam::hexRef8::storeData
 }
 
 
-void Foam::hexRef8::updateMesh(const polyTopoChangeMap& map)
+void Foam::hexRef8::topoChange(const polyTopoChangeMap& map)
 {
     Map<label> dummyMap(0);
 
-    updateMesh(map, dummyMap, dummyMap, dummyMap);
+    topoChange(map, dummyMap, dummyMap, dummyMap);
 }
 
 
-void Foam::hexRef8::updateMesh
+void Foam::hexRef8::topoChange
 (
     const polyTopoChangeMap& map,
     const Map<label>& pointsToRestore,
@@ -4253,7 +4253,7 @@ void Foam::hexRef8::updateMesh
     // Update celllevel
     if (debug)
     {
-        Pout<< "hexRef8::updateMesh :"
+        Pout<< "hexRef8::topoChange :"
             << " Updating various lists"
             << endl;
     }
@@ -4263,7 +4263,7 @@ void Foam::hexRef8::updateMesh
 
         if (debug)
         {
-            Pout<< "hexRef8::updateMesh :"
+            Pout<< "hexRef8::topoChange :"
                 << " reverseCellMap:" << map.reverseCellMap().size()
                 << " cellMap:" << map.cellMap().size()
                 << " nCells:" << mesh_.nCells()
@@ -4417,14 +4417,14 @@ void Foam::hexRef8::updateMesh
     // Update refinement tree
     if (history_.active())
     {
-        history_.updateMesh(map);
+        history_.topoChange(map);
     }
 
     // Mark files as changed
     setInstance(mesh_.facesInstance());
 
     // Update face removal engine
-    faceRemover_.updateMesh(map);
+    faceRemover_.topoChange(map);
 
     // Clear cell shapes
     cellShapesPtr_.clear();
@@ -5625,7 +5625,7 @@ void Foam::hexRef8::setUnrefinement
     // Mark files as changed
     setInstance(mesh_.facesInstance());
 
-    // history_.updateMesh will take care of truncating.
+    // history_.topoChange will take care of truncating.
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index d110731b64..a7a78b9d22 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -494,7 +494,7 @@ public:
             //  Called after the mesh change. setRefinement will already have
             //  made sure the pointLevel_ and cellLevel_ are the size of the new
             //  mesh so we only need to account for reordering.
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
 
             // Restoring : is where other processes delete and reinsert data.
@@ -513,7 +513,7 @@ public:
                 //- Update local numbering + undo
                 //  Data to restore given as new pointlabel + stored pointlabel
                 //  (i.e. what was in pointsToStore)
-                void updateMesh
+                void topoChange
                 (
                     const polyTopoChangeMap&,
                     const Map<label>& pointsToRestore,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
index 188152da02..ceac33107e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
@@ -326,7 +326,7 @@ void Foam::hexRef8Data::sync(const IOobject& io)
 }
 
 
-void Foam::hexRef8Data::updateMesh(const polyTopoChangeMap& map)
+void Foam::hexRef8Data::topoChange(const polyTopoChangeMap& map)
 {
     if (cellLevelPtr_.valid())
     {
@@ -343,7 +343,7 @@ void Foam::hexRef8Data::updateMesh(const polyTopoChangeMap& map)
 
     if (refHistoryPtr_.valid() && refHistoryPtr_().active())
     {
-        refHistoryPtr_().updateMesh(map);
+        refHistoryPtr_().topoChange(map);
         refHistoryPtr_().instance() = map.mesh().facesInstance();
     }
 }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
index 5581931655..8a42f33e75 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
@@ -112,7 +112,7 @@ public:
         void sync(const IOobject& io);
 
         //- In-place update for topology changes
-        void updateMesh(const polyTopoChangeMap&);
+        void topoChange(const polyTopoChangeMap&);
 
         //- In-place distribute
         void distribute(const polyDistributionMap&);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
index d98d6ece4c..7cf2903acc 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
@@ -1130,7 +1130,7 @@ void Foam::refinementHistory::resize(const label size)
 }
 
 
-void Foam::refinementHistory::updateMesh(const polyTopoChangeMap& map)
+void Foam::refinementHistory::topoChange(const polyTopoChangeMap& map)
 {
     if (active())
     {
@@ -1164,7 +1164,7 @@ void Foam::refinementHistory::updateMesh(const polyTopoChangeMap& map)
 
         if (debug)
         {
-            Pout<< "refinementHistory::updateMesh : from "
+            Pout<< "refinementHistory::topoChange : from "
                 << visibleCells_.size()
                 << " to " << newVisibleCells.size()
                 << " cells" << endl;
@@ -1204,7 +1204,7 @@ void Foam::refinementHistory::subset
 
         if (debug)
         {
-            Pout<< "refinementHistory::updateMesh : from "
+            Pout<< "refinementHistory::topoChange : from "
                 << visibleCells_.size()
                 << " to " << newVisibleCells.size()
                 << " cells" << endl;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
index df88dd0dee..16a3760d19 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
@@ -342,7 +342,7 @@ public:
         ) const;
 
         //- Update numbering for mesh changes
-        void updateMesh(const polyTopoChangeMap&);
+        void topoChange(const polyTopoChangeMap&);
 
         //- Update numbering for subsetting
         void subset
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.H
index ff4ce3ebff..009f521a70 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.H
@@ -113,7 +113,7 @@ public:
             ) const;
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&)
+            void topoChange(const polyTopoChangeMap&)
             {}
 };
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
index 56be090f19..31db46cc5e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
@@ -201,7 +201,7 @@ public:
         ) const;
 
         //- Force recalculation of locally stored data on topological change
-        void updateMesh(const polyTopoChangeMap&)
+        void topoChange(const polyTopoChangeMap&)
         {}
 
         //- Force recalculation of locally stored data for mesh distribution
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index 99f200ef83..4295468da0 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -453,7 +453,7 @@ void Foam::removePoints::setRefinement
 }
 
 
-void Foam::removePoints::updateMesh(const polyTopoChangeMap& map)
+void Foam::removePoints::topoChange(const polyTopoChangeMap& map)
 {
     if (undoable_)
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
index f6fe7bb9e6..139937e515 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
@@ -143,7 +143,7 @@ public:
             void setRefinement(const boolList&, polyTopoChange&);
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
             //- Given set of faces to restore calculates a consistent set of
             //  saved faces (indices into savedFaces_) and saved vertices
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
index 0b49883b3d..3279eca788 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
@@ -694,7 +694,7 @@ void Foam::tetDecomposer::setRefinement
 }
 
 
-void Foam::tetDecomposer::updateMesh(const polyTopoChangeMap& map)
+void Foam::tetDecomposer::topoChange(const polyTopoChangeMap& map)
 {
     inplaceRenumber(map.reversePointMap(), cellToPoint_);
     inplaceRenumber(map.reversePointMap(), faceToPoint_);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
index b517935769..1fa5b5f921 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
@@ -185,7 +185,7 @@ public:
             );
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
index 694151336e..5328a8c5b2 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
@@ -244,7 +244,7 @@ void Foam::polyTopoChanger::update(const polyTopoChangeMap& m)
 
     forAll(topoChanges, morphI)
     {
-        topoChanges[morphI].updateMesh(m);
+        topoChanges[morphI].topoChange(m);
     }
 
     // Force the mesh modifiers to auto-write.  This allows us to
@@ -277,7 +277,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChanger::changeMesh
         );
 
         update(topoChangeMap());
-        mesh_.updateMesh(topoChangeMap());
+        mesh_.topoChange(topoChangeMap());
         return topoChangeMap;
     }
     else
diff --git a/src/dynamicMesh/setUpdater/setUpdater.C b/src/dynamicMesh/setUpdater/setUpdater.C
index 9b3286c998..d9edd8659f 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.C
+++ b/src/dynamicMesh/setUpdater/setUpdater.C
@@ -88,12 +88,12 @@ void Foam::setUpdater::modifyMotionPoints(pointField&) const
 {}
 
 
-void Foam::setUpdater::updateMesh(const polyTopoChangeMap& map)
+void Foam::setUpdater::topoChange(const polyTopoChangeMap& map)
 {
     // Mesh has changed topologically. Update all sets.
     if (debug)
     {
-        Pout<< "setUpdater::updateMesh(const polyTopoChangeMap& map)"
+        Pout<< "setUpdater::topoChange(const polyTopoChangeMap& map)"
             << endl;
     }
 
diff --git a/src/dynamicMesh/setUpdater/setUpdater.H b/src/dynamicMesh/setUpdater/setUpdater.H
index 0312b29077..279420b643 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.H
+++ b/src/dynamicMesh/setUpdater/setUpdater.H
@@ -97,7 +97,7 @@ public:
         virtual void modifyMotionPoints(pointField& motionPoints) const;
 
         //- Force recalculation of locally stored data on topological change
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
index df2d587105..b70d94e72f 100644
--- a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
+++ b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
@@ -51,7 +51,7 @@ void Foam::setUpdater::updateSets(const polyTopoChangeMap& map) const
                 << " updated in memory" << endl;
         }
 
-        set.updateMesh(map);
+        set.topoChange(map);
 
         // Write or not? Debatable.
         set.write();
@@ -85,7 +85,7 @@ void Foam::setUpdater::updateSets(const polyTopoChangeMap& map) const
                     << " updated on disk" << endl;
             }
 
-            set.updateMesh(map);
+            set.topoChange(map);
 
             set.write();
         }
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index bf27c1801b..dbd668fb54 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -643,11 +643,11 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
 }
 
 
-void Foam::slidingInterface::updateMesh(const polyTopoChangeMap& m)
+void Foam::slidingInterface::topoChange(const polyTopoChangeMap& m)
 {
     if (debug)
     {
-        Pout<< "void slidingInterface::updateMesh(const polyTopoChangeMap& m)"
+        Pout<< "void slidingInterface::topoChange(const polyTopoChangeMap& m)"
             << " const for object " << name() << " : "
             << "Updating topology." << endl;
     }
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index 2401334e8c..91224b6912 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -365,7 +365,7 @@ public:
         virtual void modifyMotionPoints(pointField& motionPoints) const;
 
         //- Force recalculation of locally stored data on topological change
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Return projected points for a slave patch
         const pointField& pointProjection() const;
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 0782322555..2fee806b1b 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -41,8 +41,12 @@ $(derivedFvPatches)/regionCoupled/regionCoupledFvPatch.C
 $(derivedFvPatches)/regionCoupled/regionCoupledWallFvPatch.C
 
 
+meshWave = algorithms/FvFaceCellWave
+$(meshWave)/FvFaceCellWaveName.C
+
+
 wallDist = fvMesh/wallDist
-$(wallDist)/wallPointYPlus/wallPointYPlus.C
+$(wallDist)/fvWallPointYPlus/fvWallPointYPlus.C
 $(wallDist)/nearWallDist/nearWallDist.C
 $(wallDist)/wallDist/wallDist.C
 $(wallDist)/patchDistMethods/patchDistMethod/patchDistMethod.C
diff --git a/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWave.C b/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWave.C
new file mode 100644
index 0000000000..bde4f0092d
--- /dev/null
+++ b/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWave.C
@@ -0,0 +1,1067 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "FvFaceCellWave.H"
+#include "processorFvPatch.H"
+#include "cyclicFvPatch.H"
+#include "cyclicAMIFvPatch.H"
+#include "OPstream.H"
+#include "IPstream.H"
+#include "PstreamReduceOps.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class Type, class TrackingData>
+const Foam::scalar Foam::FvFaceCellWave<Type, TrackingData>::geomTol_ = 1e-6;
+
+template<class Type, class TrackingData>
+Foam::scalar Foam::FvFaceCellWave<Type, TrackingData>::propagationTol_ = 1e-2;
+
+template<class Type, class TrackingData>
+int Foam::FvFaceCellWave<Type, TrackingData>::dummyTrackData_ = 12345;
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class Type, class TrackingData>
+template<class ListList>
+Foam::labelList
+Foam::FvFaceCellWave<Type, TrackingData>::listListSizes
+(
+    const ListList& ll
+)
+{
+    labelList s(ll.size());
+    forAll(ll, i)
+    {
+        s[i] = ll[i].size();
+    }
+    return s;
+}
+
+
+template<class Type, class TrackingData>
+template<class ListList, class Value>
+ListList Foam::FvFaceCellWave<Type, TrackingData>::sizesListList
+(
+    const labelList& s,
+    const Value& value
+)
+{
+    ListList ll(s.size());
+    forAll(s, i)
+    {
+        ll[i] = typename ListList::value_type(s[i], value);
+    }
+    return ll;
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type, class TrackingData>
+const Type& Foam::FvFaceCellWave<Type, TrackingData>::faceInfo
+(
+    const labelPair& patchAndFacei
+) const
+{
+    return
+        patchAndFacei.first() == -1
+      ? internalFaceInfo_[patchAndFacei.second()]
+      : patchFaceInfo_[patchAndFacei.first()][patchAndFacei.second()];
+}
+
+
+template<class Type, class TrackingData>
+Type& Foam::FvFaceCellWave<Type, TrackingData>::faceInfo
+(
+    const labelPair& patchAndFacei
+)
+{
+    return
+        patchAndFacei.first() == -1
+      ? internalFaceInfo_[patchAndFacei.second()]
+      : patchFaceInfo_[patchAndFacei.first()][patchAndFacei.second()];
+}
+
+
+template<class Type, class TrackingData>
+bool Foam::FvFaceCellWave<Type, TrackingData>::faceChanged
+(
+    const labelPair& patchAndFacei
+)
+const
+{
+    return
+        patchAndFacei.first() == -1
+      ? internalFaceChanged_[patchAndFacei.second()]
+      : patchFaceChanged_[patchAndFacei.first()][patchAndFacei.second()];
+}
+
+
+template<class Type, class TrackingData>
+Foam::PackedBoolList::iteratorBase
+Foam::FvFaceCellWave<Type, TrackingData>::faceChanged
+(
+    const labelPair& patchAndFacei
+)
+{
+    return
+        patchAndFacei.first() == -1
+      ? internalFaceChanged_[patchAndFacei.second()]
+      : patchFaceChanged_[patchAndFacei.first()][patchAndFacei.second()];
+}
+
+
+template<class Type, class TrackingData>
+bool Foam::FvFaceCellWave<Type, TrackingData>::updateCell
+(
+    const label celli,
+    const labelPair& neighbourPatchAndFacei,
+    const Type& neighbourInfo,
+    const scalar tol,
+    Type& cellInfo
+)
+{
+    bool propagate =
+        cellInfo.updateCell
+        (
+            mesh_,
+            celli,
+            neighbourPatchAndFacei,
+            neighbourInfo,
+            tol,
+            td_
+        );
+
+    if (propagate)
+    {
+        if (!cellChanged_[celli])
+        {
+            cellChanged_[celli] = true;
+            changedCells_.append(celli);
+        }
+    }
+
+    return propagate;
+}
+
+
+template<class Type, class TrackingData>
+bool Foam::FvFaceCellWave<Type, TrackingData>::updateFace
+(
+    const labelPair& patchAndFacei,
+    const label neighbourCelli,
+    const Type& neighbourInfo,
+    const scalar tol,
+    Type& faceInfo
+)
+{
+    bool propagate =
+        faceInfo.updateFace
+        (
+            mesh_,
+            patchAndFacei,
+            neighbourCelli,
+            neighbourInfo,
+            tol,
+            td_
+        );
+
+    if (propagate)
+    {
+        PackedBoolList::iteratorBase changed = faceChanged(patchAndFacei);
+
+        if (!changed)
+        {
+            changed = true;
+            changedPatchAndFaces_.append(patchAndFacei);
+        }
+    }
+
+    return propagate;
+}
+
+
+template<class Type, class TrackingData>
+bool Foam::FvFaceCellWave<Type, TrackingData>::updateFace
+(
+    const labelPair& patchAndFacei,
+    const Type& neighbourInfo,
+    const scalar tol,
+    Type& faceInfo
+)
+{
+    bool propagate =
+        faceInfo.updateFace
+        (
+            mesh_,
+            patchAndFacei,
+            neighbourInfo,
+            tol,
+            td_
+        );
+
+    if (propagate)
+    {
+        PackedBoolList::iteratorBase changed = faceChanged(patchAndFacei);
+
+        if (!changed)
+        {
+            changed = true;
+            changedPatchAndFaces_.append(patchAndFacei);
+        }
+    }
+
+    return propagate;
+}
+
+
+template<class Type, class TrackingData>
+void Foam::FvFaceCellWave<Type, TrackingData>::checkCyclic
+(
+    const fvPatch& patch
+) const
+{
+    const cyclicFvPatch& nbrPatch =
+        refCast<const cyclicFvPatch>(patch).nbrPatch();
+
+    forAll(patch, patchFacei)
+    {
+        const Type& info = faceInfo({patch.index(), patchFacei});
+        const Type& nbrInfo = faceInfo({nbrPatch.index(), patchFacei});
+
+        const bool changed = faceChanged({patch.index(), patchFacei});
+        const bool nbrChanged = faceChanged({nbrPatch.index(), patchFacei});
+
+        if (!info.sameGeometry(mesh_, nbrInfo, geomTol_, td_))
+        {
+            FatalErrorInFunction
+                << "   faceInfo:" << info
+                << "   otherfaceInfo:" << nbrInfo
+                << abort(FatalError);
+        }
+
+        if (changed != nbrChanged)
+        {
+            FatalErrorInFunction
+                << "   faceInfo:" << info
+                << "   otherfaceInfo:" << nbrInfo
+                << "   changedFace:" << changed
+                << "   otherchangedFace:" << nbrChanged
+                << abort(FatalError);
+        }
+    }
+}
+
+
+template<class Type, class TrackingData>
+template<class PatchType>
+bool Foam::FvFaceCellWave<Type, TrackingData>::hasPatch() const
+{
+    forAll(mesh_.boundary(), patchi)
+    {
+        if (isA<PatchType>(mesh_.boundary()[patchi]))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+template<class Type, class TrackingData>
+void Foam::FvFaceCellWave<Type, TrackingData>::mergeFaceInfo
+(
+    const fvPatch& patch,
+    const label nFaces,
+    const labelList& changedPatchFaces,
+    const List<Type>& changedPatchFacesInfo
+)
+{
+    for (label changedFacei = 0; changedFacei < nFaces; changedFacei ++)
+    {
+        const label patchFacei = changedPatchFaces[changedFacei];
+
+        Type& info = faceInfo({patch.index(), patchFacei});
+        const Type& neighbourInfo = changedPatchFacesInfo[changedFacei];
+
+        if (!info.equal(neighbourInfo, td_))
+        {
+            updateFace
+            (
+                {patch.index(), patchFacei},
+                neighbourInfo,
+                propagationTol_,
+                info
+            );
+        }
+    }
+}
+
+
+template<class Type, class TrackingData>
+Foam::label
+Foam::FvFaceCellWave<Type, TrackingData>::getChangedPatchFaces
+(
+    const fvPatch& patch,
+    labelList& changedPatchFaces,
+    List<Type>& changedPatchFacesInfo
+) const
+{
+    // Construct compact patchFace change arrays for a single patch.
+    // changedPatchFaces in local patch numbering. Return length of arrays.
+
+    label i = 0;
+
+    forAll(patch, patchFacei)
+    {
+        if (patchFaceChanged_[patch.index()][patchFacei])
+        {
+            changedPatchFaces[i] = patchFacei;
+            changedPatchFacesInfo[i] = faceInfo({patch.index(), patchFacei});
+            i ++;
+        }
+    }
+
+    return i;
+}
+
+
+template<class Type, class TrackingData>
+void Foam::FvFaceCellWave<Type, TrackingData>::transform
+(
+    const fvPatch& patch,
+    const label nFaces,
+    const labelList& patchFaces,
+    const transformer& transform,
+    List<Type>& faceInfo
+)
+{
+    for (label i = 0; i < nFaces; i++)
+    {
+        faceInfo[i].transform(patch, patchFaces[i], transform, td_);
+    }
+}
+
+
+template<class Type, class TrackingData>
+void Foam::FvFaceCellWave<Type, TrackingData>::handleProcPatches()
+{
+    // Transfer information to/from neighbouring processors
+
+    // Which patches are processor patches
+    const labelList& procPatches = mesh_.globalData().processorPatches();
+
+    // Send all
+    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    forAll(procPatches, i)
+    {
+        const label patchi = procPatches[i];
+
+        const processorFvPatch& procPatch =
+            refCast<const processorFvPatch>(mesh_.boundary()[patchi]);
+
+        // Allocate buffers
+        label nSendFaces;
+        labelList sendFaces(procPatch.size());
+        List<Type> sendFacesInfo(procPatch.size());
+
+        // Determine which faces changed on current patch
+        nSendFaces =
+            getChangedPatchFaces
+            (
+                procPatch,
+                sendFaces,
+                sendFacesInfo
+            );
+
+        if (debug & 2)
+        {
+            Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
+                << " communicating with " << procPatch.neighbProcNo()
+                << "  Sending:" << nSendFaces
+                << endl;
+        }
+
+        // Send
+        UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
+        toNeighbour
+            << SubList<label>(sendFaces, nSendFaces)
+            << SubList<Type>(sendFacesInfo, nSendFaces);
+    }
+
+    pBufs.finishedSends();
+
+    // Receive all
+    forAll(procPatches, i)
+    {
+        const label patchi = procPatches[i];
+
+        const processorFvPatch& procPatch =
+            refCast<const processorFvPatch>(mesh_.boundary()[patchi]);
+
+        // Allocate buffers
+        labelList receiveFaces;
+        List<Type> receiveFacesInfo;
+
+        // Receive
+        {
+            UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
+            fromNeighbour >> receiveFaces >> receiveFacesInfo;
+        }
+
+        if (debug & 2)
+        {
+            Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
+                << " communicating with " << procPatch.neighbProcNo()
+                << "  Receiving:" << receiveFaces.size()
+                << endl;
+        }
+
+        // Transform info across the interface
+        transform
+        (
+            procPatch,
+            receiveFaces.size(),
+            receiveFaces,
+            procPatch.transform(),
+            receiveFacesInfo
+        );
+
+        // Merge received info
+        mergeFaceInfo
+        (
+            procPatch,
+            receiveFaces.size(),
+            receiveFaces,
+            receiveFacesInfo
+        );
+    }
+}
+
+
+template<class Type, class TrackingData>
+void
+Foam::FvFaceCellWave<Type, TrackingData>::handleCyclicPatches()
+{
+    // Transfer information across cyclics
+
+    forAll(mesh_.boundary(), patchi)
+    {
+        const fvPatch& patch = mesh_.boundary()[patchi];
+
+        if (!isA<cyclicFvPatch>(patch)) continue;
+
+        const cyclicFvPatch& cycPatch = refCast<const cyclicFvPatch>(patch);
+        const cyclicFvPatch& nbrCycPatch = cycPatch.nbrPatch();
+
+        // Allocate buffers
+        label nReceiveFaces;
+        labelList receiveFaces(patch.size());
+        List<Type> receiveFacesInfo(patch.size());
+
+        // Determine which faces changed
+        nReceiveFaces =
+            getChangedPatchFaces
+            (
+                nbrCycPatch,
+                receiveFaces,
+                receiveFacesInfo
+            );
+
+        if (debug & 2)
+        {
+            Pout<< " Cyclic patch " << patchi << ' ' << cycPatch.name()
+                << "  Changed : " << nReceiveFaces
+                << endl;
+        }
+
+        // Transform info across the interface
+        transform
+        (
+            cycPatch,
+            nReceiveFaces,
+            receiveFaces,
+            cycPatch.transform(),
+            receiveFacesInfo
+        );
+
+        // Merge into existing faces
+        mergeFaceInfo
+        (
+            cycPatch,
+            nReceiveFaces,
+            receiveFaces,
+            receiveFacesInfo
+        );
+
+        if (debug)
+        {
+            checkCyclic(cycPatch);
+        }
+    }
+}
+
+
+template<class Type, class TrackingData>
+void
+Foam::FvFaceCellWave<Type, TrackingData>::handleCyclicAMIPatches()
+{
+    // Define combine operator for AMIInterpolation
+
+    class combine
+    {
+        FvFaceCellWave<Type, TrackingData>& solver_;
+
+        const cyclicAMIFvPatch& patch_;
+
+        public:
+
+            combine
+            (
+                FvFaceCellWave<Type, TrackingData>& solver,
+                const cyclicAMIFvPatch& patch
+            )
+            :
+                solver_(solver),
+                patch_(patch)
+            {}
+
+            void operator()
+            (
+                Type& x,
+                const label patchFacei,
+                const Type& y,
+                const scalar weight
+            ) const
+            {
+                if (y.valid(solver_.data()))
+                {
+                    x.updateFace
+                    (
+                        solver_.mesh(),
+                        {patch_.index(), patchFacei},
+                        y,
+                        solver_.propagationTol(),
+                        solver_.data()
+                    );
+                }
+            }
+    };
+
+
+    // Transfer information across cyclicAMI halves.
+
+    forAll(mesh_.boundaryMesh(), patchi)
+    {
+        const polyPatch& patch = mesh_.boundaryMesh()[patchi];
+
+        if (isA<cyclicAMIPolyPatch>(patch))
+        {
+            const cyclicAMIFvPatch& cycPatch =
+                refCast<const cyclicAMIFvPatch>(patch);
+            const cyclicAMIFvPatch& nbrPatch = cycPatch.nbrPatch();
+
+            // Create a combine operator to transfer sendInfo from nbrPatch
+            // to cycPatch
+            combine cmb(*this, cycPatch);
+
+            // Get nbrPatch data (so not just changed faces)
+            List<Type> sendInfo(patchFaceInfo_[nbrPatch.index()]);
+
+            // Construct default values, if necessary
+            List<Type> defVals;
+            if (cycPatch.applyLowWeightCorrection())
+            {
+                defVals = cycPatch.patch().patchInternalList(cellInfo_);
+            }
+
+            // Interpolate from nbrPatch to cycPatch, applying AMI
+            // transforms as necessary
+            List<Type> receiveInfo;
+            if (cycPatch.owner())
+            {
+                forAll(cycPatch.AMIs(), i)
+                {
+                    if (cycPatch.AMITransforms()[i].transformsPosition())
+                    {
+                        List<Type> sendInfoT(sendInfo);
+                        transform
+                        (
+                            nbrPatch,
+                            nbrPatch.size(),
+                            identity(nbrPatch.size()),
+                            cycPatch.AMITransforms()[i],
+                            sendInfo
+                        );
+                        cycPatch.AMIs()[i].interpolateToSource
+                        (
+                            sendInfoT,
+                            cmb,
+                            receiveInfo,
+                            defVals
+                        );
+                    }
+                    else
+                    {
+                        cycPatch.AMIs()[i].interpolateToSource
+                        (
+                            sendInfo,
+                            cmb,
+                            receiveInfo,
+                            defVals
+                        );
+                    }
+                }
+            }
+            else
+            {
+                forAll(nbrPatch.AMIs(), i)
+                {
+                    if (nbrPatch.AMITransforms()[i].transformsPosition())
+                    {
+                        List<Type> sendInfoT(sendInfo);
+                        transform
+                        (
+                            nbrPatch,
+                            nbrPatch.size(),
+                            identity(nbrPatch.size()),
+                            nbrPatch.AMITransforms()[i],
+                            sendInfo
+                        );
+                        cycPatch.nbrPatch().AMIs()[i].interpolateToTarget
+                        (
+                            sendInfoT,
+                            cmb,
+                            receiveInfo,
+                            defVals
+                        );
+                    }
+                    else
+                    {
+                        cycPatch.nbrPatch().AMIs()[i].interpolateToTarget
+                        (
+                            sendInfo,
+                            cmb,
+                            receiveInfo,
+                            defVals
+                        );
+                    }
+                }
+            }
+
+            // Shuffle up to remove invalid info
+            DynamicList<label> receiveFaces(cycPatch.size());
+            forAll(receiveInfo, patchFacei)
+            {
+                if (receiveInfo[patchFacei].valid(td_))
+                {
+                    receiveInfo[receiveFaces.size()] = receiveInfo[patchFacei];
+                    receiveFaces.append(patchFacei);
+                }
+            }
+
+            // Transform info across the interface
+            if (cycPatch.transform().transformsPosition())
+            {
+                transform
+                (
+                    cycPatch,
+                    receiveFaces.size(),
+                    receiveFaces,
+                    cycPatch.transform(),
+                    receiveInfo
+                );
+            }
+
+            // Merge into global storage
+            mergeFaceInfo
+            (
+                cycPatch,
+                receiveFaces.size(),
+                receiveFaces,
+                receiveInfo
+            );
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class TrackingData>
+Foam::FvFaceCellWave<Type, TrackingData>::FvFaceCellWave
+(
+    const fvMesh& mesh,
+    List<Type>& internalFaceInfo,
+    List<List<Type>>& patchFaceInfo,
+    List<Type>& cellInfo,
+    TrackingData& td
+)
+:
+    mesh_(mesh),
+    internalFaceInfo_(internalFaceInfo),
+    patchFaceInfo_(patchFaceInfo),
+    cellInfo_(cellInfo),
+    td_(td),
+    internalFaceChanged_
+    (
+        mesh_.nInternalFaces(),
+        false
+    ),
+    patchFaceChanged_
+    (
+        sizesListList<List<PackedBoolList>>
+        (
+            listListSizes(mesh_.boundary()),
+            false
+        )
+    ),
+    cellChanged_
+    (
+        mesh_.nCells(),
+        false
+    ),
+    changedPatchAndFaces_(mesh_.nInternalFaces()),
+    changedCells_(mesh_.nCells()),
+    hasCyclicPatches_(hasPatch<cyclicFvPatch>()),
+    hasCyclicAMIPatches_(hasPatch<cyclicAMIFvPatch>())
+{
+    if
+    (
+        internalFaceInfo.size() != mesh_.nInternalFaces()
+     || listListSizes(patchFaceInfo) != listListSizes(mesh_.boundary())
+     || cellInfo.size() != mesh_.nCells()
+    )
+    {
+        FatalErrorInFunction
+            << "Storage does not match the size of the mesh:" << endl
+            << "          internalFaceInfo:" << internalFaceInfo.size() << endl
+            << "    mesh_.nInternalFaces():" << mesh_.nInternalFaces() << endl
+            << "          patchFaceInfo[i]:" << listListSizes(patchFaceInfo)
+            << endl
+            << "mesh_.boundary()[i].size():" << listListSizes(mesh_.boundary())
+            << endl
+            << "                  cellInfo:" << cellInfo.size() << endl
+            << "            mesh_.nCells():" << mesh_.nCells()
+            << exit(FatalError);
+    }
+}
+
+
+template<class Type, class TrackingData>
+Foam::FvFaceCellWave<Type, TrackingData>::FvFaceCellWave
+(
+    const fvMesh& mesh,
+    const List<labelPair>& initialChangedPatchAndFaces,
+    const List<Type>& initialChangedFacesInfo,
+    List<Type>& internalFaceInfo,
+    List<List<Type>>& patchFaceInfo,
+    List<Type>& cellInfo,
+    const label maxIter,
+    TrackingData& td
+)
+:
+    FvFaceCellWave
+    (
+        mesh,
+        internalFaceInfo,
+        patchFaceInfo,
+        cellInfo,
+        td
+    )
+{
+    // Copy initial changed faces data
+    setFaceInfo(initialChangedPatchAndFaces, initialChangedFacesInfo);
+
+    // Iterate until nothing changes
+    const label iter = iterate(maxIter);
+
+    // Error if incomplete
+    if ((maxIter > 0) && (iter >= maxIter))
+    {
+        FatalErrorInFunction
+            << "Maximum number of iterations reached. Increase maxIter." << endl
+            << "                     maxIter:" << maxIter << endl
+            << "        changedCells_.size():" << changedCells_.size() << endl
+            << "changedPatchAndFaces_.size():" << changedPatchAndFaces_.size()
+            << endl << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class TrackingData>
+void Foam::FvFaceCellWave<Type, TrackingData>::setFaceInfo
+(
+    const List<labelPair>& changedPatchAndFaces,
+    const List<Type>& changedFacesInfo
+)
+{
+    forAll(changedPatchAndFaces, i)
+    {
+        const labelPair& patchAndFacei = changedPatchAndFaces[i];
+
+        Type& info = faceInfo(patchAndFacei);
+        PackedBoolList::iteratorBase changed = faceChanged(patchAndFacei);
+
+        // Copy info for this face
+        info = changedFacesInfo[i];
+
+        // Mark this face as changed
+        changed = true;
+        changedPatchAndFaces_.append(patchAndFacei);
+    }
+}
+
+
+template<class Type, class TrackingData>
+Foam::label Foam::FvFaceCellWave<Type, TrackingData>::faceToCell()
+{
+    const labelList& owner = mesh_.owner();
+    const labelList& neighbour = mesh_.neighbour();
+
+    forAll(changedPatchAndFaces_, i)
+    {
+        const labelPair& patchAndFacei = changedPatchAndFaces_[i];
+        const label patchi = patchAndFacei.first();
+        const label facei = patchAndFacei.second();
+
+        if (!faceChanged(patchAndFacei))
+        {
+            FatalErrorInFunction
+                << "Patch and face " << patchAndFacei
+                << " not marked as having been changed"
+                << abort(FatalError);
+        }
+
+        const Type& info = faceInfo(patchAndFacei);
+
+        // Propagate to the owner
+        {
+            const label ownerCelli =
+                patchi == -1
+              ? owner[facei]
+              : mesh_.boundary()[patchi].faceCells()[facei];
+
+            Type& ownerInfo = cellInfo_[ownerCelli];
+
+            if (!ownerInfo.equal(info, td_))
+            {
+                updateCell
+                (
+                    ownerCelli,
+                    {patchi, facei},
+                    info,
+                    propagationTol_,
+                    ownerInfo
+                );
+            }
+        }
+
+        // Propagate to the neighbour
+        if (patchi == -1)
+        {
+            const label neighbourCelli = neighbour[facei];
+
+            Type& neighbourInfo = cellInfo_[neighbourCelli];
+
+            if (!neighbourInfo.equal(info, td_))
+            {
+                updateCell
+                (
+                    neighbourCelli,
+                    {patchi, facei},
+                    info,
+                    propagationTol_,
+                    neighbourInfo
+                );
+            }
+        }
+
+        // Reset status of face
+        faceChanged(patchAndFacei) = false;
+    }
+
+    // Handled all changed faces by now
+    changedPatchAndFaces_.clear();
+
+    if (debug & 2)
+    {
+        Pout<< " Changed cells            : " << changedCells_.size() << endl;
+    }
+
+    return returnReduce(changedCells_.size(), sumOp<label>());
+}
+
+
+template<class Type, class TrackingData>
+Foam::label Foam::FvFaceCellWave<Type, TrackingData>::cellToFace()
+{
+    const cellList& cells = mesh_.cells();
+
+    forAll(changedCells_, i)
+    {
+        const label celli = changedCells_[i];
+
+        if (!cellChanged_[celli])
+        {
+            FatalErrorInFunction
+                << "Cell " << celli << " not marked as having been changed"
+                << abort(FatalError);
+        }
+
+        const Type& info = cellInfo_[celli];
+
+        // Propagate to connected faces
+        forAll(cells[celli], cellFacei)
+        {
+            // Get the patch (if any) and face index
+            label patchi, facei;
+            const label polyFacei = cells[celli][cellFacei];
+            if (polyFacei < mesh_.nInternalFaces())
+            {
+                patchi = -1;
+                facei = polyFacei;
+            }
+            else
+            {
+                const label polyBFacei = polyFacei - mesh_.nInternalFaces();
+                patchi = mesh_.boundaryMesh().patchID()[polyBFacei];
+                facei = polyFacei - mesh_.boundaryMesh()[patchi].start();
+            }
+
+            // If connected to an empty patch then skip this face
+            if (patchi != -1 && !mesh_.boundary()[patchi].size()) continue;
+
+            Type& connectedInfo = faceInfo({patchi, facei});
+
+            if (!connectedInfo.equal(info, td_))
+            {
+                updateFace
+                (
+                    {patchi, facei},
+                    celli,
+                    info,
+                    propagationTol_,
+                    connectedInfo
+                );
+            }
+        }
+
+        // Reset status of cell
+        cellChanged_[celli] = false;
+    }
+
+    // Handled all changed cells by now
+    changedCells_.clear();
+
+    if (hasCyclicPatches_)
+    {
+        // Transfer changed faces across cyclics
+        handleCyclicPatches();
+    }
+
+    if (hasCyclicAMIPatches_)
+    {
+        // Transfer changed faces across cyclicAMIs
+        handleCyclicAMIPatches();
+    }
+
+    if (Pstream::parRun())
+    {
+        // Transfer changed faces from neighbouring processors.
+        handleProcPatches();
+    }
+
+    if (debug & 2)
+    {
+        Pout<< " Changed faces            : "
+            << changedPatchAndFaces_.size() << endl;
+    }
+
+    return returnReduce(changedPatchAndFaces_.size(), sumOp<label>());
+}
+
+
+template<class Type, class TrackingData>
+Foam::label Foam::FvFaceCellWave<Type, TrackingData>::iterate
+(
+    const label maxIter
+)
+{
+    if (hasCyclicPatches_)
+    {
+        // Transfer changed faces across cyclics
+        handleCyclicPatches();
+    }
+
+    if (hasCyclicAMIPatches_)
+    {
+        // Transfer changed faces across cyclicAMIs
+        handleCyclicAMIPatches();
+    }
+
+    if (Pstream::parRun())
+    {
+        // Transfer changed faces from neighbouring processors.
+        handleProcPatches();
+    }
+
+    label iter = 0;
+
+    while (iter < maxIter)
+    {
+        if (debug) Info<< " Iteration " << iter << endl;
+
+        label nCells = faceToCell();
+
+        if (debug) Info<< " Total changed cells      : " << nCells << endl;
+
+        if (nCells == 0)
+        {
+            break;
+        }
+
+        label nFaces = cellToFace();
+
+        if (debug) Info<< " Total changed faces      : " << nFaces << nl;
+
+        if (nFaces == 0)
+        {
+            break;
+        }
+
+        ++iter;
+    }
+
+    return iter;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWave.H b/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWave.H
new file mode 100644
index 0000000000..6571638b69
--- /dev/null
+++ b/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWave.H
@@ -0,0 +1,374 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::FvFaceCellWave
+
+Description
+    Wave propagation of information through grid. Every iteration
+    information goes through one layer of cells. Templated on information
+    that is transferred.
+
+    Handles parallel and cyclics and non-parallel cyclics.
+
+    Note: whether to propagate depends on the return value of Type::update
+    which returns true (i.e. propagate) if the value changes by more than a
+    certain tolerance.
+    This tolerance can be very strict for normal face-cell and parallel
+    cyclics (we use a value of 0.01 just to limit propagation of small changes)
+    but for non-parallel cyclics this tolerance can be critical and if chosen
+    too small can lead to non-convergence.
+
+SourceFiles
+    FvFaceCellWave.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef FvFaceCellWave_H
+#define FvFaceCellWave_H
+
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class fvMesh;
+class fvPatch;
+class transformer;
+
+/*---------------------------------------------------------------------------*\
+                      Class FvFaceCellWaveName Declaration
+\*---------------------------------------------------------------------------*/
+
+TemplateName(FvFaceCellWave);
+
+
+/*---------------------------------------------------------------------------*\
+                        Class FvFaceCellWave Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class TrackingData = int>
+class FvFaceCellWave
+:
+    public FvFaceCellWaveName
+{
+protected:
+
+    // Protected static data
+
+        //- ...
+        static const scalar geomTol_;
+
+        //- ...
+        static scalar propagationTol_;
+
+        //- Used as default trackdata value to satisfy default template
+        //  argument.
+        static int dummyTrackData_;
+
+
+    // Protected data
+
+        //- Reference to mesh
+        const fvMesh& mesh_;
+
+        //- Information for internal faces
+        List<Type>& internalFaceInfo_;
+
+        //- Information for patch faces
+        List<List<Type>>& patchFaceInfo_;
+
+        //- Information for all cells
+        List<Type>& cellInfo_;
+
+        //- Additional data to be passed into container
+        TrackingData& td_;
+
+        //- Has internal face changed?
+        PackedBoolList internalFaceChanged_;
+
+        //- Has patch face changed?
+        List<PackedBoolList> patchFaceChanged_;
+
+        //- Has cell changed?
+        PackedBoolList cellChanged_;
+
+        //- List of changed patch and faces
+        DynamicList<labelPair> changedPatchAndFaces_;
+
+        //- List of changed cells
+        DynamicList<label> changedCells_;
+
+        //- Contains cyclics
+        const bool hasCyclicPatches_;
+
+        //- Contains cyclicAMI
+        const bool hasCyclicAMIPatches_;
+
+
+    // Protected member functions
+
+        //- ...
+        const Type& faceInfo(const labelPair& patchAndFacei) const;
+
+        //- ...
+        Type& faceInfo(const labelPair& patchAndFacei);
+
+        //- ...
+        bool faceChanged(const labelPair& patchAndFacei) const;
+
+        //- ...
+        PackedBoolList::iteratorBase faceChanged(const labelPair&);
+
+        //- Updates cellInfo with information from neighbour. Updates all
+        //  statistics.
+        bool updateCell
+        (
+            const label celli,
+            const labelPair& neighbourPatchAndFacei,
+            const Type& neighbourInfo,
+            const scalar tol,
+            Type& cellInfo
+        );
+
+        //- Updates faceInfo with information from neighbour. Updates all
+        //  statistics.
+        bool updateFace
+        (
+            const labelPair& patchAndFacei,
+            const label neighbourCelli,
+            const Type& neighbourInfo,
+            const scalar tol,
+            Type& faceInfo
+        );
+
+        //- Updates faceInfo with information from same face. Updates all
+        //  statistics.
+        bool updateFace
+        (
+            const labelPair& patchAndFacei,
+            const Type& neighbourInfo,
+            const scalar tol,
+            Type& faceInfo
+        );
+
+
+        // Parallel, cyclic
+
+            //- Debugging: check info on both sides of cyclic
+            void checkCyclic(const fvPatch& patch) const;
+
+            //- Has cyclic patch?
+            template<class PatchType>
+            bool hasPatch() const;
+
+            //- Merge received patch data into global data
+            void mergeFaceInfo
+            (
+                const fvPatch& patch,
+                const label nFaces,
+                const labelList&,
+                const List<Type>&
+            );
+
+            //- Extract info for single patch only
+            label getChangedPatchFaces
+            (
+                const fvPatch& patch,
+                labelList& changedPatchFaces,
+                List<Type>& changedPatchFacesInfo
+            ) const;
+
+            //- Transform across an interface
+            void transform
+            (
+                const fvPatch& patch,
+                const label nFaces,
+                const labelList& patchFaces,
+                const transformer& transform,
+                List<Type>& faceInfo
+            );
+
+            //- Merge data from across processor boundaries
+            void handleProcPatches();
+
+            //- Merge data from across cyclics
+            void handleCyclicPatches();
+
+            //- Merge data from across AMI cyclics
+            void handleCyclicAMIPatches();
+
+
+public:
+
+    // Static Functions
+
+        //- Access to tolerance
+        static scalar propagationTol()
+        {
+            return propagationTol_;
+        }
+
+        //- Change tolerance
+        static void setPropagationTol(const scalar tol)
+        {
+            propagationTol_ = tol;
+        }
+
+        //- ...
+        template<class ListList>
+        static labelList listListSizes(const ListList& ll);
+
+        //- ...
+        template<class ListList, class Value>
+        static ListList sizesListList(const labelList& s, const Value& value);
+
+
+    // Constructors
+
+        // Construct from mesh. Use setFaceInfo and iterate() to do actual
+        // calculation.
+        FvFaceCellWave
+        (
+            const fvMesh& mesh,
+            List<Type>& internalFaceInfo,
+            List<List<Type>>& patchFaceInfo,
+            List<Type>& cellInfo,
+            TrackingData& td = dummyTrackData_
+        );
+
+        //- Construct from mesh and list of changed faces with the Type
+        //  for these faces. Iterates until nothing changes or maxIter reached.
+        //  (maxIter can be 0)
+        FvFaceCellWave
+        (
+            const fvMesh& mesh,
+            const List<labelPair>& initialChangedPatchAndFaces,
+            const List<Type>& initialChangedFacesInfo,
+            List<Type>& internalFaceInfo,
+            List<List<Type>>& patchFaceInfo,
+            List<Type>& cellInfo,
+            const label maxIter,
+            TrackingData& td = dummyTrackData_
+        );
+
+        //- Disallow default bitwise copy construction
+        FvFaceCellWave(const FvFaceCellWave&) = delete;
+
+
+    //- Destructor
+    virtual ~FvFaceCellWave()
+    {}
+
+
+    // Member Functions
+
+        // Access
+
+            //- Access internalFaceInfo
+            List<Type>& internalFaceInfo()
+            {
+                return internalFaceInfo_;
+            }
+
+            //- Access patchFaceInfo
+            List<List<Type>>& patchFaceInfo()
+            {
+                return patchFaceInfo_;
+            }
+
+            //- Access cellInfo
+            List<Type>& cellInfo()
+            {
+                return cellInfo_;
+            }
+
+            //- Additional data to be passed into container
+            const TrackingData& data() const
+            {
+                return td_;
+            }
+
+            //- Additional data to be passed into container
+            TrackingData& data()
+            {
+                return td_;
+            }
+
+            //- Access mesh
+            const fvMesh& mesh() const
+            {
+                return mesh_;
+            }
+
+
+        // Edit
+
+            //- Set initial changed faces
+            void setFaceInfo
+            (
+                const List<labelPair>& changedPatchAndFaces,
+                const List<Type>& changedFacesInfo
+            );
+
+            //- Propagate from face to cell. Returns total number of cells
+            //  (over all processors) changed.
+            virtual label faceToCell();
+
+            //- Propagate from cell to face. Returns total number of faces
+            //  (over all processors) changed. (Faces on processorpatches are
+            //  counted double)
+            virtual label cellToFace();
+
+            //- Iterate until no changes or maxIter reached.  Returns actual
+            //  number of iterations.
+            virtual label iterate(const label maxIter);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const FvFaceCellWave&) = delete;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "FvFaceCellWave.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWaveName.C b/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWaveName.C
new file mode 100644
index 0000000000..62495f061a
--- /dev/null
+++ b/src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWaveName.C
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "FvFaceCellWave.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(FvFaceCellWaveName, 0);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 8f606453d2..bc726edf3b 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -56,9 +56,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-class fvMesh;
-
 /*---------------------------------------------------------------------------*\
                            Class MRFZone Declaration
 \*---------------------------------------------------------------------------*/
@@ -180,13 +177,6 @@ public:
         //- Return the current Omega vector
         vector Omega() const;
 
-        //- Update the mesh corresponding to given map
-        void updateMesh(const polyTopoChangeMap& map)
-        {
-            // Only updates face addressing
-            setMRFFaces();
-        }
-
         //- Add the Coriolis force contribution to the acceleration field
         void addCoriolis
         (
diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H
index ac977e03e0..ffa52558d3 100644
--- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H
+++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H
@@ -47,6 +47,7 @@ namespace Foam
 
 class fvMesh;
 class polyTopoChangeMap;
+class polyMeshMap;
 class polyDistributionMap;
 
 /*---------------------------------------------------------------------------*\
@@ -212,15 +213,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&) = 0;
+            //- Update for mesh motion
+            virtual bool movePoints() = 0;
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&) = 0;
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&) = 0;
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&) = 0;
 
-            //- Update for mesh motion
-            virtual bool movePoints() = 0;
-
 
         // IO
 
diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C
index cad4aa4587..1a38bb530d 100644
--- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C
+++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C
@@ -237,28 +237,6 @@ bool Foam::fvConstraints::constrainsField(const word& fieldName) const
 }
 
 
-void Foam::fvConstraints::updateMesh(const polyTopoChangeMap& map)
-{
-    PtrListDictionary<fvConstraint>& constraintList(*this);
-
-    forAll(constraintList, i)
-    {
-        constraintList[i].updateMesh(map);
-    }
-}
-
-
-void Foam::fvConstraints::distribute(const polyDistributionMap& map)
-{
-    PtrListDictionary<fvConstraint>& constraintList(*this);
-
-    forAll(constraintList, i)
-    {
-        constraintList[i].distribute(map);
-    }
-}
-
-
 bool Foam::fvConstraints::movePoints()
 {
     bool allOk = true;
@@ -274,6 +252,39 @@ bool Foam::fvConstraints::movePoints()
 }
 
 
+void Foam::fvConstraints::topoChange(const polyTopoChangeMap& map)
+{
+    PtrListDictionary<fvConstraint>& constraintList(*this);
+
+    forAll(constraintList, i)
+    {
+        constraintList[i].topoChange(map);
+    }
+}
+
+
+void Foam::fvConstraints::mapMesh(const polyMeshMap& map)
+{
+    PtrListDictionary<fvConstraint>& constraintList(*this);
+
+    forAll(constraintList, i)
+    {
+        constraintList[i].mapMesh(map);
+    }
+}
+
+
+void Foam::fvConstraints::distribute(const polyDistributionMap& map)
+{
+    PtrListDictionary<fvConstraint>& constraintList(*this);
+
+    forAll(constraintList, i)
+    {
+        constraintList[i].distribute(map);
+    }
+}
+
+
 bool Foam::fvConstraints::readData(Istream& is)
 {
     is >> *this;
diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
index 379a6f6aca..a879c58b01 100644
--- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
+++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
@@ -133,15 +133,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
index 00ad192505..faaeff8c6e 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
@@ -48,6 +48,7 @@ namespace Foam
 
 class fvMesh;
 class polyTopoChangeMap;
+class polyMeshMap;
 class polyDistributionMap;
 
 /*---------------------------------------------------------------------------*\
@@ -330,15 +331,18 @@ public:
             //- Prepare for mesh update
             virtual void preUpdateMesh();
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&) = 0;
+            //- Update for mesh motion
+            virtual bool movePoints() = 0;
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&) = 0;
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&) = 0;
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&) = 0;
 
-            //- Update for mesh motion
-            virtual bool movePoints() = 0;
-
 
         //- Correct the fvModel
         //  e.g. solve equations, update model, for film, Lagrangian etc.
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.C b/src/finiteVolume/cfdTools/general/fvModels/fvModels.C
index ce2416175c..2747dde85d 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.C
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModels.C
@@ -263,28 +263,6 @@ void Foam::fvModels::preUpdateMesh()
 }
 
 
-void Foam::fvModels::updateMesh(const polyTopoChangeMap& map)
-{
-    PtrListDictionary<fvModel>& modelList(*this);
-
-    forAll(modelList, i)
-    {
-        modelList[i].updateMesh(map);
-    }
-}
-
-
-void Foam::fvModels::distribute(const polyDistributionMap& map)
-{
-    PtrListDictionary<fvModel>& modelList(*this);
-
-    forAll(modelList, i)
-    {
-        modelList[i].distribute(map);
-    }
-}
-
-
 bool Foam::fvModels::movePoints()
 {
     bool allOk = true;
@@ -300,6 +278,39 @@ bool Foam::fvModels::movePoints()
 }
 
 
+void Foam::fvModels::topoChange(const polyTopoChangeMap& map)
+{
+    PtrListDictionary<fvModel>& modelList(*this);
+
+    forAll(modelList, i)
+    {
+        modelList[i].topoChange(map);
+    }
+}
+
+
+void Foam::fvModels::mapMesh(const polyMeshMap& map)
+{
+    PtrListDictionary<fvModel>& modelList(*this);
+
+    forAll(modelList, i)
+    {
+        modelList[i].mapMesh(map);
+    }
+}
+
+
+void Foam::fvModels::distribute(const polyDistributionMap& map)
+{
+    PtrListDictionary<fvModel>& modelList(*this);
+
+    forAll(modelList, i)
+    {
+        modelList[i].distribute(map);
+    }
+}
+
+
 bool Foam::fvModels::readData(Istream& is)
 {
     is >> *this;
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
index dc312da895..28d14decff 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
@@ -239,15 +239,18 @@ public:
             //- Prepare for mesh update
             virtual void preUpdateMesh();
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
index 6496acae81..1e21921f2e 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.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
@@ -25,7 +25,7 @@ License
 
 #include "fvcSmooth.H"
 #include "volFields.H"
-#include "FaceCellWave.H"
+#include "FvFaceCellWave.H"
 #include "smoothData.H"
 #include "sweepData.H"
 
@@ -40,8 +40,8 @@ void Foam::fvc::smooth
     const fvMesh& mesh = field.mesh();
     scalar maxRatio = 1 + coeff;
 
-    DynamicList<label> changedFaces(mesh.nFaces()/100 + 100);
-    DynamicList<smoothData> changedFacesInfo(changedFaces.size());
+    DynamicList<labelPair> changedPatchAndFaces(mesh.nFaces()/100 + 100);
+    DynamicList<smoothData> changedFacesInfo(changedPatchAndFaces.size());
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -54,60 +54,70 @@ void Foam::fvc::smooth
         // Check if owner value much larger than neighbour value or vice versa
         if (field[own] > maxRatio*field[nbr])
         {
-            changedFaces.append(facei);
+            changedPatchAndFaces.append(labelPair(-1, facei));
             changedFacesInfo.append(smoothData(field[own]));
         }
         else if (field[nbr] > maxRatio*field[own])
         {
-            changedFaces.append(facei);
+            changedPatchAndFaces.append(labelPair(-1, facei));
             changedFacesInfo.append(smoothData(field[nbr]));
         }
     }
 
-    // Insert all faces of coupled patches - FaceCellWave will correct them
-    forAll(mesh.boundaryMesh(), patchi)
+    // Insert all faces of coupled patches - FvFaceCellWave will correct them
+    forAll(mesh.boundary(), patchi)
     {
-        const polyPatch& patch = mesh.boundaryMesh()[patchi];
+        const fvPatch& patch = mesh.boundary()[patchi];
 
         if (patch.coupled())
         {
             forAll(patch, patchFacei)
             {
-                label facei = patch.start() + patchFacei;
-                label own = mesh.faceOwner()[facei];
+                const label own = patch.faceCells()[patchFacei];
 
-                changedFaces.append(facei);
+                changedPatchAndFaces.append(labelPair(patchi, patchFacei));
                 changedFacesInfo.append(smoothData(field[own]));
             }
         }
     }
 
-    changedFaces.shrink();
+    changedPatchAndFaces.shrink();
     changedFacesInfo.shrink();
 
     // Set initial field on cells
     List<smoothData> cellData(mesh.nCells());
-
     forAll(field, celli)
     {
         cellData[celli] = field[celli];
     }
 
     // Set initial field on faces
-    List<smoothData> faceData(mesh.nFaces());
+    List<smoothData> internalFaceData(mesh.nInternalFaces());
+    List<List<smoothData>> patchFaceData
+    (
+        FvFaceCellWave<smoothData, smoothData::trackData>::template
+        sizesListList<List<List<smoothData>>>
+        (
+            FvFaceCellWave<smoothData, smoothData::trackData>::template
+            listListSizes(mesh.boundary()),
+            smoothData()
+        )
+    );
 
+    // Create track data
     smoothData::trackData td;
     td.maxRatio = maxRatio;
 
     // Propagate information over whole domain
-    FaceCellWave<smoothData, smoothData::trackData> smoothData
+    FvFaceCellWave<smoothData, smoothData::trackData> smoothData
     (
         mesh,
-        changedFaces,
+        changedPatchAndFaces,
         changedFacesInfo,
-        faceData,
+        internalFaceData,
+        patchFaceData,
         cellData,
-        mesh.globalData().nTotalCells(),   // max iterations
+        mesh.globalData().nTotalCells() + 1, // max iterations
         td
     );
 
@@ -132,19 +142,8 @@ void Foam::fvc::spread
 {
     const fvMesh& mesh = field.mesh();
 
-    DynamicList<label> changedFaces(mesh.nFaces()/100 + 100);
-    DynamicList<smoothData> changedFacesInfo(changedFaces.size());
-
-    // Set initial field on cells
-    List<smoothData> cellData(mesh.nCells());
-
-    forAll(field, celli)
-    {
-        cellData[celli] = field[celli];
-    }
-
-    // Set initial field on faces
-    List<smoothData> faceData(mesh.nFaces());
+    DynamicList<labelPair> changedPatchAndFaces(mesh.nFaces()/100 + 100);
+    DynamicList<smoothData> changedFacesInfo(changedPatchAndFaces.size());
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
@@ -154,27 +153,24 @@ void Foam::fvc::spread
         const label own = owner[facei];
         const label nbr = neighbour[facei];
 
+        // Check if owner value much larger than neighbour value or vice versa
         if (mag(alpha[own] - alpha[nbr]) > alphaDiff)
         {
-            changedFaces.append(facei);
-            changedFacesInfo.append
-            (
-                smoothData(max(field[own], field[nbr]))
-            );
+            changedPatchAndFaces.append(labelPair(-1, facei));
+            changedFacesInfo.append(smoothData(max(field[own], field[nbr])));
         }
     }
 
-    // Insert all faces of coupled patches - FaceCellWave will correct them
-    forAll(mesh.boundaryMesh(), patchi)
+    // Insert all faces of coupled patches - FvFaceCellWave will correct them
+    forAll(mesh.boundary(), patchi)
     {
-        const polyPatch& patch = mesh.boundaryMesh()[patchi];
+        const fvPatch& patch = mesh.boundary()[patchi];
 
         if (patch.coupled())
         {
             forAll(patch, patchFacei)
             {
-                label facei = patch.start() + patchFacei;
-                label own = mesh.faceOwner()[facei];
+                const label own = patch.faceCells()[patchFacei];
 
                 const scalarField alphapn
                 (
@@ -183,29 +179,51 @@ void Foam::fvc::spread
 
                 if (mag(alpha[own] - alphapn[patchFacei]) > alphaDiff)
                 {
-                    changedFaces.append(facei);
+                    changedPatchAndFaces.append(labelPair(patchi, patchFacei));
                     changedFacesInfo.append(smoothData(field[own]));
                 }
             }
         }
     }
 
-    changedFaces.shrink();
+    changedPatchAndFaces.shrink();
     changedFacesInfo.shrink();
 
+    // Set initial field on cells
+    List<smoothData> cellData(mesh.nCells());
+    forAll(field, celli)
+    {
+        cellData[celli] = field[celli];
+    }
+
+    // Set initial field on faces
+    List<smoothData> internalFaceData(mesh.nInternalFaces());
+    List<List<smoothData>> patchFaceData
+    (
+        FvFaceCellWave<smoothData, smoothData::trackData>::template
+        sizesListList<List<List<smoothData>>>
+        (
+            FvFaceCellWave<smoothData, smoothData::trackData>::template
+            listListSizes(mesh.boundary()),
+            smoothData()
+        )
+    );
+
+    // Create track data
     smoothData::trackData td;
     td.maxRatio = 1.0;
 
     // Propagate information over whole domain
-    FaceCellWave<smoothData, smoothData::trackData> smoothData
+    FvFaceCellWave<smoothData, smoothData::trackData> smoothData
     (
         mesh,
-        faceData,
+        internalFaceData,
+        patchFaceData,
         cellData,
         td
     );
 
-    smoothData.setFaceInfo(changedFaces, changedFacesInfo);
+    smoothData.setFaceInfo(changedPatchAndFaces, changedFacesInfo);
 
     smoothData.iterate(nLayers);
 
@@ -228,27 +246,23 @@ void Foam::fvc::sweep
 {
     const fvMesh& mesh = field.mesh();
 
-    DynamicList<label> changedFaces(mesh.nFaces()/100 + 100);
-    DynamicList<sweepData> changedFacesInfo(changedFaces.size());
-
-    // Set initial field on cells
-    List<sweepData> cellData(mesh.nCells());
-
-    // Set initial field on faces
-    List<sweepData> faceData(mesh.nFaces());
+    DynamicList<labelPair> changedPatchAndFaces(mesh.nFaces()/100 + 100);
+    DynamicList<sweepData> changedFacesInfo(changedPatchAndFaces.size());
 
     const labelUList& owner = mesh.owner();
     const labelUList& neighbour = mesh.neighbour();
-    const vectorField& Cf = mesh.faceCentres();
+    const surfaceVectorField& Cf = mesh.Cf();
+    const surfaceVectorField::Boundary& CfBf = mesh.Cf().boundaryField();
 
     forAll(owner, facei)
     {
         const label own = owner[facei];
         const label nbr = neighbour[facei];
 
+        // Check if owner value much larger than neighbour value or vice versa
         if (mag(alpha[own] - alpha[nbr]) > alphaDiff)
         {
-            changedFaces.append(facei);
+            changedPatchAndFaces.append(labelPair(-1, facei));
             changedFacesInfo.append
             (
                 sweepData(max(field[own], field[nbr]), Cf[facei])
@@ -256,17 +270,16 @@ void Foam::fvc::sweep
         }
     }
 
-    // Insert all faces of coupled patches - FaceCellWave will correct them
-    forAll(mesh.boundaryMesh(), patchi)
+    // Insert all faces of coupled patches - FvFaceCellWave will correct them
+    forAll(mesh.boundary(), patchi)
     {
-        const polyPatch& patch = mesh.boundaryMesh()[patchi];
+        const fvPatch& patch = mesh.boundary()[patchi];
 
         if (patch.coupled())
         {
             forAll(patch, patchFacei)
             {
-                label facei = patch.start() + patchFacei;
-                label own = mesh.faceOwner()[facei];
+                const label own = patch.faceCells()[patchFacei];
 
                 const scalarField alphapn
                 (
@@ -275,28 +288,45 @@ void Foam::fvc::sweep
 
                 if (mag(alpha[own] - alphapn[patchFacei]) > alphaDiff)
                 {
-                    changedFaces.append(facei);
+                    changedPatchAndFaces.append(labelPair(patchi, patchFacei));
                     changedFacesInfo.append
                     (
-                        sweepData(field[own], Cf[facei])
+                        sweepData(field[own], CfBf[patchi][patchFacei])
                     );
                 }
             }
         }
     }
 
-    changedFaces.shrink();
+    changedPatchAndFaces.shrink();
     changedFacesInfo.shrink();
 
+    // Set initial field on cells
+    List<sweepData> cellData(mesh.nCells());
+
+    // Set initial field on faces
+    List<sweepData> internalFaceData(mesh.nInternalFaces());
+    List<List<sweepData>> patchFaceData
+    (
+        FvFaceCellWave<sweepData>::template
+        sizesListList<List<List<sweepData>>>
+        (
+            FvFaceCellWave<sweepData>::template
+            listListSizes(mesh.boundary()),
+            sweepData()
+        )
+    );
+
     // Propagate information over whole domain
-    FaceCellWave<sweepData> sweepData
+    FvFaceCellWave<sweepData> sweepData
     (
         mesh,
-        faceData,
+        internalFaceData,
+        patchFaceData,
         cellData
     );
 
-    sweepData.setFaceInfo(changedFaces, changedFacesInfo);
+    sweepData.setFaceInfo(changedPatchAndFaces, changedFacesInfo);
 
     sweepData.iterate(nLayers);
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.H b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.H
index d66fc0d260..4a8093e75e 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.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
@@ -25,7 +25,7 @@ InNamespace
     Foam::fvc
 
 Description
-    Provides functions smooth spread and sweep which use the FaceCellWave
+    Provides functions smooth spread and sweep which use the FvFaceCellWave
     algorithm to smooth and redistribute the first field argument.
 
     smooth: smooths the field by ensuring the values in neighbouring cells are
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothData.H b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothData.H
index 5b0eab8bda..df051a6185 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothData.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothData.H
@@ -36,11 +36,19 @@ SourceFiles
 #ifndef smoothData_H
 #define smoothData_H
 
+#include "scalar.H"
+#include "labelPair.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of classes
+class fvPatch;
+class fvMesh;
+class transformer;
+
 /*---------------------------------------------------------------------------*\
                          Class smoothData Declaration
 \*---------------------------------------------------------------------------*/
@@ -101,7 +109,7 @@ public:
             }
 
 
-        // Needed by FaceCellWave
+        // Needed by FvFaceCellWave
 
             //- Check whether origin has been changed at all or
             //  still contains original (invalid) value
@@ -113,7 +121,7 @@ public:
             template<class TrackingData>
             inline bool sameGeometry
             (
-                const polyMesh&,
+                const fvMesh&,
                 const smoothData&,
                 const scalar,
                 TrackingData& td
@@ -123,7 +131,7 @@ public:
             template<class TrackingData>
             inline void transform
             (
-                const polyPatch& patch,
+                const fvPatch& patch,
                 const label patchFacei,
                 const transformer& transform,
                 TrackingData& td
@@ -133,9 +141,9 @@ public:
             template<class TrackingData>
             inline bool updateCell
             (
-                const polyMesh&,
+                const fvMesh&,
                 const label thisCelli,
-                const label neighbourFacei,
+                const labelPair& neighbourPatchAndFacei,
                 const smoothData& svf,
                 const scalar tol,
                 TrackingData& td
@@ -145,8 +153,8 @@ public:
             template<class TrackingData>
             inline bool updateFace
             (
-                const polyMesh&,
-                const label thisFacei,
+                const fvMesh&,
+                const labelPair& thisPatchAndFacei,
                 const label neighbourCelli,
                 const smoothData& svf,
                 const scalar tol,
@@ -157,8 +165,8 @@ public:
             template<class TrackingData>
             inline bool updateFace
             (
-                const polyMesh&,
-                const label thisFacei,
+                const fvMesh&,
+                const labelPair& thisPatchAndFacei,
                 const smoothData& svf,
                 const scalar tol,
                 TrackingData& td
@@ -173,7 +181,6 @@ public:
 
             inline void operator=(const scalar value);
 
-            // Needed for List IO
             inline bool operator==(const smoothData&) const;
 
             inline bool operator!=(const smoothData&) const;
@@ -181,11 +188,7 @@ public:
 
         // IOstream Operators
 
-            friend Ostream& operator<<
-            (
-                Ostream& os,
-                const smoothData& svf
-            )
+            friend Ostream& operator<<(Ostream& os, const smoothData& svf)
             {
                 return os  << svf.value_;
             }
@@ -205,7 +208,6 @@ inline bool contiguous<smoothData>()
 }
 
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothDataI.H b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothDataI.H
index 8c308cddb6..7dcf3d214b 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothDataI.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothDataI.H
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "smoothData.H"
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class TrackingData>
@@ -44,7 +46,7 @@ inline bool Foam::smoothData::update
     }
     else if (svf.value() > (1 + tol)*scale*value_)
     {
-        // Neighbour is too big for me - Up my value
+        // Neighbour is too big for me - up my value
         value_ = svf.value()/scale;
 
         // Something changed - let caller know
@@ -53,6 +55,8 @@ inline bool Foam::smoothData::update
     else
     {
         // Neighbour is not too big for me or change is too small
+        // ...
+
         // Nothing changed
         return false;
     }
@@ -85,7 +89,7 @@ inline bool Foam::smoothData::valid(TrackingData& td) const
 template<class TrackingData>
 inline bool Foam::smoothData::sameGeometry
 (
-    const polyMesh&,
+    const fvMesh&,
     const smoothData&,
     const scalar,
     TrackingData& td
@@ -98,7 +102,7 @@ inline bool Foam::smoothData::sameGeometry
 template<class TrackingData>
 inline void Foam::smoothData::transform
 (
-    const polyPatch& patch,
+    const fvPatch& patch,
     const label patchFacei,
     const transformer& transform,
     TrackingData& td
@@ -109,9 +113,9 @@ inline void Foam::smoothData::transform
 template<class TrackingData>
 inline bool Foam::smoothData::updateCell
 (
-    const polyMesh&,
-    const label,
+    const fvMesh&,
     const label,
+    const labelPair&,
     const smoothData& svf,
     const scalar tol,
     TrackingData& td
@@ -125,8 +129,8 @@ inline bool Foam::smoothData::updateCell
 template<class TrackingData>
 inline bool Foam::smoothData::updateFace
 (
-    const polyMesh&,
-    const label,
+    const fvMesh&,
+    const labelPair&,
     const label,
     const smoothData& svf,
     const scalar tol,
@@ -142,8 +146,8 @@ inline bool Foam::smoothData::updateFace
 template<class TrackingData>
 inline bool Foam::smoothData::updateFace
 (
-    const polyMesh&,
-    const label,
+    const fvMesh&,
+    const labelPair&,
     const smoothData& svf,
     const scalar tol,
     TrackingData& td
@@ -167,28 +171,19 @@ inline bool Foam::smoothData::equal
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline void Foam::smoothData::operator=
-(
-    const scalar value
-)
+inline void Foam::smoothData::operator=(const scalar value)
 {
     value_ = value;
 }
 
 
-inline bool Foam::smoothData::operator==
-(
-    const smoothData& rhs
-) const
+inline bool Foam::smoothData::operator==(const smoothData& rhs) const
 {
     return value_ == rhs.value();
 }
 
 
-inline bool Foam::smoothData::operator!=
-(
-    const smoothData& rhs
-) const
+inline bool Foam::smoothData::operator!=(const smoothData& rhs) const
 {
     return !(*this == rhs);
 }
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepData.H b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepData.H
index 5d52c2972f..923927884c 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepData.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepData.H
@@ -36,19 +36,34 @@ SourceFiles
 #ifndef sweepData_H
 #define sweepData_H
 
+#include "scalar.H"
+#include "point.H"
+#include "labelPair.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of classes
+class fvPatch;
+class fvMesh;
+class transformer;
+
 /*---------------------------------------------------------------------------*\
                           Class sweepData Declaration
 \*---------------------------------------------------------------------------*/
 
 class sweepData
 {
-    scalar value_;
-    point origin_;
+    // Private Member Data
+
+        //-
+        scalar value_;
+
+        //-
+        point origin_;
+
 
     // Private Member Functions
 
@@ -92,7 +107,7 @@ public:
             }
 
 
-        // Needed by FaceCellWave
+        // Needed by FvFaceCellWave
 
             //- Check whether origin has been changed at all or
             //  still contains original (invalid) value
@@ -104,7 +119,7 @@ public:
             template<class TrackingData>
             inline bool sameGeometry
             (
-                const polyMesh&,
+                const fvMesh&,
                 const sweepData&,
                 const scalar,
                 TrackingData& td
@@ -114,7 +129,7 @@ public:
             template<class TrackingData>
             inline void transform
             (
-                const polyPatch& patch,
+                const fvPatch& patch,
                 const label patchFacei,
                 const transformer& transform,
                 TrackingData& td
@@ -124,9 +139,9 @@ public:
             template<class TrackingData>
             inline bool updateCell
             (
-                const polyMesh&,
+                const fvMesh&,
                 const label thisCelli,
-                const label neighbourFacei,
+                const labelPair& neighbourPatchAndFacei,
                 const sweepData& svf,
                 const scalar tol,
                 TrackingData& td
@@ -136,8 +151,8 @@ public:
             template<class TrackingData>
             inline bool updateFace
             (
-                const polyMesh&,
-                const label thisFacei,
+                const fvMesh&,
+                const labelPair& thisPatchAndFacei,
                 const label neighbourCelli,
                 const sweepData& svf,
                 const scalar tol,
@@ -148,8 +163,8 @@ public:
             template<class TrackingData>
             inline bool updateFace
             (
-                const polyMesh&,
-                const label thisFacei,
+                const fvMesh&,
+                const labelPair& thisPatchAndFacei,
                 const sweepData& svf,
                 const scalar tol,
                 TrackingData& td
@@ -164,7 +179,6 @@ public:
 
             inline void operator=(const scalar value);
 
-            // Needed for List IO
             inline bool operator==(const sweepData&) const;
 
             inline bool operator!=(const sweepData&) const;
@@ -172,11 +186,7 @@ public:
 
         // IOstream Operators
 
-            friend Ostream& operator<<
-            (
-                Ostream& os,
-                const sweepData& svf
-            )
+            friend Ostream& operator<<(Ostream& os, const sweepData& svf)
             {
                 return os << svf.value_ << svf.origin_;
             }
@@ -196,7 +206,6 @@ inline bool contiguous<sweepData>()
 }
 
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepDataI.H b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepDataI.H
index a1be821db2..60b932afd0 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepDataI.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepDataI.H
@@ -23,7 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "sweepData.H"
 #include "transformer.H"
+#include "volFields.H"
+#include "surfaceFields.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -97,7 +100,7 @@ inline bool Foam::sweepData::valid(TrackingData& td) const
 template<class TrackingData>
 inline bool Foam::sweepData::sameGeometry
 (
-    const polyMesh&,
+    const fvMesh&,
     const sweepData&,
     const scalar,
     TrackingData& td
@@ -110,7 +113,7 @@ inline bool Foam::sweepData::sameGeometry
 template<class TrackingData>
 inline void Foam::sweepData::transform
 (
-    const polyPatch& patch,
+    const fvPatch& patch,
     const label patchFacei,
     const transformer& transform,
     TrackingData& td
@@ -123,30 +126,42 @@ inline void Foam::sweepData::transform
 template<class TrackingData>
 inline bool Foam::sweepData::updateCell
 (
-    const polyMesh& mesh,
+    const fvMesh& mesh,
     const label thisCelli,
-    const label,
+    const labelPair&,
     const sweepData& svf,
     const scalar tol,
     TrackingData& td
 )
 {
-    return update(svf, mesh.cellCentres()[thisCelli], tol, td);
+    return update(svf, mesh.C()[thisCelli], tol, td);
 }
 
 
 template<class TrackingData>
 inline bool Foam::sweepData::updateFace
 (
-    const polyMesh& mesh,
-    const label thisFacei,
+    const fvMesh& mesh,
+    const labelPair& thisPatchAndFacei,
     const label,
     const sweepData& svf,
     const scalar tol,
     TrackingData& td
 )
 {
-    return update(svf, mesh.faceCentres()[thisFacei], tol, td);
+    const label thisPatchi = thisPatchAndFacei.first();
+    const label thisFacei = thisPatchAndFacei.second();
+
+    return
+        update
+        (
+            svf,
+            thisPatchi == -1
+          ? mesh.Cf()[thisFacei]
+          : mesh.Cf().boundaryField()[thisPatchi][thisFacei],
+            tol,
+            td
+        );
 }
 
 
@@ -154,14 +169,26 @@ inline bool Foam::sweepData::updateFace
 template<class TrackingData>
 inline bool Foam::sweepData::updateFace
 (
-    const polyMesh& mesh,
-    const label thisFacei,
+    const fvMesh& mesh,
+    const labelPair& thisPatchAndFacei,
     const sweepData& svf,
     const scalar tol,
     TrackingData& td
 )
 {
-    return update(svf, mesh.faceCentres()[thisFacei], tol, td);
+    const label thisPatchi = thisPatchAndFacei.first();
+    const label thisFacei = thisPatchAndFacei.second();
+
+    return
+        update
+        (
+            svf,
+            thisPatchi == -1
+          ? mesh.Cf()[thisFacei]
+          : mesh.Cf().boundaryField()[thisPatchi][thisFacei],
+            tol,
+            td
+        );
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.C b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.C
index a003470d14..740ba9795e 100644
--- a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.C
+++ b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.C
@@ -167,7 +167,24 @@ Foam::fvCellSet::~fvCellSet()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::fvCellSet::updateMesh(const polyTopoChangeMap&)
+void Foam::fvCellSet::movePoints()
+{
+    if (selectionMode_ == selectionModeType::points)
+    {
+        setCells();
+    }
+    setV();
+}
+
+
+void Foam::fvCellSet::topoChange(const polyTopoChangeMap&)
+{
+    setCells();
+    setV();
+}
+
+
+void Foam::fvCellSet::mapMesh(const polyMeshMap&)
 {
     setCells();
     setV();
@@ -181,16 +198,6 @@ void Foam::fvCellSet::distribute(const polyDistributionMap&)
 }
 
 
-void Foam::fvCellSet::movePoints()
-{
-    if (selectionMode_ == selectionModeType::points)
-    {
-        setCells();
-    }
-    setV();
-}
-
-
 bool Foam::fvCellSet::read(const dictionary& dict)
 {
     selectionMode_ =
diff --git a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H
index 08b02a6248..9bfbfa7fbf 100644
--- a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H
+++ b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H
@@ -70,6 +70,7 @@ namespace Foam
 {
 
 class fvMesh;
+class polyMeshMap;
 class polyDistributionMap;
 
 /*---------------------------------------------------------------------------*\
@@ -166,15 +167,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            void movePoints();
+
+            //- Update topology using the given map
+            void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            void movePoints();
-
 
         // IO
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index ef45bc61ec..f5127ba72f 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -145,7 +145,7 @@ void Foam::fvMesh::clearAddressing(const bool isMeshUpdate)
 
     if (isMeshUpdate)
     {
-        // Part of a mesh update. Keep meshObjects that have an updateMesh
+        // Part of a mesh update. Keep meshObjects that have an topoChange
         // callback
         meshObject::clearUpto
         <
@@ -823,10 +823,10 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
 }
 
 
-void Foam::fvMesh::updateMesh(const polyTopoChangeMap& map)
+void Foam::fvMesh::topoChange(const polyTopoChangeMap& map)
 {
     // Update polyMesh. This needs to keep volume existent!
-    polyMesh::updateMesh(map);
+    polyMesh::topoChange(map);
 
     if (VPtr_)
     {
@@ -914,26 +914,49 @@ void Foam::fvMesh::updateMesh(const polyTopoChangeMap& map)
     // Clear any non-updateable addressing
     clearAddressing(true);
 
-    meshObject::updateMesh<fvMesh>(*this, map);
-    meshObject::updateMesh<lduMesh>(*this, map);
+    meshObject::topoChange<fvMesh>(*this, map);
+    meshObject::topoChange<lduMesh>(*this, map);
 
     if (topoChanger_.valid())
     {
-        topoChanger_->updateMesh(map);
+        topoChanger_->topoChange(map);
     }
 
     if (distributor_.valid())
     {
-        distributor_->updateMesh(map);
+        distributor_->topoChange(map);
     }
 
     if (mover_.valid())
     {
-        mover_->updateMesh(map);
+        mover_->topoChange(map);
     }
 }
 
 
+void Foam::fvMesh::mapMesh(const polyMeshMap& map)
+{
+    // Distribute polyMesh data
+    polyMesh::mapMesh(map);
+
+    // Clear the sliced fields
+    clearGeomNotOldVol();
+
+    // Clear the current volume and other geometry factors
+    surfaceInterpolation::clearOut();
+
+    // Clear any non-updateable addressing
+    clearAddressing(true);
+
+    meshObject::mapMesh<fvMesh>(*this, map);
+    meshObject::mapMesh<lduMesh>(*this, map);
+
+    topoChanger_->mapMesh(map);
+    distributor_->mapMesh(map);
+    mover_->mapMesh(map);
+}
+
+
 void Foam::fvMesh::distribute(const polyDistributionMap& map)
 {
     // Distribute polyMesh data
@@ -966,7 +989,7 @@ void Foam::fvMesh::addPatch
     const bool validBoundary
 )
 {
-    // Remove my local data (see updateMesh)
+    // Remove my local data (see topoChange)
     // Clear mesh motion flux
     deleteDemandDrivenData(phiPtr_);
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 63ee2007ae..f2d181f581 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -381,7 +381,10 @@ public:
             void clearOut();
 
             //- Update mesh corresponding to the given map
-            virtual void updateMesh(const polyTopoChangeMap& map);
+            virtual void topoChange(const polyTopoChangeMap& map);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap& map);
diff --git a/src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributor.H b/src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributor.H
index 7e04b6a443..7d6ee58daa 100644
--- a/src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributor.H
+++ b/src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributor.H
@@ -158,7 +158,10 @@ public:
         virtual bool update() = 0;
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&) = 0;
+        virtual void topoChange(const polyTopoChangeMap&) = 0;
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&) = 0;
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&) = 0;
diff --git a/src/finiteVolume/fvMesh/fvMeshDistributors/none/fvMeshDistributorsNone.H b/src/finiteVolume/fvMesh/fvMeshDistributors/none/fvMeshDistributorsNone.H
index 1ade7fec4c..c268fb3e95 100644
--- a/src/finiteVolume/fvMesh/fvMeshDistributors/none/fvMeshDistributorsNone.H
+++ b/src/finiteVolume/fvMesh/fvMeshDistributors/none/fvMeshDistributorsNone.H
@@ -83,7 +83,11 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&)
+        virtual void topoChange(const polyTopoChangeMap&)
+        {}
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&)
         {}
 
         //- Update corresponding to the given distribution map
diff --git a/src/finiteVolume/fvMesh/fvMeshMovers/fvMeshMover/fvMeshMover.H b/src/finiteVolume/fvMesh/fvMeshMovers/fvMeshMover/fvMeshMover.H
index 89d72b33a2..c7550902be 100644
--- a/src/finiteVolume/fvMesh/fvMeshMovers/fvMeshMover/fvMeshMover.H
+++ b/src/finiteVolume/fvMesh/fvMeshMovers/fvMeshMover/fvMeshMover.H
@@ -158,7 +158,10 @@ public:
         virtual bool update() = 0;
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&) = 0;
+        virtual void topoChange(const polyTopoChangeMap&) = 0;
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&) = 0;
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&) = 0;
diff --git a/src/finiteVolume/fvMesh/fvMeshMovers/none/fvMeshMoversNone.H b/src/finiteVolume/fvMesh/fvMeshMovers/none/fvMeshMoversNone.H
index 49034568aa..9d78127498 100644
--- a/src/finiteVolume/fvMesh/fvMeshMovers/none/fvMeshMoversNone.H
+++ b/src/finiteVolume/fvMesh/fvMeshMovers/none/fvMeshMoversNone.H
@@ -83,7 +83,11 @@ public:
         virtual bool update();
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&)
+        virtual void topoChange(const polyTopoChangeMap&)
+        {}
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&)
         {}
 
         //- Update corresponding to the given distribution map
diff --git a/src/finiteVolume/fvMesh/fvMeshTopoChangers/fvMeshTopoChanger/fvMeshTopoChanger.H b/src/finiteVolume/fvMesh/fvMeshTopoChangers/fvMeshTopoChanger/fvMeshTopoChanger.H
index 5368e84676..6c5ee3fa65 100644
--- a/src/finiteVolume/fvMesh/fvMeshTopoChangers/fvMeshTopoChanger/fvMeshTopoChanger.H
+++ b/src/finiteVolume/fvMesh/fvMeshTopoChangers/fvMeshTopoChanger/fvMeshTopoChanger.H
@@ -158,7 +158,10 @@ public:
         virtual bool update() = 0;
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&) = 0;
+        virtual void topoChange(const polyTopoChangeMap&) = 0;
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&) = 0;
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&) = 0;
diff --git a/src/finiteVolume/fvMesh/fvMeshTopoChangers/none/fvMeshTopoChangersNone.H b/src/finiteVolume/fvMesh/fvMeshTopoChangers/none/fvMeshTopoChangersNone.H
index d2a2663b6c..1d1b6aa8ac 100644
--- a/src/finiteVolume/fvMesh/fvMeshTopoChangers/none/fvMeshTopoChangersNone.H
+++ b/src/finiteVolume/fvMesh/fvMeshTopoChangers/none/fvMeshTopoChangersNone.H
@@ -83,7 +83,11 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&)
+        virtual void topoChange(const polyTopoChangeMap&)
+        {}
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&)
         {}
 
         //- Update corresponding to the given distribution map
diff --git a/src/finiteVolume/fvMesh/wallDist/fvPatchDistWave/fvPatchDistWave.H b/src/finiteVolume/fvMesh/wallDist/fvPatchDistWave/fvPatchDistWave.H
new file mode 100644
index 0000000000..a4d24a36d0
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/fvPatchDistWave/fvPatchDistWave.H
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fvPatchDistWave
+
+Description
+    Takes a set of patches to start FvFaceCellWave from and computed the
+    distance at patches and possibly additional transported data.
+
+SourceFiles
+    fvPatchDistWave.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fvPatchDistWave_H
+#define fvPatchDistWave_H
+
+#include "FvFaceCellWave.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fvPatchDistWave
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Set initial set of changed faces
+template<class PatchPointType, class ... InitialPatchData>
+void setChangedFaces
+(
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    List<labelPair>& changedPatchAndFaces,
+    List<PatchPointType>& faceDist,
+    const InitialPatchData& ... initialPatchData
+);
+
+//- Copy FvFaceCellWave values into the cell fields
+template<class PatchPointType, class DataType, class DataMethod>
+label getCellValues
+(
+    FvFaceCellWave<PatchPointType>& waveInfo,
+    Field<DataType>& cellValues,
+    DataMethod method,
+    const DataType& stabiliseValue = pTraits<DataType>::zero
+);
+
+//- Copy FvFaceCellWave values into the patch field-fields
+template<class PatchPointType, class DataType, class DataMethod>
+label getPatchValues
+(
+    FvFaceCellWave<PatchPointType>& wave,
+    GeometricBoundaryField<DataType, fvPatchField, volMesh>& valuesBf,
+    DataMethod method,
+    const DataType& stabiliseValue = pTraits<DataType>::zero
+);
+
+//- Wave distance data from the patches to the cells and other patch faces
+template<class PatchPointType>
+label wave
+(
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    volScalarField& distance,
+    bool correct = true
+);
+
+//- Wave distance and auxiliary data from the patches to the cells and other
+//  patch faces
+template<class PatchPointType>
+label wave
+(
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    const GeometricBoundaryField
+        <typename PatchPointType::dataType, fvPatchField, volMesh>&
+        initialPatchData,
+    volScalarField& distance,
+    VolField<typename PatchPointType::dataType>& data,
+    bool correct = true
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fvPatchDistWave
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "fvPatchDistWaveTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/fvPatchDistWave/fvPatchDistWaveTemplates.C b/src/finiteVolume/fvMesh/wallDist/fvPatchDistWave/fvPatchDistWaveTemplates.C
new file mode 100644
index 0000000000..978978d817
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/fvPatchDistWave/fvPatchDistWaveTemplates.C
@@ -0,0 +1,329 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvPatchDistWave.H"
+#include "patchDistFuncs.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class PatchPointType, class ... InitialPatchData>
+void Foam::fvPatchDistWave::setChangedFaces
+(
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    List<labelPair>& changedPatchAndFaces,
+    List<PatchPointType>& changedFacesInfo,
+    const InitialPatchData& ... initialPatchData
+)
+{
+    label nChangedFaces = 0;
+    forAllConstIter(labelHashSet, patchIDs, iter)
+    {
+        nChangedFaces += mesh.boundary()[iter.key()].size();
+    }
+
+    changedPatchAndFaces.resize(nChangedFaces);
+    changedFacesInfo.resize(nChangedFaces);
+
+    label changedFacei = 0;
+
+    forAllConstIter(labelHashSet, patchIDs, iter)
+    {
+        const label patchi = iter.key();
+
+        const fvPatch& patch = mesh.boundary()[patchi];
+
+        forAll(patch.Cf(), patchFacei)
+        {
+            changedPatchAndFaces[changedFacei] = {patchi, patchFacei};
+
+            changedFacesInfo[changedFacei] =
+                PatchPointType
+                (
+                    patch.Cf()[patchFacei],
+                    initialPatchData[patchi][patchFacei] ...,
+                    scalar(0)
+                );
+
+            changedFacei++;
+        }
+    }
+}
+
+
+template<class PatchPointType, class DataType, class DataMethod>
+Foam::label Foam::fvPatchDistWave::getCellValues
+(
+    FvFaceCellWave<PatchPointType>& waveInfo,
+    Field<DataType>& cellValues,
+    DataMethod method,
+    const DataType& stabiliseValue
+)
+{
+    const List<PatchPointType>& cellInfo = waveInfo.cellInfo();
+
+    label nInvalid = 0;
+
+    forAll(cellInfo, celli)
+    {
+        cellValues[celli] =
+            (cellInfo[celli].*method)(waveInfo.data())
+          + stabiliseValue;
+
+        nInvalid += !cellInfo[celli].valid(waveInfo.data());
+    }
+
+    return nInvalid;
+}
+
+
+template<class PatchPointType, class DataType, class DataMethod>
+Foam::label Foam::fvPatchDistWave::getPatchValues
+(
+    FvFaceCellWave<PatchPointType>& waveInfo,
+    GeometricBoundaryField<DataType, fvPatchField, volMesh>& valuesBf,
+    DataMethod method,
+    const DataType& stabiliseValue
+)
+{
+    const List<List<PatchPointType>>& patchFaceInfo = waveInfo.patchFaceInfo();
+
+    label nInvalid = 0;
+
+    forAll(valuesBf, patchi)
+    {
+        forAll(valuesBf[patchi], patchFacei)
+        {
+            valuesBf[patchi][patchFacei] =
+                (patchFaceInfo[patchi][patchFacei].*method)(waveInfo.data())
+              + stabiliseValue;
+
+            nInvalid +=
+                !patchFaceInfo[patchi][patchFacei].valid(waveInfo.data());
+        }
+    }
+
+    return nInvalid;
+}
+
+
+template<class PatchPointType>
+Foam::label Foam::fvPatchDistWave::wave
+(
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    volScalarField& distance,
+    const bool correct
+)
+{
+    // Initialise changedFacesInfo to face centres on patches
+    List<labelPair> changedPatchAndFaces;
+    List<PatchPointType> changedFacesInfo;
+    setChangedFaces
+    (
+        mesh,
+        patchIDs,
+        changedPatchAndFaces,
+        changedFacesInfo
+    );
+
+    // Do calculate patch distance by 'growing' from faces.
+    List<PatchPointType> internalFaceInfo(mesh.nInternalFaces());
+    List<List<PatchPointType>> patchFaceInfo
+    (
+        FvFaceCellWave<PatchPointType>::template
+        sizesListList<List<List<PatchPointType>>>
+        (
+            FvFaceCellWave<PatchPointType>::template
+            listListSizes(mesh.boundary()),
+            PatchPointType()
+        )
+    );
+    List<PatchPointType> cellInfo(mesh.nCells());
+    FvFaceCellWave<PatchPointType> wave
+    (
+        mesh,
+        changedPatchAndFaces,
+        changedFacesInfo,
+        internalFaceInfo,
+        patchFaceInfo,
+        cellInfo,
+        mesh.globalData().nTotalCells() + 1 // max iterations
+    );
+
+    // Copy distance into return field
+    const label nUnset =
+        getCellValues
+        (
+            wave,
+            distance.primitiveFieldRef(),
+            &PatchPointType::template dist<int>
+        )
+      + getPatchValues
+        (
+            wave,
+            distance.boundaryFieldRef(),
+            &PatchPointType::template dist<int>,
+            small
+        );
+
+    // Correct patch cells for true distance
+    if (correct)
+    {
+        Map<labelPair> nearestFace(2*changedFacesInfo.size());
+        patchDistFuncs::correctBoundaryFaceCells
+        (
+            mesh,
+            patchIDs,
+            distance.primitiveFieldRef(),
+            nearestFace
+        );
+        patchDistFuncs::correctBoundaryPointCells
+        (
+            mesh,
+            patchIDs,
+            distance.primitiveFieldRef(),
+            nearestFace
+        );
+    }
+
+    return nUnset;
+}
+
+
+template<class PatchPointType>
+Foam::label Foam::fvPatchDistWave::wave
+(
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    const GeometricBoundaryField
+        <typename PatchPointType::dataType, fvPatchField, volMesh>&
+        initialPatchData,
+    volScalarField& distance,
+    VolField<typename PatchPointType::dataType>& data,
+    const bool correct
+)
+{
+    // Initialise changedFacesInfo to face centres on patches
+    List<labelPair> changedPatchAndFaces;
+    List<PatchPointType> changedFacesInfo;
+    setChangedFaces
+    (
+        mesh,
+        patchIDs,
+        changedPatchAndFaces,
+        changedFacesInfo,
+        initialPatchData
+    );
+
+    // Do calculate patch distance by 'growing' from faces.
+    List<PatchPointType> internalFaceInfo(mesh.nInternalFaces());
+    List<List<PatchPointType>> patchFaceInfo
+    (
+        FvFaceCellWave<PatchPointType>::template
+        sizesListList<List<List<PatchPointType>>>
+        (
+            FvFaceCellWave<PatchPointType>::template
+            listListSizes(mesh.boundary()),
+            PatchPointType()
+        )
+    );
+    List<PatchPointType> cellInfo(mesh.nCells());
+    FvFaceCellWave<PatchPointType> wave
+    (
+        mesh,
+        changedPatchAndFaces,
+        changedFacesInfo,
+        internalFaceInfo,
+        patchFaceInfo,
+        cellInfo,
+        mesh.globalData().nTotalCells() + 1 // max iterations
+    );
+
+    // Copy distance into return field
+    const label nUnset =
+        getCellValues
+        (
+            wave,
+            distance.primitiveFieldRef(),
+            &PatchPointType::template dist<int>
+        )
+      + getPatchValues
+        (
+            wave,
+            distance.boundaryFieldRef(),
+            &PatchPointType::template dist<int>,
+            small
+        );
+
+    // Copy data into the return field
+    getCellValues
+    (
+        wave,
+        data.primitiveFieldRef(),
+        &PatchPointType::template data<int>
+    );
+    getPatchValues
+    (
+        wave,
+        data.boundaryFieldRef(),
+        &PatchPointType::template data<int>
+    );
+
+    // Correct patch cells for true distance
+    if (correct)
+    {
+        Map<labelPair> nearestPatchAndFace(2*changedFacesInfo.size());
+        patchDistFuncs::correctBoundaryFaceCells
+        (
+            mesh,
+            patchIDs,
+            distance.primitiveFieldRef(),
+            nearestPatchAndFace
+        );
+        patchDistFuncs::correctBoundaryPointCells
+        (
+            mesh,
+            patchIDs,
+            distance.primitiveFieldRef(),
+            nearestPatchAndFace
+        );
+
+        // Transfer data from nearest face to cell
+        forAllConstIter(Map<labelPair>, nearestPatchAndFace, iter)
+        {
+            const label celli = iter.key();
+            const label patchi = iter().first();
+            const label patchFacei = iter().second();
+            data.primitiveFieldRef()[celli] =
+                wave.patchFaceInfo()[patchi][patchFacei].data();
+        }
+    }
+
+    return nUnset;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/fvWallPoint/fvWallPoint.H b/src/finiteVolume/fvMesh/wallDist/fvWallPoint/fvWallPoint.H
new file mode 100644
index 0000000000..1d3445bbc9
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/fvWallPoint/fvWallPoint.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fvWallPoint
+
+Description
+    Holds information regarding nearest wall point. Used in wall distance
+    calculation.
+
+SourceFiles
+    fvWallPointI.H
+    fvWallPoint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fvWallPoint_H
+#define fvWallPoint_H
+
+#include "wallPoint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class fvPatch;
+class fvMesh;
+class transformer;
+
+
+/*---------------------------------------------------------------------------*\
+                          Class fvWallPoint Declaration
+\*---------------------------------------------------------------------------*/
+
+class fvWallPoint
+:
+    public wallPoint
+{
+public:
+
+    // Constructors
+
+        //- Inherit constructors
+        using wallPoint::wallPoint;
+
+
+    // Member Functions
+
+        // Needed by FvFaceCellWave
+
+            //- Transform across an interface
+            template<class TrackingData>
+            inline void transform
+            (
+                const fvPatch& patch,
+                const label patchFacei,
+                const transformer& transform,
+                TrackingData& td
+            );
+
+            //- Influence of neighbouring face.
+            template<class TrackingData>
+            inline bool updateCell
+            (
+                const fvMesh&,
+                const label thisCelli,
+                const labelPair& neighbourPatchAndFacei,
+                const fvWallPoint& neighbourInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+            //- Influence of neighbouring cell.
+            template<class TrackingData>
+            inline bool updateFace
+            (
+                const fvMesh&,
+                const labelPair& thisPatchAndFacei,
+                const label neighbourCelli,
+                const fvWallPoint& neighbourInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+            //- Influence of different value on same face.
+            template<class TrackingData>
+            inline bool updateFace
+            (
+                const fvMesh&,
+                const labelPair& thisPatchAndFacei,
+                const fvWallPoint& neighbourInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+};
+
+
+//- Data associated with fvWallPoint type are contiguous
+template<>
+inline bool contiguous<fvWallPoint>()
+{
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "fvWallPointI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/fvWallPoint/fvWallPointI.H b/src/finiteVolume/fvMesh/wallDist/fvWallPoint/fvWallPointI.H
new file mode 100644
index 0000000000..2d496081a5
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/fvWallPoint/fvWallPointI.H
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvWallPoint.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class TrackingData>
+inline void Foam::fvWallPoint::transform
+(
+    const fvPatch& patch,
+    const label patchFacei,
+    const transformer& transform,
+    TrackingData& td
+)
+{
+    wallPoint::transform(patch.patch(), patchFacei, transform, td);
+}
+
+
+template<class TrackingData>
+inline bool Foam::fvWallPoint::updateCell
+(
+    const fvMesh& mesh,
+    const label thisCelli,
+    const labelPair& neighbourPatchAndFacei,
+    const fvWallPoint& neighbourWallInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    return
+        this->update
+        (
+            mesh.C()[thisCelli],
+            neighbourWallInfo,
+            tol,
+            td
+        );
+}
+
+
+template<class TrackingData>
+inline bool Foam::fvWallPoint::updateFace
+(
+    const fvMesh& mesh,
+    const labelPair& thisPatchAndFacei,
+    const label neighbourCelli,
+    const fvWallPoint& neighbourWallInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    const label thisPatchi = thisPatchAndFacei.first();
+    const label thisFacei = thisPatchAndFacei.second();
+
+    return
+        this->update
+        (
+            thisPatchi == -1
+          ? mesh.Cf()[thisFacei]
+          : mesh.Cf().boundaryField()[thisPatchi][thisFacei],
+            neighbourWallInfo,
+            tol,
+            td
+        );
+}
+
+
+template<class TrackingData>
+inline bool Foam::fvWallPoint::updateFace
+(
+    const fvMesh& mesh,
+    const labelPair& thisPatchAndFacei,
+    const fvWallPoint& neighbourWallInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    const label thisPatchi = thisPatchAndFacei.first();
+    const label thisFacei = thisPatchAndFacei.second();
+
+    return
+        this->update
+        (
+            thisPatchi == -1
+          ? mesh.Cf()[thisFacei]
+          : mesh.Cf().boundaryField()[thisPatchi][thisFacei],
+            neighbourWallInfo,
+            tol,
+            td
+        );
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/patchDist/wallPointData/wallPointData.C b/src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointData.C
similarity index 88%
rename from src/meshTools/patchDist/wallPointData/wallPointData.C
rename to src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointData.C
index 200bfe1b8f..3f1597f660 100644
--- a/src/meshTools/patchDist/wallPointData/wallPointData.C
+++ b/src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointData.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "wallPointData.H"
+#include "fvWallPointData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -36,11 +36,11 @@ template<class Type>
 Ostream& operator<<
 (
     Ostream& os,
-    const wallPointData<Type>& wDist
+    const fvWallPointData<Type>& wDist
 )
 {
     return os
-        << static_cast<const wallPoint&>(wDist)
+        << static_cast<const fvWallPoint&>(wDist)
         << token::SPACE
         << wDist.data();
 }
@@ -50,10 +50,10 @@ template<class Type>
 Istream& operator>>
 (
     Istream& is,
-    wallPointData<Type>& wDist
+    fvWallPointData<Type>& wDist
 )
 {
-    return is >> static_cast<wallPoint&>(wDist) >> wDist.data_;
+    return is >> static_cast<fvWallPoint&>(wDist) >> wDist.data_;
 }
 
 
diff --git a/src/meshTools/patchDist/wallPointData/wallPointData.H b/src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointData.H
similarity index 68%
rename from src/meshTools/patchDist/wallPointData/wallPointData.H
rename to src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointData.H
index 0d9ddbff86..3a09916a52 100644
--- a/src/meshTools/patchDist/wallPointData/wallPointData.H
+++ b/src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointData.H
@@ -22,46 +22,49 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::wallPointData
+    Foam::fvWallPointData
 
 Description
     Holds information (coordinate and normal) regarding nearest wall point.
 
-    Is like wallPoint but transfer extra (passive) data.
+    Is like fvWallPoint but transfer extra (passive) data.
     Used e.g. in wall distance calculation with wall reflection vectors.
 
 SourceFiles
-    wallPointDataI.H
-    wallPointData.C
+    fvWallPointDataI.H
+    fvWallPointData.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wallPointData_H
-#define wallPointData_H
+#ifndef fvWallPointData_H
+#define fvWallPointData_H
 
-#include "wallPoint.H"
+#include "fvWallPoint.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-template<class Type> class wallPointData;
+template<class Type> class fvWallPointData;
 
 // Forward declaration of friend functions and operators
 
-template<class Type> Istream& operator>>(Istream&, wallPointData<Type>&);
-template<class Type> Ostream& operator<<(Ostream&, const wallPointData<Type>&);
+template<class Type>
+Istream& operator>>(Istream&, fvWallPointData<Type>&);
+
+template<class Type>
+Ostream& operator<<(Ostream&, const fvWallPointData<Type>&);
 
 
 /*---------------------------------------------------------------------------*\
-                        Class wallPointData Declaration
+                        Class fvWallPointData Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-class wallPointData
+class fvWallPointData
 :
-    public wallPoint
+    public fvWallPoint
 {
     // Private Data
 
@@ -78,7 +81,7 @@ class wallPointData
         inline bool update
         (
             const point&,
-            const wallPointData<Type>& w2,
+            const fvWallPointData<Type>& w2,
             const scalar tol,
             TrackingData& td
         );
@@ -92,10 +95,10 @@ public:
     // Constructors
 
         //- Construct null
-        inline wallPointData();
+        inline fvWallPointData();
 
         //- Construct from origin, normal, distance
-        inline wallPointData
+        inline fvWallPointData
         (
             const point& origin,
             const Type& data,
@@ -121,7 +124,7 @@ public:
             template<class TrackingData>
             inline void transform
             (
-                const polyPatch& patch,
+                const fvPatch& patch,
                 const label patchFacei,
                 const transformer& transform,
                 TrackingData& td
@@ -132,10 +135,10 @@ public:
             template<class TrackingData>
             inline bool updateCell
             (
-                const polyMesh& mesh,
+                const fvMesh& mesh,
                 const label thisCelli,
-                const label neighbourFacei,
-                const wallPointData<Type>& neighbourWallInfo,
+                const labelPair& neighbourPatchAndFacei,
+                const fvWallPointData<Type>& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -145,10 +148,10 @@ public:
             template<class TrackingData>
             inline bool updateFace
             (
-                const polyMesh& mesh,
-                const label thisFacei,
+                const fvMesh& mesh,
+                const labelPair& thisPatchAndFacei,
                 const label neighbourCelli,
-                const wallPointData<Type>& neighbourWallInfo,
+                const fvWallPointData<Type>& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -159,59 +162,67 @@ public:
             template<class TrackingData>
             inline bool updateFace
             (
-                const polyMesh& mesh,
-                const label thisFacei,
-                const wallPointData<Type>& neighbourWallInfo,
+                const fvMesh& mesh,
+                const labelPair& thisPatchAndFacei,
+                const fvWallPointData<Type>& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
 
-    // Member Operators
 
     // IOstream Operators
 
-        friend Ostream& operator<< <Type>(Ostream&, const wallPointData<Type>&);
-        friend Istream& operator>> <Type>(Istream&, wallPointData<Type>&);
+        friend Ostream& operator<< <Type>
+        (
+            Ostream&,
+            const fvWallPointData<Type>&
+        );
+
+        friend Istream& operator>> <Type>
+        (
+            Istream&,
+            fvWallPointData<Type>&
+        );
 };
 
 
-//- Data associated with wallPointData type are contiguous. List the usual
+//- Data associated with fvWallPointData type are contiguous. List the usual
 //  ones.
 
 template<>
-inline bool contiguous<wallPointData<bool>>()
+inline bool contiguous<fvWallPointData<bool>>()
 {
-    return contiguous<wallPoint>();
+    return contiguous<fvWallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<label>>()
+inline bool contiguous<fvWallPointData<label>>()
 {
-    return contiguous<wallPoint>();
+    return contiguous<fvWallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<scalar>>()
+inline bool contiguous<fvWallPointData<scalar>>()
 {
-    return contiguous<wallPoint>();
+    return contiguous<fvWallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<vector>>()
+inline bool contiguous<fvWallPointData<vector>>()
 {
-    return contiguous<wallPoint>();
+    return contiguous<fvWallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<sphericalTensor>>()
+inline bool contiguous<fvWallPointData<sphericalTensor>>()
 {
-    return contiguous<wallPoint>();
+    return contiguous<fvWallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<symmTensor>>()
+inline bool contiguous<fvWallPointData<symmTensor>>()
 {
-    return contiguous<wallPoint>();
+    return contiguous<fvWallPoint>();
 }
 template<>
-inline bool contiguous<wallPointData<tensor>>()
+inline bool contiguous<fvWallPointData<tensor>>()
 {
-    return contiguous<wallPoint>();
+    return contiguous<fvWallPoint>();
 }
 
 
@@ -223,12 +234,12 @@ inline bool contiguous<wallPointData<tensor>>()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "wallPointData.C"
+    #include "fvWallPointData.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "wallPointDataI.H"
+#include "fvWallPointDataI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/patchDist/wallPointData/wallPointDataI.H b/src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointDataI.H
similarity index 69%
rename from src/meshTools/patchDist/wallPointData/wallPointDataI.H
rename to src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointDataI.H
index 5097b401e3..167733dfea 100644
--- a/src/meshTools/patchDist/wallPointData/wallPointDataI.H
+++ b/src/finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointDataI.H
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "fvWallPointData.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -30,13 +32,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Update this with w2 if w2 nearer to pt.
 template<class Type>
 template<class TrackingData>
-inline bool wallPointData<Type>::update
+inline bool fvWallPointData<Type>::update
 (
     const point& pt,
-    const wallPointData<Type>& w2,
+    const fvWallPointData<Type>& w2,
     const scalar tol,
     TrackingData& td
 )
@@ -74,25 +75,23 @@ inline bool wallPointData<Type>::update
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Null constructor
 template<class Type>
-inline wallPointData<Type>::wallPointData()
+inline fvWallPointData<Type>::fvWallPointData()
 :
-    wallPoint(),
+    fvWallPoint(),
     data_()
 {}
 
 
-// Construct from components
 template<class Type>
-inline wallPointData<Type>::wallPointData
+inline fvWallPointData<Type>::fvWallPointData
 (
     const point& origin,
     const Type& data,
     const scalar distSqr
 )
 :
-    wallPoint(origin, distSqr),
+    fvWallPoint(origin, distSqr),
     data_(data)
 {}
 
@@ -100,14 +99,14 @@ inline wallPointData<Type>::wallPointData
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-inline const Type& wallPointData<Type>::data() const
+inline const Type& fvWallPointData<Type>::data() const
 {
     return data_;
 }
 
 
 template<class Type>
-inline Type& wallPointData<Type>::data()
+inline Type& fvWallPointData<Type>::data()
 {
     return data_;
 }
@@ -115,7 +114,7 @@ inline Type& wallPointData<Type>::data()
 
 template<class Type>
 template<class TrackingData>
-inline const Type& wallPointData<Type>::data(TrackingData& td) const
+inline const Type& fvWallPointData<Type>::data(TrackingData& td) const
 {
     return data_;
 }
@@ -123,37 +122,34 @@ inline const Type& wallPointData<Type>::data(TrackingData& td) const
 
 template<class Type>
 template<class TrackingData>
-inline void Foam::wallPointData<Type>::transform
+inline void Foam::fvWallPointData<Type>::transform
 (
-    const polyPatch& patch,
+    const fvPatch& patch,
     const label patchFacei,
     const transformer& transform,
     TrackingData& td
 )
 {
-    wallPoint::transform(patch, patchFacei, transform, td);
+    fvWallPoint::transform(patch, patchFacei, transform, td);
     data_ = transform.transform(data_);
 }
 
 
-// Update this with w2 if w2 nearer to pt.
 template<class Type>
 template<class TrackingData>
-inline bool wallPointData<Type>::updateCell
+inline bool fvWallPointData<Type>::updateCell
 (
-    const polyMesh& mesh,
+    const fvMesh& mesh,
     const label thisCelli,
-    const label,
-    const wallPointData<Type>& neighbourWallInfo,
+    const labelPair& neighbourPatchAndFacei,
+    const fvWallPointData<Type>& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const vectorField& cellCentres = mesh.primitiveMesh::cellCentres();
-
     return update
     (
-        cellCentres[thisCelli],
+        mesh.C()[thisCelli],
         neighbourWallInfo,
         tol,
         td
@@ -161,24 +157,26 @@ inline bool wallPointData<Type>::updateCell
 }
 
 
-// Update this with w2 if w2 nearer to pt.
 template<class Type>
 template<class TrackingData>
-inline bool wallPointData<Type>::updateFace
+inline bool fvWallPointData<Type>::updateFace
 (
-    const polyMesh& mesh,
-    const label thisFacei,
-    const label,
-    const wallPointData<Type>& neighbourWallInfo,
+    const fvMesh& mesh,
+    const labelPair& thisPatchAndFacei,
+    const label neighbourCelli,
+    const fvWallPointData<Type>& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const vectorField& faceCentres = mesh.faceCentres();
+    const label thisPatchi = thisPatchAndFacei.first();
+    const label thisFacei = thisPatchAndFacei.second();
 
     return update
     (
-        faceCentres[thisFacei],
+        thisPatchi == -1
+      ? mesh.Cf()[thisFacei]
+      : mesh.Cf().boundaryField()[thisPatchi][thisFacei],
         neighbourWallInfo,
         tol,
         td
@@ -186,23 +184,25 @@ inline bool wallPointData<Type>::updateFace
 }
 
 
-// Update this with w2 if w2 nearer to pt.
 template<class Type>
 template<class TrackingData>
-inline bool wallPointData<Type>::updateFace
+inline bool fvWallPointData<Type>::updateFace
 (
-    const polyMesh& mesh,
-    const label thisFacei,
-    const wallPointData<Type>& neighbourWallInfo,
+    const fvMesh& mesh,
+    const labelPair& thisPatchAndFacei,
+    const fvWallPointData<Type>& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const vectorField& faceCentres = mesh.faceCentres();
+    const label thisPatchi = thisPatchAndFacei.first();
+    const label thisFacei = thisPatchAndFacei.second();
 
     return update
     (
-        faceCentres[thisFacei],
+        thisPatchi == -1
+      ? mesh.Cf()[thisFacei]
+      : mesh.Cf().boundaryField()[thisPatchi][thisFacei],
         neighbourWallInfo,
         tol,
         td
diff --git a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.C b/src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlus.C
similarity index 89%
rename from src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.C
rename to src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlus.C
index ee63bf3b11..76f70a7e3b 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.C
+++ b/src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlus.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
@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "wallPointYPlus.H"
+#include "fvWallPointYPlus.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-Foam::scalar Foam::wallPointYPlus::yPlusCutOff = 200;
+Foam::scalar Foam::fvWallPointYPlus::yPlusCutOff = 200;
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H b/src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlus.H
similarity index 77%
rename from src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H
rename to src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlus.H
index c85da66bfc..a3cfc2aa0a 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H
+++ b/src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlus.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
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::wallPointYPlus
+    Foam::fvWallPointYPlus
 
 Description
     Holds information (coordinate and yStar) regarding nearest wall point.
@@ -33,18 +33,18 @@ Description
     yStar to 1.
 
     Note: should feed the additional argument (yPlusCutoff) through as a
-    template argument into FaceCellWave
+    template argument into FvFaceCellWave
 
 SourceFiles
-    wallPointYPlusI.H
-    wallPointYPlus.C
+    fvWallPointYPlusI.H
+    fvWallPointYPlus.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wallPointYPlus_H
-#define wallPointYPlus_H
+#ifndef fvWallPointYPlus_H
+#define fvWallPointYPlus_H
 
-#include "wallPointData.H"
+#include "fvWallPointData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,12 +53,12 @@ namespace Foam
 
 
 /*---------------------------------------------------------------------------*\
-                       Class wallPointYPlus Declaration
+                       Class fvWallPointYPlus Declaration
 \*---------------------------------------------------------------------------*/
 
-class wallPointYPlus
+class fvWallPointYPlus
 :
-    public wallPointData<scalar>
+    public fvWallPointData<scalar>
 {
     // Private Member Functions
 
@@ -68,8 +68,8 @@ class wallPointYPlus
         template<class TrackingData>
         inline bool update
         (
-            const point&,
-            const wallPointYPlus& w2,
+            const point& pt,
+            const fvWallPointYPlus& w2,
             const scalar tol,
             TrackingData& td
         );
@@ -86,10 +86,10 @@ public:
     // Constructors
 
         //- Construct null
-        inline wallPointYPlus();
+        inline fvWallPointYPlus();
 
         //- Construct from origin, yStar, distance
-        inline wallPointYPlus
+        inline fvWallPointYPlus
         (
             const point& origin,
             const scalar yStar,
@@ -99,17 +99,17 @@ public:
 
     // Member Functions
 
-        // Needed by FaceCellWave
+        // Needed by FvFaceCellWave
 
             //- Influence of neighbouring face.
             //  Calls update(...) with cellCentre of celli
             template<class TrackingData>
             inline bool updateCell
             (
-                const polyMesh& mesh,
+                const fvMesh& mesh,
                 const label thisCelli,
-                const label neighbourFacei,
-                const wallPointYPlus& neighbourWallInfo,
+                const labelPair& neighbourPatchAndFacei,
+                const fvWallPointYPlus& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -119,10 +119,10 @@ public:
             template<class TrackingData>
             inline bool updateFace
             (
-                const polyMesh& mesh,
-                const label thisFacei,
+                const fvMesh& mesh,
+                const labelPair& thisPatchAndFacei,
                 const label neighbourCelli,
-                const wallPointYPlus& neighbourWallInfo,
+                const fvWallPointYPlus& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -133,9 +133,9 @@ public:
             template<class TrackingData>
             inline bool updateFace
             (
-                const polyMesh& mesh,
-                const label thisFacei,
-                const wallPointYPlus& neighbourWallInfo,
+                const fvMesh& mesh,
+                const labelPair& thisPatchAndFacei,
+                const fvWallPointYPlus& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -144,9 +144,9 @@ public:
 
 //- Data associated with pointEdgePoint type as contiguous as underlying type
 template<>
-inline bool contiguous<wallPointYPlus>()
+inline bool contiguous<fvWallPointYPlus>()
 {
-    return contiguous<wallPointData<scalar>>();
+    return contiguous<fvWallPointData<scalar>>();
 }
 
 
@@ -156,7 +156,7 @@ inline bool contiguous<wallPointYPlus>()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "wallPointYPlusI.H"
+#include "fvWallPointYPlusI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlusI.H b/src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlusI.H
similarity index 71%
rename from src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlusI.H
rename to src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlusI.H
index 353614ab67..b5d9ee0d41 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlusI.H
+++ b/src/finiteVolume/fvMesh/wallDist/fvWallPointYPlus/fvWallPointYPlusI.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
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "fvWallPointYPlus.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -32,10 +34,10 @@ namespace Foam
 
 // Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
-inline bool wallPointYPlus::update
+inline bool fvWallPointYPlus::update
 (
     const point& pt,
-    const wallPointYPlus& w2,
+    const fvWallPointYPlus& w2,
     const scalar tol,
     TrackingData& td
 )
@@ -84,47 +86,42 @@ inline bool wallPointYPlus::update
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Null constructor
-inline wallPointYPlus::wallPointYPlus()
+inline fvWallPointYPlus::fvWallPointYPlus()
 :
-    wallPointData<scalar>()
+    fvWallPointData<scalar>()
 {
-    // Important: value of yStar where meshWave does not come.
+    // Important: The value of yStar where the meshWave does not come.
     data() = 1.0;
 }
 
 
-// Construct from components
-inline wallPointYPlus::wallPointYPlus
+inline fvWallPointYPlus::fvWallPointYPlus
 (
     const point& origin,
     const scalar yStar,
     const scalar distSqr
 )
 :
-    wallPointData<scalar>(origin, yStar, distSqr)
+    fvWallPointData<scalar>(origin, yStar, distSqr)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
-inline bool wallPointYPlus::updateCell
+inline bool fvWallPointYPlus::updateCell
 (
-    const polyMesh& mesh,
+    const fvMesh& mesh,
     const label thisCelli,
-    const label neighbourFacei,
-    const wallPointYPlus& neighbourWallInfo,
+    const labelPair& neighbourPatchAndFacei,
+    const fvWallPointYPlus& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const vectorField& cellCentres = mesh.primitiveMesh::cellCentres();
-
     return update
     (
-        cellCentres[thisCelli],
+        mesh.C()[thisCelli],
         neighbourWallInfo,
         tol,
         td
@@ -132,23 +129,25 @@ inline bool wallPointYPlus::updateCell
 }
 
 
-// Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
-inline bool wallPointYPlus::updateFace
+inline bool fvWallPointYPlus::updateFace
 (
-    const polyMesh& mesh,
-    const label thisFacei,
+    const fvMesh& mesh,
+    const labelPair& thisPatchAndFacei,
     const label neighbourCelli,
-    const wallPointYPlus& neighbourWallInfo,
+    const fvWallPointYPlus& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const vectorField& faceCentres = mesh.faceCentres();
+    const label thisPatchi = thisPatchAndFacei.first();
+    const label thisFacei = thisPatchAndFacei.second();
 
     return update
     (
-        faceCentres[thisFacei],
+        thisPatchi == -1
+      ? mesh.Cf()[thisFacei]
+      : mesh.Cf().boundaryField()[thisPatchi][thisFacei],
         neighbourWallInfo,
         tol,
         td
@@ -156,22 +155,24 @@ inline bool wallPointYPlus::updateFace
 }
 
 
-// Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
-inline bool wallPointYPlus::updateFace
+inline bool fvWallPointYPlus::updateFace
 (
-    const polyMesh& mesh,
-    const label thisFacei,
-    const wallPointYPlus& neighbourWallInfo,
+    const fvMesh& mesh,
+    const labelPair& thisPatchAndFacei,
+    const fvWallPointYPlus& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
-    const vectorField& faceCentres = mesh.faceCentres();
+    const label thisPatchi = thisPatchAndFacei.first();
+    const label thisFacei = thisPatchAndFacei.second();
 
     return update
     (
-        faceCentres[thisFacei],
+        thisPatchi == -1
+      ? mesh.Cf()[thisFacei]
+      : mesh.Cf().boundaryField()[thisPatchi][thisFacei],
         neighbourWallInfo,
         tol,
         td
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
index 84d2901c3d..db1ae0a9f2 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
@@ -72,7 +72,15 @@ Foam::nearWallDist::~nearWallDist()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::nearWallDist::updateMesh(const polyTopoChangeMap& map)
+bool Foam::nearWallDist::movePoints()
+{
+    correct();
+
+    return true;
+}
+
+
+void Foam::nearWallDist::topoChange(const polyTopoChangeMap& map)
 {
     y_.setSize(mesh().boundary().size());
 
@@ -94,18 +102,30 @@ void Foam::nearWallDist::updateMesh(const polyTopoChangeMap& map)
 }
 
 
+void Foam::nearWallDist::mapMesh(const polyMeshMap& map)
+{
+    forAll(y_, patchi)
+    {
+        y_.set
+        (
+            patchi,
+            fvPatchField<scalar>::New
+            (
+                calculatedFvPatchScalarField::typeName,
+                mesh().boundary()[patchi],
+                volScalarField::Internal::null()
+            )
+        );
+    }
+
+    correct();
+}
+
+
 void Foam::nearWallDist::distribute(const polyDistributionMap& map)
 {
     correct();
 }
 
 
-bool Foam::nearWallDist::movePoints()
-{
-    correct();
-
-    return true;
-}
-
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
index e5b6455651..dafed5ce65 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
@@ -93,15 +93,18 @@ public:
             return y_;
         }
 
+        //- Update the y-field when the mesh moves
+        virtual bool movePoints();
+
         //- Update the y-field when the mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
 
-        //- Update the y-field when the mesh moves
-        virtual bool movePoints();
-
 
     // Member Operators
 
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
index 2149e32f42..cee1c61de4 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
@@ -26,8 +26,8 @@ License
 #include "meshWavePatchDistMethod.H"
 #include "fvMesh.H"
 #include "volFields.H"
-#include "patchDistWave.H"
-#include "wallPointData.H"
+#include "fvPatchDistWave.H"
+#include "fvWallPointData.H"
 #include "emptyFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -75,14 +75,15 @@ bool Foam::patchDistMethods::meshWave::correct(volScalarField& y)
     y = dimensionedScalar(dimLength, great);
 
     const label nUnset =
-        patchDistWave::wave<wallPoint>
+        fvPatchDistWave::wave<fvWallPoint>
         (
             mesh_,
             patchIDs_,
-            y.primitiveFieldRef(),
+            y,
             correctWalls_
         );
 
+    // Update coupled and transform BCs
     y.correctBoundaryConditions();
 
     return nUnset > 0;
@@ -98,15 +99,13 @@ bool Foam::patchDistMethods::meshWave::correct
     y = dimensionedScalar(dimLength, great);
 
     const label nUnset =
-        patchDistWave::wave<wallPointData<vector>, fvPatchField>
+        fvPatchDistWave::wave<fvWallPointData<vector>>
         (
             mesh_,
             patchIDs_,
             n.boundaryField(),
-            y.primitiveFieldRef(),
-            y.boundaryFieldRef(),
-            n.primitiveFieldRef(),
-            n.boundaryFieldRef(),
+            y,
+            n,
             correctWalls_
         );
 
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
index aa9e7d3eb0..8ec72ab17c 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
@@ -137,20 +137,24 @@ public:
             return patchIDs_;
         }
 
-        //- Update cached topology and geometry when the mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&)
-        {}
-
-        //- Redistribute or update using the given distribution map
-        virtual void distribute(const polyDistributionMap&)
-        {}
-
         //- Update cached geometry when the mesh moves
         virtual bool movePoints()
         {
             return true;
         }
 
+        //- Update cached topology and geometry when the mesh changes
+        virtual void topoChange(const polyTopoChangeMap&)
+        {}
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&)
+        {}
+
+        //- Redistribute or update using the given distribution map
+        virtual void distribute(const polyDistributionMap&)
+        {}
+
         //- Correct the given distance-to-patch field
         virtual bool correct(volScalarField& y) = 0;
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index 2e5b7c70eb..6567ff3115 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -177,20 +177,6 @@ const Foam::volVectorField& Foam::wallDist::n() const
 }
 
 
-void Foam::wallDist::updateMesh(const polyTopoChangeMap& map)
-{
-    pdm_->updateMesh(map);
-    movePoints();
-}
-
-
-void Foam::wallDist::distribute(const polyDistributionMap& map)
-{
-    pdm_->distribute(map);
-    movePoints();
-}
-
-
 bool Foam::wallDist::movePoints()
 {
     if (pdm_->movePoints())
@@ -211,4 +197,25 @@ bool Foam::wallDist::movePoints()
 }
 
 
+void Foam::wallDist::topoChange(const polyTopoChangeMap& map)
+{
+    pdm_->topoChange(map);
+    movePoints();
+}
+
+
+void Foam::wallDist::mapMesh(const polyMeshMap& map)
+{
+    pdm_->mapMesh(map);
+    movePoints();
+}
+
+
+void Foam::wallDist::distribute(const polyDistributionMap& map)
+{
+    pdm_->distribute(map);
+    movePoints();
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
index f82e401475..6e783de349 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
@@ -145,15 +145,18 @@ public:
         //- Return reference to cached normal-to-wall field
         const volVectorField& n() const;
 
+        //- Update the y-field when the mesh moves
+        virtual bool movePoints();
+
         //- Update the y-field when the mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
 
-        //- Update the y-field when the mesh moves
-        virtual bool movePoints();
-
 
     // Member Operators
 
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
index e8f1b8d7f5..88d888f29d 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
@@ -365,7 +365,13 @@ bool Foam::pointConstraints::movePoints()
 }
 
 
-void Foam::pointConstraints::updateMesh(const polyTopoChangeMap&)
+void Foam::pointConstraints::topoChange(const polyTopoChangeMap&)
+{
+    makePatchPatchAddressing();
+}
+
+
+void Foam::pointConstraints::mapMesh(const polyMeshMap&)
 {
     makePatchPatchAddressing();
 }
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
index 3e58ee7357..d692b768fc 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
@@ -54,7 +54,6 @@ namespace Foam
 {
 
 class polyMesh;
-class polyDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                       Class pointConstraints Declaration
@@ -130,7 +129,10 @@ public:
             virtual bool movePoints();
 
             //- Update mesh topology using the morph engine
-            virtual void updateMesh(const polyTopoChangeMap&);
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Update corresponding to the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
index 05cc6eaed4..b2cfd1268a 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
@@ -362,7 +362,21 @@ Foam::volPointInterpolation::~volPointInterpolation()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::volPointInterpolation::updateMesh(const polyTopoChangeMap&)
+bool Foam::volPointInterpolation::movePoints()
+{
+    makeWeights();
+
+    return true;
+}
+
+
+void Foam::volPointInterpolation::topoChange(const polyTopoChangeMap&)
+{
+    makeWeights();
+}
+
+
+void Foam::volPointInterpolation::mapMesh(const polyMeshMap&)
 {
     makeWeights();
 }
@@ -374,14 +388,6 @@ void Foam::volPointInterpolation::distribute(const polyDistributionMap&)
 }
 
 
-bool Foam::volPointInterpolation::movePoints()
-{
-    makeWeights();
-
-    return true;
-}
-
-
 void Foam::volPointInterpolation::interpolateDisplacement
 (
     const volVectorField& vf,
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index db86433215..1191329e03 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -47,9 +47,6 @@ SourceFiles
 namespace Foam
 {
 
-class fvMesh;
-class pointMesh;
-
 /*---------------------------------------------------------------------------*\
                     Class volPointInterpolation Declaration
 \*---------------------------------------------------------------------------*/
@@ -135,16 +132,17 @@ public:
 
     // Member Functions
 
-        // Edit
+        //- Correct weighting factors for moving mesh.
+        virtual bool movePoints();
 
-            //- Update mesh topology using the morph engine
-            void updateMesh(const polyTopoChangeMap&);
+        //- Update mesh topology using the morph engine
+        virtual void topoChange(const polyTopoChangeMap&);
 
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
-            //- Correct weighting factors for moving mesh.
-            bool movePoints();
+        //- Redistribute or update using the given distribution map
+        virtual void distribute(const polyDistributionMap&);
 
 
     // Interpolation functions
diff --git a/src/functionObjects/field/layerAverage/layerAverage.C b/src/functionObjects/field/layerAverage/layerAverage.C
index 0b191179ad..4fc6310da8 100644
--- a/src/functionObjects/field/layerAverage/layerAverage.C
+++ b/src/functionObjects/field/layerAverage/layerAverage.C
@@ -440,7 +440,7 @@ bool Foam::functionObjects::layerAverage::write()
 }
 
 
-void Foam::functionObjects::layerAverage::updateMesh(const polyTopoChangeMap&)
+void Foam::functionObjects::layerAverage::topoChange(const polyTopoChangeMap&)
 {
     Info<< type() << " " << name() << ":" << nl;
     calcLayers();
diff --git a/src/functionObjects/field/layerAverage/layerAverage.H b/src/functionObjects/field/layerAverage/layerAverage.H
index 0e89f488ad..1c503f97f5 100644
--- a/src/functionObjects/field/layerAverage/layerAverage.H
+++ b/src/functionObjects/field/layerAverage/layerAverage.H
@@ -201,8 +201,8 @@ public:
         //- Calculate and write the graphs
         virtual bool write();
 
-        //- Update for changes of mesh
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Update for mesh point-motion
         virtual void movePoints(const polyMesh&);
diff --git a/src/functionObjects/field/streamlines/streamlines.C b/src/functionObjects/field/streamlines/streamlines.C
index 91da1d7406..c6fd40fa0c 100644
--- a/src/functionObjects/field/streamlines/streamlines.C
+++ b/src/functionObjects/field/streamlines/streamlines.C
@@ -585,7 +585,7 @@ bool Foam::functionObjects::streamlines::write()
 }
 
 
-void Foam::functionObjects::streamlines::updateMesh
+void Foam::functionObjects::streamlines::topoChange
 (
     const polyTopoChangeMap& map
 )
diff --git a/src/functionObjects/field/streamlines/streamlines.H b/src/functionObjects/field/streamlines/streamlines.H
index 587f293e56..7635c230dd 100644
--- a/src/functionObjects/field/streamlines/streamlines.H
+++ b/src/functionObjects/field/streamlines/streamlines.H
@@ -238,8 +238,8 @@ public:
         //- Calculate and write the streamlines
         virtual bool write();
 
-        //- Update for changes of mesh
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Update for mesh point-motion
         virtual void movePoints(const polyMesh&);
diff --git a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 201d2bddd6..b28152f278 100644
--- a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -192,12 +192,25 @@ bool Foam::fv::fixedTemperatureConstraint::constrain
 }
 
 
-void Foam::fv::fixedTemperatureConstraint::updateMesh
+bool Foam::fv::fixedTemperatureConstraint::movePoints()
+{
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::fixedTemperatureConstraint::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    set_.updateMesh(map);
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::fixedTemperatureConstraint::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -210,13 +223,6 @@ void Foam::fv::fixedTemperatureConstraint::distribute
 }
 
 
-bool Foam::fv::fixedTemperatureConstraint::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
 {
     if (fvConstraint::read(dict))
diff --git a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 1fec92f07f..753b9b8b68 100644
--- a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -160,15 +160,18 @@ public:
             const word& fieldName
         ) const;
 
-        //- Update for mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update for mesh motion
+        virtual bool movePoints();
+
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
 
-        //- Update for mesh motion
-        virtual bool movePoints();
-
         //- Read dictionary
         virtual bool read(const dictionary& dict);
 
diff --git a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C
index d437527176..f2504c59f4 100644
--- a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C
+++ b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C
@@ -137,9 +137,22 @@ FOR_ALL_FIELD_TYPES
 );
 
 
-void Foam::fv::fixedValueConstraint::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::fixedValueConstraint::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::fixedValueConstraint::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::fixedValueConstraint::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -152,13 +165,6 @@ void Foam::fv::fixedValueConstraint::distribute
 }
 
 
-bool Foam::fv::fixedValueConstraint::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::fixedValueConstraint::read(const dictionary& dict)
 {
     if (fvConstraint::read(dict))
diff --git a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H
index 0c084f45e5..8a30cd4e98 100644
--- a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H
+++ b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H
@@ -127,15 +127,18 @@ public:
         //- Add a constraint to an equation
         FOR_ALL_FIELD_TYPES(DEFINE_FV_CONSTRAINT_CONSTRAIN);
 
-        //- Update for mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update for mesh motion
+        virtual bool movePoints();
+
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
 
-        //- Update for mesh motion
-        virtual bool movePoints();
-
         //- Read source dictionary
         virtual bool read(const dictionary& dict);
 };
diff --git a/src/fvConstraints/limitMag/limitMag.C b/src/fvConstraints/limitMag/limitMag.C
index 9b55ce3861..192f4ac60d 100644
--- a/src/fvConstraints/limitMag/limitMag.C
+++ b/src/fvConstraints/limitMag/limitMag.C
@@ -140,9 +140,22 @@ FOR_ALL_FIELD_TYPES
 );
 
 
-void Foam::fv::limitMag::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::limitMag::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::limitMag::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::limitMag::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -152,13 +165,6 @@ void Foam::fv::limitMag::distribute(const polyDistributionMap& map)
 }
 
 
-bool Foam::fv::limitMag::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::limitMag::read(const dictionary& dict)
 {
     if (fvConstraint::read(dict))
diff --git a/src/fvConstraints/limitMag/limitMag.H b/src/fvConstraints/limitMag/limitMag.H
index c60ebe22b8..6e4ec4bd51 100644
--- a/src/fvConstraints/limitMag/limitMag.H
+++ b/src/fvConstraints/limitMag/limitMag.H
@@ -127,15 +127,18 @@ public:
         //- Add a constraint to an equation
         FOR_ALL_FIELD_TYPES(DEFINE_FV_CONSTRAINT_CONSTRAIN_FIELD);
 
-        //- Update for mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update for mesh motion
+        virtual bool movePoints();
+
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
 
-        //- Update for mesh motion
-        virtual bool movePoints();
-
         //- Read dictionary
         virtual bool read(const dictionary& dict);
 
diff --git a/src/fvConstraints/limitPressure/limitPressure.C b/src/fvConstraints/limitPressure/limitPressure.C
index 5989730e68..efa41b399a 100644
--- a/src/fvConstraints/limitPressure/limitPressure.C
+++ b/src/fvConstraints/limitPressure/limitPressure.C
@@ -219,7 +219,17 @@ bool Foam::fv::limitPressure::constrain(volScalarField& p) const
 }
 
 
-void Foam::fv::limitPressure::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::limitPressure::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::limitPressure::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::limitPressure::mapMesh(const polyMeshMap&)
 {}
 
 
@@ -227,12 +237,6 @@ void Foam::fv::limitPressure::distribute(const polyDistributionMap&)
 {}
 
 
-bool Foam::fv::limitPressure::movePoints()
-{
-    return true;
-}
-
-
 
 bool Foam::fv::limitPressure::read(const dictionary& dict)
 {
diff --git a/src/fvConstraints/limitPressure/limitPressure.H b/src/fvConstraints/limitPressure/limitPressure.H
index 25cab891b0..35ff983308 100644
--- a/src/fvConstraints/limitPressure/limitPressure.H
+++ b/src/fvConstraints/limitPressure/limitPressure.H
@@ -126,15 +126,18 @@ public:
         //- Constrain the energy field
         virtual bool constrain(volScalarField& he) const;
 
-        //- Update for mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update for mesh motion
+        virtual bool movePoints();
+
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
 
-        //- Update for mesh motion
-        virtual bool movePoints();
-
         //- Read dictionary
         virtual bool read(const dictionary& dict);
 
diff --git a/src/fvConstraints/limitTemperature/limitTemperature.C b/src/fvConstraints/limitTemperature/limitTemperature.C
index 613a196d8f..2571a74c3c 100644
--- a/src/fvConstraints/limitTemperature/limitTemperature.C
+++ b/src/fvConstraints/limitTemperature/limitTemperature.C
@@ -183,9 +183,22 @@ bool Foam::fv::limitTemperature::constrain(volScalarField& he) const
 }
 
 
-void Foam::fv::limitTemperature::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::limitTemperature::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::limitTemperature::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::limitTemperature::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -195,13 +208,6 @@ void Foam::fv::limitTemperature::distribute(const polyDistributionMap& map)
 }
 
 
-bool Foam::fv::limitTemperature::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::limitTemperature::read(const dictionary& dict)
 {
     if (fvConstraint::read(dict))
diff --git a/src/fvConstraints/limitTemperature/limitTemperature.H b/src/fvConstraints/limitTemperature/limitTemperature.H
index 740f2b19aa..d596bcb358 100644
--- a/src/fvConstraints/limitTemperature/limitTemperature.H
+++ b/src/fvConstraints/limitTemperature/limitTemperature.H
@@ -130,15 +130,18 @@ public:
         //- Constrain the energy field
         virtual bool constrain(volScalarField& he) const;
 
-        //- Update for mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update for mesh motion
+        virtual bool movePoints();
+
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
 
-        //- Update for mesh motion
-        virtual bool movePoints();
-
         //- Read dictionary
         virtual bool read(const dictionary& dict);
 
diff --git a/src/fvConstraints/meanVelocityForce/meanVelocityForce.C b/src/fvConstraints/meanVelocityForce/meanVelocityForce.C
index 3d6b6ec16c..1c3f3e7229 100644
--- a/src/fvConstraints/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvConstraints/meanVelocityForce/meanVelocityForce.C
@@ -248,9 +248,22 @@ bool Foam::fv::meanVelocityForce::constrain(volVectorField& U) const
 }
 
 
-void Foam::fv::meanVelocityForce::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::meanVelocityForce::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::meanVelocityForce::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::meanVelocityForce::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -260,13 +273,6 @@ void Foam::fv::meanVelocityForce::distribute(const polyDistributionMap& map)
 }
 
 
-bool Foam::fv::meanVelocityForce::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::meanVelocityForce::read(const dictionary& dict)
 {
     if (fvConstraint::read(dict))
diff --git a/src/fvConstraints/meanVelocityForce/meanVelocityForce.H b/src/fvConstraints/meanVelocityForce/meanVelocityForce.H
index 76cd63a4e8..54e896b3d2 100644
--- a/src/fvConstraints/meanVelocityForce/meanVelocityForce.H
+++ b/src/fvConstraints/meanVelocityForce/meanVelocityForce.H
@@ -155,15 +155,18 @@ public:
         //- Correct the pressure gradient
         virtual bool constrain(volVectorField& U) const;
 
-        //- Update for mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update for mesh motion
+        virtual bool movePoints();
+
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
 
-        //- Update for mesh motion
-        virtual bool movePoints();
-
         //- Read source dictionary
         virtual bool read(const dictionary& dict);
 
diff --git a/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.C b/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.C
index 902f374d87..7c7fd7d94d 100644
--- a/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.C
+++ b/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.C
@@ -154,7 +154,11 @@ bool Foam::fvMeshDistributors::distributor::update()
 }
 
 
-void Foam::fvMeshDistributors::distributor::updateMesh(const polyTopoChangeMap&)
+void Foam::fvMeshDistributors::distributor::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fvMeshDistributors::distributor::mapMesh(const polyMeshMap&)
 {}
 
 
diff --git a/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.H b/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.H
index bfb14b1715..6fc318db6e 100644
--- a/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.H
+++ b/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.H
@@ -125,7 +125,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.C b/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.C
index 97ef9d4286..0f3985c2fd 100644
--- a/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.C
+++ b/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.C
@@ -95,7 +95,13 @@ bool Foam::fvMeshMovers::layeredEngine::update()
 }
 
 
-void Foam::fvMeshMovers::layeredEngine::updateMesh(const polyTopoChangeMap&)
+void Foam::fvMeshMovers::layeredEngine::topoChange(const polyTopoChangeMap&)
+{
+    NotImplemented;
+}
+
+
+void Foam::fvMeshMovers::layeredEngine::mapMesh(const polyMeshMap&)
 {
     NotImplemented;
 }
diff --git a/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.H b/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.H
index 49917eefaf..13be28d94b 100644
--- a/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.H
+++ b/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.H
@@ -82,7 +82,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C b/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C
index d00b239e95..7ad5e01875 100644
--- a/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C
+++ b/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C
@@ -114,7 +114,13 @@ bool Foam::fvMeshMovers::inkJet::update()
 }
 
 
-void Foam::fvMeshMovers::inkJet::updateMesh(const polyTopoChangeMap&)
+void Foam::fvMeshMovers::inkJet::topoChange(const polyTopoChangeMap&)
+{
+    NotImplemented;
+}
+
+
+void Foam::fvMeshMovers::inkJet::mapMesh(const polyMeshMap&)
 {
     NotImplemented;
 }
diff --git a/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H b/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H
index c1679a5ad3..cfccb53eb1 100644
--- a/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H
+++ b/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H
@@ -100,7 +100,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C b/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C
index 0add6555d6..ebef27d06a 100644
--- a/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C
+++ b/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C
@@ -85,12 +85,21 @@ bool Foam::fvMeshMovers::interpolator::update()
 }
 
 
-void Foam::fvMeshMovers::interpolator::updateMesh(const polyTopoChangeMap&)
+void Foam::fvMeshMovers::interpolator::topoChange(const polyTopoChangeMap&)
 {
     NotImplemented;
 }
 
 
+void Foam::fvMeshMovers::interpolator::mapMesh(const polyMeshMap& map)
+{
+    if (displacement_)
+    {
+        points0_() == mesh().points();
+    }
+}
+
+
 void Foam::fvMeshMovers::interpolator::distribute
 (
     const polyDistributionMap&
diff --git a/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.H b/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.H
index e3e7d55e76..cd21115fdb 100644
--- a/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.H
+++ b/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.H
@@ -118,7 +118,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.C b/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.C
index 5816a97f32..51e90b913f 100644
--- a/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.C
+++ b/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.C
@@ -72,9 +72,15 @@ bool Foam::fvMeshMovers::motionSolver::update()
 }
 
 
-void Foam::fvMeshMovers::motionSolver::updateMesh(const polyTopoChangeMap& map)
+void Foam::fvMeshMovers::motionSolver::topoChange(const polyTopoChangeMap& map)
 {
-    motionPtr_->updateMesh(map);
+    motionPtr_->topoChange(map);
+}
+
+
+void Foam::fvMeshMovers::motionSolver::mapMesh(const polyMeshMap& map)
+{
+    motionPtr_->mapMesh(map);
 }
 
 
diff --git a/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.H b/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.H
index ff87247013..ad27597ba0 100644
--- a/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.H
+++ b/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.H
@@ -92,7 +92,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.C b/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.C
index 28479765ad..f4f51d6350 100644
--- a/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.C
@@ -289,9 +289,9 @@ void Foam::linearValveFvMesh::update()
         // Changing topology by hand
         resetMorph();
         setMorphTimeIndex(3*time().timeIndex());
-        updateMesh();
+        topoChange();
 
-        msPtr_->updateMesh();
+        msPtr_->topoChange();
     }
     else
     {
@@ -304,9 +304,9 @@ void Foam::linearValveFvMesh::update()
     // Changing topology by hand
     resetMorph();
     setMorphTimeIndex(3*time().timeIndex() + 1);
-    updateMesh();
+    topoChange();
 
-    msPtr_->updateMesh();
+    msPtr_->topoChange();
 
     if (topoChangeMap.valid())
     {
@@ -327,11 +327,11 @@ void Foam::linearValveFvMesh::update()
     makeSlidersLive();
     resetMorph();
     setMorphTimeIndex(3*time().timeIndex() + 2);
-    updateMesh();
+    topoChange();
 
     Info<< "Moving points post slider attach" << endl;
 
-    msPtr_->updateMesh();
+    msPtr_->topoChange();
 
     Info<< "Sliding interfaces coupled: " << attached() << endl;
 }
diff --git a/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.H b/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.H
index 7bebaa4d72..9c56962b14 100644
--- a/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.H
+++ b/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.H
@@ -100,7 +100,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 76321e4a4e..49f0b54b91 100644
--- a/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -360,7 +360,7 @@ void Foam::linearValveLayersFvMesh::update()
         // Changing topology
         resetMorph();
         setMorphTimeIndex(3*time().timeIndex());
-        updateMesh();
+        topoChange();
     }
     else
     {
@@ -373,7 +373,7 @@ void Foam::linearValveLayersFvMesh::update()
     // Changing topology
     resetMorph();
     setMorphTimeIndex(3*time().timeIndex() + 1);
-    updateMesh();
+    topoChange();
 
     if (topoChangeMap.valid())
     {
@@ -394,7 +394,7 @@ void Foam::linearValveLayersFvMesh::update()
     // Changing topology
     resetMorph();
     setMorphTimeIndex(3*time().timeIndex() + 2);
-    updateMesh();
+    topoChange();
 
     // Info<< "Moving points post slider attach" << endl;
     // const pointField p = allPoints();
diff --git a/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.H b/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.H
index bf46997d22..853e8b8159 100644
--- a/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.H
+++ b/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.H
@@ -97,7 +97,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshTopoChangers/mixerFvMesh/mixerFvMesh.H b/src/fvMeshTopoChangers/mixerFvMesh/mixerFvMesh.H
index 3d98530d49..4490fc33a1 100644
--- a/src/fvMeshTopoChangers/mixerFvMesh/mixerFvMesh.H
+++ b/src/fvMeshTopoChangers/mixerFvMesh/mixerFvMesh.H
@@ -111,7 +111,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.C b/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.C
index b9bbe55000..d59a8d7c07 100644
--- a/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.C
+++ b/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.C
@@ -384,13 +384,20 @@ bool Foam::fvMeshTopoChangers::movingCone::update()
 }
 
 
-void Foam::fvMeshTopoChangers::movingCone::updateMesh
+void Foam::fvMeshTopoChangers::movingCone::topoChange
 (
     const polyTopoChangeMap& map
 )
 {}
 
 
+void Foam::fvMeshTopoChangers::movingCone::mapMesh
+(
+    const polyMeshMap& map
+)
+{}
+
+
 void Foam::fvMeshTopoChangers::movingCone::distribute
 (
     const polyDistributionMap& map
diff --git a/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.H b/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.H
index 89b6a959e6..97f2e57a06 100644
--- a/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.H
+++ b/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.H
@@ -122,7 +122,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C
index 76aa5a42de..226fdd4044 100644
--- a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C
+++ b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C
@@ -166,7 +166,11 @@ bool Foam::fvMeshTopoChangers::raw::update()
 }
 
 
-void Foam::fvMeshTopoChangers::raw::updateMesh(const polyTopoChangeMap& map)
+void Foam::fvMeshTopoChangers::raw::topoChange(const polyTopoChangeMap& map)
+{}
+
+
+void Foam::fvMeshTopoChangers::raw::mapMesh(const polyMeshMap& map)
 {}
 
 
diff --git a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.H b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.H
index 2e4602d9ad..9ae5e99a42 100644
--- a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.H
+++ b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.H
@@ -101,7 +101,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
index 64021f7670..dc4735dbc8 100644
--- a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
+++ b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
@@ -257,7 +257,7 @@ Foam::fvMeshTopoChangers::refiner::refine
     }
 
     // Update fields
-    mesh().updateMesh(map);
+    mesh().topoChange(map);
 
     {
         // Correct the flux for modified/added faces. All the faces which only
@@ -372,7 +372,7 @@ Foam::fvMeshTopoChangers::refiner::unrefine
         << endl;
 
     // Update fields
-    mesh().updateMesh(map);
+    mesh().topoChange(map);
 
     // Correct the fluxes for modified faces
     unrefineFluxes(faceToSplitPoint, map());
@@ -1667,10 +1667,19 @@ bool Foam::fvMeshTopoChangers::refiner::update()
 }
 
 
-void Foam::fvMeshTopoChangers::refiner::updateMesh(const polyTopoChangeMap& map)
+void Foam::fvMeshTopoChangers::refiner::topoChange(const polyTopoChangeMap& map)
 {
     // Update numbering of cells/vertices.
-    meshCutter_.updateMesh(map);
+    meshCutter_.topoChange(map);
+}
+
+
+void Foam::fvMeshTopoChangers::refiner::mapMesh(const polyMeshMap& map)
+{
+    // meshCutter_ will need to be re-constructed from the new mesh
+    // and protectedCells_ updated.
+    // The constructor should be refactored for the protectedCells_ update.
+    NotImplemented;
 }
 
 
diff --git a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
index 865f8dac87..36fc5b8eb9 100644
--- a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
+++ b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
@@ -364,7 +364,10 @@ public:
         virtual bool update();
 
         //- Update corresponding to the given map
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.C b/src/fvModels/derived/accelerationSource/accelerationSource.C
index db6610a33c..2cdc79f783 100644
--- a/src/fvModels/derived/accelerationSource/accelerationSource.C
+++ b/src/fvModels/derived/accelerationSource/accelerationSource.C
@@ -111,9 +111,22 @@ void Foam::fv::accelerationSource::addSup
 }
 
 
-void Foam::fv::accelerationSource::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::accelerationSource::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::accelerationSource::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::accelerationSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -126,13 +139,6 @@ void Foam::fv::accelerationSource::distribute
 }
 
 
-bool Foam::fv::accelerationSource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::accelerationSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.H b/src/fvModels/derived/accelerationSource/accelerationSource.H
index c5c99fc439..04e8edf23c 100644
--- a/src/fvModels/derived/accelerationSource/accelerationSource.H
+++ b/src/fvModels/derived/accelerationSource/accelerationSource.H
@@ -163,17 +163,20 @@ public:
             ) const;
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C
index 5f5a797ecc..b8bb613f30 100644
--- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C
@@ -206,9 +206,22 @@ void Foam::fv::actuationDiskSource::addSup
 }
 
 
-void Foam::fv::actuationDiskSource::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::actuationDiskSource::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::actuationDiskSource::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::actuationDiskSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -221,13 +234,6 @@ void Foam::fv::actuationDiskSource::distribute
 }
 
 
-bool Foam::fv::actuationDiskSource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::actuationDiskSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H
index d032701c38..8ed9a30444 100644
--- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H
@@ -202,17 +202,20 @@ public:
             ) const;
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C
index b95da6ef26..fa561040e2 100644
--- a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C
+++ b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C
@@ -126,7 +126,17 @@ void Foam::fv::buoyancyEnergy::addSup
 }
 
 
-void Foam::fv::buoyancyEnergy::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::buoyancyEnergy::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::buoyancyEnergy::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::buoyancyEnergy::mapMesh(const polyMeshMap& map)
 {}
 
 
@@ -134,12 +144,6 @@ void Foam::fv::buoyancyEnergy::distribute(const polyDistributionMap&)
 {}
 
 
-bool Foam::fv::buoyancyEnergy::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::buoyancyEnergy::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H
index af037634d2..d2880b1fb5 100644
--- a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H
+++ b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H
@@ -132,15 +132,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/fvModels/derived/buoyancyForce/buoyancyForce.C b/src/fvModels/derived/buoyancyForce/buoyancyForce.C
index 0b9a121a2a..7a201ec246 100644
--- a/src/fvModels/derived/buoyancyForce/buoyancyForce.C
+++ b/src/fvModels/derived/buoyancyForce/buoyancyForce.C
@@ -130,7 +130,17 @@ void Foam::fv::buoyancyForce::addSup
 }
 
 
-void Foam::fv::buoyancyForce::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::buoyancyForce::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::buoyancyForce::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::buoyancyForce::mapMesh(const polyMeshMap& map)
 {}
 
 
@@ -138,12 +148,6 @@ void Foam::fv::buoyancyForce::distribute(const polyDistributionMap&)
 {}
 
 
-bool Foam::fv::buoyancyForce::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::buoyancyForce::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/buoyancyForce/buoyancyForce.H b/src/fvModels/derived/buoyancyForce/buoyancyForce.H
index f4b1fb5fa4..238b0ccc1b 100644
--- a/src/fvModels/derived/buoyancyForce/buoyancyForce.H
+++ b/src/fvModels/derived/buoyancyForce/buoyancyForce.H
@@ -142,15 +142,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.C b/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.C
index f713ed60d1..fe9470496a 100644
--- a/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.C
+++ b/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.C
@@ -117,7 +117,17 @@ void Foam::fv::isotropicDamping::addSup
 }
 
 
-void Foam::fv::isotropicDamping::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::isotropicDamping::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::isotropicDamping::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::isotropicDamping::mapMesh(const polyMeshMap& map)
 {}
 
 
@@ -125,12 +135,6 @@ void Foam::fv::isotropicDamping::distribute(const polyDistributionMap&)
 {}
 
 
-bool Foam::fv::isotropicDamping::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::isotropicDamping::read(const dictionary& dict)
 {
     if (damping::read(dict))
diff --git a/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.H b/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.H
index bc535b03a3..db3eb8bcd5 100644
--- a/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.H
+++ b/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.H
@@ -167,15 +167,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/fvModels/derived/damping/verticalDamping/verticalDamping.C b/src/fvModels/derived/damping/verticalDamping/verticalDamping.C
index b35e091dba..aab440b35e 100644
--- a/src/fvModels/derived/damping/verticalDamping/verticalDamping.C
+++ b/src/fvModels/derived/damping/verticalDamping/verticalDamping.C
@@ -106,7 +106,17 @@ void Foam::fv::verticalDamping::addSup
 }
 
 
-void Foam::fv::verticalDamping::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::verticalDamping::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::verticalDamping::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::verticalDamping::mapMesh(const polyMeshMap& map)
 {}
 
 
@@ -114,10 +124,4 @@ void Foam::fv::verticalDamping::distribute(const polyDistributionMap&)
 {}
 
 
-bool Foam::fv::verticalDamping::movePoints()
-{
-    return true;
-}
-
-
 // ************************************************************************* //
diff --git a/src/fvModels/derived/damping/verticalDamping/verticalDamping.H b/src/fvModels/derived/damping/verticalDamping/verticalDamping.H
index ab761cf71a..053d579934 100644
--- a/src/fvModels/derived/damping/verticalDamping/verticalDamping.H
+++ b/src/fvModels/derived/damping/verticalDamping/verticalDamping.H
@@ -172,14 +172,17 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
-
-            //- Update for mesh motion
-            virtual bool movePoints();
 };
 
 
diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index c0abe49626..286a5fba8a 100644
--- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -311,12 +311,25 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
 }
 
 
-void Foam::fv::effectivenessHeatExchangerSource::updateMesh
+bool Foam::fv::effectivenessHeatExchangerSource::movePoints()
+{
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::effectivenessHeatExchangerSource::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    set_.updateMesh(map);
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::effectivenessHeatExchangerSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -329,13 +342,6 @@ void Foam::fv::effectivenessHeatExchangerSource::distribute
 }
 
 
-bool Foam::fv::effectivenessHeatExchangerSource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index acb210ef07..6ae68de4ba 100644
--- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -217,17 +217,26 @@ public:
             const word& fieldName
         ) const;
 
-        //- Update for mesh changes
-        virtual void updateMesh(const polyTopoChangeMap&);
 
-        //- Redistribute or update using the given distribution map
-        virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
-        //- Update for mesh motion
-        virtual bool movePoints();
+            //- Update for mesh motion
+            virtual bool movePoints();
 
-        //- Read dictionary
-        virtual bool read(const dictionary& dict);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
+
+        // IO
+
+            //- Read dictionary
+            virtual bool read(const dictionary& dict);
 
 
     // Member Operators
diff --git a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C
index 0a78868907..f26afc9192 100644
--- a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C
@@ -139,9 +139,22 @@ void Foam::fv::explicitPorositySource::addSup
 }
 
 
-void Foam::fv::explicitPorositySource::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::explicitPorositySource::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::explicitPorositySource::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::explicitPorositySource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -154,13 +167,6 @@ void Foam::fv::explicitPorositySource::distribute
 }
 
 
-bool Foam::fv::explicitPorositySource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H
index ab69c956a8..16d3dcf033 100644
--- a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H
+++ b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H
@@ -176,17 +176,20 @@ public:
             ) const;
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/derived/heatSource/heatSource.C b/src/fvModels/derived/heatSource/heatSource.C
index 7c667059dd..3f2622dacc 100644
--- a/src/fvModels/derived/heatSource/heatSource.C
+++ b/src/fvModels/derived/heatSource/heatSource.C
@@ -150,9 +150,22 @@ void Foam::fv::heatSource::addSup
 }
 
 
-void Foam::fv::heatSource::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::heatSource::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::heatSource::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::heatSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -162,13 +175,6 @@ void Foam::fv::heatSource::distribute(const polyDistributionMap& map)
 }
 
 
-bool Foam::fv::heatSource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::heatSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/heatSource/heatSource.H b/src/fvModels/derived/heatSource/heatSource.H
index 412651cb40..15bf226fa4 100644
--- a/src/fvModels/derived/heatSource/heatSource.H
+++ b/src/fvModels/derived/heatSource/heatSource.H
@@ -130,17 +130,20 @@ public:
             ) const;
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/derived/heatTransfer/heatTransfer.C b/src/fvModels/derived/heatTransfer/heatTransfer.C
index 9beb434f23..701b405f48 100644
--- a/src/fvModels/derived/heatTransfer/heatTransfer.C
+++ b/src/fvModels/derived/heatTransfer/heatTransfer.C
@@ -159,9 +159,22 @@ void Foam::fv::heatTransfer::correct()
 }
 
 
-void Foam::fv::heatTransfer::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::heatTransfer::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::heatTransfer::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::heatTransfer::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -171,13 +184,6 @@ void Foam::fv::heatTransfer::distribute(const polyDistributionMap& map)
 }
 
 
-bool Foam::fv::heatTransfer::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::heatTransfer::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/heatTransfer/heatTransfer.H b/src/fvModels/derived/heatTransfer/heatTransfer.H
index e0f566af4b..9049d7fc60 100644
--- a/src/fvModels/derived/heatTransfer/heatTransfer.H
+++ b/src/fvModels/derived/heatTransfer/heatTransfer.H
@@ -173,17 +173,20 @@ public:
             virtual void correct();
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/derived/massSource/massSource.C b/src/fvModels/derived/massSource/massSource.C
index ce376ca2c2..90fbe6f220 100644
--- a/src/fvModels/derived/massSource/massSource.C
+++ b/src/fvModels/derived/massSource/massSource.C
@@ -267,9 +267,22 @@ FOR_ALL_FIELD_TYPES(IMPLEMENT_FV_MODEL_ADD_RHO_SUP, fv::massSource);
 FOR_ALL_FIELD_TYPES(IMPLEMENT_FV_MODEL_ADD_ALPHA_RHO_SUP, fv::massSource);
 
 
-void Foam::fv::massSource::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::massSource::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::massSource::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::massSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -279,13 +292,6 @@ void Foam::fv::massSource::distribute(const polyDistributionMap& map)
 }
 
 
-bool Foam::fv::massSource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::massSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/massSource/massSource.H b/src/fvModels/derived/massSource/massSource.H
index a430a720ef..0c00988c5d 100644
--- a/src/fvModels/derived/massSource/massSource.H
+++ b/src/fvModels/derived/massSource/massSource.H
@@ -205,17 +205,20 @@ public:
             FOR_ALL_FIELD_TYPES(DEFINE_FV_MODEL_ADD_ALPHA_RHO_SUP);
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
index 49865e6945..2b2c682f7b 100644
--- a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
+++ b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
@@ -109,7 +109,17 @@ FOR_ALL_FIELD_TYPES
 );
 
 
-void Foam::fv::phaseLimitStabilisation::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::phaseLimitStabilisation::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::phaseLimitStabilisation::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::phaseLimitStabilisation::mapMesh(const polyMeshMap& map)
 {}
 
 
@@ -120,12 +130,6 @@ void Foam::fv::phaseLimitStabilisation::distribute
 {}
 
 
-bool Foam::fv::phaseLimitStabilisation::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::phaseLimitStabilisation::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H
index ad389861bd..e83e24c462 100644
--- a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H
+++ b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H
@@ -146,15 +146,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         //- Read dictionary
         virtual bool read(const dictionary& dict);
diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C
index a29627d69d..19f3eea154 100644
--- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C
@@ -630,9 +630,22 @@ void Foam::fv::rotorDiskSource::addSup
 }
 
 
-void Foam::fv::rotorDiskSource::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::rotorDiskSource::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::rotorDiskSource::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::rotorDiskSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -642,13 +655,6 @@ void Foam::fv::rotorDiskSource::distribute(const polyDistributionMap& map)
 }
 
 
-bool Foam::fv::rotorDiskSource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H
index f7d5873cf8..7532875b02 100644
--- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H
@@ -336,17 +336,20 @@ public:
             ) const;
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
index b8fee375ac..d3ef4ec354 100644
--- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
+++ b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
@@ -176,7 +176,17 @@ void Foam::fv::sixDoFAccelerationSource::addSup
 }
 
 
-void Foam::fv::sixDoFAccelerationSource::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::sixDoFAccelerationSource::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::sixDoFAccelerationSource::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::sixDoFAccelerationSource::mapMesh(const polyMeshMap& map)
 {}
 
 
@@ -187,12 +197,6 @@ void Foam::fv::sixDoFAccelerationSource::distribute
 {}
 
 
-bool Foam::fv::sixDoFAccelerationSource::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::sixDoFAccelerationSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H
index 8fa35e18ef..37c0e86d27 100644
--- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H
+++ b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H
@@ -159,15 +159,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         //- Read dictionary
         virtual bool read(const dictionary& dict);
diff --git a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
index 1cc8a25202..4e50d5a9b2 100644
--- a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
+++ b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
@@ -188,13 +188,23 @@ void Foam::fv::solidEquilibriumEnergySource::addSup
 }
 
 
-void Foam::fv::solidEquilibriumEnergySource::updateMesh
+bool Foam::fv::solidEquilibriumEnergySource::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::solidEquilibriumEnergySource::topoChange
 (
     const polyTopoChangeMap&
 )
 {}
 
 
+void Foam::fv::solidEquilibriumEnergySource::mapMesh(const polyMeshMap& map)
+{}
+
+
 void Foam::fv::solidEquilibriumEnergySource::distribute
 (
     const polyDistributionMap&
@@ -202,12 +212,6 @@ void Foam::fv::solidEquilibriumEnergySource::distribute
 {}
 
 
-bool Foam::fv::solidEquilibriumEnergySource::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::solidEquilibriumEnergySource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H
index f98b146bf8..600ea8dcd8 100644
--- a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H
+++ b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H
@@ -155,15 +155,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 1487f49099..be6cd02aa6 100644
--- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -356,12 +356,25 @@ void Foam::fv::solidificationMeltingSource::addSup
 }
 
 
-void Foam::fv::solidificationMeltingSource::updateMesh
+bool Foam::fv::solidificationMeltingSource::movePoints()
+{
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::solidificationMeltingSource::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    set_.updateMesh(map);
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::solidificationMeltingSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -374,13 +387,6 @@ void Foam::fv::solidificationMeltingSource::distribute
 }
 
 
-bool Foam::fv::solidificationMeltingSource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H
index 055d691866..78fa8c45db 100644
--- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -302,17 +302,20 @@ public:
             ) const;
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C
index 98b012ce07..8a2dcd3c9e 100644
--- a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C
+++ b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C
@@ -318,7 +318,17 @@ FOR_ALL_FIELD_TYPES
 );
 
 
-void Foam::fv::volumeFractionSource::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::volumeFractionSource::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::volumeFractionSource::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::volumeFractionSource::mapMesh(const polyMeshMap& map)
 {}
 
 
@@ -326,12 +336,6 @@ void Foam::fv::volumeFractionSource::distribute(const polyDistributionMap&)
 {}
 
 
-bool Foam::fv::volumeFractionSource::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::volumeFractionSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H
index 54434af67c..f3cbf05460 100644
--- a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H
+++ b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H
@@ -232,15 +232,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/fvModels/general/codedFvModel/codedFvModel.C b/src/fvModels/general/codedFvModel/codedFvModel.C
index 86af304048..b66354fb5a 100644
--- a/src/fvModels/general/codedFvModel/codedFvModel.C
+++ b/src/fvModels/general/codedFvModel/codedFvModel.C
@@ -256,9 +256,21 @@ FOR_ALL_FIELD_TYPES(IMPLEMENT_FV_MODEL_ADD_RHO_SUP, fv::codedFvModel);
 FOR_ALL_FIELD_TYPES(IMPLEMENT_FV_MODEL_ADD_ALPHA_RHO_SUP, fv::codedFvModel);
 
 
-void Foam::fv::codedFvModel::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::codedFvModel::movePoints()
 {
-    redirectFvModel().updateMesh(map);
+    return redirectFvModel().movePoints();
+}
+
+
+void Foam::fv::codedFvModel::topoChange(const polyTopoChangeMap& map)
+{
+    redirectFvModel().topoChange(map);
+}
+
+
+void Foam::fv::codedFvModel::mapMesh(const polyMeshMap& map)
+{
+    redirectFvModel().mapMesh(map);
 }
 
 
@@ -268,12 +280,6 @@ void Foam::fv::codedFvModel::distribute(const polyDistributionMap& map)
 }
 
 
-bool Foam::fv::codedFvModel::movePoints()
-{
-    return redirectFvModel().movePoints();
-}
-
-
 bool Foam::fv::codedFvModel::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/general/codedFvModel/codedFvModel.H b/src/fvModels/general/codedFvModel/codedFvModel.H
index 454d5c284d..00faafce48 100644
--- a/src/fvModels/general/codedFvModel/codedFvModel.H
+++ b/src/fvModels/general/codedFvModel/codedFvModel.H
@@ -200,17 +200,20 @@ public:
             FOR_ALL_FIELD_TYPES(DEFINE_FV_MODEL_ADD_ALPHA_RHO_SUP);
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
index 993d938bdd..851a5e8f38 100644
--- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
+++ b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
@@ -234,9 +234,22 @@ FOR_ALL_FIELD_TYPES
 );
 
 
-void Foam::fv::semiImplicitSource::updateMesh(const polyTopoChangeMap& map)
+bool Foam::fv::semiImplicitSource::movePoints()
 {
-    set_.updateMesh(map);
+    set_.movePoints();
+    return true;
+}
+
+
+void Foam::fv::semiImplicitSource::topoChange(const polyTopoChangeMap& map)
+{
+    set_.topoChange(map);
+}
+
+
+void Foam::fv::semiImplicitSource::mapMesh(const polyMeshMap& map)
+{
+    set_.mapMesh(map);
 }
 
 
@@ -249,13 +262,6 @@ void Foam::fv::semiImplicitSource::distribute
 }
 
 
-bool Foam::fv::semiImplicitSource::movePoints()
-{
-    set_.movePoints();
-    return true;
-}
-
-
 bool Foam::fv::semiImplicitSource::read(const dictionary& dict)
 {
     if (fvModel::read(dict))
diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.H b/src/fvModels/general/semiImplicitSource/semiImplicitSource.H
index c7c2243688..82510f8e76 100644
--- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.H
+++ b/src/fvModels/general/semiImplicitSource/semiImplicitSource.H
@@ -218,17 +218,20 @@ public:
             FOR_ALL_FIELD_TYPES(DEFINE_FV_MODEL_ADD_ALPHA_RHO_SUP);
 
 
-        // Mesh motion
-
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
-
-            //- Redistribute or update using the given distribution map
-            virtual void distribute(const polyDistributionMap&);
+        // Mesh changes
 
             //- Update for mesh motion
             virtual bool movePoints();
 
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
+
+            //- Redistribute or update using the given distribution map
+            virtual void distribute(const polyDistributionMap&);
+
 
         // IO
 
diff --git a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index 45e9223db3..c3c694e443 100644
--- a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -163,13 +163,26 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
 }
 
 
-void Foam::fv::interRegionExplicitPorositySource::updateMesh
+bool Foam::fv::interRegionExplicitPorositySource::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::interRegionExplicitPorositySource::topoChange
 (
     const polyTopoChangeMap&
 )
 {}
 
 
+void Foam::fv::interRegionExplicitPorositySource::mapMesh
+(
+    const polyMeshMap& map
+)
+{}
+
+
 void Foam::fv::interRegionExplicitPorositySource::distribute
 (
     const polyDistributionMap&
@@ -177,12 +190,6 @@ void Foam::fv::interRegionExplicitPorositySource::distribute
 {}
 
 
-bool Foam::fv::interRegionExplicitPorositySource::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::interRegionExplicitPorositySource::read(const dictionary& dict)
 {
     if (interRegionModel::read(dict))
diff --git a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
index 4c540c3226..333b7be265 100644
--- a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
+++ b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
@@ -151,15 +151,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C
index 55ebd88cac..76b278d3e7 100644
--- a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C
+++ b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C
@@ -212,7 +212,17 @@ void Foam::fv::interRegionHeatTransfer::correct()
 }
 
 
-void Foam::fv::interRegionHeatTransfer::updateMesh(const polyTopoChangeMap&)
+bool Foam::fv::interRegionHeatTransfer::movePoints()
+{
+    return true;
+}
+
+
+void Foam::fv::interRegionHeatTransfer::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::interRegionHeatTransfer::mapMesh(const polyMeshMap& map)
 {}
 
 
@@ -223,12 +233,6 @@ void Foam::fv::interRegionHeatTransfer::distribute
 {}
 
 
-bool Foam::fv::interRegionHeatTransfer::movePoints()
-{
-    return true;
-}
-
-
 bool Foam::fv::interRegionHeatTransfer::read(const dictionary& dict)
 {
     if (interRegionModel::read(dict))
diff --git a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H
index 0bbb779ce4..0e4e87858e 100644
--- a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H
+++ b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H
@@ -184,15 +184,18 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update for mesh motion
+            virtual bool movePoints();
+
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
 
-            //- Update for mesh motion
-            virtual bool movePoints();
-
 
         // IO
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
index aa12abe7f6..ec45b657c2 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
@@ -239,12 +239,12 @@ void Foam::displacementComponentLaplacianFvMotionSolver::solve()
 }
 
 
-void Foam::displacementComponentLaplacianFvMotionSolver::updateMesh
+void Foam::displacementComponentLaplacianFvMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    componentDisplacementMotionSolver::updateMesh(map);
+    componentDisplacementMotionSolver::topoChange(map);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
index b61049192f..07b1825de1 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
@@ -121,7 +121,7 @@ public:
         virtual void solve();
 
         //- Update topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
index b0c3d309da..ce3bb34352 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
@@ -130,12 +130,12 @@ void Foam::velocityComponentLaplacianFvMotionSolver::solve()
 }
 
 
-void Foam::velocityComponentLaplacianFvMotionSolver::updateMesh
+void Foam::velocityComponentLaplacianFvMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    componentVelocityMotionSolver::updateMesh(map);
+    componentVelocityMotionSolver::topoChange(map);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
index ca28e4aa62..1986e9712f 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
@@ -107,7 +107,7 @@ public:
         virtual void solve();
 
         //- Update topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
index 88c85d8dad..d2f95f33c5 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -178,12 +178,12 @@ void Foam::displacementSBRStressFvMotionSolver::solve()
 }
 
 
-void Foam::displacementSBRStressFvMotionSolver::updateMesh
+void Foam::displacementSBRStressFvMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    displacementMotionSolver::updateMesh(map);
+    displacementMotionSolver::topoChange(map);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
index c6b3bfaf19..90a0ba9797 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
@@ -118,7 +118,7 @@ public:
         virtual void solve();
 
         //- Update topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index de0699cc0d..e01bc122ae 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -240,12 +240,12 @@ void Foam::displacementLaplacianFvMotionSolver::solve()
 }
 
 
-void Foam::displacementLaplacianFvMotionSolver::updateMesh
+void Foam::displacementLaplacianFvMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    displacementMotionSolver::updateMesh(map);
+    displacementMotionSolver::topoChange(map);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
index 6cddfb5c3d..dac9599fb9 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
@@ -123,7 +123,7 @@ public:
         virtual void solve();
 
         //- Update topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
index 4a81b46d3d..0bbffe9f97 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
@@ -137,12 +137,12 @@ void Foam::velocityLaplacianFvMotionSolver::solve()
 //}
 
 
-void Foam::velocityLaplacianFvMotionSolver::updateMesh
+void Foam::velocityLaplacianFvMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    velocityMotionSolver::updateMesh(map);
+    velocityMotionSolver::topoChange(map);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
index fa808dec95..d056352221 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
@@ -112,7 +112,7 @@ public:
         virtual void solve();
 
         //- Update topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
index bf6e656547..8fc9576c6d 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
@@ -25,8 +25,8 @@ License
 
 #include "inverseDistanceDiffusivity.H"
 #include "addToRunTimeSelectionTable.H"
-#include "patchDistWave.H"
-#include "wallPoint.H"
+#include "fvPatchDistWave.H"
+#include "fvWallPoint.H"
 #include "HashSet.H"
 #include "surfaceInterpolate.H"
 #include "zeroGradientFvPatchFields.H"
@@ -65,31 +65,12 @@ Foam::inverseDistanceDiffusivity::~inverseDistanceDiffusivity()
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::scalarField> Foam::inverseDistanceDiffusivity::y() const
-{
-    const labelHashSet patchSet(mesh().boundaryMesh().patchSet(patchNames_));
-
-    if (patchSet.size())
-    {
-        tmp<scalarField> tY(new scalarField(mesh().nCells()));
-        patchDistWave::wave<wallPoint>(mesh(), patchSet, tY.ref(), false);
-        return tY;
-    }
-    else
-    {
-        return tmp<scalarField>(new scalarField(mesh().nCells(), 1));
-    }
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::surfaceScalarField>
 Foam::inverseDistanceDiffusivity::operator()() const
 {
-    volScalarField y_
+    volScalarField y
     (
         IOobject
         (
@@ -98,16 +79,27 @@ Foam::inverseDistanceDiffusivity::operator()() const
             mesh()
         ),
         mesh(),
-        dimless,
+        dimensionedScalar(dimless, 1),
         zeroGradientFvPatchScalarField::typeName
     );
-    y_.primitiveFieldRef() = y();
-    y_.correctBoundaryConditions();
+
+    if (patchNames_.size())
+    {
+        fvPatchDistWave::wave<fvWallPoint>
+        (
+            mesh(),
+            mesh().boundaryMesh().patchSet(patchNames_),
+            y,
+            false
+        );
+    }
+
+    y.correctBoundaryConditions();
 
     return surfaceScalarField::New
     (
         "faceDiffusivity",
-        1.0/fvc::interpolate(y_)
+        1.0/fvc::interpolate(y)
     );
 }
 
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
index 23f59325fc..86d7ecf496 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.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,12 +58,6 @@ class inverseDistanceDiffusivity
         wordReList patchNames_;
 
 
-    // Private Member Functions
-
-        //- Return patch-cell-centre distance field
-        tmp<scalarField> y() const;
-
-
 public:
 
     //- Runtime type information
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
index cf2fdd45ff..ccffc570bf 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
@@ -25,9 +25,8 @@ License
 
 #include "inverseFaceDistanceDiffusivity.H"
 #include "surfaceFields.H"
-#include "HashSet.H"
-#include "wallPoint.H"
-#include "FaceCellWave.H"
+#include "FvFaceCellWave.H"
+#include "fvWallPoint.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -69,6 +68,68 @@ Foam::inverseFaceDistanceDiffusivity::~inverseFaceDistanceDiffusivity()
 Foam::tmp<Foam::surfaceScalarField>
 Foam::inverseFaceDistanceDiffusivity::operator()() const
 {
+    const labelHashSet patchIDs(mesh().boundaryMesh().patchSet(patchNames_));
+
+    const surfaceVectorField::Boundary& CfBf = mesh().Cf().boundaryField();
+
+    // Create changed face information
+    List<labelPair> changedPatchAndFaces;
+    List<fvWallPoint> changedFacesInfo;
+    {
+        label changedFacei = 0;
+        forAllConstIter(labelHashSet, patchIDs, iter)
+        {
+            const label patchi = iter.key();
+            changedFacei += mesh().boundary()[patchi].size();
+        }
+
+        changedPatchAndFaces.resize(changedFacei);
+        changedFacesInfo.resize(changedFacei);
+
+        changedFacei = 0;
+        forAllConstIter(labelHashSet, patchIDs, iter)
+        {
+            const label patchi = iter.key();
+
+            forAll(mesh().boundary()[patchi], patchFacei)
+            {
+                changedPatchAndFaces[changedFacei] =
+                    labelPair(patchi, patchFacei);
+                changedFacesInfo[changedFacei] =
+                    fvWallPoint(CfBf[patchi][patchFacei], 0);
+
+                changedFacei ++;
+            }
+        }
+    }
+
+    // Initialise wave storage
+    List<fvWallPoint> internalFaceInfo(mesh().nInternalFaces());
+    List<List<fvWallPoint>> patchFaceInfo
+    (
+        FvFaceCellWave<fvWallPoint>::template
+        sizesListList<List<List<fvWallPoint>>>
+        (
+            FvFaceCellWave<fvWallPoint>::template
+            listListSizes(mesh().boundary()),
+            fvWallPoint()
+        )
+    );
+    List<fvWallPoint> cellInfo(mesh().nCells());
+
+    // Wave through the mesh
+    FvFaceCellWave<fvWallPoint> wave
+    (
+        mesh(),
+        changedPatchAndFaces,
+        changedFacesInfo,
+        internalFaceInfo,
+        patchFaceInfo,
+        cellInfo,
+        mesh().globalData().nTotalCells() + 1 // max iterations
+    );
+
+    // Create the diffusivity field
     tmp<surfaceScalarField> tfaceDiffusivity
     (
         new surfaceScalarField
@@ -85,93 +146,30 @@ Foam::inverseFaceDistanceDiffusivity::operator()() const
             dimensionedScalar(dimless, 1.0)
         )
     );
-
     surfaceScalarField& faceDiffusivity = tfaceDiffusivity.ref();
 
-    const polyBoundaryMesh& bdry = mesh().boundaryMesh();
-
-    labelHashSet patchSet(bdry.size());
-
-    label nPatchFaces = 0;
-
-    forAll(patchNames_, i)
+    // Convert waved distance data into diffusivities
+    forAll(internalFaceInfo, facei)
     {
-        const label pID = bdry.findPatchID(patchNames_[i]);
-
-        if (pID > -1)
-        {
-            patchSet.insert(pID);
-            nPatchFaces += bdry[pID].size();
-        }
+        const scalar dist = internalFaceInfo[facei].dist(wave.data());
+        faceDiffusivity[facei] = 1/dist;
     }
-
-    List<wallPoint> faceDist(nPatchFaces);
-    labelList changedFaces(nPatchFaces);
-
-    nPatchFaces = 0;
-
-    forAllConstIter(labelHashSet, patchSet, iter)
+    forAll(patchFaceInfo, patchi)
     {
-        const polyPatch& patch = bdry[iter.key()];
+        // Use cell distance on faces that are part of the patch set. This
+        // avoids divide-by-zero issues.
+        const bool useCellDist = patchIDs.found(patchi);
 
-        const vectorField::subField fc(patch.faceCentres());
+        const labelUList& patchCells = mesh().boundary()[patchi].faceCells();
 
-        forAll(fc, patchFacei)
+        forAll(patchFaceInfo[patchi], patchFacei)
         {
-            changedFaces[nPatchFaces] = patch.start() + patchFacei;
+            const scalar dist =
+                useCellDist
+              ? cellInfo[patchCells[patchFacei]].dist(wave.data())
+              : patchFaceInfo[patchi][patchFacei].dist(wave.data());
 
-            faceDist[nPatchFaces] = wallPoint(fc[patchFacei], 0);
-
-            nPatchFaces++;
-        }
-    }
-    faceDist.setSize(nPatchFaces);
-    changedFaces.setSize(nPatchFaces);
-
-    List<wallPoint> faceInfo(mesh().nFaces()), cellInfo(mesh().nCells());
-    FaceCellWave<wallPoint> waveInfo
-    (
-        mesh(),
-        changedFaces,
-        faceDist,
-        faceInfo,
-        cellInfo,
-        mesh().globalData().nTotalCells() + 1   // max iterations
-    );
-
-    for (label facei=0; facei<mesh().nInternalFaces(); facei++)
-    {
-        const scalar dist = faceInfo[facei].distSqr();
-
-        faceDiffusivity[facei] = 1.0/sqrt(dist);
-    }
-
-    surfaceScalarField::Boundary& faceDiffusivityBf =
-        faceDiffusivity.boundaryFieldRef();
-
-    forAll(faceDiffusivityBf, patchi)
-    {
-        fvsPatchScalarField& bfld = faceDiffusivityBf[patchi];
-
-        const labelUList& faceCells = bfld.patch().faceCells();
-
-        if (patchSet.found(patchi))
-        {
-            forAll(bfld, i)
-            {
-                const scalar dist = cellInfo[faceCells[i]].distSqr();
-                bfld[i] = 1.0/sqrt(dist);
-            }
-        }
-        else
-        {
-            const label start = bfld.patch().start();
-
-            forAll(bfld, i)
-            {
-                const scalar dist = faceInfo[start+i].distSqr();
-                bfld[i] = 1.0/sqrt(dist);
-            }
+            faceDiffusivity.boundaryFieldRef()[patchi][patchFacei] = 1/dist;
         }
     }
 
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
index e814fb0ed5..1d71be406e 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.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
@@ -36,6 +36,7 @@ SourceFiles
 #define inverseFaceDistanceDiffusivity_H
 
 #include "motionDiffusivity.H"
+#include "wordReList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,7 +54,7 @@ class inverseFaceDistanceDiffusivity
     // Private Data
 
         //- Patches selected to base the distance on
-        wordList patchNames_;
+        wordReList patchNames_;
 
 
 public:
diff --git a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.C b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.C
index 79bc6e30ba..3dfa88a557 100644
--- a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.C
+++ b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.C
@@ -744,10 +744,10 @@ void Foam::MomentumCloud<CloudType>::patchData
 
 
 template<class CloudType>
-void Foam::MomentumCloud<CloudType>::updateMesh()
+void Foam::MomentumCloud<CloudType>::topoChange()
 {
     updateCellOccupancy();
-    injectors_.updateMesh();
+    injectors_.topoChange();
     cellLengthScale_ = mag(cbrt(this->mesh().V()));
 }
 
@@ -757,7 +757,7 @@ void Foam::MomentumCloud<CloudType>::autoMap(const polyTopoChangeMap& mapper)
 {
     Cloud<parcelType>::autoMap(mapper);
 
-    updateMesh();
+    topoChange();
 }
 
 
diff --git a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H
index 47bce34268..7a028ecb71 100644
--- a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H
+++ b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H
@@ -612,7 +612,7 @@ public:
         // Mapping
 
             //- Update mesh
-            void updateMesh();
+            void topoChange();
 
             //- Remap the cells of particles corresponding to the
             //  mesh topology change with a default tracking data object
diff --git a/src/lagrangian/parcel/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/parcel/clouds/Templates/ReactingCloud/ReactingCloud.C
index 38b82abcd4..a9ea958704 100644
--- a/src/lagrangian/parcel/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/parcel/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -313,7 +313,7 @@ void Foam::ReactingCloud<CloudType>::autoMap(const polyTopoChangeMap& mapper)
 {
     Cloud<parcelType>::autoMap(mapper);
 
-    this->updateMesh();
+    this->topoChange();
 }
 
 
diff --git a/src/lagrangian/parcel/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/parcel/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 8b92285075..50e9576927 100644
--- a/src/lagrangian/parcel/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/parcel/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -254,7 +254,7 @@ void Foam::ReactingMultiphaseCloud<CloudType>::autoMap
 {
     Cloud<parcelType>::autoMap(mapper);
 
-    this->updateMesh();
+    this->topoChange();
 }
 
 
diff --git a/src/lagrangian/parcel/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/parcel/clouds/Templates/ThermoCloud/ThermoCloud.C
index 9e9c4d0d82..fd2bd2d24f 100644
--- a/src/lagrangian/parcel/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/parcel/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -482,7 +482,7 @@ void Foam::ThermoCloud<CloudType>::autoMap(const polyTopoChangeMap& mapper)
 {
     Cloud<parcelType>::autoMap(mapper);
 
-    this->updateMesh();
+    this->topoChange();
 }
 
 
diff --git a/src/lagrangian/parcel/fvModels/clouds/clouds.C b/src/lagrangian/parcel/fvModels/clouds/clouds.C
index ffa0bf27b4..f66ed18631 100644
--- a/src/lagrangian/parcel/fvModels/clouds/clouds.C
+++ b/src/lagrangian/parcel/fvModels/clouds/clouds.C
@@ -330,7 +330,11 @@ void Foam::fv::clouds::preUpdateMesh()
 }
 
 
-void Foam::fv::clouds::updateMesh(const polyTopoChangeMap&)
+void Foam::fv::clouds::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::clouds::mapMesh(const polyMeshMap& map)
 {}
 
 
diff --git a/src/lagrangian/parcel/fvModels/clouds/clouds.H b/src/lagrangian/parcel/fvModels/clouds/clouds.H
index 90da6ade6f..92282d7807 100644
--- a/src/lagrangian/parcel/fvModels/clouds/clouds.H
+++ b/src/lagrangian/parcel/fvModels/clouds/clouds.H
@@ -207,8 +207,11 @@ public:
             //- Prepare for mesh update
             virtual void preUpdateMesh();
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.C
index 483fda650b..eb0db978f7 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.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
@@ -186,7 +186,7 @@ Foam::CellZoneInjection<CloudType>::CellZoneInjection
         )
     )
 {
-    updateMesh();
+    topoChange();
 }
 
 
@@ -219,7 +219,7 @@ Foam::CellZoneInjection<CloudType>::~CellZoneInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::CellZoneInjection<CloudType>::updateMesh()
+void Foam::CellZoneInjection<CloudType>::topoChange()
 {
     // Set/cache the injector cells
     const fvMesh& mesh = this->owner().mesh();
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.H
index cdb0764088..87b5cd7455 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.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:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
index 1ad16cf59b..dc2e82b2e0 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.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
@@ -47,7 +47,7 @@ void Foam::ConeInjection<CloudType>::setInjectionMethod()
     {
         injectionMethod_ = imPoint;
 
-        updateMesh();
+        topoChange();
     }
     else if (injectionMethod == "disc")
     {
@@ -195,7 +195,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     // Set total volume to inject
     this->volumeTotal_ = flowRateProfile_.integral(0, duration_);
 
-    updateMesh();
+    topoChange();
 }
 
 
@@ -238,7 +238,7 @@ Foam::ConeInjection<CloudType>::~ConeInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::ConeInjection<CloudType>::updateMesh()
+void Foam::ConeInjection<CloudType>::topoChange()
 {
     if (injectionMethod_ == imPoint && positionIsConstant_)
     {
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.H
index 9220b16651..8e431561ef 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.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
@@ -289,7 +289,7 @@ public:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index 83c45d521b..e219a149b8 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.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
@@ -96,7 +96,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
     this->volumeTotal_ =
         nParcelsPerInjector_*sum(pow3(diameters_))*pi/6.0;
 
-    updateMesh();
+    topoChange();
 }
 
 
@@ -133,7 +133,7 @@ Foam::FieldActivatedInjection<CloudType>::~FieldActivatedInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::FieldActivatedInjection<CloudType>::updateMesh()
+void Foam::FieldActivatedInjection<CloudType>::topoChange()
 {
     // Set/cache the injector cells
     forAll(positions_, i)
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index 0419f22020..0bafc31169 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.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
@@ -152,7 +152,7 @@ public:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.C
index 59ff2145b9..4bf055b75c 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.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
@@ -154,7 +154,7 @@ Foam::InflationInjection<CloudType>::~InflationInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::InflationInjection<CloudType>::updateMesh()
+void Foam::InflationInjection<CloudType>::topoChange()
 {}
 
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.H
index f1fd2c160c..9fddd4129b 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.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
@@ -147,7 +147,7 @@ public:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.C
index a4d5979836..a3b18e6d12 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.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
@@ -382,7 +382,7 @@ Foam::InjectionModel<CloudType>::~InjectionModel()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::InjectionModel<CloudType>::updateMesh()
+void Foam::InjectionModel<CloudType>::topoChange()
 {}
 
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.H
index a9742ad136..6fbc51ced6 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModel.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
@@ -247,7 +247,7 @@ public:
         // Mapping
 
             //- Update mesh
-            virtual void updateMesh();
+            virtual void topoChange();
 
 
         // Global information
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelList.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelList.C
index 05ced5a715..f75e7e8bac 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelList.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,11 +169,11 @@ Foam::scalar Foam::InjectionModelList<CloudType>::averageParcelMass()
 
 
 template<class CloudType>
-void Foam::InjectionModelList<CloudType>::updateMesh()
+void Foam::InjectionModelList<CloudType>::topoChange()
 {
     forAll(*this, i)
     {
-        this->operator[](i).updateMesh();
+        this->operator[](i).topoChange();
     }
 }
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelList.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelList.H
index a2b3c1887a..b51ecdcf0e 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelList.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ public:
         // Edit
 
             //- Set injector locations when mesh is updated
-            void updateMesh();
+            void topoChange();
 
 
         // Per-injection event functions
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ManualInjection/ManualInjection.C
index daae568826..40d4e2b5c2 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ManualInjection/ManualInjection.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
@@ -70,7 +70,7 @@ Foam::ManualInjection<CloudType>::ManualInjection
         this->coeffDict().lookupOrDefault("ignoreOutOfBounds", false)
     )
 {
-    updateMesh();
+    topoChange();
 
     // Construct parcel diameters
     forAll(diameters_, i)
@@ -112,7 +112,7 @@ Foam::ManualInjection<CloudType>::~ManualInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::ManualInjection<CloudType>::updateMesh()
+void Foam::ManualInjection<CloudType>::topoChange()
 {
     label nRejected = 0;
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ManualInjection/ManualInjection.H
index 2cd7368a4f..5ec1aa8029 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ManualInjection/ManualInjection.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
@@ -129,7 +129,7 @@ public:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.C
index 816c0eb932..0e4d91c0f5 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.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
@@ -66,7 +66,7 @@ Foam::MomentumLookupTableInjection<CloudType>::MomentumLookupTableInjection
     injectorTetFaces_.setSize(injectors_.size());
     injectorTetPts_.setSize(injectors_.size());
 
-    updateMesh();
+    topoChange();
 
     // Determine volume of particles to inject
     this->volumeTotal_ = 0.0;
@@ -106,7 +106,7 @@ Foam::MomentumLookupTableInjection<CloudType>::~MomentumLookupTableInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::MomentumLookupTableInjection<CloudType>::updateMesh()
+void Foam::MomentumLookupTableInjection<CloudType>::topoChange()
 {
     // Set/cache the injector cells
     forAll(injectors_, i)
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.H
index 1f950a49fe..9ffc4f3e2d 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.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
@@ -137,7 +137,7 @@ public:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index e826ce0a77..dac0beb133 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.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
@@ -68,7 +68,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
 {
     duration_ = owner.db().time().userTimeToTime(duration_);
 
-    patchInjectionBase::updateMesh(owner.mesh());
+    patchInjectionBase::topoChange(owner.mesh());
 
     // Re-initialise total mass/volume to inject to zero
     // - will be reset during each injection
@@ -104,9 +104,9 @@ Foam::PatchFlowRateInjection<CloudType>::~PatchFlowRateInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::PatchFlowRateInjection<CloudType>::updateMesh()
+void Foam::PatchFlowRateInjection<CloudType>::topoChange()
 {
-    patchInjectionBase::updateMesh(this->owner().mesh());
+    patchInjectionBase::topoChange(this->owner().mesh());
 }
 
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
index dd349ab062..b2ee75aa1a 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.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,11 +124,11 @@ public:
 
     // Member Functions
 
-        //- Inherit updateMesh from patchInjectionBase
-        using patchInjectionBase::updateMesh;
+        //- Inherit topoChange from patchInjectionBase
+        using patchInjectionBase::topoChange;
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.C
index aee62acda2..a7d5868b2d 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.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
@@ -65,7 +65,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
 {
     duration_ = owner.db().time().userTimeToTime(duration_);
 
-    patchInjectionBase::updateMesh(owner.mesh());
+    patchInjectionBase::topoChange(owner.mesh());
 
     // Set total volume/mass to inject
     this->volumeTotal_ = flowRateProfile_.integral(0.0, duration_);
@@ -98,9 +98,9 @@ Foam::PatchInjection<CloudType>::~PatchInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::PatchInjection<CloudType>::updateMesh()
+void Foam::PatchInjection<CloudType>::topoChange()
 {
-    patchInjectionBase::updateMesh(this->owner().mesh());
+    patchInjectionBase::topoChange(this->owner().mesh());
 }
 
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.H
index d7c5b68350..5c1de34981 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.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
@@ -122,11 +122,11 @@ public:
 
     // Member Functions
 
-        //- Inherit updateMesh from patchInjectionBase
-        using patchInjectionBase::updateMesh;
+        //- Inherit topoChange from patchInjectionBase
+        using patchInjectionBase::topoChange;
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         virtual scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.C
index dff1942bb5..b1468c6e73 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ Foam::patchInjectionBase::patchInjectionBase
             << exit(FatalError);
     }
 
-    updateMesh(mesh);
+    topoChange(mesh);
 }
 
 
@@ -84,7 +84,7 @@ Foam::patchInjectionBase::~patchInjectionBase()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::patchInjectionBase::updateMesh(const polyMesh& mesh)
+void Foam::patchInjectionBase::topoChange(const polyMesh& mesh)
 {
     // Set/cache the injector cells
     const polyPatch& patch = mesh.boundaryMesh()[patchId_];
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.H
index ace6002363..e552e6b034 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
     // Member Functions
 
         //- Update patch geometry and derived info for injection locations
-        virtual void updateMesh(const polyMesh& mesh);
+        virtual void topoChange(const polyMesh& mesh);
 
         //- Set the injection position and owner cell, tetFace and tetPt
         virtual void setPositionAndCell
diff --git a/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index 90f5e0f7e1..b88a19f947 100644
--- a/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.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
@@ -65,7 +65,7 @@ Foam::ReactingLookupTableInjection<CloudType>::ReactingLookupTableInjection
     injectorTetFaces_.setSize(injectors_.size());
     injectorTetPts_.setSize(injectors_.size());
 
-    updateMesh();
+    topoChange();
 
     // Determine volume of particles to inject
     this->volumeTotal_ = 0.0;
@@ -105,7 +105,7 @@ Foam::ReactingLookupTableInjection<CloudType>::~ReactingLookupTableInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::ReactingLookupTableInjection<CloudType>::updateMesh()
+void Foam::ReactingLookupTableInjection<CloudType>::topoChange()
 {
     // Set/cache the injector cells
     forAll(injectors_, i)
diff --git a/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index f82cc68d6e..af2d40878d 100644
--- a/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.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
@@ -136,7 +136,7 @@ public:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index f373613290..8b4a9c8d89 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.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
@@ -66,7 +66,7 @@ ReactingMultiphaseLookupTableInjection
     injectorTetFaces_.setSize(injectors_.size());
     injectorTetPts_.setSize(injectors_.size());
 
-    updateMesh();
+    topoChange();
 
     // Determine volume of particles to inject
     this->volumeTotal_ = 0.0;
@@ -108,7 +108,7 @@ Foam::ReactingMultiphaseLookupTableInjection<CloudType>::
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::ReactingMultiphaseLookupTableInjection<CloudType>::updateMesh()
+void Foam::ReactingMultiphaseLookupTableInjection<CloudType>::topoChange()
 {
     // Set/cache the injector cells
     forAll(injectors_, i)
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 2da8dc63de..5e28c0089e 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.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
@@ -139,7 +139,7 @@ public:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index ac08d51eb9..522af860d1 100644
--- a/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.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
@@ -66,7 +66,7 @@ Foam::ThermoLookupTableInjection<CloudType>::ThermoLookupTableInjection
     injectorTetFaces_.setSize(injectors_.size());
     injectorTetPts_.setSize(injectors_.size());
 
-    updateMesh();
+    topoChange();
 
     // Determine volume of particles to inject
     this->volumeTotal_ = 0.0;
@@ -106,7 +106,7 @@ Foam::ThermoLookupTableInjection<CloudType>::~ThermoLookupTableInjection()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::ThermoLookupTableInjection<CloudType>::updateMesh()
+void Foam::ThermoLookupTableInjection<CloudType>::topoChange()
 {
     // Set/cache the injector cells
     forAll(injectors_, i)
diff --git a/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index 3f467887e7..3818c6a3be 100644
--- a/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.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
@@ -135,7 +135,7 @@ public:
     // Member Functions
 
         //- Set injector locations when mesh is updated
-        virtual void updateMesh();
+        virtual void topoChange();
 
         //- Return the end-of-injection time
         scalar timeEnd() const;
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
index 1adea95363..e83461b912 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
@@ -126,12 +126,12 @@ void Foam::displacementMeshMoverMotionSolver::movePoints(const pointField& p)
 }
 
 
-void Foam::displacementMeshMoverMotionSolver::updateMesh
+void Foam::displacementMeshMoverMotionSolver::topoChange
 (
     const polyTopoChangeMap& map
 )
 {
-    displacementMotionSolver::updateMesh(map);
+    displacementMotionSolver::topoChange(map);
 
     // Update meshMover for new topology
     meshMoverPtr_.clear();
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
index a0c0df7d51..058a0c0060 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
@@ -93,7 +93,7 @@ public:
         virtual void movePoints(const pointField&);
 
         //- Update topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
index 7285119770..cab147cdfc 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
@@ -96,7 +96,7 @@ void Foam::externalDisplacementMeshMover::movePoints(const pointField&)
 }
 
 
-void Foam::externalDisplacementMeshMover::updateMesh
+void Foam::externalDisplacementMeshMover::topoChange
 (
     const polyTopoChangeMap& map
 )
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
index 47d60970c6..e3d0ab7636 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
@@ -167,7 +167,7 @@ public:
             virtual void movePoints(const pointField&);
 
             //-  Update local data for topology changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            virtual void topoChange(const polyTopoChangeMap&);
 
 
     // Member Operators
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
index 7bfd409ba5..0fcbcb7900 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
@@ -266,7 +266,7 @@ public:
         virtual void movePoints(const pointField&);
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&)
+        virtual void topoChange(const polyTopoChangeMap&)
         {
             NotImplemented;
         }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index ed37901cf7..739b3642e0 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -629,7 +629,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRemoveCells
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
@@ -647,7 +647,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRemoveCells
     setInstance(mesh_.facesInstance());
 
     // Update local mesh data
-    cellRemover.updateMesh(map);
+    cellRemover.topoChange(map);
 
     // Update intersections. Recalculate intersections for exposed faces.
     labelList newExposedFaces = renumber
@@ -659,7 +659,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRemoveCells
     // Pout<< "removeCells : updating intersections for "
     //    << newExposedFaces.size() << " newly exposed faces." << endl;
 
-    updateMesh(map, newExposedFaces);
+    topoChange(map, newExposedFaces);
 
     return map;
 }
@@ -771,7 +771,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::splitFaces
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
@@ -804,7 +804,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::splitFaces
         }
     }
 
-    updateMesh(map, newSplitFaces);
+    topoChange(map, newSplitFaces);
 
     return map;
 }
@@ -2357,7 +2357,7 @@ void Foam::meshRefinement::distribute(const polyDistributionMap& map)
 }
 
 
-void Foam::meshRefinement::updateMesh
+void Foam::meshRefinement::topoChange
 (
     const polyTopoChangeMap& map,
     const labelList& changedFaces
@@ -2365,7 +2365,7 @@ void Foam::meshRefinement::updateMesh
 {
     Map<label> dummyMap(0);
 
-    updateMesh(map, changedFaces, dummyMap, dummyMap, dummyMap);
+    topoChange(map, changedFaces, dummyMap, dummyMap, dummyMap);
 }
 
 
@@ -2386,7 +2386,7 @@ void Foam::meshRefinement::storeData
 }
 
 
-void Foam::meshRefinement::updateMesh
+void Foam::meshRefinement::topoChange
 (
     const polyTopoChangeMap& map,
     const labelList& changedFaces,
@@ -2398,7 +2398,7 @@ void Foam::meshRefinement::updateMesh
     // For now only meshCutter has storable/retrievable data.
 
     // Update numbering of cells/vertices.
-    meshCutter_.updateMesh
+    meshCutter_.topoChange
     (
         map,
         pointsToRestore,
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index 41e6d9f1af..03c45f0fe5 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -949,7 +949,7 @@ public:
 
             //- Update for external change to mesh. changedFaces are in new mesh
             //  face labels.
-            void updateMesh
+            void topoChange
             (
                 const polyTopoChangeMap&,
                 const labelList& changedFaces
@@ -978,7 +978,7 @@ public:
                 //- Update local numbering + undo
                 //  Data to restore given as new pointlabel + stored pointlabel
                 //  (i.e. what was in pointsToStore)
-                void updateMesh
+                void topoChange
                 (
                     const polyTopoChangeMap&,
                     const labelList& changedFaces,
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index b24569e39b..7ce490f93a 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -379,7 +379,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::createBaffles
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Move mesh if in inflation mode
     if (map().hasMotionPoints())
@@ -435,7 +435,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::createBaffles
     }
     baffledFacesSet.sync(mesh_);
 
-    updateMesh(map, baffledFacesSet.toc());
+    topoChange(map, baffledFacesSet.toc());
 
     return map;
 }
@@ -914,7 +914,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::mergeBaffles
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
@@ -951,7 +951,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::mergeBaffles
         }
     }
     newExposedFaces.setSize(newI);
-    updateMesh(map, newExposedFaces);
+    topoChange(map, newExposedFaces);
 
     return map;
 }
@@ -2709,7 +2709,7 @@ Foam::meshRefinement::dupNonManifoldPoints
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Move mesh if in inflation mode
     if (map().hasMotionPoints())
@@ -2727,7 +2727,7 @@ Foam::meshRefinement::dupNonManifoldPoints
 
     // Update intersections. Is mapping only (no faces created, positions stay
     // same) so no need to recalculate intersections.
-    updateMesh(map, labelList(0));
+    topoChange(map, labelList(0));
 
     return map;
 }
@@ -3347,7 +3347,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::zonify
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Move mesh if in inflation mode
     if (map().hasMotionPoints())
@@ -3390,7 +3390,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::zonify
     }
 
     // None of the faces has changed, only the zones. Still...
-    updateMesh(map, labelList());
+    topoChange(map, labelList());
 
     return map;
 }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index de09c3cb96..2623400564 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -95,7 +95,7 @@ License
 //            meshMod.changeMesh(mesh_, false, true);
 //
 //        // Update fields
-//        mesh_.updateMesh(map);
+//        mesh_.topoChange(map);
 //
 //        // Move mesh (since morphing does not do this)
 //        if (map().hasMotionPoints())
@@ -112,7 +112,7 @@ License
 //        // Reset the instance for if in overwrite mode
 //        mesh_.setInstance(timeName());
 //
-//        faceCombiner.updateMesh(map);
+//        faceCombiner.topoChange(map);
 //
 //        // Get the kept faces that need to be recalculated.
 //        // Merging two boundary faces might shift the cell centre
@@ -133,7 +133,7 @@ License
 //                retestFaces.insert(cFaces[i]);
 //            }
 //        }
-//        updateMesh(map, retestFaces.toc());
+//        topoChange(map, retestFaces.toc());
 //    }
 //
 //
@@ -194,7 +194,7 @@ License
 //        map = meshMod.changeMesh(mesh_, false, true);
 //
 //        // Update fields
-//        mesh_.updateMesh(map);
+//        mesh_.topoChange(map);
 //
 //        // Move mesh (since morphing does not do this)
 //        if (map().hasMotionPoints())
@@ -210,7 +210,7 @@ License
 //        // Reset the instance for if in overwrite mode
 //        mesh_.setInstance(timeName());
 //
-//        pointRemover.updateMesh(map);
+//        pointRemover.topoChange(map);
 //
 //        // Get the kept faces that need to be recalculated.
 //        labelHashSet retestFaces(6*retestOldFaces.size());
@@ -238,7 +238,7 @@ License
 //                }
 //            }
 //        }
-//        updateMesh(map, retestFaces.toc());
+//        topoChange(map, retestFaces.toc());
 //    }
 //
 //    return map;
@@ -338,7 +338,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
         autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
         // Update fields
-        mesh_.updateMesh(map);
+        mesh_.topoChange(map);
 
         // Move mesh (since morphing does not do this)
         if (map().hasMotionPoints())
@@ -354,7 +354,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
         // Reset the instance for if in overwrite mode
         mesh_.setInstance(timeName());
 
-        faceCombiner.updateMesh(map);
+        faceCombiner.topoChange(map);
 
         // Get the kept faces that need to be recalculated.
         // Merging two boundary faces might shift the cell centre
@@ -366,7 +366,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             const label oldMasterI = allFaceSets[seti][0];
             retestFaces.insert(map().reverseFaceMap()[oldMasterI]);
         }
-        updateMesh(map, growFaceCellFace(retestFaces));
+        topoChange(map, growFaceCellFace(retestFaces));
 
         if (debug&meshRefinement::MESH)
         {
@@ -528,7 +528,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
                 meshMod.changeMesh(mesh_, false, true);
 
             // Update fields
-            mesh_.updateMesh(map);
+            mesh_.topoChange(map);
 
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
@@ -545,7 +545,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             // Reset the instance for if in overwrite mode
             mesh_.setInstance(timeName());
 
-            faceCombiner.updateMesh(map);
+            faceCombiner.topoChange(map);
 
             // Renumber restore maps
             inplaceMapKey(map().reversePointMap(), restoredPoints);
@@ -564,7 +564,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             }
 
             // Experimental:restore all points/face/cells in maps
-            updateMesh
+            topoChange
             (
                 map,
                 growFaceCellFace(retestFaces),
@@ -613,7 +613,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRemovePoints
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
@@ -629,7 +629,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRemovePoints
     // Reset the instance for if in overwrite mode
     mesh_.setInstance(timeName());
 
-    pointRemover.updateMesh(map);
+    pointRemover.topoChange(map);
 
 
     // Retest all affected faces and all the cells using them
@@ -642,7 +642,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRemovePoints
             retestFaces.insert(facei);
         }
     }
-    updateMesh(map, growFaceCellFace(retestFaces));
+    topoChange(map, growFaceCellFace(retestFaces));
 
     if (debug)
     {
@@ -685,7 +685,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRestorePoints
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
@@ -701,7 +701,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRestorePoints
     // Reset the instance for if in overwrite mode
     mesh_.setInstance(timeName());
 
-    pointRemover.updateMesh(map);
+    pointRemover.topoChange(map);
 
     labelHashSet retestFaces(2*facesToRestore.size());
     forAll(facesToRestore, i)
@@ -712,7 +712,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::doRestorePoints
             retestFaces.insert(facei);
         }
     }
-    updateMesh(map, growFaceCellFace(retestFaces));
+    topoChange(map, growFaceCellFace(retestFaces));
 
     if (debug)
     {
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index a1f6677609..25d0afafae 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -2241,7 +2241,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::refine
     autoPtr<polyTopoChangeMap> map = meshMod.changeMesh(mesh_, false);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.topoChange(map);
 
     // Optionally inflate mesh
     if (map().hasMotionPoints())
@@ -2258,7 +2258,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::refine
     mesh_.setInstance(timeName());
 
     // Update intersection info
-    updateMesh(map, getChangedFaces(map, cellsToRefine));
+    topoChange(map, getChangedFaces(map, cellsToRefine));
 
     return map;
 }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index d3b1edad61..ed7666eee6 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -1042,7 +1042,7 @@ void Foam::snappyLayerDriver::determineSidePatches
         }
 
         mesh.clearOut();
-        const_cast<polyBoundaryMesh&>(mesh.boundaryMesh()).updateMesh();
+        const_cast<polyBoundaryMesh&>(mesh.boundaryMesh()).topoChange();
     }
 }
 
@@ -3365,14 +3365,14 @@ void Foam::snappyLayerDriver::addLayers
             fvMesh& newMesh = newMeshPtr();
 
             //?necessary? Update fields
-            newMesh.updateMesh(map);
+            newMesh.topoChange(map);
 
             newMesh.setInstance(meshRefiner_.timeName());
 
             // Update numbering on addLayer:
             // - cell/point labels to be newMesh.
             // - patchFaces to remain in oldMesh order.
-            addLayer.updateMesh
+            addLayer.topoChange
             (
                 map,
                 identity(pp().size()),
@@ -3518,7 +3518,7 @@ void Foam::snappyLayerDriver::addLayers
     mesh.clearOut();
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.topoChange(map);
 
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
@@ -3534,7 +3534,7 @@ void Foam::snappyLayerDriver::addLayers
     // Reset the instance for if in overwrite mode
     mesh.setInstance(meshRefiner_.timeName());
 
-    meshRefiner_.updateMesh(map, labelList(0));
+    meshRefiner_.topoChange(map, labelList(0));
 
     // Update numbering of faceWantedThickness
     meshRefinement::updateList(map().faceMap(), scalar(0), faceWantedThickness);
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.C
index 0210a4cfc9..c083447033 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.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
@@ -65,16 +65,16 @@ void Foam::cyclicAMIPointPatch::movePoints(PstreamBuffers&, const pointField&)
 {}
 
 
-void Foam::cyclicAMIPointPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::cyclicAMIPointPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    facePointPatch::initUpdateMesh(pBufs);
+    facePointPatch::initTopoChange(pBufs);
 //    cyclicAMIPointPatch::initCalcGeometry(pBufs);
 }
 
 
-void Foam::cyclicAMIPointPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::cyclicAMIPointPatch::topoChange(PstreamBuffers& pBufs)
 {
-    facePointPatch::updateMesh(pBufs);
+    facePointPatch::topoChange(pBufs);
 //    cyclicAMIPointPatch::calcGeometry(pBufs);
 }
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H
index 49e58532c5..5fecbbbf9e 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.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
@@ -75,10 +75,10 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index 523a57ab7f..2773fb312e 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.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
@@ -191,19 +191,19 @@ void Foam::cyclicAMIPolyPatch::movePoints
 }
 
 
-void Foam::cyclicAMIPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::cyclicAMIPolyPatch::initTopoChange(PstreamBuffers& pBufs)
 {
     // Clear the invalid AMIs and transforms
     AMIs_.clear();
     AMITransforms_.clear();
 
-    polyPatch::initUpdateMesh(pBufs);
+    polyPatch::initTopoChange(pBufs);
 }
 
 
-void Foam::cyclicAMIPolyPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::cyclicAMIPolyPatch::topoChange(PstreamBuffers& pBufs)
 {
-    polyPatch::updateMesh(pBufs);
+    polyPatch::topoChange(pBufs);
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
index 8d04642af0..b458c17497 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.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
@@ -112,10 +112,10 @@ protected:
         virtual void movePoints(PstreamBuffers& pBufs, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
         //- Clear geometry
         virtual void clearGeom();
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C
index 926845f8f3..badffcdaac 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.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
@@ -213,15 +213,15 @@ void Foam::mappedPolyPatch::movePoints
 }
 
 
-void Foam::mappedPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::mappedPolyPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    polyPatch::initUpdateMesh(pBufs);
+    polyPatch::initTopoChange(pBufs);
 }
 
 
-void Foam::mappedPolyPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::mappedPolyPatch::topoChange(PstreamBuffers& pBufs)
 {
-    polyPatch::updateMesh(pBufs);
+    polyPatch::topoChange(pBufs);
     mappedPatchBase::clearOut();
 }
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H
index f6f0337bfe..b1e58474ce 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.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
@@ -76,10 +76,10 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
index e504ce969f..1cddee68dd 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.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
@@ -219,15 +219,15 @@ void Foam::mappedWallPolyPatch::movePoints
 }
 
 
-void Foam::mappedWallPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::mappedWallPolyPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    wallPolyPatch::initUpdateMesh(pBufs);
+    wallPolyPatch::initTopoChange(pBufs);
 }
 
 
-void Foam::mappedWallPolyPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::mappedWallPolyPatch::topoChange(PstreamBuffers& pBufs)
 {
-    wallPolyPatch::updateMesh(pBufs);
+    wallPolyPatch::topoChange(pBufs);
     mappedPatchBase::clearOut();
 }
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H
index 934751b34b..b545346a28 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.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
@@ -76,10 +76,10 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/meshTools/patchDist/patchDistFuncs/patchDistFuncs.C b/src/meshTools/patchDist/patchDistFuncs/patchDistFuncs.C
index c3e48bed19..8e06c83a46 100644
--- a/src/meshTools/patchDist/patchDistFuncs/patchDistFuncs.C
+++ b/src/meshTools/patchDist/patchDistFuncs/patchDistFuncs.C
@@ -31,9 +31,9 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-Foam::patchDistFuncs::NoMap<Foam::label>
-Foam::patchDistFuncs::NoMap<Foam::label>::null =
-Foam::patchDistFuncs::NoMap<Foam::label>();
+Foam::patchDistFuncs::NoMap<Foam::labelPair>
+Foam::patchDistFuncs::NoMap<Foam::labelPair>::null =
+Foam::patchDistFuncs::NoMap<Foam::labelPair>();
 
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
@@ -43,24 +43,24 @@ Foam::scalar Foam::patchDistFuncs::smallestDist
     const point& p,
     const polyPatch& patch,
     const labelUList& wallFaces,
-    label& minFacei
+    label& minPatchFacei
 )
 {
     const pointField& points = patch.points();
 
     scalar minDist = great;
-    minFacei = -1;
+    minPatchFacei = -1;
 
     forAll(wallFaces, wallFacei)
     {
-        label patchFacei = wallFaces[wallFacei];
+        const label patchFacei = wallFaces[wallFacei];
 
         pointHit curHit = patch[patchFacei].nearestPoint(p, points);
 
         if (curHit.distance() < minDist)
         {
             minDist = curHit.distance();
-            minFacei = patch.start() + patchFacei;
+            minPatchFacei = patchFacei;
         }
     }
 
@@ -88,7 +88,7 @@ void Foam::patchDistFuncs::getPointNeighbours
     }
 
     // Remember part of neighbours that contains edge-connected faces.
-    label nEdgeNbs = neighbours.size();
+    const label nEdgeNbs = neighbours.size();
 
     // Add all point-only neighbours by linear searching in edge neighbours.
     // Assumes that point-only neighbours are not using multiple points on
@@ -96,13 +96,13 @@ void Foam::patchDistFuncs::getPointNeighbours
     const face& f = patch.localFaces()[patchFacei];
     forAll(f, fp)
     {
-        label pointi = f[fp];
+        const label pointi = f[fp];
 
         const labelList& pointNbs = patch.pointFaces()[pointi];
 
         forAll(pointNbs, nbI)
         {
-            label facei = pointNbs[nbI];
+            const label facei = pointNbs[nbI];
 
             // Check for facei in edge-neighbours part of neighbours
             if (findIndex(SubList<label>(neighbours, nEdgeNbs), facei) == -1)
@@ -131,56 +131,4 @@ Foam::label Foam::patchDistFuncs::maxPatchSize
 }
 
 
-void Foam::patchDistFuncs::correctBoundaryPointCells
-(
-    const polyMesh& mesh,
-    const labelHashSet& patchIDs,
-    scalarField& wallDistCorrected,
-    Map<label>& nearestFace
-)
-{
-    // Correct all (non-visited) cells with point on wall
-    const vectorField& cellCentres = mesh.cellCentres();
-
-    forAllConstIter(labelHashSet, patchIDs, iter)
-    {
-        const label patchi = iter.key();
-        const polyPatch& patch = mesh.boundaryMesh()[patchi];
-
-        const labelList& meshPoints = patch.meshPoints();
-        const labelListList& pointFaces = patch.pointFaces();
-
-        forAll(meshPoints, meshPointi)
-        {
-            const labelList& neighbours =
-                mesh.pointCells(meshPoints[meshPointi]);
-
-            forAll(neighbours, neighbourI)
-            {
-                const label celli = neighbours[neighbourI];
-
-                if (!nearestFace.found(celli))
-                {
-                    const labelList& wallFaces = pointFaces[meshPointi];
-
-                    label minFacei = -1;
-
-                    wallDistCorrected[celli] =
-                        smallestDist
-                        (
-                            cellCentres[celli],
-                            patch,
-                            wallFaces,
-                            minFacei
-                        );
-
-                    // Store wallCell and its nearest neighbour
-                    nearestFace.insert(celli, minFacei);
-                }
-            }
-        }
-    }
-}
-
-
 // ************************************************************************* //
diff --git a/src/meshTools/patchDist/patchDistFuncs/patchDistFuncs.H b/src/meshTools/patchDist/patchDistFuncs/patchDistFuncs.H
index a1b9f19998..8da1882346 100644
--- a/src/meshTools/patchDist/patchDistFuncs/patchDistFuncs.H
+++ b/src/meshTools/patchDist/patchDistFuncs/patchDistFuncs.H
@@ -43,6 +43,7 @@ SourceFiles
 #include "scalarField.H"
 #include "FieldField.H"
 #include "point.H"
+#include "labelPair.H"
 #include "primitivePatch.H"
 #include "className.H"
 
@@ -64,7 +65,7 @@ namespace patchDistFuncs
 template<class Type>
 struct NoMap
 {
-    inline bool insert(const label, const label)
+    inline bool insert(const label, const Type&)
     {
         return false;
     }
@@ -87,7 +88,7 @@ scalar smallestDist
     const point& p,
     const polyPatch& patch,
     const labelUList& wallFaces,
-    label& meshFacei
+    label& patchFacei
 );
 
 // Get point neighbours of patchFacei (including patchFacei). Note: Uses a
@@ -104,35 +105,36 @@ void getPointNeighbours
 label maxPatchSize(const polyMesh& mesh, const labelHashSet& patchIDs);
 
 //- Correct all cells connected to boundary (via face). Sets values in
-//  wallDistCorrected. Sets nearest wallface in nearestFace.
+//  wallDistCorrected. Sets nearest wallFace in nearestPatchAndFace.
 template<template<class> class MapType=NoMap>
 void correctBoundaryFaceCells
 (
     const polyMesh& mesh,
     const labelHashSet& patchIDs,
     scalarField& wallDistCorrected,
-    MapType<label>& nearestFace = NoMap<label>::null
+    MapType<labelPair>& nearestPatchAndFace = NoMap<labelPair>::null
 );
 
 //- Correct all face-cells connected to boundary. Sets values in
-//  wallDistCorrected. Sets nearest wallface in nearestFace.
+//  wallDistCorrected. Sets nearest wallFace in nearestPatchAndFace.
 template<template<class> class PatchField, template<class> class MapType=NoMap>
 void correctBoundaryFaceFaceCells
 (
     const polyMesh& mesh,
     const labelHashSet& patchIDs,
     FieldField<PatchField, scalar>& wallDistCorrected,
-    MapType<label>& nearestFace = NoMap<label>::null
+    MapType<labelPair>& nearestPatchAndFace = NoMap<labelPair>::null
 );
 
 //- Correct all cells connected to wall (via point). Sets values in
-//  wallDistCorrected. Uses/sets nearest wallFace in nearestFace.
+//  wallDistCorrected. Uses/sets nearest wallFace in nearestPatchAndFace.
+template<template<class> class MapType=NoMap>
 void correctBoundaryPointCells
 (
     const polyMesh& mesh,
     const labelHashSet& patchIDs,
     scalarField& wallDistCorrected,
-    Map<label>& nearestFace
+    MapType<labelPair>& nearestPatchAndFace = NoMap<labelPair>::null
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/patchDist/patchDistFuncs/patchDistFuncsTemplates.C b/src/meshTools/patchDist/patchDistFuncs/patchDistFuncsTemplates.C
index af1c4bf973..03be10a0b8 100644
--- a/src/meshTools/patchDist/patchDistFuncs/patchDistFuncsTemplates.C
+++ b/src/meshTools/patchDist/patchDistFuncs/patchDistFuncsTemplates.C
@@ -34,7 +34,7 @@ void Foam::patchDistFuncs::correctBoundaryFaceCells
     const polyMesh& mesh,
     const labelHashSet& patchIDs,
     scalarField& wallDistCorrected,
-    MapType<label>& nearestFace
+    MapType<labelPair>& nearestPatchAndFace
 )
 {
     // Size neighbours array for maximum possible (= size of largest patch)
@@ -60,7 +60,7 @@ void Foam::patchDistFuncs::correctBoundaryFaceCells
                 neighbours
             );
 
-            label minFacei = -1;
+            label minPatchFacei = -1;
 
             wallDistCorrected[celli] =
                 smallestDist
@@ -68,11 +68,15 @@ void Foam::patchDistFuncs::correctBoundaryFaceCells
                     cellCentres[celli],
                     patch,
                     neighbours,
-                    minFacei
+                    minPatchFacei
                 );
 
             // Store wallCell and its nearest neighbour
-            nearestFace.insert(celli, minFacei);
+            nearestPatchAndFace.insert
+            (
+                celli,
+                labelPair(patchi, minPatchFacei)
+            );
         }
     }
 }
@@ -84,7 +88,7 @@ void Foam::patchDistFuncs::correctBoundaryFaceFaceCells
     const polyMesh& mesh,
     const labelHashSet& patchIDs,
     FieldField<PatchField, scalar>& wallDistCorrected,
-    MapType<label>& nearestFace
+    MapType<labelPair>& nearestPatchAndFace
 )
 {
     // Size neighbours array for maximum possible (= size of largest patch)
@@ -110,7 +114,7 @@ void Foam::patchDistFuncs::correctBoundaryFaceFaceCells
                 neighbours
             );
 
-            label minFacei = -1;
+            label minPatchFacei = -1;
 
             wallDistCorrected[patchi][patchFacei] =
                 smallestDist
@@ -118,11 +122,72 @@ void Foam::patchDistFuncs::correctBoundaryFaceFaceCells
                     cellCentres[celli],
                     patch,
                     neighbours,
-                    minFacei
+                    minPatchFacei
                 );
 
             // Store wallCell and its nearest neighbour
-            nearestFace.insert(celli, minFacei);
+            nearestPatchAndFace.insert
+            (
+                celli,
+                labelPair(patchi, minPatchFacei)
+            );
+        }
+    }
+}
+
+
+template<template<class> class MapType>
+void Foam::patchDistFuncs::correctBoundaryPointCells
+(
+    const polyMesh& mesh,
+    const labelHashSet& patchIDs,
+    scalarField& wallDistCorrected,
+    MapType<labelPair>& nearestPatchAndFace
+)
+{
+    // Correct all (non-visited) cells with point on wall
+    const vectorField& cellCentres = mesh.cellCentres();
+
+    forAllConstIter(labelHashSet, patchIDs, iter)
+    {
+        const label patchi = iter.key();
+        const polyPatch& patch = mesh.boundaryMesh()[patchi];
+
+        const labelList& meshPoints = patch.meshPoints();
+        const labelListList& pointFaces = patch.pointFaces();
+
+        forAll(meshPoints, meshPointi)
+        {
+            const labelList& neighbours =
+                mesh.pointCells(meshPoints[meshPointi]);
+
+            forAll(neighbours, neighbourI)
+            {
+                const label celli = neighbours[neighbourI];
+
+                if (!nearestPatchAndFace.found(celli))
+                {
+                    const labelList& wallFaces = pointFaces[meshPointi];
+
+                    label minPatchFacei = -1;
+
+                    wallDistCorrected[celli] =
+                        smallestDist
+                        (
+                            cellCentres[celli],
+                            patch,
+                            wallFaces,
+                            minPatchFacei
+                        );
+
+                    // Store wallCell and its nearest neighbour
+                    nearestPatchAndFace.insert
+                    (
+                        celli,
+                        labelPair(patchi, minPatchFacei)
+                    );
+                }
+            }
         }
     }
 }
diff --git a/src/meshTools/patchDist/patchDistWave/patchDistWave.H b/src/meshTools/patchDist/patchDistWave/patchDistWave.H
index 7d64d2a1b7..12d0f78e2e 100644
--- a/src/meshTools/patchDist/patchDistWave/patchDistWave.H
+++ b/src/meshTools/patchDist/patchDistWave/patchDistWave.H
@@ -36,20 +36,16 @@ SourceFiles
 #ifndef patchDistWave_H
 #define patchDistWave_H
 
+#include "polyMesh.H"
+#include "FaceCellWave.H"
 #include "Field.H"
 #include "FieldField.H"
 #include "UPtrList.H"
-#include "FaceCellWave.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// Forward declaration of classes
-class polyMesh;
-class wallPoint;
-
 namespace patchDistWave
 {
 
@@ -70,30 +66,12 @@ void setChangedFaces
 template<class PatchPointType, class DataType, class DataMethod>
 label getCellValues
 (
-    const polyMesh& mesh,
     FaceCellWave<PatchPointType>& waveInfo,
     Field<DataType>& cellValues,
     DataMethod method,
     const DataType& stabiliseValue = pTraits<DataType>::zero
 );
 
-//- Copy FaceCellWave values into the patch field-fields
-template
-<
-    class PatchPointType,
-    template<class> class PatchField,
-    class DataType,
-    class DataMethod
->
-label getPatchValues
-(
-    const polyMesh& mesh,
-    FaceCellWave<PatchPointType>& wave,
-    FieldField<PatchField, DataType>& patchValues,
-    DataMethod method,
-    const DataType& stabiliseValue = pTraits<DataType>::zero
-);
-
 //- Wave distance data from the patches to the cells
 template<class PatchPointType>
 label wave
@@ -104,22 +82,6 @@ label wave
     bool correct = true
 );
 
-//- Wave distance and auxiliary data from the patches to the cells and other
-//  patch faces
-template<class PatchPointType, template<class> class PatchField>
-label wave
-(
-    const polyMesh& mesh,
-    const labelHashSet& patchIDs,
-    const FieldField<PatchField, typename PatchPointType::dataType>&
-        initialPatchData,
-    scalarField& cellDistance,
-    FieldField<PatchField, scalar>& patchDistance,
-    Field<typename PatchPointType::dataType>& cellData,
-    FieldField<PatchField, typename PatchPointType::dataType>& patchData,
-    bool correct = true
-);
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace patchDistWave
diff --git a/src/meshTools/patchDist/patchDistWave/patchDistWaveTemplates.C b/src/meshTools/patchDist/patchDistWave/patchDistWaveTemplates.C
index 62bf836e68..e9953a6c97 100644
--- a/src/meshTools/patchDist/patchDistWave/patchDistWaveTemplates.C
+++ b/src/meshTools/patchDist/patchDistWave/patchDistWaveTemplates.C
@@ -78,7 +78,6 @@ void Foam::patchDistWave::setChangedFaces
 template<class PatchPointType, class DataType, class DataMethod>
 Foam::label Foam::patchDistWave::getCellValues
 (
-    const polyMesh& mesh,
     FaceCellWave<PatchPointType>& waveInfo,
     Field<DataType>& cellValues,
     DataMethod method,
@@ -102,46 +101,6 @@ Foam::label Foam::patchDistWave::getCellValues
 }
 
 
-template
-<
-    class PatchPointType,
-    template<class> class PatchField,
-    class DataType,
-    class DataMethod
->
-Foam::label Foam::patchDistWave::getPatchValues
-(
-    const polyMesh& mesh,
-    FaceCellWave<PatchPointType>& waveInfo,
-    FieldField<PatchField, DataType>& patchValues,
-    DataMethod method,
-    const DataType& stabiliseValue
-)
-{
-    const List<PatchPointType>& faceInfo = waveInfo.allFaceInfo();
-
-    label nInvalid = 0;
-
-    forAll(patchValues, patchi)
-    {
-        const polyPatch& patch = mesh.boundaryMesh()[patchi];
-
-        forAll(patchValues[patchi], patchFacei)
-        {
-            const label facei = patch.start() + patchFacei;
-
-            patchValues[patchi][patchFacei] =
-                (faceInfo[facei].*method)(waveInfo.data())
-              + stabiliseValue;
-
-            nInvalid += !faceInfo[facei].valid(waveInfo.data());
-        }
-    }
-
-    return nInvalid;
-}
-
-
 template<class PatchPointType>
 Foam::label Foam::patchDistWave::wave
 (
@@ -151,7 +110,7 @@ Foam::label Foam::patchDistWave::wave
     const bool correct
 )
 {
-    // Initialise to changedFacesInfo information to face centre on patches
+    // Initialise changedFacesInfo to face centres on patches
     List<PatchPointType> changedFacesInfo;
     labelList changedFaces;
     setChangedFaces
@@ -175,15 +134,18 @@ Foam::label Foam::patchDistWave::wave
     );
 
     // Copy distance into return field
-    label nUnset = 0;
-    scalar (PatchPointType::*dist)(int&) const =
-        &PatchPointType::template dist<int>;
-    nUnset += getCellValues(mesh, wave, cellDistance, dist);
+    const label nUnset =
+        getCellValues
+        (
+            wave,
+            cellDistance,
+            &PatchPointType::template dist<int>
+        );
 
     // Correct patch cells for true distance
     if (correct)
     {
-        Map<label> nearestFace(2*changedFacesInfo.size());
+        Map<labelPair> nearestFace(2*changedFacesInfo.size());
         patchDistFuncs::correctBoundaryFaceCells
         (
             mesh,
@@ -204,90 +166,4 @@ Foam::label Foam::patchDistWave::wave
 }
 
 
-template<class PatchPointType, template<class> class PatchField>
-Foam::label Foam::patchDistWave::wave
-(
-    const polyMesh& mesh,
-    const labelHashSet& patchIDs,
-    const FieldField<PatchField, typename PatchPointType::dataType>&
-        initialPatchData,
-    scalarField& cellDistance,
-    FieldField<PatchField, scalar>& patchDistance,
-    Field<typename PatchPointType::dataType>& cellData,
-    FieldField<PatchField, typename PatchPointType::dataType>& patchData,
-    const bool correct
-)
-{
-    // Initialise to changedFacesInfo information to face centre on patches
-    List<PatchPointType> changedFacesInfo;
-    labelList changedFaces;
-    setChangedFaces
-    (
-        mesh,
-        patchIDs,
-        changedFaces,
-        changedFacesInfo,
-        initialPatchData
-    );
-
-    // Do calculate patch distance by 'growing' from faces.
-    List<PatchPointType> faceInfo(mesh.nFaces()), cellInfo(mesh.nCells());
-    FaceCellWave<PatchPointType> wave
-    (
-        mesh,
-        changedFaces,
-        changedFacesInfo,
-        faceInfo,
-        cellInfo,
-        mesh.globalData().nTotalCells() + 1 // max iterations
-    );
-
-    // Copy distance into return field
-    label nUnset = 0;
-    scalar (PatchPointType::*dist)(int&) const =
-        &PatchPointType::template dist<int>;
-    nUnset += getCellValues(mesh, wave, cellDistance, dist);
-    nUnset += getPatchValues(mesh, wave, patchDistance, dist, small);
-
-    // Copy data into the return field
-    const typename PatchPointType::dataType&
-        (PatchPointType::*data)(int&) const =
-        &PatchPointType::template data<int>;
-    getCellValues(mesh, wave, cellData, data);
-    getPatchValues(mesh, wave, patchData, data);
-
-    // Correct patch cells for true distance
-    if (correct)
-    {
-        Map<label> nearestFace(2*changedFacesInfo.size());
-        patchDistFuncs::correctBoundaryFaceCells
-        (
-            mesh,
-            patchIDs,
-            cellDistance,
-            nearestFace
-        );
-        patchDistFuncs::correctBoundaryPointCells
-        (
-            mesh,
-            patchIDs,
-            cellDistance,
-            nearestFace
-        );
-
-        // Transfer data from nearest face to cell
-        const List<PatchPointType>& faceInfo = wave.allFaceInfo();
-        const labelList patchCells(nearestFace.toc());
-        forAll(patchCells, patchCelli)
-        {
-            const label celli = patchCells[patchCelli];
-            const label facei = nearestFace[celli];
-            cellData[celli] = faceInfo[facei].data();
-        }
-    }
-
-    return nUnset;
-}
-
-
 // ************************************************************************* //
diff --git a/src/meshTools/patchDist/wallPoint/wallPoint.H b/src/meshTools/patchDist/wallPoint/wallPoint.H
index dfd4ef5cc4..6e8f686ad4 100644
--- a/src/meshTools/patchDist/wallPoint/wallPoint.H
+++ b/src/meshTools/patchDist/wallPoint/wallPoint.H
@@ -76,7 +76,9 @@ class wallPoint
         scalar distSqr_;
 
 
-    // Private Member Functions
+protected:
+
+    // Protected Member Functions
 
         //- Evaluate distance to point. Update distSqr, origin from whomever
         //  is nearer pt. Return true if w2 is closer to point,
diff --git a/src/meshTools/patchDist/wallPoint/wallPointI.H b/src/meshTools/patchDist/wallPoint/wallPointI.H
index 47f405d464..e5ecfb97c5 100644
--- a/src/meshTools/patchDist/wallPoint/wallPointI.H
+++ b/src/meshTools/patchDist/wallPoint/wallPointI.H
@@ -27,7 +27,7 @@ License
 #include "transformer.H"
 #include "SubField.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * //
 
 // Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C
index 6082aaa64d..d1fc005141 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.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
@@ -147,15 +147,15 @@ void Foam::regionCoupledPolyPatch::movePoints
 }
 
 
-void Foam::regionCoupledPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::regionCoupledPolyPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    polyPatch::initUpdateMesh(pBufs);
+    polyPatch::initTopoChange(pBufs);
 }
 
 
-void Foam::regionCoupledPolyPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::regionCoupledPolyPatch::topoChange(PstreamBuffers& pBufs)
 {
-    polyPatch::updateMesh(pBufs);
+    polyPatch::topoChange(pBufs);
     regionCoupledBase::clearGeom();
 }
 
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.H b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.H
index 4b5e1b2fa7..cd9f491568 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.H
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.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
@@ -68,10 +68,10 @@ protected:
         virtual void movePoints(PstreamBuffers& pBufs, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C
index ceb26aa967..532a1280e4 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.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
@@ -157,15 +157,15 @@ void Foam::regionCoupledWallPolyPatch::movePoints
 }
 
 
-void Foam::regionCoupledWallPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+void Foam::regionCoupledWallPolyPatch::initTopoChange(PstreamBuffers& pBufs)
 {
-    wallPolyPatch::initUpdateMesh(pBufs);
+    wallPolyPatch::initTopoChange(pBufs);
 }
 
 
-void Foam::regionCoupledWallPolyPatch::updateMesh(PstreamBuffers& pBufs)
+void Foam::regionCoupledWallPolyPatch::topoChange(PstreamBuffers& pBufs)
 {
-    wallPolyPatch::updateMesh(pBufs);
+    wallPolyPatch::topoChange(pBufs);
     regionCoupledBase::clearGeom();
 }
 
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.H b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.H
index 0258a8b2fe..d191d7200b 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.H
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.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
@@ -71,10 +71,10 @@ protected:
         virtual void movePoints(PstreamBuffers&, const pointField&);
 
         //- Initialise the update of the patch topology
-        virtual void initUpdateMesh(PstreamBuffers&);
+        virtual void initTopoChange(PstreamBuffers&);
 
         //- Update of the patch topology
-        virtual void updateMesh(PstreamBuffers&);
+        virtual void topoChange(PstreamBuffers&);
 
 
 public:
diff --git a/src/meshTools/regionSplit/localPointRegion.C b/src/meshTools/regionSplit/localPointRegion.C
index 422f887fd5..03f60f8991 100644
--- a/src/meshTools/regionSplit/localPointRegion.C
+++ b/src/meshTools/regionSplit/localPointRegion.C
@@ -636,7 +636,7 @@ Foam::List<Foam::labelPair> Foam::localPointRegion::findDuplicateFacePairs
 }
 
 
-void Foam::localPointRegion::updateMesh(const polyTopoChangeMap& map)
+void Foam::localPointRegion::topoChange(const polyTopoChangeMap& map)
 {
     {
         Map<label> newMap(meshFaceMap_.size());
diff --git a/src/meshTools/regionSplit/localPointRegion.H b/src/meshTools/regionSplit/localPointRegion.H
index 81e4de3c38..7f940f7866 100644
--- a/src/meshTools/regionSplit/localPointRegion.H
+++ b/src/meshTools/regionSplit/localPointRegion.H
@@ -190,7 +190,7 @@ public:
         // Edit
 
             //- Force recalculation of locally stored data on topological change
-            void updateMesh(const polyTopoChangeMap&);
+            void topoChange(const polyTopoChangeMap&);
 };
 
 
diff --git a/src/meshTools/sets/topoSets/cellSet.C b/src/meshTools/sets/topoSets/cellSet.C
index cd1f498c97..39d0bc098d 100644
--- a/src/meshTools/sets/topoSets/cellSet.C
+++ b/src/meshTools/sets/topoSets/cellSet.C
@@ -222,7 +222,7 @@ label cellSet::maxSize(const polyMesh& mesh) const
 }
 
 
-void cellSet::updateMesh(const polyTopoChangeMap& map)
+void cellSet::topoChange(const polyTopoChangeMap& map)
 {
     updateLabels(map.reverseCellMap());
 }
diff --git a/src/meshTools/sets/topoSets/cellSet.H b/src/meshTools/sets/topoSets/cellSet.H
index f7d4969c20..21c0a9fe6a 100644
--- a/src/meshTools/sets/topoSets/cellSet.H
+++ b/src/meshTools/sets/topoSets/cellSet.H
@@ -145,7 +145,7 @@ public:
         virtual label maxSize(const polyMesh& mesh) const;
 
         //- Update any stored data for new labels
-        virtual void updateMesh(const polyTopoChangeMap& map);
+        virtual void topoChange(const polyTopoChangeMap& map);
 
         //- Write maxLen items with label and coordinates.
         virtual void writeDebug
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C
index cfad672e13..34456c6e05 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.C
+++ b/src/meshTools/sets/topoSets/cellZoneSet.C
@@ -289,7 +289,7 @@ bool cellZoneSet::writeObject
 }
 
 
-void cellZoneSet::updateMesh(const polyTopoChangeMap& map)
+void cellZoneSet::topoChange(const polyTopoChangeMap& map)
 {
     // cellZone
     labelList newAddressing(addressing_.size());
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.H b/src/meshTools/sets/topoSets/cellZoneSet.H
index 335a110788..1fdeff71af 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.H
+++ b/src/meshTools/sets/topoSets/cellZoneSet.H
@@ -147,7 +147,7 @@ public:
         ) const;
 
         //- Update any stored data for new labels
-        virtual void updateMesh(const polyTopoChangeMap& map);
+        virtual void topoChange(const polyTopoChangeMap& map);
 
         //- Return max index+1.
         virtual label maxSize(const polyMesh& mesh) const;
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 33315969fb..6491699c5d 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -155,7 +155,7 @@ label faceSet::maxSize(const polyMesh& mesh) const
 }
 
 
-void faceSet::updateMesh(const polyTopoChangeMap& map)
+void faceSet::topoChange(const polyTopoChangeMap& map)
 {
     updateLabels(map.reverseFaceMap());
 }
diff --git a/src/meshTools/sets/topoSets/faceSet.H b/src/meshTools/sets/topoSets/faceSet.H
index 337233a730..1d7610280e 100644
--- a/src/meshTools/sets/topoSets/faceSet.H
+++ b/src/meshTools/sets/topoSets/faceSet.H
@@ -114,7 +114,7 @@ public:
         virtual label maxSize(const polyMesh& mesh) const;
 
         //- Update any stored data for new labels
-        virtual void updateMesh(const polyTopoChangeMap& map);
+        virtual void topoChange(const polyTopoChangeMap& map);
 
         //- Write maxLen items with label and coordinates.
         virtual void writeDebug
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index b6dcfc67bf..2fa8ebe352 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -505,7 +505,7 @@ bool faceZoneSet::writeObject
 }
 
 
-void faceZoneSet::updateMesh(const polyTopoChangeMap& map)
+void faceZoneSet::topoChange(const polyTopoChangeMap& map)
 {
     // faceZone
     labelList newAddressing(addressing_.size());
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.H b/src/meshTools/sets/topoSets/faceZoneSet.H
index 6407eafa99..13d396a762 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.H
+++ b/src/meshTools/sets/topoSets/faceZoneSet.H
@@ -164,7 +164,7 @@ public:
         ) const;
 
         //- Update any stored data for new labels
-        virtual void updateMesh(const polyTopoChangeMap& map);
+        virtual void topoChange(const polyTopoChangeMap& map);
 
         //- Return max index+1.
         virtual label maxSize(const polyMesh& mesh) const;
diff --git a/src/meshTools/sets/topoSets/pointSet.C b/src/meshTools/sets/topoSets/pointSet.C
index 64e4233df0..0bd0aa292c 100644
--- a/src/meshTools/sets/topoSets/pointSet.C
+++ b/src/meshTools/sets/topoSets/pointSet.C
@@ -150,7 +150,7 @@ label pointSet::maxSize(const polyMesh& mesh) const
 }
 
 
-void pointSet::updateMesh(const polyTopoChangeMap& map)
+void pointSet::topoChange(const polyTopoChangeMap& map)
 {
     updateLabels(map.reversePointMap());
 }
diff --git a/src/meshTools/sets/topoSets/pointSet.H b/src/meshTools/sets/topoSets/pointSet.H
index 4f76195868..f4450f455f 100644
--- a/src/meshTools/sets/topoSets/pointSet.H
+++ b/src/meshTools/sets/topoSets/pointSet.H
@@ -114,10 +114,10 @@ public:
         virtual label maxSize(const polyMesh& mesh) const;
 
         //- Update any stored data for new labels
-        virtual void updateMesh(const polyTopoChangeMap& map);
+        virtual void topoChange(const polyTopoChangeMap& map);
 
         //- Update any stored data for new labels
-        // virtual void updateMesh(const polyTopoChange& meshMod);
+        // virtual void topoChange(const polyTopoChange& meshMod);
 
         //- Write maxLen items with label and coordinates.
         virtual void writeDebug
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C
index 85c5528e35..bea2b6396a 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.C
+++ b/src/meshTools/sets/topoSets/pointZoneSet.C
@@ -290,7 +290,7 @@ bool pointZoneSet::writeObject
 }
 
 
-void pointZoneSet::updateMesh(const polyTopoChangeMap& map)
+void pointZoneSet::topoChange(const polyTopoChangeMap& map)
 {
     // pointZone
     labelList newAddressing(addressing_.size());
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.H b/src/meshTools/sets/topoSets/pointZoneSet.H
index bc83c3622d..7e714ccd8b 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.H
+++ b/src/meshTools/sets/topoSets/pointZoneSet.H
@@ -151,7 +151,7 @@ public:
         ) const;
 
         //- Update any stored data for new labels
-        virtual void updateMesh(const polyTopoChangeMap& map);
+        virtual void topoChange(const polyTopoChangeMap& map);
 
         //- Return max index+1.
         virtual label maxSize(const polyMesh& mesh) const;
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 849d6e76e5..6e375e6653 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -544,7 +544,7 @@ bool Foam::topoSet::writeData(Ostream& os) const
 }
 
 
-void Foam::topoSet::updateMesh(const polyTopoChangeMap&)
+void Foam::topoSet::topoChange(const polyTopoChangeMap&)
 {
     NotImplemented;
 }
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index c6023d0374..2ae40e963f 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -294,7 +294,7 @@ public:
         virtual bool writeData(Ostream&) const;
 
         //- Update any stored data for new labels. Not implemented.
-        virtual void updateMesh(const polyTopoChangeMap& map);
+        virtual void topoChange(const polyTopoChangeMap& map);
 
         //- Return max allowable index (+1). Not implemented.
         virtual label maxSize(const polyMesh& mesh) const = 0;
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index 275f426bd9..5e16eb037e 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -357,7 +357,13 @@ void Foam::twoDPointCorrector::correctDisplacement
 }
 
 
-void Foam::twoDPointCorrector::updateMesh(const polyTopoChangeMap&)
+void Foam::twoDPointCorrector::topoChange(const polyTopoChangeMap&)
+{
+    clearAddressing();
+}
+
+
+void Foam::twoDPointCorrector::mapMesh(const polyMeshMap&)
 {
     clearAddressing();
 }
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
index e493c661d9..cc5c1ea4be 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
@@ -145,7 +145,10 @@ public:
         void correctDisplacement(const pointField& p, vectorField& disp) const;
 
         //- Update topology
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Redistribute or update using the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/radiationModels/fvModels/radiation/radiation.C b/src/radiationModels/fvModels/radiation/radiation.C
index 80e5aafd2c..277d4864d8 100644
--- a/src/radiationModels/fvModels/radiation/radiation.C
+++ b/src/radiationModels/fvModels/radiation/radiation.C
@@ -94,7 +94,11 @@ void Foam::fv::radiation::addSup
 }
 
 
-void Foam::fv::radiation::updateMesh(const polyTopoChangeMap&)
+void Foam::fv::radiation::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::radiation::mapMesh(const polyMeshMap& map)
 {}
 
 
diff --git a/src/radiationModels/fvModels/radiation/radiation.H b/src/radiationModels/fvModels/radiation/radiation.H
index e528417277..c1c3437926 100644
--- a/src/radiationModels/fvModels/radiation/radiation.H
+++ b/src/radiationModels/fvModels/radiation/radiation.H
@@ -113,8 +113,11 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C
index 0955522b44..565e35b9c4 100644
--- a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C
+++ b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C
@@ -218,7 +218,11 @@ void Foam::fv::surfaceFilm::addSup
 }
 
 
-void Foam::fv::surfaceFilm::updateMesh(const polyTopoChangeMap&)
+void Foam::fv::surfaceFilm::topoChange(const polyTopoChangeMap&)
+{}
+
+
+void Foam::fv::surfaceFilm::mapMesh(const polyMeshMap& map)
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H
index 10d24c7f78..a10c0afa80 100644
--- a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H
+++ b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H
@@ -145,8 +145,11 @@ public:
 
         // Mesh changes
 
-            //- Update for mesh changes
-            virtual void updateMesh(const polyTopoChangeMap&);
+            //- Update topology using the given map
+            virtual void topoChange(const polyTopoChangeMap&);
+
+            //- Update from another mesh using the given map
+            virtual void mapMesh(const polyMeshMap&);
 
             //- Redistribute or update using the given distribution map
             virtual void distribute(const polyDistributionMap&);
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index 62a3f1a309..c0098bcfbf 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -411,7 +411,7 @@ void Foam::rigidBodyMeshMotion::solve()
 }
 
 
-void Foam::rigidBodyMeshMotion::updateMesh(const polyTopoChangeMap& map)
+void Foam::rigidBodyMeshMotion::topoChange(const polyTopoChangeMap& map)
 {
     // pointMesh already updates pointFields
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
index e5e0f549d5..05ac402dc6 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
@@ -173,7 +173,7 @@ public:
         virtual void solve();
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Write motion state information for restart
         virtual bool write() const;
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
index 8d86fc3d26..75f056a20b 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -302,9 +302,15 @@ void Foam::rigidBodyMeshMotionSolver::movePoints(const pointField& points)
 }
 
 
-void Foam::rigidBodyMeshMotionSolver::updateMesh(const polyTopoChangeMap& map)
+void Foam::rigidBodyMeshMotionSolver::topoChange(const polyTopoChangeMap& map)
 {
-    meshSolverPtr_->updateMesh(map);
+    meshSolverPtr_->topoChange(map);
+}
+
+
+void Foam::rigidBodyMeshMotionSolver::mapMesh(const polyMeshMap& map)
+{
+    meshSolverPtr_->mapMesh(map);
 }
 
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
index 294839c379..abfb2794e1 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
@@ -157,7 +157,10 @@ public:
         virtual void movePoints(const pointField&);
 
         //-  Update local data for topology changes
-        virtual void updateMesh(const polyTopoChangeMap&);
+        virtual void topoChange(const polyTopoChangeMap&);
+
+        //- Update from another mesh using the given map
+        virtual void mapMesh(const polyMeshMap&);
 
         //- Update corresponding to the given distribution map
         virtual void distribute(const polyDistributionMap&);
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 616fc35299..343b8c3c1d 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -354,9 +354,9 @@ bool Foam::probes::write()
 }
 
 
-void Foam::probes::updateMesh(const polyTopoChangeMap& map)
+void Foam::probes::topoChange(const polyTopoChangeMap& map)
 {
-    DebugInfo<< "probes: updateMesh" << endl;
+    DebugInfo<< "probes: topoChange" << endl;
 
     if (&map.mesh() != &mesh_)
     {
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index c19ba170f6..4dd0d0b271 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -234,13 +234,13 @@ public:
         //- Sample and write
         virtual bool write();
 
-        //- Update for changes of mesh
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
 
-        //- Update for changes of mesh
+        //- Update topology using the given map
         virtual void movePoints(const polyMesh&);
 
-        //- Update for changes of mesh due to readUpdate
+        //- Update topology using the given map due to readUpdate
         virtual void readUpdate(const polyMesh::readUpdateState state)
         {}
 
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index dd04a86b4f..ff961b4b06 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -283,7 +283,7 @@ void Foam::functionObjects::sampledSets::correct()
 }
 
 
-void Foam::functionObjects::sampledSets::updateMesh
+void Foam::functionObjects::sampledSets::topoChange
 (
     const polyTopoChangeMap& map
 )
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index f360cc5b36..3dd1caaaad 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -181,13 +181,13 @@ public:
         //- Correct for mesh changes
         void correct();
 
-        //- Update for changes of mesh
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update topology using the given map
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Update for mesh point-motion
         virtual void movePoints(const polyMesh&);
 
-        //- Update for changes of mesh due to readUpdate
+        //- Update topology using the given map due to readUpdate
         virtual void readUpdate(const polyMesh::readUpdateState state);
 
 
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 000b96116a..2d915cfc77 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -271,7 +271,7 @@ Foam::wordList Foam::functionObjects::sampledSurfaces::fields() const
 }
 
 
-void Foam::functionObjects::sampledSurfaces::updateMesh
+void Foam::functionObjects::sampledSurfaces::topoChange
 (
     const polyTopoChangeMap& map
 )
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index 244502700d..3af159a8fd 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -235,13 +235,14 @@ public:
         //- Sample and write
         virtual bool write();
 
-        //- Update for changes of mesh - expires the surfaces
-        virtual void updateMesh(const polyTopoChangeMap&);
+        //- Update topology using the given map - expires the surfaces
+        virtual void topoChange(const polyTopoChangeMap&);
 
         //- Update for mesh point-motion - expires the surfaces
         virtual void movePoints(const polyMesh&);
 
-        //- Update for changes of mesh due to readUpdate - expires the surfaces
+        //- Update topology using the given map due to readUpdate
+        //  - expires the surfaces
         virtual void readUpdate(const polyMesh::readUpdateState state);