Index: trunk/glueforge/templates/psdb/alloc.tt
===================================================================
--- trunk/glueforge/templates/psdb/alloc.tt	(revision 4196)
+++ trunk/glueforge/templates/psdb/alloc.tt	(revision 5907)
@@ -1,9 +1,9 @@
 [% USE format -%]
 [% indented = format('%-15s %s') -%]
-static void [% object_name %]Free([% object_name %] *object);
+static void [% table.object_name %]Free([% table.object_name %] *object);
 
-[% object_name %] *[% object_name %]Alloc(
+[% table.object_name %] *[% table.object_name %]Alloc(
 [%- SET i = 0 -%]
-[% FOREACH item = columns -%]
+[% FOREACH item = table.columns -%]
 [% IF i == 0 %][% i = 1 %][% ELSE %], [% END -%]
 [% IF item.type == "STR" -%]
@@ -15,10 +15,10 @@
 )
 {
-    [% indented(object_name, "*object") %];
+    [% indented(table.object_name, "*object") %];
 
-    object = psAlloc(sizeof([% object_name %]));
-    psMemSetDeallocator(object, (psFreeFcn)[% object_name %]Free);
+    object = psAlloc(sizeof([% table.object_name %]));
+    psMemSetDeallocator(object, (psFreeFunc)[% table.object_name %]Free);
 
-[% FOREACH item = columns -%]
+[% FOREACH item = table.columns -%]
 [% IF item.type == "STR" -%]
     object->[% item.name %] = psStringCopy([% item.name %]);
@@ -31,7 +31,7 @@
 }
 
-static void [% object_name %]Free([% object_name %] *object)
+static void [% table.object_name %]Free([% table.object_name %] *object)
 {
-[% FOREACH item = columns -%]
+[% FOREACH item = table.columns -%]
 [% IF item.type == "STR" -%]
     psFree(object->[% item.name %]);