diff --git a/source/classes.tex b/source/classes.tex
index bd45a647f8..9e1091fc39 100644
--- a/source/classes.tex
+++ b/source/classes.tex
@@ -991,7 +991,7 @@
 \pnum
 A non-static member function may be declared \tcode{const},
 \tcode{volatile}, or \tcode{const} \tcode{volatile}. These
-\grammarterm{cv-qualifiers} affect the type of the \tcode{this}
+\grammarterm{cv-qualifier}{s} affect the type of the \tcode{this}
 pointer~(\ref{class.this}). They also affect the function
 type~(\ref{dcl.fct}) of the member function; a member function declared
 \tcode{const} is a \term{const} member function, a member function
diff --git a/source/declarations.tex b/source/declarations.tex
index c7282abcc6..5e9276b012 100644
--- a/source/declarations.tex
+++ b/source/declarations.tex
@@ -198,7 +198,7 @@
 contains exactly one \grammarterm{declarator-id}, which is the name
 declared by that \grammarterm{init-declarator} and hence one of the names
 declared by the declaration. The
-\grammarterm{defining-type-specifiers}~(\ref{dcl.type}) in the
+\grammarterm{defining-type-specifier}{s}~(\ref{dcl.type}) in the
 \grammarterm{decl-specifier-seq} and the recursive \grammarterm{declarator}
 structure of the \grammarterm{init-declarator} describe a
 type~(\ref{dcl.meaning}), which is then associated with the name being
@@ -1121,14 +1121,14 @@
 \grammarterm{type-specifier}{s} are discussed in the rest of this section.
 \end{note}
 
-\rSec3[dcl.type.cv]{The \grammarterm{cv-qualifiers}}%
+\rSec3[dcl.type.cv]{The \grammarterm{cv-qualifier}{s}}%
 \indextext{specifier!cv-qualifier}%
 \indextext{initialization!\idxcode{const}}%
 \indextext{type specifier!\idxcode{const}}%
 \indextext{type specifier!\idxcode{volatile}}
 
 \pnum
-There are two \grammarterm{cv-qualifiers}, \tcode{const} and
+There are two \grammarterm{cv-qualifier}{s}, \tcode{const} and
 \tcode{volatile}. Each \grammarterm{cv-qualifier} shall appear at most once in
 a \grammarterm{cv-qualifier-seq}. If a \grammarterm{cv-qualifier} appears in a
 \grammarterm{decl-specifier-seq}, the \grammarterm{init-declarator-list}
@@ -1357,8 +1357,8 @@
 \end{simpletypetable}
 
 \pnum
-When multiple \grammarterm{simple-type-specifiers} are allowed, they can be
-freely intermixed with other \grammarterm{decl-specifiers} in any order.
+When multiple \grammarterm{simple-type-specifier}{s} are allowed, they can be
+freely intermixed with other \grammarterm{decl-specifier}{s} in any order.
 \begin{note}
 It is \impldef{signedness of \tcode{char}} whether objects of \tcode{char} type are
 represented as signed or unsigned quantities. The \tcode{signed} specifier
@@ -2323,7 +2323,7 @@
 Because a \grammarterm{namespace-definition} contains
 \grammarterm{declaration}{s} in its \grammarterm{namespace-body} and a
 \grammarterm{namespace-definition} is itself a \grammarterm{declaration}, it
-follows that \grammarterm{namespace-definitions} can be nested.
+follows that \grammarterm{namespace-definition}{s} can be nested.
 \begin{example}
 \begin{codeblock}
 namespace Outer {
@@ -3699,7 +3699,7 @@
 \grammarterm{attribute}'s specification permits it. An \grammarterm{attribute} followed
 by an ellipsis is a pack expansion~(\ref{temp.variadic}).
 An \grammarterm{attribute-specifier} that contains no \grammarterm{attribute}{s} has no
-effect. The order in which the \grammarterm{attribute-tokens} appear in an
+effect. The order in which the \grammarterm{attribute-token}{s} appear in an
 \grammarterm{attribute-list} is not significant. If a
 keyword~(\ref{lex.key})
 or an alternative token~(\ref{lex.digraph}) that satisfies the syntactic requirements
diff --git a/source/expressions.tex b/source/expressions.tex
index 25a0f13165..190221ec68 100644
--- a/source/expressions.tex
+++ b/source/expressions.tex
@@ -540,7 +540,7 @@
 or one of its base classes (Clause~\ref{class.derived}), is a
 \indextext{id!qualified}%
 \grammarterm{qualified-id};~\ref{class.qual} describes name lookup for
-class members that appear in \grammarterm{qualified-ids}. The result is the
+class members that appear in \grammarterm{qualified-id}{s}. The result is the
 member. The type of the result is the type of the member. The result is
 an lvalue if the member is a static member function or a data member and a
 prvalue otherwise.
@@ -568,7 +568,7 @@
 \grammarterm{using-directive}), is a
 \indextext{id!qualified}%
 \grammarterm{qualified-id};~\ref{namespace.qual} describes name lookup for
-namespace members that appear in \grammarterm{qualified-ids}. The result is
+namespace members that appear in \grammarterm{qualified-id}{s}. The result is
 the member. The type of the result is the type of the member. The result
 is an lvalue if the member is a function or a variable and a prvalue otherwise.
 
@@ -4648,7 +4648,7 @@
 \pnum
 Evaluating a \grammarterm{throw-expression} with an operand throws an
 exception~(\ref{except.throw}); the type of the exception object is determined by removing
-any top-level \grammarterm{cv-qualifiers} from the static type of the
+any top-level \grammarterm{cv-qualifier}{s} from the static type of the
 operand and adjusting the type
 from ``array of \tcode{T}'' or function type \tcode{T}
 to ``pointer to \tcode{T}''.
diff --git a/source/templates.tex b/source/templates.tex
index 2dabed2a81..2becf9324c 100644
--- a/source/templates.tex
+++ b/source/templates.tex
@@ -303,7 +303,7 @@
 \grammarterm{template-argument}{s}~(\ref{temp.arg}).
 \end{note}
 The top-level
-\grammarterm{cv-qualifiers}
+\grammarterm{cv-qualifier}{s}
 on the
 \grammarterm{template-parameter}
 are ignored when determining its type.