diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index 59d25ab4ae36e9afc76fd5de01cf00c20009133b..d97334192a82ec6c7f41daa5d6c488255bbbe2c5 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -326,6 +326,15 @@
 \def\@firstexaminer{\@empty}
 \newcommand{\secondexaminer}[1]{\gdef\@secondexaminer{#1}}
 \def\@secondexaminer{\@empty}
+\newcommand{\professorname}{Professor}
+\newcommand{\firstexaminername}{First examiner}
+\newcommand{\secondexaminername}{Second examiner}
+\newcaptionname{english}\professorname{Professor}
+\newcaptionname{english}\firstexaminername{First examiner}
+\newcaptionname{english}\secondexaminername{Second examiner}
+\newcaptionname{german,ngerman}\professorname{Professor(in)/Lehrbeauftragte(r)}
+\newcaptionname{german,ngerman}\firstexaminername{Erstpr{\"u}fer(in)}
+\newcaptionname{german,ngerman}\secondexaminername{Zweitpr{\"u}fer(in)}
 \newcommand{\keywords}[1]{\gdef\@keywords{#1}}
 \def\@keywords{\@empty}
 \RequirePackage{pgffor}
@@ -477,15 +486,6 @@
 \ofoot*{\pagemark}
 \pagestyle{HsHheadings}
 \automark{section}
-\newcommand{\professortext}{Professor}
-\newcommand{\firstexaminertext}{First examiner}
-\newcommand{\secondexaminertext}{Second examiner}
-\newcaptionname{english}\professortext{Professor}
-\newcaptionname{english}\firstexaminertext{First examiner}
-\newcaptionname{english}\secondexaminertext{Second examiner}
-\newcaptionname{german,ngerman}\professortext{Professor(in)/Lehrbeauftragte(r)}
-\newcaptionname{german,ngerman}\firstexaminertext{Erstpr{\"u}fer(in)}
-\newcaptionname{german,ngerman}\secondexaminertext{Zweitpr{\"u}fer(in)}
 \newtoks\@tabtoks
 \newcommand\addtabtoks[1]{\global\@tabtoks\expandafter{\the\@tabtoks#1}}
 \newcommand\eaddtabtoks[1]{\edef\mytmp{#1}\expandafter\addtabtoks\expandafter{\mytmp}}
@@ -594,9 +594,9 @@
         \if\@param l\begin{tabular}{@{}l l}\fi
         \if\@param c\begin{tabular}{l l}\fi
         \if\@param r\begin{tabular}{r r@{}}\fi
-          \if\@professor\@empty\else\textbf{\professortext:}&\@professor\\\fi
-          \if\@firstexaminer\@empty\else\textbf{\firstexaminertext:}&\@firstexaminer\\\fi
-          \if\@secondexaminer\@empty\else\textbf{\secondexaminertext:}&\@secondexaminer\\\fi
+          \if\@professor\@empty\else\textbf{\professorname:}&\@professor\\\fi
+          \if\@firstexaminer\@empty\else\textbf{\firstexaminername:}&\@firstexaminer\\\fi
+          \if\@secondexaminer\@empty\else\textbf{\secondexaminername:}&\@secondexaminer\\\fi
         \end{tabular}
       }
       \ifx\@dedication\@empty\else
diff --git a/src/HsH-classes.dtx b/src/HsH-classes.dtx
index e1d4c9f0e38781e7689c91a38e2e9bd7db5947fd..0c0193ab9c527f351be6f9272b35d8b42f1a50ad 100644
--- a/src/HsH-classes.dtx
+++ b/src/HsH-classes.dtx
@@ -1204,6 +1204,24 @@ http://www.latex-project.org/lppl.txt
 %    \end{macrocode}
 %     \end{macro}
 %
+%     \begin{macro}{\professorname,\firstexaminername,\secondexaminername}
+%       \changes{v3.02}{2024-05-02}{change the suffix to 'name', which is more inline with general \LaTeX{}}
+%
+%       For the three previous macros, we also need descriptive text to print on the titlepage.
+%       The commands storing that text are defined here:
+%    \begin{macrocode}
+\newcommand{\professorname}{Professor}
+\newcommand{\firstexaminername}{First examiner}
+\newcommand{\secondexaminername}{Second examiner}
+\newcaptionname{english}\professorname{Professor}
+\newcaptionname{english}\firstexaminername{First examiner}
+\newcaptionname{english}\secondexaminername{Second examiner}
+\newcaptionname{german,ngerman}\professorname{Professor(in)/Lehrbeauftragte(r)}
+\newcaptionname{german,ngerman}\firstexaminername{Erstpr{\"u}fer(in)}
+\newcaptionname{german,ngerman}\secondexaminername{Zweitpr{\"u}fer(in)}
+%    \end{macrocode}
+%     \end{macro}
+%
 %     \begin{macro}{\keywords,\@keywords}
 %       The macro-group defines and holds keywords which describe the document. They
 %       are used when printing the abstract as well as in the PDF's meta-data.
@@ -1547,15 +1565,6 @@ http://www.latex-project.org/lppl.txt
 %       \KOMAScript{} parrentclass, but was modified to create the desired style.
 %    \begin{macrocode}
 %<*article|report>
-\newcommand{\professortext}{Professor}
-\newcommand{\firstexaminertext}{First examiner}
-\newcommand{\secondexaminertext}{Second examiner}
-\newcaptionname{english}\professortext{Professor}
-\newcaptionname{english}\firstexaminertext{First examiner}
-\newcaptionname{english}\secondexaminertext{Second examiner}
-\newcaptionname{german,ngerman}\professortext{Professor(in)/Lehrbeauftragte(r)}
-\newcaptionname{german,ngerman}\firstexaminertext{Erstpr{\"u}fer(in)}
-\newcaptionname{german,ngerman}\secondexaminertext{Zweitpr{\"u}fer(in)}
 \newtoks\@tabtoks
 \newcommand\addtabtoks[1]{\global\@tabtoks\expandafter{\the\@tabtoks#1}}
 \newcommand\eaddtabtoks[1]{\edef\mytmp{#1}\expandafter\addtabtoks\expandafter{\mytmp}}
@@ -1726,9 +1735,9 @@ http://www.latex-project.org/lppl.txt
         \if\@param l\begin{tabular}{@{}l l}\fi
         \if\@param c\begin{tabular}{l l}\fi
         \if\@param r\begin{tabular}{r r@{}}\fi
-          \if\@professor\@empty\else\textbf{\professortext:}&\@professor\\\fi
-          \if\@firstexaminer\@empty\else\textbf{\firstexaminertext:}&\@firstexaminer\\\fi
-          \if\@secondexaminer\@empty\else\textbf{\secondexaminertext:}&\@secondexaminer\\\fi
+          \if\@professor\@empty\else\textbf{\professorname:}&\@professor\\\fi
+          \if\@firstexaminer\@empty\else\textbf{\firstexaminername:}&\@firstexaminer\\\fi
+          \if\@secondexaminer\@empty\else\textbf{\secondexaminername:}&\@secondexaminer\\\fi
         \end{tabular}
       }
 %<*article>
diff --git a/src/HsH-classes.pdf b/src/HsH-classes.pdf
index d8658378e80ede5cd72ede4124c8a027071c9848..ea78068647de81e4b2eeda55ed458d545b587b21 100644
--- a/src/HsH-classes.pdf
+++ b/src/HsH-classes.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8ded54f026e76b9a601a3e11c36b02ade14144ceba8415fe2bcaa6494fcd2d7
-size 315327
+oid sha256:a7ecf39cf4427d441cda9040505dc38e93416d13a982a38b1a7c88fcbe767bab
+size 315982
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 9582d332d5446bf6a717480b7c1e82d5e175e757..83a378e9e3fddce48e1e82377da50ec46ae0aa1a 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -339,6 +339,15 @@
 \def\@firstexaminer{\@empty}
 \newcommand{\secondexaminer}[1]{\gdef\@secondexaminer{#1}}
 \def\@secondexaminer{\@empty}
+\newcommand{\professorname}{Professor}
+\newcommand{\firstexaminername}{First examiner}
+\newcommand{\secondexaminername}{Second examiner}
+\newcaptionname{english}\professorname{Professor}
+\newcaptionname{english}\firstexaminername{First examiner}
+\newcaptionname{english}\secondexaminername{Second examiner}
+\newcaptionname{german,ngerman}\professorname{Professor(in)/Lehrbeauftragte(r)}
+\newcaptionname{german,ngerman}\firstexaminername{Erstpr{\"u}fer(in)}
+\newcaptionname{german,ngerman}\secondexaminername{Zweitpr{\"u}fer(in)}
 \newcommand{\keywords}[1]{\gdef\@keywords{#1}}
 \def\@keywords{\@empty}
 \RequirePackage{pgffor}
@@ -491,15 +500,6 @@
 \pagestyle{HsHheadings}
 \automark{chapter}
 \renewcommand*{\chapterpagestyle}{HsHheadings}
-\newcommand{\professortext}{Professor}
-\newcommand{\firstexaminertext}{First examiner}
-\newcommand{\secondexaminertext}{Second examiner}
-\newcaptionname{english}\professortext{Professor}
-\newcaptionname{english}\firstexaminertext{First examiner}
-\newcaptionname{english}\secondexaminertext{Second examiner}
-\newcaptionname{german,ngerman}\professortext{Professor(in)/Lehrbeauftragte(r)}
-\newcaptionname{german,ngerman}\firstexaminertext{Erstpr{\"u}fer(in)}
-\newcaptionname{german,ngerman}\secondexaminertext{Zweitpr{\"u}fer(in)}
 \newtoks\@tabtoks
 \newcommand\addtabtoks[1]{\global\@tabtoks\expandafter{\the\@tabtoks#1}}
 \newcommand\eaddtabtoks[1]{\edef\mytmp{#1}\expandafter\addtabtoks\expandafter{\mytmp}}
@@ -624,9 +624,9 @@
         \if\@param l\begin{tabular}{@{}l l}\fi
         \if\@param c\begin{tabular}{l l}\fi
         \if\@param r\begin{tabular}{r r@{}}\fi
-          \if\@professor\@empty\else\textbf{\professortext:}&\@professor\\\fi
-          \if\@firstexaminer\@empty\else\textbf{\firstexaminertext:}&\@firstexaminer\\\fi
-          \if\@secondexaminer\@empty\else\textbf{\secondexaminertext:}&\@secondexaminer\\\fi
+          \if\@professor\@empty\else\textbf{\professorname:}&\@professor\\\fi
+          \if\@firstexaminer\@empty\else\textbf{\firstexaminername:}&\@firstexaminer\\\fi
+          \if\@secondexaminer\@empty\else\textbf{\secondexaminername:}&\@secondexaminer\\\fi
         \end{tabular}
       }
       \par