diff --git a/core-developers/committing.rst b/core-developers/committing.rst
index 326578c0b..d83d42321 100644
--- a/core-developers/committing.rst
+++ b/core-developers/committing.rst
@@ -62,7 +62,8 @@ to enter the public source tree. Ask yourself the following questions:
    Licensing Agreement <https://www.python.org/psf/contrib/contrib-form/>`_
    (CLA), unless their change has no possible intellectual property
    associated with it (for example, fixing a spelling mistake in documentation).
-   The `CPython CLA Bot <https://github.com/apps/cpython-cla-bot/>`_
+   The `Python Software Foundation Contributor License Agreement Management Bot
+   <https://github.com/psf/clabot>`_
    checks whether the author has signed the CLA, and replies in the PR
    if they haven't. For further questions about the CLA
    process, write to contributors@python.org.
diff --git a/developer-workflow/communication-channels.rst b/developer-workflow/communication-channels.rst
index 00c569178..e9360d201 100644
--- a/developer-workflow/communication-channels.rst
+++ b/developer-workflow/communication-channels.rst
@@ -250,15 +250,16 @@ order to make open source pleasant for everyone involved.
 Additional repositories
 =======================
 
-`Python Core Workflow`_ hosts the codebase for tools such as :pypi:`blurb`.
+`Python Core Workflow`_ hosts an issue tracker for workflow discussions.
 
-Other core workflow tools are:
+Some core workflow tools are:
 
 * `cherry_picker`_ (:pypi:`PyPI <cherry_picker>`)
 * `bedevere`_
+* `blurb`_ (:pypi:`PyPI <blurb>`)
 * `blurb_it`_
 * `miss-islington`_
-* `cla-bot`_
+* `clabot`_
 * `webhook-mailer`_
 
 Python `Performance Benchmark`_ project is intended to be an authoritative
@@ -267,8 +268,9 @@ source of benchmarks for all Python implementations.
 .. _Python Core Workflow: https://github.com/python/core-workflow
 .. _cherry_picker: https://github.com/python/cherry-picker
 .. _bedevere: https://github.com/python/bedevere
+.. _blurb: https://github.com/python/blurb
 .. _blurb_it: https://github.com/python/blurb_it
 .. _miss-islington: https://github.com/python/miss-islington
-.. _cla-bot: https://github.com/ambv/cla-bot
+.. _clabot: https://github.com/psf/clabot
 .. _webhook-mailer: https://github.com/python/webhook-mailer
 .. _Performance Benchmark: https://github.com/python/pyperformance
diff --git a/getting-started/pull-request-lifecycle.rst b/getting-started/pull-request-lifecycle.rst
index 59242f13f..f95ad6555 100644
--- a/getting-started/pull-request-lifecycle.rst
+++ b/getting-started/pull-request-lifecycle.rst
@@ -354,14 +354,14 @@ Here are the steps needed in order to sign the CLA:
 
 1. Create a change and submit it as a pull request.
 
-2. When ``cpython-cla-bot`` comments on your pull request that commit
+2. When ``python-cla-bot`` comments on your pull request that commit
    authors are required to sign a Contributor License Agreement, click
    on the button in the comment to sign it. It's enough to log in through
    GitHub. The process is automatic.
 
-3. After signing, the comment by ``cpython-cla-bot`` will update to
+3. After signing, the comment by ``python-cla-bot`` will update to
    indicate that "all commit authors signed the Contributor License
-   Agreement.
+   Agreement".
 
 .. _PSF license: https://docs.python.org/dev/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python
 .. _contributor agreement: https://www.python.org/psf/contrib/