diff --git a/bin/heat-api b/bin/heat-api
index 1df5699bd3..f49ead0829 100755
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -30,8 +30,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from oslo.config import cfg
-from oslo import i18n
+from oslo_config import cfg
+import oslo_i18n as i18n
 from oslo_log import log as logging
 import six
 
diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn
index fd58d83db9..99be1b1621 100755
--- a/bin/heat-api-cfn
+++ b/bin/heat-api-cfn
@@ -32,8 +32,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from oslo.config import cfg
-from oslo import i18n
+from oslo_config import cfg
+import oslo_i18n as i18n
 from oslo_log import log as logging
 import six
 
diff --git a/bin/heat-api-cloudwatch b/bin/heat-api-cloudwatch
index 84cfc01a88..98040319dc 100755
--- a/bin/heat-api-cloudwatch
+++ b/bin/heat-api-cloudwatch
@@ -32,8 +32,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from oslo.config import cfg
-from oslo import i18n
+from oslo_config import cfg
+import oslo_i18n as i18n
 from oslo_log import log as logging
 import six
 
diff --git a/bin/heat-engine b/bin/heat-engine
index 141f0a1644..9fb9f2580f 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -32,8 +32,8 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'heat', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
-from oslo.config import cfg
-from oslo import i18n
+from oslo_config import cfg
+import oslo_i18n as i18n
 from oslo_log import log as logging
 
 from heat.common.i18n import _LC
diff --git a/bin/heat-keystone-setup-domain b/bin/heat-keystone-setup-domain
index 443865cb50..2621372cda 100755
--- a/bin/heat-keystone-setup-domain
+++ b/bin/heat-keystone-setup-domain
@@ -18,7 +18,7 @@ import sys
 
 import keystoneclient.exceptions as kc_exception
 from keystoneclient.v3 import client
-from oslo.config import cfg
+from oslo_config import cfg
 
 logger = logging.getLogger(__name__)
 
diff --git a/contrib/heat_docker/heat_docker/tests/test_docker_container.py b/contrib/heat_docker/heat_docker/tests/test_docker_container.py
index 3d1decc119..a103445318 100644
--- a/contrib/heat_docker/heat_docker/tests/test_docker_container.py
+++ b/contrib/heat_docker/heat_docker/tests/test_docker_container.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 import mock
-from oslo.utils import importutils
+from oslo_utils import importutils
 import six
 
 from heat.common import exception
diff --git a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
index 783231b1d2..83faae3a51 100644
--- a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
+++ b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
@@ -14,9 +14,9 @@
 """Client Library for Keystone Resources."""
 
 from keystoneclient.v2_0 import client as kc
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import importutils
 
 from heat.common import exception
 from heat.common.i18n import _LE
diff --git a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
index e9be344896..28819c45c5 100644
--- a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
+++ b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
@@ -14,8 +14,8 @@
 
 import mock
 import mox
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 
 from heat.common import exception
 from heat.tests import common
diff --git a/contrib/heat_mistral/heat_mistral/client.py b/contrib/heat_mistral/heat_mistral/client.py
index b3a893b494..22131d3208 100644
--- a/contrib/heat_mistral/heat_mistral/client.py
+++ b/contrib/heat_mistral/heat_mistral/client.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from heat.engine.clients import client_plugin
 
diff --git a/contrib/rackspace/rackspace/clients.py b/contrib/rackspace/rackspace/clients.py
index 5a272bd56b..811c3b6c2b 100644
--- a/contrib/rackspace/rackspace/clients.py
+++ b/contrib/rackspace/rackspace/clients.py
@@ -19,7 +19,7 @@ import time
 import urlparse
 
 from glanceclient import client as gc
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from swiftclient import utils as swiftclient_utils
 from troveclient import client as tc
diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
index 20a500e489..64fc55f4ee 100644
--- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
+++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
@@ -13,8 +13,8 @@
 
 import mock
 import mox
-from oslo.config import cfg
-from oslo.utils import uuidutils
+from oslo_config import cfg
+from oslo_utils import uuidutils
 import six
 
 from heat.common import exception
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f2373b22ff..f57621c7c4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -30,7 +30,7 @@ import re
 import sys
 import tempfile
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
diff --git a/heat/__init__.py b/heat/__init__.py
index 6148d2f7ac..27d747c374 100644
--- a/heat/__init__.py
+++ b/heat/__init__.py
@@ -14,6 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo import i18n
+import oslo_i18n as i18n
 
 i18n.enable_lazy()
diff --git a/heat/api/aws/ec2token.py b/heat/api/aws/ec2token.py
index fc809642d7..038f0dceda 100644
--- a/heat/api/aws/ec2token.py
+++ b/heat/api/aws/ec2token.py
@@ -13,10 +13,10 @@
 
 import hashlib
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils as json
-from oslo.utils import importutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_serialization import jsonutils as json
+from oslo_utils import importutils
 import requests
 import webob
 
diff --git a/heat/api/cloudwatch/watch.py b/heat/api/cloudwatch/watch.py
index cf00182d5e..669a93111b 100644
--- a/heat/api/cloudwatch/watch.py
+++ b/heat/api/cloudwatch/watch.py
@@ -13,8 +13,8 @@
 
 """Endpoint for heat AWS-compatible CloudWatch API."""
 
-from oslo import messaging
 from oslo_log import log as logging
+import oslo_messaging as messaging
 import six
 
 from heat.api.aws import exception
diff --git a/heat/api/middleware/fault.py b/heat/api/middleware/fault.py
index 57d29354be..6ff7d590c4 100644
--- a/heat/api/middleware/fault.py
+++ b/heat/api/middleware/fault.py
@@ -23,7 +23,7 @@ import six
 
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 import webob
 
 from heat.common import exception
diff --git a/heat/api/middleware/ssl.py b/heat/api/middleware/ssl.py
index 07bd48416a..c9a15cae78 100644
--- a/heat/api/middleware/ssl.py
+++ b/heat/api/middleware/ssl.py
@@ -11,7 +11,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import wsgi
 
diff --git a/heat/api/openstack/v1/build_info.py b/heat/api/openstack/v1/build_info.py
index 2cdfa6a3da..d2e9ce15dd 100644
--- a/heat/api/openstack/v1/build_info.py
+++ b/heat/api/openstack/v1/build_info.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.api.openstack.v1 import util
 from heat.common import serializers
diff --git a/heat/api/openstack/v1/services.py b/heat/api/openstack/v1/services.py
index 52597253c6..85520bc054 100644
--- a/heat/api/openstack/v1/services.py
+++ b/heat/api/openstack/v1/services.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.messaging import exceptions
+from oslo_messaging import exceptions
 from webob import exc
 
 from heat.api.openstack.v1 import util
diff --git a/heat/cmd/manage.py b/heat/cmd/manage.py
index f3b35c44bb..915f04d4b7 100644
--- a/heat/cmd/manage.py
+++ b/heat/cmd/manage.py
@@ -19,7 +19,7 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from heat.common import context
diff --git a/heat/common/auth_password.py b/heat/common/auth_password.py
index 77bdfdadfd..71fa2217c7 100644
--- a/heat/common/auth_password.py
+++ b/heat/common/auth_password.py
@@ -18,7 +18,7 @@ import logging
 
 from keystoneclient import exceptions as keystone_exceptions
 from keystoneclient import session
-from oslo.config import cfg
+from oslo_config import cfg
 from webob import exc
 
 from heat.common import context
diff --git a/heat/common/auth_url.py b/heat/common/auth_url.py
index fddf6db95a..51c751bc0e 100644
--- a/heat/common/auth_url.py
+++ b/heat/common/auth_url.py
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 from webob import exc
 
 from heat.common.i18n import _
diff --git a/heat/common/config.py b/heat/common/config.py
index f923c80146..3670af44b8 100644
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -18,7 +18,7 @@ import logging as sys_logging
 import os
 
 from eventlet.green import socket
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from heat.common.i18n import _
diff --git a/heat/common/context.py b/heat/common/context.py
index c91b5e4988..3343a2d7dd 100644
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -15,11 +15,11 @@ from keystoneclient import access
 from keystoneclient.auth.identity import base
 from keystoneclient.auth.identity import v3
 from keystoneclient.auth import token_endpoint
-from oslo.config import cfg
-from oslo.middleware import request_id as oslo_request_id
-from oslo.utils import importutils
+from oslo_config import cfg
 from oslo_context import context
 from oslo_log import log as logging
+from oslo_middleware import request_id as oslo_request_id
+from oslo_utils import importutils
 
 from heat.common import exception
 from heat.common.i18n import _LE
diff --git a/heat/common/crypt.py b/heat/common/crypt.py
index 243fa399ec..6b53058b20 100644
--- a/heat/common/crypt.py
+++ b/heat/common/crypt.py
@@ -14,7 +14,7 @@
 import base64
 
 from Crypto.Cipher import AES
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.openstack.common.crypto import utils
 
diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py
index 5850f0384a..5e8e4fda6f 100644
--- a/heat/common/heat_keystoneclient.py
+++ b/heat/common/heat_keystoneclient.py
@@ -20,9 +20,9 @@ import uuid
 import keystoneclient.exceptions as kc_exception
 from keystoneclient import session
 from keystoneclient.v3 import client as kc_v3
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import importutils
 
 from heat.common import context
 from heat.common import exception
diff --git a/heat/common/i18n.py b/heat/common/i18n.py
index 9a49bbeb34..784dffb25f 100644
--- a/heat/common/i18n.py
+++ b/heat/common/i18n.py
@@ -16,7 +16,7 @@
 # It's based on oslo.i18n usage in OpenStack Keystone project and
 # recommendations from http://docs.openstack.org/developer/oslo.i18n/usage.html
 
-from oslo import i18n
+import oslo_i18n as i18n
 
 
 _translators = i18n.TranslatorFactory(domain='heat')
diff --git a/heat/common/identifier.py b/heat/common/identifier.py
index 40a4b2b13e..34d49f4566 100644
--- a/heat/common/identifier.py
+++ b/heat/common/identifier.py
@@ -14,7 +14,7 @@
 import collections
 import re
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 from six.moves.urllib import parse as urlparse
 
 from heat.common.i18n import _
diff --git a/heat/common/messaging.py b/heat/common/messaging.py
index ca4b0f1f7d..6bb0576484 100644
--- a/heat/common/messaging.py
+++ b/heat/common/messaging.py
@@ -16,9 +16,9 @@
 # under the License.
 
 import eventlet
-from oslo.config import cfg
-import oslo.messaging
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+import oslo_messaging
+from oslo_serialization import jsonutils
 from osprofiler import profiler
 
 from heat.common import context
@@ -34,7 +34,7 @@ _ALIASES = {
 }
 
 
-class RequestContextSerializer(oslo.messaging.Serializer):
+class RequestContextSerializer(oslo_messaging.Serializer):
     def __init__(self, base):
         self._base = base
 
@@ -69,41 +69,41 @@ class RequestContextSerializer(oslo.messaging.Serializer):
         return context.RequestContext.from_dict(ctxt)
 
 
-class JsonPayloadSerializer(oslo.messaging.NoOpSerializer):
+class JsonPayloadSerializer(oslo_messaging.NoOpSerializer):
     @classmethod
     def serialize_entity(cls, context, entity):
         return jsonutils.to_primitive(entity, convert_instances=True)
 
 
 def setup(url=None, optional=False):
-    """Initialise the oslo.messaging layer."""
+    """Initialise the oslo_messaging layer."""
     global TRANSPORT, NOTIFIER
 
     if url and url.startswith("fake://"):
-        # NOTE(sileht): oslo.messaging fake driver uses time.sleep
+        # NOTE(sileht): oslo_messaging fake driver uses time.sleep
         # for task switch, so we need to monkey_patch it
         eventlet.monkey_patch(time=True)
 
     if not TRANSPORT:
-        oslo.messaging.set_transport_defaults('heat')
+        oslo_messaging.set_transport_defaults('heat')
         exmods = ['heat.common.exception']
         try:
-            TRANSPORT = oslo.messaging.get_transport(
+            TRANSPORT = oslo_messaging.get_transport(
                 cfg.CONF, url, allowed_remote_exmods=exmods, aliases=_ALIASES)
-        except oslo.messaging.InvalidTransportURL as e:
+        except oslo_messaging.InvalidTransportURL as e:
             TRANSPORT = None
             if not optional or e.url:
-                # NOTE(sileht): oslo.messaging is configured but unloadable
+                # NOTE(sileht): oslo_messaging is configured but unloadable
                 # so reraise the exception
                 raise
 
     if not NOTIFIER and TRANSPORT:
         serializer = RequestContextSerializer(JsonPayloadSerializer())
-        NOTIFIER = oslo.messaging.Notifier(TRANSPORT, serializer=serializer)
+        NOTIFIER = oslo_messaging.Notifier(TRANSPORT, serializer=serializer)
 
 
 def cleanup():
-    """Cleanup the oslo.messaging layer."""
+    """Cleanup the oslo_messaging layer."""
     global TRANSPORT, NOTIFIER
     if TRANSPORT:
         TRANSPORT.cleanup()
@@ -111,21 +111,21 @@ def cleanup():
 
 
 def get_rpc_server(target, endpoint):
-    """Return a configured oslo.messaging rpc server."""
+    """Return a configured oslo_messaging rpc server."""
     serializer = RequestContextSerializer(JsonPayloadSerializer())
-    return oslo.messaging.get_rpc_server(TRANSPORT, target, [endpoint],
+    return oslo_messaging.get_rpc_server(TRANSPORT, target, [endpoint],
                                          executor='eventlet',
                                          serializer=serializer)
 
 
 def get_rpc_client(**kwargs):
-    """Return a configured oslo.messaging RPCClient."""
-    target = oslo.messaging.Target(**kwargs)
+    """Return a configured oslo_messaging RPCClient."""
+    target = oslo_messaging.Target(**kwargs)
     serializer = RequestContextSerializer(JsonPayloadSerializer())
-    return oslo.messaging.RPCClient(TRANSPORT, target,
+    return oslo_messaging.RPCClient(TRANSPORT, target,
                                     serializer=serializer)
 
 
 def get_notifier(publisher_id):
-    """Return a configured oslo.messaging notifier."""
+    """Return a configured oslo_messaging notifier."""
     return NOTIFIER.prepare(publisher_id=publisher_id)
diff --git a/heat/common/param_utils.py b/heat/common/param_utils.py
index 7c4d9bc662..6504325d13 100644
--- a/heat/common/param_utils.py
+++ b/heat/common/param_utils.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 
 from heat.common.i18n import _
 
diff --git a/heat/common/policy.py b/heat/common/policy.py
index 9e97777ca8..458da27848 100644
--- a/heat/common/policy.py
+++ b/heat/common/policy.py
@@ -17,7 +17,7 @@
 # Based on glance/api/policy.py
 """Policy Engine For Heat"""
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import exception
 from heat.openstack.common import policy
diff --git a/heat/common/profiler.py b/heat/common/profiler.py
index d800404a30..7aa7664814 100644
--- a/heat/common/profiler.py
+++ b/heat/common/profiler.py
@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
 import osprofiler.profiler
 import osprofiler.web
 
diff --git a/heat/common/service_utils.py b/heat/common/service_utils.py
index 03e4eb903b..070af1eb2d 100644
--- a/heat/common/service_utils.py
+++ b/heat/common/service_utils.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 SERVICE_KEYS = (
     SERVICE_ID,
diff --git a/heat/common/template_format.py b/heat/common/template_format.py
index 28e4e73925..c80c8edfd3 100644
--- a/heat/common/template_format.py
+++ b/heat/common/template_format.py
@@ -15,7 +15,7 @@ import itertools
 import json
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import yaml
 
diff --git a/heat/common/urlfetch.py b/heat/common/urlfetch.py
index c631785bfa..9cec56323e 100644
--- a/heat/common/urlfetch.py
+++ b/heat/common/urlfetch.py
@@ -13,7 +13,7 @@
 
 """Utility for fetching a resource (e.g. a template) from a URL."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import requests
 from requests import exceptions
diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index 5a45f49e77..ffb4930c66 100644
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -34,9 +34,9 @@ from eventlet.green import socket
 from eventlet.green import ssl
 import eventlet.greenio
 import eventlet.wsgi
-from oslo.config import cfg
-from oslo import i18n
-from oslo.utils import importutils
+from oslo_config import cfg
+import oslo_i18n as i18n
+from oslo_utils import importutils
 from paste import deploy
 import routes
 import routes.middleware
diff --git a/heat/db/api.py b/heat/db/api.py
index e05a06e12e..60207dcd56 100644
--- a/heat/db/api.py
+++ b/heat/db/api.py
@@ -24,8 +24,8 @@ The underlying driver is loaded . SQLAlchemy is currently the only
 supported backend.
 '''
 
-from oslo.config import cfg
-from oslo.db import api
+from oslo_config import cfg
+from oslo_db import api
 
 CONF = cfg.CONF
 
diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index cade3284ca..f94a3b1902 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -15,10 +15,10 @@
 import datetime
 import sys
 
-from oslo.config import cfg
-from oslo.db.sqlalchemy import session as db_session
-from oslo.db.sqlalchemy import utils
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_db.sqlalchemy import session as db_session
+from oslo_db.sqlalchemy import utils
+from oslo_utils import timeutils
 import osprofiler.sqlalchemy
 import six
 import sqlalchemy
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py b/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py
index 715a235961..63b776564e 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/035_event_uuid_to_id.py
@@ -15,7 +15,7 @@ import itertools
 import uuid
 
 import migrate.changeset.constraint as constraint
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import sqlalchemy
 
 
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py b/heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py
index 3b1c7f2134..fa884a9eea 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/037_migrate_hot_template.py
@@ -12,7 +12,7 @@
 #    under the License.
 
 from migrate.versioning import util as migrate_util
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 import sqlalchemy
 from sqlalchemy.orm import sessionmaker
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/041_migrate_hot_template_resources.py b/heat/db/sqlalchemy/migrate_repo/versions/041_migrate_hot_template_resources.py
index d83389218c..7f229bcadd 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/041_migrate_hot_template_resources.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/041_migrate_hot_template_resources.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 from migrate.versioning import util as migrate_util
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 import sqlalchemy
 from sqlalchemy.orm import sessionmaker
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py b/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py
index b882cefc46..839537b422 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py
@@ -13,7 +13,7 @@
 import time
 
 from migrate.versioning import util as migrate_util
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import sqlalchemy
 from sqlalchemy.orm import sessionmaker
 
diff --git a/heat/db/sqlalchemy/migration.py b/heat/db/sqlalchemy/migration.py
index e63675c569..74680886e6 100644
--- a/heat/db/sqlalchemy/migration.py
+++ b/heat/db/sqlalchemy/migration.py
@@ -13,7 +13,7 @@
 
 import os
 
-from oslo.db.sqlalchemy import migration as oslo_migration
+from oslo_db.sqlalchemy import migration as oslo_migration
 
 
 INIT_VERSION = 14
diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 1b72b53e2f..b7f0952414 100644
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -16,8 +16,8 @@ SQLAlchemy models for heat data.
 
 import uuid
 
-from oslo.db.sqlalchemy import models
-from oslo.utils import timeutils
+from oslo_db.sqlalchemy import models
+from oslo_utils import timeutils
 import six
 import sqlalchemy
 from sqlalchemy.ext import declarative
diff --git a/heat/engine/api.py b/heat/engine/api.py
index cd4164ed17..05257c8e31 100644
--- a/heat/engine/api.py
+++ b/heat/engine/api.py
@@ -13,8 +13,8 @@
 
 import collections
 
-from oslo.utils import timeutils
 from oslo_log import log as logging
+from oslo_utils import timeutils
 
 from heat.common.i18n import _
 from heat.common.i18n import _LE
diff --git a/heat/engine/clients/__init__.py b/heat/engine/clients/__init__.py
index fab5cce600..b07652f4e9 100644
--- a/heat/engine/clients/__init__.py
+++ b/heat/engine/clients/__init__.py
@@ -13,9 +13,9 @@
 
 import warnings
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import importutils
 import six
 from stevedore import extension
 
diff --git a/heat/engine/clients/client_plugin.py b/heat/engine/clients/client_plugin.py
index d495d07e20..8e70c23fd5 100644
--- a/heat/engine/clients/client_plugin.py
+++ b/heat/engine/clients/client_plugin.py
@@ -15,7 +15,7 @@ import abc
 
 from keystoneclient import exceptions
 from keystoneclient import session
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 
@@ -136,4 +136,4 @@ class ClientPlugin(object):
         if self.is_conflict(ex) or self.is_not_found(ex):
             return
         else:
-            raise ex
\ No newline at end of file
+            raise ex
diff --git a/heat/engine/clients/os/glance.py b/heat/engine/clients/os/glance.py
index 255d161937..3944effc44 100644
--- a/heat/engine/clients/os/glance.py
+++ b/heat/engine/clients/os/glance.py
@@ -13,8 +13,8 @@
 
 from glanceclient import client as gc
 from glanceclient import exc
-from oslo.utils import uuidutils
 from oslo_log import log as logging
+from oslo_utils import uuidutils
 
 from heat.common import exception
 from heat.common.i18n import _
diff --git a/heat/engine/clients/os/neutron.py b/heat/engine/clients/os/neutron.py
index 4074849b64..3e482e2aa2 100644
--- a/heat/engine/clients/os/neutron.py
+++ b/heat/engine/clients/os/neutron.py
@@ -14,7 +14,7 @@
 from neutronclient.common import exceptions
 from neutronclient.neutron import v2_0 as neutronV20
 from neutronclient.v2_0 import client as nc
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 from heat.common import exception
 from heat.engine.clients import client_plugin
diff --git a/heat/engine/clients/os/nova.py b/heat/engine/clients/os/nova.py
index 8ee664fde7..1a2bb3b888 100644
--- a/heat/engine/clients/os/nova.py
+++ b/heat/engine/clients/os/nova.py
@@ -24,8 +24,8 @@ import string
 from novaclient import client as nc
 from novaclient import exceptions
 from novaclient import shell as novashell
-from oslo.config import cfg
-from oslo.utils import uuidutils
+from oslo_config import cfg
+from oslo_utils import uuidutils
 import six
 from six.moves.urllib import parse as urlparse
 
diff --git a/heat/engine/constraints.py b/heat/engine/constraints.py
index 479f0d577a..8adbad18ce 100644
--- a/heat/engine/constraints.py
+++ b/heat/engine/constraints.py
@@ -15,7 +15,7 @@ import collections
 import numbers
 import re
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six
 
 from heat.common import exception
diff --git a/heat/engine/dependencies.py b/heat/engine/dependencies.py
index a57a13432d..5c6845dd10 100644
--- a/heat/engine/dependencies.py
+++ b/heat/engine/dependencies.py
@@ -14,7 +14,7 @@
 import collections
 import itertools
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six
 
 from heat.common import exception
diff --git a/heat/engine/environment.py b/heat/engine/environment.py
index c1ccffe21b..b5033bac5f 100644
--- a/heat/engine/environment.py
+++ b/heat/engine/environment.py
@@ -17,7 +17,7 @@ import itertools
 import os.path
 import warnings
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 import six
 
diff --git a/heat/engine/notification/__init__.py b/heat/engine/notification/__init__.py
index b68dfc641e..6b3e96a8d8 100644
--- a/heat/engine/notification/__init__.py
+++ b/heat/engine/notification/__init__.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import messaging
 
diff --git a/heat/engine/parameters.py b/heat/engine/parameters.py
index cbd17269e7..b3f6b8efe7 100644
--- a/heat/engine/parameters.py
+++ b/heat/engine/parameters.py
@@ -15,8 +15,8 @@ import collections
 import itertools
 import json
 
-from oslo.utils import encodeutils
-from oslo.utils import strutils
+from oslo_utils import encodeutils
+from oslo_utils import strutils
 import six
 
 from heat.common import exception
diff --git a/heat/engine/plugin_manager.py b/heat/engine/plugin_manager.py
index 9c7e4c9c44..9a568cdd94 100644
--- a/heat/engine/plugin_manager.py
+++ b/heat/engine/plugin_manager.py
@@ -15,7 +15,7 @@ import collections
 import itertools
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 import six
 
diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index e24c313620..d670721c25 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -16,10 +16,10 @@ import contextlib
 import datetime as dt
 import warnings
 
-from oslo.config import cfg
-from oslo.utils import encodeutils
-from oslo.utils import excutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import encodeutils
+from oslo_utils import excutils
 import six
 
 from heat.common import exception
diff --git a/heat/engine/resources/aws/autoscaling_group.py b/heat/engine/resources/aws/autoscaling_group.py
index 7dfad62668..fc2e8cf204 100644
--- a/heat/engine/resources/aws/autoscaling_group.py
+++ b/heat/engine/resources/aws/autoscaling_group.py
@@ -13,8 +13,8 @@
 
 import math
 
-from oslo.utils import excutils
 from oslo_log import log as logging
+from oslo_utils import excutils
 import six
 
 from heat.common import exception
diff --git a/heat/engine/resources/aws/instance.py b/heat/engine/resources/aws/instance.py
index a046e1c857..998a714862 100644
--- a/heat/engine/resources/aws/instance.py
+++ b/heat/engine/resources/aws/instance.py
@@ -13,7 +13,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 
diff --git a/heat/engine/resources/cloud_watch.py b/heat/engine/resources/cloud_watch.py
index 834ab697c1..7d5a986091 100644
--- a/heat/engine/resources/cloud_watch.py
+++ b/heat/engine/resources/cloud_watch.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import exception
 from heat.common.i18n import _
diff --git a/heat/engine/resources/eip.py b/heat/engine/resources/eip.py
index ee718f15d3..5cc0dfcd5f 100644
--- a/heat/engine/resources/eip.py
+++ b/heat/engine/resources/eip.py
@@ -11,8 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import excutils
 from oslo_log import log as logging
+from oslo_utils import excutils
 import six
 
 from heat.common import exception
diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py
index 9b0c2c4a62..77dbac3ce7 100644
--- a/heat/engine/resources/loadbalancer.py
+++ b/heat/engine/resources/loadbalancer.py
@@ -12,7 +12,7 @@
 #    under the License.
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 
diff --git a/heat/engine/resources/neutron/neutron.py b/heat/engine/resources/neutron/neutron.py
index 919341cc37..9261617496 100644
--- a/heat/engine/resources/neutron/neutron.py
+++ b/heat/engine/resources/neutron/neutron.py
@@ -10,7 +10,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 import six
 
 import warnings
diff --git a/heat/engine/resources/nova_floatingip.py b/heat/engine/resources/nova_floatingip.py
index b22d830dac..d4c2c37f95 100644
--- a/heat/engine/resources/nova_floatingip.py
+++ b/heat/engine/resources/nova_floatingip.py
@@ -12,8 +12,8 @@
 #    under the License.
 from heat.common import exception
 
-from oslo.utils import excutils
 from oslo_log import log as logging
+from oslo_utils import excutils
 import six
 
 from heat.common.i18n import _
diff --git a/heat/engine/resources/nova_utils.py b/heat/engine/resources/nova_utils.py
index f538b2a596..116088b833 100644
--- a/heat/engine/resources/nova_utils.py
+++ b/heat/engine/resources/nova_utils.py
@@ -22,7 +22,7 @@ import string
 import warnings
 
 from novaclient import exceptions as nova_exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 from six.moves.urllib import parse as urlparse
diff --git a/heat/engine/resources/server.py b/heat/engine/resources/server.py
index f4841b87bc..0d724f0327 100644
--- a/heat/engine/resources/server.py
+++ b/heat/engine/resources/server.py
@@ -14,10 +14,10 @@
 import copy
 import uuid
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import uuidutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_serialization import jsonutils
+from oslo_utils import uuidutils
 import six
 
 from heat.common import exception
diff --git a/heat/engine/scheduler.py b/heat/engine/scheduler.py
index 992e758e24..0e2043c599 100644
--- a/heat/engine/scheduler.py
+++ b/heat/engine/scheduler.py
@@ -18,9 +18,9 @@ import time
 import types
 
 import eventlet
-from oslo.utils import encodeutils
-from oslo.utils import excutils
 from oslo_log import log as logging
+from oslo_utils import encodeutils
+from oslo_utils import excutils
 import six
 
 from heat.common.i18n import _
diff --git a/heat/engine/service.py b/heat/engine/service.py
index f3d9c485e1..bd7a8e390d 100644
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -19,12 +19,12 @@ import socket
 import warnings
 
 import eventlet
-from oslo.config import cfg
-from oslo import messaging
-from oslo.serialization import jsonutils
-from oslo.utils import timeutils
-from oslo.utils import uuidutils
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
+from oslo_serialization import jsonutils
+from oslo_utils import timeutils
+from oslo_utils import uuidutils
 from osprofiler import profiler
 import requests
 import six
diff --git a/heat/engine/service_stack_watch.py b/heat/engine/service_stack_watch.py
index b389772c15..4b967e6a9e 100644
--- a/heat/engine/service_stack_watch.py
+++ b/heat/engine/service_stack_watch.py
@@ -11,8 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import timeutils
 from oslo_log import log as logging
+from oslo_utils import timeutils
 
 from heat.common import context
 from heat.common.i18n import _LE
diff --git a/heat/engine/signal_responder.py b/heat/engine/signal_responder.py
index d6a46f7359..f4d3ad58d5 100644
--- a/heat/engine/signal_responder.py
+++ b/heat/engine/signal_responder.py
@@ -12,7 +12,7 @@
 #    under the License.
 
 from keystoneclient.contrib.ec2 import utils as ec2_utils
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from six.moves.urllib import parse as urlparse
 
diff --git a/heat/engine/stack.py b/heat/engine/stack.py
index fc552276c9..852a65e822 100644
--- a/heat/engine/stack.py
+++ b/heat/engine/stack.py
@@ -17,9 +17,9 @@ import datetime
 import re
 import warnings
 
-from oslo.config import cfg
-from oslo.utils import encodeutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import encodeutils
 from osprofiler import profiler
 import six
 
diff --git a/heat/engine/stack_lock.py b/heat/engine/stack_lock.py
index 6021f5b47c..717ec18ad3 100644
--- a/heat/engine/stack_lock.py
+++ b/heat/engine/stack_lock.py
@@ -14,10 +14,10 @@
 import contextlib
 import uuid
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.utils import excutils
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
+from oslo_utils import excutils
 
 from heat.common import exception
 from heat.common.i18n import _LI
diff --git a/heat/engine/stack_resource.py b/heat/engine/stack_resource.py
index e0ebc10df7..b688246d02 100644
--- a/heat/engine/stack_resource.py
+++ b/heat/engine/stack_resource.py
@@ -13,9 +13,9 @@
 
 import hashlib
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_serialization import jsonutils
 import six
 
 from heat.common import exception
diff --git a/heat/engine/watchrule.py b/heat/engine/watchrule.py
index 30e7119502..00f61949e1 100644
--- a/heat/engine/watchrule.py
+++ b/heat/engine/watchrule.py
@@ -14,8 +14,8 @@
 
 import datetime
 
-from oslo.utils import timeutils
 from oslo_log import log as logging
+from oslo_utils import timeutils
 
 from heat.common import exception
 from heat.common.i18n import _
diff --git a/heat/openstack/common/_i18n.py b/heat/openstack/common/_i18n.py
index 431be11943..a272fc66df 100644
--- a/heat/openstack/common/_i18n.py
+++ b/heat/openstack/common/_i18n.py
@@ -17,14 +17,14 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
 """
 
 try:
-    import oslo.i18n
+    import oslo_i18n
 
     # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
     # application name when this module is synced into the separate
     # repository. It is OK to have more than one translation function
     # using the same domain, since there will still only be one message
     # catalog.
-    _translators = oslo.i18n.TranslatorFactory(domain='heat')
+    _translators = oslo_i18n.TranslatorFactory(domain='heat')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary
diff --git a/heat/openstack/common/crypto/utils.py b/heat/openstack/common/crypto/utils.py
index c917d2ebc6..c675954a7c 100644
--- a/heat/openstack/common/crypto/utils.py
+++ b/heat/openstack/common/crypto/utils.py
@@ -29,7 +29,7 @@ import base64
 
 from Crypto.Hash import HMAC
 from Crypto import Random
-from oslo.utils import importutils
+from oslo_utils import importutils
 import six
 
 from heat.openstack.common._i18n import _
diff --git a/heat/openstack/common/eventlet_backdoor.py b/heat/openstack/common/eventlet_backdoor.py
index 3fead87e99..08a8a3eef3 100644
--- a/heat/openstack/common/eventlet_backdoor.py
+++ b/heat/openstack/common/eventlet_backdoor.py
@@ -28,7 +28,7 @@ import traceback
 
 import eventlet.backdoor
 import greenlet
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.openstack.common._i18n import _LI
 
diff --git a/heat/openstack/common/fileutils.py b/heat/openstack/common/fileutils.py
index 6cacf22b24..9097c35d45 100644
--- a/heat/openstack/common/fileutils.py
+++ b/heat/openstack/common/fileutils.py
@@ -20,7 +20,7 @@ import os
 import stat
 import tempfile
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/heat/openstack/common/middleware/request_id.py b/heat/openstack/common/middleware/request_id.py
index bb48e669b4..3ae3e2702f 100644
--- a/heat/openstack/common/middleware/request_id.py
+++ b/heat/openstack/common/middleware/request_id.py
@@ -12,7 +12,7 @@
 
 """Compatibility shim for Kilo, while operators migrate to oslo.middleware."""
 
-from oslo.middleware import request_id
+from oslo_middleware import request_id
 
 from heat.openstack.common import versionutils
 
diff --git a/heat/openstack/common/policy.py b/heat/openstack/common/policy.py
index 0aa521f4a5..7dab2959f4 100644
--- a/heat/openstack/common/policy.py
+++ b/heat/openstack/common/policy.py
@@ -95,8 +95,8 @@ import logging
 import os
 import re
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
 import six
 import six.moves.urllib.parse as urlparse
 import six.moves.urllib.request as urlrequest
diff --git a/heat/openstack/common/service.py b/heat/openstack/common/service.py
index 3070bdd9b4..2bc1c40c1d 100644
--- a/heat/openstack/common/service.py
+++ b/heat/openstack/common/service.py
@@ -35,7 +35,7 @@ except ImportError:
 
 import eventlet
 from eventlet import event
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.openstack.common import eventlet_backdoor
 from heat.openstack.common._i18n import _LE, _LI, _LW
diff --git a/heat/openstack/common/versionutils.py b/heat/openstack/common/versionutils.py
index 3a9a207c65..17522d01c7 100644
--- a/heat/openstack/common/versionutils.py
+++ b/heat/openstack/common/versionutils.py
@@ -21,7 +21,7 @@ import functools
 import inspect
 import logging
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pkg_resources
 import six
 
diff --git a/heat/scaling/cooldown.py b/heat/scaling/cooldown.py
index 882b99de29..b767df5d46 100644
--- a/heat/scaling/cooldown.py
+++ b/heat/scaling/cooldown.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 
 class CooldownMixin(object):
diff --git a/heat/tests/__init__.py b/heat/tests/__init__.py
index 0ce93b59d5..5974fcfbf6 100644
--- a/heat/tests/__init__.py
+++ b/heat/tests/__init__.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo import i18n
+import oslo_i18n as i18n
 
 
 def fake_translate_msgid(msgid, domain, desired_locale=None):
diff --git a/heat/tests/autoscaling/test_heat_scaling_group.py b/heat/tests/autoscaling/test_heat_scaling_group.py
index 0e0bbaf7d5..5bccd83165 100644
--- a/heat/tests/autoscaling/test_heat_scaling_group.py
+++ b/heat/tests/autoscaling/test_heat_scaling_group.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/autoscaling/test_heat_scaling_policy.py b/heat/tests/autoscaling/test_heat_scaling_policy.py
index 2779e77670..0eda1d1c18 100644
--- a/heat/tests/autoscaling/test_heat_scaling_policy.py
+++ b/heat/tests/autoscaling/test_heat_scaling_policy.py
@@ -14,8 +14,8 @@
 import datetime
 
 import mock
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_utils import timeutils
 import six
 
 from heat.common import exception
diff --git a/heat/tests/autoscaling/test_launch_config.py b/heat/tests/autoscaling/test_launch_config.py
index 02a57201f6..b2a120afe0 100644
--- a/heat/tests/autoscaling/test_launch_config.py
+++ b/heat/tests/autoscaling/test_launch_config.py
@@ -12,7 +12,7 @@
 #    under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/autoscaling/test_scaling_group.py b/heat/tests/autoscaling/test_scaling_group.py
index 01d4494bb1..65198ae9ab 100644
--- a/heat/tests/autoscaling/test_scaling_group.py
+++ b/heat/tests/autoscaling/test_scaling_group.py
@@ -12,7 +12,7 @@
 #    under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/autoscaling/test_scaling_policy.py b/heat/tests/autoscaling/test_scaling_policy.py
index 00c07ade02..09aabea0c6 100644
--- a/heat/tests/autoscaling/test_scaling_policy.py
+++ b/heat/tests/autoscaling/test_scaling_policy.py
@@ -14,8 +14,8 @@
 import datetime
 
 import mock
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_utils import timeutils
 import six
 
 from heat.common import exception
diff --git a/heat/tests/aws/test_volume.py b/heat/tests/aws/test_volume.py
index 7458586336..9044dc9a5a 100644
--- a/heat/tests/aws/test_volume.py
+++ b/heat/tests/aws/test_volume.py
@@ -16,7 +16,7 @@ import copy
 from cinderclient import exceptions as cinder_exp
 import mock
 import mox
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/aws/test_waitcondition.py b/heat/tests/aws/test_waitcondition.py
index 666ca1e2eb..9755c59bc0 100644
--- a/heat/tests/aws/test_waitcondition.py
+++ b/heat/tests/aws/test_waitcondition.py
@@ -16,7 +16,7 @@ import datetime
 import json
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 
diff --git a/heat/tests/common.py b/heat/tests/common.py
index 7659b702f1..f0cb401f14 100644
--- a/heat/tests/common.py
+++ b/heat/tests/common.py
@@ -19,7 +19,7 @@ import time
 
 import fixtures
 import mox
-from oslo.config import cfg
+from oslo_config import cfg
 from oslotest import mockpatch
 import testscenarios
 import testtools
diff --git a/heat/tests/db/test_migrations.py b/heat/tests/db/test_migrations.py
index 8f177b113e..926a752882 100644
--- a/heat/tests/db/test_migrations.py
+++ b/heat/tests/db/test_migrations.py
@@ -25,10 +25,10 @@ import os
 import uuid
 
 from migrate.versioning import repository
-from oslo.db.sqlalchemy import test_base
-from oslo.db.sqlalchemy import test_migrations
-from oslo.db.sqlalchemy import utils
-from oslo.serialization import jsonutils
+from oslo_db.sqlalchemy import test_base
+from oslo_db.sqlalchemy import test_migrations
+from oslo_db.sqlalchemy import utils
+from oslo_serialization import jsonutils
 import pkg_resources as pkg
 
 from heat.db.sqlalchemy import migrate_repo
diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index 19566862fe..a3b4d91f2c 100644
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -15,7 +15,7 @@ import json
 import os
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.api.aws import exception
diff --git a/heat/tests/test_api_cloudwatch.py b/heat/tests/test_api_cloudwatch.py
index 405ac76e8f..582a9b8cba 100644
--- a/heat/tests/test_api_cloudwatch.py
+++ b/heat/tests/test_api_cloudwatch.py
@@ -13,7 +13,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.api.aws import exception
 import heat.api.cloudwatch.watch as watches
diff --git a/heat/tests/test_api_ec2token.py b/heat/tests/test_api_ec2token.py
index ee115e79f0..5221480d48 100644
--- a/heat/tests/test_api_ec2token.py
+++ b/heat/tests/test_api_ec2token.py
@@ -14,8 +14,8 @@
 
 import json
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 import requests
 import six
 
diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py
index 6e8ca7d24a..d5548cc22e 100644
--- a/heat/tests/test_api_openstack_v1.py
+++ b/heat/tests/test_api_openstack_v1.py
@@ -14,10 +14,10 @@
 import json
 
 import mock
-from oslo.config import cfg
-from oslo.messaging._drivers import common as rpc_common
-from oslo.messaging import exceptions
+from oslo_config import cfg
 from oslo_log import log
+from oslo_messaging._drivers import common as rpc_common
+from oslo_messaging import exceptions
 import six
 import webob.exc
 
diff --git a/heat/tests/test_auth_password.py b/heat/tests/test_auth_password.py
index 91d66ab368..7fc04e918e 100644
--- a/heat/tests/test_auth_password.py
+++ b/heat/tests/test_auth_password.py
@@ -18,7 +18,7 @@ from keystoneclient.auth.identity import v3 as ks_v3_auth
 from keystoneclient import exceptions as keystone_exc
 from keystoneclient import session as ks_session
 import mox
-from oslo.config import cfg
+from oslo_config import cfg
 import webob
 
 from heat.common import auth_password
diff --git a/heat/tests/test_autoscaling_update_policy.py b/heat/tests/test_autoscaling_update_policy.py
index 507a43efdb..e77abe54d1 100644
--- a/heat/tests/test_autoscaling_update_policy.py
+++ b/heat/tests/test_autoscaling_update_policy.py
@@ -14,7 +14,7 @@
 import json
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py
index 7345f298d4..148f5db6ba 100644
--- a/heat/tests/test_ceilometer_alarm.py
+++ b/heat/tests/test_ceilometer_alarm.py
@@ -17,7 +17,7 @@ import json
 from ceilometerclient import exc as ceilometerclient_exc
 import mock
 import mox
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/test_clients.py b/heat/tests/test_clients.py
index 7b2816276d..30ed95ac14 100644
--- a/heat/tests/test_clients.py
+++ b/heat/tests/test_clients.py
@@ -20,7 +20,7 @@ from heatclient import exc as heat_exc
 from keystoneclient import exceptions as keystone_exc
 import mock
 from neutronclient.common import exceptions as neutron_exc
-from oslo.config import cfg
+from oslo_config import cfg
 from saharaclient.api import base as sahara_base
 import six
 from swiftclient import exceptions as swift_exc
diff --git a/heat/tests/test_common_context.py b/heat/tests/test_common_context.py
index 6a578b8123..d470acc696 100644
--- a/heat/tests/test_common_context.py
+++ b/heat/tests/test_common_context.py
@@ -14,7 +14,7 @@
 import os
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_middleware import request_id
 import webob
 
diff --git a/heat/tests/test_common_policy.py b/heat/tests/test_common_policy.py
index 01b1cb3141..dcacb6e641 100644
--- a/heat/tests/test_common_policy.py
+++ b/heat/tests/test_common_policy.py
@@ -16,7 +16,7 @@
 
 import os.path
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import exception
 from heat.common import policy
diff --git a/heat/tests/test_engine_api_utils.py b/heat/tests/test_engine_api_utils.py
index 2a03d4ea12..10ef095404 100644
--- a/heat/tests/test_engine_api_utils.py
+++ b/heat/tests/test_engine_api_utils.py
@@ -16,7 +16,7 @@ import json
 import uuid
 
 import mock
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 
 from heat.common import identifier
diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index 9e711b851d..643daa06f5 100644
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -20,9 +20,9 @@ import eventlet
 from eventlet import event as grevent
 import mock
 import mox
-from oslo.config import cfg
-from oslo.messaging.rpc import dispatcher
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_messaging.rpc import dispatcher
+from oslo_serialization import jsonutils
 import six
 
 from heat.common import context
diff --git a/heat/tests/test_environment.py b/heat/tests/test_environment.py
index c4749489c0..c089ed8a27 100644
--- a/heat/tests/test_environment.py
+++ b/heat/tests/test_environment.py
@@ -16,7 +16,7 @@ import sys
 
 import fixtures
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import environment_format
diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py
index 0a09d5c76d..3ed3795150 100644
--- a/heat/tests/test_event.py
+++ b/heat/tests/test_event.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.db import api as db_api
 from heat.engine import event
diff --git a/heat/tests/test_fault_middleware.py b/heat/tests/test_fault_middleware.py
index a0a346ea77..9be4fa7a43 100644
--- a/heat/tests/test_fault_middleware.py
+++ b/heat/tests/test_fault_middleware.py
@@ -14,9 +14,9 @@
 import inspect
 import re
 
-from oslo.config import cfg
-from oslo.messaging._drivers import common as rpc_common
+from oslo_config import cfg
 from oslo_log import log
+from oslo_messaging._drivers import common as rpc_common
 import six
 import webob
 
diff --git a/heat/tests/test_heat_autoscaling_group.py b/heat/tests/test_heat_autoscaling_group.py
index 1b96917608..ffcd39d08e 100644
--- a/heat/tests/test_heat_autoscaling_group.py
+++ b/heat/tests/test_heat_autoscaling_group.py
@@ -13,7 +13,7 @@
 import copy
 import itertools
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import short_id
 from heat.common import template_format
diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py
index fc30259609..2fd242e614 100644
--- a/heat/tests/test_heatclient.py
+++ b/heat/tests/test_heatclient.py
@@ -22,7 +22,7 @@ from keystoneclient import session as ks_session
 from keystoneclient.v3 import client as kc_v3
 from keystoneclient.v3 import domains as kc_v3_domains
 import mox
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import context
diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py
index 15f095aeff..616cc8d4b5 100644
--- a/heat/tests/test_loadbalancer.py
+++ b/heat/tests/test_loadbalancer.py
@@ -14,7 +14,7 @@
 import copy
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import exception
 from heat.common import template_format
diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py
index 7e027d6358..61718966dd 100644
--- a/heat/tests/test_metadata_refresh.py
+++ b/heat/tests/test_metadata_refresh.py
@@ -13,7 +13,7 @@
 
 
 import mox
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import identifier
 from heat.common import template_format
diff --git a/heat/tests/test_neutron_loadbalancer.py b/heat/tests/test_neutron_loadbalancer.py
index 2ea1fb7445..9656823864 100644
--- a/heat/tests/test_neutron_loadbalancer.py
+++ b/heat/tests/test_neutron_loadbalancer.py
@@ -17,7 +17,7 @@ import mox
 from neutronclient.common import exceptions
 from neutronclient.neutron import v2_0 as neutronV20
 from neutronclient.v2_0 import client as neutronclient
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/test_notifications.py b/heat/tests/test_notifications.py
index fc33ce93dc..8fb4ebc930 100644
--- a/heat/tests/test_notifications.py
+++ b/heat/tests/test_notifications.py
@@ -12,7 +12,7 @@
 #    under the License.
 
 import mock
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from heat.engine import notification
 from heat.tests import common
diff --git a/heat/tests/test_nova_client.py b/heat/tests/test_nova_client.py
index 89a1710b55..63c0843c66 100644
--- a/heat/tests/test_nova_client.py
+++ b/heat/tests/test_nova_client.py
@@ -17,7 +17,7 @@ import uuid
 
 import mock
 from novaclient import exceptions as nova_exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 7e5b7f72a8..cfce642b94 100644
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -20,7 +20,7 @@ import warnings
 from keystoneclient import exceptions as kc_exceptions
 import mock
 import mox
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import context
diff --git a/heat/tests/test_remote_stack.py b/heat/tests/test_remote_stack.py
index 3bd75c0a17..8782498aea 100644
--- a/heat/tests/test_remote_stack.py
+++ b/heat/tests/test_remote_stack.py
@@ -16,7 +16,7 @@ import copy
 from heatclient import exc
 from heatclient.v1 import stacks
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py
index 46ed0adb47..bd27cc8bee 100644
--- a/heat/tests/test_resource.py
+++ b/heat/tests/test_resource.py
@@ -16,7 +16,7 @@ import json
 import uuid
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/test_rpc_client.py b/heat/tests/test_rpc_client.py
index 1003a40b43..ef2fe35bcf 100644
--- a/heat/tests/test_rpc_client.py
+++ b/heat/tests/test_rpc_client.py
@@ -20,7 +20,7 @@ Unit Tests for heat.rpc.client
 import copy
 
 import mock
-from oslo.messaging._drivers import common as rpc_common
+from oslo_messaging._drivers import common as rpc_common
 import stubout
 import testtools
 
diff --git a/heat/tests/test_sahara_cluster.py b/heat/tests/test_sahara_cluster.py
index d8b36bfd0c..7b0ce27d62 100644
--- a/heat/tests/test_sahara_cluster.py
+++ b/heat/tests/test_sahara_cluster.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/test_server.py b/heat/tests/test_server.py
index f75b0774a8..6c532f37d2 100644
--- a/heat/tests/test_server.py
+++ b/heat/tests/test_server.py
@@ -16,7 +16,7 @@ import copy
 
 import mock
 import mox
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 import six
 from six.moves.urllib import parse as urlparse
 
diff --git a/heat/tests/test_signal.py b/heat/tests/test_signal.py
index 544c0c124e..a4a1156c77 100644
--- a/heat/tests/test_signal.py
+++ b/heat/tests/test_signal.py
@@ -14,7 +14,7 @@
 import datetime
 
 from keystoneclient import exceptions as kc_exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import exception
 from heat.common import template_format
diff --git a/heat/tests/test_sqlalchemy_api.py b/heat/tests/test_sqlalchemy_api.py
index bc283edc16..df94996fdd 100644
--- a/heat/tests/test_sqlalchemy_api.py
+++ b/heat/tests/test_sqlalchemy_api.py
@@ -17,7 +17,7 @@ import uuid
 
 import mock
 import mox
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 
 from heat.common import context
diff --git a/heat/tests/test_ssl_middleware.py b/heat/tests/test_ssl_middleware.py
index 6c39685342..5700f683b7 100644
--- a/heat/tests/test_ssl_middleware.py
+++ b/heat/tests/test_ssl_middleware.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import webob
 
 from heat.api.middleware import ssl
diff --git a/heat/tests/test_stack_lock.py b/heat/tests/test_stack_lock.py
index 017a1318a3..ca7d72f4c0 100644
--- a/heat/tests/test_stack_lock.py
+++ b/heat/tests/test_stack_lock.py
@@ -12,7 +12,7 @@
 #    under the License.
 
 import mock
-from oslo import messaging
+import oslo_messaging as messaging
 
 from heat.common import exception
 from heat.db import api as db_api
diff --git a/heat/tests/test_stack_resource.py b/heat/tests/test_stack_resource.py
index e3b6b16167..cb96c5157d 100644
--- a/heat/tests/test_stack_resource.py
+++ b/heat/tests/test_stack_resource.py
@@ -14,7 +14,7 @@
 import uuid
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from heat.common import exception
diff --git a/heat/tests/test_urlfetch.py b/heat/tests/test_urlfetch.py
index b639d48b16..47bcb88be2 100644
--- a/heat/tests/test_urlfetch.py
+++ b/heat/tests/test_urlfetch.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 from requests import exceptions
 import six
diff --git a/heat/tests/test_user.py b/heat/tests/test_user.py
index b7a1acb522..94be351635 100644
--- a/heat/tests/test_user.py
+++ b/heat/tests/test_user.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from heat.common import exception
 from heat.common import short_id
diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py
index 7d110ca65f..62ee9c2844 100644
--- a/heat/tests/test_watch.py
+++ b/heat/tests/test_watch.py
@@ -15,7 +15,7 @@
 import datetime
 
 import mox
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from heat.common import exception
 from heat.db import api as db_api
diff --git a/heat/tests/test_wsgi.py b/heat/tests/test_wsgi.py
index 55e24356df..df2a8a6783 100644
--- a/heat/tests/test_wsgi.py
+++ b/heat/tests/test_wsgi.py
@@ -17,7 +17,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import stubout
 import webob
diff --git a/heat/tests/utils.py b/heat/tests/utils.py
index f88a07c249..ef8e65222e 100644
--- a/heat/tests/utils.py
+++ b/heat/tests/utils.py
@@ -15,8 +15,8 @@ import random
 import string
 import uuid
 
-from oslo.config import cfg
-from oslo.db import options
+from oslo_config import cfg
+from oslo_db import options
 import sqlalchemy
 
 from heat.common import context
diff --git a/heat_integrationtests/common/config.py b/heat_integrationtests/common/config.py
index 0ea6263779..ec7df2e8c7 100644
--- a/heat_integrationtests/common/config.py
+++ b/heat_integrationtests/common/config.py
@@ -12,7 +12,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import heat_integrationtests
 
diff --git a/heat_integrationtests/common/test.py b/heat_integrationtests/common/test.py
index a75bff9371..c8bce8b5f0 100644
--- a/heat_integrationtests/common/test.py
+++ b/heat_integrationtests/common/test.py
@@ -19,7 +19,7 @@ import time
 
 import fixtures
 from heatclient import exc as heat_exceptions
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 import testscenarios
 import testtools
diff --git a/setup.cfg b/setup.cfg
index e149a98370..1e06ceca92 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -81,11 +81,11 @@ heat.templates =
 
 # These are for backwards compat with Icehouse notification_driver configuration values
 oslo.messaging.notify.drivers =
-    heat.openstack.common.notifier.log_notifier = oslo.messaging.notify._impl_log:LogDriver
-    heat.openstack.common.notifier.no_op_notifier = oslo.messaging.notify._impl_noop:NoOpDriver
-    heat.openstack.common.notifier.rpc_notifier2 = oslo.messaging.notify._impl_messaging:MessagingV2Driver
-    heat.openstack.common.notifier.rpc_notifier = oslo.messaging.notify._impl_messaging:MessagingDriver
-    heat.openstack.common.notifier.test_notifier = oslo.messaging.notify._impl_test:TestDriver
+    heat.openstack.common.notifier.log_notifier = oslo_messaging.notify._impl_log:LogDriver
+    heat.openstack.common.notifier.no_op_notifier = oslo_messaging.notify._impl_noop:NoOpDriver
+    heat.openstack.common.notifier.rpc_notifier2 = oslo_messaging.notify._impl_messaging:MessagingV2Driver
+    heat.openstack.common.notifier.rpc_notifier = oslo_messaging.notify._impl_messaging:MessagingDriver
+    heat.openstack.common.notifier.test_notifier = oslo_messaging.notify._impl_test:TestDriver
 
 [global]
 setup-hooks =