diff --git a/openstack/common/messaging/drivers/__init__.py b/openstack/common/messaging/_drivers/__init__.py
similarity index 94%
rename from openstack/common/messaging/drivers/__init__.py
rename to openstack/common/messaging/_drivers/__init__.py
index 08c8533ed..db3b836d6 100644
--- a/openstack/common/messaging/drivers/__init__.py
+++ b/openstack/common/messaging/_drivers/__init__.py
@@ -17,7 +17,7 @@ NAMESPACE = 'openstack.common.messaging.drivers'
 
 
 def _driver(module, name):
-    return '%s.%s:%s' % (NAMESPACE, module, name)
+    return 'openstack.common.messaging._drivers.%s:%s' % (module, name)
 
 _RABBIT_DRIVER = _driver('rabbit', 'RabbitDriver')
 _QPID_DRIVER = _driver('qpid', 'QpidDriver')
diff --git a/openstack/common/messaging/drivers/base.py b/openstack/common/messaging/_drivers/base.py
similarity index 100%
rename from openstack/common/messaging/drivers/base.py
rename to openstack/common/messaging/_drivers/base.py
diff --git a/openstack/common/messaging/transport.py b/openstack/common/messaging/transport.py
index 0081a40fc..29197cb3a 100644
--- a/openstack/common/messaging/transport.py
+++ b/openstack/common/messaging/transport.py
@@ -21,7 +21,7 @@ import urlparse
 from oslo.config import cfg
 from stevedore import driver
 
-from openstack.common.messaging import drivers
+from openstack.common.messaging import _drivers as drivers
 
 _transport_opts = [
     cfg.StrOpt('transport_url',