diff --git a/ironic/common/json_rpc/server.py b/ironic/common/json_rpc/server.py
index 0f9db5fc96..2fdab0c4fc 100644
--- a/ironic/common/json_rpc/server.py
+++ b/ironic/common/json_rpc/server.py
@@ -39,7 +39,7 @@ from ironic.common import json_rpc
 
 CONF = cfg.CONF
 LOG = log.getLogger(__name__)
-_BLACK_LIST = {'init_host', 'del_host', 'target', 'iter_nodes'}
+_DENY_LIST = {'init_host', 'del_host', 'target', 'iter_nodes'}
 
 
 def _build_method_map(manager):
@@ -50,7 +50,7 @@ def _build_method_map(manager):
     """
     result = {}
     for method in dir(manager):
-        if method.startswith('_') or method in _BLACK_LIST:
+        if method.startswith('_') or method in _DENY_LIST:
             continue
         func = getattr(manager, method)
         if not callable(func):
diff --git a/ironic/tests/base.py b/ironic/tests/base.py
index 69c12c4083..eccdb9a1bf 100644
--- a/ironic/tests/base.py
+++ b/ironic/tests/base.py
@@ -16,7 +16,7 @@
 
 """Base classes for our unit tests.
 
-Allows overriding of config for use of fakes, and some black magic for
+Allows overriding of config for use of fakes, and some magic for
 inline callbacks.
 
 """
diff --git a/ironic/tests/unit/common/test_json_rpc.py b/ironic/tests/unit/common/test_json_rpc.py
index e76500215c..217a1128c2 100644
--- a/ironic/tests/unit/common/test_json_rpc.py
+++ b/ironic/tests/unit/common/test_json_rpc.py
@@ -266,7 +266,7 @@ class TestService(test_base.TestCase):
                         'code': -32601,
                     })
 
-    def test_no_blacklisted_methods(self):
+    def test_no_deny_methods(self):
         for name in ('__init__', '_private', 'init_host', 'value'):
             body = self._request(name, {'context': self.ctx})
             self._check(body,