diff --git a/refstack/api/app.py b/refstack/api/app.py
index 15929337..1b1c8f59 100644
--- a/refstack/api/app.py
+++ b/refstack/api/app.py
@@ -19,7 +19,7 @@ import json
 import logging
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 from pecan import hooks
 import webob
diff --git a/refstack/db/api.py b/refstack/db/api.py
index f3c48601..2e3ebde6 100644
--- a/refstack/db/api.py
+++ b/refstack/db/api.py
@@ -20,8 +20,8 @@ Call these functions from refstack.db namespace, not the refstack.db.api
 namespace.
 
 """
-from oslo.config import cfg
-from oslo.db import api as db_api
+from oslo_config import cfg
+from oslo_db import api as db_api
 
 
 db_opts = [
diff --git a/refstack/db/migrations/alembic/migration.py b/refstack/db/migrations/alembic/migration.py
index 1fb29a09..8e763fe1 100644
--- a/refstack/db/migrations/alembic/migration.py
+++ b/refstack/db/migrations/alembic/migration.py
@@ -20,7 +20,7 @@ import os
 import alembic
 from alembic import config as alembic_config
 import alembic.migration as alembic_migration
-from oslo.config import cfg
+from oslo_config import cfg
 
 from refstack.db.sqlalchemy import api as db_api
 
diff --git a/refstack/db/sqlalchemy/api.py b/refstack/db/sqlalchemy/api.py
index 77c5df9a..a36f7a17 100644
--- a/refstack/db/sqlalchemy/api.py
+++ b/refstack/db/sqlalchemy/api.py
@@ -18,9 +18,9 @@ Implementation of SQLAlchemy backend.
 import sys
 import uuid
 
-from oslo.config import cfg
-from oslo.db import options as db_options
-from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
+from oslo_db import options as db_options
+from oslo_db.sqlalchemy import session as db_session
 
 from refstack.db.sqlalchemy import models
 
diff --git a/refstack/db/sqlalchemy/models.py b/refstack/db/sqlalchemy/models.py
index c91b9128..204618aa 100644
--- a/refstack/db/sqlalchemy/models.py
+++ b/refstack/db/sqlalchemy/models.py
@@ -19,9 +19,9 @@ SQLAlchemy models for Refstack data.
 
 import datetime
 
-from oslo.config import cfg
-from oslo.db.sqlalchemy import models
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_db.sqlalchemy import models
+from oslo_utils import timeutils
 import sqlalchemy as sa
 from sqlalchemy import orm
 from sqlalchemy.ext.declarative import declarative_base
diff --git a/refstack/db/utils.py b/refstack/db/utils.py
index 83c24643..c952b737 100644
--- a/refstack/db/utils.py
+++ b/refstack/db/utils.py
@@ -17,7 +17,7 @@
 
 import logging
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
diff --git a/refstack/tests/api/__init__.py b/refstack/tests/api/__init__.py
index 47b0a56c..27446770 100644
--- a/refstack/tests/api/__init__.py
+++ b/refstack/tests/api/__init__.py
@@ -19,7 +19,7 @@ import os
 
 import alembic
 import alembic.config
-from oslo.config import cfg
+from oslo_config import cfg
 import sqlalchemy as sa
 import sqlalchemy.exc
 from unittest import TestCase