diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C
index c7e0d8f29d..1c7ecde8a3 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,7 @@ void Foam::fv::VoFClouds::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::VoFClouds::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::VoFClouds::distribute(const polyMeshDistributionMap& map)
 {
     clouds_.distribute(map);
 }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H
index 3f28f686f2..1227953b13 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,7 +152,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
index 28dc4e32b8..300bc1262e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -233,7 +233,7 @@ void Foam::fv::VoFSolidificationMeltingSource::updateMesh
 
 void Foam::fv::VoFSolidificationMeltingSource::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
index 431135a65b..1087044d8e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,7 +194,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C
index 7304280f09..e4ab225d5b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C
@@ -159,7 +159,7 @@ void Foam::fv::VoFSurfaceFilm::updateMesh(const mapPolyMesh&)
 }
 
 
-void Foam::fv::VoFSurfaceFilm::distribute(const mapDistributePolyMesh&)
+void Foam::fv::VoFSurfaceFilm::distribute(const polyMeshDistributionMap&)
 {
     NotImplemented;
 }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H
index b94adb67d5..598b9d6f4a 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H
@@ -139,7 +139,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
index 1e29f31b00..fbf06c263b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ void Foam::fv::VoFTurbulenceDamping::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::VoFTurbulenceDamping::distribute(const mapDistributePolyMesh&)
+void Foam::fv::VoFTurbulenceDamping::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
index 3bbdb13a87..797ce6efba 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
index 3e03206ee7..f33ca263bb 100644
--- a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
+++ b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ void Foam::fv::VoFTurbulenceDamping::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::VoFTurbulenceDamping::distribute(const mapDistributePolyMesh&)
+void Foam::fv::VoFTurbulenceDamping::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
index c9312c5529..561222bdbf 100644
--- a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
+++ b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,7 +177,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C
index b18fd6659c..2a7bce8fef 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C
@@ -310,7 +310,7 @@ void Foam::fv::interfaceTurbulenceDamping::updateMesh(const mapPolyMesh&)
 
 void Foam::fv::interfaceTurbulenceDamping::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {}
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H
index 62479f1e4c..4ab93e0fe5 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H
@@ -198,7 +198,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C
index 4fa7eb3d2f..6cceb57293 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C
@@ -241,7 +241,7 @@ void Foam::fv::phaseTurbulenceStabilisation::updateMesh(const mapPolyMesh&)
 
 void Foam::fv::phaseTurbulenceStabilisation::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {}
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H
index dc7b1aeaf5..e3c47ab02a 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H
@@ -168,7 +168,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index 1cc47f2c86..8fd9186e18 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.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
@@ -55,7 +55,7 @@ using namespace Foam;
 //    const globalMeshData& globalData = mesh.globalData();
 //    const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch();
 //    const Map<label>& coupledPatchMP = coupledPatch.meshPointMap();
-//    const mapDistribute& map = globalData.globalPointSlavesMap();
+//    const distributionMap& map = globalData.globalPointSlavesMap();
 //    const globalIndexAndTransform& transforms =
 //        globalData.globalTransforms();
 //
@@ -171,7 +171,7 @@ using namespace Foam;
 //        transforms,
 //        coupledPointNormals.size(),
 //        coupledPointNormals,
-//        mapDistribute::transform()
+//        distributionMap::transform()
 //    );
 //
 //
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil.C b/applications/test/extendedStencil/Test-ExtendedStencil.C
index 35122c45c3..c2431e2638 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil.C
+++ b/applications/test/extendedStencil/Test-ExtendedStencil.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
@@ -33,7 +33,7 @@ Description
 #include "fvMesh.H"
 #include "volFields.H"
 #include "Time.H"
-//#include "mapDistribute.H"
+//#include "distributionMap.H"
 #include "OFstream.H"
 #include "meshTools.H"
 //#include "FECCellToFaceStencil.H"
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil2.C b/applications/test/extendedStencil/Test-ExtendedStencil2.C
index d199140099..c32df3bcd2 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil2.C
+++ b/applications/test/extendedStencil/Test-ExtendedStencil2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
 
         // Construct exchange map and renumber stencil
         List<Map<label>> compactMap(Pstream::nProcs());
-        mapDistribute map
+        distributionMap map
         (
             stencil.globalNumbering(),
             stencil,
diff --git a/applications/test/globalMeshData/Test-globalMeshData.C b/applications/test/globalMeshData/Test-globalMeshData.C
index 82d289a8d1..7db137b008 100644
--- a/applications/test/globalMeshData/Test-globalMeshData.C
+++ b/applications/test/globalMeshData/Test-globalMeshData.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
@@ -33,7 +33,7 @@ Description
 #include "argList.H"
 #include "polyMesh.H"
 #include "Time.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 using namespace Foam;
 
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 
     // Test:print shared points
     {
-        const mapDistribute& globalPointSlavesMap =
+        const distributionMap& globalPointSlavesMap =
             globalData.globalPointSlavesMap();
         const labelListList& slaves =
             globalData.globalPointSlaves();
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
         (
             transforms,
             coords,
-            mapDistribute::transformPosition()
+            distributionMap::transformPosition()
         );
 
         // Print
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
 
     // Test:print shared edges
     {
-        const mapDistribute& globalEdgeSlavesMap =
+        const distributionMap& globalEdgeSlavesMap =
             globalData.globalEdgeSlavesMap();
         const labelListList& slaves =
             globalData.globalEdgeSlaves();
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
         (
             transforms,
             ec,
-            mapDistribute::transformPosition()
+            distributionMap::transformPosition()
         );
 
         // Print
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
 
     // Test: point to faces addressing
     {
-        const mapDistribute& globalPointBoundaryFacesMap =
+        const distributionMap& globalPointBoundaryFacesMap =
             globalData.globalPointBoundaryFacesMap();
         const labelListList& slaves =
             globalData.globalPointBoundaryFaces();
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
         (
             transforms,
             fc,
-            mapDistribute::transformPosition()
+            distributionMap::transformPosition()
         );
 
         // Print
@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
     // Test: point to cells addressing
     {
         const labelList& boundaryCells = globalData.boundaryCells();
-        const mapDistribute& globalPointBoundaryCellsMap =
+        const distributionMap& globalPointBoundaryCellsMap =
             globalData.globalPointBoundaryCellsMap();
         const labelListList& slaves = globalData.globalPointBoundaryCells();
         const labelListList& transformedSlaves =
@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
         (
             transforms,
             cc,
-            mapDistribute::transformPosition()
+            distributionMap::transformPosition()
         );
 
         // Print
diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
index 50133f3b98..5502de4c32 100644
--- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
+++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "List.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "argList.H"
 #include "Time.H"
 #include "IPstream.H"
diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index 4820b64819..0155161386 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/applications/test/parallel/Test-parallel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "List.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "argList.H"
 #include "Time.H"
 #include "IPstream.H"
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
 
-    // Test mapDistribute
+    // Test distributionMap
     // ~~~~~~~~~~~~~~~~~~
 
     if (true)
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
 
 
         // Construct distribute map (destructively)
-        mapDistribute map(constructSize, move(sendMap), move(recvMap));
+        distributionMap map(constructSize, move(sendMap), move(recvMap));
 
         // Distribute complexData
         map.distribute(complexData);
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 0e644fba5c..da2f3871f7 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.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
@@ -581,7 +581,7 @@ void calcEdgeMinMaxZone
     const primitiveFacePatch& extrudePatch,
     const labelList& extrudeMeshEdges,
     const labelList& zoneID,
-    const mapDistribute& extrudeEdgeFacesMap,
+    const distributionMap& extrudeEdgeFacesMap,
     const labelListList& extrudeEdgeGlobalFaces,
 
     labelList& minZoneID,
@@ -838,7 +838,7 @@ void addCoupledPatches
     const primitiveFacePatch& extrudePatch,
     const labelList& extrudeMeshFaces,
     const labelList& extrudeMeshEdges,
-    const mapDistribute& extrudeEdgeFacesMap,
+    const distributionMap& extrudeEdgeFacesMap,
     const labelListList& extrudeEdgeGlobalFaces,
 
     labelList& sidePatchID,
@@ -1786,7 +1786,7 @@ int main(int argc, char *argv[])
         )
     );
     List<Map<label>> compactMap;
-    const mapDistribute extrudeEdgeFacesMap
+    const distributionMap extrudeEdgeFacesMap
     (
         globalExtrudeFaces,
         extrudeEdgeGlobalFaces,
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
index 0933af8908..8a2557de1e 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ namespace Foam
 class polyMesh;
 class polyTopoChange;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 class polyBoundaryMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -123,7 +123,7 @@ public:
         {}
 
         //- Force recalculation of locally stored data for mesh distribution
-        void distribute(const mapDistributePolyMesh&)
+        void distribute(const polyMeshDistributionMap&)
         {}
 
         label frontPatchi() const
diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
index 0f1ebc8c44..e562c61103 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ Foam::tmp<Foam::Field<Type>> filterFarPoints
 
 
 template<class T>
-autoPtr<mapDistribute> buildMap
+autoPtr<distributionMap> buildMap
 (
     const T& mesh,
     labelListList& pointPoints
@@ -141,9 +141,9 @@ autoPtr<mapDistribute> buildMap
 
     List<Map<label>> compactMap;
 
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndexing,
             pointPoints,
@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
 
 
     labelListList pointPoints;
-    autoPtr<mapDistribute> meshDistributor = buildMap(mesh, pointPoints);
+    autoPtr<distributionMap> meshDistributor = buildMap(mesh, pointPoints);
 
 
     triadField alignments(buildAlignmentField(mesh));
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 0b59e0ead7..c7c60bcf88 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.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
@@ -25,7 +25,7 @@ License
 
 #include "DistributedDelaunayMesh.H"
 #include "meshSearch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "zeroGradientFvPatchFields.H"
 #include "pointConversion.H"
 #include "indexedVertexEnum.H"
@@ -37,7 +37,7 @@ License
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
 template<class Triangulation>
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::DistributedDelaunayMesh<Triangulation>::buildMap
 (
     const List<label>& toProc
@@ -108,9 +108,9 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
         }
     }
 
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             constructSize,
             move(sendMap),
@@ -494,7 +494,7 @@ Foam::label Foam::DistributedDelaunayMesh<Triangulation>::referVertices
 
     const label preDistributionSize = parallelVertices.size();
 
-    mapDistribute pointMap = buildMap(targetProcessor);
+    distributionMap pointMap = buildMap(targetProcessor);
 
     // Make a copy of the original list.
     DynamicList<Vb> originalParallelVertices(parallelVertices);
@@ -803,7 +803,7 @@ bool Foam::DistributedDelaunayMesh<Triangulation>::distribute
 
 
 template<class Triangulation>
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::DistributedDelaunayMesh<Triangulation>::distribute
 (
     const backgroundMeshDecomposition& decomposition,
@@ -812,12 +812,12 @@ Foam::DistributedDelaunayMesh<Triangulation>::distribute
 {
     if (!Pstream::parRun())
     {
-        return autoPtr<mapDistribute>();
+        return autoPtr<distributionMap>();
     }
 
     distributeBoundBoxes(decomposition.procBounds());
 
-    autoPtr<mapDistribute> mapDist = decomposition.distributePoints(points);
+    autoPtr<distributionMap> mapDist = decomposition.distributePoints(points);
 
     return mapDist;
 }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index 0dffc00cd0..7c112fb2df 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.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
@@ -47,7 +47,7 @@ SourceFiles
 namespace Foam
 {
 
-class mapDistribute;
+class distributionMap;
 
 /*---------------------------------------------------------------------------*\
                    Class DistributedDelaunayMesh Declaration
@@ -158,13 +158,13 @@ public:
 
     // Member Functions
 
-        //- Build a mapDistribute for the supplied destination processor data
-        static autoPtr<mapDistribute> buildMap(const List<label>& toProc);
+        //- Build a distributionMap for the supplied destination processor data
+        static autoPtr<distributionMap> buildMap(const List<label>& toProc);
 
         //-
         bool distribute(const boundBox& bb);
 
-        autoPtr<mapDistribute> distribute
+        autoPtr<distributionMap> distribute
         (
             const backgroundMeshDecomposition& decomposition,
             List<Foam::point>& points
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index be04c25286..f26952d37c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.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
@@ -42,7 +42,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
+Foam::autoPtr<Foam::distributionMap>
+Foam::backgroundMeshDecomposition::buildMap
 (
     const List<label>& toProc
 )
@@ -112,9 +113,9 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
         }
     }
 
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             constructSize,
             move(sendMap),
@@ -408,7 +409,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
 
             fvMeshDistribute distributor(mesh_);
 
-            autoPtr<mapDistributePolyMesh> mapDist = distributor.distribute
+            autoPtr<polyMeshDistributionMap> mapDist = distributor.distribute
             (
                 newDecomp
             );
@@ -840,7 +841,7 @@ Foam::backgroundMeshDecomposition::~backgroundMeshDecomposition()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::mapDistributePolyMesh>
+Foam::autoPtr<Foam::polyMeshDistributionMap>
 Foam::backgroundMeshDecomposition::distribute
 (
     volScalarField& cellWeights
@@ -987,7 +988,8 @@ Foam::backgroundMeshDecomposition::distribute
 
     fvMeshDistribute distributor(mesh_);
 
-    autoPtr<mapDistributePolyMesh> mapDist = distributor.distribute(newDecomp);
+    autoPtr<polyMeshDistributionMap> mapDist =
+        distributor.distribute(newDecomp);
 
     meshCutter_.distribute(mapDist);
 
@@ -1122,7 +1124,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
     // Needed for reverseDistribute
     label preDistributionToCandidateProcSize = toCandidateProc.size();
 
-    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 
     map().distribute(testPoints);
 
@@ -1250,7 +1252,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
     // Needed for reverseDistribute
     label preDistributionToCandidateProcSize = toCandidateProc.size();
 
-    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 
     map().distribute(testStarts);
     map().distribute(testEnds);
@@ -1411,7 +1413,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::overlapProcessors
 //    // Needed for reverseDistribute
 ////    label preDistributionToCandidateProcSize = toCandidateProc.size();
 ////
-////    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+////    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 ////
 ////    map().distribute(testCentres);
 ////    map().distribute(testRadiusSqrs);
@@ -1528,7 +1530,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::overlapProcessors
 //    // Needed for reverseDistribute
 //    label preDistributionToCandidateProcSize = toCandidateProc.size();
 //
-//    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+//    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 //
 //    map().distribute(testCentres);
 //    map().distribute(testRadiusSqrs);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 62697a9935..2c3f38b090 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.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
@@ -62,7 +62,7 @@ SourceFiles
 #include "decompositionMethod.H"
 #include "fvMeshDistribute.H"
 #include "removeCells.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "globalIndex.H"
 #include "treeBoundBox.H"
 #include "primitivePatch.H"
@@ -205,19 +205,22 @@ public:
 
     // Member Functions
 
-        //- Build a mapDistribute for the supplied destination processor data
-        static autoPtr<mapDistribute> buildMap(const List<label>& toProc);
+        //- Build a distributionMap for the supplied destination processor data
+        static autoPtr<distributionMap> buildMap(const List<label>& toProc);
 
         //- Redistribute the background mesh based on a supplied weight field,
         //  returning a map to use to redistribute vertices.
-        autoPtr<mapDistributePolyMesh> distribute
+        autoPtr<polyMeshDistributionMap> distribute
         (
             volScalarField& cellWeights
         );
 
         //- Distribute supplied the points to the appropriate processor
         template<class PointType>
-        autoPtr<mapDistribute> distributePoints(List<PointType>& points) const;
+        autoPtr<distributionMap> distributePoints
+        (
+            List<PointType>& points
+        ) const;
 
         //- Is the given position inside the domain of this decomposition
         bool positionOnThisProcessor(const point& pt) const;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
index 1d72ad758b..7859888da0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class PointType>
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::backgroundMeshDecomposition::distributePoints
 (
     List<PointType>& points
@@ -37,7 +37,7 @@ Foam::backgroundMeshDecomposition::distributePoints
 {
     labelList toProc(processorPosition(points));
 
-    autoPtr<mapDistribute> map(buildMap(toProc));
+    autoPtr<distributionMap> map(buildMap(toProc));
 
     map().distribute(points);
 
@@ -84,7 +84,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
     // Needed for reverseDistribute
     label preDistributionToCandidateProcSize = toCandidateProc.size();
 
-    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 
     map().distribute(testPoints);
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index 319208c682..f302437c6b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -543,7 +543,7 @@ void Foam::cellShapeControlMesh::distribute
         }
     }
 
-    autoPtr<mapDistribute> mapDist =
+    autoPtr<distributionMap> mapDist =
         DistributedDelaunayMesh<CellSizeDelaunay>::distribute
         (
             decomposition,
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
index 89fdc0b6f3..f9592ef307 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.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
@@ -63,7 +63,8 @@ Foam::tmp<Foam::Field<Type>> Foam::smoothAlignmentSolver::filterFarPoints
 
 
 template<class Triangulation>
-Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
+Foam::autoPtr<Foam::distributionMap>
+Foam::smoothAlignmentSolver::buildReferredMap
 (
     const Triangulation& mesh,
     labelList& indices
@@ -93,9 +94,9 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
     indices.transfer(dynIndices);
 
     List<Map<label>> compactMap;
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndexing,
             indices,
@@ -106,7 +107,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
 
 
 template<class Triangulation>
-Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
+Foam::autoPtr<Foam::distributionMap> Foam::smoothAlignmentSolver::buildMap
 (
     const Triangulation& mesh,
     labelListList& pointPoints
@@ -157,9 +158,9 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
     }
 
     List<Map<label>> compactMap;
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndexing,
             pointPoints,
@@ -312,7 +313,7 @@ void Foam::smoothAlignmentSolver::smoothAlignments
     scalar minResidual = 0;
 
     labelListList pointPoints;
-    autoPtr<mapDistribute> meshDistributor = buildMap
+    autoPtr<distributionMap> meshDistributor = buildMap
     (
         mesh_,
         pointPoints
@@ -451,7 +452,7 @@ void Foam::smoothAlignmentSolver::smoothAlignments
     }
 
     labelList referredPoints;
-    autoPtr<mapDistribute> referredDistributor = buildReferredMap
+    autoPtr<distributionMap> referredDistributor = buildReferredMap
     (
         mesh_,
         referredPoints
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
index 403181de1a..39a339e6b9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,14 +65,14 @@ class smoothAlignmentSolver
         );
 
         template<class Triangulation>
-        autoPtr<mapDistribute> buildMap
+        autoPtr<distributionMap> buildMap
         (
             const Triangulation& mesh,
             labelListList& pointPoints
         );
 
         template<class Triangulation>
-        autoPtr<mapDistribute> buildReferredMap
+        autoPtr<distributionMap> buildReferredMap
         (
             const Triangulation& mesh,
             labelList& indices
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 9772c1a951..f4cf8fe1d6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ void Foam::conformalVoronoiMesh::insertInternalPoints
 
         // Send the points that are not on this processor to the appropriate
         // place
-        Foam::autoPtr<Foam::mapDistribute> map
+        Foam::autoPtr<Foam::distributionMap> map
         (
             decomposition_().distributePoints(transferPoints)
         );
@@ -188,7 +188,7 @@ Foam::Map<Foam::label> Foam::conformalVoronoiMesh::insertPointPairs
 {
     if (Pstream::parRun() && distribute)
     {
-        autoPtr<mapDistribute> mapDist =
+        autoPtr<distributionMap> mapDist =
             decomposition_().distributePoints(vertices);
 
         // Re-index the point pairs if one or both have been distributed.
@@ -443,7 +443,7 @@ void Foam::conformalVoronoiMesh::distribute()
         }
     }
 
-    autoPtr<mapDistribute> mapDist =
+    autoPtr<distributionMap> mapDist =
         DistributedDelaunayMesh<Delaunay>::distribute(decomposition_(), points);
 
     mapDist().distribute(types);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
index 83aeddd4e7..d5a627a00f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.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
@@ -127,7 +127,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
             cwi[cI] = max(cellVertices[cI], 1e-2);
         }
 
-        autoPtr<mapDistributePolyMesh> mapDist = decomposition_().distribute
+        autoPtr<polyMeshDistributionMap> mapDist = decomposition_().distribute
         (
             cellWeights
         );
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
index 1602ac2396..f76677e5de 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 #include "ConstCirculator.H"
 #include "backgroundMeshDecomposition.H"
 #include "autoPtr.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index 262c1ed647..8962deb4cc 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -550,7 +550,7 @@ int main(int argc, char *argv[])
             << distributor.countCells(decomp) << nl << endl;
 
         // Do actual sending/receiving of mesh
-        autoPtr<mapDistributePolyMesh> map = distributor.distribute(decomp);
+        autoPtr<polyMeshDistributionMap> map = distributor.distribute(decomp);
 
         // Print some statistics
         // Info<< "After distribution:" << endl;
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 09f6efabff..f9912eaaa8 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.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
@@ -51,7 +51,7 @@ Description
 #include "PstreamReduceOps.H"
 #include "fvCFD.H"
 #include "fvMeshDistribute.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "IOobjectList.H"
 #include "globalIndex.H"
 #include "loadOrCreateMesh.H"
@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
     //    << distributor.countCells(finalDecomp) << nl << endl;
 
     // Do actual sending/receiving of mesh
-    autoPtr<mapDistributePolyMesh> map = distributor.distribute(finalDecomp);
+    autoPtr<polyMeshDistributionMap> map = distributor.distribute(finalDecomp);
 
     //// Distribute any non-registered data accordingly
     // map().distributeFaceData(faceCc);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index 2d98e49f3e..f7f4320ae8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.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
@@ -34,7 +34,7 @@ License
 #include "IOmanip.H"
 #include "itoa.H"
 #include "globalIndex.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "stringListOps.H"
 
 #include "ensightBinaryStream.H"
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index f3994f85b7..7415b6e466 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.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
@@ -543,7 +543,7 @@ int main(int argc, char *argv[])
 
     List<Map<label>> compactMap(Pstream::nProcs());
 
-    mapDistribute map(globalNumbering, rayEndFace, compactMap);
+    distributionMap map(globalNumbering, rayEndFace, compactMap);
 
     labelListIOList IOsubMap
     (
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index cd94c5deda..d305bf380c 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.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
@@ -41,7 +41,7 @@ Note
 #include "Time.H"
 #include "polyMesh.H"
 #include "distributedTriSurfaceMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "localIOdictionary.H"
 
 using namespace Foam;
@@ -257,8 +257,8 @@ int main(int argc, char *argv[])
 
     // Do redistribution
     Info<< "Redistributing surface" << nl << endl;
-    autoPtr<mapDistribute> faceMap;
-    autoPtr<mapDistribute> pointMap;
+    autoPtr<distributionMap> faceMap;
+    autoPtr<distributionMap> pointMap;
     surfMesh.distribute
     (
         meshBb[Pstream::myProcNo()],
diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
index 7f60b15ab4..2fa1eb1742 100644
--- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C
@@ -187,7 +187,7 @@ void ${typeName}FvModel${SourceType}::updateMesh(const mapPolyMesh& map)
 
 void ${typeName}FvModel${SourceType}::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);
diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H
index 51d8681295..88d27382c1 100644
--- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H
+++ b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H
@@ -118,7 +118,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index b7655225c5..2a937d584f 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -580,12 +580,14 @@ mapPolyMesh = $(polyMesh)/mapPolyMesh
 $(mapPolyMesh)/mapPolyMesh.C
 $(mapPolyMesh)/faceMapper/faceMapper.C
 $(mapPolyMesh)/cellMapper/cellMapper.C
-$(mapPolyMesh)/mapDistribute/mapDistribute.C
-$(mapPolyMesh)/mapDistribute/mapDistributeBase.C
-$(mapPolyMesh)/mapDistribute/mapDistributePolyMesh.C
-$(mapPolyMesh)/mapDistribute/IOmapDistribute.C
 $(mapPolyMesh)/mapAddedPolyMesh.C
 
+polyMeshDistributionMap = $(polyMesh)/polyMeshDistributionMap
+$(polyMeshDistributionMap)/distributionMap.C
+$(polyMeshDistributionMap)/distributionMapBase.C
+$(polyMeshDistributionMap)/polyMeshDistributionMap.C
+$(polyMeshDistributionMap)/IOdistributionMap.C
+
 PrimitivePatch = $(primitiveMesh)/PrimitivePatch
 $(PrimitivePatch)/PrimitivePatchName.C
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index a8aab2bf73..cc7a0d9b07 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ namespace Foam
 
 class lduMesh;
 class lduMatrix;
-class mapDistribute;
+class distributionMap;
 class GAMGProcAgglomeration;
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
index 1e12644c1b..76204060aa 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.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
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "GAMGAgglomeration.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "globalIndex.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.C b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
index 305d41c2da..233a2a4dc5 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.C
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
@@ -276,7 +276,7 @@ template<class Mesh>
 void Foam::meshObject::distribute
 (
     objectRegistry& obr,
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     HashTable<GeometricMeshObject<Mesh>*> meshObjects
@@ -287,7 +287,8 @@ void Foam::meshObject::distribute
     if (meshObject::debug)
     {
         Pout<< "meshObject::distribute(objectRegistry&, "
-               "const mapDistributePolyMesh& map) : updating " << Mesh::typeName
+               "const polyMeshDistributionMap& map) : updating "
+            << Mesh::typeName
             << " meshObjects for region " << obr.name() << endl;
     }
 
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.H b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
index 28640c291b..7098ea67ba 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.H
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
@@ -77,7 +77,7 @@ namespace Foam
 
 // Forward declarations
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                          Class MeshObject Declaration
@@ -176,7 +176,7 @@ public:
         static void updateMesh(objectRegistry&, const mapPolyMesh&);
 
         template<class Mesh>
-        static void distribute(objectRegistry&, const mapDistributePolyMesh&);
+        static void distribute(objectRegistry&, const polyMeshDistributionMap&);
 
         template<class Mesh>
         static void addPatch(objectRegistry&, const label patchi);
@@ -296,7 +296,7 @@ public:
         MoveableMeshObject<Mesh>(typeName, io)
     {}
 
-    virtual void distribute(const mapDistributePolyMesh& map) = 0;
+    virtual void distribute(const polyMeshDistributionMap& map) = 0;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.C b/src/OpenFOAM/meshes/pointMesh/pointMesh.C
index 9e5f2b1b95..1085b693f7 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.C
@@ -102,11 +102,11 @@ void Foam::pointMesh::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::pointMesh::distribute(const mapDistributePolyMesh& map)
+void Foam::pointMesh::distribute(const polyMeshDistributionMap& map)
 {
     if (debug)
     {
-        Pout<< "pointMesh::distribute(const mapDistributePolyMesh&): "
+        Pout<< "pointMesh::distribute(const polyMeshDistributionMap&): "
             << "Distribute." << endl;
         Pout<< endl;
     }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.H b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
index 0da330e6c3..e0cd755418 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
@@ -122,7 +122,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Move points
             virtual bool movePoints();
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 52f0cc2eee..0006eb4459 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -29,7 +29,7 @@ License
 #include "processorPolyPatch.H"
 #include "globalPoints.H"
 #include "polyMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "labelIOList.H"
 #include "mergePoints.H"
 #include "globalIndexAndTransform.H"
@@ -556,7 +556,7 @@ void Foam::globalMeshData::calcGlobalPointSlaves() const
 
     globalPointSlavesMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             move(globalData.map())
         )
@@ -1083,7 +1083,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
     List<Map<label>> compactMap(Pstream::nProcs());
     globalEdgeSlavesMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalEdgeNumbers,
             globalEdgeSlaves,
@@ -1121,7 +1121,7 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
     // 1. Determine master point
     labelList masterPoint;
     {
-        const mapDistribute& map = globalPointSlavesMap();
+        const distributionMap& map = globalPointSlavesMap();
 
         masterPoint.setSize(map.constructSize());
         masterPoint = labelMax;
@@ -1145,7 +1145,7 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
     // to find the orientation of the master edge.
 
     {
-        const mapDistribute& map = globalEdgeSlavesMap();
+        const distributionMap& map = globalEdgeSlavesMap();
         const labelListList& slaves = globalEdgeSlaves();
         const labelListList& transformedSlaves = globalEdgeTransformedSlaves();
 
@@ -1472,7 +1472,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
 
     globalPointBoundaryFacesMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndices,
             globalPointBoundaryFaces,
@@ -1700,7 +1700,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
 
     globalPointBoundaryCellsMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndices,
             globalPointBoundaryCells,
@@ -1749,7 +1749,7 @@ void Foam::globalMeshData::calcGlobalCoPointSlaves() const
     );
     globalCoPointSlavesMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             move(globalData.map())
         )
@@ -2220,7 +2220,7 @@ const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalPointSlavesMap() const
+const Foam::distributionMap& Foam::globalMeshData::globalPointSlavesMap() const
 {
     if (!globalPointSlavesMapPtr_.valid())
     {
@@ -2274,7 +2274,7 @@ const Foam::PackedBoolList& Foam::globalMeshData::globalEdgeOrientation() const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalEdgeSlavesMap() const
+const Foam::distributionMap& Foam::globalMeshData::globalEdgeSlavesMap() const
 {
     if (!globalEdgeSlavesMapPtr_.valid())
     {
@@ -2317,7 +2317,7 @@ Foam::globalMeshData::globalPointTransformedBoundaryFaces() const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalPointBoundaryFacesMap()
+const Foam::distributionMap& Foam::globalMeshData::globalPointBoundaryFacesMap()
 const
 {
     if (!globalPointBoundaryFacesMapPtr_.valid())
@@ -2371,7 +2371,7 @@ Foam::globalMeshData::globalPointTransformedBoundaryCells() const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalPointBoundaryCellsMap()
+const Foam::distributionMap& Foam::globalMeshData::globalPointBoundaryCellsMap()
 const
 {
     if (!globalPointBoundaryCellsMapPtr_.valid())
@@ -2392,7 +2392,8 @@ const Foam::labelListList& Foam::globalMeshData::globalCoPointSlaves() const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalCoPointSlavesMap() const
+const Foam::distributionMap&
+Foam::globalMeshData::globalCoPointSlavesMap() const
 {
     if (!globalCoPointSlavesMapPtr_.valid())
     {
@@ -2412,7 +2413,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     const globalIndex& globalCoupledPoints = globalPointNumbering();
     // Use collocated only
     const labelListList& pointSlaves = globalCoPointSlaves();
-    const mapDistribute& pointSlavesMap = globalCoPointSlavesMap();
+    const distributionMap& pointSlavesMap = globalCoPointSlavesMap();
 
 
     // Points are either
@@ -2546,7 +2547,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
 {
     const indirectPrimitivePatch& cpp = coupledPatch();
     const labelListList& pointSlaves = globalCoPointSlaves();
-    const mapDistribute& pointSlavesMap = globalCoPointSlavesMap();
+    const distributionMap& pointSlavesMap = globalCoPointSlavesMap();
 
 
     // The patch points come in two variants:
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 3a6342f157..8cfd3d44e4 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -39,7 +39,8 @@ Description
     do not allow any transformations and require a global reduction on the
     master processor.
 
-    The alternative is to have an exchange schedule (through a 'mapDistribute')
+    The alternative is to have an exchange schedule
+    (through a 'distributionMap')
     which sends all point/edge data (no distinction is made between
     those on two and those on more than two coupled patches) to the local
     'master'.  This master then does any calculation and sends
@@ -50,7 +51,7 @@ Description
 
     The exchange needs
     - a field of data
-    - a mapDistribute which does all parallel exchange and transformations
+    - a distributionMap which does all parallel exchange and transformations
       This appends remote data to the end of the field.
     - a set of indices which indicate where to get untransformed data in the
       field
@@ -69,7 +70,7 @@ Note
       would be too complicated
 
 See also
-    mapDistribute
+    distributionMap
     globalIndexAndTransform
 
 SourceFiles
@@ -93,7 +94,7 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class polyMesh;
-class mapDistribute;
+class distributionMap;
 template<class T> class EdgeMap;
 class globalIndex;
 class globalIndexAndTransform;
@@ -165,7 +166,7 @@ class globalMeshData
 
             mutable autoPtr<labelListList> globalPointSlavesPtr_;
             mutable autoPtr<labelListList> globalPointTransformedSlavesPtr_;
-            mutable autoPtr<mapDistribute> globalPointSlavesMapPtr_;
+            mutable autoPtr<distributionMap> globalPointSlavesMapPtr_;
 
             // Coupled edge to coupled edges
 
@@ -173,7 +174,7 @@ class globalMeshData
             mutable autoPtr<labelListList> globalEdgeSlavesPtr_;
             mutable autoPtr<labelListList> globalEdgeTransformedSlavesPtr_;
             mutable autoPtr<PackedBoolList> globalEdgeOrientationPtr_;
-            mutable autoPtr<mapDistribute> globalEdgeSlavesMapPtr_;
+            mutable autoPtr<distributionMap> globalEdgeSlavesMapPtr_;
 
 
             // Coupled point to boundary faces
@@ -182,7 +183,7 @@ class globalMeshData
             mutable autoPtr<labelListList> globalPointBoundaryFacesPtr_;
             mutable autoPtr<labelListList>
                 globalPointTransformedBoundaryFacesPtr_;
-            mutable autoPtr<mapDistribute> globalPointBoundaryFacesMapPtr_;
+            mutable autoPtr<distributionMap> globalPointBoundaryFacesMapPtr_;
 
             // Coupled point to boundary cells
 
@@ -191,12 +192,12 @@ class globalMeshData
             mutable autoPtr<labelListList> globalPointBoundaryCellsPtr_;
             mutable autoPtr<labelListList>
                 globalPointTransformedBoundaryCellsPtr_;
-            mutable autoPtr<mapDistribute> globalPointBoundaryCellsMapPtr_;
+            mutable autoPtr<distributionMap> globalPointBoundaryCellsMapPtr_;
 
 
             // Other: coupled point to coupled COLLOCATED points
             mutable autoPtr<labelListList> globalCoPointSlavesPtr_;
-            mutable autoPtr<mapDistribute> globalCoPointSlavesMapPtr_;
+            mutable autoPtr<distributionMap> globalCoPointSlavesMapPtr_;
 
 
 
@@ -515,7 +516,7 @@ public:
                 List<Type>& pointData,
                 const labelListList& slaves,
                 const labelListList& transformedSlaves,
-                const mapDistribute& slavesMap,
+                const distributionMap& slavesMap,
                 const globalIndexAndTransform&,
                 const CombineOp& cop,
                 const TransformOp& top
@@ -528,7 +529,7 @@ public:
                 List<Type>& pointData,
                 const labelListList& slaves,
                 const labelListList& transformedSlaves,
-                const mapDistribute& slavesMap,
+                const distributionMap& slavesMap,
                 const CombineOp& cop
             );
 
@@ -540,7 +541,7 @@ public:
                 const globalIndex& globalPointNumbering() const;
                 const labelListList& globalPointSlaves() const;
                 const labelListList& globalPointTransformedSlaves() const;
-                const mapDistribute& globalPointSlavesMap() const;
+                const distributionMap& globalPointSlavesMap() const;
                 //- Helper to synchronise coupled patch point data
                 template<class Type, class CombineOp, class TransformOp>
                 void syncPointData
@@ -555,14 +556,14 @@ public:
                 const globalIndex& globalEdgeNumbering() const;
                 const labelListList& globalEdgeSlaves() const;
                 const labelListList& globalEdgeTransformedSlaves() const;
-                const mapDistribute& globalEdgeSlavesMap() const;
+                const distributionMap& globalEdgeSlavesMap() const;
                 //- Is my edge same orientation as master edge
                 const PackedBoolList& globalEdgeOrientation() const;
 
             // Collocated point to collocated point
 
                 const labelListList& globalCoPointSlaves() const;
-                const mapDistribute& globalCoPointSlavesMap() const;
+                const distributionMap& globalCoPointSlavesMap() const;
 
             // Coupled point to boundary faces. These are uncoupled boundary
             // faces only but include empty patches.
@@ -572,7 +573,7 @@ public:
                 const labelListList& globalPointBoundaryFaces() const;
                 const labelListList& globalPointTransformedBoundaryFaces()
                 const;
-                const mapDistribute& globalPointBoundaryFacesMap() const;
+                const distributionMap& globalPointBoundaryFacesMap() const;
 
             // Coupled point to boundary cell
 
@@ -584,7 +585,7 @@ public:
                 const labelListList& globalPointBoundaryCells() const;
                 const labelListList& globalPointTransformedBoundaryCells()
                 const;
-                const mapDistribute& globalPointBoundaryCellsMap() const;
+                const distributionMap& globalPointBoundaryCellsMap() const;
 
 
             // Other
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
index 2ee5281e7c..d1a384d73b 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.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 "globalMeshData.H"
 #include "polyMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -35,7 +35,7 @@ void Foam::globalMeshData::syncData
     List<Type>& elems,
     const labelListList& slaves,
     const labelListList& transformedSlaves,
-    const mapDistribute& slavesMap,
+    const distributionMap& slavesMap,
     const globalIndexAndTransform& transforms,
     const CombineOp& cop,
     const TransformOp& top
@@ -108,7 +108,7 @@ void Foam::globalMeshData::syncData
     List<Type>& elems,
     const labelListList& slaves,
     const labelListList& transformedSlaves,
-    const mapDistribute& slavesMap,
+    const distributionMap& slavesMap,
     const CombineOp& cop
 )
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index d59455667f..83c5d33ffd 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.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
@@ -27,7 +27,7 @@ License
 #include "processorPolyPatch.H"
 #include "cyclicPolyPatch.H"
 #include "polyMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1066,7 +1066,7 @@ void Foam::globalPoints::calculateSharedPoints
     List<Map<label>> compactMap;
     map_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndices_,
             pointPoints_,
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
index c21ade59cf..350477a18a 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.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
@@ -47,7 +47,7 @@ Description
 
     means point 93 on proc7 is connected to point 731 on proc4 and 114 on proc3.
     It then assigns the lowest numbered processor to be the local 'master' and
-    constructs a mapDistribute to send all data to this master.
+    constructs a distributionMap to send all data to this master.
 
     Algorithm:
         - get meshPoints of all my points on processor patches and initialise
@@ -92,7 +92,7 @@ class polyMesh;
 class polyBoundaryMesh;
 class cyclicPolyPatch;
 class polyPatch;
-class mapDistribute;
+class distributionMap;
 
 /*---------------------------------------------------------------------------*\
                         Class globalPoints Declaration
@@ -123,17 +123,17 @@ class globalPoints
         Map<label> meshToProcPoint_;
 
 
-        // Calculated mapDistribute addressing
+        // Calculated distributionMap addressing
 
-            //- Non-transformed connected points per point (in mapDistribute
+            //- Non-transformed connected points per point (in distributionMap
             //  indices)
             labelListList pointPoints_;
 
-            //- Transformed points per point (in mapDistribute indices)
+            //- Transformed points per point (in distributionMap indices)
             labelListList transformedPointPoints_;
 
             //- Corresponding map
-            autoPtr<mapDistribute> map_;
+            autoPtr<distributionMap> map_;
 
 
 
@@ -315,40 +315,40 @@ public:
                 return globalTransforms_;
             }
 
-            //- Non-transformed connected points per point (in mapDistribute
+            //- Non-transformed connected points per point (in distributionMap
             //  indices)
             const labelListList& pointPoints() const
             {
                 return pointPoints_;
             }
 
-            //- Non-transformed connected points per point (in mapDistribute
+            //- Non-transformed connected points per point (in distributionMap
             //  indices)
             labelListList& pointPoints()
             {
                 return pointPoints_;
             }
 
-            //- Transformed points per point (in mapDistribute indices)
+            //- Transformed points per point (in distributionMap indices)
             const labelListList& transformedPointPoints() const
             {
                 return transformedPointPoints_;
             }
 
-            //- Transformed points per point (in mapDistribute indices)
+            //- Transformed points per point (in distributionMap indices)
             labelListList& transformedPointPoints()
             {
                 return transformedPointPoints_;
             }
 
             //- Corresponding map
-            const mapDistribute& map() const
+            const distributionMap& map() const
             {
                 return map_();
             }
 
             //- Corresponding map
-            mapDistribute& map()
+            distributionMap& map()
             {
                 return map_();
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index b67a78d954..b90ce00f8f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.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
@@ -64,7 +64,7 @@ namespace Foam
 // Forward declaration of classes
 class globalMeshData;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 class polyMeshTetDecomposition;
 class treeDataCell;
 template<class Type> class indexedOctree;
@@ -610,7 +610,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh& map);
+            virtual void distribute(const polyMeshDistributionMap& map);
 
             //- Remove boundary patches
             void removeBoundary();
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.C
similarity index 77%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.C
index 87509c118c..9efc758d7c 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,19 +23,19 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "IOmapDistribute.H"
+#include "IOdistributionMap.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
 namespace Foam
 {
-    defineTypeNameAndDebug(IOmapDistribute, 0);
+    defineTypeNameAndDebug(IOdistributionMap, 0);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::IOmapDistribute::IOmapDistribute(const IOobject& io)
+Foam::IOdistributionMap::IOdistributionMap(const IOobject& io)
 :
     regIOobject(io)
 {
@@ -43,9 +43,9 @@ Foam::IOmapDistribute::IOmapDistribute(const IOobject& io)
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
         WarningInFunction
-            << "IOmapDistribute " << name()
+            << "IOdistributionMap " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOmapDistribute does not support automatic rereading."
+            " but IOdistributionMap does not support automatic rereading."
             << endl;
     }
 
@@ -64,10 +64,10 @@ Foam::IOmapDistribute::IOmapDistribute(const IOobject& io)
 }
 
 
-Foam::IOmapDistribute::IOmapDistribute
+Foam::IOdistributionMap::IOdistributionMap
 (
     const IOobject& io,
-    const mapDistribute& map
+    const distributionMap& map
 )
 :
     regIOobject(io)
@@ -76,9 +76,9 @@ Foam::IOmapDistribute::IOmapDistribute
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
         WarningInFunction
-            << "IOmapDistribute " << name()
+            << "IOdistributionMap " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOmapDistribute does not support automatic rereading."
+            " but IOdistributionMap does not support automatic rereading."
             << endl;
     }
 
@@ -96,27 +96,27 @@ Foam::IOmapDistribute::IOmapDistribute
     }
     else
     {
-        mapDistribute::operator=(map);
+        distributionMap::operator=(map);
     }
 }
 
 
-Foam::IOmapDistribute::IOmapDistribute
+Foam::IOdistributionMap::IOdistributionMap
 (
     const IOobject& io,
-    mapDistribute&& map
+    distributionMap&& map
 )
 :
     regIOobject(io),
-    mapDistribute(move(map))
+    distributionMap(move(map))
 {
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
         WarningInFunction
-            << "IOmapDistribute " << name()
+            << "IOdistributionMap " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOmapDistribute does not support automatic rereading."
+            " but IOdistributionMap does not support automatic rereading."
             << endl;
     }
 
@@ -137,19 +137,19 @@ Foam::IOmapDistribute::IOmapDistribute
 
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
-Foam::IOmapDistribute::~IOmapDistribute()
+Foam::IOdistributionMap::~IOdistributionMap()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::IOmapDistribute::readData(Istream& is)
+bool Foam::IOdistributionMap::readData(Istream& is)
 {
     return (is >> *this).good();
 }
 
 
-bool Foam::IOmapDistribute::writeData(Ostream& os) const
+bool Foam::IOdistributionMap::writeData(Ostream& os) const
 {
     return (os << *this).good();
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.H b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.H
similarity index 73%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.H
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.H
index a3d6a30076..e78a31307e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,22 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::IOmapDistribute
+    Foam::IOdistributionMap
 
 Description
-    IOmapDistribute is derived from mapDistribute and
-    IOobject to give the mapDistribute
+    IOdistributionMap is derived from distributionMap and
+    IOobject to give the distributionMap
     automatic IO functionality via the objectRegistry.
 
 SourceFiles
-    IOmapDistribute.C
+    IOdistributionMap.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOmapDistribute_H
-#define IOmapDistribute_H
+#ifndef IOdistributionMap_H
+#define IOdistributionMap_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "regIOobject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,34 +46,34 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                       Class IOmapDistribute Declaration
+                       Class IOdistributionMap Declaration
 \*---------------------------------------------------------------------------*/
 
-class IOmapDistribute
+class IOdistributionMap
 :
     public regIOobject,
-    public mapDistribute
+    public distributionMap
 {
 
 public:
 
     //- Runtime type information
-    TypeName("mapDistribute");
+    TypeName("distributionMap");
 
     // Constructors
 
         //- Construct given an IOobject
-        IOmapDistribute(const IOobject&);
+        IOdistributionMap(const IOobject&);
 
-        //- Construct given an IOobject and mapDistribute
-        IOmapDistribute(const IOobject&, const mapDistribute&);
+        //- Construct given an IOobject and distributionMap
+        IOdistributionMap(const IOobject&, const distributionMap&);
 
-        //- Move constructor transferring the mapDistribute contents
-        IOmapDistribute(const IOobject&, mapDistribute&&);
+        //- Move constructor transferring the distributionMap contents
+        IOdistributionMap(const IOobject&, distributionMap&&);
 
 
     //- Destructor
-    virtual ~IOmapDistribute();
+    virtual ~IOdistributionMap();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.C
similarity index 82%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.C
index 5a8031fc8a..21626cbaeb 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "globalIndexAndTransform.H"
 #include "transformField.H"
 
@@ -31,13 +31,13 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(mapDistribute, 0);
+    defineTypeNameAndDebug(distributionMap, 0);
 }
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
@@ -45,21 +45,21 @@ void Foam::mapDistribute::transform::operator()
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<label>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<label>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<label>&
@@ -68,7 +68,7 @@ void Foam::mapDistribute::transform::operator()
 
 
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
@@ -76,21 +76,21 @@ void Foam::mapDistribute::transform::operator()
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<scalar>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<scalar>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<scalar>&
@@ -99,7 +99,7 @@ void Foam::mapDistribute::transform::operator()
 
 
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
@@ -107,21 +107,21 @@ void Foam::mapDistribute::transform::operator()
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<bool>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<bool>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<bool>&
@@ -129,9 +129,9 @@ void Foam::mapDistribute::transform::operator()
 {}
 
 
-void Foam::mapDistribute::printLayout(Ostream& os) const
+void Foam::distributionMap::printLayout(Ostream& os) const
 {
-    mapDistributeBase::printLayout(os);
+    distributionMapBase::printLayout(os);
 
     forAll(transformElements_, trafoI)
     {
@@ -147,13 +147,13 @@ void Foam::mapDistribute::printLayout(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::mapDistribute::mapDistribute()
+Foam::distributionMap::distributionMap()
 :
-    mapDistributeBase()
+    distributionMapBase()
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const label constructSize,
     labelListList&& subMap,
@@ -162,7 +162,7 @@ Foam::mapDistribute::mapDistribute
     const bool constructHasFlip
 )
 :
-    mapDistributeBase
+    distributionMapBase
     (
         constructSize,
         move(subMap),
@@ -173,7 +173,7 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const label constructSize,
     labelListList&& subMap,
@@ -184,7 +184,7 @@ Foam::mapDistribute::mapDistribute
     const bool constructHasFlip
 )
 :
-    mapDistributeBase
+    distributionMapBase
     (
         constructSize,
         move(subMap),
@@ -197,17 +197,17 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const labelList& sendProcs,
     const labelList& recvProcs
 )
 :
-    mapDistributeBase(sendProcs, recvProcs)
+    distributionMapBase(sendProcs, recvProcs)
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const globalIndex& globalNumbering,
     labelList& elements,
@@ -215,7 +215,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    mapDistributeBase
+    distributionMapBase
     (
         globalNumbering,
         elements,
@@ -225,7 +225,7 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const globalIndex& globalNumbering,
     labelListList& cellCells,
@@ -233,7 +233,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    mapDistributeBase
+    distributionMapBase
     (
         globalNumbering,
         cellCells,
@@ -243,7 +243,7 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const globalIndex& globalNumbering,
     labelList& elements,
@@ -254,7 +254,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    mapDistributeBase()
+    distributionMapBase()
 {
     // Construct per processor compact addressing of the global elements
     // needed. The ones from the local processor are not included since
@@ -348,7 +348,7 @@ Foam::mapDistribute::mapDistribute
 }
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const globalIndex& globalNumbering,
     labelListList& cellCells,
@@ -359,7 +359,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    mapDistributeBase()
+    distributionMapBase()
 {
     // Construct per processor compact addressing of the global elements
     // needed. The ones from the local processor are not included since
@@ -466,46 +466,46 @@ Foam::mapDistribute::mapDistribute
 }
 
 
-Foam::mapDistribute::mapDistribute(const mapDistribute& map)
+Foam::distributionMap::distributionMap(const distributionMap& map)
 :
-    mapDistributeBase(map),
+    distributionMapBase(map),
     transformElements_(map.transformElements_),
     transformStart_(map.transformStart_)
 {}
 
 
-Foam::mapDistribute::mapDistribute(mapDistribute&& map)
+Foam::distributionMap::distributionMap(distributionMap&& map)
 :
-    mapDistributeBase(move(map)),
+    distributionMapBase(move(map)),
     transformElements_(move(map.transformElements_)),
     transformStart_(move(map.transformStart_))
 {}
 
 
-Foam::mapDistribute::mapDistribute(Istream& is)
+Foam::distributionMap::distributionMap(Istream& is)
 {
     is  >> *this;
 }
 
 
-Foam::autoPtr<Foam::mapDistribute> Foam::mapDistribute::clone() const
+Foam::autoPtr<Foam::distributionMap> Foam::distributionMap::clone() const
 {
-    return autoPtr<mapDistribute>(new mapDistribute(*this));
+    return autoPtr<distributionMap>(new distributionMap(*this));
 }
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::label Foam::mapDistribute::whichTransform(const label index)
+Foam::label Foam::distributionMap::whichTransform(const label index)
 const
 {
     return findLower(transformStart_, index+1);
 }
 
 
-void Foam::mapDistribute::transfer(mapDistribute& rhs)
+void Foam::distributionMap::transfer(distributionMap& rhs)
 {
-    mapDistributeBase::transfer(rhs);
+    distributionMapBase::transfer(rhs);
     transformElements_.transfer(rhs.transformElements_);
     transformStart_.transfer(rhs.transformStart_);
 }
@@ -513,7 +513,7 @@ void Foam::mapDistribute::transfer(mapDistribute& rhs)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::mapDistribute::operator=(const mapDistribute& rhs)
+void Foam::distributionMap::operator=(const distributionMap& rhs)
 {
     // Check for assignment to self
     if (this == &rhs)
@@ -522,7 +522,7 @@ void Foam::mapDistribute::operator=(const mapDistribute& rhs)
             << "Attempted assignment to self"
             << abort(FatalError);
     }
-    mapDistributeBase::operator=(rhs);
+    distributionMapBase::operator=(rhs);
     transformElements_ = rhs.transformElements_;
     transformStart_ = rhs.transformStart_;
 }
@@ -530,11 +530,11 @@ void Foam::mapDistribute::operator=(const mapDistribute& rhs)
 
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, mapDistribute& map)
+Foam::Istream& Foam::operator>>(Istream& is, distributionMap& map)
 {
-    is.fatalCheck("operator>>(Istream&, mapDistribute&)");
+    is.fatalCheck("operator>>(Istream&, distributionMap&)");
 
-    is  >> static_cast<mapDistributeBase&>(map)
+    is  >> static_cast<distributionMapBase&>(map)
         >> map.transformElements_ >> map.transformStart_;
 
     return is;
@@ -543,9 +543,9 @@ Foam::Istream& Foam::operator>>(Istream& is, mapDistribute& map)
 
 // * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistribute& map)
+Foam::Ostream& Foam::operator<<(Ostream& os, const distributionMap& map)
 {
-    os  << static_cast<const mapDistributeBase&>(map) << token::NL
+    os  << static_cast<const distributionMapBase&>(map) << token::NL
         << map.transformElements_ << token::NL
         << map.transformStart_;
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.H
similarity index 91%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.H
index 20b94aee28..5b66e0f20a 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.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
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::mapDistribute
+    Foam::distributionMap
 
 Description
     Class containing processor-to-processor mapping information.
@@ -48,7 +48,7 @@ Note:
     So e.g 4 procs and on proc 1 the compact
     table will first have all globalIndex.localSize() elements from proc1
     followed by used-only elements of proc0, proc2, proc3.
-    The constructed mapDistribute sends the local elements from and
+    The constructed distributionMap sends the local elements from and
     receives the remote elements into their compact position.
     compactMap[proci] is the position of elements from proci in the compact
     map. compactMap[myProcNo()] is empty since trivial addressing.
@@ -125,15 +125,15 @@ Note:
 
 
 SourceFiles
-    mapDistribute.C
-    mapDistributeTemplates.C
+    distributionMap.C
+    distributionMapTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mapDistribute_H
-#define mapDistribute_H
+#ifndef distributionMap_H
+#define distributionMap_H
 
-#include "mapDistributeBase.H"
+#include "distributionMapBase.H"
 #include "transformer.H"
 #include "coupledPolyPatch.H"
 #include "EdgeMap.H"
@@ -148,19 +148,19 @@ class globalIndexAndTransform;
 
 // Forward declaration of friend functions and operators
 
-class mapDistribute;
+class distributionMap;
 
-Istream& operator>>(Istream&, mapDistribute&);
-Ostream& operator<<(Ostream&, const mapDistribute&);
+Istream& operator>>(Istream&, distributionMap&);
+Ostream& operator<<(Ostream&, const distributionMap&);
 
 
 /*---------------------------------------------------------------------------*\
-                        Class mapDistribute Declaration
+                        Class distributionMap Declaration
 \*---------------------------------------------------------------------------*/
 
-class mapDistribute
+class distributionMap
 :
-    public mapDistributeBase
+    public distributionMapBase
 {
     // Private Data
 
@@ -328,16 +328,16 @@ public:
 
 
     // Declare name of the class and its debug switch
-    ClassName("mapDistribute");
+    ClassName("distributionMap");
 
 
     // Constructors
 
         //- Construct null
-        mapDistribute();
+        distributionMap();
 
         //- Construct from components
-        mapDistribute
+        distributionMap
         (
             const label constructSize,
             labelListList&& subMap,
@@ -347,7 +347,7 @@ public:
         );
 
         //- Construct from components
-        mapDistribute
+        distributionMap
         (
             const label constructSize,
             labelListList&& subMap,
@@ -361,7 +361,7 @@ public:
         //- Construct from reverse addressing: per data item the send
         //  processor and the receive processor. (note: data is not stored
         //  sorted per processor so cannot use printLayout).
-        mapDistribute
+        distributionMap
         (
             const labelList& sendProcs,
             const labelList& recvProcs
@@ -371,7 +371,7 @@ public:
         //  numbering (or -1). Determines compact numbering (see above) and
         //  distribute map to get data into this ordering and renumbers the
         //  elements to be in compact numbering.
-        mapDistribute
+        distributionMap
         (
             const globalIndex&,
             labelList& elements,
@@ -382,7 +382,7 @@ public:
         //- Special variant that works with the info sorted into bins
         //  according to local indices. E.g. think cellCells where
         //  cellCells[localCelli] is a list of global cells
-        mapDistribute
+        distributionMap
         (
             const globalIndex&,
             labelListList& cellCells,
@@ -396,7 +396,7 @@ public:
         //  Determines compact numbering (see above) and
         //  distribute map to get data into this ordering and renumbers the
         //  elements to be in compact numbering.
-        mapDistribute
+        distributionMap
         (
             const globalIndex&,
             labelList& untransformedElements,
@@ -408,7 +408,7 @@ public:
         );
 
         //- As above but with ListLists.
-        mapDistribute
+        distributionMap
         (
             const globalIndex&,
             labelListList& cellCells,
@@ -420,20 +420,20 @@ public:
         );
 
         //- Copy constructor
-        mapDistribute(const mapDistribute&);
+        distributionMap(const distributionMap&);
 
         //- Move constructor
-        mapDistribute(mapDistribute&&);
+        distributionMap(distributionMap&&);
 
         //- Construct from Istream
-        mapDistribute(Istream&);
+        distributionMap(Istream&);
 
         //- Clone
-        autoPtr<mapDistribute> clone() const;
+        autoPtr<distributionMap> clone() const;
 
 
     //- Destructor
-    virtual ~mapDistribute()
+    virtual ~distributionMap()
     {}
 
 
@@ -461,7 +461,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistribute&);
+            void transfer(distributionMap&);
 
             //- Distribute data using default commsType.
             template<class T>
@@ -556,99 +556,99 @@ public:
             {
                 notImplemented
                 (
-                    "mapDistribute::updateMesh(const mapPolyMesh&)"
+                    "distributionMap::updateMesh(const mapPolyMesh&)"
                 );
             }
 
     // Member Operators
 
-        void operator=(const mapDistribute&);
+        void operator=(const distributionMap&);
 
     // IOstream Operators
 
         //- Read dictionary from Istream
-        friend Istream& operator>>(Istream&, mapDistribute&);
+        friend Istream& operator>>(Istream&, distributionMap&);
 
         //- Write dictionary to Ostream
-        friend Ostream& operator<<(Ostream&, const mapDistribute&);
+        friend Ostream& operator<<(Ostream&, const distributionMap&);
 
 };
 
 
 // Template specialisation for primitives that do not need transform
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
     List<label>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<label>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<label>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<label>&
 ) const;
 
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<scalar>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
     List<scalar>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<scalar>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<scalar>&
 ) const;
 
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch& cpp,
     UList<bool>& fld
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
     List<bool>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<bool>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<bool>&
@@ -662,7 +662,7 @@ void mapDistribute::transform::operator()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "mapDistributeTemplates.C"
+    #include "distributionMapTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBase.C
similarity index 95%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBase.C
index 10494de792..511b5e66b2 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistributeBase.H"
+#include "distributionMapBase.H"
 #include "commSchedule.H"
 #include "HashSet.H"
 #include "globalIndex.H"
@@ -33,13 +33,13 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(mapDistributeBase, 0);
+    defineTypeNameAndDebug(distributionMapBase, 0);
 }
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-Foam::List<Foam::labelPair> Foam::mapDistributeBase::schedule
+Foam::List<Foam::labelPair> Foam::distributionMapBase::schedule
 (
     const labelListList& subMap,
     const labelListList& constructMap,
@@ -171,7 +171,7 @@ Foam::List<Foam::labelPair> Foam::mapDistributeBase::schedule
 }
 
 
-const Foam::List<Foam::labelPair>& Foam::mapDistributeBase::schedule() const
+const Foam::List<Foam::labelPair>& Foam::distributionMapBase::schedule() const
 {
     if (schedulePtr_.empty())
     {
@@ -187,7 +187,7 @@ const Foam::List<Foam::labelPair>& Foam::mapDistributeBase::schedule() const
 }
 
 
-void Foam::mapDistributeBase::checkReceivedSize
+void Foam::distributionMapBase::checkReceivedSize
 (
     const label proci,
     const label expectedSize,
@@ -205,7 +205,7 @@ void Foam::mapDistributeBase::checkReceivedSize
 }
 
 
-void Foam::mapDistributeBase::printLayout(Ostream& os) const
+void Foam::distributionMapBase::printLayout(Ostream& os) const
 {
     // Determine offsets of remote data.
     labelList minIndex(Pstream::nProcs(), labelMax);
@@ -279,7 +279,7 @@ void Foam::mapDistributeBase::printLayout(Ostream& os) const
 }
 
 
-void Foam::mapDistributeBase::calcCompactAddressing
+void Foam::distributionMapBase::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
     const labelList& elements,
@@ -328,7 +328,7 @@ void Foam::mapDistributeBase::calcCompactAddressing
 }
 
 
-void Foam::mapDistributeBase::calcCompactAddressing
+void Foam::distributionMapBase::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
     const labelListList& cellCells,
@@ -387,7 +387,7 @@ void Foam::mapDistributeBase::calcCompactAddressing
 }
 
 
-void Foam::mapDistributeBase::exchangeAddressing
+void Foam::distributionMapBase::exchangeAddressing
 (
     const int tag,
     const globalIndex& globalNumbering,
@@ -465,7 +465,7 @@ void Foam::mapDistributeBase::exchangeAddressing
 }
 
 
-void Foam::mapDistributeBase::exchangeAddressing
+void Foam::distributionMapBase::exchangeAddressing
 (
     const int tag,
     const globalIndex& globalNumbering,
@@ -550,7 +550,7 @@ void Foam::mapDistributeBase::exchangeAddressing
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::mapDistributeBase::mapDistributeBase()
+Foam::distributionMapBase::distributionMapBase()
 :
     constructSize_(0),
     subHasFlip_(false),
@@ -559,7 +559,7 @@ Foam::mapDistributeBase::mapDistributeBase()
 {}
 
 
-Foam::mapDistributeBase::mapDistributeBase
+Foam::distributionMapBase::distributionMapBase
 (
     const label constructSize,
     const labelListList&& subMap,
@@ -577,7 +577,7 @@ Foam::mapDistributeBase::mapDistributeBase
 {}
 
 
-Foam::mapDistributeBase::mapDistributeBase
+Foam::distributionMapBase::distributionMapBase
 (
     const labelList& sendProcs,
     const labelList& recvProcs
@@ -651,7 +651,7 @@ Foam::mapDistributeBase::mapDistributeBase
 }
 
 
-Foam::mapDistributeBase::mapDistributeBase
+Foam::distributionMapBase::distributionMapBase
 (
     const globalIndex& globalNumbering,
     labelList& elements,
@@ -711,7 +711,7 @@ Foam::mapDistributeBase::mapDistributeBase
 }
 
 
-Foam::mapDistributeBase::mapDistributeBase
+Foam::distributionMapBase::distributionMapBase
 (
     const globalIndex& globalNumbering,
     labelListList& cellCells,
@@ -771,7 +771,7 @@ Foam::mapDistributeBase::mapDistributeBase
 }
 
 
-Foam::mapDistributeBase::mapDistributeBase(const mapDistributeBase& map)
+Foam::distributionMapBase::distributionMapBase(const distributionMapBase& map)
 :
     constructSize_(map.constructSize_),
     subMap_(map.subMap_),
@@ -782,7 +782,7 @@ Foam::mapDistributeBase::mapDistributeBase(const mapDistributeBase& map)
 {}
 
 
-Foam::mapDistributeBase::mapDistributeBase(mapDistributeBase&& map)
+Foam::distributionMapBase::distributionMapBase(distributionMapBase&& map)
 :
     constructSize_(map.constructSize_),
     subMap_(move(map.subMap_)),
@@ -793,7 +793,7 @@ Foam::mapDistributeBase::mapDistributeBase(mapDistributeBase&& map)
 {}
 
 
-Foam::mapDistributeBase::mapDistributeBase(Istream& is)
+Foam::distributionMapBase::distributionMapBase(Istream& is)
 {
     is >> *this;
 }
@@ -801,7 +801,7 @@ Foam::mapDistributeBase::mapDistributeBase(Istream& is)
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::mapDistributeBase::transfer(mapDistributeBase& rhs)
+void Foam::distributionMapBase::transfer(distributionMapBase& rhs)
 {
     constructSize_ = rhs.constructSize_;
     subMap_.transfer(rhs.subMap_);
@@ -812,7 +812,7 @@ void Foam::mapDistributeBase::transfer(mapDistributeBase& rhs)
 }
 
 
-Foam::label Foam::mapDistributeBase::renumber
+Foam::label Foam::distributionMapBase::renumber
 (
     const globalIndex& globalNumbering,
     const List<Map<label>>& compactMap,
@@ -836,14 +836,18 @@ Foam::label Foam::mapDistributeBase::renumber
 }
 
 
-void Foam::mapDistributeBase::compact(const boolList& elemIsUsed, const int tag)
+void Foam::distributionMapBase::compact
+(
+    const boolList& elemIsUsed,
+    const int tag
+)
 {
     // 1. send back to sender. Have sender delete the corresponding element
     //    from the submap and do the same to the constructMap locally
     //    (and in same order).
 
     // Send elemIsUsed field to neighbour. Use nonblocking code from
-    // mapDistributeBase but in reverse order.
+    // distributionMapBase but in reverse order.
     if (Pstream::parRun())
     {
         label startOfRequests = Pstream::nRequests();
@@ -996,7 +1000,7 @@ void Foam::mapDistributeBase::compact(const boolList& elemIsUsed, const int tag)
 }
 
 
-void Foam::mapDistributeBase::compact
+void Foam::distributionMapBase::compact
 (
     const boolList& elemIsUsed,
     const label localSize,            // max index for subMap
@@ -1010,7 +1014,7 @@ void Foam::mapDistributeBase::compact
     //    (and in same order).
 
     // Send elemIsUsed field to neighbour. Use nonblocking code from
-    // mapDistributeBase but in reverse order.
+    // distributionMapBase but in reverse order.
     if (Pstream::parRun())
     {
         label startOfRequests = Pstream::nRequests();
@@ -1220,7 +1224,7 @@ void Foam::mapDistributeBase::compact
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::mapDistributeBase::operator=(const mapDistributeBase& rhs)
+void Foam::distributionMapBase::operator=(const distributionMapBase& rhs)
 {
     // Check for assignment to self
     if (this == &rhs)
@@ -1240,9 +1244,9 @@ void Foam::mapDistributeBase::operator=(const mapDistributeBase& rhs)
 
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, mapDistributeBase& map)
+Foam::Istream& Foam::operator>>(Istream& is, distributionMapBase& map)
 {
-    is.fatalCheck("operator>>(Istream&, mapDistributeBase&)");
+    is.fatalCheck("operator>>(Istream&, distributionMapBase&)");
 
     is  >> map.constructSize_ >> map.subMap_ >> map.constructMap_
         >> map.subHasFlip_ >> map.constructHasFlip_;
@@ -1253,7 +1257,7 @@ Foam::Istream& Foam::operator>>(Istream& is, mapDistributeBase& map)
 
 // * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistributeBase& map)
+Foam::Ostream& Foam::operator<<(Ostream& os, const distributionMapBase& map)
 {
     os  << map.constructSize_ << token::NL
         << map.subMap_ << token::NL
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBase.H
similarity index 92%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBase.H
index 80d1ae8f75..8a04bbf71d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::mapDistributeBase
+    Foam::distributionMapBase
 
 Description
     Class containing processor-to-processor mapping information.
@@ -47,7 +47,7 @@ Note:
     So e.g 4 procs and on proc 1 the compact
     table will first have all globalIndex.localSize() elements from proc1
     followed by used-only elements of proc0, proc2, proc3.
-    The constructed mapDistributeBase sends the local elements from and
+    The constructed distributionMapBase sends the local elements from and
     receives the remote elements into their compact position.
     compactMap[proci] is the position of elements from proci in the compact
     map. compactMap[myProcNo()] is empty since trivial addressing.
@@ -62,13 +62,13 @@ Note:
 
 
 SourceFiles
-    mapDistributeBase.C
-    mapDistributeBaseTemplates.C
+    distributionMapBase.C
+    distributionMapBaseTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mapDistributeBase_H
-#define mapDistributeBase_H
+#ifndef distributionMapBase_H
+#define distributionMapBase_H
 
 #include "labelList.H"
 #include "labelPair.H"
@@ -88,17 +88,17 @@ class PstreamBuffers;
 
 // Forward declaration of friend functions and operators
 
-class mapDistributeBase;
+class distributionMapBase;
 
-Istream& operator>>(Istream&, mapDistributeBase&);
-Ostream& operator<<(Ostream&, const mapDistributeBase&);
+Istream& operator>>(Istream&, distributionMapBase&);
+Ostream& operator<<(Ostream&, const distributionMapBase&);
 
 
 /*---------------------------------------------------------------------------*\
-                      Class mapDistributeBase Declaration
+                      Class distributionMapBase Declaration
 \*---------------------------------------------------------------------------*/
 
-class mapDistributeBase
+class distributionMapBase
 {
 protected:
 
@@ -190,16 +190,16 @@ protected:
 public:
 
     // Declare name of the class and its debug switch
-    ClassName("mapDistributeBase");
+    ClassName("distributionMapBase");
 
 
     // Constructors
 
         //- Construct null
-        mapDistributeBase();
+        distributionMapBase();
 
         //- Move construct from components
-        mapDistributeBase
+        distributionMapBase
         (
             const label constructSize,
             const labelListList&& subMap,
@@ -211,7 +211,7 @@ public:
         //- Construct from reverse addressing: per data item the send
         //  processor and the receive processor. (note: data is not stored
         //  sorted per processor so cannot use printLayout).
-        mapDistributeBase
+        distributionMapBase
         (
             const labelList& sendProcs,
             const labelList& recvProcs
@@ -221,7 +221,7 @@ public:
         //  numbering (or -1). Determines compact numbering (see above) and
         //  distribute map to get data into this ordering and renumbers the
         //  elements to be in compact numbering.
-        mapDistributeBase
+        distributionMapBase
         (
             const globalIndex&,
             labelList& elements,
@@ -232,7 +232,7 @@ public:
         //- Special variant that works with the info sorted into bins
         //  according to local indices. E.g. think cellCells where
         //  cellCells[localCellI] is a list of global cells
-        mapDistributeBase
+        distributionMapBase
         (
             const globalIndex&,
             labelListList& cellCells,
@@ -241,13 +241,13 @@ public:
         );
 
         //- Construct copy
-        mapDistributeBase(const mapDistributeBase&);
+        distributionMapBase(const distributionMapBase&);
 
         //- Move constructor
-        mapDistributeBase(mapDistributeBase&&);
+        distributionMapBase(distributionMapBase&&);
 
         //- Construct from Istream
-        mapDistributeBase(Istream&);
+        distributionMapBase(Istream&);
 
 
     // Member Functions
@@ -329,7 +329,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistributeBase&);
+            void transfer(distributionMapBase&);
 
             //- Helper for construct from globalIndex. Renumbers element
             //  (in globalIndex numbering) into compact indices.
@@ -464,17 +464,17 @@ public:
 
     // Member Operators
 
-        void operator=(const mapDistributeBase&);
-        void operator=(mapDistributeBase&&);
+        void operator=(const distributionMapBase&);
+        void operator=(distributionMapBase&&);
 
 
     // IOstream Operators
 
         //- Read dictionary from Istream
-        friend Istream& operator>>(Istream&, mapDistributeBase&);
+        friend Istream& operator>>(Istream&, distributionMapBase&);
 
         //- Write dictionary to Ostream
-        friend Ostream& operator<<(Ostream&, const mapDistributeBase&);
+        friend Ostream& operator<<(Ostream&, const distributionMapBase&);
 };
 
 
@@ -485,7 +485,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "mapDistributeBaseTemplates.C"
+    #include "distributionMapBaseTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBaseTemplates.C
similarity index 98%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBaseTemplates.C
index 5ecc428f56..a0c263079c 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBaseTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class T, class CombineOp, class negateOp>
-void Foam::mapDistributeBase::flipAndCombine
+void Foam::distributionMapBase::flipAndCombine
 (
     const UList<label>& map,
     const bool hasFlip,
@@ -76,7 +76,7 @@ void Foam::mapDistributeBase::flipAndCombine
 
 
 template<class T, class negateOp>
-T Foam::mapDistributeBase::accessAndFlip
+T Foam::distributionMapBase::accessAndFlip
 (
     const UList<T>& fld,
     const label index,
@@ -115,7 +115,7 @@ T Foam::mapDistributeBase::accessAndFlip
 
 // Distribute list.
 template<class T, class negateOp>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     const Pstream::commsTypes commsType,
     const List<labelPair>& schedule,
@@ -623,7 +623,7 @@ void Foam::mapDistributeBase::distribute
 
 // Distribute list.
 template<class T, class CombineOp, class negateOp>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     const Pstream::commsTypes commsType,
     const List<labelPair>& schedule,
@@ -1122,7 +1122,11 @@ void Foam::mapDistributeBase::distribute
 
 
 template<class T>
-void Foam::mapDistributeBase::send(PstreamBuffers& pBufs, const List<T>& field)
+void Foam::distributionMapBase::send
+(
+    PstreamBuffers& pBufs,
+    const List<T>& field
+)
 const
 {
     // Stream data into buffer
@@ -1156,7 +1160,7 @@ const
 
 
 template<class T>
-void Foam::mapDistributeBase::receive(PstreamBuffers& pBufs, List<T>& field)
+void Foam::distributionMapBase::receive(PstreamBuffers& pBufs, List<T>& field)
 const
 {
     // Consume
@@ -1196,7 +1200,7 @@ const
 
 //- Distribute data using default commsType.
 template<class T, class negateOp>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     List<T>& fld,
     const negateOp& negOp,
@@ -1256,7 +1260,7 @@ void Foam::mapDistributeBase::distribute
 
 //- Distribute data using default commsType.
 template<class T>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     List<T>& fld,
     const int tag
@@ -1268,7 +1272,7 @@ void Foam::mapDistributeBase::distribute
 
 //- Distribute data using default commsType.
 template<class T>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     DynamicList<T>& fld,
     const int tag
@@ -1286,7 +1290,7 @@ void Foam::mapDistributeBase::distribute
 
 //- Reverse distribute data using default commsType.
 template<class T>
-void Foam::mapDistributeBase::reverseDistribute
+void Foam::distributionMapBase::reverseDistribute
 (
     const label constructSize,
     List<T>& fld,
@@ -1348,7 +1352,7 @@ void Foam::mapDistributeBase::reverseDistribute
 //  Since constructSize might be larger than supplied size supply
 //  a nullValue
 template<class T>
-void Foam::mapDistributeBase::reverseDistribute
+void Foam::distributionMapBase::reverseDistribute
 (
     const label constructSize,
     const T& nullValue,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapTemplates.C
similarity index 87%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapTemplates.C
index b125ad3588..a6bbc6cde7 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class T>
-void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const
+void Foam::distributionMap::applyDummyTransforms(List<T>& field) const
 {
     forAll(transformElements_, trafoI)
     {
@@ -50,7 +50,7 @@ void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const
 
 
 template<class T>
-void Foam::mapDistribute::applyDummyInverseTransforms(List<T>& field) const
+void Foam::distributionMap::applyDummyInverseTransforms(List<T>& field) const
 {
     forAll(transformElements_, trafoI)
     {
@@ -66,7 +66,7 @@ void Foam::mapDistribute::applyDummyInverseTransforms(List<T>& field) const
 
 
 template<class T, class TransformOp>   //, class CombineOp>
-void Foam::mapDistribute::applyTransforms
+void Foam::distributionMap::applyTransforms
 (
     const globalIndexAndTransform& globalTransforms,
     List<T>& field,
@@ -96,7 +96,7 @@ void Foam::mapDistribute::applyTransforms
 
 
 template<class T, class TransformOp>   //, class CombineOp>
-void Foam::mapDistribute::applyInverseTransforms
+void Foam::distributionMap::applyInverseTransforms
 (
     const globalIndexAndTransform& globalTransforms,
     List<T>& field,
@@ -126,7 +126,7 @@ void Foam::mapDistribute::applyInverseTransforms
 
 
 template<class T, class negateOp>
-void Foam::mapDistribute::distribute
+void Foam::distributionMap::distribute
 (
     List<T>& fld,
     const negateOp& negOp,
@@ -134,7 +134,7 @@ void Foam::mapDistribute::distribute
     const int tag
 ) const
 {
-    mapDistributeBase::distribute(fld, negOp, tag);
+    distributionMapBase::distribute(fld, negOp, tag);
 
     //- Fill in transformed slots with copies
     if (dummyTransform)
@@ -145,7 +145,7 @@ void Foam::mapDistribute::distribute
 
 
 template<class T>
-void Foam::mapDistribute::distribute
+void Foam::distributionMap::distribute
 (
     List<T>& fld,
     const bool dummyTransform,
@@ -157,7 +157,7 @@ void Foam::mapDistribute::distribute
 
 
 template<class T>
-void Foam::mapDistribute::distribute
+void Foam::distributionMap::distribute
 (
     DynamicList<T>& fld,
     const bool dummyTransform,
@@ -175,7 +175,7 @@ void Foam::mapDistribute::distribute
 
 
 template<class T>
-void Foam::mapDistribute::reverseDistribute
+void Foam::distributionMap::reverseDistribute
 (
     const label constructSize,
     List<T>& fld,
@@ -188,12 +188,12 @@ void Foam::mapDistribute::reverseDistribute
         applyDummyInverseTransforms(fld);
     }
 
-    mapDistributeBase::reverseDistribute(constructSize, fld, tag);
+    distributionMapBase::reverseDistribute(constructSize, fld, tag);
 }
 
 
 template<class T>
-void Foam::mapDistribute::reverseDistribute
+void Foam::distributionMap::reverseDistribute
 (
     const label constructSize,
     const T& nullValue,
@@ -207,12 +207,12 @@ void Foam::mapDistribute::reverseDistribute
         applyDummyInverseTransforms(fld);
     }
 
-    mapDistributeBase::reverseDistribute(constructSize, nullValue, fld, tag);
+    distributionMapBase::reverseDistribute(constructSize, nullValue, fld, tag);
 }
 
 
 template<class T, class TransformOp>
-void Foam::mapDistribute::distribute
+void Foam::distributionMap::distribute
 (
     const globalIndexAndTransform& git,
     List<T>& fld,
@@ -228,7 +228,7 @@ void Foam::mapDistribute::distribute
 
 
 template<class T, class TransformOp>
-void Foam::mapDistribute::reverseDistribute
+void Foam::distributionMap::reverseDistribute
 (
     const globalIndexAndTransform& git,
     const label constructSize,
@@ -248,7 +248,7 @@ void Foam::mapDistribute::reverseDistribute
 
 
 template<class T, class TransformOp>
-void Foam::mapDistribute::reverseDistribute
+void Foam::distributionMap::reverseDistribute
 (
     const globalIndexAndTransform& git,
     const label constructSize,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/lagrangianDistributionMap.H
similarity index 87%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/lagrangianDistributionMap.H
index fe35b38fbc..6b6c038c2f 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/lagrangianDistributionMap.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
@@ -22,20 +22,20 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::mapDistributeLagrangian
+    Foam::lagrangianDistributionMap
 
 Description
     Class containing mesh-to-mesh mapping information for particles
 
 SourceFiles
-    mapDistributeLagrangian.C
+    lagrangianDistributionMap.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mapDistributeLagrangian_H
-#define mapDistributeLagrangian_H
+#ifndef lagrangianDistributionMap_H
+#define lagrangianDistributionMap_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,15 +45,15 @@ namespace Foam
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                   Class mapDistributeLagrangian Declaration
+                   Class lagrangianDistributionMap Declaration
 \*---------------------------------------------------------------------------*/
 
-class mapDistributeLagrangian
+class lagrangianDistributionMap
 {
     // Private Data
 
         //- Map to distribute particles
-        const mapDistribute particleMap_;
+        const distributionMap particleMap_;
 
         //- Per element in subsetted mesh the cell label
         const labelListList constructCellLabels_;
@@ -64,7 +64,7 @@ public:
     // Constructors
 
         //- Construct from components
-        mapDistributeLagrangian
+        lagrangianDistributionMap
         (
             const label nNewParticles,
             labelListList&& subParticleMap,
@@ -82,7 +82,7 @@ public:
         // Access
 
             //- Distribution map
-            const mapDistribute& particleMap() const
+            const distributionMap& particleMap() const
             {
                 return particleMap_;
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/polyMeshDistributionMap.C
similarity index 85%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/polyMeshDistributionMap.C
index 144433f2eb..414f6ae5e9 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/polyMeshDistributionMap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,13 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "polyMesh.H"
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::mapDistributePolyMesh::calcPatchSizes()
+void Foam::polyMeshDistributionMap::calcPatchSizes()
 {
     oldPatchSizes_.setSize(oldPatchStarts_.size());
 
@@ -59,7 +59,7 @@ void Foam::mapDistributePolyMesh::calcPatchSizes()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh()
+Foam::polyMeshDistributionMap::polyMeshDistributionMap()
 :
     nOldPoints_(0),
     nOldFaces_(0),
@@ -74,7 +74,7 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh()
 {}
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh
+Foam::polyMeshDistributionMap::polyMeshDistributionMap
 (
     const polyMesh& mesh,
 
@@ -128,7 +128,7 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
 }
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh
+Foam::polyMeshDistributionMap::polyMeshDistributionMap
 (
     // mesh before changes
     const label nOldPoints,
@@ -138,10 +138,10 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
     labelList&& oldPatchNMeshPoints,
 
     // how to transfer pieces of mesh
-    mapDistribute&& pointMap,
-    mapDistribute&& faceMap,
-    mapDistribute&& cellMap,
-    mapDistribute&& patchMap
+    distributionMap&& pointMap,
+    distributionMap&& faceMap,
+    distributionMap&& cellMap,
+    distributionMap&& patchMap
 )
 :
     nOldPoints_(nOldPoints),
@@ -159,9 +159,9 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
 }
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh
+Foam::polyMeshDistributionMap::polyMeshDistributionMap
 (
-    mapDistributePolyMesh&& map
+    polyMeshDistributionMap&& map
 )
 :
     nOldPoints_(map.nOldPoints_),
@@ -177,7 +177,7 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
 {}
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh(Istream& is)
+Foam::polyMeshDistributionMap::polyMeshDistributionMap(Istream& is)
 {
     is  >> *this;
 }
@@ -185,7 +185,7 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::mapDistributePolyMesh::transfer(mapDistributePolyMesh& rhs)
+void Foam::polyMeshDistributionMap::transfer(polyMeshDistributionMap& rhs)
 {
     nOldPoints_ = rhs.nOldPoints_;
     nOldFaces_ = rhs.nOldFaces_;
@@ -200,7 +200,7 @@ void Foam::mapDistributePolyMesh::transfer(mapDistributePolyMesh& rhs)
 }
 
 
-void Foam::mapDistributePolyMesh::distributePointIndices(labelList& lst) const
+void Foam::polyMeshDistributionMap::distributePointIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
     boolList isSelected
@@ -222,7 +222,7 @@ void Foam::mapDistributePolyMesh::distributePointIndices(labelList& lst) const
 }
 
 
-void Foam::mapDistributePolyMesh::distributeFaceIndices(labelList& lst) const
+void Foam::polyMeshDistributionMap::distributeFaceIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
     boolList isSelected
@@ -244,7 +244,7 @@ void Foam::mapDistributePolyMesh::distributeFaceIndices(labelList& lst) const
 }
 
 
-void Foam::mapDistributePolyMesh::distributeCellIndices(labelList& lst) const
+void Foam::polyMeshDistributionMap::distributeCellIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
     boolList isSelected
@@ -266,7 +266,7 @@ void Foam::mapDistributePolyMesh::distributeCellIndices(labelList& lst) const
 }
 
 
-void Foam::mapDistributePolyMesh::distributePatchIndices(labelList& lst) const
+void Foam::polyMeshDistributionMap::distributePatchIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
     boolList isSelected
@@ -290,7 +290,10 @@ void Foam::mapDistributePolyMesh::distributePatchIndices(labelList& lst) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::mapDistributePolyMesh::operator=(const mapDistributePolyMesh& rhs)
+void Foam::polyMeshDistributionMap::operator=
+(
+    const polyMeshDistributionMap& rhs
+)
 {
     nOldPoints_ = rhs.nOldPoints_;
     nOldFaces_ = rhs.nOldFaces_;
@@ -305,7 +308,7 @@ void Foam::mapDistributePolyMesh::operator=(const mapDistributePolyMesh& rhs)
 }
 
 
-void Foam::mapDistributePolyMesh::operator=(mapDistributePolyMesh&& rhs)
+void Foam::polyMeshDistributionMap::operator=(polyMeshDistributionMap&& rhs)
 {
     nOldPoints_ = rhs.nOldPoints_;
     nOldFaces_ = rhs.nOldFaces_;
@@ -322,9 +325,9 @@ void Foam::mapDistributePolyMesh::operator=(mapDistributePolyMesh&& rhs)
 
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, mapDistributePolyMesh& map)
+Foam::Istream& Foam::operator>>(Istream& is, polyMeshDistributionMap& map)
 {
-    is.fatalCheck("operator>>(Istream&, mapDistributePolyMesh&)");
+    is.fatalCheck("operator>>(Istream&, polyMeshDistributionMap&)");
 
     is  >> map.nOldPoints_
         >> map.nOldFaces_
@@ -343,7 +346,7 @@ Foam::Istream& Foam::operator>>(Istream& is, mapDistributePolyMesh& map)
 
 // * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistributePolyMesh& map)
+Foam::Ostream& Foam::operator<<(Ostream& os, const polyMeshDistributionMap& map)
 {
     os  << map.nOldPoints_
         << token::SPACE << map.nOldFaces_
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/polyMeshDistributionMap.H
similarity index 82%
rename from src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
rename to src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/polyMeshDistributionMap.H
index 5fa7d176d9..a21116ed82 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/polyMeshDistributionMap.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
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::mapDistributePolyMesh
+    Foam::polyMeshDistributionMap
 
 Description
     Class containing mesh-to-mesh mapping information after a mesh distribution
@@ -34,14 +34,14 @@ Description
     mesh (constructXXXMap).
 
 SourceFiles
-    mapDistributePolyMesh.C
+    polyMeshDistributionMap.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mapDistributePolyMesh_H
-#define mapDistributePolyMesh_H
+#ifndef polyMeshDistributionMap_H
+#define polyMeshDistributionMap_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,17 +54,17 @@ class polyMesh;
 
 // Forward declaration of friend functions and operators
 
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
-Istream& operator>>(Istream&, mapDistributePolyMesh&);
-Ostream& operator<<(Ostream&, const mapDistributePolyMesh&);
+Istream& operator>>(Istream&, polyMeshDistributionMap&);
+Ostream& operator<<(Ostream&, const polyMeshDistributionMap&);
 
 
 /*---------------------------------------------------------------------------*\
-                    Class mapDistributePolyMesh Declaration
+                    Class polyMeshDistributionMap Declaration
 \*---------------------------------------------------------------------------*/
 
-class mapDistributePolyMesh
+class polyMeshDistributionMap
 {
     // Private Data
 
@@ -88,16 +88,16 @@ class mapDistributePolyMesh
 
 
         //- Point distribute map
-        mapDistribute pointMap_;
+        distributionMap pointMap_;
 
         //- Face distribute map
-        mapDistribute faceMap_;
+        distributionMap faceMap_;
 
         //- Cell distribute map
-        mapDistribute cellMap_;
+        distributionMap cellMap_;
 
         //- Patch distribute map
-        mapDistribute patchMap_;
+        distributionMap patchMap_;
 
 
     // Private Member Functions
@@ -110,12 +110,12 @@ public:
     // Constructors
 
         //- Construct null
-        mapDistributePolyMesh();
+        polyMeshDistributionMap();
 
         //- Move constructor from components.
         //  Note that mesh has to be changed already
         //  since uses mesh.nPoints etc as the new size.
-        mapDistributePolyMesh
+        polyMeshDistributionMap
         (
             const polyMesh& mesh,
 
@@ -143,7 +143,7 @@ public:
         );
 
         //- Move constructor from components
-        mapDistributePolyMesh
+        polyMeshDistributionMap
         (
             // mesh before changes
             const label nOldPoints,
@@ -153,20 +153,20 @@ public:
             labelList&& oldPatchNMeshPoints,
 
             // how to subset pieces of mesh to send across
-            mapDistribute&& pointMap,
-            mapDistribute&& faceMap,
-            mapDistribute&& cellMap,
-            mapDistribute&& patchMap
+            distributionMap&& pointMap,
+            distributionMap&& faceMap,
+            distributionMap&& cellMap,
+            distributionMap&& patchMap
         );
 
         //- Move constructor
-        mapDistributePolyMesh(mapDistributePolyMesh&&);
+        polyMeshDistributionMap(polyMeshDistributionMap&&);
 
         //- Construct from Istream
-        mapDistributePolyMesh(Istream&);
+        polyMeshDistributionMap(Istream&);
 
         //- Disallow default bitwise copy construction
-        mapDistributePolyMesh(const mapDistributePolyMesh&) = delete;
+        polyMeshDistributionMap(const polyMeshDistributionMap&) = delete;
 
 
     // Member Functions
@@ -210,25 +210,25 @@ public:
             }
 
             //- Point distribute map
-            const mapDistribute& pointMap() const
+            const distributionMap& pointMap() const
             {
                 return pointMap_;
             }
 
             //- Face distribute map
-            const mapDistribute& faceMap() const
+            const distributionMap& faceMap() const
             {
                 return faceMap_;
             }
 
             //- Cell distribute map
-            const mapDistribute& cellMap() const
+            const distributionMap& cellMap() const
             {
                 return cellMap_;
             }
 
             //- Patch distribute map
-            const mapDistribute& patchMap() const
+            const distributionMap& patchMap() const
             {
                 return patchMap_;
             }
@@ -237,7 +237,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistributePolyMesh&);
+            void transfer(polyMeshDistributionMap&);
 
             //- Distribute list of point data
             template<class T>
@@ -286,18 +286,18 @@ public:
 
     // Member Operators
 
-        void operator=(const mapDistributePolyMesh&);
+        void operator=(const polyMeshDistributionMap&);
 
-        void operator=(mapDistributePolyMesh&&);
+        void operator=(polyMeshDistributionMap&&);
 
 
     // IOstream Operators
 
         //- Read dictionary from Istream
-        friend Istream& operator>>(Istream&, mapDistributePolyMesh&);
+        friend Istream& operator>>(Istream&, polyMeshDistributionMap&);
 
         //- Write dictionary to Ostream
-        friend Ostream& operator<<(Ostream&, const mapDistributePolyMesh&);
+        friend Ostream& operator<<(Ostream&, const polyMeshDistributionMap&);
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index 62c04d8ceb..166b7ce959 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.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
@@ -127,7 +127,7 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
 }
 
 
-void Foam::polyMesh::distribute(const mapDistributePolyMesh& map)
+void Foam::polyMesh::distribute(const polyMeshDistributionMap& map)
 {
     meshObject::distribute<polyMesh>(*this, map);
     meshObject::distribute<pointMesh>(*this, map);
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index 0e30b2482c..997e01f93a 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.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
@@ -47,7 +47,7 @@ SourceFiles
 #include "PackedBoolList.H"
 #include "polyMesh.H"
 #include "coupledPolyPatch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -187,7 +187,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -207,7 +207,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -229,7 +229,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -251,7 +251,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -274,7 +274,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -294,7 +294,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -316,7 +316,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -338,7 +338,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -355,7 +355,13 @@ public:
                 const CombineOp& cop
             )
             {
-                syncBoundaryFaceList(mesh, l, cop, mapDistribute::transform());
+                syncBoundaryFaceList
+                (
+                    mesh,
+                    l,
+                    cop,
+                    distributionMap::transform()
+                );
             }
 
             //- Synchronise locations on boundary faces only.
@@ -372,7 +378,7 @@ public:
                     mesh,
                     l,
                     cop,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -397,7 +403,7 @@ public:
                     mesh,
                     bndValues,
                     cop,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -421,7 +427,7 @@ public:
                     mesh,
                     bndValues,
                     cop,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -438,7 +444,7 @@ public:
                     mesh,
                     l,
                     eqOp<T>(),
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -454,7 +460,7 @@ public:
                     mesh,
                     l,
                     eqOp<point>(),
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -477,7 +483,7 @@ public:
                     mesh,
                     bndValues,
                     eqOp<T>(),
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -509,7 +515,7 @@ public:
                 const CombineOp& cop
             )
             {
-                syncPointMap(mesh, l, cop, mapDistribute::transform());
+                syncPointMap(mesh, l, cop, distributionMap::transform());
             }
 
             //- Synchronise locations on selected points.
@@ -521,7 +527,13 @@ public:
                 const CombineOp& cop
             )
             {
-                syncPointMap(mesh, l, cop, mapDistribute::transformPosition());
+                syncPointMap
+                (
+                    mesh,
+                    l,
+                    cop,
+                    distributionMap::transformPosition()
+                );
             }
 
             //- Synchronise values on selected edges. Edges are represented
@@ -535,7 +547,7 @@ public:
                 const CombineOp& cop
             )
             {
-                syncEdgeMap(mesh, l, cop, mapDistribute::transform());
+                syncEdgeMap(mesh, l, cop, distributionMap::transform());
             }
 
             //- Synchronise locations on selected edges.
@@ -547,7 +559,7 @@ public:
                 const CombineOp& cop
             )
             {
-                syncEdgeMap(mesh, l, cop, mapDistribute::transformPosition());
+                syncEdgeMap(mesh, l, cop, distributionMap::transformPosition());
             }
 
         // PackedList versions
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index fd2d326387..852319c6e2 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.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
@@ -1130,7 +1130,7 @@ void Foam::syncTools::syncPointList
 //        gd.globalTransforms(),
 //        cop,
 //        true,   // position?
-//        mapDistribute::transform()  // not used
+//        distributionMap::transform()  // not used
 //    );
 //
 //    forAll(meshPoints, i)
@@ -1166,7 +1166,7 @@ void Foam::syncTools::syncEdgeList
     const globalMeshData& gd = mesh.globalData();
     const labelList& meshEdges = gd.coupledPatchMeshEdges();
     const globalIndexAndTransform& git = gd.globalTransforms();
-    const mapDistribute& edgeMap = gd.globalEdgeSlavesMap();
+    const distributionMap& edgeMap = gd.globalEdgeSlavesMap();
 
     List<T> cppFld(UIndirectList<T>(edgeValues, meshEdges));
 
@@ -1209,7 +1209,7 @@ void Foam::syncTools::syncEdgeList
 //    const globalMeshData& gd = mesh.globalData();
 //    const labelList& meshEdges = gd.coupledPatchMeshEdges();
 //    const globalIndexAndTransform& git = gd.globalTransforms();
-//    const mapDistribute& map = gd.globalEdgeSlavesMap();
+//    const distributionMap& map = gd.globalEdgeSlavesMap();
 //
 //    List<point> cppFld(UIndirectList<point>(edgeValues, meshEdges));
 //
@@ -1222,7 +1222,7 @@ void Foam::syncTools::syncEdgeList
 //        git,
 //        cop,
 //        true,       // position?
-//        mapDistribute::transform()  // not used
+//        distributionMap::transform()  // not used
 //    );
 //
 //    // Extract back onto mesh
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
index 7798c68122..3b5740be3b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::pointNormals
     const globalMeshData& globalData = mesh.globalData();
     const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch();
     const Map<label>& coupledPatchMP = coupledPatch.meshPointMap();
-    const mapDistribute& map = globalData.globalPointSlavesMap();
+    const distributionMap& map = globalData.globalPointSlavesMap();
     const globalIndexAndTransform& transforms =
         globalData.globalTransforms();
 
@@ -80,7 +80,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::pointNormals
         (
             transforms,
             pointFaceNormals,
-            mapDistribute::transform()
+            distributionMap::transform()
         );
 
 
@@ -142,7 +142,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::pointNormals
             transforms,
             coupledPointNormals.size(),
             coupledPointNormals,
-            mapDistribute::transform()
+            distributionMap::transform()
         );
     }
 
@@ -216,7 +216,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::edgeNormals
 
 
     const globalMeshData& globalData = mesh.globalData();
-    const mapDistribute& map = globalData.globalEdgeSlavesMap();
+    const distributionMap& map = globalData.globalEdgeSlavesMap();
 
 
     // Convert patch-edge data into cpp-edge data
@@ -244,7 +244,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::edgeNormals
         map,
         globalData.globalTransforms(),
         plusEqOp<point>(),              // add since normalised later on
-        mapDistribute::transform()
+        distributionMap::transform()
     );
     cppEdgeData /= mag(cppEdgeData)+vSmall;
 
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
index 637ebb6e93..fca9753b5f 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.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
@@ -444,7 +444,7 @@ Foam::globalIndexAndTransform::globalIndexAndTransform(const polyMesh& mesh)
             const globalMeshData& gmd = mesh_.globalData();
             const indirectPrimitivePatch& cpp = gmd.coupledPatch();
             const labelList& meshPoints = cpp.meshPoints();
-            const mapDistribute& slavesMap = gmd.globalCoPointSlavesMap();
+            const distributionMap& slavesMap = gmd.globalCoPointSlavesMap();
             const labelListList& slaves = gmd.globalCoPointSlaves();
 
             List<labelPairList> elems(slavesMap.constructSize());
diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index bee63d6430..2b74ae629f 100644
--- a/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.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
@@ -26,7 +26,7 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "thermophysicalTransportModel.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -224,7 +224,7 @@ baffleThickness() const
     }
     else
     {
-        const mapDistribute& mapDist = this->mappedPatchBase::map();
+        const distributionMap& mapDist = this->mappedPatchBase::map();
 
         const fvPatch& nbrPatch =
             patch().boundaryMesh()[samplePolyPatch().index()];
@@ -254,7 +254,7 @@ tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>::qs() const
     }
     else
     {
-        const mapDistribute& mapDist = this->mappedPatchBase::map();
+        const distributionMap& mapDist = this->mappedPatchBase::map();
 
         const fvPatch& nbrPatch =
             patch().boundaryMesh()[samplePolyPatch().index()];
@@ -323,7 +323,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
     int oldTag = UPstream::msgType();
     UPstream::msgType() = oldTag+1;
 
-    const mapDistribute& mapDist = this->mappedPatchBase::map();
+    const distributionMap& mapDist = this->mappedPatchBase::map();
 
     const label patchi = patch().index();
 
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
index a1f2ae9a6a..73ac576b44 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.C
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.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
@@ -33,7 +33,7 @@ License
 #include "polyAddCell.H"
 #include "labelPair.H"
 #include "indirectPrimitivePatch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "globalMeshData.H"
 #include "PatchTools.H"
 #include "globalIndex.H"
@@ -74,7 +74,7 @@ void Foam::createShellMesh::syncEdges
     labelPairList& allEdgeData
 )
 {
-    const mapDistribute& map = globalData.globalEdgeSlavesMap();
+    const distributionMap& map = globalData.globalEdgeSlavesMap();
     const PackedBoolList& cppOrientation = globalData.globalEdgeOrientation();
 
     // Convert patch-edge data into cpp-edge data
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index c0647f9dcd..c6c47c6d03 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -35,7 +35,7 @@ License
 #include "removeCells.H"
 #include "polyModifyFace.H"
 #include "polyRemovePoint.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "surfaceFields.H"
 #include "pointFields.H"
 #include "syncTools.H"
@@ -976,7 +976,7 @@ void Foam::fvMeshDistribute::getCouplingData
         const globalMeshData& gmd = mesh_.globalData();
         const indirectPrimitivePatch& cpp = gmd.coupledPatch();
         const labelList& meshPoints = cpp.meshPoints();
-        const mapDistribute& slavesMap = gmd.globalCoPointSlavesMap();
+        const distributionMap& slavesMap = gmd.globalCoPointSlavesMap();
         const labelListList& slaves = gmd.globalCoPointSlaves();
 
         labelList elems(slavesMap.constructSize(), -1);
@@ -1772,7 +1772,7 @@ Foam::labelList Foam::fvMeshDistribute::countCells
 }
 
 
-Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
+Foam::autoPtr<Foam::polyMeshDistributionMap> Foam::fvMeshDistribute::distribute
 (
     const labelList& distribution
 )
@@ -1820,9 +1820,9 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     if (!Pstream::parRun())
     {
         // Collect all maps and return
-        return autoPtr<mapDistributePolyMesh>
+        return autoPtr<polyMeshDistributionMap>
         (
-            new mapDistributePolyMesh
+            new polyMeshDistributionMap
             (
                 mesh_,
 
@@ -3063,9 +3063,9 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     }
 
     // Collect all maps and return
-    return autoPtr<mapDistributePolyMesh>
+    return autoPtr<polyMeshDistributionMap>
     (
-        new mapDistributePolyMesh
+        new polyMeshDistributionMap
         (
             mesh_,
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index f91b66be09..3db41152f9 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.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
@@ -62,7 +62,7 @@ namespace Foam
 
 // Forward declaration of classes
 class mapAddedPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                       Class fvMeshDistribute Declaration
@@ -366,7 +366,7 @@ public:
 
         //- Send cells to neighbours according to distribution
         //  (for every cell the new proc)
-        autoPtr<mapDistributePolyMesh> distribute(const labelList& dist);
+        autoPtr<polyMeshDistributionMap> distribute(const labelList& dist);
 
         // Debugging
 
diff --git a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
index 486194ffb2..7da915c30c 100644
--- a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,7 +197,7 @@ void Foam::componentDisplacementMotionSolver::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::componentDisplacementMotionSolver::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {}
 
diff --git a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
index d18aceb5a2..a0df3861cd 100644
--- a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C
index 5e03a131ee..d7372fc8de 100644
--- a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ void Foam::componentVelocityMotionSolver::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::componentVelocityMotionSolver::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {}
 
diff --git a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
index 2577b3d668..94aa01cf13 100644
--- a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
index 55c2d460b8..7107fd012e 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
@@ -159,7 +159,7 @@ void Foam::points0MotionSolver::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::points0MotionSolver::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {}
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
index 10e9a568f2..57ef3859cd 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
index 4877fb7371..8baff76f8d 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.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
@@ -48,7 +48,7 @@ namespace Foam
 // Forward class declarations
 class polyMesh;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                         Class motionSolver Declaration
@@ -151,7 +151,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&) = 0;
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&) = 0;
+        virtual void distribute(const polyMeshDistributionMap&) = 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 e748140575..fd6966e886 100644
--- a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.C
+++ b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ void Foam::motionSolverList::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::motionSolverList::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     forAll(motionSolvers_, i)
diff --git a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H
index 1bb3b5bc3f..34892c56a0 100644
--- a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H
+++ b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
index 5f1c510192..010ed70139 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ void Foam::velocityMotionSolver::updateMesh(const mapPolyMesh& mpm)
 }
 
 
-void Foam::velocityMotionSolver::distribute(const mapDistributePolyMesh&)
+void Foam::velocityMotionSolver::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
index 08ccde30e1..b400774949 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 7e3613174f..c48a0d000b 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -39,7 +39,7 @@ License
 #include "OFstream.H"
 #include "Time.H"
 #include "FaceCellWave.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "refinementData.H"
 #include "refinementDistanceData.H"
 #include "degenerateMatcher.H"
@@ -4514,7 +4514,7 @@ void Foam::hexRef8::subset
 }
 
 
-void Foam::hexRef8::distribute(const mapDistributePolyMesh& map)
+void Foam::hexRef8::distribute(const polyMeshDistributionMap& map)
 {
     if (debug)
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index 15c5d8853a..89c6e558ac 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -56,7 +56,7 @@ class polyMesh;
 class polyPatch;
 class polyTopoChange;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                            Class hexRef8 Declaration
@@ -532,7 +532,7 @@ public:
             );
 
             //- Update local numbering for mesh redistribution
-            void distribute(const mapDistributePolyMesh&);
+            void distribute(const polyMeshDistributionMap&);
 
             //- Debug: Check coupled mesh for correctness
             void checkMesh() const;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
index 4ef5f619ed..6c05928427 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 
 #include "hexRef8Data.H"
 #include "mapPolyMesh.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "polyMesh.H"
 #include "syncTools.H"
 #include "refinementHistory.H"
@@ -349,7 +349,7 @@ void Foam::hexRef8Data::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::hexRef8Data::distribute(const mapDistributePolyMesh& map)
+void Foam::hexRef8Data::distribute(const polyMeshDistributionMap& map)
 {
     if (cellLevelPtr_.valid())
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
index 5712027a21..727dcfc317 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ namespace Foam
 
 // Forward declaration of classes
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 class refinementHistory;
 class fvMesh;
 
@@ -115,7 +115,7 @@ public:
         void updateMesh(const mapPolyMesh&);
 
         //- In-place distribute
-        void distribute(const mapDistributePolyMesh&);
+        void distribute(const polyMeshDistributionMap&);
 
         //- Write
         bool write() const;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
index 2fad7f646a..69814f6279 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.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 "refinementHistory.H"
 #include "mapPolyMesh.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "polyMesh.H"
 #include "syncTools.H"
 
@@ -1257,7 +1257,7 @@ void Foam::refinementHistory::countProc
 }
 
 
-void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
+void Foam::refinementHistory::distribute(const polyMeshDistributionMap& map)
 {
     if (!active())
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
index f4eb77b85c..e3441bce57 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.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
@@ -86,7 +86,7 @@ namespace Foam
 
 // Forward declaration of classes
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 
 // Forward declaration of friend functions and operators
@@ -355,7 +355,7 @@ public:
         //- Update local numbering for mesh redistribution.
         //  Can only distribute clusters sent across in one go; cannot
         //  handle parts recombined in multiple passes.
-        void distribute(const mapDistributePolyMesh&);
+        void distribute(const polyMeshDistributionMap&);
 
 
         //- Compact splitCells_. Removes all freeSplitCells_ elements.
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
index 5e3fc526d3..0839ed23f7 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.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
@@ -54,7 +54,7 @@ class polyMesh;
 class polyTopoChange;
 class face;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                          Class removeFaces Declaration
@@ -205,7 +205,7 @@ public:
         {}
 
         //- Force recalculation of locally stored data for mesh distribution
-        void distribute(const mapDistributePolyMesh&)
+        void distribute(const polyMeshDistributionMap&)
         {}
 
 
diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H
index e4977e3ef6..953b0fb11f 100644
--- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H
+++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ namespace Foam
 
 class fvMesh;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                            Class option Declaration
@@ -216,7 +216,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&) = 0;
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&) = 0;
+            virtual void distribute(const polyMeshDistributionMap&) = 0;
 
             //- Update for mesh motion
             virtual bool movePoints() = 0;
diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C
index 393fd0c25e..f377ac7ad6 100644
--- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C
+++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -248,7 +248,7 @@ void Foam::fvConstraints::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fvConstraints::distribute(const mapDistributePolyMesh& map)
+void Foam::fvConstraints::distribute(const polyMeshDistributionMap& map)
 {
     PtrListDictionary<fvConstraint>& constraintList(*this);
 
diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
index d46be19bd1..9633e0b60c 100644
--- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
+++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
index 951416ee68..ca6b991788 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H
@@ -48,7 +48,7 @@ namespace Foam
 
 class fvMesh;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                            Class fvModel Declaration
@@ -334,7 +334,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&) = 0;
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&) = 0;
+            virtual void distribute(const polyMeshDistributionMap&) = 0;
 
             //- Update for mesh motion
             virtual bool movePoints() = 0;
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.C b/src/finiteVolume/cfdTools/general/fvModels/fvModels.C
index 1643456332..b79f706abc 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.C
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModels.C
@@ -274,7 +274,7 @@ void Foam::fvModels::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fvModels::distribute(const mapDistributePolyMesh& map)
+void Foam::fvModels::distribute(const polyMeshDistributionMap& map)
 {
     PtrListDictionary<fvModel>& modelList(*this);
 
diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
index d70a89148a..d0f859e004 100644
--- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
+++ b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H
@@ -243,7 +243,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index 3c1d528d52..922b219653 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ tmp<Field<Type>> mappedPatchFieldBase<Type>::mappedField() const
     {
         case mappedPatchBase::NEARESTCELL:
         {
-            const mapDistribute& distMap = mapper_.map();
+            const distributionMap& distMap = mapper_.map();
 
             if (interpolationScheme_ != interpolationCell<Type>::typeName)
             {
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
index 29abcd7d4f..25892f5d2e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef extendedCellToCellStencil_H
 #define extendedCellToCellStencil_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -81,7 +81,7 @@ public:
             >
         > weightedSum
         (
-            const mapDistribute& map,
+            const distributionMap& map,
             const labelListList& stencil,
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             const List<List<WeightType>>& stencilWeights
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
index 49c503a257..3a2875aa79 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ Foam::tmp
     >
 > Foam::extendedCellToCellStencil::weightedSum
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const labelListList& stencil,
     const GeometricField<Type, fvPatchField, volMesh>& fld,
     const List<List<WeightType>>& stencilWeights
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
index ebf122e751..d1e5f6726a 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "extendedCentredCellToCellStencil.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "cellToCellStencil.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -41,7 +41,7 @@ Foam::extendedCentredCellToCellStencil::extendedCentredCellToCellStencil
     List<Map<label>> compactMap(Pstream::nProcs());
     mapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             stencil.globalNumbering(),
             stencil_,
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
index e20493679f..94a88c3d9f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ class extendedCentredCellToCellStencil
     // Private Data
 
         //- Swap map for getting neighbouring data
-        autoPtr<mapDistribute> mapPtr_;
+        autoPtr<distributionMap> mapPtr_;
 
         //- Per cell the stencil.
         labelListList stencil_;
@@ -78,7 +78,7 @@ public:
     // Member Functions
 
         //- Return reference to the parallel distribution map
-        const mapDistribute& map() const
+        const distributionMap& map() const
         {
             return mapPtr_();
         }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
index 854e8a562b..26efe04e04 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.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
@@ -42,7 +42,7 @@ void Foam::extendedCellToFaceStencil::writeStencilStats
 (
     Ostream& os,
     const labelListList& stencil,
-    const mapDistribute& map
+    const distributionMap& map
 )
 {
     label sumSize = 0;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
index 6a471dc4fc..aa9d1b08ed 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.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
@@ -48,7 +48,7 @@ SourceFiles
 #ifndef extendedCellToFaceStencil_H
 #define extendedCellToFaceStencil_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 
@@ -79,7 +79,7 @@ protected:
         (
             Ostream& os,
             const labelListList& stencil,
-            const mapDistribute& map
+            const distributionMap& map
         );
 
 
@@ -101,7 +101,7 @@ public:
         template<class T>
         static void collectData
         (
-            const mapDistribute& map,
+            const distributionMap& map,
             const labelListList& stencil,
             const GeometricField<T, fvPatchField, volMesh>& fld,
             List<List<T>>& stencilFld
@@ -112,7 +112,7 @@ public:
         static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         weightedSum
         (
-            const mapDistribute& map,
+            const distributionMap& map,
             const labelListList& stencil,
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             const List<List<scalar>>& stencilWeights
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
index 3ce966e3c7..772d70bde3 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class Type>
 void Foam::extendedCellToFaceStencil::collectData
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const labelListList& stencil,
     const GeometricField<Type, fvPatchField, volMesh>& fld,
     List<List<Type>>& stencilFld
@@ -84,7 +84,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::extendedCellToFaceStencil::weightedSum
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const labelListList& stencil,
     const GeometricField<Type, fvPatchField, volMesh>& fld,
     const List<List<scalar>>& stencilWeights
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
index f9d55de847..d9e85f7d2f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.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,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "extendedCentredCellToFaceStencil.H"
 #include "cellToFaceStencil.H"
 
@@ -41,7 +41,7 @@ Foam::extendedCentredCellToFaceStencil::extendedCentredCellToFaceStencil
     List<Map<label>> compactMap(Pstream::nProcs());
     mapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             stencil.globalNumbering(),
             stencil_,
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
index 44ddbb5620..aa77413edb 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.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
@@ -54,7 +54,7 @@ class extendedCentredCellToFaceStencil
     // Private Data
 
         //- Swap map for getting neighbouring data
-        autoPtr<mapDistribute> mapPtr_;
+        autoPtr<distributionMap> mapPtr_;
 
         //- Per face the stencil.
         labelListList stencil_;
@@ -77,7 +77,7 @@ public:
     // Member Functions
 
         //- Return reference to the parallel distribution map
-        const mapDistribute& map() const
+        const distributionMap& map() const
         {
             return mapPtr_();
         }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
index 248728ad66..8439509ea1 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.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
@@ -427,7 +427,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
         List<Map<label>> compactMap(Pstream::nProcs());
         ownMapPtr_.reset
         (
-            new mapDistribute
+            new distributionMap
             (
                 stencil.globalNumbering(),
                 ownStencil_,
@@ -441,7 +441,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
         List<Map<label>> compactMap(Pstream::nProcs());
         neiMapPtr_.reset
         (
-            new mapDistribute
+            new distributionMap
             (
                 stencil.globalNumbering(),
                 neiStencil_,
@@ -536,7 +536,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
         List<Map<label>> compactMap(Pstream::nProcs());
         ownMapPtr_.reset
         (
-            new mapDistribute
+            new distributionMap
             (
                 stencil.globalNumbering(),
                 ownStencil_,
@@ -582,7 +582,7 @@ Foam::extendedUpwindCellToFaceStencil::extendedUpwindCellToFaceStencil
     }
 
     // Should compact schedule. Or have both return the same schedule.
-    neiMapPtr_.reset(new mapDistribute(ownMapPtr_()));
+    neiMapPtr_.reset(new distributionMap(ownMapPtr_()));
 }
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
index 03788e09e8..f877b441e3 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.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
@@ -67,8 +67,8 @@ class extendedUpwindCellToFaceStencil
         const bool pureUpwind_;
 
         //- Swap map for getting neighbouring data
-        autoPtr<mapDistribute> ownMapPtr_;
-        autoPtr<mapDistribute> neiMapPtr_;
+        autoPtr<distributionMap> ownMapPtr_;
+        autoPtr<distributionMap> neiMapPtr_;
 
         //- Per face the stencil.
         labelListList ownStencil_;
@@ -149,13 +149,13 @@ public:
         }
 
         //- Return reference to the parallel distribution map
-        const mapDistribute& ownMap() const
+        const distributionMap& ownMap() const
         {
             return ownMapPtr_();
         }
 
         //- Return reference to the parallel distribution map
-        const mapDistribute& neiMap() const
+        const distributionMap& neiMap() const
         {
             return neiMapPtr_();
         }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
index 7112ca73ae..edf527ecd4 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.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
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "extendedCentredFaceToCellStencil.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "faceToCellStencil.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -41,7 +41,7 @@ Foam::extendedCentredFaceToCellStencil::extendedCentredFaceToCellStencil
     List<Map<label>> compactMap(Pstream::nProcs());
     mapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             stencil.globalNumbering(),
             stencil_,
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
index e999d80555..18c6cd1f07 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.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
@@ -54,7 +54,7 @@ class extendedCentredFaceToCellStencil
     // Private Data
 
         //- Swap map for getting neighbouring data
-        autoPtr<mapDistribute> mapPtr_;
+        autoPtr<distributionMap> mapPtr_;
 
         //- Per face the stencil.
         labelListList stencil_;
@@ -77,7 +77,7 @@ public:
     // Member Functions
 
         //- Return reference to the parallel distribution map
-        const mapDistribute& map() const
+        const distributionMap& map() const
         {
             return mapPtr_();
         }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
index 1baea396cf..59fde4596d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.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
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef extendedFaceToCellStencil_H
 #define extendedFaceToCellStencil_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 
@@ -74,7 +74,7 @@ public:
         template<class T>
         static void collectData
         (
-            const mapDistribute& map,
+            const distributionMap& map,
             const labelListList& stencil,
             const GeometricField<T, fvsPatchField, surfaceMesh>& fld,
             List<List<T>>& stencilFld
@@ -84,7 +84,7 @@ public:
         template<class Type>
         static tmp<GeometricField<Type, fvPatchField, volMesh>> weightedSum
         (
-            const mapDistribute& map,
+            const distributionMap& map,
             const labelListList& stencil,
             const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
             const List<List<scalar>>& stencilWeights
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
index d046c587a4..04e02f99c3 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class Type>
 void Foam::extendedFaceToCellStencil::collectData
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const labelListList& stencil,
     const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
     List<List<Type>>& stencilFld
@@ -81,7 +81,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::extendedFaceToCellStencil::weightedSum
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const labelListList& stencil,
     const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
     const List<List<scalar>>& stencilWeights
diff --git a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.C b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.C
index c9b9526ac3..7dacb8df6b 100644
--- a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.C
+++ b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.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
@@ -174,7 +174,7 @@ void Foam::fvCellSet::updateMesh(const mapPolyMesh&)
 }
 
 
-void Foam::fvCellSet::distribute(const mapDistributePolyMesh&)
+void Foam::fvCellSet::distribute(const polyMeshDistributionMap&)
 {
     setCells();
     setV();
diff --git a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H
index ad57c6ba41..4cacd31737 100644
--- a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H
+++ b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.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
@@ -70,7 +70,7 @@ namespace Foam
 {
 
 class fvMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                         Class fvCellSet Declaration
@@ -170,7 +170,7 @@ public:
             void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            void distribute(const mapDistributePolyMesh&);
+            void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             void movePoints();
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index a277d17b7b..28601572b1 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -934,7 +934,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fvMesh::distribute(const mapDistributePolyMesh& map)
+void Foam::fvMesh::distribute(const polyMeshDistributionMap& map)
 {
     // Distribute polyMesh data
     polyMesh::distribute(map);
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 7b16ec47bc..4af02dce72 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -74,7 +74,7 @@ class fvMeshTopoChanger;
 class fvMeshDistributor;
 class fvMeshMover;
 class volMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                            Class fvMesh Declaration
@@ -384,7 +384,7 @@ public:
             virtual void updateMesh(const mapPolyMesh& map);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh& map);
+            virtual void distribute(const polyMeshDistributionMap& map);
 
             //- Move points, returns volumes swept by faces in motion
             virtual tmp<scalarField> movePoints(const pointField&);
diff --git a/src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributor.H b/src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributor.H
index c17eab3a60..e4567b61eb 100644
--- a/src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributor.H
+++ b/src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&) = 0;
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&) = 0;
+        virtual void distribute(const polyMeshDistributionMap&) = 0;
 
         //- Write the mover state
         virtual bool write(const bool write = true) const
diff --git a/src/finiteVolume/fvMesh/fvMeshDistributors/none/fvMeshDistributorsNone.H b/src/finiteVolume/fvMesh/fvMeshDistributors/none/fvMeshDistributorsNone.H
index a9425fa0b4..898ddfaff3 100644
--- a/src/finiteVolume/fvMesh/fvMeshDistributors/none/fvMeshDistributorsNone.H
+++ b/src/finiteVolume/fvMesh/fvMeshDistributors/none/fvMeshDistributorsNone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ public:
         {}
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&)
+        virtual void distribute(const polyMeshDistributionMap&)
         {}
 
 
diff --git a/src/finiteVolume/fvMesh/fvMeshMovers/fvMeshMover/fvMeshMover.H b/src/finiteVolume/fvMesh/fvMeshMovers/fvMeshMover/fvMeshMover.H
index c76f9f294c..f8c51300c4 100644
--- a/src/finiteVolume/fvMesh/fvMeshMovers/fvMeshMover/fvMeshMover.H
+++ b/src/finiteVolume/fvMesh/fvMeshMovers/fvMeshMover/fvMeshMover.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&) = 0;
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&) = 0;
+        virtual void distribute(const polyMeshDistributionMap&) = 0;
 
         //- Write the mover state
         virtual bool write(const bool write = true) const
diff --git a/src/finiteVolume/fvMesh/fvMeshMovers/none/fvMeshMoversNone.H b/src/finiteVolume/fvMesh/fvMeshMovers/none/fvMeshMoversNone.H
index 1c6d7ae215..e556669622 100644
--- a/src/finiteVolume/fvMesh/fvMeshMovers/none/fvMeshMoversNone.H
+++ b/src/finiteVolume/fvMesh/fvMeshMovers/none/fvMeshMoversNone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ public:
         {}
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&)
+        virtual void distribute(const polyMeshDistributionMap&)
         {}
 
 
diff --git a/src/finiteVolume/fvMesh/fvMeshTopoChangers/fvMeshTopoChanger/fvMeshTopoChanger.H b/src/finiteVolume/fvMesh/fvMeshTopoChangers/fvMeshTopoChanger/fvMeshTopoChanger.H
index 4660383777..d0a67d865a 100644
--- a/src/finiteVolume/fvMesh/fvMeshTopoChangers/fvMeshTopoChanger/fvMeshTopoChanger.H
+++ b/src/finiteVolume/fvMesh/fvMeshTopoChangers/fvMeshTopoChanger/fvMeshTopoChanger.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&) = 0;
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&) = 0;
+        virtual void distribute(const polyMeshDistributionMap&) = 0;
 
         //- Write the mover state
         virtual bool write(const bool write = true) const
diff --git a/src/finiteVolume/fvMesh/fvMeshTopoChangers/none/fvMeshTopoChangersNone.H b/src/finiteVolume/fvMesh/fvMeshTopoChangers/none/fvMeshTopoChangersNone.H
index d1816f060c..aff64040c6 100644
--- a/src/finiteVolume/fvMesh/fvMeshTopoChangers/none/fvMeshTopoChangersNone.H
+++ b/src/finiteVolume/fvMesh/fvMeshTopoChangers/none/fvMeshTopoChangersNone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ public:
         {}
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&)
+        virtual void distribute(const polyMeshDistributionMap&)
         {}
 
 
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
index 8833afbb54..b94009b500 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
@@ -94,7 +94,7 @@ void Foam::nearWallDist::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::nearWallDist::distribute(const mapDistributePolyMesh& map)
+void Foam::nearWallDist::distribute(const polyMeshDistributionMap& map)
 {
     correct();
 }
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
index d6be54c109..17a9e1b3c4 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
@@ -97,7 +97,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update the y-field when the mesh moves
         virtual bool movePoints();
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
index 5600bce958..1216a5ff8d 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,7 @@ public:
         {}
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&)
+        virtual void distribute(const polyMeshDistributionMap&)
         {}
 
         //- Update cached geometry when the mesh moves
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index d64dc4ee6b..3cbcc2f1ac 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -184,7 +184,7 @@ void Foam::wallDist::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::wallDist::distribute(const mapDistributePolyMesh& map)
+void Foam::wallDist::distribute(const polyMeshDistributionMap& map)
 {
     pdm_->distribute(map);
     movePoints();
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
index 461b1022c2..8bb911cbf7 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,7 +149,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update the y-field when the mesh moves
         virtual bool movePoints();
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
index 829b844ed7..8bef06b7e0 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.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
@@ -146,7 +146,7 @@ void Foam::pointConstraints::makePatchPatchAddressing()
     {
         const globalMeshData& gd = mesh.globalData();
         const labelListList& globalPointSlaves = gd.globalPointSlaves();
-        const mapDistribute& globalPointSlavesMap = gd.globalPointSlavesMap();
+        const distributionMap& globalPointSlavesMap = gd.globalPointSlavesMap();
         const Map<label>& cpPointMap = gd.coupledPatch().meshPointMap();
         const labelList& cpMeshPoints = gd.coupledPatch().meshPoints();
 
@@ -371,7 +371,7 @@ void Foam::pointConstraints::updateMesh(const mapPolyMesh&)
 }
 
 
-void Foam::pointConstraints::distribute(const mapDistributePolyMesh& map)
+void Foam::pointConstraints::distribute(const polyMeshDistributionMap& map)
 {
     FatalErrorInFunction << abort(FatalError);
     makePatchPatchAddressing();
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
index 05e9cb5663..1ef9e08fd7 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.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
@@ -54,7 +54,7 @@ namespace Foam
 {
 
 class polyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                       Class pointConstraints Declaration
@@ -133,7 +133,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
 
         // Interpolation functions
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
index cc2242afed..63e2afa1cf 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraintsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ void Foam::pointConstraints::syncUntransformedData
     const indirectPrimitivePatch& cpp = gmd.coupledPatch();
     const labelList& meshPoints = cpp.meshPoints();
 
-    const mapDistribute& slavesMap = gmd.globalCoPointSlavesMap();
+    const distributionMap& slavesMap = gmd.globalCoPointSlavesMap();
     const labelListList& slaves = gmd.globalCoPointSlaves();
 
     List<Type> elems(slavesMap.constructSize());
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 69f6d5ad52..1f3d3ba5db 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.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
@@ -43,7 +43,7 @@ void Foam::volPointInterpolation::pushUntransformedData
     const indirectPrimitivePatch& cpp = gmd.coupledPatch();
     const labelList& meshPoints = cpp.meshPoints();
 
-    const mapDistribute& slavesMap = gmd.globalCoPointSlavesMap();
+    const distributionMap& slavesMap = gmd.globalCoPointSlavesMap();
     const labelListList& slaves = gmd.globalCoPointSlaves();
 
     List<Type> elems(slavesMap.constructSize());
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
index 05aaaccd6a..f238a91f76 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.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
@@ -368,7 +368,7 @@ void Foam::volPointInterpolation::updateMesh(const mapPolyMesh&)
 }
 
 
-void Foam::volPointInterpolation::distribute(const mapDistributePolyMesh&)
+void Foam::volPointInterpolation::distribute(const polyMeshDistributionMap&)
 {
     makeWeights();
 }
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index 88d070b07b..a1808d112a 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.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
@@ -141,7 +141,7 @@ public:
             void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Correct weighting factors for moving mesh.
             bool movePoints();
diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.C b/src/functionObjects/field/nearWallFields/nearWallFields.C
index 7964ea7f68..4b1fa93d55 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/functionObjects/field/nearWallFields/nearWallFields.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
@@ -148,7 +148,7 @@ void Foam::functionObjects::nearWallFields::calcAddressing()
     List<Map<label>> compactMap;
     getPatchDataMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalWalls,
             cellToWalls_,
diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.H b/src/functionObjects/field/nearWallFields/nearWallFields.H
index adb6bcff5e..b508e8d8a3 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/functionObjects/field/nearWallFields/nearWallFields.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
@@ -127,7 +127,7 @@ protected:
             List<List<point>> cellToSamples_;
 
             //- Map from cell based data back to patch based data
-            autoPtr<mapDistribute> getPatchDataMapPtr_;
+            autoPtr<distributionMap> getPatchDataMapPtr_;
 
 
         // Locally constructed fields
diff --git a/src/functionObjects/field/streamlines/streamlines.C b/src/functionObjects/field/streamlines/streamlines.C
index 788f1f7488..bfcde3f05e 100644
--- a/src/functionObjects/field/streamlines/streamlines.C
+++ b/src/functionObjects/field/streamlines/streamlines.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
@@ -31,7 +31,7 @@ License
 #include "meshSearch.H"
 #include "sampledSet.H"
 #include "globalIndex.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "interpolationCellPoint.H"
 #include "PatchTools.H"
 #include "mapPolyMesh.H"
diff --git a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index e8c3055fe5..646054dfee 100644
--- a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -200,7 +200,7 @@ void Foam::fv::fixedTemperatureConstraint::updateMesh(const mapPolyMesh& map)
 
 void Foam::fv::fixedTemperatureConstraint::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);
diff --git a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index aebd1ebec1..8d2d72dcac 100644
--- a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -164,7 +164,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update for mesh motion
         virtual bool movePoints();
diff --git a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C
index 1cd8e110a5..22d64f031c 100644
--- a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C
+++ b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C
@@ -145,7 +145,7 @@ void Foam::fv::fixedValueConstraint::updateMesh(const mapPolyMesh& map)
 
 void Foam::fv::fixedValueConstraint::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);
diff --git a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H
index 2f0a700310..9533765233 100644
--- a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H
+++ b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H
@@ -131,7 +131,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update for mesh motion
         virtual bool movePoints();
diff --git a/src/fvConstraints/limitMag/limitMag.C b/src/fvConstraints/limitMag/limitMag.C
index 55d8e4727a..578ded560c 100644
--- a/src/fvConstraints/limitMag/limitMag.C
+++ b/src/fvConstraints/limitMag/limitMag.C
@@ -146,7 +146,7 @@ void Foam::fv::limitMag::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::limitMag::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::limitMag::distribute(const polyMeshDistributionMap& map)
 {
     set_.distribute(map);
 }
diff --git a/src/fvConstraints/limitMag/limitMag.H b/src/fvConstraints/limitMag/limitMag.H
index a6b02840d6..534dbd543d 100644
--- a/src/fvConstraints/limitMag/limitMag.H
+++ b/src/fvConstraints/limitMag/limitMag.H
@@ -131,7 +131,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update for mesh motion
         virtual bool movePoints();
diff --git a/src/fvConstraints/limitPressure/limitPressure.C b/src/fvConstraints/limitPressure/limitPressure.C
index aea7acbe9a..b09e2f28f2 100644
--- a/src/fvConstraints/limitPressure/limitPressure.C
+++ b/src/fvConstraints/limitPressure/limitPressure.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -223,7 +223,7 @@ void Foam::fv::limitPressure::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::limitPressure::distribute(const mapDistributePolyMesh&)
+void Foam::fv::limitPressure::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/fvConstraints/limitPressure/limitPressure.H b/src/fvConstraints/limitPressure/limitPressure.H
index e83ad60110..c08a8c1df2 100644
--- a/src/fvConstraints/limitPressure/limitPressure.H
+++ b/src/fvConstraints/limitPressure/limitPressure.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update for mesh motion
         virtual bool movePoints();
diff --git a/src/fvConstraints/limitTemperature/limitTemperature.C b/src/fvConstraints/limitTemperature/limitTemperature.C
index ff4a1511dd..ee24b3a3c0 100644
--- a/src/fvConstraints/limitTemperature/limitTemperature.C
+++ b/src/fvConstraints/limitTemperature/limitTemperature.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -189,7 +189,7 @@ void Foam::fv::limitTemperature::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::limitTemperature::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::limitTemperature::distribute(const polyMeshDistributionMap& map)
 {
     set_.distribute(map);
 }
diff --git a/src/fvConstraints/limitTemperature/limitTemperature.H b/src/fvConstraints/limitTemperature/limitTemperature.H
index 03b04b270d..6e0937fcdd 100644
--- a/src/fvConstraints/limitTemperature/limitTemperature.H
+++ b/src/fvConstraints/limitTemperature/limitTemperature.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update for mesh motion
         virtual bool movePoints();
diff --git a/src/fvConstraints/meanVelocityForce/meanVelocityForce.C b/src/fvConstraints/meanVelocityForce/meanVelocityForce.C
index 6a0eab257e..d8c40ca1f0 100644
--- a/src/fvConstraints/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvConstraints/meanVelocityForce/meanVelocityForce.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
@@ -254,7 +254,7 @@ void Foam::fv::meanVelocityForce::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::meanVelocityForce::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::meanVelocityForce::distribute(const polyMeshDistributionMap& map)
 {
     set_.distribute(map);
 }
diff --git a/src/fvConstraints/meanVelocityForce/meanVelocityForce.H b/src/fvConstraints/meanVelocityForce/meanVelocityForce.H
index 2c4c6faeb4..dcc5d8a5e2 100644
--- a/src/fvConstraints/meanVelocityForce/meanVelocityForce.H
+++ b/src/fvConstraints/meanVelocityForce/meanVelocityForce.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
@@ -159,7 +159,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update for mesh motion
         virtual bool movePoints();
diff --git a/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.C b/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.C
index 6d7dd03586..b3146b54fe 100644
--- a/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.C
+++ b/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.C
@@ -26,7 +26,7 @@ License
 #include "fvMeshDistributorsDistributor.H"
 #include "decompositionMethod.H"
 #include "fvMeshDistribute.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -71,7 +71,7 @@ void Foam::fvMeshDistributors::distributor::distribute
     fvMeshDistribute distributor(mesh);
 
     // Do actual sending/receiving of mesh
-    autoPtr<mapDistributePolyMesh> map
+    autoPtr<polyMeshDistributionMap> map
     (
         distributor.distribute(distribution)
     );
@@ -160,7 +160,7 @@ void Foam::fvMeshDistributors::distributor::updateMesh(const mapPolyMesh&)
 
 void Foam::fvMeshDistributors::distributor::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {}
 
diff --git a/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.H b/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.H
index 115c636984..d8940d37a6 100644
--- a/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.H
+++ b/src/fvMeshDistributors/distributor/fvMeshDistributorsDistributor.H
@@ -128,7 +128,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Writing
diff --git a/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.C b/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.C
index a1e505fdee..e340962e93 100644
--- a/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.C
+++ b/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ void Foam::fvMeshMovers::layeredEngine::updateMesh(const mapPolyMesh&)
 
 void Foam::fvMeshMovers::layeredEngine::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {
     NotImplemented;
diff --git a/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.H b/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.H
index ce1e1fb664..081b2b7477 100644
--- a/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.H
+++ b/src/fvMeshMovers/engine/layered/fvMeshMoversLayeredEngine.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C b/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C
index 512b40b8c4..d8299ff05a 100644
--- a/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C
+++ b/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ void Foam::fvMeshMovers::inkJet::updateMesh(const mapPolyMesh&)
 
 void Foam::fvMeshMovers::inkJet::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {
     NotImplemented;
diff --git a/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H b/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H
index 35dc569a36..8bba961e86 100644
--- a/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H
+++ b/src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C b/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C
index 8d0c72a16f..d15fceb4e0 100644
--- a/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C
+++ b/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ void Foam::fvMeshMovers::interpolator::updateMesh(const mapPolyMesh&)
 
 void Foam::fvMeshMovers::interpolator::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {
     NotImplemented;
diff --git a/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.H b/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.H
index 24125b61ab..86229585d3 100644
--- a/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.H
+++ b/src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.C b/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.C
index cdc873752d..3ea7b3ec81 100644
--- a/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.C
+++ b/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ void Foam::fvMeshMovers::motionSolver::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::fvMeshMovers::motionSolver::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     motionPtr_->distribute(map);
diff --git a/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.H b/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.H
index c5c49dcf44..e6308fac25 100644
--- a/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.H
+++ b/src/fvMeshMovers/motionSolver/fvMeshMoversMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Write the motion solver state
         virtual bool write(const bool write = true) const;
diff --git a/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.H b/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.H
index 711b5bd54d..a5eb6b72a2 100644
--- a/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.H
+++ b/src/fvMeshTopoChangers/linearValveFvMesh/linearValveFvMesh.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
@@ -103,7 +103,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.H b/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.H
index 10fd68bcc0..6df4e7bb8f 100644
--- a/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.H
+++ b/src/fvMeshTopoChangers/linearValveLayersFvMesh/linearValveLayersFvMesh.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
@@ -100,7 +100,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/fvMeshTopoChangers/mixerFvMesh/mixerFvMesh.H b/src/fvMeshTopoChangers/mixerFvMesh/mixerFvMesh.H
index 30a76afe89..86dcc3c32c 100644
--- a/src/fvMeshTopoChangers/mixerFvMesh/mixerFvMesh.H
+++ b/src/fvMeshTopoChangers/mixerFvMesh/mixerFvMesh.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
@@ -114,7 +114,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.C b/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.C
index 2f39e8306c..b5b878b3be 100644
--- a/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.C
+++ b/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.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
@@ -390,7 +390,7 @@ void Foam::fvMeshTopoChangers::movingCone::updateMesh(const mapPolyMesh& map)
 
 void Foam::fvMeshTopoChangers::movingCone::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {}
 
diff --git a/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.H b/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.H
index d63f2d2a5e..6ea4800e39 100644
--- a/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.H
+++ b/src/fvMeshTopoChangers/movingCone/fvMeshTopoChangersMovingCone.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
@@ -125,7 +125,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C
index 9963510c9c..855799b914 100644
--- a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.C
+++ b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.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
@@ -172,7 +172,7 @@ void Foam::fvMeshTopoChangers::raw::updateMesh(const mapPolyMesh& map)
 
 void Foam::fvMeshTopoChangers::raw::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {}
 
diff --git a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.H b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.H
index c8d3dad1c0..d207b9313c 100644
--- a/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.H
+++ b/src/fvMeshTopoChangers/raw/fvMeshTopoChangersRaw.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
@@ -104,7 +104,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
index 04499265a7..4557a4d3a8 100644
--- a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
+++ b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.C
@@ -1676,7 +1676,7 @@ void Foam::fvMeshTopoChangers::refiner::updateMesh(const mapPolyMesh& map)
 
 void Foam::fvMeshTopoChangers::refiner::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     // Redistribute the mesh cutting engine
diff --git a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
index 068af9ecfb..2f92b3ef5e 100644
--- a/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
+++ b/src/fvMeshTopoChangers/refiner/fvMeshTopoChangersRefiner.H
@@ -367,7 +367,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Writing
diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.C b/src/fvModels/derived/accelerationSource/accelerationSource.C
index 7ba6420f55..ac7d6ffa9e 100644
--- a/src/fvModels/derived/accelerationSource/accelerationSource.C
+++ b/src/fvModels/derived/accelerationSource/accelerationSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,10 @@ void Foam::fv::accelerationSource::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::accelerationSource::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::accelerationSource::distribute
+(
+    const polyMeshDistributionMap& map
+)
 {
     set_.distribute(map);
 }
diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.H b/src/fvModels/derived/accelerationSource/accelerationSource.H
index 10c740b512..473916573f 100644
--- a/src/fvModels/derived/accelerationSource/accelerationSource.H
+++ b/src/fvModels/derived/accelerationSource/accelerationSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,7 +169,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C
index 9a89ba9919..40f97f77bc 100644
--- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C
@@ -212,7 +212,10 @@ void Foam::fv::actuationDiskSource::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::actuationDiskSource::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::actuationDiskSource::distribute
+(
+    const polyMeshDistributionMap& map
+)
 {
     set_.distribute(map);
 }
diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H
index bc5f308b34..32e608923a 100644
--- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H
@@ -208,7 +208,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C
index 893fd2768d..95a2932f61 100644
--- a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C
+++ b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ void Foam::fv::buoyancyEnergy::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::buoyancyEnergy::distribute(const mapDistributePolyMesh&)
+void Foam::fv::buoyancyEnergy::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H
index 13c2dc1a19..f24f3ad8a0 100644
--- a/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H
+++ b/src/fvModels/derived/buoyancyEnergy/buoyancyEnergy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/buoyancyForce/buoyancyForce.C b/src/fvModels/derived/buoyancyForce/buoyancyForce.C
index 3b283d088d..21162f7740 100644
--- a/src/fvModels/derived/buoyancyForce/buoyancyForce.C
+++ b/src/fvModels/derived/buoyancyForce/buoyancyForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ void Foam::fv::buoyancyForce::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::buoyancyForce::distribute(const mapDistributePolyMesh&)
+void Foam::fv::buoyancyForce::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/fvModels/derived/buoyancyForce/buoyancyForce.H b/src/fvModels/derived/buoyancyForce/buoyancyForce.H
index 106f65c94a..560d328873 100644
--- a/src/fvModels/derived/buoyancyForce/buoyancyForce.H
+++ b/src/fvModels/derived/buoyancyForce/buoyancyForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.C b/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.C
index e34d4d54b5..b54e6183f1 100644
--- a/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.C
+++ b/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ void Foam::fv::isotropicDamping::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::isotropicDamping::distribute(const mapDistributePolyMesh&)
+void Foam::fv::isotropicDamping::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.H b/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.H
index a67f2e71d5..8d06c83bfb 100644
--- a/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.H
+++ b/src/fvModels/derived/damping/isotropicDamping/isotropicDamping.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -171,7 +171,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/damping/verticalDamping/verticalDamping.C b/src/fvModels/derived/damping/verticalDamping/verticalDamping.C
index 0d8decc022..ca65d14869 100644
--- a/src/fvModels/derived/damping/verticalDamping/verticalDamping.C
+++ b/src/fvModels/derived/damping/verticalDamping/verticalDamping.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ void Foam::fv::verticalDamping::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::verticalDamping::distribute(const mapDistributePolyMesh&)
+void Foam::fv::verticalDamping::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/fvModels/derived/damping/verticalDamping/verticalDamping.H b/src/fvModels/derived/damping/verticalDamping/verticalDamping.H
index 6fbf0e4156..c81da23a28 100644
--- a/src/fvModels/derived/damping/verticalDamping/verticalDamping.H
+++ b/src/fvModels/derived/damping/verticalDamping/verticalDamping.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,7 +176,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index e19544020f..5bce4a549e 100644
--- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.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
@@ -322,7 +322,7 @@ void Foam::fv::effectivenessHeatExchangerSource::updateMesh
 
 void Foam::fv::effectivenessHeatExchangerSource::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);
diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index cb288c228b..c9c845521a 100644
--- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.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
@@ -221,7 +221,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Update for mesh motion
         virtual bool movePoints();
diff --git a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C
index 8a59ebb777..a159485bfb 100644
--- a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ void Foam::fv::explicitPorositySource::updateMesh(const mapPolyMesh& map)
 
 void Foam::fv::explicitPorositySource::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);
diff --git a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H
index 2c4a8a373f..d07506bebf 100644
--- a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H
+++ b/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,7 +182,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/heatSource/heatSource.C b/src/fvModels/derived/heatSource/heatSource.C
index cc4c17c9bc..fbf522f5a0 100644
--- a/src/fvModels/derived/heatSource/heatSource.C
+++ b/src/fvModels/derived/heatSource/heatSource.C
@@ -156,7 +156,7 @@ void Foam::fv::heatSource::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::heatSource::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::heatSource::distribute(const polyMeshDistributionMap& map)
 {
     set_.distribute(map);
 }
diff --git a/src/fvModels/derived/heatSource/heatSource.H b/src/fvModels/derived/heatSource/heatSource.H
index 586eecd763..40c619e639 100644
--- a/src/fvModels/derived/heatSource/heatSource.H
+++ b/src/fvModels/derived/heatSource/heatSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/heatTransfer/heatTransfer.C b/src/fvModels/derived/heatTransfer/heatTransfer.C
index af210ffeb6..1e417d297a 100644
--- a/src/fvModels/derived/heatTransfer/heatTransfer.C
+++ b/src/fvModels/derived/heatTransfer/heatTransfer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -165,7 +165,7 @@ void Foam::fv::heatTransfer::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::heatTransfer::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::heatTransfer::distribute(const polyMeshDistributionMap& map)
 {
     set_.distribute(map);
 }
diff --git a/src/fvModels/derived/heatTransfer/heatTransfer.H b/src/fvModels/derived/heatTransfer/heatTransfer.H
index 0f7a1eaff1..ac95798902 100644
--- a/src/fvModels/derived/heatTransfer/heatTransfer.H
+++ b/src/fvModels/derived/heatTransfer/heatTransfer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,7 +179,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/massSource/massSource.C b/src/fvModels/derived/massSource/massSource.C
index 839bbfd76a..14f47db9ba 100644
--- a/src/fvModels/derived/massSource/massSource.C
+++ b/src/fvModels/derived/massSource/massSource.C
@@ -273,7 +273,7 @@ void Foam::fv::massSource::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::massSource::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::massSource::distribute(const polyMeshDistributionMap& map)
 {
     set_.distribute(map);
 }
diff --git a/src/fvModels/derived/massSource/massSource.H b/src/fvModels/derived/massSource/massSource.H
index b072f19924..bfa0e932c7 100644
--- a/src/fvModels/derived/massSource/massSource.H
+++ b/src/fvModels/derived/massSource/massSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
index e07ee01cf8..952bf1e32f 100644
--- a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
+++ b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,10 @@ void Foam::fv::phaseLimitStabilisation::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::phaseLimitStabilisation::distribute(const mapDistributePolyMesh&)
+void Foam::fv::phaseLimitStabilisation::distribute
+(
+    const polyMeshDistributionMap&
+)
 {}
 
 
diff --git a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H
index 968232a8f4..9be5a9aa77 100644
--- a/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H
+++ b/src/fvModels/derived/phaseLimitStabilisation/phaseLimitStabilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C
index 25978adcef..fbb254cdcb 100644
--- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.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
@@ -636,7 +636,7 @@ void Foam::fv::rotorDiskSource::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::rotorDiskSource::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::rotorDiskSource::distribute(const polyMeshDistributionMap& map)
 {
     set_.distribute(map);
 }
diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H
index 2645d75d27..8538f990fd 100644
--- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.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
@@ -342,7 +342,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
index 1ee6258b8e..322e60dc0d 100644
--- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
+++ b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,7 +182,7 @@ void Foam::fv::sixDoFAccelerationSource::updateMesh(const mapPolyMesh&)
 
 void Foam::fv::sixDoFAccelerationSource::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {}
 
diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H
index 5b0f16c549..2cf7ffa829 100644
--- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H
+++ b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,7 +163,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
index 2f481b7df5..11fe9ff318 100644
--- a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
+++ b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,7 +194,7 @@ void Foam::fv::solidEquilibriumEnergySource::updateMesh(const mapPolyMesh&)
 
 void Foam::fv::solidEquilibriumEnergySource::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {}
 
diff --git a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H
index 87b119ab9e..360d8cea71 100644
--- a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H
+++ b/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,7 +159,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C
index aee7b48fac..a434528c48 100644
--- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -364,7 +364,7 @@ void Foam::fv::solidificationMeltingSource::updateMesh(const mapPolyMesh& map)
 
 void Foam::fv::solidificationMeltingSource::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);
diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H
index 812936cdeb..bb0ba534b2 100644
--- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -308,7 +308,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C
index 2a6e9cf2ee..d28f0cae10 100644
--- a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C
+++ b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -322,7 +322,7 @@ void Foam::fv::volumeFractionSource::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::volumeFractionSource::distribute(const mapDistributePolyMesh&)
+void Foam::fv::volumeFractionSource::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H
index a4fcdf1416..4a0d5444d3 100644
--- a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H
+++ b/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -236,7 +236,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/general/codedFvModel/codedFvModel.C b/src/fvModels/general/codedFvModel/codedFvModel.C
index 7b8dc13e4f..9464c4316e 100644
--- a/src/fvModels/general/codedFvModel/codedFvModel.C
+++ b/src/fvModels/general/codedFvModel/codedFvModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -262,7 +262,7 @@ void Foam::fv::codedFvModel::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::codedFvModel::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::codedFvModel::distribute(const polyMeshDistributionMap& map)
 {
     redirectFvModel().distribute(map);
 }
diff --git a/src/fvModels/general/codedFvModel/codedFvModel.H b/src/fvModels/general/codedFvModel/codedFvModel.H
index 9b1a5fc92e..df69efb645 100644
--- a/src/fvModels/general/codedFvModel/codedFvModel.H
+++ b/src/fvModels/general/codedFvModel/codedFvModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
index 12abc7d7e0..109cce2ac3 100644
--- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
+++ b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C
@@ -240,7 +240,10 @@ void Foam::fv::semiImplicitSource::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fv::semiImplicitSource::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::semiImplicitSource::distribute
+(
+    const polyMeshDistributionMap& map
+)
 {
     set_.distribute(map);
 }
diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.H b/src/fvModels/general/semiImplicitSource/semiImplicitSource.H
index a66ee45351..617419c511 100644
--- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.H
+++ b/src/fvModels/general/semiImplicitSource/semiImplicitSource.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
@@ -224,7 +224,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index 45d40dd7a3..2971a6bd78 100644
--- a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -169,7 +169,7 @@ void Foam::fv::interRegionExplicitPorositySource::updateMesh(const mapPolyMesh&)
 
 void Foam::fv::interRegionExplicitPorositySource::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {}
 
diff --git a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
index 2be0526364..0a4eedf8b0 100644
--- a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
+++ b/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C
index 1d31729f26..cc2892377c 100644
--- a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C
+++ b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.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
@@ -216,7 +216,10 @@ void Foam::fv::interRegionHeatTransfer::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::interRegionHeatTransfer::distribute(const mapDistributePolyMesh&)
+void Foam::fv::interRegionHeatTransfer::distribute
+(
+    const polyMeshDistributionMap&
+)
 {}
 
 
diff --git a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H
index aa1cb6dad6..5bb123daf4 100644
--- a/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.H
+++ b/src/fvModels/interRegion/interRegionHeatTransfer/interRegionHeatTransfer.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
@@ -188,7 +188,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 0a78b1b8e2..2254407e26 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.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
@@ -274,7 +274,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
 
     preDistributionCellMapSize = procToDistributeCellTo.size();
 
-    // Rebuild mapDistribute with only required referred cells
+    // Rebuild distributionMap with only required referred cells
     buildMap(cellMapPtr_, procToDistributeCellTo);
 
     // Store cellIndexAndTransformToDistribute
@@ -494,7 +494,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
 
     preDistributionWallFaceMapSize = procToDistributeWallFaceTo.size();
 
-    // Rebuild mapDistribute with only required referred wallFaces
+    // Rebuild distributionMap with only required referred wallFaces
     buildMap(wallFaceMapPtr_, procToDistributeWallFaceTo);
 
     // Store wallFaceIndexAndTransformToDistribute
@@ -828,7 +828,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
 template<class ParticleType>
 void Foam::InteractionLists<ParticleType>::buildMap
 (
-    autoPtr<mapDistribute>& mapPtr,
+    autoPtr<distributionMap>& mapPtr,
     const List<label>& toProc
 )
 {
@@ -898,7 +898,7 @@ void Foam::InteractionLists<ParticleType>::buildMap
 
     mapPtr.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             constructSize,
             move(sendMap),
@@ -1187,7 +1187,7 @@ void Foam::InteractionLists<ParticleType>::sendReferredData
         }
     }
 
-    // Using the mapDistribute to start sending and receiving the
+    // Using the distributionMap to start sending and receiving the
     // buffer but not block, i.e. it is calling
     //     pBufs.finishedSends(false);
     wallFaceMap().send(pBufs, referredWallData_);
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.H b/src/lagrangian/basic/InteractionLists/InteractionLists.H
index ea1ed11d71..93df6d6c5f 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ SourceFiles
 
 #include "polyMesh.H"
 #include "referredWallFace.H"
-//#include "mapDistribute.H"
+//#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -70,7 +70,7 @@ namespace Foam
 {
 
 class globalIndexAndTransform;
-class mapDistribute;
+class distributionMap;
 
 /*---------------------------------------------------------------------------*\
                       Class InteractionLists Declaration
@@ -91,11 +91,11 @@ class InteractionLists
         //  with the referred particles, hence gets written out
         const Switch writeCloud_;
 
-        //- mapDistribute to exchange referred particles into referred cells
-        autoPtr<mapDistribute> cellMapPtr_;
+        //- distributionMap to exchange referred particles into referred cells
+        autoPtr<distributionMap> cellMapPtr_;
 
-        //- mapDistribute to exchange wall face data
-        autoPtr<mapDistribute> wallFaceMapPtr_;
+        //- distributionMap to exchange wall face data
+        autoPtr<distributionMap> wallFaceMapPtr_;
 
         //- Maximum distance over which interactions will be detected
         scalar maxDistance_;
@@ -166,11 +166,11 @@ class InteractionLists
             List<label>& extendedProcBbsOrigProc
         );
 
-        //- Build the mapDistribute from information about which entry
+        //- Build the distributionMap from information about which entry
         //  is to be sent to which processor
         void buildMap
         (
-            autoPtr<mapDistribute>& mapPtr,
+            autoPtr<distributionMap>& mapPtr,
             const List<label>& toProc
         );
 
@@ -249,10 +249,10 @@ public:
             inline const polyMesh& mesh() const;
 
             //- Return access to the cellMap
-            inline const mapDistribute& cellMap() const;
+            inline const distributionMap& cellMap() const;
 
             //- Return access to the wallFaceMap
-            inline const mapDistribute& wallFaceMap() const;
+            inline const distributionMap& wallFaceMap() const;
 
             //- Return access to the direct interaction list
             inline const labelListList& dil() const;
diff --git a/src/lagrangian/basic/InteractionLists/InteractionListsI.H b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
index 26d7714c4b..5e6d867b1c 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionListsI.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionListsI.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
@@ -35,7 +35,7 @@ const Foam::polyMesh& Foam::InteractionLists<ParticleType>::mesh() const
 
 
 template<class ParticleType>
-const Foam::mapDistribute&
+const Foam::distributionMap&
 Foam::InteractionLists<ParticleType>::cellMap() const
 {
     return cellMapPtr_();
@@ -43,7 +43,7 @@ Foam::InteractionLists<ParticleType>::cellMap() const
 
 
 template<class ParticleType>
-const Foam::mapDistribute&
+const Foam::distributionMap&
 Foam::InteractionLists<ParticleType>::wallFaceMap() const
 {
     return wallFaceMapPtr_();
diff --git a/src/lagrangian/parcel/fvModels/clouds/clouds.C b/src/lagrangian/parcel/fvModels/clouds/clouds.C
index 344adecf64..2c1eaadf4c 100644
--- a/src/lagrangian/parcel/fvModels/clouds/clouds.C
+++ b/src/lagrangian/parcel/fvModels/clouds/clouds.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -334,7 +334,7 @@ void Foam::fv::clouds::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::clouds::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::clouds::distribute(const polyMeshDistributionMap& map)
 {
     cloudsPtr_().distribute(map);
 }
diff --git a/src/lagrangian/parcel/fvModels/clouds/clouds.H b/src/lagrangian/parcel/fvModels/clouds/clouds.H
index 44d0d50be3..ed306f20f1 100644
--- a/src/lagrangian/parcel/fvModels/clouds/clouds.H
+++ b/src/lagrangian/parcel/fvModels/clouds/clouds.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/lagrangian/parcel/parcelCloud/parcelCloud.H b/src/lagrangian/parcel/parcelCloud/parcelCloud.H
index ed72ad495f..65cf40e3b9 100644
--- a/src/lagrangian/parcel/parcelCloud/parcelCloud.H
+++ b/src/lagrangian/parcel/parcelCloud/parcelCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ public:
         virtual void storeGlobalPositions() = 0;
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh& map)
+        virtual void distribute(const polyMeshDistributionMap& map)
         {
             NotImplemented;
         }
diff --git a/src/lagrangian/parcel/parcelCloudList/parcelCloudList.C b/src/lagrangian/parcel/parcelCloudList/parcelCloudList.C
index baf5a8d7a6..dcabb26ab6 100644
--- a/src/lagrangian/parcel/parcelCloudList/parcelCloudList.C
+++ b/src/lagrangian/parcel/parcelCloudList/parcelCloudList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -385,7 +385,7 @@ void Foam::parcelCloudList::storeGlobalPositions()
 }
 
 
-void Foam::parcelCloudList::distribute(const mapDistributePolyMesh& map)
+void Foam::parcelCloudList::distribute(const polyMeshDistributionMap& map)
 {
     forAll(*this, i)
     {
diff --git a/src/lagrangian/parcel/parcelCloudList/parcelCloudList.H b/src/lagrangian/parcel/parcelCloudList/parcelCloudList.H
index d25ff5eb50..38b8030e21 100644
--- a/src/lagrangian/parcel/parcelCloudList/parcelCloudList.H
+++ b/src/lagrangian/parcel/parcelCloudList/parcelCloudList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,7 +177,7 @@ public:
         void storeGlobalPositions();
 
         //- Update mesh corresponding to the given distribution map
-        void distribute(const mapDistributePolyMesh&);
+        void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators
diff --git a/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Dual/Dual.C b/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Dual/Dual.C
index 9604418830..feac358618 100644
--- a/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Dual/Dual.C
+++ b/src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Dual/Dual.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ Foam::AveragingMethods::Dual<Type>::Dual
     (
         volumeDual_,
         plusEqOp<scalar>(),
-        mapDistribute::transform()
+        distributionMap::transform()
     );
 }
 
@@ -111,7 +111,7 @@ void Foam::AveragingMethods::Dual<Type>::syncDualData()
     (
         dataDual_,
         plusEqOp<Type>(),
-        mapDistribute::transform()
+        distributionMap::transform()
     );
 }
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 1b719c2147..b502383ec7 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.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
@@ -38,7 +38,7 @@ License
 #include "indirectPrimitivePatch.H"
 #include "polyTopoChange.H"
 #include "removeCells.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "localPointRegion.H"
 #include "pointMesh.H"
 #include "pointFields.H"
@@ -1372,7 +1372,7 @@ Foam::label Foam::meshRefinement::countHits() const
 //}
 
 
-Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
+Foam::autoPtr<Foam::polyMeshDistributionMap> Foam::meshRefinement::balance
 (
     const bool keepZoneFaces,
     const bool keepBaffles,
@@ -1381,7 +1381,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
     fvMeshDistribute& distributor
 )
 {
-    autoPtr<mapDistributePolyMesh> map;
+    autoPtr<polyMeshDistributionMap> map;
 
     if (Pstream::parRun())
     {
@@ -2303,7 +2303,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMeshRegions
 }
 
 
-void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
+void Foam::meshRefinement::distribute(const polyMeshDistributionMap& map)
 {
     // mesh_ already distributed; distribute my member data
 
@@ -2334,8 +2334,8 @@ void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
 
         forAll(geometry, i)
         {
-            autoPtr<mapDistribute> faceMap;
-            autoPtr<mapDistribute> pointMap;
+            autoPtr<distributionMap> faceMap;
+            autoPtr<distributionMap> pointMap;
             geometry[i].distribute
             (
                 meshBb,
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index c5a200119d..7c5d4cee51 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.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
@@ -60,7 +60,7 @@ namespace Foam
 
 // Class forward declarations
 class fvMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 class decompositionMethod;
 class refinementSurfaces;
 class refinementFeatures;
@@ -694,7 +694,7 @@ public:
             //  keepZoneFaces : find all faceZones from zoned surfaces and keep
             //                  owner and neighbour together
             //  keepBaffles   : find all baffles and keep them together
-            autoPtr<mapDistributePolyMesh> balance
+            autoPtr<polyMeshDistributionMap> balance
             (
                 const bool keepZoneFaces,
                 const bool keepBaffles,
@@ -800,7 +800,7 @@ public:
             autoPtr<mapPolyMesh> refine(const labelList& cellsToRefine);
 
             //- Refine some cells and rebalance
-            autoPtr<mapDistributePolyMesh> refineAndBalance
+            autoPtr<polyMeshDistributionMap> refineAndBalance
             (
                 const string& msg,
                 decompositionMethod& decomposer,
@@ -810,7 +810,7 @@ public:
             );
 
             //- Balance before refining some cells
-            autoPtr<mapDistributePolyMesh> balanceAndRefine
+            autoPtr<polyMeshDistributionMap> balanceAndRefine
             (
                 const string& msg,
                 decompositionMethod& decomposer,
@@ -942,7 +942,7 @@ public:
             );
 
             //- Update local numbering for mesh redistribution
-            void distribute(const mapDistributePolyMesh&);
+            void distribute(const polyMeshDistributionMap&);
 
             //- Update for external change to mesh. changedFaces are in new mesh
             //  face labels.
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index d65cb97f2e..6274c4895c 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -34,7 +34,7 @@ License
 #include "decompositionMethod.H"
 #include "fvMeshDistribute.H"
 #include "polyTopoChange.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "Cloud.H"
 #include "OBJstream.H"
 #include "cellSet.H"
@@ -2264,7 +2264,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::refine
 }
 
 
-Foam::autoPtr<Foam::mapDistributePolyMesh>
+Foam::autoPtr<Foam::polyMeshDistributionMap>
 Foam::meshRefinement::refineAndBalance
 (
     const string& msg,
@@ -2302,7 +2302,7 @@ Foam::meshRefinement::refineAndBalance
     // Load balancing
     // ~~~~~~~~~~~~~~
 
-    autoPtr<mapDistributePolyMesh> distMap;
+    autoPtr<polyMeshDistributionMap> distMap;
 
     if (Pstream::nProcs() > 1)
     {
@@ -2365,7 +2365,7 @@ Foam::meshRefinement::refineAndBalance
 
 
 // Do load balancing followed by refinement of consistent set of cells.
-Foam::autoPtr<Foam::mapDistributePolyMesh>
+Foam::autoPtr<Foam::polyMeshDistributionMap>
 Foam::meshRefinement::balanceAndRefine
 (
     const string& msg,
@@ -2404,7 +2404,7 @@ Foam::meshRefinement::balanceAndRefine
     // Load balancing
     // ~~~~~~~~~~~~~~
 
-    autoPtr<mapDistributePolyMesh> distMap;
+    autoPtr<polyMeshDistributionMap> distMap;
 
     if (Pstream::nProcs() > 1)
     {
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 42800103be..05729cd019 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.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
@@ -40,7 +40,7 @@ Description
 #include "polyTopoChange.H"
 #include "mapPolyMesh.H"
 #include "addPatchCellLayer.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "OBJstream.H"
 #include "layerParameters.H"
 #include "combineFaces.H"
@@ -3587,7 +3587,7 @@ void Foam::snappyLayerDriver::addLayers
         mesh.clearOut();
 
         // Balance. No restriction on face zones and baffles.
-        autoPtr<mapDistributePolyMesh> map = meshRefiner_.balance
+        autoPtr<polyMeshDistributionMap> map = meshRefiner_.balance
         (
             false,
             false,
@@ -3714,7 +3714,7 @@ void Foam::snappyLayerDriver::doLayers
             // Balance mesh (and meshRefinement). Restrict faceZones to
             // be on internal faces only since they will be converted into
             // baffles.
-            autoPtr<mapDistributePolyMesh> map = meshRefiner_.balance
+            autoPtr<polyMeshDistributionMap> map = meshRefiner_.balance
             (
                 true,   // false,    // keepZoneFaces
                 false,
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 604a869aa9..6e38af4c65 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.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
@@ -33,7 +33,7 @@ License
 #include "refinementSurfaces.H"
 #include "refinementFeatures.H"
 #include "refinementRegions.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "unitConversion.H"
 #include "snapParameters.H"
 #include "localPointRegion.H"
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 828425fcd0..3cbeb8efeb 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.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
@@ -188,7 +188,7 @@ void Foam::snappySnapDriver::smoothAndConstrain
             dispSum,
             plusEqOp<point>(),
             vector::zero,
-            mapDistribute::transform()
+            distributionMap::transform()
         );
         syncTools::syncPointList
         (
@@ -197,7 +197,7 @@ void Foam::snappySnapDriver::smoothAndConstrain
             dispCount,
             plusEqOp<label>(),
             label(0),
-            mapDistribute::transform()
+            distributionMap::transform()
         );
 
         // Constraints
@@ -584,7 +584,7 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
         pointFaceSurfNormals,
         listPlusEqOp<point>(),
         List<point>(),
-        mapDistribute::transform()
+        distributionMap::transform()
     );
     syncTools::syncPointList
     (
@@ -593,7 +593,7 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
         pointFaceDisp,
         listPlusEqOp<point>(),
         List<point>(),
-        mapDistribute::transform()
+        distributionMap::transform()
     );
     syncTools::syncPointList
     (
@@ -602,7 +602,7 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
         pointFaceCentres,
         listPlusEqOp<point>(),
         List<point>(),
-        mapDistribute::transformPosition()
+        distributionMap::transformPosition()
     );
     syncTools::syncPointList
     (
@@ -2228,7 +2228,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
             edgeFaceNormals,
             listPlusEqOp<point>(),
             List<point>(),
-            mapDistribute::transform()
+            distributionMap::transform()
         );
     }
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index 137005c1e5..f1517b99f4 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.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
@@ -26,7 +26,7 @@ License
 #include "AMIInterpolation.H"
 #include "AMIMethod.H"
 #include "meshTools.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "flipOp.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -232,7 +232,7 @@ void Foam::AMIInterpolation::normaliseWeights
 
 void Foam::AMIInterpolation::agglomerate
 (
-    const autoPtr<mapDistribute>& targetMapPtr,
+    const autoPtr<distributionMap>& targetMapPtr,
     const scalarField& fineSrcMagSf,
     const labelListList& fineSrcAddress,
     const scalarListList& fineSrcWeights,
@@ -244,7 +244,7 @@ void Foam::AMIInterpolation::agglomerate
     labelListList& srcAddress,
     scalarListList& srcWeights,
     scalarField& srcWeightsSum,
-    autoPtr<mapDistribute>& tgtMap
+    autoPtr<distributionMap>& tgtMap
 )
 {
     label sourceCoarseSize =
@@ -275,7 +275,7 @@ void Foam::AMIInterpolation::agglomerate
     // Agglomerate weights and indices
     if (targetMapPtr.valid())
     {
-        const mapDistribute& map = targetMapPtr();
+        const distributionMap& map = targetMapPtr();
 
         // Get all restriction addressing.
         labelList allRestrict(targetRestrictAddressing);
@@ -403,7 +403,7 @@ void Foam::AMIInterpolation::agglomerate
         forAll(fineSrcAddress, facei)
         {
             // All the elements contributing to facei. Are slots in
-            // mapDistribute'd data.
+            // distributionMap'd data.
             const labelList& elems = fineSrcAddress[facei];
             const scalarList& weights = fineSrcWeights[facei];
             const scalar fineArea = fineSrcMagSf[facei];
@@ -435,7 +435,7 @@ void Foam::AMIInterpolation::agglomerate
 
         tgtMap.reset
         (
-            new mapDistribute
+            new distributionMap
             (
                 compactI,
                 move(tgtSubMap),
@@ -451,7 +451,7 @@ void Foam::AMIInterpolation::agglomerate
         forAll(fineSrcAddress, facei)
         {
             // All the elements contributing to facei. Are slots in
-            // mapDistribute'd data.
+            // distributionMap'd data.
             const labelList& elems = fineSrcAddress[facei];
             const scalarList& weights = fineSrcWeights[facei];
             const scalar fineArea = fineSrcMagSf[facei];
@@ -784,8 +784,8 @@ void Foam::AMIInterpolation::update
         // Create processor map of overlapping faces. This map gets
         // (possibly remote) faces from the tgtPatch such that they (together)
         // cover all of the srcPatch
-        autoPtr<mapDistribute> mapPtr = calcProcMap(srcPatch, tgtPatch);
-        const mapDistribute& map = mapPtr();
+        autoPtr<distributionMap> mapPtr = calcProcMap(srcPatch, tgtPatch);
+        const distributionMap& map = mapPtr();
 
         // Create new target patch that fully encompasses source patch
 
@@ -875,7 +875,7 @@ void Foam::AMIInterpolation::update
         // Send data back to originating procs. Note that contributions
         // from different processors get added (ListAppendEqOp)
 
-        mapDistributeBase::distribute
+        distributionMapBase::distribute
         (
             Pstream::commsTypes::nonBlocking,
             List<labelPair>(),
@@ -890,7 +890,7 @@ void Foam::AMIInterpolation::update
             labelList()
         );
 
-        mapDistributeBase::distribute
+        distributionMapBase::distribute
         (
             Pstream::commsTypes::nonBlocking,
             List<labelPair>(),
@@ -907,8 +907,14 @@ void Foam::AMIInterpolation::update
 
         // Cache maps and reset addresses
         List<Map<label>> cMap;
-        srcMapPtr_.reset(new mapDistribute(globalSrcFaces, tgtAddress_, cMap));
-        tgtMapPtr_.reset(new mapDistribute(globalTgtFaces, srcAddress_, cMap));
+        srcMapPtr_.reset
+        (
+            new distributionMap(globalSrcFaces, tgtAddress_, cMap)
+        );
+        tgtMapPtr_.reset
+        (
+            new distributionMap(globalTgtFaces, srcAddress_, cMap)
+        );
 
         if (debug)
         {
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
index c5331ecb46..e175eb0ea5 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.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
@@ -125,10 +125,10 @@ class AMIInterpolation
         const faceAreaIntersect::triangulationMode triMode_;
 
         //- Source map pointer - parallel running only
-        autoPtr<mapDistribute> srcMapPtr_;
+        autoPtr<distributionMap> srcMapPtr_;
 
         //- Target map pointer - parallel running only
-        autoPtr<mapDistribute> tgtMapPtr_;
+        autoPtr<distributionMap> tgtMapPtr_;
 
 
         // Parallel functionality
@@ -149,7 +149,7 @@ class AMIInterpolation
 
             void distributePatches
             (
-                const mapDistribute& map,
+                const distributionMap& map,
                 const primitivePatch& pp,
                 const globalIndex& gi,
                 List<faceList>& faces,
@@ -159,7 +159,7 @@ class AMIInterpolation
 
             void distributeAndMergePatches
             (
-                const mapDistribute& map,
+                const distributionMap& map,
                 const primitivePatch& tgtPatch,
                 const globalIndex& gi,
                 faceList& tgtFaces,
@@ -167,7 +167,7 @@ class AMIInterpolation
                 labelList& tgtFaceIDs
             ) const;
 
-            autoPtr<mapDistribute> calcProcMap
+            autoPtr<distributionMap> calcProcMap
             (
                 const primitivePatch& srcPatch,
                 const primitivePatch& tgtPatch
@@ -231,7 +231,7 @@ class AMIInterpolation
 
             static void agglomerate
             (
-                const autoPtr<mapDistribute>& targetMap,
+                const autoPtr<distributionMap>& targetMap,
                 const scalarField& fineSrcMagSf,
                 const labelListList& fineSrcAddress,
                 const scalarListList& fineSrcWeights,
@@ -243,7 +243,7 @@ class AMIInterpolation
                 labelListList& srcAddress,
                 scalarListList& srcWeights,
                 scalarField& srcWeightsSum,
-                autoPtr<mapDistribute>& tgtMap
+                autoPtr<distributionMap>& tgtMap
             );
 
             void constructFromSurface
@@ -348,7 +348,7 @@ public:
                 //- Source map pointer - valid only if singlePatchProc = -1
                 //  This gets source data into a form to be consumed by
                 //  tgtAddress, tgtWeights
-                inline const mapDistribute& srcMap() const;
+                inline const distributionMap& srcMap() const;
 
 
             // Target patch
@@ -376,7 +376,7 @@ public:
                 //- Target map pointer -  valid only if singlePatchProc=-1.
                 //  This gets target data into a form to be consumed by
                 //  srcAddress, srcWeights
-                inline const mapDistribute& tgtMap() const;
+                inline const distributionMap& tgtMap() const;
 
 
         // Manipulation
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
index 10fa684300..69d5469978 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.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
@@ -77,7 +77,7 @@ inline Foam::scalarField& Foam::AMIInterpolation::srcWeightsSum()
 }
 
 
-inline const Foam::mapDistribute& Foam::AMIInterpolation::srcMap() const
+inline const Foam::distributionMap& Foam::AMIInterpolation::srcMap() const
 {
     return srcMapPtr_();
 }
@@ -119,7 +119,7 @@ inline Foam::scalarField& Foam::AMIInterpolation::tgtWeightsSum()
 }
 
 
-inline const Foam::mapDistribute& Foam::AMIInterpolation::tgtMap() const
+inline const Foam::distributionMap& Foam::AMIInterpolation::tgtMap() const
 {
     return tgtMapPtr_();
 }
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
index 22921da555..cc41b84cff 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "AMIInterpolation.H"
 #include "mergePoints.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -112,7 +112,7 @@ Foam::label Foam::AMIInterpolation::calcOverlappingProcs
 
 void Foam::AMIInterpolation::distributePatches
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const primitivePatch& pp,
     const globalIndex& gi,
     List<faceList>& faces,
@@ -207,7 +207,7 @@ void Foam::AMIInterpolation::distributePatches
 
 void Foam::AMIInterpolation::distributeAndMergePatches
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const primitivePatch& tgtPatch,
     const globalIndex& gi,
     faceList& tgtFaces,
@@ -319,7 +319,7 @@ void Foam::AMIInterpolation::distributeAndMergePatches
 }
 
 
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::AMIInterpolation::calcProcMap
 (
     const primitivePatch& srcPatch,
@@ -457,9 +457,9 @@ Foam::AMIInterpolation::calcProcMap
         }
     }
 
-    autoPtr<mapDistribute> mapPtr
+    autoPtr<distributionMap> mapPtr
     (
-        new mapDistribute
+        new distributionMap
         (
             segmentI,       // size after construction
             move(sendMap),
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationTemplates.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationTemplates.C
index c677977dd7..a27836ee05 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationTemplates.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationTemplates.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
@@ -26,7 +26,7 @@ License
 #include "AMIInterpolation.H"
 #include "AMIMethod.H"
 #include "meshTools.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "flipOp.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,7 +69,7 @@ void Foam::AMIInterpolation::interpolateToTarget
 
     if (singlePatchProc_ == -1)
     {
-        const mapDistribute& map = srcMapPtr_();
+        const distributionMap& map = srcMapPtr_();
 
         List<Type> work(fld);
         map.distribute(work);
@@ -153,7 +153,7 @@ void Foam::AMIInterpolation::interpolateToSource
 
     if (singlePatchProc_ == -1)
     {
-        const mapDistribute& map = tgtMapPtr_();
+        const distributionMap& map = tgtMapPtr_();
 
         List<Type> work(fld);
         map.distribute(work);
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
index bba3dbc570..c27da59dab 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "AMIMethod.H"
 #include "meshTools.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.C b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.C
index 0f412e835a..b1ce632ca8 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.C
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.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
@@ -170,7 +170,7 @@ void Foam::PatchEdgeFaceWave<PrimitivePatchType, Type, TrackingData>::
 syncEdges()
 {
     const globalMeshData& globalData = mesh_.globalData();
-    const mapDistribute& map = globalData.globalEdgeSlavesMap();
+    const distributionMap& map = globalData.globalEdgeSlavesMap();
     const PackedBoolList& cppOrientation = globalData.globalEdgeOrientation();
 
     // Convert patch-edge data into cpp-edge data
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
index 45358695fc..f779cd187e 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
@@ -436,7 +436,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
     const indirectPrimitivePatch& cpp = gmd.coupledPatch();
     const labelList& meshPoints = cpp.meshPoints();
 
-    const mapDistribute& slavesMap = gmd.globalPointSlavesMap();
+    const distributionMap& slavesMap = gmd.globalPointSlavesMap();
     const labelListList& slaves = gmd.globalPointSlaves();
 
     List<Type> elems(slavesMap.constructSize());
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 40bd6aa715..ecefe085cc 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.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
@@ -36,7 +36,7 @@ License
 #include "polyMesh.H"
 #include "polyPatch.H"
 #include "Time.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "SubField.H"
 #include "triPointRef.H"
 #include "syncTools.H"
@@ -699,7 +699,7 @@ void Foam::mappedPatchBase::calcMapping() const
     }
 
     // Determine schedule.
-    mapPtr_.reset(new mapDistribute(sampleProcs, patchFaceProcs));
+    mapPtr_.reset(new distributionMap(sampleProcs, patchFaceProcs));
 
     // Rework the schedule from indices into samples to cell data to send,
     // face data to receive.
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
index 603930930c..d9291d6a5d 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.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
@@ -95,7 +95,7 @@ namespace Foam
 
 class polyPatch;
 class polyMesh;
-class mapDistribute;
+class distributionMap;
 
 /*---------------------------------------------------------------------------*\
                        Class mappedPatchBase Declaration
@@ -224,7 +224,7 @@ protected:
             //    - Cells/faces to sample per processor
             //    - Patch faces to receive per processor
             //    - schedule
-            mutable autoPtr<mapDistribute> mapPtr_;
+            mutable autoPtr<distributionMap> mapPtr_;
 
 
         // AMI interpolator (only for NEARESTPATCHFACEAMI)
@@ -382,7 +382,7 @@ public:
             inline bool sameRegion() const;
 
             //- Return reference to the parallel distribution map
-            inline const mapDistribute& map() const;
+            inline const distributionMap& map() const;
 
             //- Return reference to the AMI interpolator
             inline const AMIInterpolation& AMI
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
index a66b8241b6..2dca5170a8 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.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
@@ -141,7 +141,7 @@ inline bool Foam::mappedPatchBase::sameRegion() const
 }
 
 
-inline const Foam::mapDistribute& Foam::mappedPatchBase::map() const
+inline const Foam::distributionMap& Foam::mappedPatchBase::map() const
 {
     if (mapPtr_.empty())
     {
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
index aa1b255d9b..7106fae597 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ void Foam::mappedPatchBase::distribute
         }
         default:
         {
-            mapDistributeBase::distribute
+            distributionMapBase::distribute
             (
                 Pstream::defaultCommsType,
                 map().schedule(),
@@ -120,7 +120,7 @@ void Foam::mappedPatchBase::reverseDistribute
         default:
         {
             label cSize = sampleSize();
-            mapDistributeBase::distribute
+            distributionMapBase::distribute
             (
                 Pstream::defaultCommsType,
                 map().schedule(),
diff --git a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H
index a20f60936b..7f89f35836 100644
--- a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H
+++ b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.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
@@ -57,7 +57,7 @@ namespace Foam
 
 // Forward declaration of classes
 class objectRegistry;
-class mapDistribute;
+class distributionMap;
 class treeBoundBox;
 
 /*---------------------------------------------------------------------------*\
@@ -361,8 +361,8 @@ public:
             (
                 const List<treeBoundBox>&,
                 const bool keepNonLocal,
-                autoPtr<mapDistribute>& faceMap,
-                autoPtr<mapDistribute>& pointMap
+                autoPtr<distributionMap>& faceMap,
+                autoPtr<distributionMap>& pointMap
             )
             {}
 
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
index ff56d6b755..1bdf803f90 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.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
@@ -708,8 +708,8 @@ void Foam::searchableSurfaceCollection::distribute
 (
     const List<treeBoundBox>& bbs,
     const bool keepNonLocal,
-    autoPtr<mapDistribute>& faceMap,
-    autoPtr<mapDistribute>& pointMap
+    autoPtr<distributionMap>& faceMap,
+    autoPtr<distributionMap>& pointMap
 )
 {
     forAll(subGeom_, surfI)
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H
index f694b845e3..14ddbdae9d 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.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
@@ -258,8 +258,8 @@ public:
             (
                 const List<treeBoundBox>&,
                 const bool keepNonLocal,
-                autoPtr<mapDistribute>& faceMap,
-                autoPtr<mapDistribute>& pointMap
+                autoPtr<distributionMap>& faceMap,
+                autoPtr<distributionMap>& pointMap
             );
 
             //- WIP. Store element-wise field.
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.H b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.H
index 37af8cfab8..12c0960887 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.H
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.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
@@ -260,8 +260,8 @@ public:
             //(
             //    const List<treeBoundBox>& bbs,
             //    const bool keepNonLocal,
-            //    autoPtr<mapDistribute>& faceMap,
-            //    autoPtr<mapDistribute>& pointMap
+            //    autoPtr<distributionMap>& faceMap,
+            //    autoPtr<distributionMap>& pointMap
             //)
             //{
             //    subGeom_[0].distribute(bbs, keepNonLocal, faceMap, pointMap);
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index b1f58a200c..ba940e7b4f 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.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
@@ -363,7 +363,7 @@ void Foam::twoDPointCorrector::updateMesh(const mapPolyMesh&)
 }
 
 
-void Foam::twoDPointCorrector::distribute(const mapDistributePolyMesh&)
+void Foam::twoDPointCorrector::distribute(const polyMeshDistributionMap&)
 {
     clearAddressing();
 }
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
index fbe1b291b5..5436622b83 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.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,7 +148,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update mesh corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Correct weighting factors for moving mesh.
         virtual bool movePoints();
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index 693545cdfe..0235e556d3 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -27,7 +27,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "IFstream.H"
 #include "globalIndex.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,7 +77,7 @@ void Foam::multiLevelDecomp::subsetGlobalCellCells
 
     // Get new indices for neighbouring processors
     List<Map<label>> compactMap;
-    mapDistribute map(globalCells, subCellCells, compactMap);
+    distributionMap map(globalCells, subCellCells, compactMap);
     map.distribute(oldToNew);
     labelList allDist(dist);
     map.distribute(allDist);
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index ef16c42a45..3c12b5516b 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.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,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "distributedTriSurfaceMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "Random.H"
 #include "addToRunTimeSelectionTable.H"
 #include "triangleFuncs.H"
@@ -252,7 +252,7 @@ void Foam::distributedTriSurfaceMesh::distributeSegment
 }
 
 
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::distributedTriSurfaceMesh::distributeSegments
 (
     const pointField& start,
@@ -342,9 +342,9 @@ Foam::distributedTriSurfaceMesh::distributeSegments
         }
     }
 
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             segmentI,       // size after construction
             move(sendMap),
@@ -436,7 +436,7 @@ void Foam::distributedTriSurfaceMesh::findLine
             // Original index of segment
             labelList allSegmentMap(start.size());
 
-            const autoPtr<mapDistribute> mapPtr
+            const autoPtr<distributionMap> mapPtr
             (
                 distributeSegments
                 (
@@ -446,7 +446,7 @@ void Foam::distributedTriSurfaceMesh::findLine
                     allSegmentMap
                 )
             );
-            const mapDistribute& map = mapPtr();
+            const distributionMap& map = mapPtr();
 
             label nOldAllSegments = allSegments.size();
 
@@ -537,7 +537,7 @@ void Foam::distributedTriSurfaceMesh::findLine
 // Exchanges indices to the processor they come from.
 // - calculates exchange map
 // - uses map to calculate local triangle index
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::distributedTriSurfaceMesh::calcLocalQueries
 (
     const List<pointIndexHit>& info,
@@ -635,16 +635,16 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
     // Pack into distribution map
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    autoPtr<mapDistribute> mapPtr
+    autoPtr<distributionMap> mapPtr
     (
-        new mapDistribute
+        new distributionMap
         (
             segmentI,       // size after construction
             move(sendMap),
             move(constructMap)
         )
     );
-    const mapDistribute& map = mapPtr();
+    const distributionMap& map = mapPtr();
 
 
     // Send over queries
@@ -688,7 +688,7 @@ Foam::label Foam::distributedTriSurfaceMesh::calcOverlappingProcs
 // Generate queries for parallel distance calculation
 // - calculates exchange map
 // - uses map to exchange points and radius
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::distributedTriSurfaceMesh::calcLocalQueries
 (
     const pointField& centres,
@@ -788,9 +788,9 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
         }
     }
 
-    autoPtr<mapDistribute> mapPtr
+    autoPtr<distributionMap> mapPtr
     (
-        new mapDistribute
+        new distributionMap
         (
             segmentI,       // size after construction
             move(sendMap),
@@ -1583,7 +1583,7 @@ void Foam::distributedTriSurfaceMesh::findNearest
         pointField allCentres;
         scalarField allRadiusSqr;
         labelList allSegmentMap;
-        autoPtr<mapDistribute> mapPtr
+        autoPtr<distributionMap> mapPtr
         (
             calcLocalQueries
             (
@@ -1595,7 +1595,7 @@ void Foam::distributedTriSurfaceMesh::findNearest
                 allSegmentMap
             )
         );
-        const mapDistribute& map = mapPtr();
+        const distributionMap& map = mapPtr();
 
 
         // swap samples to local processor
@@ -1837,7 +1837,7 @@ void Foam::distributedTriSurfaceMesh::getRegion
     // ~~~~~~~~~~~~~~
 
     labelList triangleIndex(info.size());
-    autoPtr<mapDistribute> mapPtr
+    autoPtr<distributionMap> mapPtr
     (
         calcLocalQueries
         (
@@ -1845,7 +1845,7 @@ void Foam::distributedTriSurfaceMesh::getRegion
             triangleIndex
         )
     );
-    const mapDistribute& map = mapPtr();
+    const distributionMap& map = mapPtr();
 
 
     // Do my tests
@@ -1886,7 +1886,7 @@ void Foam::distributedTriSurfaceMesh::getNormal
     // ~~~~~~~~~~~~~~
 
     labelList triangleIndex(info.size());
-    autoPtr<mapDistribute> mapPtr
+    autoPtr<distributionMap> mapPtr
     (
         calcLocalQueries
         (
@@ -1894,7 +1894,7 @@ void Foam::distributedTriSurfaceMesh::getNormal
             triangleIndex
         )
     );
-    const mapDistribute& map = mapPtr();
+    const distributionMap& map = mapPtr();
 
 
     // Do my tests
@@ -1942,7 +1942,7 @@ void Foam::distributedTriSurfaceMesh::getField
         // ~~~~~~~~~~~~~~
 
         labelList triangleIndex(info.size());
-        autoPtr<mapDistribute> mapPtr
+        autoPtr<distributionMap> mapPtr
         (
             calcLocalQueries
             (
@@ -1950,7 +1950,7 @@ void Foam::distributedTriSurfaceMesh::getField
                 triangleIndex
             )
         );
-        const mapDistribute& map = mapPtr();
+        const distributionMap& map = mapPtr();
 
 
         // Do my tests
@@ -2031,8 +2031,8 @@ void Foam::distributedTriSurfaceMesh::distribute
 (
     const List<treeBoundBox>& bbs,
     const bool keepNonLocal,
-    autoPtr<mapDistribute>& faceMap,
-    autoPtr<mapDistribute>& pointMap
+    autoPtr<distributionMap>& faceMap,
+    autoPtr<distributionMap>& pointMap
 )
 {
     // Get bbs of all domains
@@ -2298,7 +2298,7 @@ void Foam::distributedTriSurfaceMesh::distribute
 
     faceMap.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             allTris.size(),
             move(faceSendMap),
@@ -2307,7 +2307,7 @@ void Foam::distributedTriSurfaceMesh::distribute
     );
     pointMap.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             allPoints.size(),
             move(pointSendMap),
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index ab2bacbef5..dd139493e3 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.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
@@ -58,7 +58,7 @@ SourceFiles
 namespace Foam
 {
 
-class mapDistribute;
+class distributionMap;
 class decompositionMethod;
 
 // Typedefs
@@ -158,7 +158,7 @@ private:
 
             //- Divide edges into local and remote segments. Construct map to
             //  distribute and collect data.
-            autoPtr<mapDistribute> distributeSegments
+            autoPtr<distributionMap> distributeSegments
             (
                 const pointField& start,
                 const pointField& end,
@@ -182,7 +182,7 @@ private:
             //- Obtains global indices from pointIndexHit and swaps them back
             //  to their original processor. Used to calculate local region
             //  and normal.
-            autoPtr<mapDistribute> calcLocalQueries
+            autoPtr<distributionMap> calcLocalQueries
             (
                 const List<pointIndexHit>&,
                 labelList& triangleIndex
@@ -198,7 +198,7 @@ private:
                 boolList& overlaps
             ) const;
 
-            autoPtr<mapDistribute> calcLocalQueries
+            autoPtr<distributionMap> calcLocalQueries
             (
                 const pointField& centres,
                 const scalarField& radiusSqr,
@@ -287,7 +287,7 @@ private:
 
             //- Distribute stored fields
             template<class Type>
-            void distributeFields(const mapDistribute& map);
+            void distributeFields(const distributionMap& map);
 
 
 public:
@@ -415,8 +415,8 @@ public:
             (
                 const List<treeBoundBox>&,
                 const bool keepNonLocal,
-                autoPtr<mapDistribute>& faceMap,
-                autoPtr<mapDistribute>& pointMap
+                autoPtr<distributionMap>& faceMap,
+                autoPtr<distributionMap>& pointMap
             );
 
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMeshTemplates.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMeshTemplates.C
index 03b3aca7f2..025b5e27aa 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMeshTemplates.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMeshTemplates.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 "distributedTriSurfaceMesh.H"
 #include "triSurfaceFields.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -44,7 +44,7 @@ License
 //    // ~~~~~~~~~~~~~~
 //
 //    labelList triangleIndex(info.size());
-//    autoPtr<mapDistribute> mapPtr
+//    autoPtr<distributionMap> mapPtr
 //    (
 //        calcLocalQueries
 //        (
@@ -52,7 +52,7 @@ License
 //            triangleIndex
 //        )
 //    );
-//    const mapDistribute& map = mapPtr();
+//    const distributionMap& map = mapPtr();
 //
 //
 //    // Do my tests
@@ -83,7 +83,7 @@ License
 template<class Type>
 void Foam::distributedTriSurfaceMesh::distributeFields
 (
-    const mapDistribute& map
+    const distributionMap& map
 )
 {
     typedef DimensionedField<Type, triSurfaceGeoMesh> DimensionedSurfField;
diff --git a/src/radiationModels/fvModels/radiation/radiation.C b/src/radiationModels/fvModels/radiation/radiation.C
index 7cd20720be..2eab228e34 100644
--- a/src/radiationModels/fvModels/radiation/radiation.C
+++ b/src/radiationModels/fvModels/radiation/radiation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ void Foam::fv::radiation::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::radiation::distribute(const mapDistributePolyMesh&)
+void Foam::fv::radiation::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/radiationModels/fvModels/radiation/radiation.H b/src/radiationModels/fvModels/radiation/radiation.H
index d88af2df90..6278e53505 100644
--- a/src/radiationModels/fvModels/radiation/radiation.H
+++ b/src/radiationModels/fvModels/radiation/radiation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/radiationModels/radiationModels/viewFactor/viewFactor.C b/src/radiationModels/radiationModels/viewFactor/viewFactor.C
index 465acc8edc..935a1188dc 100644
--- a/src/radiationModels/radiationModels/viewFactor/viewFactor.C
+++ b/src/radiationModels/radiationModels/viewFactor/viewFactor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ void Foam::radiationModels::viewFactor::initialise()
 
     map_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             consMapDim[0],
             move(subMap),
diff --git a/src/radiationModels/radiationModels/viewFactor/viewFactor.H b/src/radiationModels/radiationModels/viewFactor/viewFactor.H
index 8859ab00af..e6097c23e9 100644
--- a/src/radiationModels/radiationModels/viewFactor/viewFactor.H
+++ b/src/radiationModels/radiationModels/viewFactor/viewFactor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ SourceFiles
 #include "scalarMatrices.H"
 #include "globalIndex.H"
 #include "scalarListIOList.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -74,7 +74,7 @@ class viewFactor
         labelListIOList finalAgglom_;
 
         //- Map distributed
-        autoPtr<mapDistribute> map_;
+        autoPtr<distributionMap> map_;
 
         //- Coarse mesh
         singleCellFvMesh coarseMesh_;
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index 57a107cd3b..411be3687e 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -30,7 +30,7 @@ License
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
 #include "mappedWallPolyPatch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
index ea203858e0..3e5671bf44 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.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
@@ -30,7 +30,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "surfaceFilmRegionModel.H"
 #include "mappedWallPolyPatch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C
index 222b0406ed..e457c4c7fa 100644
--- a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C
+++ b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C
@@ -222,7 +222,7 @@ void Foam::fv::surfaceFilm::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::surfaceFilm::distribute(const mapDistributePolyMesh&)
+void Foam::fv::surfaceFilm::distribute(const polyMeshDistributionMap&)
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H
index 15f3e27cca..8436038a45 100644
--- a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H
+++ b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H
@@ -149,7 +149,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 81ee3cb619..03d6500136 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -40,7 +40,7 @@ License
 #include "constrainHbyA.H"
 
 #include "mappedWallPolyPatch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "filmViscosityModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 29939ac1dc..eaf5b4d721 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.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
@@ -39,7 +39,7 @@ License
 #include "zeroGradientFvPatchFields.H"
 #include "mixedFvPatchFields.H"
 #include "mappedFieldFvPatchField.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "constants.H"
 
 #include "heatTransferModel.H"
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
index db9817bf1c..e03e991f2f 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -310,7 +310,7 @@ void Foam::rigidBodyMeshMotionSolver::updateMesh(const mapPolyMesh& map)
 
 void Foam::rigidBodyMeshMotionSolver::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     meshSolverPtr_->distribute(map);
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
index d411c4d33e..121496044e 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,7 +160,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
         //- Write motion state information for restart
         virtual bool write() const;
diff --git a/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapper.H b/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapper.H
index 9ad1517cc1..8d87300ae9 100644
--- a/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapper.H
+++ b/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapper.H
@@ -33,7 +33,7 @@ Description
 #define distributedWeightedFvPatchFieldMapper_H
 
 #include "fvPatchFieldMapper.H"
-#include "mapDistributeBase.H"
+#include "distributionMapBase.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ class distributedWeightedFvPatchFieldMapper
 
         const label singlePatchProc_;
 
-        const mapDistributeBase* distMapPtr_;
+        const distributionMapBase* distMapPtr_;
 
         const labelListList& addressing_;
 
@@ -90,7 +90,7 @@ public:
         distributedWeightedFvPatchFieldMapper
         (
             const label singlePatchProc,
-            const mapDistributeBase* distMapPtr,
+            const distributionMapBase* distMapPtr,
             const labelListList& addressing,
             const scalarListList& weights
         )
@@ -115,7 +115,7 @@ public:
                 (
                     "distributedWeightedFvPatchFieldMapper::"
                     "distributedWeightedFvPatchFieldMapper(..)"
-                )   << "Supply a mapDistributeBase if and only if "
+                )   << "Supply a distributionMapBase if and only if "
                     << "singlePatchProc is -1"
                     << " singlePatchProc_:" << singlePatchProc_
                     << " distMapPtr_:" << (distMapPtr_ != nullptr)
diff --git a/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapperTemplates.C b/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapperTemplates.C
index a4d9b0148f..0c7a9fb56d 100644
--- a/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapperTemplates.C
+++ b/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapperTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ void Foam::distributedWeightedFvPatchFieldMapper::map
     if (singlePatchProc_ == -1)
     {
         // Fetch remote parts of mapF
-        const mapDistributeBase& distMap = *distMapPtr_;
+        const distributionMapBase& distMap = *distMapPtr_;
         Field<Type> newMapF(mapF);
 
         // Moved flux "flip" functionality to higher level
diff --git a/src/sampling/meshToMesh/meshToMesh.C b/src/sampling/meshToMesh/meshToMesh.C
index 8e53f9c5ca..8bcaafcc06 100644
--- a/src/sampling/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMesh/meshToMesh.C
@@ -258,8 +258,8 @@ Foam::word Foam::meshToMesh::calculate(const word& methodName)
         // Create processor map of overlapping cells. This map gets
         // (possibly remote) cells from the tgt mesh such that they (together)
         // cover all of the src mesh
-        autoPtr<mapDistribute> mapPtr = calcProcMap(srcRegion_, tgtRegion_);
-        const mapDistribute& map = mapPtr();
+        autoPtr<distributionMap> mapPtr = calcProcMap(srcRegion_, tgtRegion_);
+        const distributionMap& map = mapPtr();
 
         pointField newTgtPoints;
         faceList newTgtFaces;
@@ -355,7 +355,7 @@ Foam::word Foam::meshToMesh::calculate(const word& methodName)
         }
 
         // set up as a reverse distribute
-        mapDistributeBase::distribute
+        distributionMapBase::distribute
         (
             Pstream::commsTypes::nonBlocking,
             List<labelPair>(),
@@ -371,7 +371,7 @@ Foam::word Foam::meshToMesh::calculate(const word& methodName)
         );
 
         // set up as a reverse distribute
-        mapDistributeBase::distribute
+        distributionMapBase::distribute
         (
             Pstream::commsTypes::nonBlocking,
             List<labelPair>(),
@@ -405,11 +405,11 @@ Foam::word Foam::meshToMesh::calculate(const word& methodName)
         List<Map<label>> cMap;
         srcMapPtr_.reset
         (
-            new mapDistribute(globalSrcCells, tgtToSrcCellAddr_, cMap)
+            new distributionMap(globalSrcCells, tgtToSrcCellAddr_, cMap)
         );
         tgtMapPtr_.reset
         (
-            new mapDistribute(globalTgtCells, srcToTgtCellAddr_, cMap)
+            new distributionMap(globalTgtCells, srcToTgtCellAddr_, cMap)
         );
 
         // collect volume intersection contributions
diff --git a/src/sampling/meshToMesh/meshToMesh.H b/src/sampling/meshToMesh/meshToMesh.H
index 1ebdd4e26c..0df2d9f10e 100644
--- a/src/sampling/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMesh/meshToMesh.H
@@ -44,7 +44,7 @@ SourceFiles
 
 #include "polyMesh.H"
 #include "boundBox.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "volFieldsFwd.H"
 #include "NamedEnum.H"
 #include "AMIInterpolation.H"
@@ -100,10 +100,10 @@ class meshToMesh
         label singleMeshProc_;
 
         //- Source map pointer - parallel running only
-        autoPtr<mapDistribute> srcMapPtr_;
+        autoPtr<distributionMap> srcMapPtr_;
 
         //- Target map pointer - parallel running only
-        autoPtr<mapDistribute> tgtMapPtr_;
+        autoPtr<distributionMap> tgtMapPtr_;
 
 
     // Private Member Functions
@@ -197,7 +197,7 @@ class meshToMesh
             ) const;
 
             //- Calculate the mapping between processors
-            autoPtr<mapDistribute> calcProcMap
+            autoPtr<distributionMap> calcProcMap
             (
                 const polyMesh& src,
                 const polyMesh& tgt
@@ -206,7 +206,7 @@ class meshToMesh
             //- Distribute mesh info from 'my' processor to others
             void distributeCells
             (
-                const mapDistribute& map,
+                const distributionMap& map,
                 const polyMesh& tgtMesh,
                 const globalIndex& globalI,
                 List<pointField>& points,
@@ -222,7 +222,7 @@ class meshToMesh
             //- Collect pieces of tgt mesh from other processors and restructure
             void distributeAndMergeCells
             (
-                const mapDistribute& map,
+                const distributionMap& map,
                 const polyMesh& tgt,
                 const globalIndex& globalI,
                 pointField& tgtPoints,
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index 1e112b596b..9f44d12564 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.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
@@ -108,7 +108,7 @@ Foam::label Foam::meshToMesh::calcOverlappingProcs
 }
 
 
-Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
+Foam::autoPtr<Foam::distributionMap> Foam::meshToMesh::calcProcMap
 (
     const polyMesh& src,
     const polyMesh& tgt
@@ -242,9 +242,9 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
         }
     }
 
-    autoPtr<mapDistribute> mapPtr
+    autoPtr<distributionMap> mapPtr
     (
-        new mapDistribute
+        new distributionMap
         (
             segmentI,       // size after construction
             move(sendMap),
@@ -258,7 +258,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
 
 void Foam::meshToMesh::distributeCells
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const polyMesh& tgtMesh,
     const globalIndex& globalI,
     List<pointField>& points,
@@ -498,7 +498,7 @@ void Foam::meshToMesh::distributeCells
 
 void Foam::meshToMesh::distributeAndMergeCells
 (
-    const mapDistribute& map,
+    const distributionMap& map,
     const polyMesh& tgt,
     const globalIndex& globalI,
     pointField& tgtPoints,
diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C
index 3d30a96ae1..4389881b48 100644
--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@@ -96,7 +96,7 @@ void Foam::meshToMesh::mapSrcToTgt
 
     if (singleMeshProc_ == -1)
     {
-        const mapDistribute& map = srcMapPtr_();
+        const distributionMap& map = srcMapPtr_();
 
         List<Type> work(srcField);
         map.distribute(work);
@@ -186,7 +186,7 @@ void Foam::meshToMesh::mapTgtToSrc
 
     if (singleMeshProc_ == -1)
     {
-        const mapDistribute& map = tgtMapPtr_();
+        const distributionMap& map = tgtMapPtr_();
 
         List<Type> work(tgtField);
         map.distribute(work);
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
index 2ff31d4685..e9a65e5ccc 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ Foam::sampledSurfaces::patchInternalField::interpolateField
     forAll(patchIDs(), i)
     {
         // See mappedFixedValueFvPatchField
-        const mapDistribute& distMap = mappers_[i].map();
+        const distributionMap& distMap = mappers_[i].map();
 
         // Send back sample points to processor that holds the cell.
         // Mark cells with point::max so we know which ones we need