diff --git a/doc/source/introduction/components.rst b/doc/source/introduction/components.rst
index 1380718b5..dcb670a2f 100644
--- a/doc/source/introduction/components.rst
+++ b/doc/source/introduction/components.rst
@@ -203,26 +203,32 @@ and `OpenStack Developer's Guide`_ for details.
   * Approved Specs: http://specs.openstack.org/openstack/ironic-specs/
 
 
-ironic-discoverd
-^^^^^^^^^^^^^^^^
+ironic inspector (former ironic-discoverd)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-ironic-discoverd project is responsible for discovery of hardware properties
-for newly enrolled nodes (see also ironic_). Ironic uses drivers to hide
-hardware details behind a common API.
+Ironic Inspector project is responsible for inspection of hardware properties
+for newly enrolled nodes (see also ironic_).
+
+Ironic Inspector was called ironic-discoverd previously, and the RPM packages
+are still based on the old version, so they are using the old name for now.
 
 **How to contribute**
 
-ironic-discoverd uses `tox <https://tox.readthedocs.org/en/latest/>`_ to manage
+Ironic Inspector uses `tox <https://tox.readthedocs.org/en/latest/>`_ to manage
 the development environment, see `upstream documentation
-<https://github.com/stackforge/ironic-discoverd/blob/master/CONTRIBUTING.rst>`_
+<https://github.com/openstack/ironic-inspector/blob/master/CONTRIBUTING.rst>`_
 for details.
 
 **Useful links**
 
-* Upstream Project: https://github.com/stackforge/ironic-discoverd
-* PyPI: https://pypi.python.org/pypi/ironic-discoverd
-* Bugs: https://bugs.launchpad.net/ironic-discoverd
-* Blueprints: https://blueprints.launchpad.net/ironic-discoverd
+* Upstream Project: https://github.com/openstack/ironic-inspector
+* PyPI: https://pypi.python.org/pypi/ironic-inspector
+
+  Also https://pypi.python.org/pypi/ironic-discoverd for the old version which
+  RDO Manager currently uses.
+
+* Bugs: https://bugs.launchpad.net/ironic-inspector
+* Blueprints: https://blueprints.launchpad.net/ironic-inspector
 
 
 Deployment Planning
diff --git a/doc/source/troubleshooting/troubleshooting-nodes.rst b/doc/source/troubleshooting/troubleshooting-nodes.rst
index 2ebcead38..c2957a9ad 100644
--- a/doc/source/troubleshooting/troubleshooting-nodes.rst
+++ b/doc/source/troubleshooting/troubleshooting-nodes.rst
@@ -64,9 +64,10 @@ Refusing to introspect node with provision state "available"
 If you're running discovery directly using ironic-discoverd CLI (or in case of
 bugs in our scripts), a node can be in the "AVAILABLE" state, which is meant for
 deployment, not for discovery. You should advance node to the "MANAGEABLE" state
-before discovery and move it back before deployment. Please refer to `upstream
-node states documentation <https://github.com/stackforge/ironic-discoverd
-#node-states>`_ for information on how to fix it.
+before discovery and move it back before deployment.
+Please refer to `upstream node states documentation
+<https://github.com/openstack/ironic-inspector#node-states>`_ for information
+on how to fix it.
 
 How can discovery be stopped?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -87,4 +88,4 @@ then remove ironic-discoverd cache and restart it::
     sudo systemctl restart openstack-ironic-discoverd
 
 
-.. _ironic-discoverd troubleshooting documentation: https://github.com/stackforge/ironic-discoverd#troubleshooting
+.. _ironic-discoverd troubleshooting documentation: https://github.com/openstack/ironic-inspector#troubleshooting