diff --git a/metadata.tex b/metadata.tex
index 53cb563..8091a53 100644
--- a/metadata.tex
+++ b/metadata.tex
@@ -10,17 +10,23 @@
 
 \newif\ifMFF
 \MFFtrue % comment this out for the version with a big UK university logo
-\def\UKName{Charles University in Prague} %this is used in UK-logo-version
-
+\def\UKName{Charles University in Prague} %this is only used in UK-logo-version
 \def\UKFaculty{Faculty of Mathematics and Physics}
-\def\ThesisTypeName{\ifEN BACHELOR THESIS \else BAKALÁŘSKÁ PRÁCE \fi}
-%\def\ThesisTypeName{\ifEN MASTER THESIS \else DIPLOMOVÁ PRÁCE \fi}
-%\def\ThesisTypeName{\ifEN RIGOROUS THESIS \else RIGORÓZNÍ PRÁCE \fi}
-%\def\ThesisTypeName{\ifEN DOCTORAL THESIS \else DISERTAČNÍ PRÁCE \fi}
-\def\SupervisedThesisName{\ifEN bachelor \else bakalářské \fi}
-%\def\SupervisedThesisName{\ifEN master \else diplomové \fi}
-%\def\SupervisedThesisName{\ifEN rigorous \else rigorózní \fi}
-%\def\SupervisedThesisName{\ifEN doctoral \else disertační \fi}
+
+% Thesis type names, as used in several places in the title
+\def\ThesisTypeTitle{\ifEN BACHELOR THESIS \else BAKALÁŘSKÁ PRÁCE \fi}
+%\def\ThesisTypeTitle{\ifEN MASTER THESIS \else DIPLOMOVÁ PRÁCE \fi}
+%\def\ThesisTypeTitle{\ifEN RIGOROUS THESIS \else RIGORÓZNÍ PRÁCE \fi}
+%\def\ThesisTypeTitle{\ifEN DOCTORAL THESIS \else DISERTAČNÍ PRÁCE \fi}
+\def\ThesisGenitive{\ifEN bachelor \else bakalářské \fi}
+%\def\ThesisGenitive{\ifEN master \else diplomové \fi}
+%\def\ThesisGenitive{\ifEN rigorous \else rigorózní \fi}
+%\def\ThesisGenitive{\ifEN doctoral \else disertační \fi}
+\def\ThesisAccusative{\ifEN bachelor \else bakalářskou \fi}
+%\def\ThesisAccusative{\ifEN master \else diplomovou \fi}
+%\def\ThesisAccusative{\ifEN rigorous \else rigorózní \fi}
+%\def\ThesisAccusative{\ifEN doctoral \else disertační \fi}
+
 
 
 %%% Fill in your details %%%
diff --git a/title.tex b/title.tex
index cc8caf6..702028c 100644
--- a/title.tex
+++ b/title.tex
@@ -16,7 +16,7 @@
 \fi
 \vfill
 
-{\bf\Large\ThesisTypeName}
+{\bf\Large\ThesisTypeTitle}
 
 \vfill
 
@@ -38,8 +38,8 @@
 
 {
 \centerline{\vbox{\halign{\hbox to 0.45\hsize{\hfil #}&\hskip 0.5em\parbox[t]{0.45\hsize}{\raggedright #}\cr
-\ifEN Supervisor of the \SupervisedThesisName thesis:
-\else Vedoucí \SupervisedThesisName práce: \fi
+\ifEN Supervisor of the \ThesisGenitive thesis:
+\else Vedoucí \ThesisGenitive práce: \fi
 & \Supervisor \cr
 \noalign{\vspace{2mm}}
 \ifEN Study programme: \else Studijní program: \fi
@@ -67,12 +67,12 @@
 
 \ifEN
 \noindent
-I declare that I carried out this bachelor thesis independently, and only with the cited
+I declare that I carried out this \ThesisAccusative thesis independently, and only with the cited
 sources, literature and other professional sources. It has not been used to obtain another
 or the same degree.
 \else
 \noindent
-Prohlašuji, že jsem tuto bakalářskou práci vypracoval(a) samostatně a výhradně
+Prohlašuji, že jsem tuto \ThesisAccusative práci vypracoval(a) samostatně a výhradně
 s~použitím citovaných pramenů, literatury a dalších odborných zdrojů.
 Tato práce nebyla využita k získání jiného nebo stejného titulu.
 \fi