update some names

8 files changed, 14 insertions, 14 deletions

diff --git a/bin/keystone b/bin/keystone
index 6e0f4398..5f75279b 100755
--- a/bin/keystone
+++ b/bin/keystone
@@ -19,7 +19,7 @@ if os.path.exists(os.path.join(possible_topdir,
 from paste import deploy
 
 from keystone import config
-from keystone import wsgi
+from keystone.common import wsgi
 
 
 CONF = config.CONF
diff --git a/bin/keystone-manage b/bin/keystone-manage
index 63c1aac1..d290c8cd 100755
--- a/bin/keystone-manage
+++ b/bin/keystone-manage
@@ -19,7 +19,7 @@ if os.path.exists(os.path.join(possible_topdir,
 
 
 from keystone import config
-from keystone import utils
+from keystone.common import utils
 
 
 CONF = config.CONF
diff --git a/etc/keystone.conf b/etc/keystone.conf
index f4c38e07..bbc84b78 100644
--- a/etc/keystone.conf
+++ b/etc/keystone.conf
@@ -23,23 +23,23 @@ max_pool_size = 10
 pool_timeout = 200
 
 [identity]
-driver = keystone.backends.kvs.KvsIdentity
+driver = keystone.identity.backends.kvs.Identity
 
 [catalog]
-driver = keystone.backends.templated.TemplatedCatalog
+driver = keystone.catalog.backends.templated.TemplatedCatalog
 template_file = ./etc/default_catalog.templates
 
 [token]
-driver = keystone.backends.kvs.KvsToken
+driver = keystone.token.backends.kvs.Token
 
 [policy]
-driver = keystone.backends.policy.SimpleMatch
+driver = keystone.policy.backends.simple.SimpleMatch
 
 [ec2]
-driver = keystone.backends.kvs.KvsEc2
+driver = keystone.contrib.ec2.backends.kvs.Ec2
 
 [filter:debug]
-paste.filter_factory = keystone.wsgi:Debug.factory
+paste.filter_factory = keystone.common.wsgi:Debug.factory
 
 [filter:token_auth]
 paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory
@@ -51,10 +51,10 @@ paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory
 paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory
 
 [filter:crud_extension]
-paste.filter_factory = keystone.service:AdminCrudExtension.factory
+paste.filter_factory = keystone.contrib.admin_crud:CrudExtension.factory
 
 [filter:ec2_extension]
-paste.filter_factory = keystone.service:Ec2Extension.factory
+paste.filter_factory = keystone.contrib.ec2:Ec2Extension.factory
 
 [app:public_service]
 paste.app_factory = keystone.service:public_app_factory
diff --git a/keystone/catalog/backends/kvs.py b/keystone/catalog/backends/kvs.py
index 84d18572..69f45492 100644
--- a/keystone/catalog/backends/kvs.py
+++ b/keystone/catalog/backends/kvs.py
@@ -4,7 +4,7 @@
 from keystone.common import kvs
 
 
-class KvsCatalog(kvs.Base):
+class Catalog(kvs.Base):
     # Public interface
     def get_catalog(self, user_id, tenant_id, metadata=None):
         return self.db.get('catalog-%s-%s' % (tenant_id, user_id))
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index 78d3008a..f12e852b 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -82,7 +82,7 @@ class UserTenantMembership(sql.ModelBase, sql.DictBase):
                            primary_key=True)
 
 
-class SqlIdentity(sql.Base):
+class Identity(sql.Base):
     # Internal interface to manage the database
     def db_sync(self):
         migration.db_sync()
diff --git a/keystone/middleware/__init__.py b/keystone/middleware/__init__.py
index 1593e6e2..e2e9a993 100644
--- a/keystone/middleware/__init__.py
+++ b/keystone/middleware/__init__.py
@@ -1 +1 @@
-from keystone.middleware.internal import *
+from keystone.middleware.core import *
diff --git a/keystone/middleware/internal.py b/keystone/middleware/core.py
index 389c9bf0..389c9bf0 100644
--- a/keystone/middleware/internal.py
+++ b/keystone/middleware/core.py
diff --git a/keystone/token/backends/kvs.py b/keystone/token/backends/kvs.py
index 574b2fc7..8686a3dc 100644
--- a/keystone/token/backends/kvs.py
+++ b/keystone/token/backends/kvs.py
@@ -2,7 +2,7 @@
 
 from keystone.common import kvs
 
-class KvsToken(kvs.Base):
+class Token(kvs.Base):
     # Public interface
     def get_token(self, token_id):
         return self.db.get('token-%s' % token_id)