diff --git a/config-generator/keystone.conf b/config-generator/keystone.conf
index f65fffa722..0e00d489f5 100644
--- a/config-generator/keystone.conf
+++ b/config-generator/keystone.conf
@@ -3,7 +3,6 @@ output_file = etc/keystone.conf.sample
 wrap_width = 79
 namespace = keystone
 namespace = keystone.notifications
-namespace = keystone.openstack.common.eventlet_backdoor
 namespace = oslo.log
 namespace = oslo.messaging
 namespace = oslo.policy
diff --git a/keystone/common/controller.py b/keystone/common/controller.py
index 7d31ab9026..bc7074ac86 100644
--- a/keystone/common/controller.py
+++ b/keystone/common/controller.py
@@ -40,7 +40,7 @@ def v2_deprecated(f):
     This is a placeholder for the pending deprecation of v2. The implementation
     of this decorator can be replaced with::
 
-        from keystone.openstack.common import versionutils
+        from oslo_log import versionutils
 
 
         v2_deprecated = versionutils.deprecated(
diff --git a/keystone/common/environment/eventlet_server.py b/keystone/common/environment/eventlet_server.py
index d187e08a20..398952e153 100644
--- a/keystone/common/environment/eventlet_server.py
+++ b/keystone/common/environment/eventlet_server.py
@@ -178,7 +178,7 @@ class Server(service.ServiceBase):
 
         The service interface is used by the launcher when receiving a
         SIGHUP. The service interface is defined in
-        keystone.openstack.common.service.Service.
+        oslo_service.service.Service.
 
         Keystone does not need to do anything here.
         """
diff --git a/keystone/tests/hacking/checks.py b/keystone/tests/hacking/checks.py
index 7a760561b6..17bafff37a 100644
--- a/keystone/tests/hacking/checks.py
+++ b/keystone/tests/hacking/checks.py
@@ -144,7 +144,7 @@ class CheckForLoggingIssues(BaseASTChecker):
     DEBUG_CHECK_DESC = 'K005 Using translated string in debug logging'
     NONDEBUG_CHECK_DESC = 'K006 Not using translating helper for logging'
     EXCESS_HELPER_CHECK_DESC = 'K007 Using hints when _ is necessary'
-    LOG_MODULES = ('logging', 'keystone.openstack.common.log')
+    LOG_MODULES = ('logging', 'oslo_log.log')
     I18N_MODULES = (
         'keystone.i18n._',
         'keystone.i18n._LI',
diff --git a/keystone/tests/unit/ksfixtures/hacking.py b/keystone/tests/unit/ksfixtures/hacking.py
index 7017a5ff9f..918087adca 100644
--- a/keystone/tests/unit/ksfixtures/hacking.py
+++ b/keystone/tests/unit/ksfixtures/hacking.py
@@ -118,8 +118,8 @@ class HackingCode(fixtures.Fixture):
             import logging as stlib_logging
             from keystone.i18n import _
             from keystone.i18n import _ as oslo_i18n
-            from keystone.openstack.common import log
-            from keystone.openstack.common import log as oslo_logging
+            from oslo_log import log
+            from oslo_log import log as oslo_logging
 
             # stdlib logging
             L0 = logging.getLogger()
@@ -138,7 +138,7 @@ class HackingCode(fixtures.Fixture):
                     )
 
             # oslo logging and specifying a logger
-            L2 = log.getLogger(__name__)
+            L2 = logging.getLogger(__name__)
             L2.debug(oslo_i18n('text'))
 
             # oslo logging w/ alias
@@ -207,8 +207,8 @@ class HackingLogging(fixtures.Fixture):
                 from keystone.i18n import _LE as error_hint
                 from keystone.i18n import _LI
                 from keystone.i18n import _LW
-                from keystone.openstack.common import log
-                from keystone.openstack.common import log as oslo_logging
+                from oslo_log import log
+                from oslo_log import log as oslo_logging
     """
 
     examples = [