Index: trunk/glueforge/templates/psdb/code.tt
===================================================================
--- trunk/glueforge/templates/psdb/code.tt	(revision 3864)
+++ trunk/glueforge/templates/psdb/code.tt	(revision 3865)
@@ -1,3 +1,3 @@
-#include "[% table_name %]db.h"
+#include "[% namespace %]db.h"
 
 [% INCLUDE init.tt %]
Index: trunk/glueforge/templates/psdb/create.tt
===================================================================
--- trunk/glueforge/templates/psdb/create.tt	(revision 3864)
+++ trunk/glueforge/templates/psdb/create.tt	(revision 3865)
@@ -1,3 +1,3 @@
-bool [% table_name %]CreateTable(psDB *dbh) {
+bool [% namespace %]CreateTable(psDB *dbh) {
     psMetadata          *md;
     bool                status;
@@ -20,5 +20,5 @@
         [%- i = i + 1 %]
     [%- END %]
-    status = psDBCreateTable(dbh, "[% table_name %]", md);
+    status = psDBCreateTable(dbh, "[% namespace FILTER upper %]_TABLE_NAME", md);
     psFree(md);
 
Index: trunk/glueforge/templates/psdb/init.tt
===================================================================
--- trunk/glueforge/templates/psdb/init.tt	(revision 3864)
+++ trunk/glueforge/templates/psdb/init.tt	(revision 3865)
@@ -1,3 +1,3 @@
-psDB *[% table_name %]Init(const char *host, const char *user, const char *passwd, const char *dbname) {
+psDB *[% namespace %]Init(const char *host, const char *user, const char *passwd, const char *dbname) {
 
     psDB            *dbh;
Index: trunk/glueforge/templates/psdb/insert.tt
===================================================================
--- trunk/glueforge/templates/psdb/insert.tt	(revision 3864)
+++ trunk/glueforge/templates/psdb/insert.tt	(revision 3865)
@@ -1,3 +1,3 @@
-bool [% table_name %]Insert(psDB * dbh,
+bool [% namespace %]Insert(psDB * dbh,
     [%- SET i = 0 -%]
     [%- FOREACH item = columns -%]
@@ -22,5 +22,5 @@
         [%- i = i + 1 %]
     [%- END %]
-    status = psDBInsertOneRow(dbh, "[% table_name %]", row);
+    status = psDBInsertOneRow(dbh, "[% namespace FILTER upper %]_TABLE_NAME", row);
     psFree(row);
 
Index: trunk/glueforge/templates/psdb/makefile.tt
===================================================================
--- trunk/glueforge/templates/psdb/makefile.tt	(revision 3864)
+++ trunk/glueforge/templates/psdb/makefile.tt	(revision 3865)
@@ -6,10 +6,10 @@
 
 
-objects=[% table_name %]db.o
+objects=[% namespace %]db.o
 
-all: lib[% table_name %]db.so
+all: lib[% namespace %]db.so
 
-lib[% table_name %]db.so: $(objects)
-	$(CC) $(CFLAGS) -shared -o lib[% table_name %]db.so $(objects) $(LIBS)
+lib[% namespace %]db.so: $(objects)
+	$(CC) $(CFLAGS) -shared -o lib[% namespace %]db.so $(objects) $(LIBS)
 
 $(objects): %.o : %.c