diff --git a/history/pom.xml b/history/pom.xml
index 9780f3d62..e4b71c0d7 100644
--- a/history/pom.xml
+++ b/history/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>pro.taskana.history</groupId>
-	<artifactId>taskana-history-parent</artifactId>
+	<groupId>pro.taskana.simplehistory</groupId>
+	<artifactId>taskana-simplehistory-parent</artifactId>
 	<packaging>pom</packaging>
 
 	<name>${project.groupId}:${project.artifactId}</name>
diff --git a/history/taskana-loghistory-provider/pom.xml b/history/taskana-loghistory-provider/pom.xml
index d9afac40c..17cb7e8de 100644
--- a/history/taskana-loghistory-provider/pom.xml
+++ b/history/taskana-loghistory-provider/pom.xml
@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>pro.taskana.history</groupId>
-    <artifactId>taskana-history-parent</artifactId>
+    <groupId>pro.taskana.simplehistory</groupId>
+    <artifactId>taskana-simplehistory-parent</artifactId>
     <version>3.2.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
diff --git a/history/taskana-loghistory-provider/src/main/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImpl.java b/history/taskana-loghistory-provider/src/main/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImpl.java
index a1a68611e..edb0aa29b 100644
--- a/history/taskana-loghistory-provider/src/main/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImpl.java
+++ b/history/taskana-loghistory-provider/src/main/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImpl.java
@@ -18,7 +18,8 @@ import pro.taskana.TaskanaEngineConfiguration;
 import pro.taskana.common.api.TaskanaEngine;
 import pro.taskana.common.api.exceptions.SystemException;
 import pro.taskana.spi.history.api.TaskanaHistory;
-import pro.taskana.spi.history.api.events.TaskanaHistoryEvent;
+import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
+import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 
 public class LogfileHistoryServiceImpl implements TaskanaHistory {
 
@@ -49,7 +50,19 @@ public class LogfileHistoryServiceImpl implements TaskanaHistory {
   }
 
   @Override
-  public void create(TaskanaHistoryEvent event) {
+  public void create(TaskHistoryEvent event) {
+
+    try {
+      if (historyLogger.isInfoEnabled()) {
+        historyLogger.info(objectMapper.writeValueAsString(event));
+      }
+    } catch (JsonProcessingException e) {
+      throw new SystemException("Caught exception while serializing history event to JSON ", e);
+    }
+  }
+
+  @Override
+  public void create(WorkbasketHistoryEvent event) {
 
     try {
       if (historyLogger.isInfoEnabled()) {
diff --git a/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java b/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java
index 4a15ac84c..b5c22f03e 100644
--- a/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java
+++ b/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java
@@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.time.Instant;
-import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
@@ -13,7 +13,8 @@ import uk.org.lidalia.slf4jtest.TestLogger;
 import uk.org.lidalia.slf4jtest.TestLoggerFactory;
 
 import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.spi.history.api.events.TaskanaHistoryEvent;
+import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
+import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 
 class LogfileHistoryServiceImplTest {
 
@@ -22,8 +23,8 @@ class LogfileHistoryServiceImplTest {
   TestLogger logger = TestLoggerFactory.getTestLogger("AUDIT");
   @Mock TaskanaEngine taskanaEngine;
 
-  @AfterAll
-  public static void clearLoggers() {
+  @AfterEach
+  public void clearLoggers() {
     TestLoggerFactory.clear();
   }
 
@@ -33,10 +34,10 @@ class LogfileHistoryServiceImplTest {
   }
 
   @Test
-  void should_LogEventAsJson_When_CreateIsCalled() throws Exception {
+  void should_LogTaskEventAsJson_When_CreateIsCalled() throws Exception {
 
     logfileHistoryServiceImpl.initialize(taskanaEngine);
-    TaskanaHistoryEvent eventToBeLogged = new TaskanaHistoryEvent();
+    TaskHistoryEvent eventToBeLogged = new TaskHistoryEvent();
     eventToBeLogged.setId("someId");
     eventToBeLogged.setUserId("someUser");
     eventToBeLogged.setEventType("TASK_CREATED");
@@ -54,8 +55,31 @@ class LogfileHistoryServiceImplTest {
 
     String logMessage = logger.getLoggingEvents().asList().get(0).getMessage();
 
-    TaskanaHistoryEvent deserializedEventFromLogMessage =
-        objectMapper.readValue(logMessage, TaskanaHistoryEvent.class);
+    TaskHistoryEvent deserializedEventFromLogMessage =
+        objectMapper.readValue(logMessage, TaskHistoryEvent.class);
+
+    assertThat(eventToBeLogged).isEqualTo(deserializedEventFromLogMessage);
+  }
+
+  @Test
+  void should_LogWorkbasketEventAsJson_When_CreateIsCalled() throws Exception {
+
+    logfileHistoryServiceImpl.initialize(taskanaEngine);
+    WorkbasketHistoryEvent eventToBeLogged = new WorkbasketHistoryEvent();
+    eventToBeLogged.setId("someId");
+    eventToBeLogged.setUserId("someUser");
+    eventToBeLogged.setEventType("TASK_CREATED");
+    eventToBeLogged.setDomain("DOMAIN_A");
+    eventToBeLogged.setCreated(Instant.now());
+    eventToBeLogged.setKey("someWorkbasketKey");
+    eventToBeLogged.setDetails("someDetails");
+
+    logfileHistoryServiceImpl.create(eventToBeLogged);
+
+    String logMessage = logger.getLoggingEvents().asList().get(0).getMessage();
+
+    WorkbasketHistoryEvent deserializedEventFromLogMessage =
+        objectMapper.readValue(logMessage, WorkbasketHistoryEvent.class);
 
     assertThat(eventToBeLogged).isEqualTo(deserializedEventFromLogMessage);
   }
diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml
index 25d3bfa3a..676ef1e3b 100644
--- a/history/taskana-simplehistory-provider/pom.xml
+++ b/history/taskana-simplehistory-provider/pom.xml
@@ -9,8 +9,8 @@
 	<description>The taskana history events plugin to include in your project.</description>
 
 	<parent>
-		<groupId>pro.taskana.history</groupId>
-		<artifactId>taskana-history-parent</artifactId>
+		<groupId>pro.taskana.simplehistory</groupId>
+		<artifactId>taskana-simplehistory-parent</artifactId>
 		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java
index 27e70070a..2e3bc5fa7 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java
@@ -40,8 +40,8 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
   private TimeInterval[] createdIn;
   private String[] userIdIn;
   private String[] domainIn;
-  private String[] workbasketKeyIn;
-  private String[] workbasketTypeIn;
+  private String[] keyIn;
+  private String[] typeIn;
   private String[] ownerIn;
   private String[] custom1In;
   private String[] custom2In;
@@ -56,8 +56,8 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
   private String[] eventTypeLike;
   private String[] userIdLike;
   private String[] domainLike;
-  private String[] workbasketKeyLike;
-  private String[] workbasketTypeLike;
+  private String[] keyLike;
+  private String[] typeLike;
   private String[] ownerLike;
   private String[] custom1Like;
   private String[] custom2Like;
@@ -98,12 +98,12 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
     return domainIn;
   }
 
-  public String[] getWorkbasketKeyIn() {
-    return workbasketKeyIn;
+  public String[] getKeyIn() {
+    return keyIn;
   }
 
-  public String[] getWorkbasketTypeIn() {
-    return workbasketTypeIn;
+  public String[] getTypeIn() {
+    return typeIn;
   }
 
   public String[] getOwnerIn() {
@@ -158,12 +158,12 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
     return domainLike;
   }
 
-  public String[] getWorkbasketKeyLike() {
-    return workbasketKeyLike;
+  public String[] getKeyLike() {
+    return keyLike;
   }
 
-  public String[] getWorkbasketTypeLike() {
-    return workbasketTypeLike;
+  public String[] getTypeLike() {
+    return typeLike;
   }
 
   public String[] getOwnerLike() {
@@ -239,14 +239,14 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
   }
 
   @Override
-  public WorkbasketHistoryQuery workbasketKeyIn(String... workbasketKey) {
-    this.workbasketKeyIn = toUpperCopy(workbasketKey);
+  public WorkbasketHistoryQuery keyIn(String... workbasketKey) {
+    this.keyIn = toUpperCopy(workbasketKey);
     return this;
   }
 
   @Override
-  public WorkbasketHistoryQuery workbasketTypeIn(String... workbasketType) {
-    this.workbasketTypeIn = toUpperCopy(workbasketType);
+  public WorkbasketHistoryQuery typeIn(String... workbasketType) {
+    this.typeIn = toUpperCopy(workbasketType);
     return this;
   }
 
@@ -330,13 +330,13 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
 
   @Override
   public WorkbasketHistoryQuery workbasketKeyLike(String... workbasketKey) {
-    this.workbasketKeyLike = toUpperCopy(workbasketKey);
+    this.keyLike = toUpperCopy(workbasketKey);
     return this;
   }
 
   @Override
   public WorkbasketHistoryQuery workbasketTypeLike(String... workbasketType) {
-    this.workbasketTypeLike = toUpperCopy(workbasketType);
+    this.typeLike = toUpperCopy(workbasketType);
     return this;
   }
 
@@ -420,13 +420,13 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
   }
 
   @Override
-  public WorkbasketHistoryQuery orderByWorkbasketKey(SortDirection sortDirection) {
-    return addOrderCriteria("WORKBASKET_KEY", sortDirection);
+  public WorkbasketHistoryQuery orderByKey(SortDirection sortDirection) {
+    return addOrderCriteria("KEY", sortDirection);
   }
 
   @Override
-  public WorkbasketHistoryQuery orderByWorkbasketType(SortDirection sortDirection) {
-    return addOrderCriteria("WORKBASKET_TYPE", sortDirection);
+  public WorkbasketHistoryQuery orderByType(SortDirection sortDirection) {
+    return addOrderCriteria("TYPE", sortDirection);
   }
 
   @Override
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java
index 0d7ed5669..c28fedc5d 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java
@@ -14,13 +14,13 @@ public interface WorkbasketHistoryEventMapper {
 
   @Insert(
       "<script>INSERT INTO WORKBASKET_HISTORY_EVENT (ID,WORKBASKET_ID,"
-          + " EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, WORKBASKET_TYPE, OWNER, "
+          + " EVENT_TYPE, CREATED, USER_ID, DOMAIN, KEY, TYPE, OWNER, "
           + " CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, ORGLEVEL_1,"
           + " ORGLEVEL_2, ORGLEVEL_3, ORGLEVEL_4, DETAILS)"
           + " VALUES ( #{historyEvent.id}, #{historyEvent.workbasketId},"
           + " #{historyEvent.eventType}, #{historyEvent.created}, #{historyEvent.userId},"
-          + " #{historyEvent.domain}, #{historyEvent.workbasketKey}, "
-          + " #{historyEvent.workbasketType}, #{historyEvent.owner}, "
+          + " #{historyEvent.domain}, #{historyEvent.key}, "
+          + " #{historyEvent.type}, #{historyEvent.owner}, "
           + " #{historyEvent.custom1}, #{historyEvent.custom2}, #{historyEvent.custom3}, "
           + "#{historyEvent.custom4}, #{historyEvent.orgLevel1}, #{historyEvent.orgLevel2}, "
           + "#{historyEvent.orgLevel3}, #{historyEvent.orgLevel4}, #{historyEvent.details}) "
@@ -29,7 +29,7 @@ public interface WorkbasketHistoryEventMapper {
 
   @Select(
       "<script>"
-          + "SELECT ID, WORKBASKET_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, WORKBASKET_TYPE, OWNER,  "
+          + "SELECT ID, WORKBASKET_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, KEY, TYPE, OWNER,  "
           + "CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, ORGLEVEL_1, ORGLEVEL_2, ORGLEVEL_3, ORGLEVEL_4, DETAILS "
           + "FROM WORKBASKET_HISTORY_EVENT WHERE ID = #{id} "
           + "<if test=\"_databaseId == 'db2'\">with UR </if> "
@@ -42,8 +42,8 @@ public interface WorkbasketHistoryEventMapper {
         @Result(property = "created", column = "CREATED"),
         @Result(property = "userId", column = "USER_ID"),
         @Result(property = "domain", column = "DOMAIN"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
-        @Result(property = "workbasketType", column = "WORKBASKET_TYPE"),
+        @Result(property = "key", column = "KEY"),
+        @Result(property = "type", column = "TYPE"),
         @Result(property = "owner", column = "OWNER"),
         @Result(property = "custom1", column = "CUSTOM_1"),
         @Result(property = "custom2", column = "CUSTOM_2"),
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 02a60c249..26cc66da6 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
@@ -64,7 +64,7 @@ public interface WorkbasketHistoryQuery
    * @param workbasketKey as String
    * @return the query
    */
-  WorkbasketHistoryQuery workbasketKeyIn(String... workbasketKey);
+  WorkbasketHistoryQuery keyIn(String... workbasketKey);
 
   /**
    * Add your workbasketType to your query.
@@ -72,7 +72,7 @@ public interface WorkbasketHistoryQuery
    * @param workbasketType as String
    * @return the query
    */
-  WorkbasketHistoryQuery workbasketTypeIn(String... workbasketType);
+  WorkbasketHistoryQuery typeIn(String... workbasketType);
 
   /**
    * Add your owner to your query.
@@ -334,7 +334,7 @@ public interface WorkbasketHistoryQuery
    *     If sortDirection is null, the result is sorted in ascending order
    * @return the query
    */
-  WorkbasketHistoryQuery orderByWorkbasketKey(SortDirection sortDirection);
+  WorkbasketHistoryQuery orderByKey(SortDirection sortDirection);
 
   /**
    * Sort the query result by WorkbasketType.
@@ -343,7 +343,7 @@ public interface WorkbasketHistoryQuery
    *     If sortDirection is null, the result is sorted in ascending order
    * @return the query
    */
-  WorkbasketHistoryQuery orderByWorkbasketType(SortDirection sortDirection);
+  WorkbasketHistoryQuery orderByType(SortDirection sortDirection);
 
   /**
    * Sort the query result by a custom attribute.
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java
index b851688b8..cf27dacd7 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java
@@ -10,8 +10,8 @@ public enum WorkbasketHistoryQueryColumnName implements QueryColumnName {
   CREATED("created"),
   USER_ID("user_id"),
   DOMAIN("domain"),
-  WORKBASKET_KEY("workbasket_key"),
-  WORKBASKET_TYPE("workbasket_type"),
+  KEY("key"),
+  TYPE("type"),
   OWNER("owner"),
   CUSTOM_1("custom_1"),
   CUSTOM_2("custom_2"),
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java
index 086a978fa..df5d5be05 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java
@@ -14,7 +14,7 @@ public interface WorkbasketHistoryQueryMapper {
 
   @Select(
       "<script>"
-          + "SELECT ID, WORKBASKET_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, WORKBASKET_TYPE,"
+          + "SELECT ID, WORKBASKET_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, KEY, TYPE,"
           + "OWNER, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, ORGLEVEL_1, ORGLEVEL_2, ORGLEVEL_3, ORGLEVEL_4 "
           + "FROM WORKBASKET_HISTORY_EVENT"
           + "<where>"
@@ -25,8 +25,8 @@ public interface WorkbasketHistoryQueryMapper {
           + "<if test='createdIn !=null'> AND ( <foreach item='item' collection='createdIn' separator=',' > ( <if test='item.begin!=null'> CREATED &gt;= #{item.begin} </if> <if test='item.begin!=null and item.end!=null'> AND </if><if test='item.end!=null'> CREATED &lt;=#{item.end} </if>)</foreach>)</if> "
           + "<if test='userIdIn != null'>AND UPPER(USER_ID) IN (<foreach item='item' collection='userIdIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='domainIn != null'>AND UPPER(DOMAIN) IN (<foreach item='item' collection='domainIn' separator=',' >#{item}</foreach>)</if> "
-          + "<if test='workbasketKeyIn != null'>AND UPPER(WORKBASKET_KEY) IN (<foreach item='item' collection='workbasketKeyIn' separator=',' >#{item}</foreach>)</if> "
-          + "<if test='workbasketTypeIn != null'>AND UPPER(WORKBASKET_TYPE) IN (<foreach item='item' collection='workbasketTypeIn' separator=',' >#{item}</foreach>)</if> "
+          + "<if test='keyIn != null'>AND UPPER(KEY) IN (<foreach item='item' collection='keyIn' separator=',' >#{item}</foreach>)</if> "
+          + "<if test='typeIn != null'>AND UPPER(TYPE) IN (<foreach item='item' collection='typeIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='ownerIn != null'>AND UPPER(OWNER) IN (<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='custom1In != null'>AND UPPER(CUSTOM_1) IN (<foreach item='item' collection='custom1In' separator=',' >#{item}</foreach>)</if> "
           + "<if test='custom2In != null'>AND UPPER(CUSTOM_2) IN (<foreach item='item' collection='custom2In' separator=',' >#{item}</foreach>)</if> "
@@ -41,8 +41,8 @@ public interface WorkbasketHistoryQueryMapper {
           + "<if test='eventTypeLike != null'>AND (<foreach item='item' collection='eventTypeLike' separator=' OR ' >UPPER(EVENT_TYPE) LIKE #{item}</foreach>)</if> "
           + "<if test='userIdLike != null'>AND (<foreach item='item' collection='userIdLike' separator=' OR ' >UPPER(USER_ID) LIKE #{item}</foreach>)</if> "
           + "<if test='domainLike != null'>AND (<foreach item='item' collection='domainLike' separator=' OR ' >UPPER(DOMAIN) LIKE #{item}</foreach>)</if> "
-          + "<if test='workbasketKeyLike != null'>AND (<foreach item='item' collection='workbasketKeyLike' separator=' OR ' >UPPER(WORKBASKET_KEY) LIKE #{item}</foreach>)</if> "
-          + "<if test='workbasketTypeLike != null'>AND (<foreach item='item' collection='workbasketTypeLike' separator=' OR ' >UPPER(WORKBASKET_TYPE) LIKE #{item}</foreach>)</if> "
+          + "<if test='keyLike != null'>AND (<foreach item='item' collection='keyLike' separator=' OR ' >UPPER(KEY) LIKE #{item}</foreach>)</if> "
+          + "<if test='typeLike != null'>AND (<foreach item='item' collection='typeLike' separator=' OR ' >UPPER(TYPE) LIKE #{item}</foreach>)</if> "
           + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR ' >UPPER(OWNER) LIKE #{item}</foreach>)</if> "
           + "<if test='custom1Like != null'>AND (<foreach item='item' collection='custom1Like' separator=' OR ' >UPPER(CUSTOM_1) LIKE #{item}</foreach>)</if> "
           + "<if test='custom2Like != null'>AND (<foreach item='item' collection='custom2Like' separator=' OR ' >UPPER(CUSTOM_2) LIKE #{item}</foreach>)</if> "
@@ -63,8 +63,8 @@ public interface WorkbasketHistoryQueryMapper {
         @Result(property = "created", column = "CREATED"),
         @Result(property = "userId", column = "USER_ID"),
         @Result(property = "domain", column = "DOMAIN"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
-        @Result(property = "workbasketType", column = "WORKBASKET_TYPE"),
+        @Result(property = "key", column = "KEY"),
+        @Result(property = "type", column = "TYPE"),
         @Result(property = "owner", column = "OWNER"),
         @Result(property = "custom1", column = "CUSTOM_1"),
         @Result(property = "custom2", column = "CUSTOM_2"),
@@ -88,8 +88,8 @@ public interface WorkbasketHistoryQueryMapper {
           + "<if test='createdIn !=null'> AND ( <foreach item='item' collection='createdIn' separator=',' > ( <if test='item.begin!=null'> CREATED &gt;= #{item.begin} </if> <if test='item.begin!=null and item.end!=null'> AND </if><if test='item.end!=null'> CREATED &lt;=#{item.end} </if>)</foreach>)</if> "
           + "<if test='userIdIn != null'>AND UPPER(USER_ID) IN (<foreach item='item' collection='userIdIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='domainIn != null'>AND UPPER(DOMAIN) IN (<foreach item='item' collection='domainIn' separator=',' >#{item}</foreach>)</if> "
-          + "<if test='workbasketKeyIn != null'>AND UPPER(WORKBASKET_KEY) IN (<foreach item='item' collection='workbasketKeyIn' separator=',' >#{item}</foreach>)</if> "
-          + "<if test='workbasketTypeIn != null'>AND UPPER(WORKBASKET_TYPE) IN (<foreach item='item' collection='workbasketTypeIn' separator=',' >#{item}</foreach>)</if> "
+          + "<if test='keyIn != null'>AND UPPER(KEY) IN (<foreach item='item' collection='keyIn' separator=',' >#{item}</foreach>)</if> "
+          + "<if test='typeIn != null'>AND UPPER(TYPE) IN (<foreach item='item' collection='typeIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='ownerIn != null'>AND UPPER(OWNER) IN (<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='custom1In != null'>AND UPPER(CUSTOM_1) IN (<foreach item='item' collection='custom1In' separator=',' >#{item}</foreach>)</if> "
           + "<if test='custom2In != null'>AND UPPER(CUSTOM_2) IN (<foreach item='item' collection='custom2In' separator=',' >#{item}</foreach>)</if> "
@@ -104,8 +104,8 @@ public interface WorkbasketHistoryQueryMapper {
           + "<if test='eventTypeLike != null'>AND (<foreach item='item' collection='eventTypeLike' separator=' OR ' >UPPER(EVENT_TYPE) LIKE #{item}</foreach>)</if> "
           + "<if test='userIdLike != null'>AND (<foreach item='item' collection='userIdLike' separator=' OR ' >UPPER(USER_ID) LIKE #{item}</foreach>)</if> "
           + "<if test='domainLike != null'>AND (<foreach item='item' collection='domainLike' separator=' OR ' >UPPER(DOMAIN) LIKE #{item}</foreach>)</if> "
-          + "<if test='workbasketKeyLike != null'>AND (<foreach item='item' collection='workbasketKeyLike' separator=' OR ' >UPPER(WORKBASKET_KEY) LIKE #{item}</foreach>)</if> "
-          + "<if test='workbasketTypeLike != null'>AND (<foreach item='item' collection='workbasketTypeLike' separator=' OR ' >UPPER(WORKBASKET_TYPE) LIKE #{item}</foreach>)</if> "
+          + "<if test='keyLike != null'>AND (<foreach item='item' collection='keyLike' separator=' OR ' >UPPER(KEY) LIKE #{item}</foreach>)</if> "
+          + "<if test='typeLike != null'>AND (<foreach item='item' collection='typeLike' separator=' OR ' >UPPER(TYPE) LIKE #{item}</foreach>)</if> "
           + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR ' >UPPER(OWNER) LIKE #{item}</foreach>)</if> "
           + "<if test='custom1Like != null'>AND (<foreach item='item' collection='custom1Like' separator=' OR ' >UPPER(CUSTOM_1) LIKE #{item}</foreach>)</if> "
           + "<if test='custom2Like != null'>AND (<foreach item='item' collection='custom2Like' separator=' OR ' >UPPER(CUSTOM_2) LIKE #{item}</foreach>)</if> "
@@ -129,8 +129,8 @@ public interface WorkbasketHistoryQueryMapper {
           + "<if test='createdIn !=null'> AND ( <foreach item='item' collection='createdIn' separator=',' > ( <if test='item.begin!=null'> CREATED &gt;= #{item.begin} </if> <if test='item.begin!=null and item.end!=null'> AND </if><if test='item.end!=null'> CREATED &lt;=#{item.end} </if>)</foreach>)</if> "
           + "<if test='userIdIn != null'>AND UPPER(USER_ID) IN (<foreach item='item' collection='userIdIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='domainIn != null'>AND UPPER(DOMAIN) IN (<foreach item='item' collection='domainIn' separator=',' >#{item}</foreach>)</if> "
-          + "<if test='workbasketKeyIn != null'>AND UPPER(WORKBASKET_KEY) IN (<foreach item='item' collection='workbasketKeyIn' separator=',' >#{item}</foreach>)</if> "
-          + "<if test='workbasketTypeIn != null'>AND UPPER(WORKBASKET_TYPE) IN (<foreach item='item' collection='workbasketTypeIn' separator=',' >#{item}</foreach>)</if> "
+          + "<if test='keyIn != null'>AND UPPER(KEY) IN (<foreach item='item' collection='keyIn' separator=',' >#{item}</foreach>)</if> "
+          + "<if test='typeIn != null'>AND UPPER(TYPE) IN (<foreach item='item' collection='typeIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='ownerIn != null'>AND UPPER(OWNER) IN (<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
           + "<if test='custom1In != null'>AND UPPER(CUSTOM_1) IN (<foreach item='item' collection='custom1In' separator=',' >#{item}</foreach>)</if> "
           + "<if test='custom2In != null'>AND UPPER(CUSTOM_2) IN (<foreach item='item' collection='custom2In' separator=',' >#{item}</foreach>)</if> "
@@ -145,8 +145,8 @@ public interface WorkbasketHistoryQueryMapper {
           + "<if test='eventTypeLike != null'>AND (<foreach item='item' collection='eventTypeLike' separator=' OR ' >UPPER(EVENT_TYPE) LIKE #{item}</foreach>)</if> "
           + "<if test='userIdLike != null'>AND (<foreach item='item' collection='userIdLike' separator=' OR ' >UPPER(USER_ID) LIKE #{item}</foreach>)</if> "
           + "<if test='domainLike != null'>AND (<foreach item='item' collection='domainLike' separator=' OR ' >UPPER(DOMAIN) LIKE #{item}</foreach>)</if> "
-          + "<if test='workbasketKeyLike != null'>AND (<foreach item='item' collection='workbasketKeyLike' separator=' OR ' >UPPER(WORKBASKET_KEY) LIKE #{item}</foreach>)</if> "
-          + "<if test='workbasketTypeLike != null'>AND (<foreach item='item' collection='workbasketTypeLike' separator=' OR ' >UPPER(WORKBASKET_TYPE) LIKE #{item}</foreach>)</if> "
+          + "<if test='keyLike != null'>AND (<foreach item='item' collection='keyLike' separator=' OR ' >UPPER(KEY) LIKE #{item}</foreach>)</if> "
+          + "<if test='typeLike != null'>AND (<foreach item='item' collection='typeLike' separator=' OR ' >UPPER(TYPE) LIKE #{item}</foreach>)</if> "
           + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR ' >UPPER(OWNER) LIKE #{item}</foreach>)</if> "
           + "<if test='custom1Like != null'>AND (<foreach item='item' collection='custom1Like' separator=' OR ' >UPPER(CUSTOM_1) LIKE #{item}</foreach>)</if> "
           + "<if test='custom2Like != null'>AND (<foreach item='item' collection='custom2Like' separator=' OR ' >UPPER(CUSTOM_2) LIKE #{item}</foreach>)</if> "
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
index a1fce467c..c929384f4 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
@@ -23,6 +23,7 @@ import pro.taskana.sampledata.SampleDataGenerator;
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
 import pro.taskana.simplehistory.impl.TaskanaHistoryEngineImpl;
 import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.task.api.models.ObjectReference;
@@ -94,15 +95,12 @@ public abstract class AbstractAccTest {
    * @return Workbasket History event object created.
    */
   public static WorkbasketHistoryEvent createWorkbasketHistoryEvent(
-      String workbasketKey,
-      String type,
-      String userid,
-      String details) {
+      String workbasketKey, String type, String userid, String details) {
     WorkbasketHistoryEvent historyEvent = new WorkbasketHistoryEvent();
     historyEvent.setId(IdGenerator.generateWithPrefix(ID_PREFIX_HISTORY_EVENT));
     historyEvent.setUserId(userid);
     historyEvent.setDetails(details);
-    historyEvent.setWorkbasketKey(workbasketKey);
+    historyEvent.setKey(workbasketKey);
     historyEvent.setEventType(type);
     return historyEvent;
   }
@@ -182,6 +180,24 @@ public abstract class AbstractAccTest {
     return objectRef;
   }
 
+  protected static WorkbasketHistoryEventMapper getWorkbasketHistoryEventMapper() {
+
+    SqlSessionManager manager = null;
+
+    Field sessionManager;
+    try {
+      sessionManager = TaskanaHistoryEngineImpl.class.getDeclaredField("sessionManager");
+
+      sessionManager.setAccessible(true);
+
+      manager = (SqlSessionManager) sessionManager.get(taskanaHistoryEngine);
+
+    } catch (Exception e) {
+      LOGGER.warn("Caught unexpected exception ", e);
+    }
+    return manager.getMapper(WorkbasketHistoryEventMapper.class);
+  }
+
   @BeforeAll
   static void setupTest() throws Exception {
     resetDb(null);
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
index c1b86539b..15279faf7 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
@@ -50,7 +50,7 @@ class CreateHistoryEventOnTaskCancelClaimAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_CLAIM_CANCELLED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.CLAIM_CANCELLED.getName());
 
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java
index b9d837eac..608aecbff 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java
@@ -39,7 +39,7 @@ class CreateHistoryEventOnTaskCancellationAccTest extends AbstractAccTest {
 
     String eventType = listEvents.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_CANCELLED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.CANCELLED.getName());
   }
 
   @Test
@@ -61,6 +61,6 @@ class CreateHistoryEventOnTaskCancellationAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_CANCELLED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.CANCELLED.getName());
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
index 2fab0a516..6cd2dde54 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
@@ -48,6 +48,6 @@ class CreateHistoryEventOnTaskClaimAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_CLAIMED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.CLAIMED.getName());
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java
index 8cbf683e5..0ad17e070 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java
@@ -48,6 +48,6 @@ class CreateHistoryEventOnTaskCompletionAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_COMPLETED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.COMPLETED.getName());
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java
index 4017e97d8..ead1b2b59 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java
@@ -44,6 +44,6 @@ class CreateHistoryEventOnTaskCreationAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_CREATED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.CREATED.getName());
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java
index a600be1c4..4144ffd36 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java
@@ -39,7 +39,7 @@ class CreateHistoryEventOnTaskTerminationAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_TERMINATED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.TERMINATED.getName());
   }
 
   @Test
@@ -61,6 +61,6 @@ class CreateHistoryEventOnTaskTerminationAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_TERMINATED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.TERMINATED.getName());
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java
index 7f31eec8c..244eac492 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java
@@ -46,6 +46,6 @@ class CreateHistoryEventOnTaskTransferAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_TRANSFERRED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.TRANSFERRED.getName());
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java
index 18187229d..18ac1e8f0 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java
@@ -48,7 +48,7 @@ class CreateHistoryEventOnTaskUpdateAccTest extends AbstractAccTest {
 
     String eventType = events.get(0).getEventType();
 
-    assertThat(eventType).isEqualTo(TaskHistoryEventType.TASK_UPDATED.getName());
+    assertThat(eventType).isEqualTo(TaskHistoryEventType.UPDATED.getName());
 
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java
index ace1bd964..e351dca7f 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java
@@ -6,6 +6,7 @@ import acceptance.AbstractAccTest;
 import org.junit.jupiter.api.Test;
 
 import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
+import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
 
 
 class GetTaskHistoryEventAccTest extends AbstractAccTest {
@@ -26,7 +27,7 @@ class GetTaskHistoryEventAccTest extends AbstractAccTest {
         getHistoryService().getTaskHistoryEvent("HEI:000000000000000000000000000000000000");
     assertThat(taskHistoryEvent.getBusinessProcessId()).isEqualTo("BPI:01");
     assertThat(taskHistoryEvent.getUserId()).isEqualTo("admin");
-    assertThat(taskHistoryEvent.getEventType()).isEqualTo("TASK_UPDATED");
+    assertThat(taskHistoryEvent.getEventType()).isEqualTo(TaskHistoryEventType.UPDATED.getName());
     assertThat(taskHistoryEvent.getDetails()).isEqualTo(detailsJson);
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java
index 9b166ef98..95088d456 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -20,6 +21,8 @@ class CreateHistoryEventOnWorkbasketAccessItemCreationAccTest extends AbstractAc
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -43,8 +46,11 @@ class CreateHistoryEventOnWorkbasketAccessItemCreationAccTest extends AbstractAc
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
     assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEM_CREATED.getName());
+        .isEqualTo(WorkbasketHistoryEventType.ACCESS_ITEM_CREATED.getName());
+
+    assertThat(details).contains("\"newValue\":\"peter\"");
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java
index 0291155e6..c43919b7b 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -19,6 +20,8 @@ class CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest extends AbstractAc
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -41,10 +44,12 @@ class CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest extends AbstractAc
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
     assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEM_DELETED.getName());
+        .isEqualTo(WorkbasketHistoryEventType.ACCESS_ITEM_DELETED.getName());
 
+    assertThat(details).contains("\"oldValue\":\"WBI:100000000000000000000000000000000004\"");
   }
 
   @WithAccessId(user = "admin")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java
index b95e0295c..c0d8151a6 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -19,6 +20,8 @@ class CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest extends AbstractA
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -46,9 +49,13 @@ class CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest extends AbstractA
 
     assertThat(events).hasSize(4);
 
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
+
     assertThat(events)
         .extracting(WorkbasketHistoryEvent::getEventType)
-        .containsOnly(WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEM_DELETED.getName());
+        .containsOnly(WorkbasketHistoryEventType.ACCESS_ITEM_DELETED.getName());
+
+    assertThat(details).contains("\"oldValue\":\"WBI:100000000000000000000000000000000001\"");
   }
 
   @WithAccessId(user = "admin")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java
index 710a8c124..0ff607770 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java
@@ -11,6 +11,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -21,6 +22,8 @@ class CreateHistoryEventOnWorkbasketAccessItemsSetAccTest extends AbstractAccTes
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -57,8 +60,11 @@ class CreateHistoryEventOnWorkbasketAccessItemsSetAccTest extends AbstractAccTes
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
     assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEMS_UPDATED.getName());
+        .isEqualTo(WorkbasketHistoryEventType.ACCESS_ITEMS_UPDATED.getName());
+
+    assertThat(details).contains("peter");
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java
index 106e0382a..e57ef7a91 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -21,6 +22,8 @@ class CreateHistoryEventOnWorkbasketCreationAccTest extends AbstractAccTest {
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -39,9 +42,10 @@ class CreateHistoryEventOnWorkbasketCreationAccTest extends AbstractAccTest {
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
-    assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_CREATED.getName());
+    assertThat(eventType).isEqualTo(WorkbasketHistoryEventType.CREATED.getName());
 
+    assertThat(details).contains("Megabasket");
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java
index 3462c1189..9190a75d6 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -19,6 +20,8 @@ class CreateHistoryEventOnWorkbasketDeletionAccTest extends AbstractAccTest {
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -37,9 +40,10 @@ class CreateHistoryEventOnWorkbasketDeletionAccTest extends AbstractAccTest {
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
-    assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_DELETED.getName());
+    assertThat(eventType).isEqualTo(WorkbasketHistoryEventType.DELETED.getName());
 
+    assertThat(details).contains("\"oldValue\":\"WBI:100000000000000000000000000000000008\"");
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java
index 877b0104a..7ffbb954b 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -19,6 +20,8 @@ class CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest extends Abstr
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -41,8 +44,11 @@ class CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest extends Abstr
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
     assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_DISTRIBUTION_TARGET_ADDED.getName());
+        .isEqualTo(WorkbasketHistoryEventType.DISTRIBUTION_TARGET_ADDED.getName());
+
+    assertThat(details).contains("\"newValue\":\"WBI:100000000000000000000000000000000001\"");
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java
index 419b5d008..8c722fde7 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -19,6 +20,8 @@ class CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest extends Abs
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -42,8 +45,11 @@ class CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest extends Abs
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
     assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_DISTRIBUTION_TARGET_REMOVED.getName());
+        .isEqualTo(WorkbasketHistoryEventType.DISTRIBUTION_TARGET_REMOVED.getName());
+
+    assertThat(details).contains("\"oldValue\":\"WBI:100000000000000000000000000000000002\"");
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java
index 54c9c9474..f8845f96c 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java
@@ -11,6 +11,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -20,6 +21,8 @@ class CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest extends Abstra
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -47,8 +50,14 @@ class CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest extends Abstra
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
     assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_DISTRIBUTION_TARGETS_UPDATED.getName());
+        .isEqualTo(WorkbasketHistoryEventType.DISTRIBUTION_TARGETS_UPDATED.getName());
+
+    assertThat(details)
+        .contains(
+            "\"newValue\":[\"WBI:100000000000000000000000000000000002\","
+                + "\"WBI:100000000000000000000000000000000003\"");
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java
index c26f8d029..8e2c11970 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketService;
@@ -19,6 +20,8 @@ class CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest extends AbstractAcc
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "admin")
   @Test
@@ -39,8 +42,12 @@ class CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest extends AbstractAcc
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String eventWorkbasketId = events.get(0).getWorkbasketId();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
     assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_MARKED_FOR_DELETION.getName());
+        .isEqualTo(WorkbasketHistoryEventType.MARKED_FOR_DELETION.getName());
+
+    assertThat(eventWorkbasketId).isEqualTo(workbasketId);
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java
index ebd64748c..cac846ae7 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
+import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
 import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
 import pro.taskana.workbasket.api.WorkbasketCustomField;
@@ -22,10 +23,12 @@ class CreateHistoryEventOnWorkbasketUpdateAccTest extends AbstractAccTest {
 
   private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
   private final SimpleHistoryServiceImpl historyService = getHistoryService();
+  private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
+      getWorkbasketHistoryEventMapper();
 
   @WithAccessId(user = "businessadmin")
   @Test
-  void testUpdateWorkbasket() throws Exception {
+  void should_CreateWorkbasketUpdatedHistoryEvent_When_WorkbasketIsUpdated() throws Exception {
 
     Workbasket workbasket = workbasketService.getWorkbasket("GPK_KSC", "DOMAIN_A");
 
@@ -54,8 +57,10 @@ class CreateHistoryEventOnWorkbasketUpdateAccTest extends AbstractAccTest {
     assertThat(events).hasSize(1);
 
     String eventType = events.get(0).getEventType();
+    String details = workbasketHistoryEventMapper.findById(events.get(0).getId()).getDetails();
 
-    assertThat(eventType)
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_UPDATED.getName());
+    assertThat(eventType).isEqualTo(WorkbasketHistoryEventType.UPDATED.getName());
+
+    assertThat(details).contains("\"new level 1\"");
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java
index f8e073dd8..824de91b7 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java
@@ -14,6 +14,7 @@ import pro.taskana.simplehistory.impl.task.TaskHistoryQuery;
 import pro.taskana.simplehistory.impl.task.TaskHistoryQueryColumnName;
 import pro.taskana.spi.history.api.events.TaskHistoryCustomField;
 import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
+import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
 
 /** Test for Task History queries. */
 class QueryTaskHistoryAccTest extends AbstractAccTest {
@@ -85,10 +86,13 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
   void should_ReturnSingleHistoryEvent_When_UsingSingleMethod() {
     TaskHistoryEvent single =
         getHistoryService().createTaskHistoryQuery().userIdIn("peter").single();
-    assertThat(single.getEventType()).isEqualTo("TASK_CREATED");
+    assertThat(single.getEventType()).isEqualTo(TaskHistoryEventType.CREATED.getName());
 
     single =
-        getHistoryService().createTaskHistoryQuery().eventTypeIn("TASK_CREATED", "xy").single();
+        getHistoryService()
+            .createTaskHistoryQuery()
+            .eventTypeIn(TaskHistoryEventType.CREATED.getName(), "xy")
+            .single();
     assertThat(single.getUserId()).isEqualTo("peter");
   }
 
@@ -122,7 +126,11 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
             .list();
     assertThat(returnValues).hasSize(2);
 
-    returnValues = getHistoryService().createTaskHistoryQuery().eventTypeIn("TASK_CREATED").list();
+    returnValues =
+        getHistoryService()
+            .createTaskHistoryQuery()
+            .eventTypeIn(TaskHistoryEventType.CREATED.getName())
+            .list();
     assertThat(returnValues).hasSize(12);
 
     TimeInterval timeInterval = new TimeInterval(Instant.now().minusSeconds(10), Instant.now());
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java
index 0c22a3540..0ebfad688 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java
@@ -53,7 +53,7 @@ class QueryWorkbasketHistoryAccTest extends AbstractAccTest {
     WorkbasketHistoryQuery query =
         historyService
             .createWorkbasketHistoryQuery()
-            .eventTypeIn(WorkbasketHistoryEventType.WORKBASKET_CREATED.getName())
+            .eventTypeIn(WorkbasketHistoryEventType.CREATED.getName())
             .domainLike("%A")
             .custom1In("custom1", "otherCustom1")
             .orderByCreated(SortDirection.DESCENDING);
@@ -97,12 +97,12 @@ class QueryWorkbasketHistoryAccTest extends AbstractAccTest {
     WorkbasketHistoryEvent single =
         historyService.createWorkbasketHistoryQuery().userIdIn("peter").single();
     assertThat(single.getEventType())
-        .isEqualTo(WorkbasketHistoryEventType.WORKBASKET_CREATED.getName());
+        .isEqualTo(WorkbasketHistoryEventType.CREATED.getName());
 
     single =
         historyService
             .createWorkbasketHistoryQuery()
-            .eventTypeIn(WorkbasketHistoryEventType.WORKBASKET_CREATED.getName(), "xy")
+            .eventTypeIn(WorkbasketHistoryEventType.CREATED.getName(), "xy")
             .single();
     assertThat(single.getUserId()).isEqualTo("peter");
   }
@@ -133,7 +133,7 @@ class QueryWorkbasketHistoryAccTest extends AbstractAccTest {
     returnValues =
         historyService
             .createWorkbasketHistoryQuery()
-            .eventTypeIn(WorkbasketHistoryEventType.WORKBASKET_CREATED.getName())
+            .eventTypeIn(WorkbasketHistoryEventType.CREATED.getName())
             .list();
     assertThat(returnValues).hasSize(6);
 
@@ -147,7 +147,7 @@ class QueryWorkbasketHistoryAccTest extends AbstractAccTest {
     returnValues = historyService.createWorkbasketHistoryQuery().domainIn("DOMAIN_A").list();
     assertThat(returnValues).hasSize(10);
 
-    returnValues = historyService.createWorkbasketHistoryQuery().workbasketKeyIn("soRt003").list();
+    returnValues = historyService.createWorkbasketHistoryQuery().keyIn("soRt003").list();
     assertThat(returnValues).hasSize(5);
 
     returnValues = historyService.createWorkbasketHistoryQuery().custom1In("custom1").list();
@@ -186,7 +186,7 @@ class QueryWorkbasketHistoryAccTest extends AbstractAccTest {
     assertThat(returnValues).hasSize(10);
 
     returnValues =
-        historyService.createWorkbasketHistoryQuery().eventTypeLike("WORKBASKET_C%").list();
+        historyService.createWorkbasketHistoryQuery().eventTypeLike("C%").list();
     assertThat(returnValues).hasSize(6);
 
     returnValues = historyService.createWorkbasketHistoryQuery().userIdLike("p%", "c%").list();
@@ -252,13 +252,13 @@ class QueryWorkbasketHistoryAccTest extends AbstractAccTest {
     returnedList =
         historyService
             .createWorkbasketHistoryQuery()
-            .listValues(WorkbasketHistoryQueryColumnName.WORKBASKET_KEY, null);
+            .listValues(WorkbasketHistoryQueryColumnName.KEY, null);
     assertThat(returnedList).hasSize(2);
 
     returnedList =
         historyService
             .createWorkbasketHistoryQuery()
-            .listValues(WorkbasketHistoryQueryColumnName.WORKBASKET_TYPE, null);
+            .listValues(WorkbasketHistoryQueryColumnName.TYPE, null);
     assertThat(returnedList).hasSize(1);
 
     returnedList =
diff --git a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImplTest.java b/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImplTest.java
index cbc12c7fb..7881d2b4b 100644
--- a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImplTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImplTest.java
@@ -89,7 +89,7 @@ class SimpleHistoryServiceImplTest {
     WorkbasketHistoryEvent expectedEvent =
         AbstractAccTest.createWorkbasketHistoryEvent(
             "wbKey1",
-            WorkbasketHistoryEventType.WORKBASKET_CREATED.getName(),
+            WorkbasketHistoryEventType.CREATED.getName(),
             "someUserId",
             "someDetails");
 
@@ -128,20 +128,20 @@ class SimpleHistoryServiceImplTest {
     returnList.add(
         AbstractAccTest.createWorkbasketHistoryEvent(
             "wbKey1",
-            WorkbasketHistoryEventType.WORKBASKET_CREATED.getName(),
+            WorkbasketHistoryEventType.CREATED.getName(),
             "someUserId",
             "someDetails"));
     when(taskanaHistoryEngineMock.getSqlSession()).thenReturn(sqlSessionMock);
     when(sqlSessionMock.selectList(any(), any())).thenReturn(new ArrayList<>(returnList));
 
     final List<WorkbasketHistoryEvent> result =
-        cutSpy.createWorkbasketHistoryQuery().workbasketKeyIn("wbKey1").list();
+        cutSpy.createWorkbasketHistoryQuery().keyIn("wbKey1").list();
 
     verify(taskanaHistoryEngineMock, times(1)).openConnection();
     verify(taskanaHistoryEngineMock, times(1)).getSqlSession();
     verify(sqlSessionMock, times(1)).selectList(any(), any());
     verify(taskanaHistoryEngineMock, times(1)).returnConnection();
     assertThat(result).hasSize(returnList.size());
-    assertThat(result.get(0).getWorkbasketKey()).isEqualTo(returnList.get(0).getWorkbasketKey());
+    assertThat(result.get(0).getKey()).isEqualTo(returnList.get(0).getKey());
   }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImplTest.java b/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImplTest.java
index a6d599908..fc20a8be5 100644
--- a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImplTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImplTest.java
@@ -44,7 +44,7 @@ class WorkbasketHistoryQueryImplTest {
     returnList.add(
         createHistoryEvent(
             "abcd",
-            WorkbasketHistoryEventType.WORKBASKET_CREATED.getName(),
+            WorkbasketHistoryEventType.CREATED.getName(),
             "someUserId",
             "someDetails",
             null));
@@ -58,7 +58,7 @@ class WorkbasketHistoryQueryImplTest {
     List<WorkbasketHistoryEvent> result =
         historyQueryImpl
             .workbasketIdIn("WBI:01")
-            .workbasketKeyIn("abcd", "some_random_string")
+            .keyIn("abcd", "some_random_string")
             .userIdIn("someUserId")
             .createdWithin(interval)
             .list();
@@ -73,7 +73,7 @@ class WorkbasketHistoryQueryImplTest {
     he.setId(IdGenerator.generateWithPrefix(ID_PREFIX_HISTORY_EVENT));
     he.setUserId(userId);
     he.setDetails(details);
-    he.setWorkbasketKey(workbasketKey);
+    he.setKey(workbasketKey);
     he.setEventType(type);
     he.setCreated(created);
     return he;
diff --git a/history/taskana-simplehistory-rest-spring-example/pom.xml b/history/taskana-simplehistory-rest-spring-example/pom.xml
index 03f44e89a..8e4b5cc52 100644
--- a/history/taskana-simplehistory-rest-spring-example/pom.xml
+++ b/history/taskana-simplehistory-rest-spring-example/pom.xml
@@ -9,8 +9,8 @@
     <description>Demo project for taskana-simplehistory-rest-spring</description>
 
     <parent>
-        <groupId>pro.taskana.history</groupId>
-        <artifactId>taskana-history-parent</artifactId>
+        <groupId>pro.taskana.simplehistory</groupId>
+        <artifactId>taskana-simplehistory-parent</artifactId>
         <version>3.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/history/taskana-simplehistory-rest-spring/pom.xml b/history/taskana-simplehistory-rest-spring/pom.xml
index cffdf3006..8343a2734 100644
--- a/history/taskana-simplehistory-rest-spring/pom.xml
+++ b/history/taskana-simplehistory-rest-spring/pom.xml
@@ -9,8 +9,8 @@
 	<description>The taskana history events plugin, spring based REST API.</description>
 
 	<parent>
-		<groupId>pro.taskana.history</groupId>
-		<artifactId>taskana-history-parent</artifactId>
+		<groupId>pro.taskana.simplehistory</groupId>
+		<artifactId>taskana-simplehistory-parent</artifactId>
 		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/sampledata/SampleDataGenerator.java b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/sampledata/SampleDataGenerator.java
index 58c939623..8cf4f5a57 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/sampledata/SampleDataGenerator.java
+++ b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/sampledata/SampleDataGenerator.java
@@ -21,7 +21,7 @@ public class SampleDataGenerator {
   private static final Logger LOGGER = LoggerFactory.getLogger(SampleDataGenerator.class);
   private static final String TEST_DATA = "/sql.sample-data";
   private static final String CLEAR = TEST_DATA + "/clear-db.sql";
-  private static final String HISTORY_EVENT = TEST_DATA + "/history-event.sql";
+  private static final String TASK_HISTORY_EVENT = TEST_DATA + "/task-history-event.sql";
   DataSource dataSource;
   String dbProductName;
 
@@ -58,7 +58,7 @@ public class SampleDataGenerator {
       runner.runScript(
           new BufferedReader(
               new InputStreamReader(
-                  SampleDataGenerator.class.getResourceAsStream(HISTORY_EVENT),
+                  SampleDataGenerator.class.getResourceAsStream(TASK_HISTORY_EVENT),
                   StandardCharsets.UTF_8)));
 
     } catch (Exception e) {
diff --git a/history/taskana-simplehistory-rest-spring/src/main/resources/sql.sample-data/history-event.sql b/history/taskana-simplehistory-rest-spring/src/main/resources/sql.sample-data/history-event.sql
deleted file mode 100644
index a93527d11..000000000
--- a/history/taskana-simplehistory-rest-spring/src/main/resources/sql.sample-data/history-event.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-INSERT INTO TASK_HISTORY_EVENT (ID, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY, ATTACHMENT_CLASSIFICATION_KEY, OLD_VALUE, NEW_VALUE, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, DETAILS) VALUES
--- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID,                                        EVENT_TYPE, TASK_CREATEDD,                                        USER_ID,    DOMAIN,         WORKBASKET_KEY,                                                     POR_COMPANY     , POR_SYSTEM, POR_INSTANCE      , POR_TYPE      , POR_VALUE     , TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY , ATTACHMENT_CLASSIFICATION_KEY , OLD_VALUE     , NEW_VALUE     , CUSTOM_1      , CUSTOM_2      , CUSTOM_3      , CUSTOM_4
-('HEI:000000000000000000000000000000000000','BPI:01'               ,'',                        'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   CURRENT_TIMESTAMP ,                      'USER_2_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,' L140101'                         , 'TASK'                       ,''                    ,'old_val12'      ,'new_val12'      ,'custom1'      ,'custom2'      , 'custom3'     ,'custom4', 'some Details'),
-('HEI:000000000000000000000000000000000001','BPI:02'               ,'',                        'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -2, CURRENT_TIMESTAMP ),  'USER_1_1', 'DOMAIN_A',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '65464564'                     ,  ''                               ,  ''                          ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000002','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000003','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000004','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000005','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000006','BPI:06'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000007','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000008','BPI:04'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_CREATED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000009','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000010','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000011','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000012','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000013','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000014','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000015','BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000016','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_CREATED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000017','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000018','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000019','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000020','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000021','BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000022','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000023','BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000024','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000025','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000026','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_CREATED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000027','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000028','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000029','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000030','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000031','BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000032','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000033','BPI:06'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000034','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_CREATED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000035','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000036','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000037','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000038','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000039','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000040','BPI:06'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000041','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000042','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('HEI:000000000000000000000000000000000043','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('HEI:000000000000000000000000000000000044','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details');
\ No newline at end of file
diff --git a/history/taskana-simplehistory-rest-spring/src/main/resources/sql.sample-data/task-history-event.sql b/history/taskana-simplehistory-rest-spring/src/main/resources/sql.sample-data/task-history-event.sql
new file mode 100644
index 000000000..cc3259ffc
--- /dev/null
+++ b/history/taskana-simplehistory-rest-spring/src/main/resources/sql.sample-data/task-history-event.sql
@@ -0,0 +1,47 @@
+INSERT INTO TASK_HISTORY_EVENT (ID, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY, ATTACHMENT_CLASSIFICATION_KEY, OLD_VALUE, NEW_VALUE, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, DETAILS) VALUES
+-- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID,                                        EVENT_TYPE, CREATED,                                        USER_ID,    DOMAIN,         WORKBASKET_KEY,                                                     POR_COMPANY     , POR_SYSTEM, POR_INSTANCE      , POR_TYPE      , POR_VALUE     , TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY , ATTACHMENT_CLASSIFICATION_KEY , OLD_VALUE     , NEW_VALUE     , CUSTOM_1      , CUSTOM_2      , CUSTOM_3      , CUSTOM_4
+('HEI:000000000000000000000000000000000000','BPI:01'               ,'',                        'TKI:000000000000000000000000000000000000',     'CREATED',   CURRENT_TIMESTAMP ,                      'USER_2_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,' L140101'                         , 'TASK'                       ,''                    ,'old_val12'      ,'new_val12'      ,'custom1'      ,'custom2'      , 'custom3'     ,'custom4', 'some Details'),
+('HEI:000000000000000000000000000000000001','BPI:02'               ,'',                        'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -2, CURRENT_TIMESTAMP ),  'USER_1_1', 'DOMAIN_A',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '65464564'                     ,  ''                               ,  ''                          ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000002','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000003','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000004','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000005','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000006','BPI:06'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000007','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000008','BPI:04'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'CREATED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000009','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000010','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000011','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000012','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000013','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000014','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000015','BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000016','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'CREATED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000017','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000018','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000019','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000020','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000021','BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000022','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000023','BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000024','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000025','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000026','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'CREATED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000027','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000028','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000029','BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000030','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000031','BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000032','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000033','BPI:06'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000034','BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'CREATED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000035','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000036','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000037','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000038','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000039','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000040','BPI:06'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000041','BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000042','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('HEI:000000000000000000000000000000000043','BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   DATEADD('DAY', -1, CURRENT_TIMESTAMP ),  'USER_1_2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('HEI:000000000000000000000000000000000044','BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', CURRENT_TIMESTAMP ,                        'USER_2_1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details');
\ No newline at end of file
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCancelledEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCancelledEvent.java
index dc63fd1b1..7edeb15b0 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCancelledEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCancelledEvent.java
@@ -7,7 +7,7 @@ public class TaskCancelledEvent extends TaskHistoryEvent {
 
   public TaskCancelledEvent(String id, Task task, String userId) {
     super(id, task, userId, null);
-    eventType = "TASK_CANCELLED";
+    eventType = TaskHistoryEventType.CANCELLED.getName();
     created = task.getCompleted();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskClaimCancelledEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskClaimCancelledEvent.java
index 6be44e1c8..5067ddafe 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskClaimCancelledEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskClaimCancelledEvent.java
@@ -7,7 +7,7 @@ public class TaskClaimCancelledEvent extends TaskHistoryEvent {
 
   public TaskClaimCancelledEvent(String id, Task task, String userId) {
     super(id, task, userId, null);
-    eventType = TaskHistoryEventType.TASK_CLAIM_CANCELLED.getName();
+    eventType = TaskHistoryEventType.CLAIM_CANCELLED.getName();
     created = task.getModified();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskClaimedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskClaimedEvent.java
index 6ed66b988..9a426fe86 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskClaimedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskClaimedEvent.java
@@ -7,7 +7,7 @@ public class TaskClaimedEvent extends TaskHistoryEvent {
 
   public TaskClaimedEvent(String id, Task task, String userId) {
     super(id, task, userId, null);
-    eventType = (TaskHistoryEventType.TASK_CLAIMED.getName());
+    eventType = (TaskHistoryEventType.CLAIMED.getName());
     created = task.getClaimed();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCompletedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCompletedEvent.java
index 1bde60325..3501c5e74 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCompletedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCompletedEvent.java
@@ -8,13 +8,13 @@ public class TaskCompletedEvent extends TaskHistoryEvent {
 
   public TaskCompletedEvent(String id, Task completedTask, String userId) {
     super(id, completedTask, userId, null);
-    eventType = TaskHistoryEventType.TASK_COMPLETED.getName();
+    eventType = TaskHistoryEventType.COMPLETED.getName();
     created = completedTask.getCompleted();
   }
 
   public TaskCompletedEvent(String id, TaskSummary completedTask, String userId) {
     super(id, completedTask, userId, null);
-    eventType = TaskHistoryEventType.TASK_COMPLETED.getName();
+    eventType = TaskHistoryEventType.COMPLETED.getName();
     created = completedTask.getCompleted();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCreatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCreatedEvent.java
index b386c3236..25b34fded 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCreatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskCreatedEvent.java
@@ -7,7 +7,7 @@ public class TaskCreatedEvent extends TaskHistoryEvent {
 
   public TaskCreatedEvent(String id, Task task, String userId, String details) {
     super(id, task, userId, details);
-    eventType = TaskHistoryEventType.TASK_CREATED.getName();
+    eventType = TaskHistoryEventType.CREATED.getName();
     created = task.getCreated();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java
index 90b6675a7..6fdbcd6c7 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java
@@ -262,76 +262,53 @@ public class TaskHistoryEvent {
     this.details = details;
   }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        getId(),
-        getBusinessProcessId(),
-        getParentBusinessProcessId(),
-        getTaskId(),
-        getEventType(),
-        getCreated(),
-        getUserId(),
-        getDomain(),
-        getWorkbasketKey(),
-        getPorCompany(),
-        getPorSystem(),
-        getPorInstance(),
-        getPorType(),
-        getPorValue(),
-        getTaskClassificationKey(),
-        getTaskClassificationCategory(),
-        getAttachmentClassificationKey(),
-        getOldValue(),
-        getNewValue(),
-        getCustomAttribute(TaskHistoryCustomField.CUSTOM_1),
-        getCustomAttribute(TaskHistoryCustomField.CUSTOM_2),
-        getCustomAttribute(TaskHistoryCustomField.CUSTOM_3),
-        getCustomAttribute(TaskHistoryCustomField.CUSTOM_4),
-        getDetails());
-  }
-
   @Override
   public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
-    if (!(obj instanceof TaskanaHistoryEvent)) {
+    if (!(obj instanceof TaskHistoryEvent)) {
       return false;
     }
-    TaskanaHistoryEvent other = (TaskanaHistoryEvent) obj;
+    TaskHistoryEvent other = (TaskHistoryEvent) obj;
     return Objects.equals(getId(), other.getId())
-        && Objects.equals(getBusinessProcessId(), other.getBusinessProcessId())
-        && Objects.equals(getParentBusinessProcessId(), other.getParentBusinessProcessId())
-        && Objects.equals(getTaskId(), other.getTaskId())
-        && Objects.equals(getEventType(), other.getEventType())
-        && Objects.equals(getCreated(), other.getCreated())
-        && Objects.equals(getUserId(), other.getUserId())
-        && Objects.equals(getDomain(), other.getDomain())
-        && Objects.equals(getWorkbasketKey(), other.getWorkbasketKey())
-        && Objects.equals(getPorCompany(), other.getPorCompany())
-        && Objects.equals(getPorSystem(), other.getPorSystem())
-        && Objects.equals(getPorInstance(), other.getPorInstance())
-        && Objects.equals(getPorType(), other.getPorType())
-        && Objects.equals(getPorValue(), other.getPorValue())
-        && Objects.equals(getTaskClassificationKey(), other.getTaskClassificationKey())
-        && Objects.equals(getTaskClassificationCategory(), other.getTaskClassificationCategory())
-        && Objects.equals(getAttachmentClassificationKey(), other.getAttachmentClassificationKey())
-        && Objects.equals(getOldValue(), other.getOldValue())
-        && Objects.equals(getNewValue(), other.getNewValue())
-        && Objects.equals(
-            getCustomAttribute(TaskHistoryCustomField.CUSTOM_1),
-            other.getCustomAttribute(TaskHistoryCustomField.CUSTOM_1))
-        && Objects.equals(
-            getCustomAttribute(TaskHistoryCustomField.CUSTOM_2),
-            other.getCustomAttribute(TaskHistoryCustomField.CUSTOM_2))
-        && Objects.equals(
-            getCustomAttribute(TaskHistoryCustomField.CUSTOM_3),
-            other.getCustomAttribute(TaskHistoryCustomField.CUSTOM_3))
-        && Objects.equals(
-            getCustomAttribute(TaskHistoryCustomField.CUSTOM_4),
-            other.getCustomAttribute(TaskHistoryCustomField.CUSTOM_4))
-        && Objects.equals(getDetails(), other.getDetails());
+               && Objects.equals(getBusinessProcessId(), other.getBusinessProcessId())
+               && Objects
+                      .equals(getParentBusinessProcessId(), other.getParentBusinessProcessId())
+               && Objects.equals(getTaskId(), other.getTaskId())
+               && Objects.equals(getEventType(), other.getEventType())
+               && Objects.equals(getCreated(), other.getCreated())
+               && Objects.equals(getUserId(), other.getUserId())
+               && Objects.equals(getDomain(), other.getDomain())
+               && Objects.equals(getWorkbasketKey(), other.getWorkbasketKey())
+               && Objects.equals(getPorCompany(), other.getPorCompany())
+               && Objects.equals(getPorSystem(), other.getPorSystem())
+               && Objects.equals(getPorInstance(), other.getPorInstance())
+               && Objects.equals(getPorType(), other.getPorType())
+               && Objects.equals(getPorValue(), other.getPorValue())
+               && Objects
+                      .equals(getTaskClassificationKey(), other.getTaskClassificationKey())
+               && Objects
+                      .equals(getTaskClassificationCategory(),
+                          other.getTaskClassificationCategory())
+               && Objects.equals(getAttachmentClassificationKey(),
+        other.getAttachmentClassificationKey())
+               && Objects.equals(getOldValue(), other.getOldValue())
+               && Objects.equals(getNewValue(), other.getNewValue())
+               && Objects.equals(custom1, other.custom1)
+               && Objects.equals(custom2, other.custom2)
+               && Objects.equals(custom3, other.custom3)
+               && Objects.equals(custom4, other.custom4)
+               && Objects.equals(getDetails(), other.getDetails());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getId(), getBusinessProcessId(), getParentBusinessProcessId(), getTaskId(),
+        getEventType(), getCreated(), getUserId(), getDomain(), getWorkbasketKey(), getPorCompany(),
+        getPorSystem(), getPorInstance(), getPorType(), getPorValue(), getTaskClassificationKey(),
+        getTaskClassificationCategory(), getAttachmentClassificationKey(), getOldValue(),
+        getNewValue(), custom1, custom2, custom3, custom4, getDetails());
   }
 
   @Override
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEventType.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEventType.java
index 9f18d7df8..4fccd9749 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEventType.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEventType.java
@@ -1,14 +1,14 @@
 package pro.taskana.spi.history.api.events.task;
 
 public enum TaskHistoryEventType {
-  TASK_CREATED("TASK_CREATED"),
-  TASK_UPDATED("TASK_UPDATED"),
-  TASK_CLAIMED("TASK_CLAIMED"),
-  TASK_CLAIM_CANCELLED("TASK_CLAIM_CANCELLED"),
-  TASK_COMPLETED("TASK_COMPLETED"),
-  TASK_CANCELLED("TASK_CANCELLED"),
-  TASK_TERMINATED("TASK_TERMINATED"),
-  TASK_TRANSFERRED("TASK_TRANSFERRED");
+  CREATED("CREATED"),
+  UPDATED("UPDATED"),
+  CLAIMED("CLAIMED"),
+  CLAIM_CANCELLED("CLAIM_CANCELLED"),
+  COMPLETED("COMPLETED"),
+  CANCELLED("CANCELLED"),
+  TERMINATED("TERMINATED"),
+  TRANSFERRED("TRANSFERRED");
 
   private String name;
 
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskTerminatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskTerminatedEvent.java
index de123bedb..2a2f9e489 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskTerminatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskTerminatedEvent.java
@@ -7,7 +7,7 @@ public class TaskTerminatedEvent extends TaskHistoryEvent {
 
   public TaskTerminatedEvent(String id, Task task, String userId) {
     super(id, task, userId, null);
-    eventType = "TASK_TERMINATED";
+    eventType = TaskHistoryEventType.TERMINATED.getName();
     created = task.getCompleted();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskTransferredEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskTransferredEvent.java
index fd50f03be..d910589cb 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskTransferredEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskTransferredEvent.java
@@ -13,7 +13,7 @@ public class TaskTransferredEvent extends TaskHistoryEvent {
       WorkbasketSummary newWorkbasket,
       String userId) {
     super(id, task, userId, null);
-    eventType = TaskHistoryEventType.TASK_TRANSFERRED.getName();
+    eventType = TaskHistoryEventType.TRANSFERRED.getName();
     created = task.getModified();
     this.oldValue = oldWorkbasket.getId();
     this.newValue = newWorkbasket.getId();
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskUpdatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskUpdatedEvent.java
index 7c25aa2b3..3d747a5aa 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskUpdatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskUpdatedEvent.java
@@ -6,7 +6,7 @@ public class TaskUpdatedEvent extends TaskHistoryEvent {
 
   public TaskUpdatedEvent(String id, Task updatedTask, String userId, String details) {
     super(id, updatedTask, userId, details);
-    eventType = TaskHistoryEventType.TASK_UPDATED.getName();
+    eventType = TaskHistoryEventType.UPDATED.getName();
     created = updatedTask.getModified();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemCreatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemCreatedEvent.java
index 2dc333867..033bf0062 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemCreatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemCreatedEvent.java
@@ -9,7 +9,7 @@ public class WorkbasketAccessItemCreatedEvent extends WorkbasketHistoryEvent {
   public WorkbasketAccessItemCreatedEvent(
       String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEM_CREATED.getName();
+    eventType = WorkbasketHistoryEventType.ACCESS_ITEM_CREATED.getName();
     created = Instant.now();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemDeletedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemDeletedEvent.java
index 96d84ce5a..17646ac3b 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemDeletedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemDeletedEvent.java
@@ -9,7 +9,7 @@ public class WorkbasketAccessItemDeletedEvent extends WorkbasketHistoryEvent {
   public WorkbasketAccessItemDeletedEvent(
       String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEM_DELETED.getName();
+    eventType = WorkbasketHistoryEventType.ACCESS_ITEM_DELETED.getName();
     created = Instant.now();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemDeletedForAccessIdEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemDeletedForAccessIdEvent.java
index f1729d2d7..70ae47e5f 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemDeletedForAccessIdEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemDeletedForAccessIdEvent.java
@@ -9,7 +9,7 @@ public class WorkbasketAccessItemDeletedForAccessIdEvent extends WorkbasketHisto
   public WorkbasketAccessItemDeletedForAccessIdEvent(
       String id, Workbasket workbasket, String userId) {
     super(id, workbasket, userId, null);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEM_DELETED_FOR_ACCESS_ID.getName();
+    eventType = WorkbasketHistoryEventType.ACCESS_ITEM_DELETED_FOR_ACCESS_ID.getName();
     created = Instant.now();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemUpdatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemUpdatedEvent.java
index 2128bd81a..085ddeece 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemUpdatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemUpdatedEvent.java
@@ -9,7 +9,7 @@ public class WorkbasketAccessItemUpdatedEvent extends WorkbasketHistoryEvent {
   public WorkbasketAccessItemUpdatedEvent(
       String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEM_UPDATED.getName();
+    eventType = WorkbasketHistoryEventType.ACCESS_ITEM_UPDATED.getName();
     created = Instant.now();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemsUpdatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemsUpdatedEvent.java
index d3e9dc35e..da52ed29d 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemsUpdatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketAccessItemsUpdatedEvent.java
@@ -9,7 +9,7 @@ public class WorkbasketAccessItemsUpdatedEvent extends WorkbasketHistoryEvent {
   public WorkbasketAccessItemsUpdatedEvent(
       String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_ACCESS_ITEMS_UPDATED.getName();
+    eventType = WorkbasketHistoryEventType.ACCESS_ITEMS_UPDATED.getName();
     created = Instant.now();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketCreatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketCreatedEvent.java
index 73bd4dfd8..40985ba9d 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketCreatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketCreatedEvent.java
@@ -6,7 +6,7 @@ public class WorkbasketCreatedEvent extends WorkbasketHistoryEvent {
 
   public WorkbasketCreatedEvent(String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_CREATED.getName();
+    eventType = WorkbasketHistoryEventType.CREATED.getName();
     created = workbasket.getCreated();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDeletedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDeletedEvent.java
index c7b15c0d0..ded92a4df 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDeletedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDeletedEvent.java
@@ -6,7 +6,7 @@ public class WorkbasketDeletedEvent extends WorkbasketHistoryEvent {
 
   public WorkbasketDeletedEvent(String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_DELETED.getName();
+    eventType = WorkbasketHistoryEventType.DELETED.getName();
     created = workbasket.getModified();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetAddedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetAddedEvent.java
index 1d5fe743c..fb0ee5a60 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetAddedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetAddedEvent.java
@@ -9,7 +9,7 @@ public class WorkbasketDistributionTargetAddedEvent extends WorkbasketHistoryEve
   public WorkbasketDistributionTargetAddedEvent(
       String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_DISTRIBUTION_TARGET_ADDED.getName();
+    eventType = WorkbasketHistoryEventType.DISTRIBUTION_TARGET_ADDED.getName();
     created = Instant.now();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetRemovedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetRemovedEvent.java
index 8a0ed823d..762647aa4 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetRemovedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetRemovedEvent.java
@@ -9,7 +9,7 @@ public class WorkbasketDistributionTargetRemovedEvent extends WorkbasketHistoryE
   public WorkbasketDistributionTargetRemovedEvent(
       String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_DISTRIBUTION_TARGET_REMOVED.getName();
+    eventType = WorkbasketHistoryEventType.DISTRIBUTION_TARGET_REMOVED.getName();
     created = Instant.now();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetsUpdatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetsUpdatedEvent.java
index f003cdbe7..75de7f4a1 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetsUpdatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketDistributionTargetsUpdatedEvent.java
@@ -9,7 +9,7 @@ public class WorkbasketDistributionTargetsUpdatedEvent extends WorkbasketHistory
   public WorkbasketDistributionTargetsUpdatedEvent(
       String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_DISTRIBUTION_TARGETS_UPDATED.getName();
+    eventType = WorkbasketHistoryEventType.DISTRIBUTION_TARGETS_UPDATED.getName();
     created = Instant.now();
   }
 
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java
index 82ae094f1..04161f5af 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java
@@ -1,6 +1,7 @@
 package pro.taskana.spi.history.api.events.workbasket;
 
 import java.time.Instant;
+import java.util.Objects;
 
 import pro.taskana.workbasket.api.WorkbasketCustomField;
 import pro.taskana.workbasket.api.models.WorkbasketSummary;
@@ -14,8 +15,8 @@ public class WorkbasketHistoryEvent {
   protected String userId;
   protected String domain;
   protected String workbasketId;
-  protected String workbasketKey;
-  protected String workbasketType;
+  protected String key;
+  protected String type;
   protected String owner;
   protected String custom1;
   protected String custom2;
@@ -36,8 +37,8 @@ public class WorkbasketHistoryEvent {
     this.details = details;
     workbasketId = workbasket.getId();
     domain = workbasket.getDomain();
-    workbasketKey = workbasket.getKey();
-    workbasketType = workbasket.getType().name();
+    key = workbasket.getKey();
+    type = workbasket.getType().name();
     owner = workbasket.getOwner();
     custom1 = workbasket.getCustomAttribute(WorkbasketCustomField.CUSTOM_1);
     custom2 = workbasket.getCustomAttribute(WorkbasketCustomField.CUSTOM_2);
@@ -49,6 +50,43 @@ public class WorkbasketHistoryEvent {
     orgLevel4 = workbasket.getOrgLevel4();
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof WorkbasketHistoryEvent)) {
+      return false;
+    }
+    WorkbasketHistoryEvent other = (WorkbasketHistoryEvent) obj;
+    return Objects.equals(getId(), other.getId())
+               && Objects.equals(getEventType(), other.getEventType())
+               && Objects.equals(getCreated(), other.getCreated())
+               && Objects.equals(getUserId(), other.getUserId())
+               && Objects.equals(getDomain(), other.getDomain())
+               && Objects.equals(getWorkbasketId(), other.getWorkbasketId())
+               && Objects.equals(getKey(), other.getKey())
+               && Objects.equals(getType(), other.getType())
+               && Objects.equals(getOwner(), other.getOwner())
+               && Objects.equals(getCustom1(), other.getCustom1())
+               && Objects.equals(getCustom2(), other.getCustom2())
+               && Objects.equals(getCustom3(), other.getCustom3())
+               && Objects.equals(getCustom4(), other.getCustom4())
+               && Objects.equals(getOrgLevel1(), other.getOrgLevel1())
+               && Objects.equals(getOrgLevel2(), other.getOrgLevel2())
+               && Objects.equals(getOrgLevel3(), other.getOrgLevel3())
+               && Objects.equals(getOrgLevel4(), other.getOrgLevel4())
+               && Objects.equals(getDetails(), other.getDetails());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getId(), getEventType(), getCreated(), getUserId(), getDomain(),
+        getWorkbasketId(), getKey(), getType(), getOwner(), getCustom1(),
+        getCustom2(), getCustom3(), getCustom4(), getOrgLevel1(), getOrgLevel2(), getOrgLevel3(),
+        getOrgLevel4(), getDetails());
+  }
+
   public String getId() {
     return id;
   }
@@ -97,20 +135,20 @@ public class WorkbasketHistoryEvent {
     this.workbasketId = workbasketId;
   }
 
-  public String getWorkbasketKey() {
-    return workbasketKey;
+  public String getKey() {
+    return key;
   }
 
-  public void setWorkbasketKey(String workbasketKey) {
-    this.workbasketKey = workbasketKey;
+  public void setKey(String key) {
+    this.key = key;
   }
 
-  public String getWorkbasketType() {
-    return workbasketType;
+  public String getType() {
+    return type;
   }
 
-  public void setWorkbasketType(String workbasketType) {
-    this.workbasketType = workbasketType;
+  public void setType(String type) {
+    this.type = type;
   }
 
   public String getOwner() {
@@ -208,9 +246,9 @@ public class WorkbasketHistoryEvent {
         + ", workbasketId="
         + workbasketId
         + ", workbasketKey="
-        + workbasketKey
+        + key
         + ", workbasketType="
-        + workbasketType
+        + type
         + ", owner="
         + owner
         + ", custom1="
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEventType.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEventType.java
index 54111f34e..4a7ae4c0d 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEventType.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEventType.java
@@ -1,18 +1,18 @@
 package pro.taskana.spi.history.api.events.workbasket;
 
 public enum WorkbasketHistoryEventType {
-  WORKBASKET_CREATED("WORKBASKET_CREATED"),
-  WORKBASKET_UPDATED("WORKBASKET_UPDATED"),
-  WORKBASKET_DELETED("WORKBASKET_DELETED"),
-  WORKBASKET_MARKED_FOR_DELETION("WORKBASKET_MARKED_FOR_DELETION"),
-  WORKBASKET_ACCESS_ITEM_CREATED("WORKBASKET_ACCESS_ITEM_CREATED"),
-  WORKBASKET_ACCESS_ITEM_UPDATED("WORKBASKET_ACCESS_ITEM_UPDATED"),
-  WORKBASKET_ACCESS_ITEM_DELETED("WORKBASKET_ACCESS_ITEM_DELETED"),
-  WORKBASKET_ACCESS_ITEMS_UPDATED("WORKBASKET_ACCESS_ITEMS_UPDATED"),
-  WORKBASKET_ACCESS_ITEM_DELETED_FOR_ACCESS_ID("WORKBASKET_ACCESS_ITEM_DELETED_FOR_ACCESS_ID"),
-  WORKBASKET_DISTRIBUTION_TARGET_ADDED("WORKBASKET_DISTRIBUTION_TARGET_ADDED"),
-  WORKBASKET_DISTRIBUTION_TARGET_REMOVED("WORKBASKET_DISTRIBUTION_TARGET_REMOVED"),
-  WORKBASKET_DISTRIBUTION_TARGETS_UPDATED("WORKBASKET_DISTRIBUTION_TARGETS_UPDATED");
+  CREATED("CREATED"),
+  UPDATED("UPDATED"),
+  DELETED("DELETED"),
+  MARKED_FOR_DELETION("MARKED_FOR_DELETION"),
+  ACCESS_ITEM_CREATED("ACCESS_ITEM_CREATED"),
+  ACCESS_ITEM_UPDATED("ACCESS_ITEM_UPDATED"),
+  ACCESS_ITEM_DELETED("ACCESS_ITEM_DELETED"),
+  ACCESS_ITEMS_UPDATED("ACCESS_ITEMS_UPDATED"),
+  ACCESS_ITEM_DELETED_FOR_ACCESS_ID("ACCESS_ITEM_DELETED_FOR_ACCESS_ID"),
+  DISTRIBUTION_TARGET_ADDED("DISTRIBUTION_TARGET_ADDED"),
+  DISTRIBUTION_TARGET_REMOVED("DISTRIBUTION_TARGET_REMOVED"),
+  DISTRIBUTION_TARGETS_UPDATED("DISTRIBUTION_TARGETS_UPDATED");
 
 
   private String name;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketMarkedForDeletionEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketMarkedForDeletionEvent.java
index e5fd9a63a..172bb522a 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketMarkedForDeletionEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketMarkedForDeletionEvent.java
@@ -7,7 +7,7 @@ public class WorkbasketMarkedForDeletionEvent extends WorkbasketHistoryEvent {
   public WorkbasketMarkedForDeletionEvent(
       String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_MARKED_FOR_DELETION.getName();
+    eventType = WorkbasketHistoryEventType.MARKED_FOR_DELETION.getName();
     created = workbasket.getModified();
   }
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketUpdatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketUpdatedEvent.java
index a6fc2449a..c20f0f521 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketUpdatedEvent.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketUpdatedEvent.java
@@ -6,7 +6,7 @@ public class WorkbasketUpdatedEvent extends WorkbasketHistoryEvent {
 
   public WorkbasketUpdatedEvent(String id, Workbasket workbasket, String userId, String details) {
     super(id, workbasket, userId, details);
-    eventType = WorkbasketHistoryEventType.WORKBASKET_UPDATED.getName();
+    eventType = WorkbasketHistoryEventType.UPDATED.getName();
     created = workbasket.getModified();
   }
 }
diff --git a/lib/taskana-core/src/main/resources/sql/db2/taskana-schema-db2.sql b/lib/taskana-core/src/main/resources/sql/db2/taskana-schema-db2.sql
index d24fa9d90..6a2473f29 100644
--- a/lib/taskana-core/src/main/resources/sql/db2/taskana-schema-db2.sql
+++ b/lib/taskana-core/src/main/resources/sql/db2/taskana-schema-db2.sql
@@ -243,17 +243,17 @@ CREATE TABLE WORKBASKET_HISTORY_EVENT
     USER_ID                       VARCHAR(32)  NULL,
     DOMAIN                        VARCHAR(32)  NULL,
     WORKBASKET_ID                 VARCHAR(40)  NULL,
-    WORKBASKET_KEY                VARCHAR(64)  NULL,
-    WORKBASKET_TYPE               VARCHAR(64)  NULL,
-    OWNER                         VARCHAR(32)  NULL,
-    CUSTOM_1                      VARCHAR(128) NULL,
-    CUSTOM_2                      VARCHAR(128) NULL,
-    CUSTOM_3                      VARCHAR(128) NULL,
-    CUSTOM_4                      VARCHAR(128) NULL,
-    ORGLEVEL_1                    VARCHAR(128) NULL,
-    ORGLEVEL_2                    VARCHAR(128) NULL,
-    ORGLEVEL_3                    VARCHAR(128) NULL,
-    ORGLEVEL_4                    VARCHAR(128) NULL,
+    KEY                           VARCHAR(64)  NULL,
+    TYPE                          VARCHAR(64)  NULL,
+    OWNER                         VARCHAR(128) NULL,
+    CUSTOM_1                      VARCHAR(255) NULL,
+    CUSTOM_2                      VARCHAR(255) NULL,
+    CUSTOM_3                      VARCHAR(255) NULL,
+    CUSTOM_4                      VARCHAR(255) NULL,
+    ORGLEVEL_1                    VARCHAR(255) NULL,
+    ORGLEVEL_2                    VARCHAR(255) NULL,
+    ORGLEVEL_3                    VARCHAR(255) NULL,
+    ORGLEVEL_4                    VARCHAR(255) NULL,
     DETAILS                       CLOB         NULL,
     PRIMARY KEY (ID)
 );
diff --git a/lib/taskana-core/src/main/resources/sql/db2/taskana_schema_update_3.0.0_to_4.0.0_db2.sql b/lib/taskana-core/src/main/resources/sql/db2/taskana_schema_update_3.0.0_to_4.0.0_db2.sql
index 07a451185..006e20ca6 100644
--- a/lib/taskana-core/src/main/resources/sql/db2/taskana_schema_update_3.0.0_to_4.0.0_db2.sql
+++ b/lib/taskana-core/src/main/resources/sql/db2/taskana_schema_update_3.0.0_to_4.0.0_db2.sql
@@ -18,3 +18,26 @@ RENAME TABLE HISTORY_EVENTS TO TASK_HISTORY_EVENT;
 
 UPDATE TASK_HISTORY_EVENT SET ID = REPLACE(ID,'HEI','THI') WHERE ID LIKE '%HEI%';
 
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+    ID                            VARCHAR(40) NOT NULL,
+    EVENT_TYPE                    VARCHAR(40)  NULL,
+    CREATED                       TIMESTAMP    NULL,
+    USER_ID                       VARCHAR(32)  NULL,
+    DOMAIN                        VARCHAR(32)  NULL,
+    WORKBASKET_ID                 VARCHAR(40)  NULL,
+    KEY                           VARCHAR(64)  NULL,
+    TYPE                          VARCHAR(64)  NULL,
+    OWNER                         VARCHAR(128) NULL,
+    CUSTOM_1                      VARCHAR(255) NULL,
+    CUSTOM_2                      VARCHAR(255) NULL,
+    CUSTOM_3                      VARCHAR(255) NULL,
+    CUSTOM_4                      VARCHAR(255) NULL,
+    ORGLEVEL_1                    VARCHAR(255) NULL,
+    ORGLEVEL_2                    VARCHAR(255) NULL,
+    ORGLEVEL_3                    VARCHAR(255) NULL,
+    ORGLEVEL_4                    VARCHAR(255) NULL,
+    DETAILS                       CLOB         NULL,
+    PRIMARY KEY (ID)
+);
+
diff --git a/lib/taskana-core/src/main/resources/sql/h2/taskana-schema-h2.sql b/lib/taskana-core/src/main/resources/sql/h2/taskana-schema-h2.sql
index a3f277155..206d6bda1 100644
--- a/lib/taskana-core/src/main/resources/sql/h2/taskana-schema-h2.sql
+++ b/lib/taskana-core/src/main/resources/sql/h2/taskana-schema-h2.sql
@@ -246,17 +246,17 @@ CREATE TABLE WORKBASKET_HISTORY_EVENT
     USER_ID                       VARCHAR(32)  NULL,
     DOMAIN                        VARCHAR(32)  NULL,
     WORKBASKET_ID                 VARCHAR(40)  NULL,
-    WORKBASKET_KEY                VARCHAR(64)  NULL,
-    WORKBASKET_TYPE               VARCHAR(64)  NULL,
-    OWNER                         VARCHAR(32)  NULL,
-    CUSTOM_1                      VARCHAR(128) NULL,
-    CUSTOM_2                      VARCHAR(128) NULL,
-    CUSTOM_3                      VARCHAR(128) NULL,
-    CUSTOM_4                      VARCHAR(128) NULL,
-    ORGLEVEL_1                    VARCHAR(128) NULL,
-    ORGLEVEL_2                    VARCHAR(128) NULL,
-    ORGLEVEL_3                    VARCHAR(128) NULL,
-    ORGLEVEL_4                    VARCHAR(128) NULL,
+    KEY                           VARCHAR(64)  NULL,
+    TYPE                          VARCHAR(64)  NULL,
+    OWNER                         VARCHAR(128) NULL,
+    CUSTOM_1                      VARCHAR(255) NULL,
+    CUSTOM_2                      VARCHAR(255) NULL,
+    CUSTOM_3                      VARCHAR(255) NULL,
+    CUSTOM_4                      VARCHAR(255) NULL,
+    ORGLEVEL_1                    VARCHAR(255) NULL,
+    ORGLEVEL_2                    VARCHAR(255) NULL,
+    ORGLEVEL_3                    VARCHAR(255) NULL,
+    ORGLEVEL_4                    VARCHAR(255) NULL,
     DETAILS                       CLOB         NULL,
     PRIMARY KEY (ID)
 );
diff --git a/lib/taskana-core/src/main/resources/sql/h2/taskana_schema_update_3.0.0_to_4.0.0_h2.sql b/lib/taskana-core/src/main/resources/sql/h2/taskana_schema_update_3.0.0_to_4.0.0_h2.sql
index 8c918ee45..61464efb6 100644
--- a/lib/taskana-core/src/main/resources/sql/h2/taskana_schema_update_3.0.0_to_4.0.0_h2.sql
+++ b/lib/taskana-core/src/main/resources/sql/h2/taskana_schema_update_3.0.0_to_4.0.0_h2.sql
@@ -10,4 +10,27 @@ ALTER TABLE HISTORY_EVENTS RENAME TO TASK_HISTORY_EVENT;
 
 UPDATE TASK_HISTORY_EVENT SET ID = REPLACE(ID,'HEI','THI') WHERE ID LIKE '%HEI%';
 
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+    ID                            VARCHAR(40) NOT NULL,
+    EVENT_TYPE                    VARCHAR(40)  NULL,
+    CREATED                       TIMESTAMP    NULL,
+    USER_ID                       VARCHAR(32)  NULL,
+    DOMAIN                        VARCHAR(32)  NULL,
+    WORKBASKET_ID                 VARCHAR(40)  NULL,
+    KEY                           VARCHAR(64)  NULL,
+    TYPE                          VARCHAR(64)  NULL,
+    OWNER                         VARCHAR(128) NULL,
+    CUSTOM_1                      VARCHAR(255) NULL,
+    CUSTOM_2                      VARCHAR(255) NULL,
+    CUSTOM_3                      VARCHAR(255) NULL,
+    CUSTOM_4                      VARCHAR(255) NULL,
+    ORGLEVEL_1                    VARCHAR(255) NULL,
+    ORGLEVEL_2                    VARCHAR(255) NULL,
+    ORGLEVEL_3                    VARCHAR(255) NULL,
+    ORGLEVEL_4                    VARCHAR(255) NULL,
+    DETAILS                       CLOB         NULL,
+    PRIMARY KEY (ID)
+);
+
 
diff --git a/lib/taskana-core/src/main/resources/sql/postgres/taskana-schema-postgres.sql b/lib/taskana-core/src/main/resources/sql/postgres/taskana-schema-postgres.sql
index 861cc43f0..5f18f5043 100644
--- a/lib/taskana-core/src/main/resources/sql/postgres/taskana-schema-postgres.sql
+++ b/lib/taskana-core/src/main/resources/sql/postgres/taskana-schema-postgres.sql
@@ -241,19 +241,17 @@ CREATE TABLE WORKBASKET_HISTORY_EVENT
     CREATED                       TIMESTAMP    NULL,
     USER_ID                       VARCHAR(32)  NULL,
     DOMAIN                        VARCHAR(32)  NULL,
-    WORKBASKET_KEY                VARCHAR(64)  NULL,
-    WORKBASKET_TYPE               VARCHAR(64)  NULL,
-    OWNER                         VARCHAR(32)  NULL,
-    OLD_VALUE                     VARCHAR(255) NULL,
-    NEW_VALUE                     VARCHAR(255) NULL,
-    CUSTOM_1                      VARCHAR(128) NULL,
-    CUSTOM_2                      VARCHAR(128) NULL,
-    CUSTOM_3                      VARCHAR(128) NULL,
-    CUSTOM_4                      VARCHAR(128) NULL,
-    ORGLEVEL_1                    VARCHAR(128) NULL,
-    ORGLEVEL_2                    VARCHAR(128) NULL,
-    ORGLEVEL_3                    VARCHAR(128) NULL,
-    ORGLEVEL_4                    VARCHAR(128) NULL,
+    KEY                           VARCHAR(64)  NULL,
+    TYPE                          VARCHAR(64)  NULL,
+    OWNER                         VARCHAR(128) NULL,
+    CUSTOM_1                      VARCHAR(255) NULL,
+    CUSTOM_2                      VARCHAR(255) NULL,
+    CUSTOM_3                      VARCHAR(255) NULL,
+    CUSTOM_4                      VARCHAR(255) NULL,
+    ORGLEVEL_1                    VARCHAR(255) NULL,
+    ORGLEVEL_2                    VARCHAR(255) NULL,
+    ORGLEVEL_3                    VARCHAR(255) NULL,
+    ORGLEVEL_4                    VARCHAR(255) NULL,
     DETAILS                       TEXT         NULL,
     PRIMARY KEY (ID)
 );
diff --git a/lib/taskana-core/src/main/resources/sql/postgres/taskana_schema_update_3.0.0_to_4.0.0_postgres.sql b/lib/taskana-core/src/main/resources/sql/postgres/taskana_schema_update_3.0.0_to_4.0.0_postgres.sql
index 0559aaf32..8b4f2d4f5 100644
--- a/lib/taskana-core/src/main/resources/sql/postgres/taskana_schema_update_3.0.0_to_4.0.0_postgres.sql
+++ b/lib/taskana-core/src/main/resources/sql/postgres/taskana_schema_update_3.0.0_to_4.0.0_postgres.sql
@@ -10,4 +10,27 @@ ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID TYPE VARCHAR(40);
 
 ALTER TABLE HISTORY_EVENTS RENAME TO TASK_HISTORY_EVENT;
 
-UPDATE TASK_HISTORY_EVENT SET ID = REPLACE(ID,'HEI','THI') WHERE ID LIKE '%HEI%';
\ No newline at end of file
+UPDATE TASK_HISTORY_EVENT SET ID = REPLACE(ID,'HEI','THI') WHERE ID LIKE '%HEI%';
+
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+    ID                            VARCHAR(40) NOT NULL,
+    WORKBASKET_ID                 VARCHAR(40)  NULL,
+    EVENT_TYPE                    VARCHAR(40)  NULL,
+    CREATED                       TIMESTAMP    NULL,
+    USER_ID                       VARCHAR(32)  NULL,
+    DOMAIN                        VARCHAR(32)  NULL,
+    KEY                           VARCHAR(64)  NULL,
+    TYPE                          VARCHAR(64)  NULL,
+    OWNER                         VARCHAR(128) NULL,
+    CUSTOM_1                      VARCHAR(255) NULL,
+    CUSTOM_2                      VARCHAR(255) NULL,
+    CUSTOM_3                      VARCHAR(255) NULL,
+    CUSTOM_4                      VARCHAR(255) NULL,
+    ORGLEVEL_1                    VARCHAR(255) NULL,
+    ORGLEVEL_2                    VARCHAR(255) NULL,
+    ORGLEVEL_3                    VARCHAR(255) NULL,
+    ORGLEVEL_4                    VARCHAR(255) NULL,
+    DETAILS                       TEXT         NULL,
+    PRIMARY KEY (ID)
+);
diff --git a/lib/taskana-core/src/test/java/pro/taskana/PojoTest.java b/lib/taskana-core/src/test/java/pro/taskana/PojoTest.java
index b31068b2a..83f7ef551 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/PojoTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/PojoTest.java
@@ -119,7 +119,10 @@ class PojoTest {
     return new ClassFileImporter()
         .importPackages("pro.taskana").stream()
             .filter(javaClass -> javaClass.tryGetMethod("equals", Object.class).isPresent())
-               .filter(javaClass -> !javaClass.getSimpleName().equals("TaskanaHistoryEvent"))
+            .filter(
+                javaClass ->
+                    !javaClass.getSimpleName().equals("TaskHistoryEvent")
+                        && !javaClass.getSimpleName().equals("WorkbasketHistoryEvent"))
             .map(JavaClass::reflect)
             .collect(Collectors.toList());
   }
diff --git a/lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java b/lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java
index 2a0666c7f..dc856c975 100644
--- a/lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java
+++ b/lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java
@@ -13,7 +13,8 @@ public final class SampleDataProvider {
   static final String TEST_CLASSIFICATION = "/sql/test-data/classification.sql";
   static final String TEST_OBJECT_REFERENCE = "/sql/test-data/object-reference.sql";
   static final String TEST_ATTACHMENT = "/sql/test-data/attachment.sql";
-  static final String TEST_HISTORY_EVENT = "/sql/test-data/history-event.sql";
+  static final String TEST_TASK_HISTORY_EVENT = "/sql/test-data/task-history-event.sql";
+  static final String TEST_WORKBASKET_HISTORY_EVENT = "/sql/test-data/workbasket-history-event.sql";
   static final String MONITOR_SAMPLE_DATA = "/sql/monitor-data/monitor-sample-data.sql";
   private static final String DB_CLEAR_TABLES_SCRIPT = "/sql/clear/clear-db.sql";
   private static final String DB_DROP_TABLES_SCRIPT = "/sql/clear/drop-tables.sql";
@@ -62,7 +63,8 @@ public final class SampleDataProvider {
         TEST_CLASSIFICATION,
         TEST_WORKBASKET,
         TEST_TASK,
-        TEST_HISTORY_EVENT,
+        TEST_TASK_HISTORY_EVENT,
+        TEST_WORKBASKET_HISTORY_EVENT,
         TEST_TASK_COMMENT,
         TEST_WORKBASKET_ACCESS_LIST,
         TEST_DISTRIBUTION_TARGETS,
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/history-event.sql b/lib/taskana-data/src/main/resources/sql/sample-data/history-event.sql
index d29b55325..7cd5fda9e 100644
--- a/lib/taskana-data/src/main/resources/sql/sample-data/history-event.sql
+++ b/lib/taskana-data/src/main/resources/sql/sample-data/history-event.sql
@@ -1,47 +1,47 @@
 INSERT INTO TASK_HISTORY_EVENT (BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY, ATTACHMENT_CLASSIFICATION_KEY, OLD_VALUE, NEW_VALUE, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, DETAILS) VALUES
--- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID,                                        EVENT_TYPE, TASK_CREATEDD,                                        USER_ID,    DOMAIN,         WORKBASKET_KEY,                                                     POR_COMPANY     , POR_SYSTEM, POR_INSTANCE      , POR_TYPE      , POR_VALUE     , TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY , ATTACHMENT_CLASSIFICATION_KEY , OLD_VALUE     , NEW_VALUE     , CUSTOM_1      , CUSTOM_2      , CUSTOM_3      , CUSTOM_4
-('BPI:01'               ,'',                        'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   RELATIVE_DATE(0) ,                      'USER-2-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,' L140101'                         , 'TASK'                       ,''                    ,'old_val12'      ,'new_val12'      ,'custom1'      ,'custom2'      , 'custom3'     ,'custom4', 'some Details'),
-('BPI:02'               ,'',                        'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-1', 'DOMAIN_A',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '65464564'                     ,  ''                               ,  ''                          ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:06'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:04'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_CREATED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_CREATED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_CREATED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:06'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_CREATED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:06'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
-('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'TASK_CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
-('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'TASK_DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details');
\ No newline at end of file
+-- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID,                                        EVENT_TYPE, CREATED,                                        USER_ID,    DOMAIN,         WORKBASKET_KEY,                                                     POR_COMPANY     , POR_SYSTEM, POR_INSTANCE      , POR_TYPE      , POR_VALUE     , TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY , ATTACHMENT_CLASSIFICATION_KEY , OLD_VALUE     , NEW_VALUE     , CUSTOM_1      , CUSTOM_2      , CUSTOM_3      , CUSTOM_4
+('BPI:01'               ,'',                        'TKI:000000000000000000000000000000000000',     'CREATED',   RELATIVE_DATE(0) ,                      'USER-2-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,' L140101'                         , 'TASK'                       ,''                    ,'old_val12'      ,'new_val12'      ,'custom1'      ,'custom2'      , 'custom3'     ,'custom4', 'some Details'),
+('BPI:02'               ,'',                        'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-1', 'DOMAIN_A',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '65464564'                     ,  ''                               ,  ''                          ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:06'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:04'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'CREATED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'CREATED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'CREATED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:03'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:05'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:06'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:02'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'CREATED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:06'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:02'               ,''             ,           'TKI:000000000000000000000000000000000000',     'UPDATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details'),
+('BPI:04'               ,''             ,           'TKI:000000000000000000000000000000000000',     'CREATED',   RELATIVE_DATE(0),  'USER-1-2', 'DOMAIN_B',         'WBI:100000000000000000000000000000000001', '00'                , 'PASystem', '00'                      , 'VNR'         , '11223344'                     ,  ''                               , ''                           ,''                    ,'2old_val'     ,'new_val2'     ,'custom1'      ,''             , 'custom3'     ,'custom4','some Details'),
+('BPI:03'               ,'BPI:01',                  'TKI:000000000000000000000000000000000001',     'DELETED', RELATIVE_DATE(0) ,                        'USER-2-1', 'DOMAIN_B',         'WBI:100000000000000000000000000000000002', '11'                , ''        , '22'                      , ''            , ''                             , 'L140101'                         , 'TASK'                       ,'DOCTYPE_DEFAULT'     ,''             ,''             ,'custom1'      ,''             , 'custom3'     ,'','some Details');
\ No newline at end of file
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/history-event.sql b/lib/taskana-data/src/main/resources/sql/test-data/history-event.sql
deleted file mode 100644
index 5f1987a4e..000000000
--- a/lib/taskana-data/src/main/resources/sql/test-data/history-event.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-INSERT INTO TASK_HISTORY_EVENT (ID,BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, TASK_CLASSIFICATION_KEY,
-                            TASK_CLASSIFICATION_CATEGORY, ATTACHMENT_CLASSIFICATION_KEY, OLD_VALUE, NEW_VALUE, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, DETAILS) VALUES
--- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, 	EVENT_TYPE, CREATED, 							 USER_ID, 	DOMAIN, 	WORKBASKET_KEY, 							POR_COMPANY	, POR_SYSTEM, POR_INSTANCE	, POR_TYPE	, POR_VALUE	, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY	, ATTACHMENT_CLASSIFICATION_KEY	, OLD_VALUE	, NEW_VALUE	, CUSTOM_1	, CUSTOM_2	, CUSTOM_3	, CUSTOM_4,          details
-('HEI:000000000000000000000000000000000000','BPI:01'	,''		,'TKI:000000000000000000000000000000000000', 'TASK_UPDATED', 	'2018-01-29 15:55:00'					, 'admin', 'DOMAIN_B', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', 'L140101'				, 'TASK'						,''								,'old_val'	,'new_val'	,'custom1'	,'custom2'	, 'custom3'	,'custom4',  '{"changes":[{"newValue":"BPI:01","fieldName":"businessProcessId","oldValue":"BPI:02"},{"newValue":"admin","fieldName":"owner","oldValue":"owner1"}]}'	),
-('HEI:000000000000000000000000000000000001','BPI:02'	,''		,'TKI:000000000000000000000000000000000000', 'TASK_CREATED', 	'2018-01-29 15:55:01','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
-('HEI:000000000000000000000000000000000002','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000036','TASK_CREATED',    '2018-01-29 15:55:02'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
-('HEI:000000000000000000000000000000000003','BPI:02'	,''		,'TKI:000000000000000000000000000000000036', 'TASK_CREATED', 	'2018-01-29 15:55:03','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
-('HEI:000000000000000000000000000000000004','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000037','TASK_CREATED',    '2018-01-29 15:55:04'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
-('HEI:000000000000000000000000000000000005','BPI:02'	,''		,'TKI:000000000000000000000000000000000038', 'TASK_CREATED', 	'2018-01-29 15:55:05','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
-('HEI:000000000000000000000000000000000006','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000038','TASK_CREATED',    '2018-01-29 15:55:06'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
-('HEI:000000000000000000000000000000000007','BPI:02'	,''		,'TKI:000000000000000000000000000000000039', 'TASK_CREATED', 	'2018-01-29 15:55:07','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
-('HEI:000000000000000000000000000000000008','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000039','TASK_CREATED',    '2018-01-29 15:55:08'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
-('HEI:000000000000000000000000000000000009','BPI:02'	,''		,'TKI:000000000000000000000000000000000040', 'TASK_CREATED', 	'2018-01-29 15:55:09','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
-('HEI:000000000000000000000000000000000010','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000040','TASK_CREATED',    '2018-01-29 15:55:10'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
-('HEI:000000000000000000000000000000000011','BPI:02'	,''		,'TKI:000000000000000000000000000000000066', 'TASK_CREATED', 	'2018-01-29 15:55:11','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
-('HEI:000000000000000000000000000000000012','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000066','TASK_CREATED',    '2018-01-29 15:55:12'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		)
-;
-
-INSERT INTO WORKBASKET_HISTORY_EVENT (ID,EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_ID, WORKBASKET_KEY, WORKBASKET_TYPE, OWNER, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, ORGLEVEL_1, ORGLEVEL_2, ORGLEVEL_3, ORGLEVEL_4, DETAILS) VALUES
--- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, 	EVENT_TYPE, CREATED, 							 USER_ID, 	DOMAIN, 	WORKBASKET_KEY, 							POR_COMPANY	, POR_SYSTEM, POR_INSTANCE	, POR_TYPE	, POR_VALUE	, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY	, ATTACHMENT_CLASSIFICATION_KEY	, OLD_VALUE	, NEW_VALUE	, CUSTOM_1	, CUSTOM_2	, CUSTOM_3	, CUSTOM_4,          details
-('WHI:000000000000000000000000000000000000','WORKBASKET_CREATED'	,'2018-01-29 15:55:00'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004',  	'TOPIC', 'admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000001','WORKBASKET_UPDATED'	,'2018-01-29 15:55:01'		,'claudia', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC', 'admin', 'otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000002','WORKBASKET_DELETED'	,'2018-01-29 15:55:02'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004', 	'TOPIC','admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000003','WORKBASKET_CREATED'	,'2018-01-29 15:55:03'		,'claudia', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC','admin', 'otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000004','WORKBASKET_CREATED'	,'2018-01-29 15:55:04'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC','admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000005','WORKBASKET_DELETED'	,'2018-01-29 15:55:05'		,'sven', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004', 	'TOPIC','admin', 'otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000006','WORKBASKET_CREATED'	,'2018-01-29 15:55:06'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC','admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000007','WORKBASKET_CREATED'	,'2018-01-29 15:55:07'		,'sven', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004', 	'TOPIC','admin', 'otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000008','WORKBASKET_UPDATED'	,'2018-01-29 15:55:08'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC','admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
-('WHI:000000000000000000000000000000000009','WORKBASKET_CREATED'	,'2018-01-29 15:55:09'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004', 	'TOPIC', 'admin','otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	)
-
-;
-
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/task-history-event.sql b/lib/taskana-data/src/main/resources/sql/test-data/task-history-event.sql
new file mode 100644
index 000000000..d56a4f130
--- /dev/null
+++ b/lib/taskana-data/src/main/resources/sql/test-data/task-history-event.sql
@@ -0,0 +1,17 @@
+INSERT INTO TASK_HISTORY_EVENT (ID,BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, TASK_CLASSIFICATION_KEY,
+                                TASK_CLASSIFICATION_CATEGORY, ATTACHMENT_CLASSIFICATION_KEY, OLD_VALUE, NEW_VALUE, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, DETAILS) VALUES
+-- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, 	EVENT_TYPE, CREATED, 							 USER_ID, 	DOMAIN, 	WORKBASKET_KEY, 							POR_COMPANY	, POR_SYSTEM, POR_INSTANCE	, POR_TYPE	, POR_VALUE	, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY	, ATTACHMENT_CLASSIFICATION_KEY	, OLD_VALUE	, NEW_VALUE	, CUSTOM_1	, CUSTOM_2	, CUSTOM_3	, CUSTOM_4,          details
+('HEI:000000000000000000000000000000000000','BPI:01'	,''		,'TKI:000000000000000000000000000000000000', 'UPDATED', 	'2018-01-29 15:55:00'					, 'admin', 'DOMAIN_B', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', 'L140101'				, 'TASK'						,''								,'old_val'	,'new_val'	,'custom1'	,'custom2'	, 'custom3'	,'custom4',  '{"changes":[{"newValue":"BPI:01","fieldName":"businessProcessId","oldValue":"BPI:02"},{"newValue":"admin","fieldName":"owner","oldValue":"owner1"}]}'	),
+('HEI:000000000000000000000000000000000001','BPI:02'	,''		,'TKI:000000000000000000000000000000000000', 'CREATED', 	'2018-01-29 15:55:01','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
+('HEI:000000000000000000000000000000000002','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000036','CREATED',    '2018-01-29 15:55:02'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
+('HEI:000000000000000000000000000000000003','BPI:02'	,''		,'TKI:000000000000000000000000000000000036', 'CREATED', 	'2018-01-29 15:55:03','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
+('HEI:000000000000000000000000000000000004','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000037','CREATED',    '2018-01-29 15:55:04'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
+('HEI:000000000000000000000000000000000005','BPI:02'	,''		,'TKI:000000000000000000000000000000000038', 'CREATED', 	'2018-01-29 15:55:05','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
+('HEI:000000000000000000000000000000000006','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000038','CREATED',    '2018-01-29 15:55:06'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
+('HEI:000000000000000000000000000000000007','BPI:02'	,''		,'TKI:000000000000000000000000000000000039', 'CREATED', 	'2018-01-29 15:55:07','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
+('HEI:000000000000000000000000000000000008','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000039','CREATED',    '2018-01-29 15:55:08'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
+('HEI:000000000000000000000000000000000009','BPI:02'	,''		,'TKI:000000000000000000000000000000000040', 'CREATED', 	'2018-01-29 15:55:09','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
+('HEI:000000000000000000000000000000000010','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000040','CREATED',    '2018-01-29 15:55:10'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		),
+('HEI:000000000000000000000000000000000011','BPI:02'	,''		,'TKI:000000000000000000000000000000000066', 'CREATED', 	'2018-01-29 15:55:11','peter', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000001', '00'		, 'PASystem', '00'			, 'VNR'		, '11223344', ''					, ''							,''								,'2old_val'	,'new_val2'	,'custom1'	,''			, 'custom2'	,''           ,'someDetails'			),
+('HEI:000000000000000000000000000000000012','BPI:03'	,'BPI:01','TKI:000000000000000000000000000000000066','CREATED',    '2018-01-29 15:55:12'					, 'admin', 'DOMAIN_A', 	'WBI:100000000000000000000000000000000002', '11'		, ''		, '22'			, ''		, ''		, 'L140101'				, 'TASK'						,'DOCTYPE_DEFAULT'				,''			,''			,'custom1'	,''			, 'custom3'	,''	          ,'someDetails'		)
+;
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-history-event.sql b/lib/taskana-data/src/main/resources/sql/test-data/workbasket-history-event.sql
new file mode 100644
index 000000000..a32e2c8b2
--- /dev/null
+++ b/lib/taskana-data/src/main/resources/sql/test-data/workbasket-history-event.sql
@@ -0,0 +1,13 @@
+INSERT INTO WORKBASKET_HISTORY_EVENT (ID,EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_ID, KEY, TYPE, OWNER, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, ORGLEVEL_1, ORGLEVEL_2, ORGLEVEL_3, ORGLEVEL_4, DETAILS) VALUES
+-- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, 	EVENT_TYPE, CREATED, 							 USER_ID, 	DOMAIN, 	WORKBASKET_KEY, 							POR_COMPANY	, POR_SYSTEM, POR_INSTANCE	, POR_TYPE	, POR_VALUE	, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY	, ATTACHMENT_CLASSIFICATION_KEY	, OLD_VALUE	, NEW_VALUE	, CUSTOM_1	, CUSTOM_2	, CUSTOM_3	, CUSTOM_4,          details
+('WHI:000000000000000000000000000000000000','CREATED'	,'2018-01-29 15:55:00'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004',  	'TOPIC', 'admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000001','UPDATED'	,'2018-01-29 15:55:01'		,'claudia', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC', 'admin', 'otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000002','DELETED'	,'2018-01-29 15:55:02'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004', 	'TOPIC','admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000003','CREATED'	,'2018-01-29 15:55:03'		,'claudia', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC','admin', 'otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000004','CREATED'	,'2018-01-29 15:55:04'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC','admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000005','DELETED'	,'2018-01-29 15:55:05'		,'sven', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004', 	'TOPIC','admin', 'otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000006','CREATED'	,'2018-01-29 15:55:06'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC','admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000007','CREATED'	,'2018-01-29 15:55:07'		,'sven', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004', 	'TOPIC','admin', 'otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000008','UPDATED'	,'2018-01-29 15:55:08'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000803', 'soRt003', 	'TOPIC','admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
+('WHI:000000000000000000000000000000000009','CREATED'	,'2018-01-29 15:55:09'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004', 	'TOPIC', 'admin','otherCustom1'	,'otherCustom2'	, 'otherCustom3'	,'otherCustom4', 'otherOrgLevel1'	,'otherOrgLevel2'	, 'otherOrgLevel3'	,'otherOrgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	)
+;