diff --git a/src/OpenFOAM/db/memberFunctionSelection/addToMemberFunctionSelectionTable.H b/src/OpenFOAM/db/memberFunctionSelection/addToMemberFunctionSelectionTable.H
index 5d6b78db47..7bfd089dc3 100644
--- a/src/OpenFOAM/db/memberFunctionSelection/addToMemberFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/memberFunctionSelection/addToMemberFunctionSelectionTable.H
@@ -26,7 +26,7 @@ InClass
     Foam::memberFunctionSelectionTables
 
 Description
-    Macros to enable the easy insertion into member function selection tables.
+    Macros for easy insertion into member function selection tables
 
 \*---------------------------------------------------------------------------*/
 
@@ -47,14 +47,13 @@ Description
                                                                               \
     /* Add the thisType constructor function to the table */                  \
     baseType::add##memberFunction##argNames##MemberFunctionToTable<thisType>  \
-    add##thisType##memberFunction##argNames##MemberFunctionTo##baseType##Table_(#lookup)
+    add_##lookup##_##thisType##memberFunction##argNames##MemberFunctionTo##baseType##Table_(#lookup)
 
 #define addTemplateToMemberFunctionSelectionTable\
 (baseType,thisType,Targ,memberFunction,argNames)                              \
                                                                               \
     /* Add the thisType constructor function to the table */                  \
-    baseType::add##memberFunction##argNames##MemberFunctionToTable            \
-    <thisType<Targ> >                                                         \
+    baseType::add##memberFunction##argNames##MemberFunctionToTable<thisType<Targ> > \
     add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##baseType##Table_
 
 
diff --git a/src/OpenFOAM/db/runTimeSelection/addToRunTimeSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/addToRunTimeSelectionTable.H
index b3bbf50cb7..3a1d74e28a 100644
--- a/src/OpenFOAM/db/runTimeSelection/addToRunTimeSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/addToRunTimeSelectionTable.H
@@ -26,7 +26,7 @@ InClass
     Foam::runTimeSelectionTables
 
 Description
-    Macros to enable the easy insertion into run-time selection tables.
+    Macros for easy insertion into run-time selection tables
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,7 +45,7 @@ Description
                                                                               \
     /* Add the thisType constructor function to the table */                  \
     baseType::add##argNames##ConstructorToTable<thisType>                     \
-        add##thisType##argNames##ConstructorTo##baseType##Table_(#lookup)
+        add_##lookup##_##thisType##argNames##ConstructorTo##baseType##Table_(#lookup)
 
 #define addTemplateToRunTimeSelectionTable(baseType,thisType,Targ,argNames)   \
                                                                               \