diff --git a/core/src/main/java/se/su/dsv/scipro/peer/Comment.java b/core/src/main/java/se/su/dsv/scipro/peer/Comment.java
index d217298107..bb5c68db96 100755
--- a/core/src/main/java/se/su/dsv/scipro/peer/Comment.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/Comment.java
@@ -1,9 +1,19 @@
 package se.su.dsv.scipro.peer;
 
+import jakarta.persistence.Basic;
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import se.su.dsv.scipro.system.DomainObject;
 import se.su.dsv.scipro.system.User;
 
-import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.Comparator;
 
@@ -16,14 +26,16 @@ public class Comment extends DomainObject {
     private Long id;
 
     @ManyToOne(optional = false)
-    @JoinColumn(name = "user_id")
+    @JoinColumn(name = "creator_user_id", referencedColumnName = "id")
     private User creator;
 
+    @Basic
+    @Column(name = "comment")
     @Lob
     private String comment;
 
     @ManyToOne(optional = false)
-    @JoinColumn(name = "comment_thread_id")
+    @JoinColumn(name = "comment_thread_id", referencedColumnName = "id")
     private CommentThread commentThread;
 
     protected Comment() {
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 906ea5a9c0..3306215d7c 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
@@ -538,11 +538,11 @@ alter table comment_thread rename column `commentableKey` to `commentable_key`;
 alter table `comment_thread` add constraint uk_comment_thread_id_key unique(commentable_id, commentable_key);
 
 alter table comment rename column `commentThread_id` to `comment_thread_id`;
-alter table comment rename column `creator_id` to `user_id`;
+alter table comment rename column `creator_id` to `creator_user_id`;
 
 alter table `comment`
-    add constraint fk_comment_user_id
-        foreign key (user_id) references user (id)
+    add constraint fk_comment_creator_user_id
+        foreign key (creator_user_id) references user (id)
             on delete cascade on update cascade;
 
 alter table `comment`