diff --git a/autogenerate_config_docs/autohelp.py b/autogenerate_config_docs/autohelp.py
index ec96f878..1f4632da 100755
--- a/autogenerate_config_docs/autohelp.py
+++ b/autogenerate_config_docs/autohelp.py
@@ -18,7 +18,7 @@
 #
 
 # Must import this before argparse
-from oslo.config import cfg
+from oslo_config import cfg
 
 import argparse
 import importlib
@@ -29,7 +29,7 @@ import sys
 
 import git
 from lxml import etree
-import oslo.i18n as i18n
+import oslo_i18n as i18n
 import stevedore
 
 from hooks import HOOKS  # noqa
diff --git a/autogenerate_config_docs/extract_swift_flags.py b/autogenerate_config_docs/extract_swift_flags.py
index d6b7b1a3..9a2f06ab 100644
--- a/autogenerate_config_docs/extract_swift_flags.py
+++ b/autogenerate_config_docs/extract_swift_flags.py
@@ -19,7 +19,7 @@ import pickle
 import sys
 
 from lxml import etree
-from oslo.config import cfg
+from oslo_config import cfg
 
 from autohelp import OptionsCache  # noqa
 
diff --git a/autogenerate_config_docs/hooks.py b/autogenerate_config_docs/hooks.py
index 570fea28..bd56d0e8 100644
--- a/autogenerate_config_docs/hooks.py
+++ b/autogenerate_config_docs/hooks.py
@@ -27,7 +27,7 @@ def keystone_config():
 def glance_store_config():
     try:
         import glance_store
-        from oslo.config import cfg
+        from oslo_config import cfg
 
         glance_store.backend.register_opts(cfg.CONF)
     except ImportError:
@@ -40,7 +40,7 @@ def neutron_misc():
     import networking_cisco.plugins.cisco.cfg_agent.device_status  # noqa
     import networking_l2gw.services.l2gateway.common.config as l2gw
     import networking_vsphere.common.config
-    from oslo.config import cfg
+    from oslo_config import cfg
     import vmware_nsx.neutron.plugins.vmware.common.config  # noqa
 
     bsnstacklib.plugins.bigswitch.config.register_config()
diff --git a/autogenerate_config_docs/test/generator.py b/autogenerate_config_docs/test/generator.py
index 0394ca5a..eb1a02e1 100755
--- a/autogenerate_config_docs/test/generator.py
+++ b/autogenerate_config_docs/test/generator.py
@@ -30,7 +30,7 @@ import socket
 import sys
 import textwrap
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 # from openstack.common import gettextutils
 from openstack.common import importutils
diff --git a/os_doc_tools/doctest.py b/os_doc_tools/doctest.py
index 4dec161f..cc6d0c36 100755
--- a/os_doc_tools/doctest.py
+++ b/os_doc_tools/doctest.py
@@ -43,7 +43,7 @@ import time
 import urllib2
 
 from lxml import etree
-from oslo.config import cfg
+from oslo_config import cfg
 
 import os_doc_tools
 from os_doc_tools.common import check_output   # noqa
diff --git a/os_doc_tools/openstack/common/log.py b/os_doc_tools/openstack/common/log.py
index 2b67b30d..3dd34dad 100644
--- a/os_doc_tools/openstack/common/log.py
+++ b/os_doc_tools/openstack/common/log.py
@@ -36,7 +36,7 @@ import os
 import sys
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 from six import moves