diff --git a/install-guide/source/get_started.rst b/install-guide/source/get_started.rst
index 9fcb1d0e7..c394b297a 100644
--- a/install-guide/source/get_started.rst
+++ b/install-guide/source/get_started.rst
@@ -34,7 +34,7 @@ ironic-api
 
 ironic-conductor
   Adds/edits/deletes nodes; powers on/off nodes with ipmi or ssh;
-  provisions/deploys/decommissions bare metal nodes.
+  provisions/deploys/cleans bare metal nodes.
 
 ironic-python-agent
   A python service which is run in a temporary ramdisk to provide
diff --git a/ironic/drivers/modules/agent_base_vendor.py b/ironic/drivers/modules/agent_base_vendor.py
index 75d33f44b..093ffbe17 100644
--- a/ironic/drivers/modules/agent_base_vendor.py
+++ b/ironic/drivers/modules/agent_base_vendor.py
@@ -733,7 +733,7 @@ class BaseAgentVendor(AgentDeployMixin, base.VendorInterface):
         """Find a matching node for the agent.
 
         Method to be called the first time a ramdisk agent checks in. This
-        can be because this is a node just entering decom or a node that
+        can be because this is a node just entering cleaning or a node that
         rebooted for some reason. We will use the mac addresses listed in the
         kwargs to find the matching node, then return the node object to the
         agent. The agent can that use that UUID to use the node vendor