diff --git a/chapters/functions.tex b/chapters/functions.tex
index 4aa81065d..ccb695085 100644
--- a/chapters/functions.tex
+++ b/chapters/functions.tex
@@ -2579,7 +2579,7 @@ \subsubsection{Input Parameters, Function Value}\label{input-parameters-function
 \end{lstlisting}
 \end{example}
 
-\subsubsection{Arbitrary Placement of Output Parameters, No External Function Value}\label{arbitrary-placement-of-output-parameters-no-external-function-value}\label{both-function-value-and-output-variable}
+\subsubsection{Arbitrary Placement of Output Parameters, No External Function Value}\label{arbitrary-placement-of-output-parameters-no-external-function-value}
 
 \begin{example}
 In the following example, the external function call is given
@@ -2609,7 +2609,7 @@ \subsubsection{Arbitrary Placement of Output Parameters, No External Function Va
 \end{lstlisting}
 \end{example}
 
-\subsubsection{Both Function Value and Output Variable}\label{external-function-with-both-function-value-and-output-variable}
+\subsubsection{Both Function Value and Output Variable}\label{external-function-with-both-function-value-and-output-variable}\label{both-function-value-and-output-variable}
 
 \begin{example}
 The following external function returns two results: one
diff --git a/chapters/statements.tex b/chapters/statements.tex
index 10392c4f6..7687f726f 100644
--- a/chapters/statements.tex
+++ b/chapters/statements.tex
@@ -26,7 +26,7 @@ \subsection{Initial Algorithm Sections}\label{initial-algorithm-sections}
 See \cref{initialization-initial-equation-and-initial-algorithm} for a description of both initial algorithm sections and
 initial equation sections.
 
-\subsection{An algorithm in a model}\label{execution-of-an-algorithm-in-a-model}\label{an-algorithm-in-a-model}
+\subsection{An Algorithm in a Model}\label{execution-of-an-algorithm-in-a-model}\label{an-algorithm-in-a-model}
 
 An algorithm section is conceptually a code fragment that remains together and the statements of an algorithm section are executed in the order of appearance.
 Whenever an algorithm section is invoked, all variables appearing on the left hand side of the assignment operator \lstinline!:=! are initialized (at least conceptually):
@@ -64,7 +64,7 @@ \subsection{An algorithm in a model}\label{execution-of-an-algorithm-in-a-model}
 This is usually the case, except for algorithms with \lstinline!when!-statements, and especially for initial algorithms.
 \end{nonnormative}
 
-\subsection{The algorithm in a function}\label{execution-of-the-algorithm-in-a-function}\label{the-algorithm-in-a-function}
+\subsection{The Algorithm in a Function}\label{execution-of-the-algorithm-in-a-function}\label{the-algorithm-in-a-function}
 
 See \crefnameref{initialization-and-binding-equations-of-components-in-functions}.
 
@@ -392,7 +392,7 @@ \subsection{When-Statements}\label{when-statements}
 Merging the \lstinline!when!-statements can lead to less efficient code and different models with different behavior depending on the order of the assignment to \lstinline!y1! and \lstinline!y3! in the algorithm.
 \end{example}
 
-\subsubsection{Where a When-statement may occur}\label{restrictions-on-where-a-when-statement-may-occur}\label{where-a-when-statement-may-occur}
+\subsubsection{Where a When-statement May Occur}\label{restrictions-on-where-a-when-statement-may-occur}\label{where-a-when-statement-may-occur}
 
 \begin{itemize}
 \item
@@ -416,7 +416,7 @@ \subsubsection{Where a When-statement may occur}\label{restrictions-on-where-a-w
 \end{lstlisting}
 \end{example}
 
-\subsubsection{Statements within When-Statements}\label{restrictions-on-statements-within-when-statements}\label{statements-within-when-statements}
+\subsubsection{Statements within When-statements}\label{restrictions-on-statements-within-when-statements}\label{statements-within-when-statements}
 
 \begin{nonnormative}
 In contrast to \lstinline!when!-equations, \cref{restrictions-on-equations-within-when-equations}, there are no additional restrictions within \lstinline!when!-statements:
@@ -431,7 +431,7 @@ \subsubsection{Statements within When-Statements}\label{restrictions-on-statemen
 \end{itemize}
 \end{nonnormative}
 
-\subsubsection{Defining When-Statements by If-Statements}\label{defining-when-statements-by-if-statements}
+\subsubsection{Defining When-statements by If-statements}\label{defining-when-statements-by-if-statements}
 
 A \lstinline!when!-statement:
 \begin{lstlisting}[language=modelica]