diff --git a/cinder/compute/__init__.py b/cinder/compute/__init__.py
index 21a94f826c4..96f73b897af 100644
--- a/cinder/compute/__init__.py
+++ b/cinder/compute/__init__.py
@@ -13,21 +13,21 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import oslo.config.cfg
+import oslo_config.cfg
 from oslo_utils import importutils
 
 
 _compute_opts = [
-    oslo.config.cfg.StrOpt('compute_api_class',
+    oslo_config.cfg.StrOpt('compute_api_class',
                            default='cinder.compute.nova.API',
                            help='The full class name of the '
                                 'compute API class to use'),
 ]
 
-oslo.config.cfg.CONF.register_opts(_compute_opts)
+oslo_config.cfg.CONF.register_opts(_compute_opts)
 
 
 def API():
-    compute_api_class = oslo.config.cfg.CONF.compute_api_class
+    compute_api_class = oslo_config.cfg.CONF.compute_api_class
     cls = importutils.import_class(compute_api_class)
     return cls()
diff --git a/setup.cfg b/setup.cfg
index 4a72a101f6a..9c56be70f41 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,7 +47,7 @@ console_scripts =
     cinder-api = cinder.cmd.api:main
     cinder-backup = cinder.cmd.backup:main
     cinder-manage = cinder.cmd.manage:main
-    cinder-rootwrap = oslo.rootwrap.cmd:main
+    cinder-rootwrap = oslo_rootwrap.cmd:main
     cinder-rtstool = cinder.cmd.rtstool:main
     cinder-scheduler = cinder.cmd.scheduler:main
     cinder-volume = cinder.cmd.volume:main
@@ -61,7 +61,7 @@ oslo.messaging.notify.drivers =
     cinder.openstack.common.notifier.test_notifier = oslo.messaging.notify._impl_test:TestDriver
 
 cinder.database.migration_backend =
-    sqlalchemy = oslo.db.sqlalchemy.migration
+    sqlalchemy = oslo_db.sqlalchemy.migration
 
 [build_sphinx]
 all_files = 1
diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc
index d17957ef4f6..47b7d3bb636 100644
--- a/tools/config/oslo.config.generator.rc
+++ b/tools/config/oslo.config.generator.rc
@@ -1,2 +1,2 @@
 export CINDER_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token"
-export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.messaging oslo.db oslo.db.concurrency"
+export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.messaging oslo_db oslo.db.concurrency"