Index: trunk/packages/sipb-xen-www/code/main.py
===================================================================
--- trunk/packages/sipb-xen-www/code/main.py	(revision 863)
+++ trunk/packages/sipb-xen-www/code/main.py	(revision 864)
@@ -40,6 +40,5 @@
 import controls
 from getafsgroups import getAfsGroupMembers
-import sipb_xen_database
-from invirt import database
+import sipb_xen_database as database
 from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
 from invirt.config import structs as config
@@ -86,5 +85,5 @@
         return '<p>STDERR:</p><pre>' + str(addition) + '</pre>'
 
-Template.sipb_xen_database = sipb_xen_database
+Template.database = database
 Template.helppopup = staticmethod(helppopup)
 Template.err = None
@@ -679,5 +678,5 @@
     def __iter__(self):
         start_time = time.time()
-        sipb_xen_database.clear_cache()
+        database.clear_cache()
         sys.stderr = StringIO()
         fields = cgi.FieldStorage(fp=self.environ['wsgi.input'], environ=self.environ)
Index: trunk/packages/sipb-xen-www/code/templates/functions.tmpl
===================================================================
--- trunk/packages/sipb-xen-www/code/templates/functions.tmpl	(revision 863)
+++ trunk/packages/sipb-xen-www/code/templates/functions.tmpl	(revision 864)
@@ -21,5 +21,5 @@
 #def cdromList($default="", $onchange=None)
 #filter None
-$databaseList(sorted($sipb_xen_database.CDROM.select(), key=lambda x: x.description),
+$databaseList(sorted($database.CDROM.select(), key=lambda x: x.description),
               default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')
 #end filter
@@ -28,5 +28,5 @@
 #def autoList($default="", $onchange=None)
 #filter None
-$databaseList(sorted($sipb_xen_database.Autoinstall.select(), key=lambda x: x.description),
+$databaseList(sorted($database.Autoinstall.select(), key=lambda x: x.description),
               default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')
 #end filter
Index: trunk/packages/sipb-xen-www/code/webcommon.py
===================================================================
--- trunk/packages/sipb-xen-www/code/webcommon.py	(revision 863)
+++ trunk/packages/sipb-xen-www/code/webcommon.py	(revision 864)
@@ -2,5 +2,5 @@
 
 import time
-from sipb_xen_database import Machine, MachineAccess
+from invirt.database import Machine, MachineAccess
 
 class MyException(Exception):