From ba25e78ad4426f5e1c68c59be230fa5014240ad2 Mon Sep 17 00:00:00 2001
From: Alisdair Meredith <alisdairm@me.com>
Date: Thu, 31 Jul 2025 08:53:59 -0400
Subject: [PATCH] [pre] No names in the preprocessor

The term "name" applies specifically to entities in phase 7
of translation.  Macros have macro names, headers are parsed
as *header-name*s, etc.
---
 source/preprocessor.tex | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/preprocessor.tex b/source/preprocessor.tex
index b517a270a4..bbcf9a66ae 100644
--- a/source/preprocessor.tex
+++ b/source/preprocessor.tex
@@ -618,7 +618,7 @@
 Each directive's condition is checked in order.
 If it evaluates to false (zero),
 the group that it controls is skipped:
-directives are processed only through the name that determines
+directives are processed only through the directive name that determines
 the directive in order to keep track of the level
 of nested conditionals;
 the rest of the directives' preprocessing tokens are ignored,
@@ -1045,7 +1045,7 @@
 \end{note}
 \begin{example}
 If the directive matches the second form, the whole directive is replaced.
-If the directive matches the first form, everything after the name is replaced.
+If the directive matches the first form, everything after the \grammarterm{header-name} is replaced.
 \begin{codeblock}
 #define EMPTY
 #define X myfile
@@ -1532,11 +1532,11 @@
 \pnum
 \indextext{unit!translation}%
 A translation unit shall not \tcode{\#define} or \tcode{\#undef}
-names lexically identical
+macro names lexically identical
 to keywords,
 to the identifiers listed in \tref{lex.name.special}, or
 to the \grammarterm{attribute-token}{s} described in~\ref{dcl.attr},
-except that the names \tcode{likely} and \tcode{unlikely} may be
+except that the macro names \tcode{likely} and \tcode{unlikely} may be
 defined as function-like macros.
 
 \pnum
@@ -2191,7 +2191,7 @@
 replace the value of this macro with a greater value.
 \end{note}
 
-\item The names listed in \tref{cpp.predefined.ft}.\\
+\item The macro names listed in \tref{cpp.predefined.ft}.\\
 The macros defined in \tref{cpp.predefined.ft} shall be defined to
 the corresponding integer literal.
 \begin{note}