diff --git a/MediaManager/src/auth/__init__.py b/MediaManager/src/auth/__init__.py
index 36831fa..6c3f8c6 100644
--- a/MediaManager/src/auth/__init__.py
+++ b/MediaManager/src/auth/__init__.py
@@ -8,8 +8,8 @@ from jwt.exceptions import InvalidTokenError
 from pydantic import BaseModel
 
 import database
-import  database.user
-from database.user import UserInternal
+import  database.users
+from database.users import UserInternal
 
 class Token(BaseModel):
     access_token: str
@@ -52,7 +52,7 @@ async def get_current_user(token: str = Depends(oauth2_scheme)) -> UserInternal:
     except InvalidTokenError:
         log.warning("received invalid token: " + token)
         raise credentials_exception
-    user = database.user.get_user(uid=token_data.uid)
+    user = database.users.get_user(uid=token_data.uid)
     if user is None:
         log.debug("user not found")
         raise credentials_exception
diff --git a/MediaManager/src/auth/password.py b/MediaManager/src/auth/password.py
index 76424bf..84b0ac8 100644
--- a/MediaManager/src/auth/password.py
+++ b/MediaManager/src/auth/password.py
@@ -7,8 +7,8 @@ from fastapi.security import OAuth2PasswordRequestForm
 
 import database
 from auth import ACCESS_TOKEN_EXPIRE_MINUTES, create_access_token, Token, router
-from database import  user
-from database.user import  User, UserInternal
+from database import  users
+from database.users import UserInternal
 
 
 def verify_password(plain_password, hashed_password):
@@ -32,7 +32,7 @@ def authenticate_user(email: str, password: str) -> bool | UserInternal:
     :param password:  password of the user
     :return:  if authentication succeeds, returns the user object with added name and lastname, otherwise  or if the user doesn't exist returns False
     """
-    user = database.user.get_user(email=email)
+    user = database.users.get_user(email=email)
     if not user:
         return False
     if not verify_password(password, user.hashed_password):
diff --git a/MediaManager/src/database/__init__.py b/MediaManager/src/database/__init__.py
index 99b98ac..be4e5dc 100644
--- a/MediaManager/src/database/__init__.py
+++ b/MediaManager/src/database/__init__.py
@@ -7,7 +7,7 @@ from psycopg.rows import dict_row
 log = logging.getLogger(__name__)
 
 
-class PgDatabase():
+class PgDatabase:
     """PostgreSQL Database context manager using psycopg"""
 
     def __init__(self) -> None:
@@ -35,8 +35,8 @@ class PgDatabase():
 def init_db():
     log.info("Initializing database")
 
-    from database import tv, user
-    user.init_table()
+    from database import tv, users
+    users.init_table()
     tv.init_table()
 
     log.info("Tables initialized successfully")
diff --git a/MediaManager/src/database/user.py b/MediaManager/src/database/users.py
similarity index 97%
rename from MediaManager/src/database/user.py
rename to MediaManager/src/database/users.py
index de5ff4b..d3216b5 100644
--- a/MediaManager/src/database/user.py
+++ b/MediaManager/src/database/users.py
@@ -73,7 +73,7 @@ def get_user(email: str = None, uid: str = None) -> UserInternal | None:
         user = UserInternal(id=result["id"].__str__(), name=result["name"], lastname=result["lastname"],
                             email=result["email"],
                             hashed_password=result["hashed_password"])
-        log.debug(f"Retrieved User succesfully:  {user.model_dump()} ")
+        log.debug(f"Retrieved User successfully:  {user.model_dump()} ")
         return user
 
 
diff --git a/MediaManager/src/routers/tv.py b/MediaManager/src/routers/tv.py
new file mode 100644
index 0000000..e69de29
diff --git a/MediaManager/src/routers/users.py b/MediaManager/src/routers/users.py
index 4c4e75a..c30fa98 100644
--- a/MediaManager/src/routers/users.py
+++ b/MediaManager/src/routers/users.py
@@ -6,7 +6,7 @@ from starlette.responses import JSONResponse
 import database
 from auth import get_current_user
 from auth.password import get_password_hash
-from database.user import UserInternal, User
+from database.users import UserInternal, User
 from routers import log
 
 router = APIRouter(
@@ -34,7 +34,7 @@ async def create_user(
 ):
     internal_user = UserInternal(name=user.name, lastname=user.lastname, email=user.email,
                                  hashed_password=get_password_hash(user.password))
-    if database.user.create_user(internal_user):
+    if database.users.create_user(internal_user):
         log.info("Created new user", internal_user.model_dump())
         return internal_user
     else: