Index: /trunk/glueforge/templates/psdb/code.tt
===================================================================
--- /trunk/glueforge/templates/psdb/code.tt	(revision 3869)
+++ /trunk/glueforge/templates/psdb/code.tt	(revision 3870)
@@ -1,3 +1,5 @@
 #include "[% namespace %]db.h"
+
+#define [% namespace FILTER upper %]_TABLE_NAME [% table_name %]
 
 [% INCLUDE init.tt %]
Index: /trunk/glueforge/templates/psdb/header.tt
===================================================================
--- /trunk/glueforge/templates/psdb/header.tt	(revision 3869)
+++ /trunk/glueforge/templates/psdb/header.tt	(revision 3870)
@@ -11,7 +11,6 @@
 /// @{
 
-#define [% namespace FILTER upper %]_TABLE_NAME [% table_name %]
-
 [% INCLUDE object_h.tt %]
+[% INCLUDE alloc_h.tt %]
 [% INCLUDE init_h.tt %]
 [% INCLUDE create_h.tt %]
Index: /trunk/glueforge/templates/psdb/insertobject_h.tt
===================================================================
--- /trunk/glueforge/templates/psdb/insertobject_h.tt	(revision 3869)
+++ /trunk/glueforge/templates/psdb/insertobject_h.tt	(revision 3870)
@@ -7,5 +7,5 @@
  * @return true on success
  */
-bool [% namespace %]Insert[% object_name %](
+bool [% namespace %]InsertObject(
     psDB            *dbh,               ///< Database handle
     [% indented(object_name, "*object") %]///< [% object_name %] object
Index: /trunk/glueforge/templates/psdb/popobject_h.tt
===================================================================
--- /trunk/glueforge/templates/psdb/popobject_h.tt	(revision 3869)
+++ /trunk/glueforge/templates/psdb/popobject_h.tt	(revision 3870)
@@ -6,5 +6,5 @@
  */
 
-[% object_name %] [% namespace %]Pop[% object_name %](
+[% object_name %] [% namespace %]PopObject(
     psDB            *dbh                ///< Database handle
 );