diff --git a/components/NewsDirectory.vue b/components/NewsDirectory.vue
index 73b3092..f2be02d 100644
--- a/components/NewsDirectory.vue
+++ b/components/NewsDirectory.vue
@@ -80,11 +80,11 @@
           ]"
         >
           <div
-            v-if="article.image"
+            v-if="article.imageObjectId"
             class="absolute inset-0 rounded-lg transition-all duration-200 overflow-hidden"
           >
             <img
-              :src="useObject(article.image)"
+              :src="useObject(article.imageObjectId)"
               class="absolute blur-sm inset-0 w-full h-full object-cover transition-all duration-200 group-hover:scale-110"
             />
             <div
diff --git a/components/UserHeader/UserWidget.vue b/components/UserHeader/UserWidget.vue
index 827b633..067b1df 100644
--- a/components/UserHeader/UserWidget.vue
+++ b/components/UserHeader/UserWidget.vue
@@ -4,7 +4,7 @@
       <UserHeaderWidget>
         <div class="inline-flex items-center text-zinc-300 hover:text-white">
           <img
-            :src="useObject(user.profilePicture)"
+            :src="useObject(user.profilePictureObjectId)"
             class="w-5 h-5 rounded-sm"
           />
           <span class="ml-2 text-sm font-bold">{{ user.displayName }}</span>
@@ -31,7 +31,7 @@
           >
             <div class="inline-flex items-center text-zinc-300">
               <img
-                :src="useObject(user.profilePicture)"
+                :src="useObject(user.profilePictureObjectId)"
                 class="w-5 h-5 rounded-sm"
               />
               <span class="ml-2 text-sm font-bold">{{ user.displayName }}</span>
diff --git a/pages/news/[id]/index.vue b/pages/news/[id]/index.vue
index 390ecc5..5101e2c 100644
--- a/pages/news/[id]/index.vue
+++ b/pages/news/[id]/index.vue
@@ -4,9 +4,9 @@
     <div v-if="article" class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
       <!-- Banner header with blurred background -->
       <div class="relative w-full h-[300px] mb-8 rounded-lg overflow-hidden">
-        <div v-if="article.image" class="absolute inset-0">
+        <div v-if="article.imageObjectId" class="absolute inset-0">
           <img
-            :src="useObject(article.image)"
+            :src="useObject(article.imageObjectId)"
             alt=""
             class="w-full h-full object-cover blur-sm scale-110"
           />
diff --git a/pages/news/index.vue b/pages/news/index.vue
index 35fd7c0..62b1512 100644
--- a/pages/news/index.vue
+++ b/pages/news/index.vue
@@ -26,8 +26,8 @@
         >
           <div class="relative h-48 w-full overflow-hidden">
             <img
-              v-if="article.image"
-              :src="useObject(article.image)"
+              v-if="article.imageObjectId"
+              :src="useObject(article.imageObjectId)"
               alt=""
               class="h-full w-full object-cover object-center transition-all duration-500 group-hover:scale-110 scale-105"
             />
diff --git a/prisma/migrations/20250508224553_cleanup_old_objects/migration.sql b/prisma/migrations/20250508224553_cleanup_old_objects/migration.sql
index 7d6dfb8..2de26c3 100644
--- a/prisma/migrations/20250508224553_cleanup_old_objects/migration.sql
+++ b/prisma/migrations/20250508224553_cleanup_old_objects/migration.sql
@@ -8,3 +8,9 @@ ALTER TABLE "Game" RENAME COLUMN "mImageLibrary" TO "mImageLibraryObjectIds";
 
 -- Rename saveslot table columns
 ALTER TABLE "SaveSlot" RENAME COLUMN "history" TO "historyObjectIds";
+
+-- Rename article table columns
+ALTER TABLE "Article" RENAME COLUMN "image" TO "imageObjectId";
+
+-- Rename user table columns
+ALTER TABLE "User" RENAME COLUMN "profilePicture" TO "profilePictureObjectId";
diff --git a/prisma/models/news.prisma b/prisma/models/news.prisma
index d9ef63c..dcc25ec 100644
--- a/prisma/models/news.prisma
+++ b/prisma/models/news.prisma
@@ -13,8 +13,8 @@ model Article {
 
   tags Tag[]
 
-  image       String? // Object ID
-  publishedAt DateTime @default(now())
+  imageObjectId String? // Object ID
+  publishedAt   DateTime @default(now())
 
   author   User?   @relation(fields: [authorId], references: [id]) // Optional, if no user, it's a system post
   authorId String?
diff --git a/prisma/models/user.prisma b/prisma/models/user.prisma
index 9a578a1..20f1c60 100644
--- a/prisma/models/user.prisma
+++ b/prisma/models/user.prisma
@@ -4,9 +4,9 @@ model User {
     admin    Boolean @default(false)
     enabled  Boolean @default(true)
 
-    email          String
-    displayName    String
-    profilePicture String // Object
+    email                  String
+    displayName            String
+    profilePictureObjectId String // Object
 
     authMecs      LinkedAuthMec[]
     clients       Client[]
diff --git a/server/api/v1/auth/signup/simple.post.ts b/server/api/v1/auth/signup/simple.post.ts
index bef4608..ade27c1 100644
--- a/server/api/v1/auth/signup/simple.post.ts
+++ b/server/api/v1/auth/signup/simple.post.ts
@@ -77,7 +77,7 @@ export default defineEventHandler(async (h3) => {
             username: user.username,
             displayName: user.displayName ?? user.username,
             email: user.email,
-            profilePicture: profilePictureId,
+            profilePictureObjectId: profilePictureId,
             admin: invitation.isAdmin,
           },
         },
diff --git a/server/internal/news/index.ts b/server/internal/news/index.ts
index 2c13603..a0ea696 100644
--- a/server/internal/news/index.ts
+++ b/server/internal/news/index.ts
@@ -127,8 +127,8 @@ class NewsManager {
     const article = await prisma.article.delete({
       where: { id },
     });
-    if (article.image) {
-      return await objectHandler.deleteAsSystem(article.image);
+    if (article.imageObjectId) {
+      return await objectHandler.deleteAsSystem(article.imageObjectId);
     }
     return true;
   }
diff --git a/server/internal/oidc/index.ts b/server/internal/oidc/index.ts
index efe2309..24c4e33 100644
--- a/server/internal/oidc/index.ts
+++ b/server/internal/oidc/index.ts
@@ -276,7 +276,7 @@ export class OIDCManager {
               username,
               email: userinfo.email ?? "",
               displayName: userinfo.name ?? username,
-              profilePicture: profilePictureId,
+              profilePictureObjectId: profilePictureId,
               admin: isAdmin,
             },
           },
diff --git a/server/plugins/01.system-init.ts b/server/plugins/01.system-init.ts
index 1193ec5..a28edbe 100644
--- a/server/plugins/01.system-init.ts
+++ b/server/plugins/01.system-init.ts
@@ -16,7 +16,7 @@ export default defineNitroPlugin(async (_nitro) => {
       displayName: "System",
       username: "system",
       email: "system@drop",
-      profilePicture: "",
+      profilePictureObjectId: "",
     },
     update: {
       admin: true,