diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/DonationDAO.java
similarity index 96%
rename from helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java
rename to helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/DonationDAO.java
index 8b6cbf4..2da1d5d 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/DonationDAO.java
@@ -1,4 +1,4 @@
-package ntnu.systemutvikling.team6.DAO;
+package ntnu.systemutvikling.team6.database.DAO;
 
 import java.sql.*;
 import java.util.UUID;
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/UserDAO.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/UserDAO.java
similarity index 92%
rename from helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/UserDAO.java
rename to helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/UserDAO.java
index 19c7714..e5ee362 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/UserDAO.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/UserDAO.java
@@ -1,4 +1,4 @@
-package ntnu.systemutvikling.team6.DAO;
+package ntnu.systemutvikling.team6.database.DAO;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -55,8 +55,8 @@ INSERT INTO Settings (
       try (PreparedStatement psUser = conn.prepareStatement(userSql)) {
 
         psUser.setString(1, user.getId().toString());
-        psUser.setString(2, user.getName()); // display name
-        psUser.setString(3, user.getName()); // username
+        psUser.setString(2, user.getDisplayName()); // display name
+        psUser.setString(3, user.getUsername()); // username
         psUser.setString(4, user.getEmail());
         psUser.setString(5, user.getPasswordHash());
         psUser.setString(6, user.getRole().name());
diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/DAO/DonationDAOTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/DAO/DonationDAOTest.java
similarity index 97%
rename from helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/DAO/DonationDAOTest.java
rename to helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/DAO/DonationDAOTest.java
index 902c7a6..5d80c03 100644
--- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/DAO/DonationDAOTest.java
+++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/DAO/DonationDAOTest.java
@@ -1,4 +1,4 @@
-package ntnu.systemutvikling.team6.DAO;
+package ntnu.systemutvikling.team6.database.DAO;
 
 import static org.junit.jupiter.api.Assertions.*;