@@ -2607,12 +2607,6 @@
     \opt{global-module-fragment} module-declaration \opt{declaration-seq} \opt{private-module-fragment}
 \end{bnf}
 
-\pnum
-A token sequence beginning with
-\opt{\tcode{export}} \tcode{module}
-and not immediately followed by \tcode{::}
-is never interpreted as a \grammarterm{declaration}.
-
 \pnum
 \indextext{linkage}%
 \indextext{translation unit}%
 
@@ -1934,6 +1934,28 @@
 
 \rSec2[diff.cpp17.lex]{\ref{lex}: lexical conventions}
 
+\diffref{lex.pptoken,module.unit,module.import,cpp.pre,cpp.module,cpp.import}
+\change
+New identifiers with special meaning.
+\rationale
+Required for new features.
+\effect
+Logical lines beginning with
+\tcode{module} or \tcode{import} may
+be interpreted differently
+in this International Standard.
+\begin{example}
+\begin{codeblock}
+class module {};
+module m1;          // was variable declaration; now \grammarterm{module-declaration}
+module *m2;         // OK
+
+class import {};
+import j1;          // was variable declaration; now \grammarterm{import-declaration}
+::import j2;        // variable declaration
+\end{codeblock}
+\end{example}
+
 \diffref{lex.header}
 \change
 \grammarterm{header-name} tokens are formed in more contexts.
@@ -2038,28 +2060,6 @@
 
 \rSec2[diff.cpp17.basic]{\ref{basic}: basics}
 
-\diffref{basic.link,module.unit,module.import}
-\change
-New identifiers with special meaning.
-\rationale
-Required for new features.
-\effect
-Top-level declarations beginning with
-\tcode{module} or \tcode{import} may
-be either ill-formed or interpreted differently
-in this International Standard.
-\begin{example}
-\begin{codeblock}
-class module;
-module *m1;         // ill-formed; previously well-formed
-::module *m2;       // OK
-
-class import {};
-import j1;          // was variable declaration; now \grammarterm{import-declaration}
-::import j2;        // variable declaration
-\end{codeblock}
-\end{example}
-
 \diffref{intro.races}
 \change
 Except for the initial release operation,
 
@@ -297,6 +297,8 @@
 \nontermdef{preprocessing-token}\br
     header-name\br
     import-keyword\br
+    module-keyword\br
+    export-keyword\br
     identifier\br
     pp-number\br
     character-literal\br
@@ -382,8 +384,14 @@
 
 \pnum
 The \grammarterm{import-keyword} is produced
-by processing an \tcode{import} directive\iref{cpp.import} and
-has no associated grammar productions.
+by processing an \tcode{import} directive\iref{cpp.import},
+the \grammarterm{module-keyword} is produced
+by preprocessing a \tcode{module} directive\iref{cpp.module}, and
+the \grammarterm{export-keyword} is produced
+by preprocessing either of the previous two directives.
+\begin{note}
+None have any observable spelling.
+\end{note}
 
 \pnum
 \begin{example}
@@ -790,26 +798,29 @@
 \keyword{enum} \\
 \keyword{explicit} \\
 \keyword{export} \\
-\keyword{extern} \\
+\grammarterm{export-keyword} \\
 \columnbreak
+\keyword{extern} \\
 \keyword{false} \\
 \keyword{float} \\
 \keyword{for} \\
 \keyword{friend} \\
 \keyword{goto} \\
 \keyword{if} \\
+\grammarterm{import-keyword} \\
 \keyword{inline} \\
 \keyword{int} \\
 \keyword{long} \\
+\grammarterm{module-keyword} \\
 \keyword{mutable} \\
 \keyword{namespace} \\
 \keyword{new} \\
 \keyword{noexcept} \\
 \keyword{nullptr} \\
+\columnbreak
 \keyword{operator} \\
 \keyword{private} \\
 \keyword{protected} \\
-\columnbreak
 \keyword{public} \\
 \keyword{register} \\
 \keyword{reinterpret_cast} \\
@@ -824,10 +835,10 @@
 \keyword{struct} \\
 \keyword{switch} \\
 \keyword{template} \\
+\columnbreak
 \keyword{this} \\
 \keyword{thread_local} \\
 \keyword{throw} \\
-\columnbreak
 \keyword{true} \\
 \keyword{try} \\
 \keyword{typedef} \\
 
@@ -7,7 +7,7 @@
 
 \begin{bnf}
 \nontermdef{module-declaration}\br
-    \opt{\keyword{export}} \keyword{module} module-name \opt{module-partition} \opt{attribute-specifier-seq} \terminal{;}
+    \opt{export-keyword} module-keyword module-name \opt{module-partition} \opt{attribute-specifier-seq} \terminal{;}
 \end{bnf}
 
 \begin{bnf}
@@ -409,9 +409,9 @@
 
 \begin{bnf}
 \nontermdef{module-import-declaration}\br
-    \opt{\keyword{export}} import-keyword module-name \opt{attribute-specifier-seq} \terminal{;}\br
-    \opt{\keyword{export}} import-keyword module-partition \opt{attribute-specifier-seq} \terminal{;}\br
-    \opt{\keyword{export}} import-keyword header-name \opt{attribute-specifier-seq} \terminal{;}
+    \opt{export-keyword} import-keyword module-name \opt{attribute-specifier-seq} \terminal{;}\br
+    \opt{export-keyword} import-keyword module-partition \opt{attribute-specifier-seq} \terminal{;}\br
+    \opt{export-keyword} import-keyword header-name \opt{attribute-specifier-seq} \terminal{;}
 \end{bnf}
 
 \pnum
@@ -558,14 +558,14 @@
 
 \begin{bnf}
 \nontermdef{global-module-fragment}\br
-    \keyword{module} \terminal{;} \opt{declaration-seq}
+    module-keyword \terminal{;} \opt{declaration-seq}
 \end{bnf}
 
 \pnum
 \begin{note}
 Prior to phase 4 of translation,
 only preprocessing directives can appear
-in the \grammarterm{declaration-seq}\iref{cpp.global.frag}.
+in the \grammarterm{declaration-seq}\iref{cpp.pre}.
 \end{note}
 
 \pnum
@@ -765,7 +765,7 @@
 
 \begin{bnf}
 \nontermdef{private-module-fragment}\br
-    \keyword{module} \terminal{:} \keyword{private} \terminal{;} \opt{declaration-seq}
+    module-keyword \terminal{:} \keyword{private} \terminal{;} \opt{declaration-seq}
 \end{bnf}
 
 \pnum