diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-06-25-00-50-14.gh-issue-94246.TBRWQL.rst b/Misc/NEWS.d/next/Tools-Demos/2022-06-25-00-50-14.gh-issue-94246.TBRWQL.rst
new file mode 100644
index 00000000000000..fe1e743798dec5
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2022-06-25-00-50-14.gh-issue-94246.TBRWQL.rst
@@ -0,0 +1,2 @@
+Argument Clinic started to prefer user supplied names for document string
+rendering of special variables (like ``self`` and ``module``).
diff --git a/Python/clinic/bltinmodule.c.h b/Python/clinic/bltinmodule.c.h
index 48f65091164d04..59c69dc654d5a5 100644
--- a/Python/clinic/bltinmodule.c.h
+++ b/Python/clinic/bltinmodule.c.h
@@ -522,7 +522,7 @@ builtin_hasattr(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 }
 
 PyDoc_STRVAR(builtin_id__doc__,
-"id($module, obj, /)\n"
+"id($self, obj, /)\n"
 "--\n"
 "\n"
 "Return the identity of an object.\n"
@@ -1045,4 +1045,4 @@ builtin_issubclass(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=a2c5c53e8aead7c3 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1c58745b448d11ff input=a9049054013a1b77]*/
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index f0f2d205c419db..2cdf87e161416d 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4972,7 +4972,7 @@ def add_parameter(text):
             if p.is_vararg():
                 p_add("*")
 
-            name = p.converter.signature_name or p.name
+            name = p.name or p.converter.signature_name
             p_add(name)
 
             if not p.is_vararg() and p.converter.is_optional():