diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 821349f8e8739b3c54896f3af88d910a0a58decf..6f62a09cd6d6034c49082697ce190bed2073b5f9 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -12,20 +12,14 @@
 \newif\if@german%
 \DeclareOption{german}{%
 	\PassOptionsToPackage{ngerman}{babel}
-	\renewcaptionname{ngerman}{\figurename}{Abb.} %Figure
-	\renewcaptionname{ngerman}{\tablename}{Tab.} %Table
 	\@germantrue
 }
 \DeclareOption{ngerman}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
-	\renewcaptionname{ngerman}{\figurename}{Abb.} %Figure
-	\renewcaptionname{ngerman}{\tablename}{Tab.} %Table
 	\@germantrue
 }
 \DeclareOption{english}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
-	\renewcaptionname{english}{\figurename}{Fig.} %Figure
-	\renewcaptionname{english}{\tablename}{Tab.} %Table
 }
 \DeclareOption{f1}{%
 	\renewcommand{\HsHlogoPage}{2}
diff --git a/src/config.tex b/src/config.tex
index 06e533a6f97ba692698750f4758a181de51ccff7..2a4f58ea45dd925bde7a850f18cbd3ad58352e0e 100644
--- a/src/config.tex
+++ b/src/config.tex
@@ -1,4 +1,11 @@
-\renewcommand{\abstractname}{Abstract} % Abstract
+\if@german
+	\renewcommand{\abstractname}{Abstract} % Abstract
+	\renewcaptionname{ngerman}{\figurename}{Abb.} %Figure
+	\renewcaptionname{ngerman}{\tablename}{Tab.} %Table
+\else
+	\renewcaptionname{english}{\figurename}{Fig.} %Figure
+	\renewcaptionname{english}{\tablename}{Tab.} %Table
+\fi
 
 \ifx\KOMAScriptVersion\undefined\else % check if KOMA is used
 	\g@addto@macro\@floatboxreset\centering % center all floats