Index: trunk/glueforge/templates/psdb/popobject.tt
===================================================================
--- trunk/glueforge/templates/psdb/popobject.tt	(revision 4341)
+++ trunk/glueforge/templates/psdb/popobject.tt	(revision 5907)
@@ -1,7 +1,7 @@
 [% USE format -%]
 [% indented = format('%-15s %s') -%]
-[% object_name %] *[% namespace %]PopObject(psDB *dbh)
+[% table.object_name %] *[% table.namespace %]PopObject(psDB *dbh)
 {
-[% FOREACH item = columns -%]
+[% FOREACH item = table.columns -%]
 [% IF item.type == "STR" -%]
     [% indented("char", "$item.name[256]") %];
@@ -11,7 +11,7 @@
 [% END -%]
 
-    if (![% namespace %]Pop(dbh, 
+    if (![% table.namespace %]Pop(dbh, 
 [%- SET i = 0 -%]
-[% FOREACH item = columns -%]
+[% FOREACH item = table.columns -%]
 [% IF i == 0 %][% i = 1 %][% ELSE %], [% END -%]
 [% IF item.type == "STR" -%]
@@ -25,7 +25,7 @@
     }
 
-    return [% object_name %]Alloc(
+    return [% table.object_name %]Alloc(
 [%- SET i = 0 -%]
-[% FOREACH item = columns -%]
+[% FOREACH item = table.columns -%]
 [% IF i == 0 -%][%- i = 1 -%][% ELSE %], [% END -%]
 [% item.name %]