diff --git a/HACKING.rst b/HACKING.rst
index e1cb283aa1..a779db7453 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -25,8 +25,8 @@ Logging
 
 Use the common logging module, and ensure you ``getLogger``::
 
-    from keystone.openstack.common import log as logging
+    from keystone.openstack.common import log
 
-    LOG = logging.getLogger(__name__)
+    LOG = log.getLogger(__name__)
 
     LOG.debug('Foobar')
diff --git a/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py
index 6465b997c1..5985cb45f1 100644
--- a/keystone/assignment/backends/ldap.py
+++ b/keystone/assignment/backends/ldap.py
@@ -27,11 +27,11 @@ from keystone.common import models
 from keystone import config
 from keystone import exception
 from keystone.identity.backends import ldap as ldap_identity
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @dependency.requires('identity_api')
diff --git a/keystone/assignment/controllers.py b/keystone/assignment/controllers.py
index 9264eb7e45..5683e06f20 100644
--- a/keystone/assignment/controllers.py
+++ b/keystone/assignment/controllers.py
@@ -26,12 +26,12 @@ from keystone.common import controller
 from keystone.common import dependency
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @dependency.requires('assignment_api', 'identity_api', 'token_api')
diff --git a/keystone/assignment/core.py b/keystone/assignment/core.py
index 5b13cb007c..c3275b1f51 100644
--- a/keystone/assignment/core.py
+++ b/keystone/assignment/core.py
@@ -27,11 +27,11 @@ from keystone.common import manager
 from keystone import config
 from keystone import exception
 from keystone import notifications
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 SHOULD_CACHE = cache.should_cache_fn('assignment')
 
 DEFAULT_DOMAIN = {'description':
diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py
index bb9b420f65..64f3763d42 100644
--- a/keystone/auth/controllers.py
+++ b/keystone/auth/controllers.py
@@ -23,11 +23,11 @@ from keystone.common import wsgi
 from keystone import config
 from keystone import exception
 from keystone.openstack.common import importutils
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 CONF = config.CONF
 
diff --git a/keystone/auth/plugins/external.py b/keystone/auth/plugins/external.py
index 978fc4b204..13c54ffe01 100644
--- a/keystone/auth/plugins/external.py
+++ b/keystone/auth/plugins/external.py
@@ -23,11 +23,11 @@ import six
 from keystone import auth
 from keystone.common import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 CONF = config.CONF
 
diff --git a/keystone/auth/plugins/oauth1.py b/keystone/auth/plugins/oauth1.py
index 09f68ce54f..5ccc335274 100644
--- a/keystone/auth/plugins/oauth1.py
+++ b/keystone/auth/plugins/oauth1.py
@@ -19,12 +19,12 @@ from keystone.common import dependency
 from keystone.contrib import oauth1
 from keystone.contrib.oauth1 import core as oauth
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 
 
 METHOD_NAME = 'oauth1'
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @dependency.requires('oauth_api')
diff --git a/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py
index a5c8457cb9..5cc20c37b8 100644
--- a/keystone/auth/plugins/password.py
+++ b/keystone/auth/plugins/password.py
@@ -17,11 +17,11 @@
 from keystone import auth
 from keystone.common import dependency
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 METHOD_NAME = 'password'
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @dependency.requires('assignment_api', 'identity_api')
diff --git a/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py
index 50def926d5..a06032d84d 100644
--- a/keystone/auth/plugins/token.py
+++ b/keystone/auth/plugins/token.py
@@ -17,14 +17,14 @@
 from keystone import auth
 from keystone.common import wsgi
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 from keystone.token import provider
 
 
 METHOD_NAME = 'token'
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class Token(auth.AuthMethodHandler):
diff --git a/keystone/catalog/backends/templated.py b/keystone/catalog/backends/templated.py
index e3319793d9..af7fc3d194 100644
--- a/keystone/catalog/backends/templated.py
+++ b/keystone/catalog/backends/templated.py
@@ -20,10 +20,10 @@ from keystone.catalog.backends import kvs
 from keystone.catalog import core
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 CONF = config.CONF
 
diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py
index f377931282..901b26aa1d 100644
--- a/keystone/catalog/core.py
+++ b/keystone/catalog/core.py
@@ -25,11 +25,11 @@ from keystone.common import dependency
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def format_url(url, data):
diff --git a/keystone/common/cms.py b/keystone/common/cms.py
index 8d52ccc002..086d106b9f 100644
--- a/keystone/common/cms.py
+++ b/keystone/common/cms.py
@@ -17,10 +17,10 @@
 import hashlib
 
 from keystone.common import environment
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 PKI_ANS1_PREFIX = 'MII'
 
 
diff --git a/keystone/common/controller.py b/keystone/common/controller.py
index c786acb47b..88c3afd1a8 100644
--- a/keystone/common/controller.py
+++ b/keystone/common/controller.py
@@ -22,11 +22,11 @@ from keystone.common import dependency
 from keystone.common import wsgi
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 CONF = config.CONF
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
 
diff --git a/keystone/common/environment/__init__.py b/keystone/common/environment/__init__.py
index 491b3189f0..fcd343b4eb 100644
--- a/keystone/common/environment/__init__.py
+++ b/keystone/common/environment/__init__.py
@@ -18,10 +18,10 @@ import functools
 import os
 
 from keystone.common import config
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 __all__ = ['Server', 'httplib', 'subprocess']
diff --git a/keystone/common/environment/eventlet_server.py b/keystone/common/environment/eventlet_server.py
index a9d873b09a..661c0521ad 100644
--- a/keystone/common/environment/eventlet_server.py
+++ b/keystone/common/environment/eventlet_server.py
@@ -26,10 +26,10 @@ import eventlet
 import eventlet.wsgi
 import greenlet
 
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class Server(object):
@@ -104,10 +104,10 @@ class Server(object):
 
     def _run(self, application, socket):
         """Start a WSGI server in a new green thread."""
-        log = logging.getLogger('eventlet.wsgi.server')
+        logger = log.getLogger('eventlet.wsgi.server')
         try:
             eventlet.wsgi.server(socket, application, custom_pool=self.pool,
-                                 log=logging.WritableLogger(log))
+                                 log=log.WritableLogger(logger))
         except Exception:
             LOG.exception(_('Server error'))
             raise
diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py
index 8856f65b89..bc9c85b4fe 100644
--- a/keystone/common/ldap/core.py
+++ b/keystone/common/ldap/core.py
@@ -20,9 +20,9 @@ import ldap
 import ldap.filter
 
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 LDAP_VALUES = {'TRUE': True, 'FALSE': False}
diff --git a/keystone/common/openssl.py b/keystone/common/openssl.py
index 8326555ca8..7d1264fef9 100644
--- a/keystone/common/openssl.py
+++ b/keystone/common/openssl.py
@@ -20,9 +20,9 @@ import os
 from keystone.common import environment
 from keystone.common import utils
 from keystone import config
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 CONF = config.CONF
 
 PUBLIC_DIR_PERMS = 0o755        # -rwxr-xr-x
diff --git a/keystone/common/utils.py b/keystone/common/utils.py
index a7bc901b88..8e4e4d879b 100644
--- a/keystone/common/utils.py
+++ b/keystone/common/utils.py
@@ -30,13 +30,13 @@ import passlib.hash
 from keystone.common import config
 from keystone.common import environment
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from six import moves
 
 
 CONF = config.CONF
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def read_cached_file(filename, cache_info, reload_func=None):
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 03a8af4cbf..6e27311232 100644
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -33,11 +33,11 @@ from keystone import exception
 from keystone.openstack.common import gettextutils
 from keystone.openstack.common import importutils
 from keystone.openstack.common import jsonutils
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 # Environment variable used to pass the request context
 CONTEXT_ENV = 'openstack.context'
@@ -382,11 +382,11 @@ class Debug(Middleware):
             LOG.debug('%s %s %s', ('*' * 20), 'REQUEST ENVIRON', ('*' * 20))
             for key, value in req.environ.items():
                 LOG.debug('%s = %s', key,
-                          logging.mask_password(value))
+                          log.mask_password(value))
             LOG.debug('')
             LOG.debug('%s %s %s', ('*' * 20), 'REQUEST BODY', ('*' * 20))
             for line in req.body_file:
-                LOG.debug('%s', logging.mask_password(line))
+                LOG.debug('%s', log.mask_password(line))
             LOG.debug('')
 
         resp = req.get_response(self.application)
@@ -436,7 +436,6 @@ class Router(object):
           mapper.connect(None, '/v1.0/{path_info:.*}', controller=BlogApp())
 
         """
-
         self.map = mapper
         self._router = routes.middleware.RoutesMiddleware(self._dispatch,
                                                           self.map)
diff --git a/keystone/contrib/access/core.py b/keystone/contrib/access/core.py
index 869a666cf1..584f739009 100644
--- a/keystone/contrib/access/core.py
+++ b/keystone/contrib/access/core.py
@@ -18,12 +18,12 @@ import webob.dec
 
 from keystone.common import wsgi
 from keystone import config
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 
 
 CONF = config.CONF
-LOG = logging.getLogger('access')
+LOG = log.getLogger('access')
 APACHE_TIME_FORMAT = '%d/%b/%Y:%H:%M:%S'
 APACHE_LOG_FORMAT = (
     '%(remote_addr)s - %(remote_user)s [%(datetime)s] "%(method)s %(url)s '
diff --git a/keystone/contrib/endpoint_filter/core.py b/keystone/contrib/endpoint_filter/core.py
index 5f1144003e..b94225ffd0 100644
--- a/keystone/contrib/endpoint_filter/core.py
+++ b/keystone/contrib/endpoint_filter/core.py
@@ -23,11 +23,11 @@ from keystone.common import extension
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 extension_data = {
     'name': 'Openstack Keystone Endpoint Filter API',
diff --git a/keystone/contrib/example/core.py b/keystone/contrib/example/core.py
index cd1494503e..12a7bc6899 100644
--- a/keystone/contrib/example/core.py
+++ b/keystone/contrib/example/core.py
@@ -19,11 +19,11 @@ from keystone.common import dependency
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @dependency.provider('example_api')
diff --git a/keystone/contrib/stats/core.py b/keystone/contrib/stats/core.py
index 0568db144f..a643a14e7f 100644
--- a/keystone/contrib/stats/core.py
+++ b/keystone/contrib/stats/core.py
@@ -20,13 +20,13 @@ from keystone.common import wsgi
 from keystone import config
 from keystone import exception
 from keystone import identity
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone import policy
 from keystone import token
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 extension_data = {
     'name': 'Openstack Keystone Stats API',
diff --git a/keystone/contrib/user_crud/core.py b/keystone/contrib/user_crud/core.py
index 2129af408b..15be597fef 100644
--- a/keystone/contrib/user_crud/core.py
+++ b/keystone/contrib/user_crud/core.py
@@ -21,10 +21,10 @@ from keystone.common import extension
 from keystone.common import wsgi
 from keystone import exception
 from keystone import identity
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 extension.register_public_extension(
diff --git a/keystone/controllers.py b/keystone/controllers.py
index 635915c2ef..c440ca0daa 100644
--- a/keystone/controllers.py
+++ b/keystone/controllers.py
@@ -18,10 +18,10 @@ from keystone.common import extension
 from keystone.common import wsgi
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 CONF = config.CONF
 
 MEDIA_TYPE_JSON = 'application/vnd.openstack.identity-%s+json'
diff --git a/keystone/credential/core.py b/keystone/credential/core.py
index 96f6ef8cde..11f3b7ff1f 100644
--- a/keystone/credential/core.py
+++ b/keystone/credential/core.py
@@ -24,12 +24,12 @@ from keystone.common import dependency
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @dependency.provider('credential_api')
diff --git a/keystone/exception.py b/keystone/exception.py
index 0edf2108da..66378c5410 100644
--- a/keystone/exception.py
+++ b/keystone/exception.py
@@ -17,12 +17,12 @@
 import six
 
 from keystone.common import config
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import strutils
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 # Tests use this to make exception message format errors fatal
 _FATAL_EXCEPTION_FORMAT_ERRORS = False
diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py
index 96d11cbec5..15e7980d56 100644
--- a/keystone/identity/backends/ldap.py
+++ b/keystone/identity/backends/ldap.py
@@ -26,11 +26,11 @@ from keystone.common import utils
 from keystone import config
 from keystone import exception
 from keystone import identity
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @dependency.requires('assignment_api')
diff --git a/keystone/identity/controllers.py b/keystone/identity/controllers.py
index 5f64456bce..f67716b404 100644
--- a/keystone/identity/controllers.py
+++ b/keystone/identity/controllers.py
@@ -25,13 +25,13 @@ from keystone.common import controller
 from keystone.common import dependency
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 
 CONF = config.CONF
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class DeprecatedMeta(type):
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index e76e45243e..21e5498d47 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -31,13 +31,13 @@ from keystone import config
 from keystone import exception
 from keystone import notifications
 from keystone.openstack.common import importutils
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 
 CONF = config.CONF
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def moved_to_assignment(f):
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index fc88af6147..09b8c4e5bb 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -22,10 +22,10 @@ from keystone.common import utils
 from keystone.common import wsgi
 from keystone import exception
 from keystone.openstack.common import jsonutils
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 # Header used to transmit the auth token
diff --git a/keystone/middleware/s3_token.py b/keystone/middleware/s3_token.py
index 342cee4658..b1ab679022 100644
--- a/keystone/middleware/s3_token.py
+++ b/keystone/middleware/s3_token.py
@@ -38,11 +38,11 @@ import urllib
 import webob
 
 from keystone.openstack.common import jsonutils
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 PROTOCOL_NAME = 'S3 Token Authentication'
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 # TODO(kun): remove it after oslo merge this.
diff --git a/keystone/policy/backends/rules.py b/keystone/policy/backends/rules.py
index a2267741a0..cc4edf47cc 100644
--- a/keystone/policy/backends/rules.py
+++ b/keystone/policy/backends/rules.py
@@ -22,13 +22,13 @@ import os.path
 from keystone.common import utils
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import policy as common_policy
 from keystone import policy
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 _ENFORCER = None
diff --git a/keystone/service.py b/keystone/service.py
index 5685413e59..2452c7052f 100644
--- a/keystone/service.py
+++ b/keystone/service.py
@@ -27,7 +27,7 @@ from keystone.contrib import endpoint_filter
 from keystone import controllers
 from keystone import credential
 from keystone import identity
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone import policy
 from keystone import routers
 from keystone import token
@@ -35,7 +35,7 @@ from keystone import trust
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 # Ensure the cache is configured and built before we instantiate the managers
diff --git a/keystone/tests/fakeldap.py b/keystone/tests/fakeldap.py
index 62346a5fe9..3763aae92e 100644
--- a/keystone/tests/fakeldap.py
+++ b/keystone/tests/fakeldap.py
@@ -30,7 +30,7 @@ import shelve
 import ldap
 
 from keystone.common import utils
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from six import moves
 
 
@@ -41,7 +41,7 @@ SCOPE_NAMES = {
 }
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 def _process_attr(attr_name, value_or_values):
diff --git a/keystone/token/backends/kvs.py b/keystone/token/backends/kvs.py
index 0fa3e8f1f2..c3824b0bf5 100644
--- a/keystone/token/backends/kvs.py
+++ b/keystone/token/backends/kvs.py
@@ -18,11 +18,11 @@ import copy
 
 from keystone.common import kvs
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 from keystone import token
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class Token(kvs.Base, token.Driver):
diff --git a/keystone/token/backends/memcache.py b/keystone/token/backends/memcache.py
index c836a9476f..f641e367fa 100644
--- a/keystone/token/backends/memcache.py
+++ b/keystone/token/backends/memcache.py
@@ -23,14 +23,14 @@ from keystone.common import utils
 from keystone import config
 from keystone import exception
 from keystone.openstack.common import jsonutils
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 from keystone import token
 
 
 CONF = config.CONF
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class Token(token.Driver):
diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py
index 7fb45c3284..2704775317 100644
--- a/keystone/token/controllers.py
+++ b/keystone/token/controllers.py
@@ -22,13 +22,13 @@ from keystone.common import dependency
 from keystone.common import wsgi
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 from keystone.token import core
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
 
 
diff --git a/keystone/token/core.py b/keystone/token/core.py
index c2c0cdb65b..a37b35420b 100644
--- a/keystone/token/core.py
+++ b/keystone/token/core.py
@@ -28,13 +28,13 @@ from keystone.common import dependency
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 from keystone.openstack.common import versionutils
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 SHOULD_CACHE = cache.should_cache_fn('token')
 
 
diff --git a/keystone/token/provider.py b/keystone/token/provider.py
index 1f32416228..b7371bbf7a 100644
--- a/keystone/token/provider.py
+++ b/keystone/token/provider.py
@@ -25,12 +25,12 @@ from keystone.common import dependency
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 
 
 CONF = config.CONF
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 SHOULD_CACHE = cache.should_cache_fn('token')
 
 
diff --git a/keystone/token/providers/common.py b/keystone/token/providers/common.py
index b5f1d7b349..889ee2cfb0 100644
--- a/keystone/token/providers/common.py
+++ b/keystone/token/providers/common.py
@@ -25,11 +25,11 @@ from keystone.token import provider
 from keystone import trust
 
 
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 CONF = config.CONF
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
 
diff --git a/keystone/token/providers/pki.py b/keystone/token/providers/pki.py
index 714899e528..4a17631626 100644
--- a/keystone/token/providers/pki.py
+++ b/keystone/token/providers/pki.py
@@ -22,13 +22,13 @@ from keystone.common import cms
 from keystone.common import environment
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.token.providers import common
 
 
 CONF = config.CONF
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 class Provider(common.BaseProvider):
diff --git a/keystone/trust/controllers.py b/keystone/trust/controllers.py
index 6dafda71a0..6026c192c2 100644
--- a/keystone/trust/controllers.py
+++ b/keystone/trust/controllers.py
@@ -21,11 +21,11 @@ from keystone.common import controller
 from keystone.common import dependency
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 CONF = config.CONF
 
 
diff --git a/keystone/trust/core.py b/keystone/trust/core.py
index 7ad78b42cb..0bab37029e 100644
--- a/keystone/trust/core.py
+++ b/keystone/trust/core.py
@@ -24,12 +24,12 @@ from keystone.common import dependency
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
+from keystone.openstack.common import log
 
 
 CONF = config.CONF
 
-LOG = logging.getLogger(__name__)
+LOG = log.getLogger(__name__)
 
 
 @dependency.provider('trust_api')