diff --git a/uhhassignment.dtx b/uhhassignment.dtx
index e6b66f4..a50f6f5 100644
--- a/uhhassignment.dtx
+++ b/uhhassignment.dtx
@@ -19,7 +19,7 @@
 %<driver>\ProvidesFile{uhhassignment.dtx}
 %
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<class>\ProvidesClass{uhhassignment}[2017/04/22 v1.0 The UHH-Assignment Class]
+%<class>\ProvidesClass{uhhassignment}[2018/10/16 v1.0 The UHH-Assignment Class]
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage[utf8]{inputenc}
@@ -328,6 +328,8 @@
 %    \begin{macrocode}
 \def\uhhassignment@sheetid{Aufgabenblatt}
 \def\uhhassignment@groupid{Übungsgruppe}
+\def\uhhassignment@taskid{Aufgabe}
+\def\uhhassignment@subtaskid{Teilaufgabe}
 %    \end{macrocode}
 
 % \iffalse %%%%%%%%%%%%%%%%%%%
@@ -494,9 +496,9 @@
         \setcounter{task}{#1}%
     }%
     \ifstrempty{#2}{%
-        \section{Aufgabe \arabic{task}}%
+        \section{\uhhassignment@taskid{} \arabic{task}}%
     }{%
-        \section{Aufgabe \arabic{task}: #2}%
+        \section{\uhhassignment@taskid{} \arabic{task}: #2}%
     }%
 }
 %    \end{macrocode}
@@ -514,7 +516,7 @@
         \setcounter{subtask}{#1}%
     }%
     \ifstrempty{#2}{%
-        \subsection{Teilaufgabe \arabic{task}.\arabic{subtask}}%
+        \subsection{\uhhassignment@subtaskid{} \arabic{task}.\arabic{subtask}}%
     }{%
         \subsection{\arabic{task}.\arabic{subtask}. #2}%
     }%
@@ -665,7 +667,7 @@
             \def\titleright{}%
             \extendedfalse
         }{%
-            \def\metaleft{\uhhassignment@sheetid{} \@group}%
+            \def\metaleft{\uhhassignment@groupid{} \@group}%
             \def\metaright{\@teacher}%
             \def\titleright{\@date}%
         }%