diff --git a/Doc/library/cmdline.rst b/Doc/library/cmdline.rst
index 85e82f6292a5ec..1f3a810bd2f170 100644
--- a/Doc/library/cmdline.rst
+++ b/Doc/library/cmdline.rst
@@ -14,17 +14,17 @@ The following modules have a command-line interface.
 * :ref:`dis <dis-cli>`
 * :ref:`doctest <doctest-cli>`
 * :mod:`!encodings.rot_13`
-* :mod:`ensurepip`
+* :ref:`ensurepip <ensurepip-cli>`
 * :mod:`filecmp`
 * :mod:`fileinput`
 * :mod:`ftplib`
 * :ref:`gzip <gzip-cli>`
 * :ref:`http.server <http-server-cli>`
-* :mod:`!idlelib`
+* :ref:`idlelib <idlelib-cli>`
 * :ref:`inspect <inspect-module-cli>`
 * :ref:`json <json-commandline>`
 * :ref:`mimetypes <mimetypes-cli>`
-* :mod:`pdb`
+* :ref:`pdb <pdb-cli>`
 * :ref:`pickle <pickle-cli>`
 * :ref:`pickletools <pickletools-cli>`
 * :mod:`platform`
@@ -51,7 +51,7 @@ The following modules have a command-line interface.
 * :ref:`unittest <unittest-command-line-interface>`
 * :ref:`uuid <uuid-cli>`
 * :mod:`venv`
-* :mod:`webbrowser`
+* :ref:`webbrowser <webbrowser-cli>`
 * :ref:`zipapp <zipapp-command-line-interface>`
 * :ref:`zipfile <zipfile-commandline>`
 
diff --git a/Doc/library/ensurepip.rst b/Doc/library/ensurepip.rst
index fa102c4a080103..8feaf8a7dccfe3 100644
--- a/Doc/library/ensurepip.rst
+++ b/Doc/library/ensurepip.rst
@@ -40,7 +40,9 @@ when creating a virtual environment) or after explicitly uninstalling
 
 .. include:: ../includes/wasm-mobile-notavail.rst
 
-Command line interface
+.. _ensurepip-cli:
+
+Command-line interface
 ----------------------
 
 .. program:: ensurepip
diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
index c9d96085ef739d..6af6c4246ed890 100644
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -267,7 +267,7 @@ Example of how to GZIP compress a binary string::
 
 .. _gzip-cli:
 
-Command Line Interface
+Command-line Interface
 ----------------------
 
 The :mod:`gzip` module provides a simple command line interface to compress or
@@ -280,7 +280,7 @@ Once executed the :mod:`gzip` module keeps the input file(s).
    Add a new command line interface with a usage.
    By default, when you will execute the CLI, the default compression level is 6.
 
-Command line options
+Command-line options
 ^^^^^^^^^^^^^^^^^^^^
 
 .. option:: file
diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index fabea611e0ebcd..2e04898981108f 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -657,7 +657,9 @@ looked for in the user's home directory.  Statements in this file will be
 executed in the Tk namespace, so this file is not useful for importing
 functions to be used from IDLE's Python shell.
 
-Command line usage
+.. _idlelib-cli:
+
+Command-line usage
 ^^^^^^^^^^^^^^^^^^
 
 .. program:: idle
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index e8d1176f477866..59a473cefbdf66 100644
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -1768,7 +1768,7 @@ Buffer flags
 
 .. _inspect-module-cli:
 
-Command Line Interface
+Command-line Interface
 ----------------------
 
 The :mod:`inspect` module also provides a basic introspection capability
diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst
index 3c8c07074993f2..b867ac657fe2b7 100644
--- a/Doc/library/pdb.rst
+++ b/Doc/library/pdb.rst
@@ -74,6 +74,7 @@ The debugger's prompt is ``(Pdb)``, which is the indicator that you are in debug
    command arguments, e.g. the current global and local names are offered as
    arguments of the ``p`` command.
 
+.. _pdb-cli:
 
 .. program:: pdb
 
diff --git a/Doc/library/site.rst b/Doc/library/site.rst
index e98dd83b60eb60..053c184ac5c29f 100644
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -270,7 +270,7 @@ Module contents
 
 .. _site-commandline:
 
-Command Line Interface
+Command-line Interface
 ----------------------
 
 .. program:: site
diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
index cbb2b06c2a0f9d..dd7055807209ef 100644
--- a/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@ -49,6 +49,8 @@ a new tab, with the browser being brought to the foreground. The use of the
 :mod:`webbrowser` module on iOS requires the :mod:`ctypes` module. If
 :mod:`ctypes` isn't available, calls to :func:`.open` will fail.
 
+.. _webbrowser-cli:
+
 .. program:: webbrowser
 
 The script :program:`webbrowser` can be used as a command-line interface for the