--- a/sat_pubsub/tap.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/tap.py	Thu May 17 01:53:12 2012 +0200
@@ -62,8 +62,8 @@
 from wokkel.iwokkel import IPubSubResource
 from wokkel.pubsub import PubSubService
 
-from idavoll import __version__
-from idavoll.backend import BackendService
+from sat_pubsub import __version__
+from sat_pubsub.backend import BackendService
 
 class Options(usage.Options):
     optParameters = [
@@ -99,7 +99,7 @@
 
     if config['backend'] == 'pgsql':
         from twisted.enterprise import adbapi
-        from idavoll.pgsql_storage import Storage
+        from sat_pubsub.pgsql_storage import Storage
         dbpool = adbapi.ConnectionPool('psycopg2',
                                        user=config['dbuser'],
                                        password=config['dbpass'],
@@ -111,7 +111,7 @@
                                        )
         st = Storage(dbpool)
     elif config['backend'] == 'memory':
-        from idavoll.memory_storage import Storage
+        from sat_pubsub.memory_storage import Storage
         st = Storage()
 
     bs = BackendService(st)