diff --git a/backend/app/models/__init__.py b/backend/app/models/__init__.py
index e73a86a..62ba067 100644
--- a/backend/app/models/__init__.py
+++ b/backend/app/models/__init__.py
@@ -1,31 +1,31 @@
 """Models package"""
 
 from app.models.database_models import (
-    User,
-    MailAccount,
-    ProcessingRun,
-    ProcessingLog,
-    NotificationConfig,
-    MailServerPreset,
-    SubscriptionPlan,
-    AuditLog,
-    SubscriptionTier,
-    MailProtocol,
-    AccountStatus,
-    NotificationChannel,
+    AccountStatus as AccountStatus,
+    AuditLog as AuditLog,
+    MailAccount as MailAccount,
+    MailProtocol as MailProtocol,
+    MailServerPreset as MailServerPreset,
+    NotificationChannel as NotificationChannel,
+    NotificationConfig as NotificationConfig,
+    ProcessingLog as ProcessingLog,
+    ProcessingRun as ProcessingRun,
+    SubscriptionPlan as SubscriptionPlan,
+    SubscriptionTier as SubscriptionTier,
+    User as User,
 )
 
 __all__ = [
-    "User",
-    "MailAccount",
-    "ProcessingRun",
-    "ProcessingLog",
-    "NotificationConfig",
-    "MailServerPreset",
-    "SubscriptionPlan",
-    "AuditLog",
-    "SubscriptionTier",
-    "MailProtocol",
     "AccountStatus",
+    "AuditLog",
+    "MailAccount",
+    "MailProtocol",
+    "MailServerPreset",
     "NotificationChannel",
+    "NotificationConfig",
+    "ProcessingLog",
+    "ProcessingRun",
+    "SubscriptionPlan",
+    "SubscriptionTier",
+    "User",
 ]
diff --git a/frontend/package.json b/frontend/package.json
index a0f78ea..fa90af8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,7 +22,7 @@
     "@types/node": "^20",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "eslint": "^10",
+    "eslint": "^9",
     "eslint-config-next": "16.2.1",
     "tailwindcss": "^4",
     "typescript": "^5"