diff --git a/source/expressions.tex b/source/expressions.tex
index ebc2646472..c2c875fc55 100644
--- a/source/expressions.tex
+++ b/source/expressions.tex
@@ -2588,7 +2588,7 @@
     identifier \opt{\terminal{...}}\br
     \terminal{\&} identifier \opt{\terminal{...}}\br
     \keyword{this}\br
-    \terminal{*} \terminal{this}
+    \terminal{*} \keyword{this}
 \end{bnf}
 
 \begin{bnf}
@@ -3449,8 +3449,8 @@
     typename-specifier \terminal{(} \opt{expression-list} \terminal{)}\br
     simple-type-specifier braced-init-list\br
     typename-specifier braced-init-list\br
-    postfix-expression \terminal{.} \opt{\terminal{template}} id-expression\br
-    postfix-expression \terminal{->} \opt{\terminal{template}} id-expression\br
+    postfix-expression \terminal{.} \opt{\keyword{template}} id-expression\br
+    postfix-expression \terminal{->} \opt{\keyword{template}} id-expression\br
     postfix-expression \terminal{++}\br
     postfix-expression \terminal{--}\br
     \keyword{dynamic_cast} \terminal{<} type-id \terminal{>} \terminal{(} expression \terminal{)}\br
@@ -5153,7 +5153,7 @@
 
 \begin{bnf}
 \nontermdef{await-expression}\br
-    \terminal{co_await} cast-expression
+    \keyword{co_await} cast-expression
 \end{bnf}
 
 \pnum
@@ -7473,8 +7473,8 @@
 
 \begin{bnf}
   \nontermdef{yield-expression}\br
-  \terminal{co_yield} assignment-expression\br
-  \terminal{co_yield} braced-init-list
+  \keyword{co_yield} assignment-expression\br
+  \keyword{co_yield} braced-init-list
 \end{bnf}
 
 \pnum
diff --git a/source/lex.tex b/source/lex.tex
index 6cf011e432..28ce23f2b8 100644
--- a/source/lex.tex
+++ b/source/lex.tex
@@ -2079,8 +2079,8 @@
 \indextext{literal!boolean}%
 \begin{bnf}
 \nontermdef{boolean-literal}\br
-    \terminal{false}\br
-    \terminal{true}
+    \keyword{false}\br
+    \keyword{true}
 \end{bnf}
 
 \pnum
@@ -2093,7 +2093,7 @@
 \indextext{literal!pointer}%
 \begin{bnf}
 \nontermdef{pointer-literal}\br
-    \terminal{nullptr}
+    \keyword{nullptr}
 \end{bnf}
 
 \pnum
diff --git a/source/overloading.tex b/source/overloading.tex
index 5343a015a7..c5691428c1 100644
--- a/source/overloading.tex
+++ b/source/overloading.tex
@@ -589,7 +589,7 @@
 and having the form
 \begin{ncbnf}
 \terminal{R} \placeholder{call-function} \terminal{(} conversion-type-id \ %
-\terminal{F, P$_1$ a$_1$, $\dotsc$, P$_n$ a$_n$)} \terminal{\{ return F (a$_1$, $\dotsc$, a$_n$); \}}
+\terminal{F, P$_1$ a$_1$, $\dotsc$, P$_n$ a$_n$)} \terminal{\{} \keyword{return} \terminal{F (a$_1$, $\dotsc$, a$_n$); \}}
 \end{ncbnf}
 is also considered as a candidate function.
 Similarly, surrogate
@@ -3309,7 +3309,7 @@
 %% Ed. note: character protrusion would misalign various operators.
 \microtypesetup{protrusion=false}
 \nontermdef{operator} \textnormal{one of}\br
-    \terminal{new \ \ \ \ \ delete \ \ new[] \ \ \ delete[] co_await (\rlap{\,)} \ \ \ \ \ \ \ [\rlap{\,]} \ \ \ \ \ \ \ -> \ \ \ \ \ \ ->*}\br
+    \terminal{\keyword{new} \ \ \ \ \ \keyword{delete} \ \ \keyword{new}[] \ \ \ \keyword{delete}[] \keyword{co_await} (\rlap{\,)} \ \ \ \ \ \ \ [\rlap{\,]} \ \ \ \ \ \ \ -> \ \ \ \ \ \ ->*}\br
     \terminal{\~ \ \ \ \ \ \ \ ! \ \ \ \ \ \ \ + \ \ \ \ \ \ \ - \ \ \ \ \ \ \ * \ \ \ \ \ \ \ / \ \ \ \ \ \ \ \% \ \ \ \ \ \ \ \caret{} \ \ \ \ \ \ \ \&}\br
     \terminal{| \ \ \ \ \ \ \ = \ \ \ \ \ \ \ += \ \ \ \ \ \ -= \ \ \ \ \ \ *= \ \ \ \ \ \ /= \ \ \ \ \ \ \%= \ \ \ \ \ \ \caret{}= \ \ \ \ \ \ \&=}\br
     \terminal{|= \ \ \ \ \ \ == \ \ \ \ \ \ != \ \ \ \ \ \ < \ \ \ \ \ \ \ > \ \ \ \ \ \ \ <= \ \ \ \ \ \ >= \ \ \ \ \ \ <=> \ \ \ \ \ \&\&}\br
diff --git a/source/preprocessor.tex b/source/preprocessor.tex
index ee7959abeb..d5f6e0ba7d 100644
--- a/source/preprocessor.tex
+++ b/source/preprocessor.tex
@@ -793,7 +793,7 @@
 whether the \tcode{\#include} preprocessing directive
 is instead replaced by an \tcode{import} directive\iref{cpp.import} of the form
 \begin{ncbnf}
-\terminal{import} header-name \terminal{;} new-line
+\keyword{import} header-name \terminal{;} new-line
 \end{ncbnf}
 
 \pnum
diff --git a/source/statements.tex b/source/statements.tex
index ba75c744d2..bfa70d26f9 100644
--- a/source/statements.tex
+++ b/source/statements.tex
@@ -988,7 +988,7 @@
 
 \begin{bnf}
 \nontermdef{coroutine-return-statement}\br
-    \terminal{co_return} \opt{expr-or-braced-init-list} \terminal{;}
+    \keyword{co_return} \opt{expr-or-braced-init-list} \terminal{;}
 \end{bnf}
 
 \pnum
@@ -1008,7 +1008,7 @@
 promise object\iref{dcl.fct.def.coroutine}.
 A \keyword{co_return} statement is equivalent to:
 \begin{ncsimplebnf}
-\terminal{\{} S\terminal{;} \terminal{goto} \exposid{final-suspend}\terminal{;} \terminal{\}}
+\terminal{\{} S\terminal{;} \keyword{goto} \exposid{final-suspend}\terminal{;} \terminal{\}}
 \end{ncsimplebnf}
 where \exposid{final-suspend} is the exposition-only label
 defined in \ref{dcl.fct.def.coroutine}
diff --git a/source/templates.tex b/source/templates.tex
index bf283e46da..7d4eca1376 100644
--- a/source/templates.tex
+++ b/source/templates.tex
@@ -4782,7 +4782,7 @@
 \begin{bnf}
 \nontermdef{typename-specifier}\br
   \keyword{typename} nested-name-specifier identifier\br
-  \keyword{typename} nested-name-specifier \opt{\terminal{template}} simple-template-id
+  \keyword{typename} nested-name-specifier \opt{\keyword{template}} simple-template-id
 \end{bnf}
 
 \pnum