@@ -4385,13 +4385,20 @@
 \end{example}
 
 \pnum
-A \grammarterm{qualified-id}
-whose terminal name is dependent and that is in a type-only context
-is considered to denote a type.
+Each of the forms
+\begin{ncsimplebnf}
+nested-name-specifier identifier\br
+nested-name-specifier \opt{\keyword{template}} simple-template-id
+\end{ncsimplebnf}
+where the terminal name $N$ is dependent\iref{temp.dep.type}
+is interpreted as a \grammarterm{simple-type-specifier}\iref{dcl.type.simple}
+if $N$ is in a type-only context and
+as a \grammarterm{qualified-id}\iref{expr.prim.id.qual} otherwise.
 A name
 that refers to a \grammarterm{using-declarator} whose terminal name is dependent
-is interpreted as a \grammarterm{typedef-name}
-if the \grammarterm{using-declarator} uses the keyword \keyword{typename}.
+is interpreted as a \grammarterm{typedef-name}\iref{dcl.typedef}
+if the \grammarterm{using-declarator} uses the keyword \keyword{typename}
+and as an \grammarterm{unqualified-id}\iref{expr.prim.id.unqual} otherwise.
 \begin{example}
 \begin{codeblock}
 template <class T> void f(int i) {