diff --git a/chapters/classes.tex b/chapters/classes.tex
index 027bd3b2a..19756d4b7 100644
--- a/chapters/classes.tex
+++ b/chapters/classes.tex
@@ -358,7 +358,7 @@ \subsection{Component Variability Prefixes discrete, parameter, constant}\label{
   A variable \lstinline!vc! declared with \lstinline!constant!\indexinline{constant} prefix remains constant during transient analysis, with a value that is unaffected by the initialization problem (i.e., determined during translation).
   This is called a \firstuse[---]{constant}, or \firstuse[constant!variable]{constant variable}\index{component variability!constant}.
 \item
-  A variable \lstinline!sp! is called a \firstuse[---]{structural parameter variable}\index{component variability!structural parameter} if all of the following applies:
+  A variable \lstinline!sp! is called a \firstuse[parameter!structural]{structural parameter variable}\index{component variability!structural parameter} if all of the following applies:
   \begin{itemize}
   \item
     It is declared with the \lstinline!parameter!\indexinline{parameter} prefix.
@@ -369,17 +369,17 @@ \subsection{Component Variability Prefixes discrete, parameter, constant}\label{
   \item
     The declaration equation -- or \lstinline!start! attribute if no declaration equation is given (see \cref{initialization-initial-equation-and-initial-algorithm}) -- is given by a structural expression (\cref{structural-expressions}).
   \end{itemize}
-  A structural parameter remains constant during transient analysis, with a value either determined during translation (similar to having prefix \lstinline!constant!, and is then called an \firstuse{evaluated parameter}) or by the initialization problem (similar to a \willintroduce{normal parameter}, see item below).
+  A structural parameter remains constant during transient analysis, with a value either determined during translation (similar to having prefix \lstinline!constant!, and is then called an \firstuse[parameter!evaluated]{evaluated parameter}) or by the initialization problem (similar to a \willintroduce{normal parameter}, see item below).
   At which of these stages the value is determined is tool dependent.
 \item
-  A variable \lstinline!np! declared with the \lstinline!parameter!\indexinline{parameter} prefix, is called a \firstuse[---]{normal parameter variable}\index{component variability!normal parameter} unless it is a structural parameter.
+  A variable \lstinline!np! declared with the \lstinline!parameter!\indexinline{parameter} prefix, is called a \firstuse[parameter!normal]{normal parameter variable}\index{component variability!normal parameter} unless it is a structural parameter.
   It is also simply called a \firstuse[parameter!normal]{normal parameter}.
   It remains constant during transient analysis, with a value determined by the initialization problem.
 \item
   A \firstuse[discrete-time!variable]{discrete-time variable}\index{component variability!discrete-time} \lstinline!vd! is a variable that is discrete-valued (that is, not of \lstinline!Real! type) or assigned in a \lstinline!when!-clause.
   The \lstinline!discrete!\indexinline{discrete} prefix may be used to clarify that a variable is discrete-time.
   It has a vanishing time derivative between events.
-  Note that this is not the same as saying that \lstinline!der(vd)=0! almost everywhere, as the derivative is not even defined at the events.
+  Note that this is not the same as saying that \lstinline!der(vd) = 0! almost everywhere, as the derivative is not even defined at the events.
   It is not allowed to apply \lstinline!der! to discrete-time variables.
   During transient analysis the variable can only change its value at event instants (see \cref{events-and-synchronization}).
 \item