diff --git a/config/thesis_commands.tex b/config/thesis_commands.tex
index bf9bbf2..4f76477 100644
--- a/config/thesis_commands.tex
+++ b/config/thesis_commands.tex
@@ -24,10 +24,10 @@
 % References
 \newcommand{\chapref}[1]{chapter~\ref{#1}}
 \newcommand{\Chapref}[1]{Chapter~\ref{#1}}
-\renewcommand{\eqref}[1]{Equation~\ref{\labelprefix:eq:#1}}
-\renewcommand{\figref}[1]{Figure~\ref{\labelprefix:fig:#1}}
+\renewcommand{\eqref}[2][\labelprefix]{Equation~\ref{#1:eq:#2}}
+\renewcommand{\figref}[2][\labelprefix]{Figure~\ref{#1:fig:#2}}
 \newcommand{\partref}[1]{part~\ref{#1}}
 \newcommand{\Partref}[1]{Part~\ref{#1}}
-\renewcommand{\secref}[1]{section~\ref{\labelprefix:sec:#1}}
-\newcommand{\Secref}[1]{Section~\ref{\labelprefix:sec:#1}}
-\renewcommand{\tabref}[1]{Table~\ref{\labelprefix:tab:#1}}
+\renewcommand{\secref}[2][\labelprefix]{section~\ref{#1:sec:#2}}
+\newcommand{\Secref}[2][\labelprefix]{Section~\ref{#1:sec:#2}}
+\renewcommand{\tabref}[2][\labelprefix]{Table~\ref{#1:tab:#2}}