diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaces.C b/src/surfMesh/MeshedSurface/MeshedSurfaces.C
index e6d7c3856f..15ac8eff77 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaces.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaces.C
@@ -33,13 +33,17 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define makeMeshedSurface(surfaceType)                                        \
-defineNamedTemplateTypeNameAndDebug(surfaceType, 0);                          \
-defineTemplateMemberFunctionSelectionTable(surfaceType,write,fileExtension);  \
-defineTemplateRunTimeSelectionTable(surfaceType, fileExtension);
+#define makeMeshedSurface(faceType)                                           \
+    defineNamedTemplateTypeNameAndDebug                                       \
+        (MeshedSurface<faceType>, 0);                                         \
+    defineTemplatedRunTimeSelectionTable                                      \
+        (MeshedSurface, fileExtension,faceType);                              \
+    defineTemplatedMemberFunctionSelectionTable                               \
+        (MeshedSurface, write,fileExtension,faceType);
 
-makeMeshedSurface(meshedSurface)
-makeMeshedSurface(triMeshedSurface)
+
+makeMeshedSurface(face)
+makeMeshedSurface(triFace)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
index 9dd95cd0c4..2b12160a0a 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C
@@ -33,13 +33,17 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define makeUnsortedMeshedSurface(surfaceType)                                \
-defineNamedTemplateTypeNameAndDebug(surfaceType, 0);                          \
-defineTemplateRunTimeSelectionTable(surfaceType, fileExtension);              \
-defineTemplateMemberFunctionSelectionTable(surfaceType,write,fileExtension);
+#define makeUnsortedMeshedSurface(faceType)                                   \
+    defineNamedTemplateTypeNameAndDebug                                       \
+        (UnsortedMeshedSurface<faceType>, 0);                                 \
+    defineTemplatedRunTimeSelectionTable                                      \
+        (UnsortedMeshedSurface, fileExtension,faceType);                      \
+    defineTemplatedMemberFunctionSelectionTable                               \
+        (UnsortedMeshedSurface, write,fileExtension,faceType);
 
-makeUnsortedMeshedSurface(unsortedMeshedSurface)
-makeUnsortedMeshedSurface(triUnsortedMeshedSurface)
+
+makeUnsortedMeshedSurface(face)
+makeUnsortedMeshedSurface(triFace)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //