Index: /trunk/glueforge/templates/psdb/header.tt
===================================================================
--- /trunk/glueforge/templates/psdb/header.tt	(revision 3861)
+++ /trunk/glueforge/templates/psdb/header.tt	(revision 3862)
@@ -16,5 +16,5 @@
 [% INCLUDE insert_h.tt %]
 [% INCLUDE insertobject_h.tt %]
-[% INCLUDE pop_h.tt %]
+[% INCLUDE popobject_h.tt %]
 
 /// @}
Index: unk/glueforge/templates/psdb/pop_h.tt
===================================================================
--- /trunk/glueforge/templates/psdb/pop_h.tt	(revision 3861)
+++ 	(revision )
@@ -1,10 +1,0 @@
-/** Removes the last row from the database and returns it
- *
- * This function constructs and inserts a single row based on it's parameters.
- *
- * @return true on success
- */
-
-[% object_name %] [% namespace %]Pop(
-    psDB            *dbh                ///< Database handle
-);
Index: /trunk/glueforge/templates/psdb/popobject_h.tt
===================================================================
--- /trunk/glueforge/templates/psdb/popobject_h.tt	(revision 3862)
+++ /trunk/glueforge/templates/psdb/popobject_h.tt	(revision 3862)
@@ -0,0 +1,10 @@
+/** Removes the last row from the database and returns it
+ *
+ * This function constructs and inserts a single row based on it's parameters.
+ *
+ * @return true on success
+ */
+
+[% object_name %] [% namespace %]Pop[% object_name %](
+    psDB            *dbh                ///< Database handle
+);