diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQueryColumnName.java b/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQueryColumnName.java
index 564c5d015..6820c2be7 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQueryColumnName.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQueryColumnName.java
@@ -1,11 +1,11 @@
 package pro.taskana.classification.api;
 
+import pro.taskana.classification.internal.ClassificationQueryMapper;
 import pro.taskana.common.api.QueryColumnName;
-import pro.taskana.workbasket.internal.WorkbasketQueryMapper;
 
 /**
  * Enum containing the column names for {@link
- * WorkbasketQueryMapper#queryClassificationColumnValues}.
+ * ClassificationQueryMapper#queryClassificationColumnValues}.
  *
  * @author jsa
  */
diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQueryColumnName.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQueryColumnName.java
index a8110c0d2..eef130f83 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQueryColumnName.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQueryColumnName.java
@@ -1,12 +1,10 @@
 package pro.taskana.task.api;
 
 import pro.taskana.common.api.QueryColumnName;
-import pro.taskana.workbasket.internal.WorkbasketQueryMapper;
+import pro.taskana.task.internal.TaskQueryMapper;
 
 /**
- * Enum containing the column names for {@link
- * WorkbasketQueryMapper#queryObjectReferenceColumnValues
- * (pro.taskana.impl.ObjectReferenceQueryImpl)}.
+ * Enum containing the column names for {@link TaskQueryMapper#queryObjectReferenceColumnValues}.
  *
  * @author jsa
  */
diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQueryColumnName.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQueryColumnName.java
index e8e64ed33..49a0ef5ef 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQueryColumnName.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQueryColumnName.java
@@ -2,11 +2,11 @@ package pro.taskana.task.api;
 
 import pro.taskana.common.api.QueryColumnName;
 import pro.taskana.task.internal.TaskQueryImpl;
-import pro.taskana.workbasket.internal.WorkbasketQueryMapper;
+import pro.taskana.task.internal.TaskQueryMapper;
 
 /**
  * Enum containing the column names for {@link
- * WorkbasketQueryMapper#queryTaskColumnValues(TaskQueryImpl)}.
+ * TaskQueryMapper#queryTaskColumnValues(TaskQueryImpl)}.
  *
  * @author jsa
  */
diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQueryColumnName.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQueryColumnName.java
index d35556e5a..e6df60d0a 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQueryColumnName.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQueryColumnName.java
@@ -4,8 +4,7 @@ import pro.taskana.common.api.QueryColumnName;
 import pro.taskana.workbasket.internal.WorkbasketQueryMapper;
 
 /**
- * Enum containing the column names for {@link WorkbasketQueryMapper#queryWorkbasketColumnValues
- * (pro.taskana.impl.WorkbasketQueryImpl)}.
+ * Enum containing the column names for {@link WorkbasketQueryMapper#queryWorkbasketColumnValues}.
  *
  * @author jsa
  */