From df6d3bf9d262d62a9046027e0c89d1ece4eb73e5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 26 Mar 2024 14:52:16 +0000
Subject: [PATCH] Renamed meshCellZones -> cellZones, meshFaceZones ->
 faceZones and meshPointZones -> pointZones

The prefix "mesh" was confusing and obviously relevant or helpful in
understanding the purpose or operation of these zone container classes.
---
 .../manipulation/mergeMeshes/mergePolyMesh.C  |  6 ++--
 .../manipulation/polyDualMesh/polyDualMesh.C  |  2 +-
 .../manipulation/renumberMesh/renumberMesh.C  |  4 +--
 .../manipulation/setsToZones/setsToZones.C    |  6 ++--
 .../splitMeshRegions/splitMeshRegions.C       | 10 +++---
 .../mesh/manipulation/topoSet/topoSet.C       |  6 ++--
 .../foamToTecplot360/foamToTecplot360.C       |  8 ++---
 .../dataConversion/foamToVTK/foamToVTK.C      |  4 +--
 .../PVReaders/vtkPVFoam/vtkPVFoamMesh.C       |  8 ++---
 .../vtkPVFoam/vtkPVFoamSurfaceField.H         |  2 +-
 .../PVReaders/vtkPVFoam/vtkPVFoamVolFields.H  |  4 +--
 .../surfaceMeshTriangulate.C                  |  2 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.H       | 24 ++++++-------
 src/OpenFOAM/meshes/polyMesh/polyMeshIO.C     |  8 ++---
 .../Zones/{meshCellZones.H => cellZones.H}    |  8 ++---
 .../{meshCellZonesFwd.H => cellZonesFwd.H}    |  8 ++---
 .../Zones/{meshFaceZones.H => faceZones.H}    |  8 ++---
 .../{meshFaceZonesFwd.H => faceZonesFwd.H}    | 10 +++---
 .../Zones/{meshPointZones.H => pointZones.H}  |  8 ++---
 .../{meshPointZonesFwd.H => pointZonesFwd.H}  |  8 ++---
 .../meshes/polyMesh/zones/cellZone/cellZone.C | 30 ++++++++--------
 .../meshes/polyMesh/zones/cellZone/cellZone.H | 28 +++++++--------
 .../polyMesh/zones/cellZone/cellZoneNew.C     |  2 +-
 .../meshes/polyMesh/zones/faceZone/faceZone.C | 34 +++++++++----------
 .../meshes/polyMesh/zones/faceZone/faceZone.H | 26 +++++++-------
 .../polyMesh/zones/faceZone/faceZoneNew.C     |  2 +-
 .../polyMesh/zones/pointZone/pointZone.C      | 30 ++++++++--------
 .../polyMesh/zones/pointZone/pointZone.H      | 28 +++++++--------
 .../polyMesh/zones/pointZone/pointZoneNew.C   |  2 +-
 src/conversion/meshTables/cellTable.C         |  2 +-
 ...surfaceDisplacementPointPatchVectorField.C |  4 +--
 ...aceSlipDisplacementPointPatchVectorField.C |  4 +--
 .../molecule/moleculeCloud/moleculeCloud.C    |  4 +--
 .../FacePostProcessing/FacePostProcessing.C   |  8 ++---
 .../meshRefinement/meshRefinement.C           |  4 +--
 .../meshRefinement/meshRefinementBaffles.C    |  4 +--
 .../refinementSurfaces/surfaceZonesInfo.C     |  8 ++---
 .../snappyHexMeshDriver/snappySnapDriver.C    |  4 +--
 src/meshTools/sets/topoSets/cellZoneSet.C     |  4 +--
 src/meshTools/sets/topoSets/faceZoneSet.C     |  4 +--
 src/meshTools/sets/topoSets/pointZoneSet.C    |  4 +--
 .../multiSolidBodyMotionSolver.C              |  4 +--
 .../preserveFaceZonesConstraint.C             |  6 ++--
 .../parallel/domainDecompositionDecompose.C   |  6 ++--
 .../fvMeshDistribute/fvMeshDistribute.C       |  8 ++---
 .../fvMeshSubset/fvMeshSubset.C               |  6 ++--
 .../polyMeshAdder/polyMeshAdder.C             | 12 +++----
 .../polyMeshAdder/polyMeshAdder.H             | 10 +++---
 .../polyTopoChange/polyTopoChange.C           |  6 ++--
 49 files changed, 219 insertions(+), 219 deletions(-)
 rename src/OpenFOAM/meshes/polyMesh/zones/Zones/{meshCellZones.H => cellZones.H} (93%)
 rename src/OpenFOAM/meshes/polyMesh/zones/Zones/{meshCellZonesFwd.H => cellZonesFwd.H} (92%)
 rename src/OpenFOAM/meshes/polyMesh/zones/Zones/{meshFaceZones.H => faceZones.H} (93%)
 rename src/OpenFOAM/meshes/polyMesh/zones/Zones/{meshFaceZonesFwd.H => faceZonesFwd.H} (91%)
 rename src/OpenFOAM/meshes/polyMesh/zones/Zones/{meshPointZones.H => pointZones.H} (93%)
 rename src/OpenFOAM/meshes/polyMesh/zones/Zones/{meshPointZonesFwd.H => pointZonesFwd.H} (92%)

diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index f4dabc8c4d..da3730efef 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -198,7 +198,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
     const pointField& p = m.points();
     labelList renumberPoints(p.size());
 
-    const meshPointZones& pz = m.pointZones();
+    const pointZones& pz = m.pointZones();
     labelList pointZoneIndices(pz.size());
 
     forAll(pz, zonei)
@@ -229,7 +229,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
     const cellList& c = m.cells();
     labelList renumberCells(c.size());
 
-    const meshCellZones& cz = m.cellZones();
+    const cellZones& cz = m.cellZones();
     labelList cellZoneIndices(cz.size());
 
     forAll(cz, zonei)
@@ -267,7 +267,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
 
 
 
-    const meshFaceZones& fz = m.faceZones();
+    const faceZones& fz = m.faceZones();
     labelList faceZoneIndices(fz.size());
 
     forAll(fz, zonei)
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
index c5158a1318..94024319fd 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
@@ -238,7 +238,7 @@ void simpleMarkFeatures
     }
 
     // B. face zones.
-    const meshFaceZones& faceZones = mesh.faceZones();
+    const faceZones& faceZones = mesh.faceZones();
 
     if (doNotPreserveFaceZones)
     {
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 140b89306b..88d4ee6bf7 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -453,7 +453,7 @@ autoPtr<polyTopoChangeMap> reorderMesh
 
     // Re-do the faceZones
     {
-        meshFaceZones& faceZones = mesh.faceZones();
+        faceZones& faceZones = mesh.faceZones();
         forAll(faceZones, zoneI)
         {
             faceZone& fZone = faceZones[zoneI];
@@ -483,7 +483,7 @@ autoPtr<polyTopoChangeMap> reorderMesh
     }
     // Re-do the cellZones
     {
-        meshCellZones& cellZones = mesh.cellZones();
+        cellZones& cellZones = mesh.cellZones();
         forAll(cellZones, zoneI)
         {
             cellZones[zoneI] = UIndirectList<label>
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index f1892afec5..03b8bafbd2 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
                 (
                     set.name(),             // name
                     pointLabels,            // addressing
-                    mesh.pointZones()       // meshPointZones
+                    mesh.pointZones()       // pointZones
                 )
             );
             mesh.pointZones().writeOpt() = IOobject::AUTO_WRITE;
@@ -256,7 +256,7 @@ int main(int argc, char *argv[])
                     set.name(),             // name
                     addressing.shrink(),    // addressing
                     flipMap.shrink(),       // flipmap
-                    mesh.faceZones()        // meshFaceZones
+                    mesh.faceZones()        // faceZones
                 )
             );
             mesh.faceZones().writeOpt() = IOobject::AUTO_WRITE;
@@ -303,7 +303,7 @@ int main(int argc, char *argv[])
                     (
                         set.name(),             // name
                         cellLabels,             // addressing
-                        mesh.cellZones()        // meshCellZones
+                        mesh.cellZones()        // cellZones
                     )
                 );
                 mesh.cellZones().writeOpt() = IOobject::AUTO_WRITE;
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index f3f864bd9f..ec57a96e8d 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -1122,7 +1122,7 @@ label findCorrespondingRegion
 void getZoneID
 (
     const polyMesh& mesh,
-    const meshCellZones& cellZones,
+    const cellZones& cellZones,
     labelList& zoneID,
     labelList& neiZoneID
 )
@@ -1181,7 +1181,7 @@ void matchRegions
     labelList& zoneToRegion
 )
 {
-    const meshCellZones& cellZones = mesh.cellZones();
+    const cellZones& cellZones = mesh.cellZones();
 
     regionToZone.setSize(nCellRegions, -1);
     regionNames.setSize(nCellRegions);
@@ -1513,7 +1513,7 @@ int main(int argc, char *argv[])
         args.optionLookupOrDefault("defaultRegionName", standardRegionName)
     );
 
-    const meshCellZones& cellZones = mesh.cellZones();
+    const Foam::cellZones& cellZones = mesh.cellZones();
 
     // Existing zoneID
     labelList zoneID(mesh.nCells(), -1);
@@ -1572,7 +1572,7 @@ int main(int argc, char *argv[])
             << "This requires all"
             << " cells to be in one and only one cellZone." << nl << endl;
 
-        meshCellZones newCellZones
+        Foam::cellZones newCellZones
         (
             IOobject
             (
@@ -1865,7 +1865,7 @@ int main(int argc, char *argv[])
                         (
                             zoneName,           // name
                             regionCells,        // addressing
-                            cellZones           // meshCellZones
+                            cellZones           // cellZones
                         )
                     );
                 }
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index 9f8d63deef..0803198414 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -126,7 +126,7 @@ void removeSet
     {
         removeZone
         (
-            const_cast<meshCellZones&>(mesh.cellZones()),
+            const_cast<cellZones&>(mesh.cellZones()),
             setName
         );
     }
@@ -134,7 +134,7 @@ void removeSet
     {
         removeZone
         (
-            const_cast<meshFaceZones&>(mesh.faceZones()),
+            const_cast<faceZones&>(mesh.faceZones()),
             setName
         );
     }
@@ -142,7 +142,7 @@ void removeSet
     {
         removeZone
         (
-            const_cast<meshPointZones&>(mesh.pointZones()),
+            const_cast<pointZones&>(mesh.pointZones()),
             setName
         );
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index 7fbd1fdf91..f1d7560c64 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -1062,18 +1062,18 @@ int main(int argc, char *argv[])
         //
         //---------------------------------------------------------------------
 
-        const meshFaceZones& zones = mesh.faceZones();
+        const faceZones& zones = mesh.faceZones();
 
         if (doFaceZones && zones.size() > 0)
         {
-            mkDir(fvPath/"meshFaceZones");
+            mkDir(fvPath/"faceZones");
 
             fileName patchFileName;
 
             if (vMesh.useSubMesh())
             {
                 patchFileName =
-                    fvPath/"meshFaceZones"/cellSetName
+                    fvPath/"faceZones"/cellSetName
                   + "_"
                   + timeDesc
                   + ".plt";
@@ -1081,7 +1081,7 @@ int main(int argc, char *argv[])
             else
             {
                 patchFileName =
-                    fvPath/"meshFaceZones"/"meshFaceZones"
+                    fvPath/"faceZones"/"faceZones"
                   + "_"
                   + timeDesc
                   + ".plt";
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 84f84ba2cc..d5680f2748 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -144,7 +144,7 @@ Usage
 #include "sphericalTensorIOField.H"
 #include "symmTensorIOField.H"
 #include "tensorIOField.H"
-#include "meshFaceZones.H"
+#include "faceZones.H"
 #include "Cloud.H"
 #include "passiveParticle.H"
 #include "stringListOps.H"
@@ -1074,7 +1074,7 @@ int main(int argc, char *argv[])
             );
             print("    surfVectorFields  :", Info, svf);
 
-            const meshFaceZones& zones = mesh.faceZones();
+            const faceZones& zones = mesh.faceZones();
 
             forAll(zones, zoneI)
             {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMesh.C
index 651e57facc..07d305832e 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -264,7 +264,7 @@ void Foam::vtkPVFoam::convertMeshCellZones
         printMemory();
     }
 
-    const meshCellZones& zMesh = mesh.cellZones();
+    const cellZones& zMesh = mesh.cellZones();
     for (int partId = range.start(); partId < range.end(); ++partId)
     {
         const word zoneName = getPartName(partId);
@@ -432,7 +432,7 @@ void Foam::vtkPVFoam::convertMeshFaceZones
         printMemory();
     }
 
-    const meshFaceZones& zMesh = mesh.faceZones();
+    const faceZones& zMesh = mesh.faceZones();
     for (int partId = range.start(); partId < range.end(); ++partId)
     {
         const word zoneName = getPartName(partId);
@@ -550,7 +550,7 @@ void Foam::vtkPVFoam::convertMeshPointZones
 
     if (range.size())
     {
-        const meshPointZones& zMesh = mesh.pointZones();
+        const pointZones& zMesh = mesh.pointZones();
         for (int partId = range.start(); partId < range.end(); ++partId)
         {
             word zoneName = getPartName(partId);
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H
index 30c2d32a6c..25caca9e04 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H
@@ -260,7 +260,7 @@ void Foam::vtkPVFoam::convertSurfaceFields
                 continue;
             }
 
-            const meshFaceZones& zMesh = mesh.faceZones();
+            const faceZones& zMesh = mesh.faceZones();
             const label zoneId = zMesh.findIndex(zoneName);
 
             if (zoneId < 0)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
index 4626400ba2..069a4592bc 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,7 +217,7 @@ void Foam::vtkPVFoam::convertVolFields
                 continue;
             }
 
-            const meshFaceZones& zMesh = mesh.faceZones();
+            const faceZones& zMesh = mesh.faceZones();
             const label zoneId = zMesh.findIndex(zoneName);
 
             if (zoneId < 0)
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 3066c4ecda..8a8266126b 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
 
 
 
-    const meshFaceZones& mfz = mesh.faceZones();
+    const faceZones& mfz = mesh.faceZones();
     labelHashSet includeFaceZones(mfz.size());
 
     if (args.optionFound("faceZones"))
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index c191f2ef0f..dfd71a90f8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -52,9 +52,9 @@ SourceFiles
 #include "labelIOList.H"
 #include "polyBoundaryMesh.H"
 #include "boundBox.H"
-#include "meshPointZones.H"
-#include "meshFaceZones.H"
-#include "meshCellZones.H"
+#include "pointZones.H"
+#include "faceZones.H"
+#include "cellZones.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -159,13 +159,13 @@ private:
         // Zoning information
 
             //- Point zones
-            meshPointZones pointZones_;
+            Foam::pointZones pointZones_;
 
             //- Face zones
-            meshFaceZones faceZones_;
+            Foam::faceZones faceZones_;
 
             //- Cell zones
-            meshCellZones cellZones_;
+            Foam::cellZones cellZones_;
 
 
         //- Parallel info
@@ -438,19 +438,19 @@ public:
             const indexedOctree<treeDataCell>& cellTree() const;
 
             //- Return point zones
-            const meshPointZones& pointZones() const
+            const Foam::pointZones& pointZones() const
             {
                 return pointZones_;
             }
 
             //- Return face zones
-            const meshFaceZones& faceZones() const
+            const Foam::faceZones& faceZones() const
             {
                 return faceZones_;
             }
 
             //- Return cell zones
-            const meshCellZones& cellZones() const
+            const Foam::cellZones& cellZones() const
             {
                 return cellZones_;
             }
@@ -506,19 +506,19 @@ public:
         // Topological change
 
             //- Return non-const access to the pointZones
-            meshPointZones& pointZones()
+            Foam::pointZones& pointZones()
             {
                 return pointZones_;
             }
 
             //- Return non-const access to the faceZones
-            meshFaceZones& faceZones()
+            Foam::faceZones& faceZones()
             {
                 return faceZones_;
             }
 
             //- Return non-const access to the cellZones
-            meshCellZones& cellZones()
+            Foam::cellZones& cellZones()
             {
                 return cellZones_;
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 25bd755dc2..b2ce739166 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -308,7 +308,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 
         // pointZones
         {
-            meshPointZones newPointZones
+            Foam::pointZones newPointZones
             (
                 IOobject
                 (
@@ -329,7 +329,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 
         // faceZones
         {
-            meshFaceZones newFaceZones
+            Foam::faceZones newFaceZones
             (
                 IOobject
                 (
@@ -350,7 +350,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 
         // cellZones
         {
-            meshCellZones newCellZones
+            Foam::cellZones newCellZones
             (
                 IOobject
                 (
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshCellZones.H b/src/OpenFOAM/meshes/polyMesh/zones/Zones/cellZones.H
similarity index 93%
rename from src/OpenFOAM/meshes/polyMesh/zones/Zones/meshCellZones.H
rename to src/OpenFOAM/meshes/polyMesh/zones/Zones/cellZones.H
index bf5642504c..ad99957697 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshCellZones.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/Zones/cellZones.H
@@ -22,16 +22,16 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    Foam::meshCellZones
+    Foam::cellZones
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshCellZones_H
-#define meshCellZones_H
+#ifndef cellZones_H
+#define cellZones_H
 
 #include "Zones.H"
 #include "cellZone.H"
-#include "meshCellZonesFwd.H"
+#include "cellZonesFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshCellZonesFwd.H b/src/OpenFOAM/meshes/polyMesh/zones/Zones/cellZonesFwd.H
similarity index 92%
rename from src/OpenFOAM/meshes/polyMesh/zones/Zones/meshCellZonesFwd.H
rename to src/OpenFOAM/meshes/polyMesh/zones/Zones/cellZonesFwd.H
index 599adaf0aa..b4ff6756d1 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshCellZonesFwd.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/Zones/cellZonesFwd.H
@@ -22,15 +22,15 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::meshCellZones
+    Foam::cellZones
 
 Description
     A Zones with the type cellZone
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshCellZonesFwd_H
-#define meshCellZonesFwd_H
+#ifndef cellZonesFwd_H
+#define cellZonesFwd_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,7 +40,7 @@ namespace Foam
     class cellZone;
     class polyMesh;
 
-    typedef Zones<cellZone, polyMesh> meshCellZones;
+    typedef Zones<cellZone, polyMesh> cellZones;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshFaceZones.H b/src/OpenFOAM/meshes/polyMesh/zones/Zones/faceZones.H
similarity index 93%
rename from src/OpenFOAM/meshes/polyMesh/zones/Zones/meshFaceZones.H
rename to src/OpenFOAM/meshes/polyMesh/zones/Zones/faceZones.H
index 3ea76d6612..0010e3ebc0 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshFaceZones.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/Zones/faceZones.H
@@ -22,16 +22,16 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    Foam::meshFaceZones
+    Foam::faceZones
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshFaceZones_H
-#define meshFaceZones_H
+#ifndef faceZones_H
+#define faceZones_H
 
 #include "Zones.H"
 #include "faceZone.H"
-#include "meshFaceZonesFwd.H"
+#include "faceZonesFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshFaceZonesFwd.H b/src/OpenFOAM/meshes/polyMesh/zones/Zones/faceZonesFwd.H
similarity index 91%
rename from src/OpenFOAM/meshes/polyMesh/zones/Zones/meshFaceZonesFwd.H
rename to src/OpenFOAM/meshes/polyMesh/zones/Zones/faceZonesFwd.H
index 4a8fba113f..64d7ccfe82 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshFaceZonesFwd.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/Zones/faceZonesFwd.H
@@ -22,15 +22,15 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::meshFaceZones
+    Foam::faceZones
 
 Description
     A Zones with the type faceZone
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshFaceZonesFwd_H
-#define meshFaceZonesFwd_H
+#ifndef faceZonesFwd_H
+#define faceZonesFwd_H
 
 #include "Zones.H"
 
@@ -42,9 +42,9 @@ namespace Foam
     class faceZone;
     class polyMesh;
 
-    typedef Zones<faceZone, polyMesh> meshFaceZones;
+    typedef Zones<faceZone, polyMesh> faceZones;
 
-    // class meshFaceZones
+    // class faceZones
     // :
     //     public Zones<faceZone, polyMesh>
     // {
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshPointZones.H b/src/OpenFOAM/meshes/polyMesh/zones/Zones/pointZones.H
similarity index 93%
rename from src/OpenFOAM/meshes/polyMesh/zones/Zones/meshPointZones.H
rename to src/OpenFOAM/meshes/polyMesh/zones/Zones/pointZones.H
index 124b4c39d9..f0f3041d18 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshPointZones.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/Zones/pointZones.H
@@ -22,16 +22,16 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    Foam::meshPointZones
+    Foam::pointZones
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshPointZones_H
-#define meshPointZones_H
+#ifndef pointZones_H
+#define pointZones_H
 
 #include "Zones.H"
 #include "pointZone.H"
-#include "meshPointZonesFwd.H"
+#include "pointZonesFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshPointZonesFwd.H b/src/OpenFOAM/meshes/polyMesh/zones/Zones/pointZonesFwd.H
similarity index 92%
rename from src/OpenFOAM/meshes/polyMesh/zones/Zones/meshPointZonesFwd.H
rename to src/OpenFOAM/meshes/polyMesh/zones/Zones/pointZonesFwd.H
index 94e8ba6cb8..255abce305 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/Zones/meshPointZonesFwd.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/Zones/pointZonesFwd.H
@@ -22,15 +22,15 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::meshPointZones
+    Foam::pointZones
 
 Description
     A Zones with the type pointZone
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshPointZonesFwd_H
-#define meshPointZonesFwd_H
+#ifndef pointZonesFwd_H
+#define pointZonesFwd_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,7 +40,7 @@ namespace Foam
     class pointZone;
     class polyMesh;
 
-    typedef Zones<pointZone, polyMesh> meshPointZones;
+    typedef Zones<pointZone, polyMesh> pointZones;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
index a1a13a32f6..dda3266ed0 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cellZone.H"
-#include "meshCellZones.H"
+#include "cellZones.H"
 #include "polyMesh.H"
 #include "polyTopoChangeMap.H"
 #include "addToRunTimeSelectionTable.H"
@@ -46,10 +46,10 @@ Foam::cellZone::cellZone
 (
     const word& name,
     const labelUList& addr,
-    const meshCellZones& mz
+    const cellZones& mz
 )
 :
-    Zone<cellZone, meshCellZones>(name, addr, mz)
+    Zone<cellZone, cellZones>(name, addr, mz)
 {}
 
 
@@ -57,10 +57,10 @@ Foam::cellZone::cellZone
 (
     const word& name,
     labelList&& addr,
-    const meshCellZones& mz
+    const cellZones& mz
 )
 :
-    Zone<cellZone, meshCellZones>(name, move(addr), mz)
+    Zone<cellZone, cellZones>(name, move(addr), mz)
 {}
 
 
@@ -68,10 +68,10 @@ Foam::cellZone::cellZone
 (
     const word& name,
     const dictionary& dict,
-    const meshCellZones& mz
+    const cellZones& mz
 )
 :
-    Zone<cellZone, meshCellZones>(name, dict, this->labelsName, mz)
+    Zone<cellZone, cellZones>(name, dict, this->labelsName, mz)
 {}
 
 
@@ -79,10 +79,10 @@ Foam::cellZone::cellZone
 (
     const cellZone& cz,
     const labelUList& addr,
-    const meshCellZones& mz
+    const cellZones& mz
 )
 :
-    Zone<cellZone, meshCellZones>(cz, addr, mz)
+    Zone<cellZone, cellZones>(cz, addr, mz)
 {}
 
 
@@ -90,10 +90,10 @@ Foam::cellZone::cellZone
 (
     const cellZone& cz,
     labelList&& addr,
-    const meshCellZones& mz
+    const cellZones& mz
 )
 :
-    Zone<cellZone, meshCellZones>(cz, move(addr), mz)
+    Zone<cellZone, cellZones>(cz, move(addr), mz)
 {}
 
 
@@ -107,13 +107,13 @@ Foam::cellZone::~cellZone()
 
 Foam::label Foam::cellZone::whichCell(const label globalCellID) const
 {
-    return Zone<cellZone, meshCellZones>::localIndex(globalCellID);
+    return Zone<cellZone, cellZones>::localIndex(globalCellID);
 }
 
 
 bool Foam::cellZone::checkDefinition(const bool report) const
 {
-    return Zone<cellZone, meshCellZones>::checkDefinition
+    return Zone<cellZone, cellZones>::checkDefinition
     (
         zones_.mesh().nCells(),
         report
@@ -164,13 +164,13 @@ void Foam::cellZone::writeDict(Ostream& os) const
 
 void Foam::cellZone::operator=(const cellZone& zn)
 {
-    Zone<cellZone, meshCellZones>::operator=(zn);
+    Zone<cellZone, cellZones>::operator=(zn);
 }
 
 
 void Foam::cellZone::operator=(cellZone&& zn)
 {
-    Zone<cellZone, meshCellZones>::operator=(move(zn));
+    Zone<cellZone, cellZones>::operator=(move(zn));
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index 4ea31de4df..498154596f 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -29,7 +29,7 @@ Description
 
     Currently set up as an indirect list but will be extended to use a
     primitive mesh.  For quick check whether a cell belongs to the zone use
-    the lookup mechanism in meshCellZones, where all the zoned cells are
+    the lookup mechanism in cellZones, where all the zoned cells are
     registered with their zone number.
 
 SourceFiles
@@ -42,7 +42,7 @@ SourceFiles
 #define cellZone_H
 
 #include "Zone.H"
-#include "meshCellZonesFwd.H"
+#include "cellZonesFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,12 +55,12 @@ namespace Foam
 
 class cellZone
 :
-    public Zone<cellZone, meshCellZones>
+    public Zone<cellZone, cellZones>
 {
 
 public:
 
-    typedef meshCellZones ZonesType;
+    typedef cellZones ZonesType;
 
     // Static Data Members
 
@@ -82,7 +82,7 @@ public:
             (
                 const word& name,
                 const dictionary& dict,
-                const meshCellZones& mz
+                const cellZones& mz
             ),
             (name, dict, mz)
         );
@@ -95,7 +95,7 @@ public:
         (
             const word& name,
             const labelUList& addr,
-            const meshCellZones&
+            const cellZones&
         );
 
         //- Construct from components, transferring contents
@@ -103,7 +103,7 @@ public:
         (
             const word& name,
             labelList&& addr,
-            const meshCellZones&
+            const cellZones&
         );
 
         //- Construct from dictionary
@@ -111,7 +111,7 @@ public:
         (
             const word& name,
             const dictionary&,
-            const meshCellZones&
+            const cellZones&
         );
 
         //- Construct given the original zone and resetting the
@@ -120,7 +120,7 @@ public:
         (
             const cellZone&,
             const labelUList& addr,
-            const meshCellZones&
+            const cellZones&
         );
 
         //- Construct given the original zone, resetting the
@@ -129,7 +129,7 @@ public:
         (
             const cellZone&,
             labelList&& addr,
-            const meshCellZones&
+            const cellZones&
         );
 
         //- Disallow default bitwise copy construction
@@ -137,7 +137,7 @@ public:
 
 
         //- Construct and return a clone, resetting the mesh zones
-        virtual autoPtr<cellZone> clone(const meshCellZones& mz) const
+        virtual autoPtr<cellZone> clone(const cellZones& mz) const
         {
             return autoPtr<cellZone>
             (
@@ -150,7 +150,7 @@ public:
         virtual autoPtr<cellZone> clone
         (
             const labelUList& addr,
-            const meshCellZones& mz
+            const cellZones& mz
         ) const
         {
             return autoPtr<cellZone>
@@ -168,7 +168,7 @@ public:
         (
             const word& name,
             const dictionary&,
-            const meshCellZones&
+            const cellZones&
         );
 
 
@@ -200,7 +200,7 @@ public:
 
     // Member Operators
 
-        using Zone<cellZone, meshCellZones>::operator=;
+        using Zone<cellZone, cellZones>::operator=;
 
         //- Assignment to zone, clearing demand-driven data
         void operator=(const cellZone&);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
index cfedb8f7e0..af489a62ed 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
 (
     const word& name,
     const dictionary& dict,
-    const meshCellZones& mz
+    const cellZones& mz
 )
 {
     if (debug)
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 255cc6267d..4bb17c7727 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "faceZone.H"
-#include "meshFaceZones.H"
+#include "faceZones.H"
 #include "polyMesh.H"
 #include "polyTopoChangeMap.H"
 #include "syncTools.H"
@@ -202,10 +202,10 @@ Foam::faceZone::faceZone
     const word& name,
     const labelUList& addr,
     const boolList& fm,
-    const meshFaceZones& mz
+    const faceZones& mz
 )
 :
-    Zone<faceZone, meshFaceZones>(name, addr, mz),
+    Zone<faceZone, faceZones>(name, addr, mz),
     flipMap_(fm),
     patchPtr_(nullptr),
     masterCellsPtr_(nullptr),
@@ -221,10 +221,10 @@ Foam::faceZone::faceZone
     const word& name,
     labelList&& addr,
     boolList&& fm,
-    const meshFaceZones& mz
+    const faceZones& mz
 )
 :
-    Zone<faceZone, meshFaceZones>(name, move(addr), mz),
+    Zone<faceZone, faceZones>(name, move(addr), mz),
     flipMap_(move(fm)),
     patchPtr_(nullptr),
     masterCellsPtr_(nullptr),
@@ -239,10 +239,10 @@ Foam::faceZone::faceZone
 (
     const word& name,
     const dictionary& dict,
-    const meshFaceZones& mz
+    const faceZones& mz
 )
 :
-    Zone<faceZone, meshFaceZones>(name, dict, this->labelsName, mz),
+    Zone<faceZone, faceZones>(name, dict, this->labelsName, mz),
     flipMap_(dict.lookup("flipMap")),
     patchPtr_(nullptr),
     masterCellsPtr_(nullptr),
@@ -258,10 +258,10 @@ Foam::faceZone::faceZone
     const faceZone& fz,
     const labelUList& addr,
     const boolList& fm,
-    const meshFaceZones& mz
+    const faceZones& mz
 )
 :
-    Zone<faceZone, meshFaceZones>(fz, addr, mz),
+    Zone<faceZone, faceZones>(fz, addr, mz),
     flipMap_(fm),
     patchPtr_(nullptr),
     masterCellsPtr_(nullptr),
@@ -277,10 +277,10 @@ Foam::faceZone::faceZone
     const faceZone& fz,
     labelList&& addr,
     boolList&& fm,
-    const meshFaceZones& mz
+    const faceZones& mz
 )
 :
-    Zone<faceZone, meshFaceZones>(fz, move(addr), mz),
+    Zone<faceZone, faceZones>(fz, move(addr), mz),
     flipMap_(move(fm)),
     patchPtr_(nullptr),
     masterCellsPtr_(nullptr),
@@ -303,7 +303,7 @@ Foam::faceZone::~faceZone()
 
 Foam::label Foam::faceZone::whichFace(const label globalFaceID) const
 {
-    return Zone<faceZone, meshFaceZones>::localIndex(globalFaceID);
+    return Zone<faceZone, faceZones>::localIndex(globalFaceID);
 }
 
 
@@ -361,7 +361,7 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
 
 void Foam::faceZone::clearAddressing()
 {
-    Zone<faceZone, meshFaceZones>::clearAddressing();
+    Zone<faceZone, faceZones>::clearAddressing();
 
     deleteDemandDrivenData(patchPtr_);
 
@@ -386,7 +386,7 @@ void Foam::faceZone::resetAddressing
 
 bool Foam::faceZone::checkDefinition(const bool report) const
 {
-    return Zone<faceZone, meshFaceZones>::checkDefinition
+    return Zone<faceZone, faceZones>::checkDefinition
     (
         zones().mesh().faces().size(),
         report
@@ -491,7 +491,7 @@ void Foam::faceZone::insert(const Map<bool>& newIndices)
 
 void Foam::faceZone::swap(faceZone& fz)
 {
-    Zone<faceZone, meshFaceZones>::swap(fz);
+    Zone<faceZone, faceZones>::swap(fz);
     flipMap_.swap(fz.flipMap_);
 }
 
@@ -570,14 +570,14 @@ void Foam::faceZone::writeDict(Ostream& os) const
 
 void Foam::faceZone::operator=(const faceZone& zn)
 {
-    Zone<faceZone, meshFaceZones>::operator=(zn);
+    Zone<faceZone, faceZones>::operator=(zn);
     flipMap_ = zn.flipMap_;
 }
 
 
 void Foam::faceZone::operator=(faceZone&& zn)
 {
-    Zone<faceZone, meshFaceZones>::operator=(move(zn));
+    Zone<faceZone, faceZones>::operator=(move(zn));
     flipMap_ = move(zn.flipMap_);
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 9951d5c10f..10bd797c20 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -28,7 +28,7 @@ Description
     A subset of mesh faces organised as a primitive patch.
 
     For quick check whether a face belongs to the zone use the lookup
-    mechanism in meshFaceZones, where all the zoned faces are registered
+    mechanism in faceZones, where all the zoned faces are registered
     with their zone number.
 
 SourceFiles
@@ -41,7 +41,7 @@ SourceFiles
 #define faceZone_H
 
 #include "Zone.H"
-#include "meshFaceZonesFwd.H"
+#include "faceZonesFwd.H"
 #include "boolList.H"
 #include "primitiveFacePatch.H"
 
@@ -62,7 +62,7 @@ Ostream& operator<<(Ostream&, const faceZone&);
 
 class faceZone
 :
-    public Zone<faceZone, meshFaceZones>
+    public Zone<faceZone, faceZones>
 {
     // Private Data
 
@@ -114,7 +114,7 @@ protected:
 
 public:
 
-    typedef meshFaceZones ZonesType;
+    typedef faceZones ZonesType;
 
     // Static Data Members
 
@@ -136,7 +136,7 @@ public:
             (
                 const word& name,
                 const dictionary& dict,
-                const meshFaceZones& mz
+                const faceZones& mz
             ),
             (name, dict, mz)
         );
@@ -150,7 +150,7 @@ public:
             const word& name,
             const labelUList& addr,
             const boolList& fm,
-            const meshFaceZones& mz
+            const faceZones& mz
         );
 
         //- Construct from components, moving contents
@@ -159,7 +159,7 @@ public:
             const word& name,
             labelList&& addr,
             boolList&& fm,
-            const meshFaceZones&
+            const faceZones&
         );
 
         //- Construct from dictionary
@@ -167,7 +167,7 @@ public:
         (
             const word& name,
             const dictionary&,
-            const meshFaceZones&
+            const faceZones&
         );
 
         //- Construct given the original zone and resetting the
@@ -177,7 +177,7 @@ public:
             const faceZone&,
             const labelUList& addr,
             const boolList& fm,
-            const meshFaceZones&
+            const faceZones&
         );
 
         //- Construct given the original zone, resetting the
@@ -187,7 +187,7 @@ public:
             const faceZone&,
             labelList&& addr,
             boolList&& fm,
-            const meshFaceZones&
+            const faceZones&
         );
 
         //- Disallow default bitwise copy construction
@@ -195,7 +195,7 @@ public:
 
 
         //- Construct and return a clone, resetting the mesh zones
-        virtual autoPtr<faceZone> clone(const meshFaceZones& mz) const
+        virtual autoPtr<faceZone> clone(const faceZones& mz) const
         {
             return autoPtr<faceZone>
             (
@@ -209,7 +209,7 @@ public:
         (
             const labelUList& addr,
             const boolList& fm,
-            const meshFaceZones& mz
+            const faceZones& mz
         ) const
         {
             return autoPtr<faceZone>
@@ -227,7 +227,7 @@ public:
         (
             const word& name,
             const dictionary&,
-            const meshFaceZones&
+            const faceZones&
         );
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
index c107d4584b..c270f6fe8e 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
 (
     const word& name,
     const dictionary& dict,
-    const meshFaceZones& mz
+    const faceZones& mz
 )
 {
     if (debug)
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index 14f2d2c1ea..4197338b1e 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "pointZone.H"
-#include "meshPointZones.H"
+#include "pointZones.H"
 #include "polyMesh.H"
 #include "polyTopoChangeMap.H"
 #include "syncTools.H"
@@ -47,10 +47,10 @@ Foam::pointZone::pointZone
 (
     const word& name,
     const labelUList& addr,
-    const meshPointZones& mz
+    const pointZones& mz
 )
 :
-    Zone<pointZone, meshPointZones>(name, addr, mz)
+    Zone<pointZone, pointZones>(name, addr, mz)
 {}
 
 
@@ -58,10 +58,10 @@ Foam::pointZone::pointZone
 (
     const word& name,
     labelList&& addr,
-    const meshPointZones& mz
+    const pointZones& mz
 )
 :
-    Zone<pointZone, meshPointZones>(name, move(addr), mz)
+    Zone<pointZone, pointZones>(name, move(addr), mz)
 {}
 
 
@@ -69,10 +69,10 @@ Foam::pointZone::pointZone
 (
     const word& name,
     const dictionary& dict,
-    const meshPointZones& mz
+    const pointZones& mz
 )
 :
-    Zone<pointZone, meshPointZones>(name, dict, this->labelsName, mz)
+    Zone<pointZone, pointZones>(name, dict, this->labelsName, mz)
 {}
 
 
@@ -80,10 +80,10 @@ Foam::pointZone::pointZone
 (
     const pointZone& pz,
     const labelUList& addr,
-    const meshPointZones& mz
+    const pointZones& mz
 )
 :
-    Zone<pointZone, meshPointZones>(pz, addr, mz)
+    Zone<pointZone, pointZones>(pz, addr, mz)
 {}
 
 
@@ -91,10 +91,10 @@ Foam::pointZone::pointZone
 (
     const pointZone& pz,
     labelList&& addr,
-    const meshPointZones& mz
+    const pointZones& mz
 )
 :
-    Zone<pointZone, meshPointZones>(pz, move(addr), mz)
+    Zone<pointZone, pointZones>(pz, move(addr), mz)
 {}
 
 
@@ -108,13 +108,13 @@ Foam::pointZone::~pointZone()
 
 Foam::label Foam::pointZone::whichPoint(const label globalPointID) const
 {
-    return Zone<pointZone, meshPointZones>::localIndex(globalPointID);
+    return Zone<pointZone, pointZones>::localIndex(globalPointID);
 }
 
 
 bool Foam::pointZone::checkDefinition(const bool report) const
 {
-    return Zone<pointZone, meshPointZones>::checkDefinition
+    return Zone<pointZone, pointZones>::checkDefinition
     (
         zones_.mesh().points().size(),
         report
@@ -217,13 +217,13 @@ void Foam::pointZone::writeDict(Ostream& os) const
 
 void Foam::pointZone::operator=(const pointZone& zn)
 {
-    Zone<pointZone, meshPointZones>::operator=(zn);
+    Zone<pointZone, pointZones>::operator=(zn);
 }
 
 
 void Foam::pointZone::operator=(pointZone&& zn)
 {
-    Zone<pointZone, meshPointZones>::operator=(move(zn));
+    Zone<pointZone, pointZones>::operator=(move(zn));
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 73b79a6f23..51c2da0f48 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -30,7 +30,7 @@ Description
     list.
 
     For quick check whether a point belongs to the zone use the lookup
-    mechanism in meshPointZones, where all the zoned points are registered
+    mechanism in pointZones, where all the zoned points are registered
     with their zone number.
 
 SourceFiles
@@ -43,7 +43,7 @@ SourceFiles
 #define pointZone_H
 
 #include "Zone.H"
-#include "meshPointZonesFwd.H"
+#include "pointZonesFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,12 +56,12 @@ namespace Foam
 
 class pointZone
 :
-    public Zone<pointZone, meshPointZones>
+    public Zone<pointZone, pointZones>
 {
 
 public:
 
-    typedef meshPointZones ZonesType;
+    typedef pointZones ZonesType;
 
     // Static Data Members
 
@@ -83,7 +83,7 @@ public:
             (
                 const word& name,
                 const dictionary& dict,
-                const meshPointZones& mz
+                const pointZones& mz
             ),
             (name, dict, mz)
         );
@@ -96,7 +96,7 @@ public:
         (
             const word& name,
             const labelUList& addr,
-            const meshPointZones&
+            const pointZones&
         );
 
         //- Construct from components, transferring contents
@@ -104,7 +104,7 @@ public:
         (
             const word& name,
             labelList&& addr,
-            const meshPointZones&
+            const pointZones&
         );
 
         //- Construct from dictionary
@@ -112,7 +112,7 @@ public:
         (
             const word& name,
             const dictionary&,
-            const meshPointZones&
+            const pointZones&
         );
 
         //- Construct given the original zone and resetting the
@@ -121,7 +121,7 @@ public:
         (
             const pointZone&,
             const labelUList& addr,
-            const meshPointZones&
+            const pointZones&
         );
 
         //- Construct given the original zone, resetting the
@@ -130,7 +130,7 @@ public:
         (
             const pointZone&,
             labelList&& addr,
-            const meshPointZones&
+            const pointZones&
         );
 
         //- Disallow default bitwise copy construction
@@ -138,7 +138,7 @@ public:
 
 
         //- Construct and return a clone, resetting the mesh zones
-        virtual autoPtr<pointZone> clone(const meshPointZones& mz) const
+        virtual autoPtr<pointZone> clone(const pointZones& mz) const
         {
             return autoPtr<pointZone>
             (
@@ -150,7 +150,7 @@ public:
         //  and mesh zones
         virtual autoPtr<pointZone> clone
         (
-            const meshPointZones& mz,
+            const pointZones& mz,
             const labelUList& addr
         ) const
         {
@@ -169,7 +169,7 @@ public:
         (
             const word& name,
             const dictionary&,
-            const meshPointZones&
+            const pointZones&
         );
 
 
@@ -198,7 +198,7 @@ public:
 
     // Member Operators
 
-        using Zone<pointZone, meshPointZones>::operator=;
+        using Zone<pointZone, pointZones>::operator=;
 
         //- Assignment to zone, clearing demand-driven data
         void operator=(const pointZone&);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
index 5b60d8181c..c34f80b2f0 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
 (
     const word& name,
     const dictionary& dict,
-    const meshPointZones& mz
+    const pointZones& mz
 )
 {
     if (debug)
diff --git a/src/conversion/meshTables/cellTable.C b/src/conversion/meshTables/cellTable.C
index 005ea43448..acd3bad542 100644
--- a/src/conversion/meshTables/cellTable.C
+++ b/src/conversion/meshTables/cellTable.C
@@ -470,7 +470,7 @@ void Foam::cellTable::addCellZones
     }
     zoneUsed.setSize(nZone);
 
-    meshCellZones& czMesh = mesh.cellZones();
+    cellZones& czMesh = mesh.cellZones();
 
     czMesh.clear();
     if (nZone <= 1)
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index e28691afcc..89e0265ff6 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ void surfaceDisplacementPointPatchVectorField::calcProjection
 
     if (frozenPointsZone_.size() > 0)
     {
-        const meshPointZones& pZones = mesh.pointZones();
+        const pointZones& pZones = mesh.pointZones();
 
         zonePtr = &pZones[frozenPointsZone_];
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index e7a63e2fc8..e840ddf020 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ void surfaceSlipDisplacementPointPatchVectorField::calcProjection
 
     if (frozenPointsZone_.size() > 0)
     {
-        const meshPointZones& pZones = mesh.pointZones();
+        const pointZones& pZones = mesh.pointZones();
 
         zonePtr = &pZones[frozenPointsZone_];
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 5e688b145e..e254d02670 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -481,7 +481,7 @@ void Foam::moleculeCloud::initialiseMolecules
         << "Initialising molecules in each zone specified in mdInitialiseDict."
         << endl;
 
-    const meshCellZones& cellZones = mesh_.cellZones();
+    const cellZones& cellZones = mesh_.cellZones();
 
     if (!cellZones.size())
     {
diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
index 3b3754e7c6..f7ed63f374 100644
--- a/src/lagrangian/parcel/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
+++ b/src/lagrangian/parcel/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ void Foam::FacePostProcessing<CloudType>::write()
 {
     const fvMesh& mesh = this->owner().mesh();
     const Time& time = mesh.time();
-    const meshFaceZones& mfz = mesh.faceZones();
+    const faceZones& mfz = mesh.faceZones();
     scalar timeNew = time.value();
     scalar timeElapsed = timeNew - timeOld_;
 
@@ -264,7 +264,7 @@ Foam::FacePostProcessing<CloudType>::FacePostProcessing
     outputFilePtr_.setSize(faceZoneNames.size());
 
     DynamicList<label> zoneIDs;
-    const meshFaceZones& mfz = owner.mesh().faceZones();
+    const faceZones& mfz = owner.mesh().faceZones();
     const surfaceScalarField& magSf = owner.mesh().magSf();
     const polyBoundaryMesh& pbm = owner.mesh().boundaryMesh();
     forAll(faceZoneNames, i)
@@ -357,7 +357,7 @@ void Foam::FacePostProcessing<CloudType>::preFace(const parcelType& p)
      || this->owner().solution().transient()
     )
     {
-        const meshFaceZones& mfz = this->owner().mesh().faceZones();
+        const faceZones& mfz = this->owner().mesh().faceZones();
 
         forAll(faceZoneIndices_, i)
         {
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 318de601a1..b7a26c46b9 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1388,7 +1388,7 @@ Foam::autoPtr<Foam::polyDistributionMap> Foam::meshRefinement::balance
 
                 const PtrList<surfaceZonesInfo>& surfZones =
                     surfaces().surfZones();
-                const meshFaceZones& fZones = mesh_.faceZones();
+                const faceZones& fZones = mesh_.faceZones();
                 const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
                 // Get faces whose owner and neighbour should stay together,
@@ -1801,7 +1801,7 @@ Foam::tmp<Foam::pointVectorField> Foam::meshRefinement::makeDisplacementField
 
 void Foam::meshRefinement::checkCoupledFaceZones(const polyMesh& mesh)
 {
-    const meshFaceZones& fZones = mesh.faceZones();
+    const faceZones& fZones = mesh.faceZones();
 
     // Check any zones are present anywhere and in same order
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index f18fff4730..2bcb87b454 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -214,7 +214,7 @@ Foam::Map<Foam::labelPair> Foam::meshRefinement::getZoneBafflePatches
     Map<labelPair> bafflePatch(mesh_.nFaces()/1000);
 
     const PtrList<surfaceZonesInfo>& surfZones = surfaces_.surfZones();
-    const meshFaceZones& fZones = mesh_.faceZones();
+    const faceZones& fZones = mesh_.faceZones();
 
     forAll(surfZones, surfi)
     {
@@ -397,7 +397,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::createBaffles
 
 void Foam::meshRefinement::checkZoneFaces() const
 {
-    const meshFaceZones& fZones = mesh_.faceZones();
+    const faceZones& fZones = mesh_.faceZones();
 
     const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
index 259f3cddf7..fd5c2e3b32 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
@@ -340,7 +340,7 @@ Foam::labelList Foam::surfaceZonesInfo::addCellZonesToMesh
 {
     labelList surfaceToCellZone(surfList.size(), -1);
 
-    meshCellZones& cellZones = mesh.cellZones();
+    cellZones& cellZones = mesh.cellZones();
 
     forAll(namedSurfaces, i)
     {
@@ -363,7 +363,7 @@ Foam::labelList Foam::surfaceZonesInfo::addCellZonesToMesh
                     (
                         cellZoneName,   // name
                         labelList(0),   // addressing
-                        cellZones       // meshCellZones
+                        cellZones       // cellZones
                     )
                 );
             }
@@ -404,7 +404,7 @@ Foam::labelList Foam::surfaceZonesInfo::addFaceZonesToMesh
 {
     labelList surfaceToFaceZone(surfList.size(), -1);
 
-    meshFaceZones& faceZones = mesh.faceZones();
+    faceZones& faceZones = mesh.faceZones();
 
     forAll(namedSurfaces, i)
     {
@@ -426,7 +426,7 @@ Foam::labelList Foam::surfaceZonesInfo::addFaceZonesToMesh
                     faceZoneName,   // name
                     labelList(0),   // addressing
                     boolList(0),    // flipmap
-                    faceZones       // meshFaceZones
+                    faceZones       // faceZones
                 )
             );
         }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index d35ad683ea..154b451473 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -1839,7 +1839,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::snappySnapDriver::repatchToSurface
 
         // 2. All faces on zoned surfaces
         const PtrList<surfaceZonesInfo>& surfZones = surfaces.surfZones();
-        const meshFaceZones& fZones = mesh.faceZones();
+        const faceZones& fZones = mesh.faceZones();
 
         forAll(zonedSurfaces, i)
         {
@@ -2138,7 +2138,7 @@ void Foam::snappySnapDriver::doSnap
     // Selectively 'forget' about the baffles, i.e. not check across them
     // or merge across them.
     {
-        const meshFaceZones& fZones = mesh.faceZones();
+        const faceZones& fZones = mesh.faceZones();
         const refinementSurfaces& surfaces = meshRefiner_.surfaces();
         const PtrList<surfaceZonesInfo>& surfZones = surfaces.surfZones();
 
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C
index d88e38c861..a6c4bc657a 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.C
+++ b/src/meshTools/sets/topoSets/cellZoneSet.C
@@ -74,7 +74,7 @@ cellZoneSet::cellZoneSet
     mesh_(mesh),
     addressing_(0)
 {
-    const meshCellZones& cellZones = mesh.cellZones();
+    const cellZones& cellZones = mesh.cellZones();
     label zoneID = cellZones.findIndex(name);
 
     if
@@ -259,7 +259,7 @@ bool cellZoneSet::writeObject
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify cellZone
-    meshCellZones& cellZones = const_cast<polyMesh&>(mesh_).cellZones();
+    cellZones& cellZones = const_cast<polyMesh&>(mesh_).cellZones();
     label zoneID = cellZones.findIndex(name());
 
     if (zoneID == -1)
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index b81313a173..9344f16d20 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -79,7 +79,7 @@ faceZoneSet::faceZoneSet
     addressing_(0),
     flipMap_(0)
 {
-    const meshFaceZones& faceZones = mesh.faceZones();
+    const faceZones& faceZones = mesh.faceZones();
     label zoneID = faceZones.findIndex(name);
 
     if
@@ -474,7 +474,7 @@ bool faceZoneSet::writeObject
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify faceZone
-    meshFaceZones& faceZones = const_cast<polyMesh&>(mesh_).faceZones();
+    faceZones& faceZones = const_cast<polyMesh&>(mesh_).faceZones();
     label zoneID = faceZones.findIndex(name());
 
     if (zoneID == -1)
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C
index 8f97346aa4..9017a60112 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.C
+++ b/src/meshTools/sets/topoSets/pointZoneSet.C
@@ -76,7 +76,7 @@ pointZoneSet::pointZoneSet
     mesh_(mesh),
     addressing_(0)
 {
-    const meshPointZones& pointZones = mesh.pointZones();
+    const pointZones& pointZones = mesh.pointZones();
     label zoneID = pointZones.findIndex(name);
 
     if
@@ -260,7 +260,7 @@ bool pointZoneSet::writeObject
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify pointZone
-    meshPointZones& pointZones = const_cast<polyMesh&>(mesh_).pointZones();
+    pointZones& pointZones = const_cast<polyMesh&>(mesh_).pointZones();
     label zoneID = pointZones.findIndex(name());
 
     if (zoneID == -1)
diff --git a/src/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver/multiSolidBodyMotionSolver.C b/src/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver/multiSolidBodyMotionSolver.C
index b5f6e48ec7..a1f440d351 100644
--- a/src/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver/multiSolidBodyMotionSolver.C
+++ b/src/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver/multiSolidBodyMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "multiSolidBodyMotionSolver.H"
 #include "addToRunTimeSelectionTable.H"
 #include "transformField.H"
-#include "meshCellZones.H"
+#include "cellZones.H"
 #include "boolList.H"
 #include "syncTools.H"
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C
index 90692a86f4..f1ba4192e8 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.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-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ void Foam::decompositionConstraints::preserveFaceZonesConstraint::add
 {
     blockedFace.setSize(mesh.nFaces(), true);
 
-    const meshFaceZones& fZones = mesh.faceZones();
+    const faceZones& fZones = mesh.faceZones();
 
     const labelList zoneIDs = findStrings(zones_, fZones.names());
 
@@ -167,7 +167,7 @@ void Foam::decompositionConstraints::preserveFaceZonesConstraint::apply
     // Override if differing
     // ~~~~~~~~~~~~~~~~~~~~~
 
-    const meshFaceZones& fZones = mesh.faceZones();
+    const faceZones& fZones = mesh.faceZones();
 
     const labelList zoneIDs = findStrings(zones_, fZones.names());
 
diff --git a/src/parallel/parallel/domainDecompositionDecompose.C b/src/parallel/parallel/domainDecompositionDecompose.C
index 2587a1a330..f27b389f3c 100644
--- a/src/parallel/parallel/domainDecompositionDecompose.C
+++ b/src/parallel/parallel/domainDecompositionDecompose.C
@@ -935,7 +935,7 @@ void Foam::domainDecomposition::decompose()
 
         // Create point zones
         {
-            const meshPointZones& pz = completeMesh().pointZones();
+            const pointZones& pz = completeMesh().pointZones();
 
             // Go through all the zoned points and find out if they
             // belong to a zone.  If so, add it to the zone as
@@ -999,7 +999,7 @@ void Foam::domainDecomposition::decompose()
 
         // Create face zones
         {
-            const meshFaceZones& fz = completeMesh().faceZones();
+            const faceZones& fz = completeMesh().faceZones();
 
             // Go through all the zoned face and find out if they
             // belong to a zone.  If so, add it to the zone as
@@ -1091,7 +1091,7 @@ void Foam::domainDecomposition::decompose()
 
         // Create cell zones
         {
-            const meshCellZones& cz = completeMesh().cellZones();
+            const cellZones& cz = completeMesh().cellZones();
 
             // Go through all the zoned cells and find out if they
             // belong to a zone.  If so, add it to the zone as
diff --git a/src/polyTopoChange/fvMeshDistribute/fvMeshDistribute.C b/src/polyTopoChange/fvMeshDistribute/fvMeshDistribute.C
index 978f55cbcd..2298babc38 100644
--- a/src/polyTopoChange/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/polyTopoChange/fvMeshDistribute/fvMeshDistribute.C
@@ -1525,7 +1525,7 @@ void Foam::fvMeshDistribute::sendMesh
     // in merged-zone indices.
     CompactListList<label> zonePoints;
     {
-        const meshPointZones& pointZones = mesh.pointZones();
+        const pointZones& pointZones = mesh.pointZones();
 
         labelList rowSizes(pointZoneNames.size(), 0);
 
@@ -1555,7 +1555,7 @@ void Foam::fvMeshDistribute::sendMesh
     CompactListList<label> zoneFaces;
     CompactListList<bool> zoneFaceFlip;
     {
-        const meshFaceZones& faceZones = mesh.faceZones();
+        const faceZones& faceZones = mesh.faceZones();
 
         labelList rowSizes(faceZoneNames.size(), 0);
 
@@ -1587,7 +1587,7 @@ void Foam::fvMeshDistribute::sendMesh
     // Assume sparse, possibly overlapping cell zones
     CompactListList<label> zoneCells;
     {
-        const meshCellZones& cellZones = mesh.cellZones();
+        const cellZones& cellZones = mesh.cellZones();
 
         labelList rowSizes(cellZoneNames.size(), 0);
 
@@ -1620,7 +1620,7 @@ void Foam::fvMeshDistribute::sendMesh
     //    cellZoneID.setSize(mesh.nCells());
     //    cellZoneID = -1;
     //
-    //    const meshCellZones& cellZones = mesh.cellZones();
+    //    const cellZones& cellZones = mesh.cellZones();
     //
     //    forAll(cellZones, zoneI)
     //    {
diff --git a/src/polyTopoChange/fvMeshSubset/fvMeshSubset.C b/src/polyTopoChange/fvMeshSubset/fvMeshSubset.C
index 3bdbd8f541..999f10b304 100644
--- a/src/polyTopoChange/fvMeshSubset/fvMeshSubset.C
+++ b/src/polyTopoChange/fvMeshSubset/fvMeshSubset.C
@@ -324,7 +324,7 @@ void Foam::fvMeshSubset::subsetZones()
 {
     // Keep all zones, even if zero size.
 
-    const meshPointZones& pointZones = baseMesh().pointZones();
+    const pointZones& pointZones = baseMesh().pointZones();
 
     // PointZones
     List<pointZone*> pZonePtrs(pointZones.size());
@@ -343,7 +343,7 @@ void Foam::fvMeshSubset::subsetZones()
 
 
     // FaceZones
-    const meshFaceZones& faceZones = baseMesh().faceZones();
+    const faceZones& faceZones = baseMesh().faceZones();
 
     // Do we need to remove zones where the side we're interested in
     // no longer exists? Guess not.
@@ -409,7 +409,7 @@ void Foam::fvMeshSubset::subsetZones()
     }
 
     // CellZones
-    const meshCellZones& cellZones = baseMesh().cellZones();
+    const cellZones& cellZones = baseMesh().cellZones();
 
     List<cellZone*> cZonePtrs(cellZones.size());
 
diff --git a/src/polyTopoChange/polyMeshAdder/polyMeshAdder.C b/src/polyTopoChange/polyMeshAdder/polyMeshAdder.C
index 8c4a333455..51518f7ecd 100644
--- a/src/polyTopoChange/polyMeshAdder/polyMeshAdder.C
+++ b/src/polyTopoChange/polyMeshAdder/polyMeshAdder.C
@@ -562,8 +562,8 @@ void Foam::polyMeshAdder::mergePrimitives
 void Foam::polyMeshAdder::mergePointZones
 (
     const label nAllPoints,
-    const meshPointZones& pz0,
-    const meshPointZones& pz1,
+    const pointZones& pz0,
+    const pointZones& pz1,
     const labelList& from0ToAllPoints,
     const labelList& from1ToAllPoints,
 
@@ -712,9 +712,9 @@ void Foam::polyMeshAdder::mergeFaceZones
     List<DynamicList<bool>>& fzFlips
 )
 {
-    const meshFaceZones& fz0 = mesh0.faceZones();
+    const faceZones& fz0 = mesh0.faceZones();
     const labelList& owner0 = mesh0.faceOwner();
-    const meshFaceZones& fz1 = mesh1.faceZones();
+    const faceZones& fz1 = mesh1.faceZones();
     const labelList& owner1 = mesh1.faceOwner();
 
 
@@ -890,8 +890,8 @@ void Foam::polyMeshAdder::mergeCellZones
 (
     const label nAllCells,
 
-    const meshCellZones& cz0,
-    const meshCellZones& cz1,
+    const cellZones& cz0,
+    const cellZones& cz1,
     const labelList& from1ToAllCells,
 
     DynamicList<word>& zoneNames,
diff --git a/src/polyTopoChange/polyMeshAdder/polyMeshAdder.H b/src/polyTopoChange/polyMeshAdder/polyMeshAdder.H
index 8f07a998d7..1450db76eb 100644
--- a/src/polyTopoChange/polyMeshAdder/polyMeshAdder.H
+++ b/src/polyTopoChange/polyMeshAdder/polyMeshAdder.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,8 +133,8 @@ private:
         (
             const label nAllPoints,
 
-            const meshPointZones& pz0,
-            const meshPointZones& pz1,
+            const pointZones& pz0,
+            const pointZones& pz1,
             const labelList& from0ToAllPoints,
             const labelList& from1ToAllPoints,
 
@@ -165,8 +165,8 @@ private:
         (
             const label nAllCells,
 
-            const meshCellZones& cz0,
-            const meshCellZones& cz1,
+            const cellZones& cz0,
+            const cellZones& cz1,
             const labelList& from1ToAllCells,
 
             DynamicList<word>& zoneNames,
diff --git a/src/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/polyTopoChange/polyTopoChange/polyTopoChange.C
index 7faff37f17..895d30441c 100644
--- a/src/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -2322,7 +2322,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::makeMesh
     // ~~~~~
 
     // Copy pointZone from old mesh
-    const meshPointZones& oldPointZones = mesh.pointZones();
+    const pointZones& oldPointZones = mesh.pointZones();
     List<pointZone*> pZonePtrs(oldPointZones.size());
     {
         forAll(oldPointZones, i)
@@ -2332,7 +2332,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::makeMesh
     }
 
     // Copy faceZone from old mesh
-    const meshFaceZones& oldFaceZones = mesh.faceZones();
+    const faceZones& oldFaceZones = mesh.faceZones();
     List<faceZone*> fZonePtrs(oldFaceZones.size());
     {
         forAll(oldFaceZones, i)
@@ -2342,7 +2342,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::makeMesh
     }
 
     // Copy cellZone from old mesh
-    const meshCellZones& oldCellZones = mesh.cellZones();
+    const cellZones& oldCellZones = mesh.cellZones();
     List<cellZone*> cZonePtrs(oldCellZones.size());
     {
         forAll(oldCellZones, i)