diff --git a/lib/ansible/callbacks/noop.py b/lib/ansible/callback_plugins/noop.py
similarity index 100%
rename from lib/ansible/callbacks/noop.py
rename to lib/ansible/callback_plugins/noop.py
diff --git a/lib/ansible/callbacks.py b/lib/ansible/callbacks.py
index 455de0fc82a..7b1c17c4ad5 100644
--- a/lib/ansible/callbacks.py
+++ b/lib/ansible/callbacks.py
@@ -24,7 +24,7 @@ import os.path
 from ansible.color import stringc
 
 dirname = os.path.dirname(__file__)
-callbacks = utils.import_plugins(os.path.join(dirname, 'callbacks'))
+callbacks = utils.import_plugins(os.path.join(dirname, 'callback_plugins'))
 callbacks = [ c.CallbackModule() for c in callbacks.values() ]
 
 cowsay = None
diff --git a/lib/ansible/runner/connection.py b/lib/ansible/runner/connection.py
index 379fbd2183f..a79b952e531 100644
--- a/lib/ansible/runner/connection.py
+++ b/lib/ansible/runner/connection.py
@@ -23,7 +23,7 @@ from ansible.errors import AnsibleError
 
 import os.path
 dirname = os.path.dirname(__file__)
-modules = utils.import_plugins(os.path.join(dirname, 'connections'))
+modules = utils.import_plugins(os.path.join(dirname, 'connection_plugins'))
 
 # rename this module
 modules['paramiko'] = modules['paramiko_ssh']
diff --git a/lib/ansible/runner/connections/local.py b/lib/ansible/runner/connection_plugins/local.py
similarity index 100%
rename from lib/ansible/runner/connections/local.py
rename to lib/ansible/runner/connection_plugins/local.py
diff --git a/lib/ansible/runner/connections/paramiko_ssh.py b/lib/ansible/runner/connection_plugins/paramiko_ssh.py
similarity index 100%
rename from lib/ansible/runner/connections/paramiko_ssh.py
rename to lib/ansible/runner/connection_plugins/paramiko_ssh.py
diff --git a/lib/ansible/runner/connections/ssh.py b/lib/ansible/runner/connection_plugins/ssh.py
similarity index 100%
rename from lib/ansible/runner/connections/ssh.py
rename to lib/ansible/runner/connection_plugins/ssh.py