diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java
index f9830d3..32fe40d 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java
@@ -13,8 +13,8 @@ import java.time.LocalDate;
 public class Expense implements IMoneyTransaction {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Getter(AccessLevel.NONE)
-    private Long expenseId;
+    @Column(name = "expense_id")
+    private Long id;
 
     @ManyToOne()
     @JoinColumn(name = "user_uuid")
@@ -28,11 +28,5 @@ public class Expense implements IMoneyTransaction {
 
     private LocalDate date;
     private BigDecimal amount;
-
-    @Override
-    public Long getId() {
-        return expenseId;
-    }
-
 }
 
diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java b/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java
index ac8326b..c5989ea 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java
@@ -1,32 +1,16 @@
 package com.faf223.expensetrackerfaf.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.AccessLevel;
+import jakarta.persistence.*;
 import lombok.Data;
-import lombok.Getter;
 
 @Data
 @Entity(name = "expense_categories")
 public class ExpenseCategory implements IMoneyTransactionCategory {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Getter(AccessLevel.NONE)
-    private Long categoryId;
-
-    @Getter(AccessLevel.NONE)
-    private String categoryName;
-
-    @Override
-    public Long getId() {
-        return categoryId;
-    }
-
-    @Override
-    public String getName() {
-        return categoryName;
-    }
+    @Column(name = "category_id")
+    private Long id;
 
+    @Column(name = "category_name")
+    private String name;
 }
diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java
index c7476ed..967fa3b 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java
@@ -14,8 +14,8 @@ import java.time.LocalDate;
 public class Income implements IMoneyTransaction {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Getter(AccessLevel.NONE)
-    private Long incomeId;
+    @Column(name = "income_id")
+    private Long id;
 
     @ManyToOne
     @JoinColumn(name = "user_uuid")
@@ -29,9 +29,4 @@ public class Income implements IMoneyTransaction {
 
     private LocalDate date;
     private BigDecimal amount;
-
-    @Override
-    public Long getId() {
-        return incomeId;
-    }
 }
diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java b/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java
index 08b41f2..237c41f 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java
@@ -1,32 +1,17 @@
 package com.faf223.expensetrackerfaf.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.AccessLevel;
+import jakarta.persistence.*;
 import lombok.Data;
-import lombok.Getter;
 
 @Data
 @Entity(name = "income_categories")
 public class IncomeCategory implements IMoneyTransactionCategory {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Getter(AccessLevel.NONE)
-    private Long categoryId;
+    @Column(name = "category_id")
+    private Long id;
 
-    @Getter(AccessLevel.NONE)
-    private String categoryName;
-
-    @Override
-    public Long getId() {
-        return categoryId;
-    }
-
-    @Override
-    public String getName() {
-        return categoryName;
-    }
+    @Column(name = "category_name")
+    private String name;
 }