diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplate.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplate.java
index 6de9fe5815..b91217a705 100755
--- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplate.java
+++ b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplate.java
@@ -39,7 +39,7 @@ public class ActivityPlanTemplate extends DomainObject {
 	private boolean isSysAdminTemplate = false;
 
 	@Basic
-	@Column(nullable=false)
+	@Column(name = "title", nullable = false)
 	private String title;
 
 	@Basic
@@ -49,8 +49,8 @@ public class ActivityPlanTemplate extends DomainObject {
 	//</editor-fold>
 
 	//<editor-fold desc="JPA-mappings of foreign keys in this table (activity_plan_template) referencing other tables.">
-	@ManyToOne(optional=false)
-	@JoinColumn(name = "user_id")
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "creator_user_id", referencedColumnName = "id")
 	private User creator;
 	//</editor-fold>
 
diff --git a/core/src/main/resources/db/migration/V390__harmonize_table_attribute_name.sql b/core/src/main/resources/db/migration/V390__harmonize_table_attribute_name.sql
index 3306215d7c..57c3ea170c 100644
--- a/core/src/main/resources/db/migration/V390__harmonize_table_attribute_name.sql
+++ b/core/src/main/resources/db/migration/V390__harmonize_table_attribute_name.sql
@@ -1043,11 +1043,11 @@ alter table `ActivityPlanTemplate` drop key `FKACCF6522E44F4DBE`;
 rename table `ActivityPlanTemplate` to `activity_plan_template`;
 
 alter table `activity_plan_template` rename column `isSysAdminTemplate` to `is_sys_admin_template`;
-alter table `activity_plan_template` rename column `creator_id` to `user_id`;
+alter table `activity_plan_template` rename column `creator_id` to `creator_user_id`;
 
 alter table `activity_plan_template`
-    add constraint fk_activity_plan_template_user_id
-        foreign key (user_id) references user (id)
+    add constraint fk_activity_plan_template_creator_user_id
+        foreign key (creator_user_id) references user (id)
             on delete cascade on update cascade;
 
 -- Add back all foreign key references to activity_plan_template