diff --git a/src/main/java/app/mealsmadeeasy/api/user/GrantedAuthorityEntityRepository.java b/src/main/java/app/mealsmadeeasy/api/user/GrantedAuthorityEntityRepository.java
deleted file mode 100644
index 9f9abff..0000000
--- a/src/main/java/app/mealsmadeeasy/api/user/GrantedAuthorityEntityRepository.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.mealsmadeeasy.api.user;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface GrantedAuthorityEntityRepository extends JpaRepository<GrantedAuthorityEntity, Long> {}
diff --git a/src/main/java/app/mealsmadeeasy/api/user/User.java b/src/main/java/app/mealsmadeeasy/api/user/User.java
index a39a407..fa8285c 100644
--- a/src/main/java/app/mealsmadeeasy/api/user/User.java
+++ b/src/main/java/app/mealsmadeeasy/api/user/User.java
@@ -38,7 +38,7 @@ public final class User implements UserDetails {
     private String password;
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "user")
-    private final Set<GrantedAuthorityEntity> authorities = new HashSet<>();
+    private final Set<UserGrantedAuthority> authorities = new HashSet<>();
 
     @Column(nullable = false)
     private Boolean enabled;
@@ -57,15 +57,15 @@ public final class User implements UserDetails {
         return this.authorities;
     }
 
-    public void addAuthority(GrantedAuthorityEntity userGrantedAuthority) {
+    public void addAuthority(UserGrantedAuthority userGrantedAuthority) {
         this.authorities.add(userGrantedAuthority);
     }
 
-    public void addAuthorities(Set<? extends GrantedAuthorityEntity> userGrantedAuthorities) {
+    public void addAuthorities(Set<? extends UserGrantedAuthority> userGrantedAuthorities) {
         userGrantedAuthorities.forEach(this::addAuthority);
     }
 
-    public void removeAuthority(GrantedAuthorityEntity userGrantedAuthority) {
+    public void removeAuthority(UserGrantedAuthority userGrantedAuthority) {
         this.authorities.remove(userGrantedAuthority);
     }
 
diff --git a/src/main/java/app/mealsmadeeasy/api/user/GrantedAuthorityEntity.java b/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthority.java
similarity index 86%
rename from src/main/java/app/mealsmadeeasy/api/user/GrantedAuthorityEntity.java
rename to src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthority.java
index 870538b..a290b8f 100644
--- a/src/main/java/app/mealsmadeeasy/api/user/GrantedAuthorityEntity.java
+++ b/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthority.java
@@ -7,7 +7,7 @@ import org.springframework.security.core.GrantedAuthority;
 @Entity(name = "UserGrantedAuthority")
 @Table(name = "user_granted_authority")
 @Data
-public final class GrantedAuthorityEntity implements GrantedAuthority {
+public final class UserGrantedAuthority implements GrantedAuthority {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthorityRepository.java b/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthorityRepository.java
new file mode 100644
index 0000000..51d0fdb
--- /dev/null
+++ b/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthorityRepository.java
@@ -0,0 +1,5 @@
+package app.mealsmadeeasy.api.user;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserGrantedAuthorityRepository extends JpaRepository<UserGrantedAuthority, Long> {}
diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserService.java b/src/main/java/app/mealsmadeeasy/api/user/UserService.java
index f52f311..6109050 100644
--- a/src/main/java/app/mealsmadeeasy/api/user/UserService.java
+++ b/src/main/java/app/mealsmadeeasy/api/user/UserService.java
@@ -4,7 +4,7 @@ import java.util.Set;
 
 public interface UserService {
 
-    User createUser(String username, String email, String rawPassword, Set<GrantedAuthorityEntity> authorities)
+    User createUser(String username, String email, String rawPassword, Set<UserGrantedAuthority> authorities)
             throws UserCreateException;
 
     default User createUser(String username, String email, String rawPassword) throws UserCreateException {
diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserServiceImpl.java b/src/main/java/app/mealsmadeeasy/api/user/UserServiceImpl.java
index f3ee793..be8ed62 100644
--- a/src/main/java/app/mealsmadeeasy/api/user/UserServiceImpl.java
+++ b/src/main/java/app/mealsmadeeasy/api/user/UserServiceImpl.java
@@ -21,7 +21,7 @@ public final class UserServiceImpl implements UserService {
             String username,
             String email,
             String rawPassword,
-            Set<GrantedAuthorityEntity> authorities
+            Set<UserGrantedAuthority> authorities
     ) throws UserCreateException {
         if (this.userRepository.existsByUsername(username)) {
             throw new UserCreateException(