diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java
index acee984d0..63a6f8775 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java
@@ -266,14 +266,14 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
   }
 
   @Override
-  public TaskHistoryQuery idIn(String... idIn) {
-    this.idIn = idIn;
+  public TaskHistoryQuery idIn(String... ids) {
+    this.idIn = ids;
     return this;
   }
 
   @Override
-  public TaskHistoryQuery businessProcessIdIn(String... businessProcessId) {
-    this.businessProcessIdIn = businessProcessId;
+  public TaskHistoryQuery businessProcessIdIn(String... businessProcessIds) {
+    this.businessProcessIdIn = businessProcessIds;
     return this;
   }
 
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQuery.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQuery.java
index 98e4e15a6..41b6bbd47 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQuery.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQuery.java
@@ -13,18 +13,18 @@ public interface ClassificationHistoryQuery
   /**
    * Add your Id to your query.
    *
-   * @param idIn as String
+   * @param idIns as String
    * @return the query
    */
-  ClassificationHistoryQuery idIn(String... idIn);
+  ClassificationHistoryQuery idIn(String... idIns);
 
   /**
    * Add your eventType to your query.
    *
-   * @param eventType as String
+   * @param eventTypes as String
    * @return the query
    */
-  ClassificationHistoryQuery eventTypeIn(String... eventType);
+  ClassificationHistoryQuery eventTypeIn(String... eventTypes);
 
   /**
    * Add your created TimeInterval to your query.
@@ -38,74 +38,74 @@ public interface ClassificationHistoryQuery
   /**
    * Add your userId to your query.
    *
-   * @param userId as String
+   * @param userIds as String
    * @return the query
    */
-  ClassificationHistoryQuery userIdIn(String... userId);
+  ClassificationHistoryQuery userIdIn(String... userIds);
 
   /**
    * Add your classificationId to your query.
    *
-   * @param classificationId as String
+   * @param classificationIds as String
    * @return the query
    */
-  ClassificationHistoryQuery classificationIdIn(String... classificationId);
+  ClassificationHistoryQuery classificationIdIn(String... classificationIds);
 
   /**
    * Add your applicationEntryPoint to your query.
    *
-   * @param applicationEntryPoint as String
+   * @param applicationEntryPoints as String
    * @return the query
    */
-  ClassificationHistoryQuery applicationEntryPointIn(String... applicationEntryPoint);
+  ClassificationHistoryQuery applicationEntryPointIn(String... applicationEntryPoints);
 
   /**
    * Add your category to your query.
    *
-   * @param category as String
+   * @param categories as String
    * @return the query
    */
-  ClassificationHistoryQuery categoryIn(String... category);
+  ClassificationHistoryQuery categoryIn(String... categories);
 
   /**
    * Add your domain to your query.
    *
-   * @param domain as String
+   * @param domains as String
    * @return the query
    */
-  ClassificationHistoryQuery domainIn(String... domain);
+  ClassificationHistoryQuery domainIn(String... domains);
 
   /**
    * Add your key to your query.
    *
-   * @param key as String
+   * @param keys as String
    * @return the query
    */
-  ClassificationHistoryQuery keyIn(String... key);
+  ClassificationHistoryQuery keyIn(String... keys);
 
   /**
    * Add your name to your query.
    *
-   * @param name as String
+   * @param names as String
    * @return the query
    */
-  ClassificationHistoryQuery nameIn(String... name);
+  ClassificationHistoryQuery nameIn(String... names);
 
   /**
    * Add your parentId to your query.
    *
-   * @param parentId as String
+   * @param parentIds as String
    * @return the query
    */
-  ClassificationHistoryQuery parentIdIn(String... parentId);
+  ClassificationHistoryQuery parentIdIn(String... parentIds);
 
   /**
    * Add your parentKey to your query.
    *
-   * @param parentKey as String
+   * @param parentKeys as String
    * @return the query
    */
-  ClassificationHistoryQuery parentKeyIn(String... parentKey);
+  ClassificationHistoryQuery parentKeyIn(String... parentKeys);
 
   /**
    * Add your priority to your query.
@@ -118,18 +118,18 @@ public interface ClassificationHistoryQuery
   /**
    * Add your serviceLevel to your query.
    *
-   * @param serviceLevelIn as String
+   * @param serviceLevels as String
    * @return the query
    */
-  ClassificationHistoryQuery serviceLevelIn(String... serviceLevelIn);
+  ClassificationHistoryQuery serviceLevelIn(String... serviceLevels);
 
   /**
    * Add your type to your query.
    *
-   * @param type as String
+   * @param types as String
    * @return the query
    */
-  ClassificationHistoryQuery typeIn(String... type);
+  ClassificationHistoryQuery typeIn(String... types);
 
   /**
    * Add the values of custom attributes for exact matching to your query.
@@ -145,109 +145,109 @@ public interface ClassificationHistoryQuery
    * Add your eventType to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param eventType as String
+   * @param eventTypes as String
    * @return the query
    */
-  ClassificationHistoryQuery eventTypeLike(String... eventType);
+  ClassificationHistoryQuery eventTypeLike(String... eventTypes);
 
   /**
    * Add your userId to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param userId as String
+   * @param userIds as String
    * @return the query
    */
-  ClassificationHistoryQuery userIdLike(String... userId);
+  ClassificationHistoryQuery userIdLike(String... userIds);
 
   /**
    * Add your classificationId to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param classificationId as String
+   * @param classificationIds as String
    * @return the query
    */
-  ClassificationHistoryQuery classificationIdLike(String... classificationId);
+  ClassificationHistoryQuery classificationIdLike(String... classificationIds);
 
   /**
    * Add your applicationEntryPoint to your query. It will be compared in SQL with an LIKE. If you
    * use a * wildcard like % then it will be transmitted to the database.
    *
-   * @param applicationEntryPointLike name of the applications entrypoint
+   * @param applicationEntryPoints name of the applications entrypoint
    * @return the query
    */
-  ClassificationHistoryQuery applicationEntryPointLike(String... applicationEntryPointLike);
+  ClassificationHistoryQuery applicationEntryPointLike(String... applicationEntryPoints);
 
   /**
    * Add your category to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param category as String
+   * @param categories as String
    * @return the query
    */
-  ClassificationHistoryQuery categoryLike(String... category);
+  ClassificationHistoryQuery categoryLike(String... categories);
 
   /**
    * Add your domain to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param domain as String
+   * @param domains as String
    * @return the query
    */
-  ClassificationHistoryQuery domainLike(String... domain);
+  ClassificationHistoryQuery domainLike(String... domains);
 
   /**
    * Add your key to your query. It will be compared in SQL with an LIKE. If you use a wildcard like
    * % then it will be transmitted to the database.
    *
-   * @param key as String
+   * @param keys as String
    * @return the query
    */
-  ClassificationHistoryQuery keyLike(String... key);
+  ClassificationHistoryQuery keyLike(String... keys);
 
   /**
    * Add your name to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param name as String
+   * @param names as String
    * @return the query
    */
-  ClassificationHistoryQuery nameLike(String... name);
+  ClassificationHistoryQuery nameLike(String... names);
 
   /**
    * Add your parentId to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param parentId as String
+   * @param parentIds as String
    * @return the query
    */
-  ClassificationHistoryQuery parentIdLike(String... parentId);
+  ClassificationHistoryQuery parentIdLike(String... parentIds);
 
   /**
    * Add your parentKey to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param parentKey as String
+   * @param parentKeys as String
    * @return the query
    */
-  ClassificationHistoryQuery parentKeyLike(String... parentKey);
+  ClassificationHistoryQuery parentKeyLike(String... parentKeys);
 
   /**
    * Add your serviceLevel to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param serviceLevel as String
+   * @param serviceLevels as String
    * @return the query
    */
-  ClassificationHistoryQuery serviceLevelLike(String... serviceLevel);
+  ClassificationHistoryQuery serviceLevelLike(String... serviceLevels);
 
   /**
    * Add your type to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param type as String
+   * @param types as String
    * @return the query
    */
-  ClassificationHistoryQuery typeLike(String... type);
+  ClassificationHistoryQuery typeLike(String... types);
 
   /**
    * Add the values of custom attributes for pattern matching to your query. They will be compared
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java
index a0b67e43e..4e722e270 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java
@@ -11,42 +11,42 @@ public interface TaskHistoryQuery extends BaseQuery<TaskHistoryEvent, TaskHistor
   /**
    * Add your Id to your query.
    *
-   * @param idIn as String
+   * @param ids as String
    * @return the query
    */
-  TaskHistoryQuery idIn(String... idIn);
+  TaskHistoryQuery idIn(String... ids);
 
   /**
    * Add your businessProcessId to your query.
    *
-   * @param businessProcessId as String
+   * @param businessProcessIds as String
    * @return the query
    */
-  TaskHistoryQuery businessProcessIdIn(String... businessProcessId);
+  TaskHistoryQuery businessProcessIdIn(String... businessProcessIds);
 
   /**
    * Add your parentBusinessProcessId to your query.
    *
-   * @param parentBusinessProcessId as String
+   * @param parentBusinessProcessIds as String
    * @return the query
    */
-  TaskHistoryQuery parentBusinessProcessIdIn(String... parentBusinessProcessId);
+  TaskHistoryQuery parentBusinessProcessIdIn(String... parentBusinessProcessIds);
 
   /**
    * Add your taskId to your query.
    *
-   * @param taskId as String
+   * @param taskIds as String
    * @return the query
    */
-  TaskHistoryQuery taskIdIn(String... taskId);
+  TaskHistoryQuery taskIdIn(String... taskIds);
 
   /**
    * Add your eventType to your query.
    *
-   * @param eventType as String
+   * @param eventTypes as String
    * @return the query
    */
-  TaskHistoryQuery eventTypeIn(String... eventType);
+  TaskHistoryQuery eventTypeIn(String... eventTypes);
 
   /**
    * Add your created TimeInterval to your query.
@@ -60,241 +60,241 @@ public interface TaskHistoryQuery extends BaseQuery<TaskHistoryEvent, TaskHistor
   /**
    * Add your userId to your query.
    *
-   * @param userId as String
+   * @param userIds as String
    * @return the query
    */
-  TaskHistoryQuery userIdIn(String... userId);
+  TaskHistoryQuery userIdIn(String... userIds);
 
   /**
    * Add your domain to your query.
    *
-   * @param domain as String
+   * @param domains as String
    * @return the query
    */
-  TaskHistoryQuery domainIn(String... domain);
+  TaskHistoryQuery domainIn(String... domains);
 
   /**
    * Add your workbasketKey to your query.
    *
-   * @param workbasketKey as String
+   * @param workbasketKeys as String
    * @return the query
    */
-  TaskHistoryQuery workbasketKeyIn(String... workbasketKey);
+  TaskHistoryQuery workbasketKeyIn(String... workbasketKeys);
 
   /**
    * Add your porCompany to your query.
    *
-   * @param porCompany as String
+   * @param porCompanies as String
    * @return the query
    */
-  TaskHistoryQuery porCompanyIn(String... porCompany);
+  TaskHistoryQuery porCompanyIn(String... porCompanies);
 
   /**
    * Add your porSystem to your query.
    *
-   * @param porSystem as String
+   * @param porSystems as String
    * @return the query
    */
-  TaskHistoryQuery porSystemIn(String... porSystem);
+  TaskHistoryQuery porSystemIn(String... porSystems);
 
   /**
    * Add your porInstance to your query.
    *
-   * @param porInstance as String
+   * @param porInstances as String
    * @return the query
    */
-  TaskHistoryQuery porInstanceIn(String... porInstance);
+  TaskHistoryQuery porInstanceIn(String... porInstances);
 
   /**
    * Add your porType to your query.
    *
-   * @param porType as String
+   * @param porTypes as String
    * @return the query
    */
-  TaskHistoryQuery porTypeIn(String... porType);
+  TaskHistoryQuery porTypeIn(String... porTypes);
 
   /**
    * Add your porValue to your query.
    *
-   * @param porValue as String
+   * @param porValues as String
    * @return the query
    */
-  TaskHistoryQuery porValueIn(String... porValue);
+  TaskHistoryQuery porValueIn(String... porValues);
 
   /**
    * Add your taskClassificationKey to your query.
    *
-   * @param taskClassificationKey as String
+   * @param taskClassificationKeys as String
    * @return the query
    */
-  TaskHistoryQuery taskClassificationKeyIn(String... taskClassificationKey);
+  TaskHistoryQuery taskClassificationKeyIn(String... taskClassificationKeys);
 
   /**
    * Add your taskClassificationCategory to your query.
    *
-   * @param taskClassificationCategory as String
+   * @param taskClassificationCategories as String
    * @return the query
    */
-  TaskHistoryQuery taskClassificationCategoryIn(String... taskClassificationCategory);
+  TaskHistoryQuery taskClassificationCategoryIn(String... taskClassificationCategories);
 
   /**
    * Add your attachmentClassificationKey to your query.
    *
-   * @param attachmentClassificationKey as String
+   * @param attachmentClassificationKeys as String
    * @return the query
    */
-  TaskHistoryQuery attachmentClassificationKeyIn(String... attachmentClassificationKey);
+  TaskHistoryQuery attachmentClassificationKeyIn(String... attachmentClassificationKeys);
 
   /**
    * Add your oldValue to your query.
    *
-   * @param oldValue as String
+   * @param oldValues as String
    * @return the query
    */
-  TaskHistoryQuery oldValueIn(String... oldValue);
+  TaskHistoryQuery oldValueIn(String... oldValues);
 
   /**
    * Add your newValue to your query.
    *
-   * @param newValue as String
+   * @param newValues as String
    * @return the query
    */
-  TaskHistoryQuery newValueIn(String... newValue);
+  TaskHistoryQuery newValueIn(String... newValues);
 
   /**
    * Add your businessProcessId to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param businessProcessId as String
+   * @param businessProcessIds as String
    * @return the query
    */
-  TaskHistoryQuery businessProcessIdLike(String... businessProcessId);
+  TaskHistoryQuery businessProcessIdLike(String... businessProcessIds);
 
   /**
    * Add your parentBusinessProcessId to your query. It will be compared in SQL with an LIKE. If you
    * use a wildcard like % then it will be transmitted to the database.
    *
-   * @param parentBusinessProcessId as String
+   * @param parentBusinessProcessIds as String
    * @return the query
    */
-  TaskHistoryQuery parentBusinessProcessIdLike(String... parentBusinessProcessId);
+  TaskHistoryQuery parentBusinessProcessIdLike(String... parentBusinessProcessIds);
 
   /**
    * Add your taskId to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param taskId as String
+   * @param taskIds as String
    * @return the query
    */
-  TaskHistoryQuery taskIdLike(String... taskId);
+  TaskHistoryQuery taskIdLike(String... taskIds);
 
   /**
    * Add your eventType to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param eventType as String
+   * @param eventTypes as Strings
    * @return the query
    */
-  TaskHistoryQuery eventTypeLike(String... eventType);
+  TaskHistoryQuery eventTypeLike(String... eventTypes);
 
   /**
    * Add your userId to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param userId as String
+   * @param userIds as String
    * @return the query
    */
-  TaskHistoryQuery userIdLike(String... userId);
+  TaskHistoryQuery userIdLike(String... userIds);
 
   /**
    * Add your domain to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param domain as String
+   * @param domains as String
    * @return the query
    */
-  TaskHistoryQuery domainLike(String... domain);
+  TaskHistoryQuery domainLike(String... domains);
 
   /**
    * Add your workbasketKey to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param workbasketKey as String
+   * @param workbasketKeys as String
    * @return the query
    */
-  TaskHistoryQuery workbasketKeyLike(String... workbasketKey);
+  TaskHistoryQuery workbasketKeyLike(String... workbasketKeys);
 
   /**
    * Add your porCompany to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param porCompany as String
+   * @param porCompanies as String
    * @return the query
    */
-  TaskHistoryQuery porCompanyLike(String... porCompany);
+  TaskHistoryQuery porCompanyLike(String... porCompanies);
 
   /**
    * Add your porSystem to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param porSystem as String
+   * @param porSystems as String
    * @return the query
    */
-  TaskHistoryQuery porSystemLike(String... porSystem);
+  TaskHistoryQuery porSystemLike(String... porSystems);
 
   /**
    * Add your porInstance to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param porInstance as String
+   * @param porInstances as String
    * @return the query
    */
-  TaskHistoryQuery porInstanceLike(String... porInstance);
+  TaskHistoryQuery porInstanceLike(String... porInstances);
 
   /**
    * Add your porType to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param porType as String
+   * @param porTypes as String
    * @return the query
    */
-  TaskHistoryQuery porTypeLike(String... porType);
+  TaskHistoryQuery porTypeLike(String... porTypes);
 
   /**
    * Add your porValue to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param porValue as String
+   * @param porValues as String
    * @return the query
    */
-  TaskHistoryQuery porValueLike(String... porValue);
+  TaskHistoryQuery porValueLike(String... porValues);
 
   /**
    * Add your taskClassificationKey to your query. It will be compared in SQL with an LIKE. If you
    * use a wildcard like % then it will be transmitted to the database.
    *
-   * @param taskClassificationKey as String
+   * @param taskClassificationKeys as String
    * @return the query
    */
-  TaskHistoryQuery taskClassificationKeyLike(String... taskClassificationKey);
+  TaskHistoryQuery taskClassificationKeyLike(String... taskClassificationKeys);
 
   /**
    * Add your taskClassificationCategory to your query. It will be compared in SQL with an LIKE. If
    * you use a wildcard like % then it will be transmitted to the database.
    *
-   * @param taskClassificationCategory as String
+   * @param taskClassificationCategories as String
    * @return the query
    */
-  TaskHistoryQuery taskClassificationCategoryLike(String... taskClassificationCategory);
+  TaskHistoryQuery taskClassificationCategoryLike(String... taskClassificationCategories);
 
   /**
    * Add your attachmentClassificationKey to your query. It will be compared in SQL with an LIKE. If
    * you use a wildcard like % then it will be transmitted to the database.
    *
-   * @param attachmentClassificationKey as String
+   * @param attachmentClassificationKeys as String
    * @return the query
    */
-  TaskHistoryQuery attachmentClassificationKeyLike(String... attachmentClassificationKey);
+  TaskHistoryQuery attachmentClassificationKeyLike(String... attachmentClassificationKeys);
 
   /**
    * Add your oldValue to your query. It will be compared in SQL with an LIKE. If you use a wildcard
@@ -309,10 +309,10 @@ public interface TaskHistoryQuery extends BaseQuery<TaskHistoryEvent, TaskHistor
    * Add your newValue to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param newValue as String
+   * @param newValues as String
    * @return the query
    */
-  TaskHistoryQuery newValueLike(String... newValue);
+  TaskHistoryQuery newValueLike(String... newValues);
 
   /**
    * Add the values of custom attributes for exact matching to your query.
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java
index 3083dbb4f..e10bd3e5d 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java
@@ -13,26 +13,26 @@ public interface WorkbasketHistoryQuery
   /**
    * Add your Id to your query.
    *
-   * @param idIn as String
+   * @param ids as String
    * @return the query
    */
-  WorkbasketHistoryQuery idIn(String... idIn);
+  WorkbasketHistoryQuery idIn(String... ids);
 
   /**
    * Add your workbasketId to your query.
    *
-   * @param workbasketId as String
+   * @param workbasketIds as String
    * @return the query
    */
-  WorkbasketHistoryQuery workbasketIdIn(String... workbasketId);
+  WorkbasketHistoryQuery workbasketIdIn(String... workbasketIds);
 
   /**
    * Add your eventType to your query.
    *
-   * @param eventType as String
+   * @param eventTypes as String
    * @return the query
    */
-  WorkbasketHistoryQuery eventTypeIn(String... eventType);
+  WorkbasketHistoryQuery eventTypeIn(String... eventTypes);
 
   /**
    * Add your created TimeInterval to your query.
@@ -46,74 +46,74 @@ public interface WorkbasketHistoryQuery
   /**
    * Add your userId to your query.
    *
-   * @param userId as String
+   * @param userIds as String
    * @return the query
    */
-  WorkbasketHistoryQuery userIdIn(String... userId);
+  WorkbasketHistoryQuery userIdIn(String... userIds);
 
   /**
    * Add your domain to your query.
    *
-   * @param domain as String
+   * @param domains as String
    * @return the query
    */
-  WorkbasketHistoryQuery domainIn(String... domain);
+  WorkbasketHistoryQuery domainIn(String... domains);
 
   /**
    * Add your workbasketKey to your query.
    *
-   * @param workbasketKey as String
+   * @param workbasketKeys as String
    * @return the query
    */
-  WorkbasketHistoryQuery keyIn(String... workbasketKey);
+  WorkbasketHistoryQuery keyIn(String... workbasketKeys);
 
   /**
-   * Add your workbasketType to your query.
+   * Add your workbasketTypes to your query.
    *
-   * @param workbasketType as String
+   * @param workbasketTypes as String
    * @return the query
    */
-  WorkbasketHistoryQuery typeIn(String... workbasketType);
+  WorkbasketHistoryQuery typeIn(String... workbasketTypes);
 
   /**
    * Add your owner to your query.
    *
-   * @param owner as String
+   * @param owners as String
    * @return the query
    */
-  WorkbasketHistoryQuery ownerIn(String... owner);
+  WorkbasketHistoryQuery ownerIn(String... owners);
 
   /**
    * Add your orgLevel1 to your query.
    *
-   * @param orgLevel1 as String
+   * @param orgLevels1 as String
    * @return the query
    */
-  WorkbasketHistoryQuery orgLevel1In(String... orgLevel1);
+  WorkbasketHistoryQuery orgLevel1In(String... orgLevels1);
+
+  /**
+   * Add your orgLevel2 to your query.
+   *
+   * @param orgLevels2 as String
+   * @return the query
+   */
+  WorkbasketHistoryQuery orgLevel2In(String... orgLevels2);
 
   /**
    * Add your orgLevel1 to your query.
    *
-   * @param orgLevel2 as String
+   * @param orgLevels3 as String
    * @return the query
    */
-  WorkbasketHistoryQuery orgLevel2In(String... orgLevel2);
+  WorkbasketHistoryQuery orgLevel3In(String... orgLevels3);
 
   /**
    * Add your orgLevel1 to your query.
    *
-   * @param orgLevel3 as String
+   * @param orgLevels4 as String
    * @return the query
    */
-  WorkbasketHistoryQuery orgLevel3In(String... orgLevel3);
-
-  /**
-   * Add your orgLevel1 to your query.
-   *
-   * @param orgLevel4 as String
-   * @return the query
-   */
-  WorkbasketHistoryQuery orgLevel4In(String... orgLevel4);
+  WorkbasketHistoryQuery orgLevel4In(String... orgLevels4);
 
   /**
    * Add the values of custom attributes for exact matching to your query.
@@ -141,100 +141,100 @@ public interface WorkbasketHistoryQuery
    * Add your workbasketId to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param workbasketId as String
+   * @param workbasketIds as String
    * @return the query
    */
-  WorkbasketHistoryQuery workbasketIdLike(String... workbasketId);
+  WorkbasketHistoryQuery workbasketIdLike(String... workbasketIds);
 
   /**
    * Add your eventType to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param eventType as String
+   * @param eventTypes as String
    * @return the query
    */
-  WorkbasketHistoryQuery eventTypeLike(String... eventType);
+  WorkbasketHistoryQuery eventTypeLike(String... eventTypes);
 
   /**
    * Add your userId to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param userId as String
+   * @param userIds as String
    * @return the query
    */
-  WorkbasketHistoryQuery userIdLike(String... userId);
+  WorkbasketHistoryQuery userIdLike(String... userIds);
 
   /**
    * Add your domain to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param domain as String
+   * @param domains as String
    * @return the query
    */
-  WorkbasketHistoryQuery domainLike(String... domain);
+  WorkbasketHistoryQuery domainLike(String... domains);
 
   /**
    * Add your workbasketKey to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param workbasketKey as String
+   * @param workbasketKeys as String
    * @return the query
    */
-  WorkbasketHistoryQuery workbasketKeyLike(String... workbasketKey);
+  WorkbasketHistoryQuery workbasketKeyLike(String... workbasketKeys);
 
   /**
    * Add your workbasketType to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param workbasketType as String
+   * @param workbasketTypes as String
    * @return the query
    */
-  WorkbasketHistoryQuery workbasketTypeLike(String... workbasketType);
+  WorkbasketHistoryQuery workbasketTypeLike(String... workbasketTypes);
 
   /**
    * Add your owner to your query. It will be compared in SQL with an LIKE. If you use a wildcard
    * like % then it will be transmitted to the database.
    *
-   * @param owner as String
+   * @param owners as String
    * @return the query
    */
-  WorkbasketHistoryQuery ownerLike(String... owner);
+  WorkbasketHistoryQuery ownerLike(String... owners);
 
   /**
    * Add your orgLevel1 to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param orgLevel1 as String
+   * @param orgLevels1 as String
    * @return the query
    */
-  WorkbasketHistoryQuery orgLevel1Like(String... orgLevel1);
+  WorkbasketHistoryQuery orgLevel1Like(String... orgLevels1);
 
   /**
    * Add your orgLevel2 to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param orgLevel2 as String
+   * @param orgLevels2 as String
    * @return the query
    */
-  WorkbasketHistoryQuery orgLevel2Like(String... orgLevel2);
+  WorkbasketHistoryQuery orgLevel2Like(String... orgLevels2);
 
   /**
    * Add your orgLevel3 to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param orgLevel3 as String
+   * @param orgLevels3 as String
    * @return the query
    */
-  WorkbasketHistoryQuery orgLevel3Like(String... orgLevel3);
+  WorkbasketHistoryQuery orgLevel3Like(String... orgLevels3);
 
   /**
    * Add your orgLevel4 to your query. It will be compared in SQL with an LIKE. If you use a
    * wildcard like % then it will be transmitted to the database.
    *
-   * @param orgLevel4 as String
+   * @param orgLevels4 as String
    * @return the query
    */
-  WorkbasketHistoryQuery orgLevel4Like(String... orgLevel4);
+  WorkbasketHistoryQuery orgLevel4Like(String... orgLevels4);
 
   /**
    * Sort the query result by workbasketId.
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java b/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java
index f6866483a..89ba74cdd 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java
@@ -17,64 +17,64 @@ public interface ClassificationQuery
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getKey() key} equal to any of the passed values.
    *
-   * @param key the values of interest
+   * @param keys the values of interest
    * @return the query
    */
-  ClassificationQuery keyIn(String... key);
+  ClassificationQuery keyIn(String... keys);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have an {@linkplain
    * Classification#getId() id} equal to any of the passed values.
    *
-   * @param id the values of interest
+   * @param ids the values of interest
    * @return the query
    */
-  ClassificationQuery idIn(String... id);
+  ClassificationQuery idIn(String... ids);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getParentId() parentId} equal to any of the passed values.
    *
-   * @param parentId the values of interest
+   * @param parentIds the values of interest
    * @return the query
    */
-  ClassificationQuery parentIdIn(String... parentId);
+  ClassificationQuery parentIdIn(String... parentIds);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getParentKey() parentKey} equal to any of the passed values.
    *
-   * @param parentKey the values of interest
+   * @param parentKeys the values of interest
    * @return the query
    */
-  ClassificationQuery parentKeyIn(String... parentKey);
+  ClassificationQuery parentKeyIn(String... parentKeys);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getCategory() category} equal to any of the passed values.
    *
-   * @param category the values of interest
+   * @param categories the values of interest
    * @return the query
    */
-  ClassificationQuery categoryIn(String... category);
+  ClassificationQuery categoryIn(String... categories);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getType() type} equal to any of the passed values.
    *
-   * @param type the values of interest
+   * @param types the values of interest
    * @return the query
    */
-  ClassificationQuery typeIn(String... type);
+  ClassificationQuery typeIn(String... types);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getDomain() domain} equal to any of the passed values.
    *
-   * @param domain the values of interest
+   * @param domains the values of interest
    * @return the query
    */
-  ClassificationQuery domainIn(String... domain);
+  ClassificationQuery domainIn(String... domains);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
@@ -109,10 +109,10 @@ public interface ClassificationQuery
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getName() name} equal to any of the passed values.
    *
-   * @param nameIn the values of interest
+   * @param names the values of interest
    * @return the query
    */
-  ClassificationQuery nameIn(String... nameIn);
+  ClassificationQuery nameIn(String... names);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
@@ -123,24 +123,24 @@ public interface ClassificationQuery
    *
    * <p>Not using any wildcard will compute an exact match.
    *
-   * @param nameLike the patterns of interest
+   * @param names the patterns of interest
    * @return the query
    */
-  ClassificationQuery nameLike(String... nameLike);
+  ClassificationQuery nameLike(String... names);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
-   * Classification#getDescription() description} value that matches any of the passed patterns.
+   * Classification#getDescription() description} value that matches the passed pattern.
    *
    * <p>Behind this method the SQL LIKE operator is used. SQL LIKE wildcard characters will be
    * resolved correctly.
    *
    * <p>Not using any wildcard will compute an exact match.
    *
-   * @param descriptionLike the patterns of interest
+   * @param description the pattern of interest
    * @return the query
    */
-  ClassificationQuery descriptionLike(String descriptionLike);
+  ClassificationQuery descriptionLike(String description);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
@@ -155,10 +155,10 @@ public interface ClassificationQuery
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getServiceLevel() serviceLevel} equal to any of the passed values.
    *
-   * @param serviceLevelIn the values of interest
+   * @param serviceLevels the values of interest
    * @return the query
    */
-  ClassificationQuery serviceLevelIn(String... serviceLevelIn);
+  ClassificationQuery serviceLevelIn(String... serviceLevels);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
@@ -169,20 +169,20 @@ public interface ClassificationQuery
    *
    * <p>Not using any wildcard will compute an exact match.
    *
-   * @param serviceLevelLike the patterns of interest
+   * @param serviceLevels the patterns of interest
    * @return the query
    */
-  ClassificationQuery serviceLevelLike(String... serviceLevelLike);
+  ClassificationQuery serviceLevelLike(String... serviceLevels);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
    * Classification#getApplicationEntryPoint() applicationEntryPoint} equal to any of the passed
    * values.
    *
-   * @param applicationEntryPointIn the values of interest
+   * @param applicationEntryPoints the values of interest
    * @return the query
    */
-  ClassificationQuery applicationEntryPointIn(String... applicationEntryPointIn);
+  ClassificationQuery applicationEntryPointIn(String... applicationEntryPoints);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have a {@linkplain
@@ -194,10 +194,10 @@ public interface ClassificationQuery
    *
    * <p>Not using any wildcard will compute an exact match.
    *
-   * @param applicationEntryPointLike the patterns of interest
+   * @param applicationEntryPoints the patterns of interest
    * @return the query
    */
-  ClassificationQuery applicationEntryPointLike(String... applicationEntryPointLike);
+  ClassificationQuery applicationEntryPointLike(String... applicationEntryPoints);
 
   /**
    * Selects only {@linkplain Classification Classifications} which have the specified {@linkplain
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java
index 688930cb8..4b8647ad7 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java
@@ -73,44 +73,44 @@ public class ClassificationQueryImpl implements ClassificationQuery {
   }
 
   @Override
-  public ClassificationQuery keyIn(String... key) {
-    this.key = key;
+  public ClassificationQuery keyIn(String... keys) {
+    this.key = keys;
     return this;
   }
 
   @Override
-  public ClassificationQuery idIn(String... id) {
-    this.idIn = id;
+  public ClassificationQuery idIn(String... ids) {
+    this.idIn = ids;
     return this;
   }
 
   @Override
-  public ClassificationQuery parentIdIn(String... parentId) {
-    this.parentId = parentId;
+  public ClassificationQuery parentIdIn(String... parentIds) {
+    this.parentId = parentIds;
     return this;
   }
 
   @Override
-  public ClassificationQuery parentKeyIn(String... parentKey) {
-    this.parentKey = parentKey;
+  public ClassificationQuery parentKeyIn(String... parentKeys) {
+    this.parentKey = parentKeys;
     return this;
   }
 
   @Override
-  public ClassificationQuery categoryIn(String... category) {
-    this.category = category;
+  public ClassificationQuery categoryIn(String... categories) {
+    this.category = categories;
     return this;
   }
 
   @Override
-  public ClassificationQuery typeIn(String... type) {
-    this.type = type;
+  public ClassificationQuery typeIn(String... types) {
+    this.type = types;
     return this;
   }
 
   @Override
-  public ClassificationQuery domainIn(String... domain) {
-    this.domain = domain;
+  public ClassificationQuery domainIn(String... domains) {
+    this.domain = domains;
     return this;
   }
 
@@ -135,20 +135,20 @@ public class ClassificationQueryImpl implements ClassificationQuery {
   }
 
   @Override
-  public ClassificationQuery nameIn(String... nameIn) {
-    this.nameIn = nameIn;
+  public ClassificationQuery nameIn(String... names) {
+    this.nameIn = names;
     return this;
   }
 
   @Override
-  public ClassificationQuery nameLike(String... nameLike) {
-    this.nameLike = toLowerCopy(nameLike);
+  public ClassificationQuery nameLike(String... names) {
+    this.nameLike = toLowerCopy(names);
     return this;
   }
 
   @Override
-  public ClassificationQuery descriptionLike(String description) {
-    this.descriptionLike = description.toLowerCase();
+  public ClassificationQuery descriptionLike(String descriptions) {
+    this.descriptionLike = descriptions.toLowerCase();
     return this;
   }
 
@@ -159,61 +159,61 @@ public class ClassificationQueryImpl implements ClassificationQuery {
   }
 
   @Override
-  public ClassificationQuery serviceLevelIn(String... serviceLevelIn) {
-    this.serviceLevelIn = serviceLevelIn;
+  public ClassificationQuery serviceLevelIn(String... serviceLevels) {
+    this.serviceLevelIn = serviceLevels;
     return this;
   }
 
   @Override
-  public ClassificationQuery serviceLevelLike(String... serviceLevelLike) {
-    this.serviceLevelLike = toLowerCopy(serviceLevelLike);
+  public ClassificationQuery serviceLevelLike(String... serviceLevels) {
+    this.serviceLevelLike = toLowerCopy(serviceLevels);
     return this;
   }
 
   @Override
-  public ClassificationQuery applicationEntryPointIn(String... applicationEntryPointIn) {
-    this.applicationEntryPointIn = applicationEntryPointIn;
+  public ClassificationQuery applicationEntryPointIn(String... applicationEntryPoints) {
+    this.applicationEntryPointIn = applicationEntryPoints;
     return this;
   }
 
   @Override
-  public ClassificationQuery applicationEntryPointLike(String... applicationEntryPointLike) {
-    this.applicationEntryPointLike = toLowerCopy(applicationEntryPointLike);
+  public ClassificationQuery applicationEntryPointLike(String... applicationEntryPoints) {
+    this.applicationEntryPointLike = toLowerCopy(applicationEntryPoints);
     return this;
   }
 
   @Override
   public ClassificationQuery customAttributeIn(
-      ClassificationCustomField customField, String... customIn) throws InvalidArgumentException {
-    if (customIn.length == 0) {
+      ClassificationCustomField customField, String... values) throws InvalidArgumentException {
+    if (values.length == 0) {
       throw new InvalidArgumentException(
           "At least one string has to be provided as a search parameter");
     }
 
     switch (customField) {
       case CUSTOM_1:
-        this.custom1In = customIn;
+        this.custom1In = values;
         break;
       case CUSTOM_2:
-        this.custom2In = customIn;
+        this.custom2In = values;
         break;
       case CUSTOM_3:
-        this.custom3In = customIn;
+        this.custom3In = values;
         break;
       case CUSTOM_4:
-        this.custom4In = customIn;
+        this.custom4In = values;
         break;
       case CUSTOM_5:
-        this.custom5In = customIn;
+        this.custom5In = values;
         break;
       case CUSTOM_6:
-        this.custom6In = customIn;
+        this.custom6In = values;
         break;
       case CUSTOM_7:
-        this.custom7In = customIn;
+        this.custom7In = values;
         break;
       case CUSTOM_8:
-        this.custom8In = customIn;
+        this.custom8In = values;
         break;
       default:
         throw new SystemException("Unknown customField '" + customField + "'");
@@ -224,36 +224,36 @@ public class ClassificationQueryImpl implements ClassificationQuery {
 
   @Override
   public ClassificationQuery customAttributeLike(
-      ClassificationCustomField customField, String... customLike) throws InvalidArgumentException {
-    if (customLike.length == 0) {
+      ClassificationCustomField customField, String... values) throws InvalidArgumentException {
+    if (values.length == 0) {
       throw new InvalidArgumentException(
           "At least one string has to be provided as a search parameter");
     }
 
     switch (customField) {
       case CUSTOM_1:
-        this.custom1Like = toLowerCopy(customLike);
+        this.custom1Like = toLowerCopy(values);
         break;
       case CUSTOM_2:
-        this.custom2Like = toLowerCopy(customLike);
+        this.custom2Like = toLowerCopy(values);
         break;
       case CUSTOM_3:
-        this.custom3Like = toLowerCopy(customLike);
+        this.custom3Like = toLowerCopy(values);
         break;
       case CUSTOM_4:
-        this.custom4Like = toLowerCopy(customLike);
+        this.custom4Like = toLowerCopy(values);
         break;
       case CUSTOM_5:
-        this.custom5Like = toLowerCopy(customLike);
+        this.custom5Like = toLowerCopy(values);
         break;
       case CUSTOM_6:
-        this.custom6Like = toLowerCopy(customLike);
+        this.custom6Like = toLowerCopy(values);
         break;
       case CUSTOM_7:
-        this.custom7Like = toLowerCopy(customLike);
+        this.custom7Like = toLowerCopy(values);
         break;
       case CUSTOM_8:
-        this.custom8Like = toLowerCopy(customLike);
+        this.custom8Like = toLowerCopy(values);
         break;
       default:
         throw new SystemException("Unknown customField '" + customField + "'");
diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java
index bba7ab62a..bb93b966e 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java
@@ -18,18 +18,18 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
   /**
    * Filter for summaries which contain one of the given taskIds.
    *
-   * @param taskIds The ids of the searched-for tasks.
+   * @param ids The ids of the searched-for tasks.
    * @return the taskQuery
    */
-  TaskQuery idIn(String... taskIds);
+  TaskQuery idIn(String... ids);
 
   /**
    * Exclude summaries which contain one of the given taskIds.
    *
-   * @param taskIds The ids of the searched-for tasks.
+   * @param ids The ids of the searched-for tasks.
    * @return the taskQuery
    */
-  TaskQuery idNotIn(String... taskIds);
+  TaskQuery idNotIn(String... ids);
 
   /**
    * This method sorts the query result according to the primary task id.
@@ -415,20 +415,20 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * LIKE operator. You may use a wildcard like % to specify the pattern. If you specify multiple
    * arguments they are combined with the OR keyword.
    *
-   * @param note your custom note
+   * @param notes your custom notes
    * @return the query
    */
-  TaskQuery noteLike(String... note);
+  TaskQuery noteLike(String... notes);
 
   /**
    * Exclude your custom note for pattern matching from your query. It will be compared in SQL with
    * the LIKE operator. You may use a wildcard like % to specify the pattern. If you specify
    * multiple arguments they are combined with the OR keyword.
    *
-   * @param note your custom note
+   * @param notes your custom notes
    * @return the query
    */
-  TaskQuery noteNotLike(String... note);
+  TaskQuery noteNotLike(String... notes);
 
   /**
    * This method sorts the query result according to the note.
@@ -447,20 +447,20 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * LIKE operator. You may use a wildcard like % to specify the pattern. If you specify multiple
    * arguments they are combined with the OR keyword.
    *
-   * @param description your description
+   * @param descriptions your descriptions
    * @return the query
    */
-  TaskQuery descriptionLike(String... description);
+  TaskQuery descriptionLike(String... descriptions);
 
   /**
    * Exclude your description for pattern matching from your query. It will be compared in SQL with
    * the LIKE operator. You may use a wildcard like % to specify the pattern. If you specify
    * multiple arguments they are combined with the OR keyword.
    *
-   * @param description your description
+   * @param descriptions your descriptions
    * @return the query
    */
-  TaskQuery descriptionNotLike(String... description);
+  TaskQuery descriptionNotLike(String... descriptions);
 
   // endregion
   // region priority
@@ -942,20 +942,20 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * compared in SQL with the LIKE operator. You may use a wildcard like % to specify the pattern.
    * If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param company the company of your primary object reference
+   * @param companies the companies of your primary object reference
    * @return the query
    */
-  TaskQuery primaryObjectReferenceCompanyLike(String... company);
+  TaskQuery primaryObjectReferenceCompanyLike(String... companies);
 
   /**
    * Exclude the company of the primary object reference for pattern matching from your query. It
    * will be compared in SQL with the LIKE operator. You may use a wildcard like % to specify the
    * pattern. If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param company the company of your primary object reference
+   * @param companies the companies of your primary object reference
    * @return the query
    */
-  TaskQuery primaryObjectReferenceCompanyNotLike(String... company);
+  TaskQuery primaryObjectReferenceCompanyNotLike(String... companies);
 
   /**
    * This method sorts the query result according to the company of the primary object reference.
@@ -1190,20 +1190,20 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
   /**
    * Add the attachment classification Ids for exact matching to your query.
    *
-   * @param attachmentClassificationId the attachmentClassificationId values of the searched for
+   * @param attachmentClassificationIds the attachmentClassificationId values of the searched for
    *     tasks
    * @return the query
    */
-  TaskQuery attachmentClassificationIdIn(String... attachmentClassificationId);
+  TaskQuery attachmentClassificationIdIn(String... attachmentClassificationIds);
 
   /**
    * Exclude the attachment classification Ids for exact matching from your query.
    *
-   * @param attachmentClassificationId the attachmentClassificationId values of the searched for
+   * @param attachmentClassificationIds the attachmentClassificationId values of the searched for
    *     tasks
    * @return the query
    */
-  TaskQuery attachmentClassificationIdNotIn(String... attachmentClassificationId);
+  TaskQuery attachmentClassificationIdNotIn(String... attachmentClassificationIds);
 
   /**
    * This method sorts the query result according to the attachment classification id. (Should only
@@ -1241,22 +1241,22 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * in SQL with the LIKE operator. You may use a wildcard like % to specify the pattern. If you
    * specify multiple arguments they are combined with the OR keyword.
    *
-   * @param attachmentClassificationKey the attachmentClassificationKeys values of the searched for
+   * @param attachmentClassificationKeys the attachmentClassificationKey values of the searched for
    *     tasks
    * @return the query
    */
-  TaskQuery attachmentClassificationKeyLike(String... attachmentClassificationKey);
+  TaskQuery attachmentClassificationKeyLike(String... attachmentClassificationKeys);
 
   /**
    * Exclude the attachment classification Keys for pattern matching from your query. It will be
    * compared in SQL with the LIKE operator. You may use a wildcard like % to specify the pattern.
    * If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param attachmentClassificationKey the attachmentClassificationKeys values of the searched for
+   * @param attachmentClassificationKeys the attachmentClassificationKey values of the searched for
    *     tasks
    * @return the query
    */
-  TaskQuery attachmentClassificationKeyNotLike(String... attachmentClassificationKey);
+  TaskQuery attachmentClassificationKeyNotLike(String... attachmentClassificationKeys);
 
   /**
    * This method sorts the query result according to the attachment classification key. (Should only
@@ -1274,42 +1274,42 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
   /**
    * Add the attachment classification names for exact matching to your query.
    *
-   * @param attachmentClassificationName the attachmentClassificationName values of the searched for
-   *     tasks
+   * @param attachmentClassificationNames the attachmentClassificationName values of the searched
+   *     for tasks
    * @return the query
    */
-  TaskQuery attachmentClassificationNameIn(String... attachmentClassificationName);
+  TaskQuery attachmentClassificationNameIn(String... attachmentClassificationNames);
 
   /**
    * Exclude the attachment classification names for exact matching from your query.
    *
-   * @param attachmentClassificationName the attachmentClassificationName values of the searched for
-   *     tasks
+   * @param attachmentClassificationNames the attachmentClassificationName values of the searched
+   *     for tasks
    * @return the query
    */
-  TaskQuery attachmentClassificationNameNotIn(String... attachmentClassificationName);
+  TaskQuery attachmentClassificationNameNotIn(String... attachmentClassificationNames);
 
   /**
    * Add the values of attachment classification names for pattern matching to your query. They will
    * be compared in SQL with the LIKE operator. You may use a wildcard like % to specify the
    * pattern. If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param attachmentClassificationName the attachmentClassificationName values of the searched-for
-   *     tasks
+   * @param attachmentClassificationNames the attachmentClassificationName values of the
+   *     searched-for tasks
    * @return the query
    */
-  TaskQuery attachmentClassificationNameLike(String... attachmentClassificationName);
+  TaskQuery attachmentClassificationNameLike(String... attachmentClassificationNames);
 
   /**
    * Exclude the values of attachment classification names for pattern matching from your query.
    * They will be compared in SQL with the LIKE operator. You may use a wildcard like % to specify
    * the pattern. If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param attachmentClassificationName the attachmentClassificationName values of the searched-for
-   *     tasks
+   * @param attachmentClassificationNames the attachmentClassificationName values of the
+   *     searched-for tasks
    * @return the query
    */
-  TaskQuery attachmentClassificationNameNotLike(String... attachmentClassificationName);
+  TaskQuery attachmentClassificationNameNotLike(String... attachmentClassificationNames);
 
   /**
    * This method sorts the query result according to the attachment classification name. (Should
@@ -1327,18 +1327,18 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
   /**
    * Add the values of attachment channel for exact matching to your query.
    *
-   * @param attachmentChannel the attachmentChannel values of the searched for tasks
+   * @param attachmentChannels the attachmentChannel values of the searched for tasks
    * @return the query
    */
-  TaskQuery attachmentChannelIn(String... attachmentChannel);
+  TaskQuery attachmentChannelIn(String... attachmentChannels);
 
   /**
    * Exclude the values of attachment channel for exact matching from your query.
    *
-   * @param attachmentChannel the attachmentChannel values of the searched for tasks
+   * @param attachmentChannels the attachmentChannel values of the searched for tasks
    * @return the query
    */
-  TaskQuery attachmentChannelNotIn(String... attachmentChannel);
+  TaskQuery attachmentChannelNotIn(String... attachmentChannels);
 
   /**
    * This method sorts the query result according to the owner's long name. (Should only be used if
@@ -1355,20 +1355,20 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * in SQL with the LIKE operator. You may use a wildcard like % to specify the pattern. If you
    * specify multiple arguments they are combined with the OR keyword.
    *
-   * @param attachmentChannel the attachmentChannel values of the searched-for tasks
+   * @param attachmentChannels the attachmentChannel values of the searched-for tasks
    * @return the query
    */
-  TaskQuery attachmentChannelLike(String... attachmentChannel);
+  TaskQuery attachmentChannelLike(String... attachmentChannels);
 
   /**
    * Exclude the values of attachment channel for pattern matching from your query. They will be
    * compared in SQL with the LIKE operator. You may use a wildcard like % to specify the pattern.
    * If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param attachmentChannel the attachmentChannel values of the searched-for tasks
+   * @param attachmentChannels the attachmentChannel values of the searched-for tasks
    * @return the query
    */
-  TaskQuery attachmentChannelNotLike(String... attachmentChannel);
+  TaskQuery attachmentChannelNotLike(String... attachmentChannels);
 
   /**
    * This method sorts the query result according to the attachment channel. (Should only be used if
@@ -1386,38 +1386,38 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
   /**
    * Add the values of reference values for exact matching to your query.
    *
-   * @param referenceValue the referenceValue values of the searched for tasks
+   * @param referenceValues the referenceValue values of the searched for tasks
    * @return the query
    */
-  TaskQuery attachmentReferenceValueIn(String... referenceValue);
+  TaskQuery attachmentReferenceValueIn(String... referenceValues);
 
   /**
    * Exclude the values of reference values for exact matching from your query.
    *
-   * @param referenceValue the referenceValue values of the searched for tasks
+   * @param referenceValues the referenceValue values of the searched for tasks
    * @return the query
    */
-  TaskQuery attachmentReferenceValueNotIn(String... referenceValue);
+  TaskQuery attachmentReferenceValueNotIn(String... referenceValues);
 
   /**
    * Add the values of reference values for pattern matching to your query. They will be compared in
    * SQL with the LIKE operator. You may use a wildcard like % to specify the pattern. If you
    * specify multiple arguments they are combined with the OR keyword.
    *
-   * @param referenceValue the referenceValue values of the searched-for tasks
+   * @param referenceValues the referenceValue values of the searched-for tasks
    * @return the query
    */
-  TaskQuery attachmentReferenceValueLike(String... referenceValue);
+  TaskQuery attachmentReferenceValueLike(String... referenceValues);
 
   /**
    * Exclude the values of reference values for pattern matching to your query. They will be
    * compared in SQL with the LIKE operator. You may use a wildcard like % to specify the pattern.
    * If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param referenceValue the referenceValue values of the searched-for tasks
+   * @param referenceValues the referenceValue values of the searched-for tasks
    * @return the query
    */
-  TaskQuery attachmentReferenceValueNotLike(String... referenceValue);
+  TaskQuery attachmentReferenceValueNotLike(String... referenceValues);
 
   /**
    * This method sorts the query result according to the attachment reference value. (Should only be
@@ -1494,11 +1494,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * {@linkplain Task#getSecondaryObjectReferences() secondaryObjectReferences} for exact matching
    * to your query.
    *
-   * @param companyIn the {@linkplain ObjectReference#getCompany() company} values of the searched
+   * @param companies the {@linkplain ObjectReference#getCompany() company} values of the searched
    *     for {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorCompanyIn(String... companyIn);
+  TaskQuery sorCompanyIn(String... companies);
 
   /**
    * Add the values of {@linkplain ObjectReference#getCompany() company} of at least one of the
@@ -1507,11 +1507,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * % to specify the pattern. If you specify multiple arguments they are combined with the OR
    * keyword.
    *
-   * @param companyLike the {@linkplain ObjectReference#getCompany() company} values of the
+   * @param companies the {@linkplain ObjectReference#getCompany() company} values of the
    *     searched-for {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorCompanyLike(String... companyLike);
+  TaskQuery sorCompanyLike(String... companies);
 
   // endregion
   // region secondaryObjectReferenceSystem
@@ -1521,11 +1521,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * {@linkplain Task#getSecondaryObjectReferences() secondaryObjectReferences} for exact matching
    * to your query.
    *
-   * @param systemIn the {@linkplain ObjectReference#getSystem() system} values of the searched for
+   * @param systems the {@linkplain ObjectReference#getSystem() system} values of the searched for
    *     {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorSystemIn(String... systemIn);
+  TaskQuery sorSystemIn(String... systems);
 
   /**
    * Add the values of {@linkplain ObjectReference#getSystem system} of at least one of the
@@ -1534,11 +1534,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * % to specify the pattern. If you specify multiple arguments they are combined with the OR
    * keyword.
    *
-   * @param systemLike the {@linkplain ObjectReference#getSystem system} values of the searched-for
+   * @param systems the {@linkplain ObjectReference#getSystem system} values of the searched-for
    *     {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorSystemLike(String... systemLike);
+  TaskQuery sorSystemLike(String... systems);
 
   // endregion
   // region secondaryObjectReferenceSystemInstance
@@ -1548,11 +1548,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * least one of the {@linkplain Task#getSecondaryObjectReferences() secondaryObjectReferences} for
    * exact matching to your query.
    *
-   * @param systemInstanceIn the {@linkplain ObjectReference#getSystemInstance() systemInstance}
+   * @param systemInstances the {@linkplain ObjectReference#getSystemInstance() systemInstance}
    *     values of the searched for {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorSystemInstanceIn(String... systemInstanceIn);
+  TaskQuery sorSystemInstanceIn(String... systemInstances);
 
   /**
    * Add the values of {@linkplain ObjectReference#getSystemInstance() systemInstance} of at least
@@ -1561,11 +1561,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * use a wildcard like % to specify the pattern. If you specify multiple arguments they are
    * combined with the OR keyword.
    *
-   * @param systemInstanceLike the {@linkplain ObjectReference#getSystemInstance() systemInstance}
+   * @param systemInstances the {@linkplain ObjectReference#getSystemInstance() systemInstance}
    *     values of the searched-for {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorSystemInstanceLike(String... systemInstanceLike);
+  TaskQuery sorSystemInstanceLike(String... systemInstances);
 
   // endregion
   // region secondaryObjectReferenceType
@@ -1575,11 +1575,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * {@linkplain Task#getSecondaryObjectReferences() secondaryObjectReferences} for exact matching
    * to your query.
    *
-   * @param typeIn the {@linkplain ObjectReference#getType() type} values of the searched for
+   * @param types the {@linkplain ObjectReference#getType() type} values of the searched for
    *     {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorTypeIn(String... typeIn);
+  TaskQuery sorTypeIn(String... types);
 
   /**
    * Add the values of {@linkplain ObjectReference#getType type} of at least one of the {@linkplain
@@ -1587,11 +1587,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * query. They will be compared in SQL with the LIKE operator. You may use a wildcard like % to
    * specify the pattern. If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param typeLike the {@linkplain ObjectReference#getType type} values of the searched-for
+   * @param types the {@linkplain ObjectReference#getType type} values of the searched-for
    *     {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorTypeLike(String... typeLike);
+  TaskQuery sorTypeLike(String... types);
 
   // endregion
   // region secondaryObjectReferenceValue
@@ -1601,11 +1601,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * {@linkplain Task#getSecondaryObjectReferences() secondaryObjectReferences} for exact matching
    * to your query.
    *
-   * @param valueIn the {@linkplain ObjectReference#getValue() value} values of the searched for
+   * @param values the {@linkplain ObjectReference#getValue() value} values of the searched for
    *     {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorValueIn(String... valueIn);
+  TaskQuery sorValueIn(String... values);
 
   /**
    * Add the values of {@linkplain ObjectReference#getValue() value} of at least one of the
@@ -1614,11 +1614,11 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
    * % to specify the pattern. If you specify multiple arguments they are combined with the OR
    * keyword.
    *
-   * @param valueLike the {@linkplain ObjectReference#getValue() value} values of the searched-for
+   * @param values the {@linkplain ObjectReference#getValue() value} values of the searched-for
    *     {@linkplain Task Tasks}
    * @return the {@linkplain TaskQuery}
    */
-  TaskQuery sorValueLike(String... valueLike);
+  TaskQuery sorValueLike(String... values);
 
   // endregion
   // region customAttributes
diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java
index 1c42d76f8..268d683d3 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java
@@ -556,14 +556,14 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery noteLike(String... note) {
-    this.noteLike = toLowerCopy(note);
+  public TaskQuery noteLike(String... notes) {
+    this.noteLike = toLowerCopy(notes);
     return this;
   }
 
   @Override
-  public TaskQuery noteNotLike(String... note) {
-    this.noteNotLike = toLowerCopy(note);
+  public TaskQuery noteNotLike(String... notes) {
+    this.noteNotLike = toLowerCopy(notes);
     return this;
   }
 
@@ -573,14 +573,14 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery descriptionLike(String... description) {
-    this.descriptionLike = toLowerCopy(description);
+  public TaskQuery descriptionLike(String... descriptions) {
+    this.descriptionLike = toLowerCopy(descriptions);
     return this;
   }
 
   @Override
-  public TaskQuery descriptionNotLike(String... description) {
-    this.descriptionNotLike = toLowerCopy(description);
+  public TaskQuery descriptionNotLike(String... descriptions) {
+    this.descriptionNotLike = toLowerCopy(descriptions);
     return this;
   }
 
@@ -619,8 +619,8 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery classificationIdIn(String... classificationId) {
-    this.classificationIdIn = classificationId;
+  public TaskQuery classificationIdIn(String... classificationIds) {
+    this.classificationIdIn = classificationIds;
     return this;
   }
 
@@ -631,8 +631,8 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery classificationKeyIn(String... classificationKey) {
-    this.classificationKeyIn = classificationKey;
+  public TaskQuery classificationKeyIn(String... classificationKeys) {
+    this.classificationKeyIn = classificationKeys;
     return this;
   }
 
@@ -884,14 +884,14 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery primaryObjectReferenceCompanyLike(String... company) {
-    this.porCompanyLike = toLowerCopy(company);
+  public TaskQuery primaryObjectReferenceCompanyLike(String... companies) {
+    this.porCompanyLike = toLowerCopy(companies);
     return this;
   }
 
   @Override
-  public TaskQuery primaryObjectReferenceCompanyNotLike(String... company) {
-    this.porCompanyNotLike = toLowerCopy(company);
+  public TaskQuery primaryObjectReferenceCompanyNotLike(String... companies) {
+    this.porCompanyNotLike = toLowerCopy(companies);
     return this;
   }
 
@@ -913,8 +913,8 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery primaryObjectReferenceSystemLike(String... system) {
-    this.porSystemLike = toLowerCopy(system);
+  public TaskQuery primaryObjectReferenceSystemLike(String... systems) {
+    this.porSystemLike = toLowerCopy(systems);
     return this;
   }
 
@@ -942,8 +942,8 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery primaryObjectReferenceSystemInstanceLike(String... systemInstance) {
-    this.porSystemInstanceLike = toLowerCopy(systemInstance);
+  public TaskQuery primaryObjectReferenceSystemInstanceLike(String... systemInstances) {
+    this.porSystemInstanceLike = toLowerCopy(systemInstances);
     return this;
   }
 
@@ -1029,16 +1029,16 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery attachmentClassificationIdIn(String... attachmentClassificationId) {
+  public TaskQuery attachmentClassificationIdIn(String... attachmentClassificationIds) {
     joinWithAttachments = true;
-    this.attachmentClassificationIdIn = attachmentClassificationId;
+    this.attachmentClassificationIdIn = attachmentClassificationIds;
     return this;
   }
 
   @Override
-  public TaskQuery attachmentClassificationIdNotIn(String... attachmentClassificationId) {
+  public TaskQuery attachmentClassificationIdNotIn(String... attachmentClassificationIds) {
     joinWithAttachments = true;
-    this.attachmentClassificationIdNotIn = attachmentClassificationId;
+    this.attachmentClassificationIdNotIn = attachmentClassificationIds;
     return this;
   }
 
@@ -1066,16 +1066,16 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery attachmentClassificationKeyLike(String... attachmentClassificationKey) {
+  public TaskQuery attachmentClassificationKeyLike(String... attachmentClassificationKeys) {
     joinWithAttachments = true;
-    this.attachmentClassificationKeyLike = toLowerCopy(attachmentClassificationKey);
+    this.attachmentClassificationKeyLike = toLowerCopy(attachmentClassificationKeys);
     return this;
   }
 
   @Override
-  public TaskQuery attachmentClassificationKeyNotLike(String... attachmentClassificationKey) {
+  public TaskQuery attachmentClassificationKeyNotLike(String... attachmentClassificationKeys) {
     joinWithAttachments = true;
-    this.attachmentClassificationKeyNotLike = toLowerCopy(attachmentClassificationKey);
+    this.attachmentClassificationKeyNotLike = toLowerCopy(attachmentClassificationKeys);
     return this;
   }
 
@@ -1089,30 +1089,30 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery attachmentClassificationNameIn(String... attachmentClassificationName) {
+  public TaskQuery attachmentClassificationNameIn(String... attachmentClassificationNames) {
     joinWithAttachmentClassifications = true;
-    this.attachmentClassificationNameIn = attachmentClassificationName;
+    this.attachmentClassificationNameIn = attachmentClassificationNames;
     return this;
   }
 
   @Override
-  public TaskQuery attachmentClassificationNameNotIn(String... attachmentClassificationName) {
+  public TaskQuery attachmentClassificationNameNotIn(String... attachmentClassificationNames) {
     joinWithAttachmentClassifications = true;
-    this.attachmentClassificationNameNotIn = attachmentClassificationName;
+    this.attachmentClassificationNameNotIn = attachmentClassificationNames;
     return this;
   }
 
   @Override
-  public TaskQuery attachmentClassificationNameLike(String... attachmentClassificationName) {
+  public TaskQuery attachmentClassificationNameLike(String... attachmentClassificationNames) {
     joinWithAttachmentClassifications = true;
-    this.attachmentClassificationNameLike = toLowerCopy(attachmentClassificationName);
+    this.attachmentClassificationNameLike = toLowerCopy(attachmentClassificationNames);
     return this;
   }
 
   @Override
-  public TaskQuery attachmentClassificationNameNotLike(String... attachmentClassificationName) {
+  public TaskQuery attachmentClassificationNameNotLike(String... attachmentClassificationNames) {
     joinWithAttachmentClassifications = true;
-    this.attachmentClassificationNameNotLike = toLowerCopy(attachmentClassificationName);
+    this.attachmentClassificationNameNotLike = toLowerCopy(attachmentClassificationNames);
     return this;
   }
 
@@ -1126,30 +1126,30 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery attachmentChannelIn(String... attachmentChannel) {
+  public TaskQuery attachmentChannelIn(String... attachmentChannels) {
     joinWithAttachments = true;
-    this.attachmentChannelIn = attachmentChannel;
+    this.attachmentChannelIn = attachmentChannels;
     return this;
   }
 
   @Override
-  public TaskQuery attachmentChannelNotIn(String... attachmentChannel) {
+  public TaskQuery attachmentChannelNotIn(String... attachmentChannels) {
     joinWithAttachments = true;
-    this.attachmentChannelNotIn = attachmentChannel;
+    this.attachmentChannelNotIn = attachmentChannels;
     return this;
   }
 
   @Override
-  public TaskQuery attachmentChannelLike(String... attachmentChannel) {
+  public TaskQuery attachmentChannelLike(String... attachmentChannels) {
     joinWithAttachments = true;
-    this.attachmentChannelLike = toLowerCopy(attachmentChannel);
+    this.attachmentChannelLike = toLowerCopy(attachmentChannels);
     return this;
   }
 
   @Override
-  public TaskQuery attachmentChannelNotLike(String... attachmentChannel) {
+  public TaskQuery attachmentChannelNotLike(String... attachmentChannels) {
     joinWithAttachments = true;
-    this.attachmentChannelNotLike = toLowerCopy(attachmentChannel);
+    this.attachmentChannelNotLike = toLowerCopy(attachmentChannels);
     return this;
   }
 
@@ -1161,30 +1161,30 @@ public class TaskQueryImpl implements TaskQuery {
   }
 
   @Override
-  public TaskQuery attachmentReferenceValueIn(String... referenceValue) {
+  public TaskQuery attachmentReferenceValueIn(String... referenceValues) {
     joinWithAttachments = true;
-    this.attachmentReferenceIn = referenceValue;
+    this.attachmentReferenceIn = referenceValues;
     return this;
   }
 
   @Override
-  public TaskQuery attachmentReferenceValueNotIn(String... referenceValue) {
+  public TaskQuery attachmentReferenceValueNotIn(String... referenceValues) {
     joinWithAttachments = true;
-    this.attachmentReferenceNotIn = referenceValue;
+    this.attachmentReferenceNotIn = referenceValues;
     return this;
   }
 
   @Override
-  public TaskQuery attachmentReferenceValueLike(String... referenceValue) {
+  public TaskQuery attachmentReferenceValueLike(String... referenceValues) {
     joinWithAttachments = true;
-    this.attachmentReferenceLike = toLowerCopy(referenceValue);
+    this.attachmentReferenceLike = toLowerCopy(referenceValues);
     return this;
   }
 
   @Override
-  public TaskQuery attachmentReferenceValueNotLike(String... referenceValue) {
+  public TaskQuery attachmentReferenceValueNotLike(String... referenceValues) {
     joinWithAttachments = true;
-    this.attachmentReferenceNotLike = toLowerCopy(referenceValue);
+    this.attachmentReferenceNotLike = toLowerCopy(referenceValues);
     return this;
   }
 
@@ -1250,64 +1250,64 @@ public class TaskQueryImpl implements TaskQuery {
     return this;
   }
 
-  public TaskQuery sorCompanyIn(String... companyIn) {
+  public TaskQuery sorCompanyIn(String... companies) {
     joinWithSecondaryObjectReferences = true;
-    sorCompanyIn = companyIn;
+    sorCompanyIn = companies;
     return this;
   }
 
-  public TaskQuery sorCompanyLike(String... companyLike) {
+  public TaskQuery sorCompanyLike(String... companies) {
     joinWithSecondaryObjectReferences = true;
-    sorCompanyLike = toLowerCopy(companyLike);
+    sorCompanyLike = toLowerCopy(companies);
     return this;
   }
 
-  public TaskQuery sorSystemIn(String... systemIn) {
+  public TaskQuery sorSystemIn(String... systems) {
     joinWithSecondaryObjectReferences = true;
-    sorSystemIn = systemIn;
+    sorSystemIn = systems;
     return this;
   }
 
-  public TaskQuery sorSystemLike(String... systemLike) {
+  public TaskQuery sorSystemLike(String... systems) {
     joinWithSecondaryObjectReferences = true;
-    sorSystemLike = toLowerCopy(systemLike);
+    sorSystemLike = toLowerCopy(systems);
     return this;
   }
 
-  public TaskQuery sorSystemInstanceIn(String... systemInstanceIn) {
+  public TaskQuery sorSystemInstanceIn(String... systemInstances) {
     joinWithSecondaryObjectReferences = true;
-    sorSystemInstanceIn = systemInstanceIn;
+    sorSystemInstanceIn = systemInstances;
     return this;
   }
 
-  public TaskQuery sorSystemInstanceLike(String... systemInstanceLike) {
+  public TaskQuery sorSystemInstanceLike(String... systemInstances) {
     joinWithSecondaryObjectReferences = true;
-    sorSystemInstanceLike = toLowerCopy(systemInstanceLike);
+    sorSystemInstanceLike = toLowerCopy(systemInstances);
     return this;
   }
 
-  public TaskQuery sorTypeIn(String... typeIn) {
+  public TaskQuery sorTypeIn(String... types) {
     joinWithSecondaryObjectReferences = true;
-    sorTypeIn = typeIn;
+    sorTypeIn = types;
     return this;
   }
 
-  public TaskQuery sorTypeLike(String... typeLike) {
+  public TaskQuery sorTypeLike(String... types) {
     joinWithSecondaryObjectReferences = true;
-    sorTypeLike = toLowerCopy(typeLike);
+    sorTypeLike = toLowerCopy(types);
     return this;
   }
 
   @Override
-  public TaskQuery sorValueIn(String... valueIn) {
+  public TaskQuery sorValueIn(String... values) {
     joinWithSecondaryObjectReferences = true;
-    sorValueIn = valueIn;
+    sorValueIn = values;
     return this;
   }
 
-  public TaskQuery sorValueLike(String... valueLike) {
+  public TaskQuery sorValueLike(String... values) {
     joinWithSecondaryObjectReferences = true;
-    sorValueLike = toLowerCopy(valueLike);
+    sorValueLike = toLowerCopy(values);
     return this;
   }
 
diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java
index fecdcc03a..94b5b7a29 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java
@@ -25,18 +25,18 @@ public interface AbstractWorkbasketAccessItemQuery<
   /**
    * Add the {@linkplain Workbasket#getId() id} to your query.
    *
-   * @param workbasketId the {@linkplain Workbasket#getId() id} of the Workbasket
+   * @param workbasketIds the {@linkplain Workbasket#getId() id} of the Workbasket
    * @return the query
    */
-  Q workbasketIdIn(String... workbasketId);
+  Q workbasketIdIn(String... workbasketIds);
 
   /**
    * Add your accessIds to your query.
    *
-   * @param accessId as access Ids
+   * @param accessIds as access Ids
    * @return the query
    */
-  Q accessIdIn(String... accessId);
+  Q accessIdIn(String... accessIds);
 
   /**
    * Sort the query result by workbasket id.
diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java
index d07a05e4e..c95191740 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java
@@ -18,10 +18,10 @@ public interface WorkbasketAccessItemQuery
   /**
    * Add your workbasket id to your query.
    *
-   * @param workbasketId the workbasket Id
+   * @param workbasketIds the workbasket Id
    * @return the query
    */
-  WorkbasketAccessItemQuery workbasketIdIn(String... workbasketId);
+  WorkbasketAccessItemQuery workbasketIdIn(String... workbasketIds);
 
   /**
    * Add your unique entry workbasket key to your query as filter.
@@ -37,18 +37,18 @@ public interface WorkbasketAccessItemQuery
    * specify multiple keys they are connected with an OR operator, this is, the query searches
    * access items workbaskets whose keys are like key1 or like key2, etc.
    *
-   * @param key the keys as Strings
+   * @param keys the keys as Strings
    * @return the query
    */
-  WorkbasketAccessItemQuery workbasketKeyLike(String... key);
+  WorkbasketAccessItemQuery workbasketKeyLike(String... keys);
 
   /**
    * Add your accessIds to your query.
    *
-   * @param accessId as access Ids
+   * @param accessIds as access Ids
    * @return the query
    */
-  WorkbasketAccessItemQuery accessIdIn(String... accessId);
+  WorkbasketAccessItemQuery accessIdIn(String... accessIds);
 
   /**
    * Add keys to your query. The keys are compared case-insensitively to the keys of access items
diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java
index b474e2166..b59e2bdbb 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java
@@ -13,19 +13,19 @@ public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary, Workbasket
    * Add your ids to your query. The ids are compared to the ids of workbaskets with the IN
    * operator.
    *
-   * @param id the id as Strings
+   * @param ids the id as Strings
    * @return the query
    */
-  WorkbasketQuery idIn(String... id);
+  WorkbasketQuery idIn(String... ids);
 
   /**
    * Add your keys to your query. The keys are compared case-insensitively to the keys of
    * workbaskets with the IN operator.
    *
-   * @param key the keys as Strings
+   * @param keys the keys as Strings
    * @return the query
    */
-  WorkbasketQuery keyIn(String... key);
+  WorkbasketQuery keyIn(String... keys);
 
   /**
    * Add keys to your query. The keys are compared case-insensitively to the keys of workbaskets
@@ -33,19 +33,19 @@ public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary, Workbasket
    * specify multiple keys they are connected with an OR operator, this is, the query searches
    * workbaskets whose keys are like key1 or like key2, etc.
    *
-   * @param key the keys as Strings
+   * @param keys the keys as Strings
    * @return the query
    */
-  WorkbasketQuery keyLike(String... key);
+  WorkbasketQuery keyLike(String... keys);
 
   /**
    * Add your names to your query. The names are compared case-insensitively to the names of
    * workbaskets
    *
-   * @param name the names as Strings
+   * @param names the names as Strings
    * @return the query
    */
-  WorkbasketQuery nameIn(String... name);
+  WorkbasketQuery nameIn(String... names);
 
   /**
    * Add names to your query. The names are compared case-insensitively to the names of workbaskets
@@ -53,10 +53,10 @@ public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary, Workbasket
    * specify multiple names, they are connected with an OR operator, this is, the query searches
    * workbaskets whose names are like name1 or like name2, etc.
    *
-   * @param name the names as Strings
+   * @param names the names as Strings
    * @return the query
    */
-  WorkbasketQuery nameLike(String... name);
+  WorkbasketQuery nameLike(String... names);
 
   /**
    * Add search strings to your query that are searched case-insensitively in the key and name
@@ -65,26 +65,26 @@ public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary, Workbasket
    * whose keys are like string1 or whose names are like string1 or whose keys are like string2 or
    * whose names are like string2, etc...
    *
-   * @param searchString the seach strings
+   * @param searchStrings the search strings
    * @return the query
    */
-  WorkbasketQuery keyOrNameLike(String... searchString);
+  WorkbasketQuery keyOrNameLike(String... searchStrings);
 
   /**
    * Add your domains to your query.
    *
-   * @param domain the domains as Strings
+   * @param domains the domains as Strings
    * @return the query
    */
-  WorkbasketQuery domainIn(String... domain);
+  WorkbasketQuery domainIn(String... domains);
 
   /**
    * Add your types to your query.
    *
-   * @param type the types
+   * @param types the types
    * @return the query
    */
-  WorkbasketQuery typeIn(WorkbasketType... type);
+  WorkbasketQuery typeIn(WorkbasketType... types);
 
   /**
    * Add the time intervals within which the workbasket was created to your query. For each time
@@ -115,10 +115,10 @@ public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary, Workbasket
    * of workbaskets using the LIKE operator. You may use a wildcard like '%' to search generically.
    * If you specify multiple arguments they are combined with the OR keyword.
    *
-   * @param description your description
+   * @param descriptions your description
    * @return the query
    */
-  WorkbasketQuery descriptionLike(String... description);
+  WorkbasketQuery descriptionLike(String... descriptions);
 
   /**
    * Add the owners to your query.
@@ -221,10 +221,10 @@ public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary, Workbasket
    * operator. You may use a wildcard like % to specify the pattern. If you specify multiple
    * arguments they are combined with the OR keyword.
    *
-   * @param domain the domains of workbaskets as Strings
+   * @param domains the domains of workbaskets as Strings
    * @return the query
    */
-  WorkbasketQuery domainLike(String... domain);
+  WorkbasketQuery domainLike(String... domains);
 
   /**
    * This method sorts the query result according to the value of a custom field.
@@ -296,74 +296,74 @@ public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary, Workbasket
   /**
    * Add the 1st organization level to your query.
    *
-   * @param orgLevel1 the 1st organization level as String
+   * @param orgLevels1 the 1st organization level as String
    * @return the query
    */
-  WorkbasketQuery orgLevel1In(String... orgLevel1);
+  WorkbasketQuery orgLevel1In(String... orgLevels1);
 
   /**
    * Add the 1st organization level for pattern matching to your query. It will be compared in SQL
    * with the LIKE operator. You may use a wildcard like % to specify the pattern. If you specify
    * multiple arguments they are combined with the OR keyword.
    *
-   * @param orgLevel1 the 1st organization level as Strings
+   * @param orgLevels1 the 1st organization level as Strings
    * @return the query
    */
-  WorkbasketQuery orgLevel1Like(String... orgLevel1);
+  WorkbasketQuery orgLevel1Like(String... orgLevels1);
 
   /**
    * Add the 2nd organization level to your query.
    *
-   * @param orgLevel2 the 2nd organization level as String
+   * @param orgLevels2 the 2nd organization level as String
    * @return the query
    */
-  WorkbasketQuery orgLevel2In(String... orgLevel2);
+  WorkbasketQuery orgLevel2In(String... orgLevels2);
 
   /**
    * Add the 2nd organization level for pattern matching to your query. It will be compared in SQL
    * with the LIKE operator. You may use a wildcard like % to specify the pattern. If you specify
    * multiple arguments they are combined with the OR keyword.
    *
-   * @param orgLevel2 the 2nd organization level as Strings
+   * @param orgLevels2 the 2nd organization level as Strings
    * @return the query
    */
-  WorkbasketQuery orgLevel2Like(String... orgLevel2);
+  WorkbasketQuery orgLevel2Like(String... orgLevels2);
 
   /**
    * Add the 3rd organization level to your query.
    *
-   * @param orgLevel3 the 3rd organization level as String
+   * @param orgLevels3 the 3rd organization level as String
    * @return the query
    */
-  WorkbasketQuery orgLevel3In(String... orgLevel3);
+  WorkbasketQuery orgLevel3In(String... orgLevels3);
 
   /**
    * Add the 3rd organization level for pattern matching to your query. It will be compared in SQL
    * with the LIKE operator. You may use a wildcard like % to specify the pattern. If you specify
    * multiple arguments they are combined with the OR keyword.
    *
-   * @param orgLevel3 the 3rd organization level as Strings
+   * @param orgLevels3 the 3rd organization level as Strings
    * @return the query
    */
-  WorkbasketQuery orgLevel3Like(String... orgLevel3);
+  WorkbasketQuery orgLevel3Like(String... orgLevels3);
 
   /**
    * Add the 4th organization level to your query.
    *
-   * @param orgLevel4 the 4th organization level as String
+   * @param orgLevels4 the 4th organization level as String
    * @return the query
    */
-  WorkbasketQuery orgLevel4In(String... orgLevel4);
+  WorkbasketQuery orgLevel4In(String... orgLevels4);
 
   /**
    * Add the 4th organization level for pattern matching to your query. It will be compared in SQL
    * with the LIKE operator. You may use a wildcard like % to specify the pattern. If you specify
    * multiple arguments they are combined with the OR keyword.
    *
-   * @param orgLevel4 the 4th organization level as Strings
+   * @param orgLevels4 the 4th organization level as Strings
    * @return the query
    */
-  WorkbasketQuery orgLevel4Like(String... orgLevel4);
+  WorkbasketQuery orgLevel4Like(String... orgLevels4);
 
   /**
    * Add to your query if the Workbasket shall be marked for deletion.
diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java
index 8d8699789..ce36a64b4 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java
@@ -81,17 +81,17 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
   }
 
   @Override
-  public WorkbasketQuery idIn(String... id) {
-    if (id != null && id.length != 0) {
-      this.idIn = id;
+  public WorkbasketQuery idIn(String... ids) {
+    if (ids != null && ids.length != 0) {
+      this.idIn = ids;
     }
     return this;
   }
 
   @Override
-  public WorkbasketQuery keyIn(String... key) {
-    if (key != null && key.length != 0) {
-      this.keyIn = key;
+  public WorkbasketQuery keyIn(String... keys) {
+    if (keys != null && keys.length != 0) {
+      this.keyIn = keys;
     }
     return this;
   }
@@ -121,14 +121,14 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
   }
 
   @Override
-  public WorkbasketQuery domainIn(String... domain) {
-    this.domainIn = domain;
+  public WorkbasketQuery domainIn(String... domains) {
+    this.domainIn = domains;
     return this;
   }
 
   @Override
-  public WorkbasketQuery typeIn(WorkbasketType... type) {
-    this.type = type;
+  public WorkbasketQuery typeIn(WorkbasketType... types) {
+    this.type = types;
     return this;
   }
 
@@ -147,8 +147,8 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
   }
 
   @Override
-  public WorkbasketQuery descriptionLike(String... description) {
-    this.descriptionLike = toLowerCopy(description);
+  public WorkbasketQuery descriptionLike(String... descriptions) {
+    this.descriptionLike = toLowerCopy(descriptions);
     return this;
   }
 
@@ -224,8 +224,8 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
   }
 
   @Override
-  public WorkbasketQuery domainLike(String... domain) {
-    this.domainLike = toLowerCopy(domain);
+  public WorkbasketQuery domainLike(String... domains) {
+    this.domainLike = toLowerCopy(domains);
     return this;
   }
 
@@ -300,50 +300,50 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
   }
 
   @Override
-  public WorkbasketQuery orgLevel1In(String... orgLevel1) {
-    this.orgLevel1In = orgLevel1;
+  public WorkbasketQuery orgLevel1In(String... orgLevels1) {
+    this.orgLevel1In = orgLevels1;
     return this;
   }
 
   @Override
-  public WorkbasketQuery orgLevel1Like(String... orgLevel1) {
-    this.orgLevel1Like = toLowerCopy(orgLevel1);
+  public WorkbasketQuery orgLevel1Like(String... orgLevels1) {
+    this.orgLevel1Like = toLowerCopy(orgLevels1);
     return this;
   }
 
   @Override
-  public WorkbasketQuery orgLevel2In(String... orgLevel2) {
-    this.orgLevel2In = orgLevel2;
+  public WorkbasketQuery orgLevel2In(String... orgLevels2) {
+    this.orgLevel2In = orgLevels2;
     return this;
   }
 
   @Override
-  public WorkbasketQuery orgLevel2Like(String... orgLevel2) {
-    this.orgLevel2Like = toLowerCopy(orgLevel2);
+  public WorkbasketQuery orgLevel2Like(String... orgLevels2) {
+    this.orgLevel2Like = toLowerCopy(orgLevels2);
     return this;
   }
 
   @Override
-  public WorkbasketQuery orgLevel3In(String... orgLevel3) {
-    this.orgLevel3In = orgLevel3;
+  public WorkbasketQuery orgLevel3In(String... orgLevels3) {
+    this.orgLevel3In = orgLevels3;
     return this;
   }
 
   @Override
-  public WorkbasketQuery orgLevel3Like(String... orgLevel3) {
-    this.orgLevel3Like = toLowerCopy(orgLevel3);
+  public WorkbasketQuery orgLevel3Like(String... orgLevels3) {
+    this.orgLevel3Like = toLowerCopy(orgLevels3);
     return this;
   }
 
   @Override
-  public WorkbasketQuery orgLevel4In(String... orgLevel4) {
-    this.orgLevel4In = orgLevel4;
+  public WorkbasketQuery orgLevel4In(String... orgLevels4) {
+    this.orgLevel4In = orgLevels4;
     return this;
   }
 
   @Override
-  public WorkbasketQuery orgLevel4Like(String... orgLevel4) {
-    this.orgLevel4Like = toLowerCopy(orgLevel4);
+  public WorkbasketQuery orgLevel4Like(String... orgLevels4) {
+    this.orgLevel4Like = toLowerCopy(orgLevels4);
     return this;
   }
 
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/models/TaskSummaryRepresentationModel.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/models/TaskSummaryRepresentationModel.java
index a7a410c12..c7d508699 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/models/TaskSummaryRepresentationModel.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/models/TaskSummaryRepresentationModel.java
@@ -112,21 +112,21 @@ public class TaskSummaryRepresentationModel
   protected String custom15;
   /** A custom property with name "16". */
   protected String custom16;
-  /** A custom property with name "1". */
-  protected Integer customInt1;
   /** A custom int property with name "1". */
-  protected Integer customInt2;
+  protected Integer customInt1;
   /** A custom int property with name "2". */
-  protected Integer customInt3;
+  protected Integer customInt2;
   /** A custom int property with name "3". */
-  protected Integer customInt4;
+  protected Integer customInt3;
   /** A custom int property with name "4". */
-  protected Integer customInt5;
+  protected Integer customInt4;
   /** A custom int property with name "5". */
-  protected Integer customInt6;
+  protected Integer customInt5;
   /** A custom int property with name "6". */
-  protected Integer customInt7;
+  protected Integer customInt6;
   /** A custom int property with name "7". */
+  protected Integer customInt7;
+  /** A custom int property with name "8". */
   protected Integer customInt8;
   /** Secondary object references of the task. */
   protected List<ObjectReferenceRepresentationModel> secondaryObjectReferences = new ArrayList<>();