diff --git a/openstack/common/messaging/executors/__init__.py b/openstack/common/messaging/_executors/__init__.py
similarity index 100%
rename from openstack/common/messaging/executors/__init__.py
rename to openstack/common/messaging/_executors/__init__.py
diff --git a/openstack/common/messaging/executors/base.py b/openstack/common/messaging/_executors/base.py
similarity index 100%
rename from openstack/common/messaging/executors/base.py
rename to openstack/common/messaging/_executors/base.py
diff --git a/openstack/common/messaging/executors/impl_blocking.py b/openstack/common/messaging/_executors/impl_blocking.py
similarity index 95%
rename from openstack/common/messaging/executors/impl_blocking.py
rename to openstack/common/messaging/_executors/impl_blocking.py
index a1c653e40..ad6cb2ac1 100644
--- a/openstack/common/messaging/executors/impl_blocking.py
+++ b/openstack/common/messaging/_executors/impl_blocking.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from openstack.common.messaging.executor import base
+from openstack.common.messaging._executors import base
 
 
 class BlockingExecutor(base.ExecutorBase):
diff --git a/openstack/common/messaging/executors/impl_eventlet.py b/openstack/common/messaging/_executors/impl_eventlet.py
similarity index 96%
rename from openstack/common/messaging/executors/impl_eventlet.py
rename to openstack/common/messaging/_executors/impl_eventlet.py
index bab050858..30363346d 100644
--- a/openstack/common/messaging/executors/impl_eventlet.py
+++ b/openstack/common/messaging/_executors/impl_eventlet.py
@@ -16,7 +16,7 @@
 import eventlet
 import greenlet
 
-from openstack.common.messaging.executor import base
+from openstack.common.messaging._executor import base
 
 
 class EventletExecutor(base.ExecutorBase):
diff --git a/openstack/common/messaging/eventlet.py b/openstack/common/messaging/eventlet.py
index c14af7538..de7463ea2 100644
--- a/openstack/common/messaging/eventlet.py
+++ b/openstack/common/messaging/eventlet.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from openstack.common.messaging.executors import impl_eventlet
+from openstack.common.messaging._executors import impl_eventlet
 from openstack.common.messaging.rpc import server
 
 
diff --git a/openstack/common/messaging/rpc/server.py b/openstack/common/messaging/rpc/server.py
index 48d9ea488..4ce6e5333 100644
--- a/openstack/common/messaging/rpc/server.py
+++ b/openstack/common/messaging/rpc/server.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 from openstack.common.messaging import _server as server
-from openstack.common.messaging.executors import impl_blocking
+from openstack.common.messaging._executors import impl_blocking
 from openstack.common.messaging.rpc import dispatcher