Refactored api function names to avoid redundancy with new module names

9 files changed, 244 insertions, 246 deletions

diff --git a/keystone/db/sqlalchemy/api/baseurl.py b/keystone/db/sqlalchemy/api/baseurl.py
index cec6e581..3a046c22 100644
--- a/keystone/db/sqlalchemy/api/baseurl.py
+++ b/keystone/db/sqlalchemy/api/baseurl.py
@@ -17,27 +17,27 @@
 
 from keystone.db.sqlalchemy import get_session, models, aliased
 
-def baseurls_create(values):
+def create(values):
     baseurls_ref = models.BaseUrls()
     baseurls_ref.update(values)
     baseurls_ref.save()
     return baseurls_ref
 
 
-def baseurls_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.BaseUrls).filter_by(id=id).first()
     return result
 
 
-def baseurls_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     return session.query(models.BaseUrls).all()
 
 
-def baseurls_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -50,7 +50,7 @@ def baseurls_get_page(marker, limit, session=None):
                             models.BaseUrls.id.desc()).limit(limit).all()
 
 
-def baseurls_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.BaseUrls).order_by(\
@@ -88,7 +88,7 @@ def baseurls_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def baseurls_ref_get_by_tenant_get_page(tenant_id, marker, limit,
+def ref_get_by_tenant_get_page(tenant_id, marker, limit,
                                         session=None):
     if not session:
         session = get_session()
@@ -104,7 +104,7 @@ def baseurls_ref_get_by_tenant_get_page(tenant_id, marker, limit,
             order_by(models.TenantBaseURLAssociation.id).limit(limit).all()
 
 
-def baseurls_ref_get_by_tenant_get_page_markers(tenant_id, marker, limit,
+def ref_get_by_tenant_get_page_markers(tenant_id, marker, limit,
                                                 session=None):
     if not session:
         session = get_session()
@@ -154,14 +154,14 @@ def baseurls_ref_get_by_tenant_get_page_markers(tenant_id, marker, limit,
     return (prev, next)
 
 
-def baseurls_ref_add(values):
+def ref_add(values):
     baseurls_ref = models.TenantBaseURLAssociation()
     baseurls_ref.update(values)
     baseurls_ref.save()
     return baseurls_ref
 
 
-def baseurls_ref_get(id, session=None):
+def ref_get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.TenantBaseURLAssociation).\
@@ -169,7 +169,7 @@ def baseurls_ref_get(id, session=None):
     return result
 
 
-def baseurls_ref_get_by_tenant(tenant_id, session=None):
+def ref_get_by_tenant(tenant_id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.TenantBaseURLAssociation).\
@@ -177,9 +177,9 @@ def baseurls_ref_get_by_tenant(tenant_id, session=None):
     return result
 
 
-def baseurls_ref_delete(id, session=None):
+def ref_delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        baseurls_ref = baseurls_ref_get(id, session)
+        baseurls_ref = ref_get(id, session)
         session.delete(baseurls_ref)
diff --git a/keystone/db/sqlalchemy/api/group.py b/keystone/db/sqlalchemy/api/group.py
index 866073ac..dbc75752 100644
--- a/keystone/db/sqlalchemy/api/group.py
+++ b/keystone/db/sqlalchemy/api/group.py
@@ -17,14 +17,14 @@
 
 from keystone.db.sqlalchemy import get_session, models, aliased
 
-def group_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Group).filter_by(id=id).first()
     return result
 
 
-def group_users(id, session=None):
+def get_users(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.User).filter_by(\
@@ -32,14 +32,14 @@ def group_users(id, session=None):
     return result
 
 
-def group_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     result = session.query(models.Group)
     return result
 
 
-def group_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -52,7 +52,7 @@ def group_get_page(marker, limit, session=None):
                             models.Group.id.desc()).limit(limit).all()
 
 
-def group_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.Group).order_by(\
@@ -90,14 +90,14 @@ def group_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def group_delete(id, session=None):
+def delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        group_ref = group_get(id, session)
+        group_ref = get(id, session)
         session.delete(group_ref)
 
-def groups_get_by_user_get_page(user_id, marker, limit, session=None):
+def get_by_user_get_page(user_id, marker, limit, session=None):
     if not session:
         session = get_session()
     uga = aliased(models.UserGroupAssociation)
@@ -116,7 +116,7 @@ def groups_get_by_user_get_page(user_id, marker, limit, session=None):
                             group.id).limit(limit).all()
 
 
-def groups_get_by_user_get_page_markers(user_id, marker, limit, session=None):
+def get_by_user_get_page_markers(user_id, marker, limit, session=None):
     if not session:
         session = get_session()
     uga = aliased(models.UserGroupAssociation)
diff --git a/keystone/db/sqlalchemy/api/role.py b/keystone/db/sqlalchemy/api/role.py
index e16d8e63..1d39be0a 100644
--- a/keystone/db/sqlalchemy/api/role.py
+++ b/keystone/db/sqlalchemy/api/role.py
@@ -17,27 +17,27 @@
 
 from keystone.db.sqlalchemy import get_session, models
 
-def role_create(values):
+def create(values):
     role_ref = models.Role()
     role_ref.update(values)
     role_ref.save()
     return role_ref
 
 
-def role_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Role).filter_by(id=id).first()
     return result
 
 
-def role_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     return session.query(models.Role).all()
 
 
-def role_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -50,7 +50,7 @@ def role_get_page(marker, limit, session=None):
                             models.Role.id.desc()).limit(limit).all()
 
 
-def role_ref_get_page(marker, limit, user_id, session=None):
+def ref_get_page(marker, limit, user_id, session=None):
     if not session:
         session = get_session()
 
@@ -65,35 +65,35 @@ def role_ref_get_page(marker, limit, user_id, session=None):
                 models.UserRoleAssociation.id.desc()).limit(limit).all()
 
 
-def role_ref_get_all_global_roles(user_id, session=None):
+def ref_get_all_global_roles(user_id, session=None):
     if not session:
         session = get_session()
     return session.query(models.UserRoleAssociation).\
                 filter_by(user_id=user_id).filter("tenant_id is null").all()
 
 
-def role_ref_get_all_tenant_roles(user_id, tenant_id, session=None):
+def ref_get_all_tenant_roles(user_id, tenant_id, session=None):
     if not session:
         session = get_session()
     return session.query(models.UserRoleAssociation).\
             filter_by(user_id=user_id).filter_by(tenant_id=tenant_id).all()
 
 
-def role_ref_get(id, session=None):
+def ref_get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.UserRoleAssociation).filter_by(id=id).first()
     return result
 
 
-def role_ref_delete(id, session=None):
+def ref_delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        role_ref = role_ref_get(id, session)
+        role_ref = ref_get(id, session)
         session.delete(role_ref)
 
-def role_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.Role).order_by(\
@@ -131,7 +131,7 @@ def role_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def role_ref_get_page_markers(user_id, marker, limit, session=None):
+def ref_get_page_markers(user_id, marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.UserRoleAssociation).filter_by(\
diff --git a/keystone/db/sqlalchemy/api/tenant.py b/keystone/db/sqlalchemy/api/tenant.py
index 29646e15..2af370a0 100644
--- a/keystone/db/sqlalchemy/api/tenant.py
+++ b/keystone/db/sqlalchemy/api/tenant.py
@@ -17,21 +17,21 @@
 
 from keystone.db.sqlalchemy import get_session, models, aliased
 
-def tenant_create(values):
+def create(values):
     tenant_ref = models.Tenant()
     tenant_ref.update(values)
     tenant_ref.save()
     return tenant_ref
 
 
-def tenant_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Tenant).filter_by(id=id).first()
     return result
 
 
-def tenant_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     return session.query(models.Tenant).all()
@@ -51,8 +51,7 @@ def tenants_for_user_get_page(user, marker, limit, session=None):
                 marker='%s' % marker).order_by(\
                 tenant.id.desc()).limit(limit).all()
     else:
-        return q3.order_by(\
-                            tenant.id.desc()).limit(limit).all()
+        return q3.order_by(tenant.id.desc()).limit(limit).all()
 
 
 def tenants_for_user_get_page_markers(user, marker, limit, session=None):
@@ -98,7 +97,7 @@ def tenants_for_user_get_page_markers(user, marker, limit, session=None):
     return (prev, next)
 
 
-def tenant_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -111,7 +110,7 @@ def tenant_get_page(marker, limit, session=None):
                             models.Tenant.id.desc()).limit(limit).all()
 
 
-def tenant_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.Tenant).order_by(\
@@ -149,7 +148,7 @@ def tenant_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def tenant_is_empty(id, session=None):
+def is_empty(id, session=None):
     if not session:
         session = get_session()
     a_user = session.query(models.UserRoleAssociation).filter_by(\
@@ -165,24 +164,24 @@ def tenant_is_empty(id, session=None):
     return True
 
 
-def tenant_update(id, values, session=None):
+def update(id, values, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        tenant_ref = tenant_get(id, session)
+        tenant_ref = get(id, session)
         tenant_ref.update(values)
         tenant_ref.save(session=session)
 
 
-def tenant_delete(id, session=None):
+def delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        tenant_ref = tenant_get(id, session)
+        tenant_ref = get(id, session)
         session.delete(tenant_ref)
 
 
-def tenant_baseurls_get_all(tenant_id, session=None):
+def get_all_baseurls(tenant_id, session=None):
     if not session:
         session = get_session()
     tba = aliased(models.TenantBaseURLAssociation)
@@ -190,3 +189,9 @@ def tenant_baseurls_get_all(tenant_id, session=None):
     return session.query(baseUrls).join((tba,
         tba.baseURLs_id == baseUrls.id)).\
             filter(tba.tenant_id == tenant_id).all()
+
+def get_role_assignments(tenant_id, session=None):
+    if not session:
+        session = get_session()
+    return session.query(models.UserRoleAssociation).\
+                        filter_by(tenant_id=tenant_id)
diff --git a/keystone/db/sqlalchemy/api/tenant_group.py b/keystone/db/sqlalchemy/api/tenant_group.py
index 232c939f..4efce544 100644
--- a/keystone/db/sqlalchemy/api/tenant_group.py
+++ b/keystone/db/sqlalchemy/api/tenant_group.py
@@ -17,14 +17,14 @@
 
 from keystone.db.sqlalchemy import get_session, models
 
-def tenant_group_create(values):
+def create(values):
     group_ref = models.Group()
     group_ref.update(values)
     group_ref.save()
     return group_ref
 
 
-def tenant_group_is_empty(id, session=None):
+def is_empty(id, session=None):
     if not session:
         session = get_session()
     a_user = session.query(models.UserGroupAssociation).filter_by(
@@ -34,7 +34,7 @@ def tenant_group_is_empty(id, session=None):
     return True
 
 
-def tenant_group_get(id, tenant, session=None):
+def get(id, tenant, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Group).filter_by(id=id, \
@@ -43,7 +43,7 @@ def tenant_group_get(id, tenant, session=None):
     return result
 
 
-def tenant_group_get_page(tenantId, marker, limit, session=None):
+def get_page(tenantId, marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -58,7 +58,7 @@ def tenant_group_get_page(tenantId, marker, limit, session=None):
     #return session.query(models.Tenant).all()
 
 
-def tenant_group_get_page_markers(tenantId, marker, limit, session=None):
+def get_page_markers(tenantId, marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.Group).filter_by(\
@@ -101,11 +101,11 @@ def tenant_group_get_page_markers(tenantId, marker, limit, session=None):
     return (prev, next)
 
 
-def tenant_group_update(id, tenant_id, values, session=None):
+def update(id, tenant_id, values, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        tenant_ref = tenant_group_get(id, tenant_id, session)
+        tenant_ref = get(id, tenant_id, session)
         tenant_ref.update(values)
         tenant_ref.save(session=session)
 
@@ -114,12 +114,5 @@ def delete(id, tenant_id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        tenantgroup_ref = tenant_group_get(id, tenant_id, session)
+        tenantgroup_ref = get(id, tenant_id, session)
         session.delete(tenantgroup_ref)
-
-
-def tenant_role_assignments_get(tenant_id, session=None):
-    if not session:
-        session = get_session()
-    return session.query(models.UserRoleAssociation).\
-                        filter_by(tenant_id=tenant_id)
diff --git a/keystone/db/sqlalchemy/api/token.py b/keystone/db/sqlalchemy/api/token.py
index 847e668f..1863292f 100644
--- a/keystone/db/sqlalchemy/api/token.py
+++ b/keystone/db/sqlalchemy/api/token.py
@@ -17,29 +17,29 @@
 
 from keystone.db.sqlalchemy import get_session, models
 
-def token_create(values):
+def create(values):
     token_ref = models.Token()
     token_ref.update(values)
     token_ref.save()
     return token_ref
 
 
-def token_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Token).filter_by(token_id=id).first()
     return result
 
 
-def token_delete(id, session=None):
+def delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        token_ref = token_get(id, session)
+        token_ref = get(id, session)
         session.delete(token_ref)
 
 
-def token_for_user(user_id, session=None):
+def get_for_user(user_id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Token).filter_by(
@@ -47,7 +47,7 @@ def token_for_user(user_id, session=None):
     return result
 
 
-def token_for_user_tenant(user_id, tenant_id, session=None):
+def get_for_user_by_tenant(user_id, tenant_id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Token).filter_by(
@@ -55,7 +55,7 @@ def token_for_user_tenant(user_id, tenant_id, session=None):
     return result
 
 
-def token_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     return session.query(models.Token).all()
diff --git a/keystone/db/sqlalchemy/api/user.py b/keystone/db/sqlalchemy/api/user.py
index af1d8d59..dfc7bbcf 100644
--- a/keystone/db/sqlalchemy/api/user.py
+++ b/keystone/db/sqlalchemy/api/user.py
@@ -17,14 +17,14 @@
 
 from keystone.db.sqlalchemy import get_session, models, aliased, joinedload
 
-def user_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     result = session.query(models.User)
     return result
 
 
-def get_user_by_group(user_id, group_id, session=None):
+def get_by_group(user_id, group_id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.UserGroupAssociation).filter_by(\
@@ -32,29 +32,29 @@ def get_user_by_group(user_id, group_id, session=None):
     return result
 
 
-def user_tenant_group(values):
+def tenant_group(values):
     user_ref = models.UserGroupAssociation()
     user_ref.update(values)
     user_ref.save()
     return user_ref
 
 
-def user_tenant_group_delete(id, group_id, session=None):
+def tenant_group_delete(id, group_id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        usertenantgroup_ref = get_user_by_group(id, group_id, session)
+        usertenantgroup_ref = get_by_group(id, group_id, session)
         session.delete(usertenantgroup_ref)
 
 
-def user_create(values):
+def create(values):
     user_ref = models.User()
     user_ref.update(values)
     user_ref.save()
     return user_ref
 
 
-def user_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     #TODO(Ziad): finish cleaning up model
@@ -64,7 +64,7 @@ def user_get(id, session=None):
     return result
 
 
-def user_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -77,7 +77,7 @@ def user_get_page(marker, limit, session=None):
                             models.User.id.desc()).limit(limit).all()
 
 
-def user_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.User).order_by(\
@@ -115,14 +115,14 @@ def user_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def user_get_email(email, session=None):
+def get_by_email(email, session=None):
     if not session:
         session = get_session()
     result = session.query(models.User).filter_by(email=email).first()
     return result
 
 
-def user_groups(id, session=None):
+def get_groups(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Group).filter_by(\
@@ -138,11 +138,11 @@ def user_roles_by_tenant(user_id, tenant_id, session=None):
     return result
 
 
-def user_update(id, values, session=None):
+def update(id, values, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        user_ref = user_get(id, session)
+        user_ref = get(id, session)
         user_ref.update(values)
         user_ref.save(session=session)
 
@@ -212,15 +212,15 @@ def users_tenant_group_get_page_markers(group_id, marker, limit, session=None):
     return (prev, next)
 
 
-def user_delete(id, session=None):
+def delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        user_ref = user_get(id, session)
+        user_ref = get(id, session)
         session.delete(user_ref)
 
 
-def user_get_by_tenant(id, tenant_id, session=None):
+def get_by_tenant(id, tenant_id, session=None):
     if not session:
         session = get_session()
     # Most common use case: user lives in tenant
@@ -233,19 +233,19 @@ def user_get_by_tenant(id, tenant_id, session=None):
     user_tenant = session.query(models.UserRoleAssociation).filter_by(\
         tenant_id=tenant_id, user_id=id).first()
     if user_tenant:
-        return user_get(id, session)
+        return get(id, session)
     else:
         return None
 
 
-def user_get_by_group(id, session=None):
+def get_group_by_tenant(id, session=None):
     if not session:
         session = get_session()
     user_group = session.query(models.Group).filter_by(tenant_id=id).all()
     return user_group
 
 
-def user_delete_tenant(id, tenant_id, session=None):
+def delete_tenant(id, tenant_id, session=None):
     if not session:
         session = get_session()
     with session.begin():
@@ -254,14 +254,14 @@ def user_delete_tenant(id, tenant_id, session=None):
             for user_tenant_ref in users_tenant_ref:
                 session.delete(user_tenant_ref)
 
-        user_group_ref = user_get_by_group(tenant_id, session)
+        user_group_ref = get_group_by_tenant(tenant_id, session)
 
         if user_group_ref is not None:
             for user_group in user_group_ref:
-                group_users = session.query(models.UserGroupAssociation)\
+                get_users = session.query(models.UserGroupAssociation)\
                                 .filter_by(user_id=id,
                                         group_id=user_group.id).all()
-                for group_user in group_users:
+                for group_user in get_users:
                     session.delete(group_user)
 
 
diff --git a/keystone/logic/service.py b/keystone/logic/service.py
index b292d75f..5306c1f4 100755
--- a/keystone/logic/service.py
+++ b/keystone/logic/service.py
@@ -25,7 +25,7 @@ import keystone.db.sqlalchemy.models as db_models
 import keystone.logic.types.fault as fault
 import keystone.logic.types.tenant as tenants
 import keystone.logic.types.role as roles
-import keystone.logic.types.user as users
+import keystone.logic.types.user as get_users
 import keystone.logic.types.baseURL as baseURLs
 
 
@@ -42,11 +42,11 @@ class IdentityService(object):
             raise fault.BadRequestFault("Expecting Password Credentials!")
 
         if not credentials.tenant_id:
-            duser = db_api.user.user_get(credentials.username)
+            duser = db_api.user.get(credentials.username)
             if duser == None:
                 raise fault.UnauthorizedFault("Unauthorized")
         else:
-            duser = db_api.user.user_get_by_tenant(credentials.username,
+            duser = db_api.user.get_by_tenant(credentials.username,
                                               credentials.tenant_id)
             if duser == None:
                 raise fault.UnauthorizedFault("Unauthorized on this tenant")
@@ -61,9 +61,9 @@ class IdentityService(object):
         # TODO: Handle tenant/token search
         #
         if not credentials.tenant_id:
-            dtoken = db_api.token.token_for_user(duser.id)
+            dtoken = db_api.token.get_for_user(duser.id)
         else:
-            dtoken = db_api.token.token_for_user_tenant(duser.id,
+            dtoken = db_api.token.get_for_user_by_tenant(duser.id,
                                                   credentials.tenant_id)
         tenant_id = None
         if credentials.tenant_id:
@@ -79,7 +79,7 @@ class IdentityService(object):
             if credentials.tenant_id:
                 dtoken.tenant_id = credentials.tenant_id
             dtoken.expires = datetime.now() + timedelta(days=1)
-            db_api.token.token_create(dtoken)
+            db_api.token.create(dtoken)
         #if tenant_id is passed in the call that tenant_id is passed else
         #user's default tenant_id is used.
         return self.__get_auth_data(dtoken, tenant_id)
@@ -102,11 +102,11 @@ class IdentityService(object):
     def revoke_token(self, admin_token, token_id):
         self.__validate_token(admin_token)
 
-        dtoken = db_api.token.token_get(token_id)
+        dtoken = db_api.token.get(token_id)
         if not dtoken:
             raise fault.ItemNotFoundFault("Token not found")
 
-        db_api.token.token_delete(token_id)
+        db_api.token.delete(token_id)
 
     #
     #   Tenant Operations
@@ -121,7 +121,7 @@ class IdentityService(object):
         if tenant.tenant_id == None:
             raise fault.BadRequestFault("Expecting a unique Tenant Id")
 
-        if db_api.tenant.tenant_get(tenant.tenant_id) != None:
+        if db_api.tenant.get(tenant.tenant_id) != None:
             raise fault.TenantConflictFault(
                 "A tenant with that id already exists")
 
@@ -130,7 +130,7 @@ class IdentityService(object):
         dtenant.desc = tenant.description
         dtenant.enabled = tenant.enabled
 
-        db_api.tenant.tenant_create(dtenant)
+        db_api.tenant.create(dtenant)
         return tenant
 
     ##
@@ -141,11 +141,11 @@ class IdentityService(object):
             (token, user) = self.__validate_token(admin_token)
             # If Global admin return all tenants.
             ts = []
-            dtenants = db_api.tenant.tenant_get_page(marker, limit)
+            dtenants = db_api.tenant.get_page(marker, limit)
             for dtenant in dtenants:
                 ts.append(tenants.Tenant(dtenant.id,
                                          dtenant.desc, dtenant.enabled))
-            prev, next = db_api.tenant.tenant_get_page_markers(marker, limit)
+            prev, next = db_api.tenant.get_page_markers(marker, limit)
             links = []
             if prev:
                 links.append(atom.Link('prev', "%s?'marker=%s&limit=%s'" \
@@ -176,7 +176,7 @@ class IdentityService(object):
     def get_tenant(self, admin_token, tenant_id):
         self.__validate_token(admin_token)
 
-        dtenant = db_api.tenant.tenant_get(tenant_id)
+        dtenant = db_api.tenant.get(tenant_id)
         if not dtenant:
             raise fault.ItemNotFoundFault("The tenant could not be found")
         return tenants.Tenant(dtenant.id, dtenant.desc, dtenant.enabled)
@@ -187,25 +187,25 @@ class IdentityService(object):
         if not isinstance(tenant, tenants.Tenant):
             raise fault.BadRequestFault("Expecting a Tenant")
 
-        dtenant = db_api.tenant.tenant_get(tenant_id)
+        dtenant = db_api.tenant.get(tenant_id)
         if dtenant == None:
             raise fault.ItemNotFoundFault("The tenant cloud not be found")
         values = {'desc': tenant.description, 'enabled': tenant.enabled}
-        db_api.tenant.tenant_update(tenant_id, values)
+        db_api.tenant.update(tenant_id, values)
         return tenants.Tenant(dtenant.id, tenant.description, tenant.enabled)
 
     def delete_tenant(self, admin_token, tenant_id):
         self.__validate_token(admin_token)
 
-        dtenant = db_api.tenant.tenant_get(tenant_id)
+        dtenant = db_api.tenant.get(tenant_id)
         if dtenant == None:
             raise fault.ItemNotFoundFault("The tenant cloud not be found")
 
-        if not db_api.tenant.tenant_is_empty(tenant_id):
+        if not db_api.tenant.is_empty(tenant_id):
             raise fault.ForbiddenFault("You may not delete a tenant that "
-                                       "contains users or groups")
+                                       "contains get_users or groups")
 
-        db_api.tenant.tenant_delete(dtenant.id)
+        db_api.tenant.delete(dtenant.id)
         return None
 
     #
@@ -220,14 +220,14 @@ class IdentityService(object):
         if tenant == None:
             raise fault.BadRequestFault("Expecting a Tenant Id")
 
-        dtenant = db_api.tenant.tenant_get(tenant)
+        dtenant = db_api.tenant.get(tenant)
         if dtenant == None:
             raise fault.ItemNotFoundFault("The tenant not found")
 
         if group.group_id == None:
             raise fault.BadRequestFault("Expecting a Group Id")
 
-        if db_api.group.group_get(group.group_id) != None:
+        if db_api.group.get(group.group_id) != None:
             raise fault.TenantGroupConflictFault(
                 "A tenant group with that id already exists")
 
@@ -235,7 +235,7 @@ class IdentityService(object):
         dtenant.id = group.group_id
         dtenant.desc = group.description
         dtenant.tenant_id = tenant
-        db_api.tenant_group.tenant_group_create(dtenant)
+        db_api.tenant_group.create(dtenant)
         return tenants.Group(dtenant.id, dtenant.desc, dtenant.tenant_id)
 
     def get_tenant_groups(self, admin_token, tenant_id, marker, limit, url):
@@ -243,18 +243,18 @@ class IdentityService(object):
         if tenant_id == None:
             raise fault.BadRequestFault("Expecting a Tenant Id")
 
-        dtenant = db_api.tenant.tenant_get(tenant_id)
+        dtenant = db_api.tenant.get(tenant_id)
         if dtenant == None:
             raise fault.ItemNotFoundFault("The tenant not found")
 
         ts = []
-        dtenantgroups = db_api.tenant_group.tenant_group_get_page(tenant_id, marker, limit)
+        dtenantgroups = db_api.tenant_group.get_page(tenant_id, marker, limit)
 
         for dtenantgroup in dtenantgroups:
             ts.append(tenants.Group(dtenantgroup.id,
                                      dtenantgroup.desc,
                                      dtenantgroup.tenant_id))
-        prev, next = db_api.tenant_group.tenant_group_get_page_markers(tenant_id, marker,
+        prev, next = db_api.tenant_group.get_page_markers(tenant_id, marker,
                                                           limit)
         links = []
         if prev:
@@ -269,11 +269,11 @@ class IdentityService(object):
     def get_tenant_group(self, admin_token, tenant_id, group_id):
         self.__validate_token(admin_token)
 
-        dtenant = db_api.tenant.tenant_get(tenant_id)
+        dtenant = db_api.tenant.get(tenant_id)
         if dtenant == None:
             raise fault.ItemNotFoundFault("The tenant not found")
 
-        dtenant = db_api.tenant_group.tenant_group_get(group_id, tenant_id)
+        dtenant = db_api.tenant_group.get(group_id, tenant_id)
         if not dtenant:
             raise fault.ItemNotFoundFault("The tenant group not found")
 
@@ -286,11 +286,11 @@ class IdentityService(object):
             raise fault.BadRequestFault("Expecting a Group")
         True
 
-        dtenant = db_api.tenant.tenant_get(tenant_id)
+        dtenant = db_api.tenant.get(tenant_id)
         if dtenant == None:
             raise fault.ItemNotFoundFault("The tenant not found")
 
-        dtenant = db_api.tenant_group.tenant_group_get(group_id, tenant_id)
+        dtenant = db_api.tenant_group.get(group_id, tenant_id)
         if not dtenant:
             raise fault.ItemNotFoundFault("The tenant group not found")
 
@@ -304,25 +304,25 @@ class IdentityService(object):
 
         values = {'desc': group.description}
 
-        db_api.tenant_group.tenant_group_update(group_id, tenant_id, values)
+        db_api.tenant_group.update(group_id, tenant_id, values)
 
         return tenants.Group(group_id, group.description, tenant_id)
 
     def delete_tenant_group(self, admin_token, tenant_id, group_id):
         self.__validate_token(admin_token)
 
-        dtenant = db_api.tenant.tenant_get(tenant_id)
+        dtenant = db_api.tenant.get(tenant_id)
 
         if dtenant == None:
             raise fault.ItemNotFoundFault("The tenant not found")
 
-        dtenant = db_api.tenant_group.tenant_group_get(group_id, tenant_id)
+        dtenant = db_api.tenant_group.get(group_id, tenant_id)
         if not dtenant:
             raise fault.ItemNotFoundFault("The tenant group not found")
 
-        if not db_api.tenant_group.tenant_group_is_empty(group_id):
+        if not db_api.tenant_group.is_empty(group_id):
             raise fault.ForbiddenFault("You may not delete a tenant that "
-                                       "contains users or groups")
+                                       "contains get_users or groups")
 
         db_api.tenant_group.delete(group_id, tenant_id)
         return None
@@ -333,10 +333,10 @@ class IdentityService(object):
         if tenantId == None:
             raise fault.BadRequestFault("Expecting a Tenant Id")
 
-        if db_api.tenant.tenant_get(tenantId) == None:
+        if db_api.tenant.get(tenantId) == None:
             raise fault.ItemNotFoundFault("The tenant not found")
 
-        if db_api.tenant_group.tenant_group_get(groupId, tenantId) == None:
+        if db_api.tenant_group.get(groupId, tenantId) == None:
             raise fault.ItemNotFoundFault(
                 "A tenant group with that id not found")
         ts = []
@@ -362,27 +362,27 @@ class IdentityService(object):
     def add_user_tenant_group(self, admin_token, tenant, group, user):
         self.__validate_token(admin_token)
 
-        if db_api.tenant.tenant_get(tenant) == None:
+        if db_api.tenant.get(tenant) == None:
             raise fault.ItemNotFoundFault("The Tenant not found")
 
-        if db_api.group.group_get(group) == None:
+        if db_api.group.get(group) == None:
             raise fault.ItemNotFoundFault("The Group not found")
-        duser = db_api.user.user_get(user)
+        duser = db_api.user.get(user)
         if duser == None:
             raise fault.ItemNotFoundFault("The User not found")
 
-        if db_api.tenant_group.tenant_group_get(group, tenant) == None:
+        if db_api.tenant_group.get(group, tenant) == None:
             raise fault.ItemNotFoundFault("A tenant group with"
                                            " that id not found")
 
-        if db_api.user.get_user_by_group(user, group) != None:
+        if db_api.user.get_by_group(user, group) != None:
             raise fault.UserGroupConflictFault(
                 "A user with that id already exists in group")
 
         dusergroup = db_models.UserGroupAssociation()
         dusergroup.user_id = user
         dusergroup.group_id = group
-        db_api.user.user_tenant_group(dusergroup)
+        db_api.user.tenant_group(dusergroup)
 
         return tenants.User(duser.id, duser.email, duser.enabled,
                             tenant, group)
@@ -390,24 +390,24 @@ class IdentityService(object):
     def delete_user_tenant_group(self, admin_token, tenant, group, user):
         self.__validate_token(admin_token)
 
-        if db_api.tenant.tenant_get(tenant) == None:
+        if db_api.tenant.get(tenant) == None:
             raise fault.ItemNotFoundFault("The Tenant not found")
 
-        if db_api.group.group_get(group) == None:
+        if db_api.group.get(group) == None:
             raise fault.ItemNotFoundFault("The Group not found")
-        duser = db_api.user.user_get(user)
+        duser = db_api.user.get(user)
         if duser == None:
             raise fault.ItemNotFoundFault("The User not found")
 
-        if db_api.tenant_group.tenant_group_get(group, tenant) == None:
+        if db_api.tenant_group.get(group, tenant) == None:
             raise fault.ItemNotFoundFault("A tenant group with"
                                           " that id not found")
 
-        if db_api.user.get_user_by_group(user, group) == None:
+        if db_api.user.get_by_group(user, group) == None:
             raise fault.ItemNotFoundFault("A user with that id "
                                           "in a group not found")
 
-        db_api.user.user_tenant_group_delete(user, group)
+        db_api.user.tenant_group_delete(user, group)
         return None
 
     #
@@ -419,9 +419,9 @@ class IdentityService(object):
         token = None
         user = None
         if token_id:
-            token = db_api.token.token_get(token_id)
+            token = db_api.token.get(token_id)
             if token:
-                user = db_api.user.user_get(token.user_id)
+                user = db_api.user.get(token.user_id)
         return (token, user)
 
     #
@@ -430,24 +430,24 @@ class IdentityService(object):
     def create_user(self, admin_token, user):
         self.__validate_token(admin_token)
 
-        dtenant = db_api.tenant.tenant_get(user.tenant_id)
+        dtenant = db_api.tenant.get(user.tenant_id)
         if dtenant == None:
             raise fault.UnauthorizedFault("Unauthorized")
 
         if not dtenant.enabled:
             raise fault.TenantDisabledFault("Your account has been disabled")
 
-        if not isinstance(user, users.User):
+        if not isinstance(user, get_users.User):
             raise fault.BadRequestFault("Expecting a User")
 
         if user.user_id == None:
             raise fault.BadRequestFault("Expecting a unique User Id")
 
-        if db_api.user.user_get(user.user_id) != None:
+        if db_api.user.get(user.user_id) != None:
             raise fault.UserConflictFault(
                 "An user with that id already exists")
 
-        if db_api.user.user_get_email(user.email) != None:
+        if db_api.user.get_by_email(user.email) != None:
             raise fault.EmailConflictFault(
                 "Email already exists")
 
@@ -457,7 +457,7 @@ class IdentityService(object):
         duser.email = user.email
         duser.enabled = user.enabled
         duser.tenant_id = user.tenant_id
-        db_api.user.user_create(duser)
+        db_api.user.create(duser)
 
         return user
 
@@ -466,7 +466,7 @@ class IdentityService(object):
 
         if tenant_id == None:
             raise fault.BadRequestFault("Expecting a Tenant Id")
-        dtenant = db_api.tenant.tenant_get(tenant_id)
+        dtenant = db_api.tenant.get(tenant_id)
         if dtenant is  None:
             raise fault.ItemNotFoundFault("The tenant not found")
         if not dtenant.enabled:
@@ -475,7 +475,7 @@ class IdentityService(object):
         dtenantusers = db_api.user.users_get_by_tenant_get_page(tenant_id, marker,
                                                           limit)
         for dtenantuser in dtenantusers:
-            ts.append(users.User(None, dtenantuser.id, tenant_id,
+            ts.append(get_users.User(None, dtenantuser.id, tenant_id,
                                    dtenantuser.email, dtenantuser.enabled))
         links = []
         if ts.__len__():
@@ -487,14 +487,14 @@ class IdentityService(object):
             if next:
                 links.append(atom.Link('next', "%s?'marker=%s&limit=%s'" % 
                                       (url, next, limit)))
-        return users.Users(ts, links)
+        return get_users.Users(ts, links)
 
     def get_users(self, admin_token, marker, limit, url):
         self.__validate_token(admin_token)
         ts = []
         dusers = db_api.user.users_get_page(marker, limit)
         for duser in dusers:
-            ts.append(users.User(None, duser.id, duser.tenant_id,
+            ts.append(get_users.User(None, duser.id, duser.tenant_id,
                                    duser.email, duser.enabled))
         links = []
         if ts.__len__():
@@ -505,19 +505,19 @@ class IdentityService(object):
             if next:
                 links.append(atom.Link('next', "%s?'marker=%s&limit=%s'" % 
                                       (url, next, limit)))
-        return users.Users(ts, links)
+        return get_users.Users(ts, links)
 
 
     def get_user(self, admin_token, user_id):
         self.__validate_token(admin_token)
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
         if not duser:
             raise fault.ItemNotFoundFault("The user could not be found")
 
         if not duser.enabled:
             raise fault.UserDisabledFault("User has been disabled")
 
-        dtenant = db_api.tenant.tenant_get(duser.tenant_id)
+        dtenant = db_api.tenant.get(duser.tenant_id)
 
         ts = []
         dusergroups = db_api.user.user_groups_get_all(user_id)
@@ -525,7 +525,7 @@ class IdentityService(object):
         for dusergroup, dusergroupAsso in dusergroups:
             ts.append(tenants.Group(dusergroup.id, dusergroup.tenant_id, None))
 
-        return users.User_Update(None, duser.id, duser.tenant_id, duser.email,
+        return get_users.User_Update(None, duser.id, duser.tenant_id, duser.email,
                                  duser.enabled, ts)
 
     ##
@@ -535,7 +535,7 @@ class IdentityService(object):
     def update_user(self, admin_token, user_id, user):
         self.__validate_token(admin_token)
 
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
 
         if not duser:
             raise fault.ItemNotFoundFault("The user could not be found")
@@ -543,75 +543,75 @@ class IdentityService(object):
         if not duser.enabled:
             raise fault.UserDisabledFault("User has been disabled")
 
-        if not isinstance(user, users.User):
+        if not isinstance(user, get_users.User):
             raise fault.BadRequestFault("Expecting a User")
 
         if user.email != duser.email and \
-            db_api.user.user_get_email(user.email) is not None:
+            db_api.user.get_by_email(user.email) is not None:
             raise fault.EmailConflictFault(
                 "Email already exists")
 
         values = {'email': user.email}
-        db_api.user.user_update(user_id, values)
+        db_api.user.update(user_id, values)
         duser = db_api.user.user_get_update(user_id)
-        return users.User(duser.password, duser.id, duser.tenant_id,
+        return get_users.User(duser.password, duser.id, duser.tenant_id,
                           duser.email, duser.enabled)
 
     def set_user_password(self, admin_token, user_id, user):
         self.__validate_token(admin_token)
 
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
         if not duser:
             raise fault.ItemNotFoundFault("The user could not be found")
 
         if not duser.enabled:
             raise fault.UserDisabledFault("User has been disabled")
 
-        if not isinstance(user, users.User):
+        if not isinstance(user, get_users.User):
             raise fault.BadRequestFault("Expecting a User")
 
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
         if duser == None:
             raise fault.ItemNotFoundFault("The user could not be found")
 
         values = {'password': user.password}
 
-        db_api.user.user_update(user_id, values)
+        db_api.user.update(user_id, values)
 
-        return users.User_Update(user.password, None, None, None, None, None)
+        return get_users.User_Update(user.password, None, None, None, None, None)
 
     def enable_disable_user(self, admin_token, user_id, user):
         self.__validate_token(admin_token)
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
         if not duser:
             raise fault.ItemNotFoundFault("The user could not be found")
-        if not isinstance(user, users.User):
+        if not isinstance(user, get_users.User):
             raise fault.BadRequestFault("Expecting a User")
 
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
         if duser == None:
             raise fault.ItemNotFoundFault("The user could not be found")
 
         values = {'enabled': user.enabled}
 
-        db_api.user.user_update(user_id, values)
+        db_api.user.update(user_id, values)
 
-        return users.User_Update(None, None, None, None, user.enabled, None)
+        return get_users.User_Update(None, None, None, None, user.enabled, None)
 
     def set_user_tenant(self, admin_token, user_id, user):
         self.__validate_token(admin_token)
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
         if not duser:
             raise fault.ItemNotFoundFault("The user could not be found")
-        if not isinstance(user, users.User):
+        if not isinstance(user, get_users.User):
             raise fault.BadRequestFault("Expecting a User")
 
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
         if duser == None:
             raise fault.ItemNotFoundFault("The user could not be found")
 
         
-        dtenant = db_api.tenant.tenant_get(user.tenant_id)
+        dtenant = db_api.tenant.get(user.tenant_id)
 
         #Check if tenant exists.If user has passed a tenant that does not exist throw error.
         #If user is trying to update to a tenant that is disabled throw an error.
@@ -621,24 +621,24 @@ class IdentityService(object):
             raise fault.TenantDisabledFault("Your account has been disabled")
 
         values = {'tenant_id': user.tenant_id}
-        db_api.user.user_update(user_id, values)
-        return users.User_Update(None, None, user.tenant_id, None, None, None)
+        db_api.user.update(user_id, values)
+        return get_users.User_Update(None, None, user.tenant_id, None, None, None)
 
     def delete_user(self, admin_token, user_id):
         self.__validate_token(admin_token)
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
         if not duser:
             raise fault.ItemNotFoundFault("The user could not be found")
 
-        dtenant = db_api.tenant.tenant_get(duser.tenant_id)
-        db_api.user.user_delete_tenant(user_id, dtenant.id)
+        dtenant = db_api.tenant.get(duser.tenant_id)
+        db_api.user.delete_tenant(user_id, dtenant.id)
         return None
 
     def get_user_groups(self, admin_token, user_id, marker, limit,
                         url):
         self.__validate_token(admin_token)
         ts = []
-        dusergroups = db_api.group.groups_get_by_user_get_page(user_id, marker,
+        dusergroups = db_api.group.get_by_user_get_page(user_id, marker,
                                                           limit)
 
         for dusergroup, dusergroupAsso in dusergroups:
@@ -646,7 +646,7 @@ class IdentityService(object):
                                     dusergroup.tenant_id))
         links = []
         if ts.__len__():
-            prev, next = db_api.group.groups_get_by_user_get_page_markers(user_id,
+            prev, next = db_api.group.get_by_user_get_page_markers(user_id,
                                                         marker, limit)
             if prev:
                 links.append(atom.Link('prev', "%s?'marker=%s&limit=%s'" % 
@@ -663,14 +663,14 @@ class IdentityService(object):
     #       with server.py
     def __check_create_global_tenant(self):
 
-        dtenant = db_api.tenant.tenant_get('GlobalTenant')
+        dtenant = db_api.tenant.get('GlobalTenant')
 
         if dtenant is None:
             dtenant = db_models.Tenant()
             dtenant.id = 'GlobalTenant'
             dtenant.desc = 'GlobalTenant is Default tenant for global groups'
             dtenant.enabled = True
-            db_api.tenant.tenant_create(dtenant)
+            db_api.tenant.create(dtenant)
         return dtenant
 
     def create_global_group(self, admin_token, group):
@@ -682,7 +682,7 @@ class IdentityService(object):
         if group.group_id == None:
             raise fault.BadRequestFault("Expecting a Group Id")
 
-        if db_api.group.group_get(group.group_id) != None:
+        if db_api.group.get(group.group_id) != None:
             raise fault.TenantGroupConflictFault(
                 "A tenant group with that id already exists")
         gtenant = self.__check_create_global_tenant()
@@ -690,19 +690,19 @@ class IdentityService(object):
         dtenant.id = group.group_id
         dtenant.desc = group.description
         dtenant.tenant_id = gtenant.id
-        db_api.tenant_group.tenant_group_create(dtenant)
+        db_api.tenant_group.create(dtenant)
         return tenants.GlobalGroup(dtenant.id, dtenant.desc, None)
 
     def get_global_groups(self, admin_token, marker, limit, url):
         self.__validate_token(admin_token)
         gtenant = self.__check_create_global_tenant()
         ts = []
-        dtenantgroups = db_api.tenant_group.tenant_group_get_page(gtenant.id, \
+        dtenantgroups = db_api.tenant_group.get_page(gtenant.id, \
                                                       marker, limit)
         for dtenantgroup in dtenantgroups:
             ts.append(tenants.GlobalGroup(dtenantgroup.id,
                                      dtenantgroup.desc))
-        prev, next = db_api.tenant_group.tenant_group_get_page_markers(gtenant.id,
+        prev, next = db_api.tenant_group.get_page_markers(gtenant.id,
                                                        marker, limit)
         links = []
         if prev:
@@ -716,11 +716,11 @@ class IdentityService(object):
     def get_global_group(self, admin_token, group_id):
         self.__validate_token(admin_token)
         gtenant = self.__check_create_global_tenant()
-        dtenant = db_api.tenant.tenant_get(gtenant.id)
+        dtenant = db_api.tenant.get(gtenant.id)
         if dtenant == None:
             raise fault.ItemNotFoundFault("The Global tenant not found")
 
-        dtenant = db_api.tenant_group.tenant_group_get(group_id, gtenant.id)
+        dtenant = db_api.tenant_group.get(group_id, gtenant.id)
 
         if not dtenant:
             raise fault.ItemNotFoundFault("The Global tenant group not found")
@@ -732,11 +732,11 @@ class IdentityService(object):
         if not isinstance(group, tenants.GlobalGroup):
             raise fault.BadRequestFault("Expecting a Group")
 
-        dtenant = db_api.tenant.tenant_get(gtenant.id)
+        dtenant = db_api.tenant.get(gtenant.id)
         if dtenant == None:
             raise fault.ItemNotFoundFault("The global tenant not found")
 
-        dtenant = db_api.tenant_group.tenant_group_get(group_id, gtenant.id)
+        dtenant = db_api.tenant_group.get(group_id, gtenant.id)
         if not dtenant:
             raise fault.ItemNotFoundFault("The Global tenant group not found")
         if group_id != group.group_id:
@@ -744,24 +744,24 @@ class IdentityService(object):
                                             "Group id not matching")
 
         values = {'desc': group.description}
-        db_api.tenant_group.tenant_group_update(group_id, gtenant.id, values)
+        db_api.tenant_group.update(group_id, gtenant.id, values)
         return tenants.GlobalGroup(group_id, group.description, gtenant.id)
 
     def delete_global_group(self, admin_token, group_id):
         self.__validate_token(admin_token)
         gtenant = self.__check_create_global_tenant()
-        dtenant = db_api.tenant.tenant_get(gtenant.id)
+        dtenant = db_api.tenant.get(gtenant.id)
 
         if dtenant == None:
             raise fault.ItemNotFoundFault("The global tenant not found")
 
-        dtenant = db_api.tenant_group.tenant_group_get(group_id, dtenant.id)
+        dtenant = db_api.tenant_group.get(group_id, dtenant.id)
         if not dtenant:
             raise fault.ItemNotFoundFault("The global tenant group not found")
 
-        if not db_api.tenant_group.tenant_group_is_empty(group_id):
+        if not db_api.tenant_group.is_empty(group_id):
             raise fault.ForbiddenFault("You may not delete a group that "
-                                       "contains users")
+                                       "contains get_users")
 
         db_api.tenant_group.delete(group_id, gtenant.id)
         return None
@@ -773,10 +773,10 @@ class IdentityService(object):
         if gtenant.id == None:
             raise fault.BadRequestFault("Expecting a global Tenant")
 
-        if db_api.tenant.tenant_get(gtenant.id) == None:
+        if db_api.tenant.get(gtenant.id) == None:
             raise fault.ItemNotFoundFault("The global tenant not found")
 
-        if db_api.tenant_group.tenant_group_get(groupId, gtenant.id) == None:
+        if db_api.tenant_group.get(groupId, gtenant.id) == None:
             raise fault.ItemNotFoundFault(
                 "A global tenant group with that id not found")
         ts = []
@@ -801,27 +801,27 @@ class IdentityService(object):
         self.__validate_token(admin_token)
         gtenant = self.__check_create_global_tenant()
 
-        if db_api.tenant.tenant_get(gtenant.id) == None:
+        if db_api.tenant.get(gtenant.id) == None:
             raise fault.ItemNotFoundFault("The Global Tenant not found")
 
-        if db_api.group.group_get(group) == None:
+        if db_api.group.get(group) == None:
             raise fault.ItemNotFoundFault("The Group not found")
-        duser = db_api.user.user_get(user)
+        duser = db_api.user.get(user)
         if duser == None:
             raise fault.ItemNotFoundFault("The User not found")
 
-        if db_api.tenant_group.tenant_group_get(group, gtenant.id) == None:
+        if db_api.tenant_group.get(group, gtenant.id) == None:
             raise fault.ItemNotFoundFault("A global tenant group with"
                                           " that id not found")
 
-        if db_api.user.get_user_by_group(user, group) != None:
+        if db_api.user.get_by_group(user, group) != None:
             raise fault.UserGroupConflictFault(
                 "A user with that id already exists in group")
 
         dusergroup = db_models.UserGroupAssociation()
         dusergroup.user_id = user
         dusergroup.group_id = group
-        db_api.user.user_tenant_group(dusergroup)
+        db_api.user.tenant_group(dusergroup)
 
         return tenants.User(duser.id, duser.email, duser.enabled,
                            group_id=group)
@@ -830,24 +830,24 @@ class IdentityService(object):
         self.__validate_token(admin_token)
         gtenant = self.__check_create_global_tenant()
 
-        if db_api.tenant.tenant_get(gtenant.id) == None:
+        if db_api.tenant.get(gtenant.id) == None:
             raise fault.ItemNotFoundFault("The Global Tenant not found")
 
-        if db_api.group.group_get(group) == None:
+        if db_api.group.get(group) == None:
             raise fault.ItemNotFoundFault("The Group not found")
-        duser = db_api.user.user_get(user)
+        duser = db_api.user.get(user)
         if duser == None:
             raise fault.ItemNotFoundFault("The User not found")
 
-        if db_api.tenant_group.tenant_group_get(group, gtenant.id) == None:
+        if db_api.tenant_group.get(group, gtenant.id) == None:
             raise fault.ItemNotFoundFault("A global tenant group with "
                                           "that id not found")
 
-        if db_api.user.get_user_by_group(user, group) == None:
+        if db_api.user.get_by_group(user, group) == None:
             raise fault.ItemNotFoundFault("A user with that id in a "
                                           "group not found")
 
-        db_api.user.user_tenant_group_delete(user, group)
+        db_api.user.tenant_group_delete(user, group)
         return None
 
     #
@@ -856,7 +856,7 @@ class IdentityService(object):
         """return AuthData object for a token"""
         base_urls = None
         if tenant_id != None:
-            base_urls = db_api.tenant.tenant_baseurls_get_all(tenant_id)
+            base_urls = db_api.tenant.get_all_baseurls(tenant_id)
         token = auth.Token(dtoken.expires, dtoken.token_id, tenant_id)
         return auth.AuthData(token, base_urls)
 
@@ -866,12 +866,12 @@ class IdentityService(object):
         token = auth.Token(dtoken.expires, dtoken.token_id, dtoken.tenant_id)
         ts = []
         if dtoken.tenant_id:
-            droleRefs = db_api.role.role_ref_get_all_tenant_roles(duser.id,
+            droleRefs = db_api.role.ref_get_all_tenant_roles(duser.id,
                                                              dtoken.tenant_id)
             for droleRef in droleRefs:
                 ts.append(roles.RoleRef(droleRef.id, droleRef.role_id,
                                          droleRef.tenant_id))
-        droleRefs = db_api.role.role_ref_get_all_global_roles(duser.id)
+        droleRefs = db_api.role.ref_get_all_global_roles(duser.id)
         for droleRef in droleRefs:
             ts.append(roles.RoleRef(droleRef.id, droleRef.role_id,
                                      droleRef.tenant_id))
@@ -892,7 +892,7 @@ class IdentityService(object):
             raise fault.UserDisabledFault("The user %s has been disabled!"
                                           % user.id)
         if admin:
-            roleRefs = db_api.role.role_ref_get_all_global_roles(user.id)
+            roleRefs = db_api.role.ref_get_all_global_roles(user.id)
             for roleRef in roleRefs:
                 if roleRef.role_id == "Admin" and roleRef.tenant_id is None:
                     return (token, user)
@@ -909,24 +909,24 @@ class IdentityService(object):
         if role.role_id == None:
             raise fault.BadRequestFault("Expecting a Role Id")
 
-        if db_api.role.role_get(role.role_id) != None:
+        if db_api.role.get(role.role_id) != None:
             raise fault.RoleConflictFault(
                 "A role with that id already exists")
         drole = db_models.Role()
         drole.id = role.role_id
         drole.desc = role.desc
-        db_api.role.role_create(drole)
+        db_api.role.create(drole)
         return role
 
     def get_roles(self, admin_token, marker, limit, url):
         self.__validate_token(admin_token)
 
         ts = []
-        droles = db_api.role.role_get_page(marker, limit)
+        droles = db_api.role.get_page(marker, limit)
         for drole in droles:
             ts.append(roles.Role(drole.id,
                                      drole.desc))
-        prev, next = db_api.role.role_get_page_markers(marker, limit)
+        prev, next = db_api.role.get_page_markers(marker, limit)
         links = []
         if prev:
             links.append(atom.Link('prev', "%s?'marker=%s&limit=%s'" \
@@ -939,14 +939,14 @@ class IdentityService(object):
     def get_role(self, admin_token, role_id):
         self.__validate_token(admin_token)
 
-        drole = db_api.role.role_get(role_id)
+        drole = db_api.role.get(role_id)
         if not drole:
             raise fault.ItemNotFoundFault("The role could not be found")
         return roles.Role(drole.id, drole.desc)
 
     def create_role_ref(self, admin_token, user_id, roleRef):
         self.__validate_token(admin_token)
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
 
         if not duser:
             raise fault.ItemNotFoundFault("The user could not be found")
@@ -957,12 +957,12 @@ class IdentityService(object):
         if roleRef.role_id == None:
             raise fault.BadRequestFault("Expecting a Role Id")
 
-        drole = db_api.role.role_get(roleRef.role_id)
+        drole = db_api.role.get(roleRef.role_id)
         if drole == None:
             raise fault.ItemNotFoundFault("The role not found")
 
         if roleRef.tenant_id != None:
-            dtenant = db_api.tenant.tenant_get(roleRef.tenant_id)
+            dtenant = db_api.tenant.get(roleRef.tenant_id)
             if dtenant == None:
                 raise fault.ItemNotFoundFault("The tenant not found")
 
@@ -977,22 +977,22 @@ class IdentityService(object):
 
     def delete_role_ref(self, admin_token, role_ref_id):
         self.__validate_token(admin_token)
-        db_api.role.role_ref_delete(role_ref_id)
+        db_api.role.ref_delete(role_ref_id)
         return None
 
     def get_user_roles(self, admin_token, marker, limit, url, user_id):
         self.__validate_token(admin_token)
-        duser = db_api.user.user_get(user_id)
+        duser = db_api.user.get(user_id)
 
         if not duser:
             raise fault.ItemNotFoundFault("The user could not be found")
 
         ts = []
-        droleRefs = db_api.role.role_ref_get_page(marker, limit, user_id)
+        droleRefs = db_api.role.ref_get_page(marker, limit, user_id)
         for droleRef in droleRefs:
             ts.append(roles.RoleRef(droleRef.id, droleRef.role_id,
                                      droleRef.tenant_id))
-        prev, next = db_api.role.role_ref_get_page_markers(user_id, marker, limit)
+        prev, next = db_api.role.ref_get_page_markers(user_id, marker, limit)
         links = []
         if prev:
             links.append(atom.Link('prev', "%s?'marker=%s&limit=%s'" \
@@ -1006,14 +1006,14 @@ class IdentityService(object):
         self.__validate_token(admin_token)
 
         ts = []
-        dbaseurls = db_api.baseurl.baseurls_get_page(marker, limit)
+        dbaseurls = db_api.baseurl.get_page(marker, limit)
         for dbaseurl in dbaseurls:
             ts.append(baseURLs.BaseURL(dbaseurl.id, dbaseurl.region,
                                        dbaseurl.service, dbaseurl.public_url,
                                        dbaseurl.admin_url,
                                        dbaseurl.internal_url,
                                        dbaseurl.enabled))
-        prev, next = db_api.baseurl.baseurls_get_page_markers(marker, limit)
+        prev, next = db_api.baseurl.get_page_markers(marker, limit)
         links = []
         if prev:
             links.append(atom.Link('prev', "%s?'marker=%s&limit=%s'" \
@@ -1026,7 +1026,7 @@ class IdentityService(object):
     def get_baseurl(self, admin_token, baseurl_id):
         self.__validate_token(admin_token)
 
-        dbaseurl = db_api.baseurl.baseurls_get(baseurl_id)
+        dbaseurl = db_api.baseurl.get(baseurl_id)
         if not dbaseurl:
             raise fault.ItemNotFoundFault("The base URL could not be found")
         return baseURLs.BaseURL(dbaseurl.id, dbaseurl.region, dbaseurl.service,
@@ -1038,13 +1038,13 @@ class IdentityService(object):
         if tenant_id == None:
             raise fault.BadRequestFault("Expecting a Tenant Id")
 
-        if db_api.tenant.tenant_get(tenant_id) == None:
+        if db_api.tenant.get(tenant_id) == None:
             raise fault.ItemNotFoundFault("The tenant not found")
 
         ts = []
 
         dtenantBaseURLAssociations = \
-            db_api.baseurl.baseurls_ref_get_by_tenant_get_page(tenant_id, marker,
+            db_api.baseurl.ref_get_by_tenant_get_page(tenant_id, marker,
                                                           limit)
         for dtenantBaseURLAssociation in dtenantBaseURLAssociations:
             ts.append(baseURLs.BaseURLRef(dtenantBaseURLAssociation.id,
@@ -1053,7 +1053,7 @@ class IdentityService(object):
         links = []
         if ts.__len__():
             prev, next = \
-                db_api.baseurl.baseurls_ref_get_by_tenant_get_page_markers(tenant_id,
+                db_api.baseurl.ref_get_by_tenant_get_page_markers(tenant_id,
                                                         marker, limit)
             if prev:
                 links.append(atom.Link('prev', "%s?'marker=%s&limit=%s'" % 
@@ -1069,16 +1069,16 @@ class IdentityService(object):
         if tenant_id == None:
             raise fault.BadRequestFault("Expecting a Tenant Id")
 
-        if db_api.tenant.tenant_get(tenant_id) == None:
+        if db_api.tenant.get(tenant_id) == None:
             raise fault.ItemNotFoundFault("The tenant not found")
 
-        dbaseurl = db_api.baseurl.baseurls_get(baseurl.id)
+        dbaseurl = db_api.baseurl.get(baseurl.id)
         if not dbaseurl:
             raise fault.ItemNotFoundFault("The base URL could not be found")
         dbaseurl_ref = db_models.TenantBaseURLAssociation()
         dbaseurl_ref.tenant_id = tenant_id
         dbaseurl_ref.baseURLs_id = baseurl.id
-        dbaseurl_ref = db_api.baseurl.baseurls_ref_add(dbaseurl_ref)
+        dbaseurl_ref = db_api.baseurl.ref_add(dbaseurl_ref)
         baseurlRef = baseURLs.BaseURLRef(dbaseurl_ref.id, url + \
                                          '/baseURLs/' + \
                                          dbaseurl_ref.baseURLs_id)
@@ -1086,5 +1086,5 @@ class IdentityService(object):
 
     def delete_baseurls_ref(self, admin_token, baseurls_id):
         self.__validate_token(admin_token)
-        db_api.baseurl.baseurls_ref_delete(baseurls_id)
+        db_api.baseurl.ref_delete(baseurls_id)
         return None
diff --git a/keystone/test/unit/base.py b/keystone/test/unit/base.py
index 0d59bba1..631e6cd3 100644
--- a/keystone/test/unit/base.py
+++ b/keystone/test/unit/base.py
@@ -18,7 +18,6 @@
 
 import datetime
 import functools
-import json
 import httplib
 import logging
 import pprint
@@ -28,7 +27,8 @@ from lxml import etree, objectify
 import webob
 
 from keystone import server
-from keystone.db.sqlalchemy import api as db_api
+import keystone.db.sqlalchemy as db
+import keystone.db.sqlalchemy.api as db_api
 
 logger = logging.getLogger('test.unit.base')
 
@@ -48,7 +48,7 @@ class ServiceAPITest(unittest.TestCase):
     """
     Dict of configuration options to pass to the API controller
     """
-    options = {'sql_connection': 'sqlite:///',  # in-memory db
+    options = {'sql_connection': 'sqlite:///', # in-memory db
                'verbose': False,
                'debug': False}
 
@@ -117,9 +117,9 @@ class ServiceAPITest(unittest.TestCase):
         """
         Purges the database of all data
         """
-        db_api.unregister_models()
+        db.unregister_models()
         logger.debug("Cleared all data from database")
-        db_api.register_models()
+        db.register_models()
 
     def fixture_create_tenant(self, **kwargs):
         """
@@ -128,7 +128,7 @@ class ServiceAPITest(unittest.TestCase):
         :params **kwargs: Attributes of the tenant to create
         """
         values = kwargs.copy()
-        tenant = db_api.tenant_create(values)
+        tenant = db_api.tenant.create(values)
         logger.debug("Created tenant fixture %s", values['id'])
         return tenant
 
@@ -142,11 +142,11 @@ class ServiceAPITest(unittest.TestCase):
         values = kwargs.copy()
         tenant_id = values.get('tenant_id')
         if tenant_id:
-            if not db_api.tenant_get(tenant_id):
-                db_api.tenant_create({'id': tenant_id,
+            if not db_api.tenant.get(tenant_id):
+                db_api.tenant.create({'id': tenant_id,
                                       'enabled': True,
                                       'desc': tenant_id})
-        user = db_api.user_create(values)
+        user = db_api.user.create(values)
         logger.debug("Created user fixture %s", values['id'])
         return user
 
@@ -157,7 +157,7 @@ class ServiceAPITest(unittest.TestCase):
         :params **kwargs: Attributes of the token to create
         """
         values = kwargs.copy()
-        token = db_api.token_create(values)
+        token = db_api.token.create(values)
         logger.debug("Created token fixture %s", values['token_id'])
         return token
     
@@ -225,7 +225,7 @@ class ServiceAPITest(unittest.TestCase):
         nicely formatted for easy comparison if there is a failure.
         """
         self.assertEqual(expected, got, "Mappings are not equal.\n"
-                         "Got:\n%s\nExpected:\n%s" %
+                         "Got:\n%s\nExpected:\n%s" % 
                          (pprint.pformat(got),
                           pprint.pformat(expected)))
 
@@ -242,7 +242,7 @@ class ServiceAPITest(unittest.TestCase):
         expected = objectify.fromstring(expected)
         self.assertEqual(etree.tostring(expected),
                          etree.tostring(got), "DOMs are not equal.\n"
-                         "Got:\n%s\nExpected:\n%s" %
+                         "Got:\n%s\nExpected:\n%s" % 
                          (etree.tostring(got, pretty_print=True),
                           etree.tostring(expected, pretty_print=True)))