diff --git a/source/basic.tex b/source/basic.tex
index bdae264dbf..3fb2a28f9a 100644
--- a/source/basic.tex
+++ b/source/basic.tex
@@ -883,7 +883,7 @@
 only of the declarative region following the name's point of
 declaration, but also of all function bodies, default arguments,
 \grammarterm{noexcept-specifier}{s}, and
-\grammarterm{brace-or-equal-initializers} of non-static data members
+\grammarterm{brace-or-equal-initializer}{s} of non-static data members
 in that class (including such
 things in nested classes).
 
@@ -1778,7 +1778,7 @@
 declarations of \tcode{m} in \tcode{X} and the inline namespace set of
 \tcode{X}~(\ref{namespace.def}). If $S'(X, m)$ is not empty, $S(X, m)$
 is $S'(X, m)$; otherwise, $S(X, m)$ is the union of $S(N_i, m)$ for
-all namespaces $N_i$ nominated by \grammarterm{using-directives} in
+all namespaces $N_i$ nominated by \grammarterm{using-directive}{s} in
 \tcode{X} and its inline namespace set.
 
 \pnum
diff --git a/source/declarations.tex b/source/declarations.tex
index c2a442c626..cd53fe1c5b 100644
--- a/source/declarations.tex
+++ b/source/declarations.tex
@@ -492,7 +492,7 @@
 \indextext{function|seealso{friend function; member function; inline function; virtual function}}
 
 \pnum
-\grammarterm{Function-specifiers}
+\grammarterm{Function-specifier}{s}
 can be used only in function declarations.
 
 \begin{bnf}
diff --git a/source/declarators.tex b/source/declarators.tex
index a52491d35d..0b59632abb 100644
--- a/source/declarators.tex
+++ b/source/declarators.tex
@@ -70,8 +70,8 @@
 and each \tcode{Di} is an \grammarterm{init-declarator}.
 One exception is when a name introduced by one of the
 \grammarterm{declarator}{s} hides a type name used by the
-\grammarterm{decl-specifiers}, so that when the same
-\grammarterm{decl-specifiers} are used in a subsequent declaration,
+\grammarterm{decl-specifier}{s}, so that when the same
+\grammarterm{decl-specifier}{s} are used in a subsequent declaration,
 they do not have the same meaning, as in
 \begin{codeblock}
 struct S { ... };
diff --git a/source/exceptions.tex b/source/exceptions.tex
index 8182cd33e9..9ea8e4ab6d 100644
--- a/source/exceptions.tex
+++ b/source/exceptions.tex
@@ -493,7 +493,7 @@
 The \grammarterm{handler} is of type \cv{}~\tcode{T} or
 \cv{}~\tcode{T\&} and
 \tcode{E} and \tcode{T}
-are the same type (ignoring the top-level \grammarterm{cv-qualifiers}), or
+are the same type (ignoring the top-level \grammarterm{cv-qualifier}{s}), or
 \item%
 the \grammarterm{handler} is of type \cv{}~\tcode{T} or
 \cv{}~\tcode{T\&} and
diff --git a/source/expressions.tex b/source/expressions.tex
index 450a55baa8..ff9562dc45 100644
--- a/source/expressions.tex
+++ b/source/expressions.tex
@@ -3755,7 +3755,7 @@
 is an rvalue reference to object type; otherwise the result is a prvalue.
 \begin{note}
 If \tcode{T} is a non-class type that is cv-qualified, the
-\grammarterm{cv-qualifiers} are discarded when determining the type of the
+\grammarterm{cv-qualifier}{s} are discarded when determining the type of the
 resulting prvalue; see Clause~\ref{expr}.
 \end{note}
 
diff --git a/source/special.tex b/source/special.tex
index ca2fe666a3..3c44e2aba2 100644
--- a/source/special.tex
+++ b/source/special.tex
@@ -1890,13 +1890,13 @@
 as they appear in the
 \grammarterm{base-specifier-list}
 (regardless of the order of the
-\grammarterm{mem-initializers}).
+\grammarterm{mem-initializer}{s}).
 \item
 \indextext{initialization!order of member}%
 Then, non-static data members are initialized in the order
 they were declared in the class definition
 (again regardless of the order of the
-\grammarterm{mem-initializers}).
+\grammarterm{mem-initializer}{s}).
 \item
 Finally, the \grammarterm{compound-statement} of the constructor
 body  is executed.
diff --git a/source/statements.tex b/source/statements.tex
index fffe4b6d0d..5203ff1c1b 100644
--- a/source/statements.tex
+++ b/source/statements.tex
@@ -638,7 +638,7 @@
 \item
 if the \grammarterm{for-range-initializer} is an \grammarterm{expression},
 it is regarded as if it were surrounded by parentheses (so that a comma operator
-cannot be reinterpreted as delimiting two \grammarterm{init-declarators});
+cannot be reinterpreted as delimiting two \grammarterm{init-declarator}{s});
 
 \item \tcode{__range}, \tcode{__begin}, and \tcode{__end} are variables defined for
 exposition only; and