diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index 59d25ab4ae36e9afc76fd5de01cf00c20009133b..7073d626854ba5b1a035e91a6d252669133018cc 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -195,7 +195,7 @@
 \HsH@Options@DeclareAlias{ngerman}{language=ngerman}
 \def\HsH@opt@faculty{1}
 \FamilyNumericalKey{HsH}{faculty}{HsH@opt@faculty}{%
-  {0}{1}, {none}{1}, {false}{1}, {off}{1}%
+  {0}{1}, {none}{1}, {false}{1}, {off}{1},%
   {1}{2}, {f1}{2},%
   {2}{3}, {f2}{3},%
   {3}{4}, {f3}{4},%
@@ -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 08578cc9247e50742784fb13e949ec798498b134..7e376d65cee0631718c6c9f5ad78095a9fdda413 100644
--- a/src/HsH-classes.dtx
+++ b/src/HsH-classes.dtx
@@ -1211,6 +1211,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.
@@ -1554,15 +1572,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}}
@@ -1733,9 +1742,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 054ac77491cd3be919a94709af88ed03909bd7c1..862abbb5548b16a8cb8627c9c46401111c10ddc3 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:7a44256d48925c0d383248d4107f595e2409872359c7c1193781deb73ecb52e3
-size 317320
+oid sha256:b647b31f4e5824108ac18c65696ca6cdc804cc3d6b4e8834a27a5a6f7d1e5986
+size 317929
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 9582d332d5446bf6a717480b7c1e82d5e175e757..8b10acc1e5cc6c43ab982cf5b0ce65e2e98f3d0b 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -195,7 +195,7 @@
 \HsH@Options@DeclareAlias{ngerman}{language=ngerman}
 \def\HsH@opt@faculty{1}
 \FamilyNumericalKey{HsH}{faculty}{HsH@opt@faculty}{%
-  {0}{1}, {none}{1}, {false}{1}, {off}{1}%
+  {0}{1}, {none}{1}, {false}{1}, {off}{1},%
   {1}{2}, {f1}{2},%
   {2}{3}, {f2}{3},%
   {3}{4}, {f3}{4},%
@@ -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
diff --git a/src/HsH-standalone.cls b/src/HsH-standalone.cls
index f23662b6d82fa2aa57bcaf9b5ec2f0f2eaf4bcfd..c1701d637224b93e9bce52af5bcefdb7a205d950 100644
--- a/src/HsH-standalone.cls
+++ b/src/HsH-standalone.cls
@@ -66,7 +66,7 @@
 \HsH@Options@DeclareAlias{ngerman}{language=ngerman}
 \def\HsH@opt@faculty{1}
 \FamilyNumericalKey{HsH}{faculty}{HsH@opt@faculty}{%
-  {0}{1}, {none}{1}, {false}{1}, {off}{1}%
+  {0}{1}, {none}{1}, {false}{1}, {off}{1},%
   {1}{2}, {f1}{2},%
   {2}{3}, {f2}{3},%
   {3}{4}, {f3}{4},%