diff --git a/chapters/classes.tex b/chapters/classes.tex
index f7bcd0524..1d0ef9f43 100644
--- a/chapters/classes.tex
+++ b/chapters/classes.tex
@@ -540,8 +540,11 @@ \section{Class Declarations}\label{class-declarations}
 \end{lstlisting}
 \end{example}
 
-The following is the formal syntax of class definitions, including the
-special variants described in later sections.
+The following is the formal syntax of class definitions, including the special variants described in later sections.
+
+An \firstuse{element}\index{element} is part of a class definition, and is one of: class definition, component declaration, or extends clause.
+Component declarations and class definitions are called \firstuse{named elements}\index{named elements}.
+An element is either inherited from a base class or local.
 
 \begin{lstlisting}[language=grammar]
 class-definition :
diff --git a/chapters/glossary.tex b/chapters/glossary.tex
index bbb5275be..d13aa1a17 100644
--- a/chapters/glossary.tex
+++ b/chapters/glossary.tex
@@ -1,10 +1,5 @@
 \chapter{Glossary}\label{glossary}
 
-\glossaryitem{element}: part of a class definition, one of: class definition,
-component declaration, or extends clause. Component declarations and
-class definitions are called named elements. An element is either
-inherited from a base class or local.
-
 \glossaryitem{element modification}: part of a modification, overrides the
 declaration equation in the class used by the instance generated by the
 modified element. Example: \lstinline!vcc(unit="V")=1000!. (See \cref{modifications}.)