diff --git a/src/lib/types/api/entities.ts b/src/lib/types/api/entities.ts
index d50bd77f..56cc16c5 100644
--- a/src/lib/types/api/entities.ts
+++ b/src/lib/types/api/entities.ts
@@ -220,7 +220,8 @@ export interface Raid {
   name: LocalizedName
   level: number
   element: number
-  game_id?: number
+  enemy_id?: number
+  summon_id?: number
   group?: RaidGroup
 }
 
diff --git a/src/lib/types/api/raid.ts b/src/lib/types/api/raid.ts
index 6ff4ab8c..3cdd159b 100644
--- a/src/lib/types/api/raid.ts
+++ b/src/lib/types/api/raid.ts
@@ -16,7 +16,8 @@ export interface RaidFull {
   name: LocalizedName
   level: number
   element: number
-  game_id?: number
+  enemy_id?: number
+  summon_id?: number
   group?: RaidGroupFlat
 }
 
@@ -46,7 +47,8 @@ export interface CreateRaidInput {
   level: number
   element: number
   group_id: string
-  game_id?: number
+  enemy_id?: number
+  summon_id?: number
 }
 
 export interface UpdateRaidInput {
@@ -56,7 +58,8 @@ export interface UpdateRaidInput {
   level?: number
   element?: number
   group_id?: string
-  game_id?: number
+  enemy_id?: number
+  summon_id?: number
 }
 
 // Input types for creating/updating raid groups
diff --git a/src/routes/(app)/database/raids/[slug]/+page.svelte b/src/routes/(app)/database/raids/[slug]/+page.svelte
index 878dc1ec..9c314836 100644
--- a/src/routes/(app)/database/raids/[slug]/+page.svelte
+++ b/src/routes/(app)/database/raids/[slug]/+page.svelte
@@ -86,7 +86,8 @@
 				<DetailItem label="Name (JA)" value={raid.name.ja || '-'} />
 				<DetailItem label="Slug" value={raid.slug || '-'} />
 				<DetailItem label="Level" value={raid.level?.toString() ?? '-'} />
-				<DetailItem label="Game ID" value={raid.game_id?.toString() ?? '-'} />
+				<DetailItem label="Enemy ID" value={raid.enemy_id?.toString() ?? '-'} />
+				<DetailItem label="Summon ID" value={raid.summon_id?.toString() ?? '-'} />
 				<DetailItem label="Element">
 					{#if raid.element !== undefined && raid.element !== null}
 						<ElementBadge element={raid.element} />
diff --git a/src/routes/(app)/database/raids/[slug]/edit/+page.svelte b/src/routes/(app)/database/raids/[slug]/edit/+page.svelte
index 43c6415f..c1df54a9 100644
--- a/src/routes/(app)/database/raids/[slug]/edit/+page.svelte
+++ b/src/routes/(app)/database/raids/[slug]/edit/+page.svelte
@@ -58,7 +58,8 @@
 		level: 0,
 		element: 0,
 		group_id: '',
-		game_id: undefined as number | undefined
+		enemy_id: undefined as number | undefined,
+		summon_id: undefined as number | undefined
 	})
 
 	// Sync edit data when raid changes
@@ -71,7 +72,8 @@
 				level: raid.level ?? 0,
 				element: raid.element ?? 0,
 				group_id: raid.group?.id || '',
-				game_id: raid.game_id
+				enemy_id: raid.enemy_id,
+				summon_id: raid.summon_id
 			}
 		}
 	})
@@ -115,7 +117,8 @@
 				level: editData.level,
 				element: editData.element,
 				group_id: editData.group_id,
-				game_id: editData.game_id
+				enemy_id: editData.enemy_id,
+				summon_id: editData.summon_id
 			})
 
 			// Invalidate queries
@@ -187,8 +190,14 @@
 					type="number"
 				/>
 				<DetailItem
-					label="Game ID"
-					bind:value={editData.game_id}
+					label="Enemy ID"
+					bind:value={editData.enemy_id}
+					editable={true}
+					type="number"
+				/>
+				<DetailItem
+					label="Summon ID"
+					bind:value={editData.summon_id}
 					editable={true}
 					type="number"
 				/>
diff --git a/src/routes/(app)/database/raids/new/+page.svelte b/src/routes/(app)/database/raids/new/+page.svelte
index dd79f620..3831a1d4 100644
--- a/src/routes/(app)/database/raids/new/+page.svelte
+++ b/src/routes/(app)/database/raids/new/+page.svelte
@@ -45,7 +45,8 @@
 		level: 0,
 		element: 0,
 		group_id: '',
-		game_id: undefined as number | undefined
+		enemy_id: undefined as number | undefined,
+		summon_id: undefined as number | undefined
 	})
 
 	// Element options
@@ -87,7 +88,8 @@
 				level: editData.level,
 				element: editData.element,
 				group_id: editData.group_id,
-				game_id: editData.game_id
+				enemy_id: editData.enemy_id,
+				summon_id: editData.summon_id
 			})
 
 			// Invalidate queries
@@ -154,8 +156,14 @@
 				type="number"
 			/>
 			<DetailItem
-				label="Game ID"
-				bind:value={editData.game_id}
+				label="Enemy ID"
+				bind:value={editData.enemy_id}
+				editable={true}
+				type="number"
+			/>
+			<DetailItem
+				label="Summon ID"
+				bind:value={editData.summon_id}
 				editable={true}
 				type="number"
 			/>