diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Group.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Group.java
index 9ce454eca5e1894ba516d2f51fdc5e68b1a8de02..9ce2d9df4785e481578f3ed48467e93e6b3def95 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Group.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Group.java
@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Entity(name = "group")
+@Entity(name = "groups")
 @Data
 public class Group {
 
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
index 70481d8132a053afc0394c8c4bc659f04a46e79c..aa2d2513d4cab48ceef5fabb5c7a17858a85cdc9 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
@@ -28,7 +28,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Entity(name = "user")
+@Entity(name = "users")
 @Builder
 public class User implements UserDetails {
     @Id