diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index a0e9a99b64..b43e4db9ff 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -26,21 +26,14 @@ Class
     Foam::polyPatch
 
 Description
-    A patch is a list of labels, which address the faces in the global face
-    list. Based on the global faces, the patch can calculate its own edge.
+    A patch is a list of labels that address the faces in the global face list.
+
+    The patch can calculate its own edges based on the global faces.
     Patch also contains all addressing between the faces.
 
 SourceFiles
     polyPatch.C
-    calcPolyPatchAddressing.C
-    calcPolyPatchFaceCells.C
-    calcPolyPatchIntBdryEdges.C
-    calcPolyPatchMeshEdges.C
-    calcPolyPatchMeshData.C
-    calcPolyPatchPointAddressing.C
-    clearPolyPatch.C
     newPolyPatch.C
-    polyPatchTools.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -59,10 +52,9 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-class polyBoundaryMesh;
-
 // Forward declaration of friend functions and operators
 
+class polyBoundaryMesh;
 class polyPatch;
 
 Ostream& operator<<(Ostream&, const polyPatch&);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchTools.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.C
similarity index 87%
rename from src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchTools.C
rename to src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.C
index bd41c42c5b..45f634ea50 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchTools.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.C
@@ -24,12 +24,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatchTools.H"
+#include "PatchTools.H"
 
-#include "PrimitivePatchToolsCheck.C"
-#include "PrimitivePatchToolsEdgeOwner.C"
-#include "PrimitivePatchToolsSearch.C"
-#include "PrimitivePatchToolsSortEdges.C"
+#include "PatchToolsCheck.C"
+#include "PatchToolsEdgeOwner.C"
+#include "PatchToolsSearch.C"
+#include "PatchToolsSortEdges.C"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchTools.H b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
similarity index 92%
rename from src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchTools.H
rename to src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
index c4631b1be5..403a115ec4 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchTools.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
@@ -23,18 +23,24 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::PrimitivePatchTools
+    Foam::PatchTools
 
 Description
-    A collect of tools for searching, sort PrimitivePatch information.
+    A collection of tools for searching, sorting PrimitivePatch information.
+
+    The class could also be extended to include more that just static methods.
 
 SourceFiles
-    PrimitivePatchTools.C
+    PatchTools.C
+    PatchToolsCheck.C
+    PatchToolsEdgeOwner.C
+    PatchToolsSearch.C
+    PatchToolsSortEdges.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef PrimitivePatchTools_H
-#define PrimitivePatchTools_H
+#ifndef PatchTools_H
+#define PatchTools_H
 
 #include "PrimitivePatch.H"
 #include "HashSet.H"
@@ -45,7 +51,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class PatchTools Declaration
+                         Class PatchTools Declaration
 \*---------------------------------------------------------------------------*/
 
 class PatchTools
@@ -171,7 +177,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PrimitivePatchTools.C"
+#   include "PatchTools.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsCheck.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsCheck.C
similarity index 99%
rename from src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsCheck.C
rename to src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsCheck.C
index e779d61b18..5fcec15c95 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsCheck.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatchTools.H"
+#include "PatchTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsEdgeOwner.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
similarity index 98%
rename from src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsEdgeOwner.C
rename to src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
index ecf85633e2..2c1cac1be7 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsEdgeOwner.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatchTools.H"
+#include "PatchTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsSearch.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
similarity index 99%
rename from src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsSearch.C
rename to src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
index 639d375972..0f271008a9 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsSearch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
@@ -27,7 +27,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatchTools.H"
+#include "PatchTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsSortEdges.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
similarity index 99%
rename from src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsSortEdges.C
rename to src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
index 0aaa3b2e48..8e985bcfa8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchTools/PrimitivePatchToolsSortEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PrimitivePatchTools.H"
+#include "PatchTools.H"
 #include "SortableList.H"
 #include "transform.H"
 
diff --git a/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
index e43cfa48fa..89120b255e 100644
--- a/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
+++ b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
@@ -37,7 +37,7 @@ SourceFiles
 #define BasicMeshedSurface_H
 
 #include "PrimitivePatch.H"
-#include "PrimitivePatchTools.H"
+#include "PatchTools.H"
 #include "pointField.H"
 #include "face.H"
 #include "triFace.H"
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 8e9d86d207..99f54c3a6d 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -26,7 +26,6 @@ License
 
 #include "MeshedSurface.H"
 #include "UnsortedMeshedSurface.H"
-#include "PrimitivePatchTools.H"
 #include "IFstream.H"
 #include "OFstream.H"
 #include "Time.H"
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 5f762d929a..7387b64cfa 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -26,7 +26,6 @@ License
 
 #include "MeshedSurface.H"
 #include "UnsortedMeshedSurface.H"
-#include "PrimitivePatchTools.H"
 #include "IFstream.H"
 #include "OFstream.H"
 #include "Time.H"