diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java b/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java
index 837c3fa66..a39f2674a 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java
+++ b/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface ClassificationMapper {
 
-	@Select("SELECT * FROM BUSINESS_CLASSIFICATION ORDER BY ID")
+	@Select("SELECT * FROM CLASSIFICATION ORDER BY ID")
 	@Results({
 		@Result(property="id", column="ID"),
 		@Result(property="tenantId", column="TENANT_ID"),
@@ -23,15 +23,15 @@ public interface ClassificationMapper {
 	})
 	List<Classification> findAll();
 	
-	@Select("SELECT * FROM BUSINESS_CLASSIFICATION WHERE PARENT_CLASSIFICATION_ID = #{parentClassificationId} ORDER BY ID")
+	@Select("SELECT * FROM CLASSIFICATION WHERE PARENT_CLASSIFICATION_ID = #{parentClassificationId} ORDER BY ID")
 	List<Classification> findByParentId(@Param("parentClassificationId") String parentId);
 	
-	@Select("SELECT * FROM BUSINESS_CLASSIFICATION WHERE ID = #{classificationId}")
+	@Select("SELECT * FROM CLASSIFICATION WHERE ID = #{classificationId}")
 	Classification findById(@Param("classificationId") String classificationId);
 	
-	@Insert("INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES (#{classification.id}, #{classification.tenantId}, #{classification.parentClassificationId}, #{classification.category}, #{classification.type}, #{classification.created}, #{classification.name}, #{classification.description}, #{classification.priority}, #{classification.serviceLevel})")
+	@Insert("INSERT INTO CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES (#{classification.id}, #{classification.tenantId}, #{classification.parentClassificationId}, #{classification.category}, #{classification.type}, #{classification.created}, #{classification.name}, #{classification.description}, #{classification.priority}, #{classification.serviceLevel})")
 	void insert(@Param("classification") Classification classification);
 	
-	@Update(value = "UPDATE BUSINESS_CLASSIFICATION SET TENANT_ID = #{classification.tenantId}, PARENT_CLASSIFICATION_ID = #{classification.parentClassificationId}, CATEGORY = #{classification.category}, TYPE = #{classification.type}, NAME = #{classification.name}, DESCRIPTION = #{classification.description}, PRIORITY = #{classification.priority}, SERVICE_LEVEL = #{classification.serviceLevel}, MODIFIED = #{classification.modified} WHERE ID = #{classification.id}")
+	@Update(value = "UPDATE CLASSIFICATION SET TENANT_ID = #{classification.tenantId}, PARENT_CLASSIFICATION_ID = #{classification.parentClassificationId}, CATEGORY = #{classification.category}, TYPE = #{classification.type}, NAME = #{classification.name}, DESCRIPTION = #{classification.description}, PRIORITY = #{classification.priority}, SERVICE_LEVEL = #{classification.serviceLevel}, MODIFIED = #{classification.modified} WHERE ID = #{classification.id}")
 	void update(@Param("classification") Classification classification);
 }
diff --git a/lib/taskana-core/src/main/resources/sql/db-structure.sql b/lib/taskana-core/src/main/resources/sql/db-structure.sql
index 46b39f648..eee36ec38 100644
--- a/lib/taskana-core/src/main/resources/sql/db-structure.sql
+++ b/lib/taskana-core/src/main/resources/sql/db-structure.sql
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS DISTRIBUTION_TARGETS(
 	PRIMARY KEY (SOURCE_ID, TARGET_ID)
 );
 
-CREATE TABLE IF NOT EXISTS BUSINESS_CLASSIFICATION(
+CREATE TABLE IF NOT EXISTS CLASSIFICATION(
 	ID varchar(255) NOT NULL,
 	TENANT_ID varchar(255) NULL,
 	PARENT_CLASSIFICATION_ID varchar(255),
@@ -63,4 +63,4 @@ CREATE TABLE IF NOT EXISTS WORKBASKET_ACCESS_LIST(
 	TRANSFER bit NOT NULL,
 	DISTRIBUTE bit NOT NULL,
 	PRIMARY KEY (ID)
-);
\ No newline at end of file
+);