diff --git a/source/basic.tex b/source/basic.tex
index 96c2128196..f8dd29c053 100644
--- a/source/basic.tex
+++ b/source/basic.tex
@@ -714,7 +714,7 @@
 
 \pnum
 The point of declaration for an
-\grammarterm{injected-class-name} (Clause~\ref{class}) is immediately following
+injected-class-name (Clause~\ref{class}) is immediately following
 the opening brace of the class definition.
 
 \pnum
diff --git a/source/classes.tex b/source/classes.tex
index ab1b59fc24..c5f0bbf01c 100644
--- a/source/classes.tex
+++ b/source/classes.tex
@@ -64,8 +64,7 @@
 A \grammarterm{class-name} is inserted into the scope in which it is
 declared immediately after the \grammarterm{class-name} is seen. The
 \grammarterm{class-name} is also inserted into the scope of the class
-itself; this is known as the \grammarterm{injected-class-name}.
-\indextext{\idxgram{injected-class-name}}%
+itself; this is known as the \defn{injected-class-name}.
 For purposes of access checking, the injected-class-name is treated as
 if it were a public member name.
 \indextext{definition!class}%