diff --git a/app/routes/admin.data-sync.tsx b/app/routes/admin.data-sync.tsx
index fff5737..1d3bed9 100644
--- a/app/routes/admin.data-sync.tsx
+++ b/app/routes/admin.data-sync.tsx
@@ -6,7 +6,7 @@ import { logger } from "~/lib/logger";
 import { findAllSports } from "~/models/sport";
 import { findAllSportsSeasons } from "~/models/sports-season";
 import { findAllSeasonTemplates } from "~/models/season-template";
-import { countAllParticipants } from "~/models/participant";
+import { countAllParticipants } from "~/models/season-participant";
 import { countAllParticipantEVs } from "~/models/participant-expected-value";
 import { importSportsDataFromJSON } from "~/utils/sports-data-sync.server";
 import { Button } from "~/components/ui/button";
diff --git a/app/routes/admin.sports-seasons.$id.elo-ratings.tsx b/app/routes/admin.sports-seasons.$id.elo-ratings.tsx
index 385e911..8536efe 100644
--- a/app/routes/admin.sports-seasons.$id.elo-ratings.tsx
+++ b/app/routes/admin.sports-seasons.$id.elo-ratings.tsx
@@ -3,7 +3,7 @@ import type { Route } from './+types/admin.sports-seasons.$id.elo-ratings';
 
 import { logger } from '~/lib/logger';
 import { findSportsSeasonById, updateSportsSeason } from '~/models/sports-season';
-import { findParticipantsBySportsSeasonId } from '~/models/participant';
+import { findParticipantsBySportsSeasonId } from '~/models/season-participant';
 import {
   getAllParticipantEVsForSeason,
   batchSaveSourceElos,
diff --git a/app/routes/admin.sports-seasons.$id.events.$eventId.bracket.server.ts b/app/routes/admin.sports-seasons.$id.events.$eventId.bracket.server.ts
index 3bb6044..f401485 100644
--- a/app/routes/admin.sports-seasons.$id.events.$eventId.bracket.server.ts
+++ b/app/routes/admin.sports-seasons.$id.events.$eventId.bracket.server.ts
@@ -1,7 +1,7 @@
 import type { Route } from "./+types/admin.sports-seasons.$id.events.$eventId.bracket";
 
 import { findSportsSeasonById } from "~/models/sports-season";
-import { findParticipantsBySportsSeasonId } from "~/models/participant";
+import { findParticipantsBySportsSeasonId } from "~/models/season-participant";
 import { getScoringEventById, updateScoringEvent } from "~/models/scoring-event";
 import {
   findPlayoffMatchesByEventId,
diff --git a/app/routes/admin.sports-seasons.$id.events.$eventId.cs2-setup.tsx b/app/routes/admin.sports-seasons.$id.events.$eventId.cs2-setup.tsx
index 4051206..9dec8fd 100644
--- a/app/routes/admin.sports-seasons.$id.events.$eventId.cs2-setup.tsx
+++ b/app/routes/admin.sports-seasons.$id.events.$eventId.cs2-setup.tsx
@@ -3,7 +3,7 @@ import type { Route } from './+types/admin.sports-seasons.$id.events.$eventId.cs
 
 import { findSportsSeasonById } from '~/models/sports-season';
 import { getScoringEventById } from '~/models/scoring-event';
-import { findParticipantsBySportsSeasonId } from '~/models/participant';
+import { findParticipantsBySportsSeasonId } from '~/models/season-participant';
 import {
   getCs2StageResultsForEvent,
   upsertCs2StageAssignments,
diff --git a/app/routes/admin.sports-seasons.$id.events.$eventId.server.ts b/app/routes/admin.sports-seasons.$id.events.$eventId.server.ts
index e1b3515..c1a997b 100644
--- a/app/routes/admin.sports-seasons.$id.events.$eventId.server.ts
+++ b/app/routes/admin.sports-seasons.$id.events.$eventId.server.ts
@@ -1,7 +1,7 @@
 import type { Route } from "./+types/admin.sports-seasons.$id.events.$eventId";
 import { logger } from "~/lib/logger";
 import { findSportsSeasonById } from "~/models/sports-season";
-import { findParticipantsBySportsSeasonId, createParticipant } from "~/models/participant";
+import { findParticipantsBySportsSeasonId, createParticipant } from "~/models/season-participant";
 import {
   getScoringEventById,
   completeScoringEvent,
@@ -134,7 +134,7 @@ export async function action({ request, params }: Route.ActionArgs) {
         // This marks them as "competed, earned nothing" so simulations skip this event.
         const allParticipants = await findParticipantsBySportsSeasonId(params.id);
         const existingResults = await getEventResults(params.eventId);
-        const existingIds = new Set(existingResults.map((r) => r.participantId));
+        const existingIds = new Set(existingResults.map((r) => r.seasonParticipantId));
         const missingIds = findParticipantsWithoutResults(
           allParticipants.map((p) => p.id),
           existingIds
@@ -373,7 +373,7 @@ export async function action({ request, params }: Route.ActionArgs) {
 
     try {
       const existingResults = await getEventResults(params.eventId);
-      const existingIds = new Set(existingResults.map((r) => r.participantId));
+      const existingIds = new Set(existingResults.map((r) => r.seasonParticipantId));
       const newResults = filterNewResults(incoming, existingIds);
 
       if (newResults.length > 0) {
diff --git a/app/routes/admin.sports-seasons.$id.events.$eventId.tsx b/app/routes/admin.sports-seasons.$id.events.$eventId.tsx
index b963899..7eba5ac 100644
--- a/app/routes/admin.sports-seasons.$id.events.$eventId.tsx
+++ b/app/routes/admin.sports-seasons.$id.events.$eventId.tsx
@@ -99,7 +99,7 @@ export default function EventResults({
 
   // Create a map of participants with results for easy lookup
   const participantResultsMap = new Map(
-    results.map((r: { participant: { id: string } }) => [r.participant.id, r])
+    results.map((r: { seasonParticipant: { id: string } }) => [r.seasonParticipant.id, r])
   );
 
   // Get participants without results
@@ -419,7 +419,7 @@ export default function EventResults({
               participants={participants}
               sportsSeasonId={sportsSeason.id}
               existingResultParticipantIds={
-                new Set(results.map((r: { participant: { id: string } }) => r.participant.id))
+                new Set(results.map((r: { seasonParticipant: { id: string } }) => r.seasonParticipant.id))
               }
             />
           )}
@@ -576,7 +576,7 @@ export default function EventResults({
                             </span>
                           </div>
                         </TableCell>
-                        <TableCell>{result.participant.name}</TableCell>
+                        <TableCell>{result.seasonParticipant.name}</TableCell>
                         {event.isQualifyingEvent && event.isComplete && (
                           <TableCell className="text-right">
                             {result.qualifyingPointsAwarded ? (
@@ -620,7 +620,7 @@ export default function EventResults({
                                   variant="ghost"
                                   className="h-8 w-8 p-0 text-destructive hover:text-destructive"
                                   onClick={(e) => {
-                                    if (!confirm(`Delete result for ${result.participant.name}?`)) {
+                                    if (!confirm(`Delete result for ${result.seasonParticipant.name}?`)) {
                                       e.preventDefault();
                                     }
                                   }}
diff --git a/app/routes/admin.sports-seasons.$id.expected-values.server.ts b/app/routes/admin.sports-seasons.$id.expected-values.server.ts
index 9dcbe4b..70104e0 100644
--- a/app/routes/admin.sports-seasons.$id.expected-values.server.ts
+++ b/app/routes/admin.sports-seasons.$id.expected-values.server.ts
@@ -1,7 +1,7 @@
 import type { Route } from "./+types/admin.sports-seasons.$id.expected-values";
 import { logger } from "~/lib/logger";
 import { findSportsSeasonById } from "~/models/sports-season";
-import { findParticipantsBySportsSeasonId } from "~/models/participant";
+import { findParticipantsBySportsSeasonId } from "~/models/season-participant";
 import {
   batchUpsertParticipantEVs,
   getAllParticipantEVsForSeason
diff --git a/app/routes/admin.sports-seasons.$id.futures-odds.tsx b/app/routes/admin.sports-seasons.$id.futures-odds.tsx
index dd02a22..e0bce3d 100644
--- a/app/routes/admin.sports-seasons.$id.futures-odds.tsx
+++ b/app/routes/admin.sports-seasons.$id.futures-odds.tsx
@@ -3,7 +3,7 @@ import type { Route } from './+types/admin.sports-seasons.$id.futures-odds';
 
 import { logger } from '~/lib/logger';
 import { findSportsSeasonById, updateSportsSeason } from '~/models/sports-season';
-import { findParticipantsBySportsSeasonId } from '~/models/participant';
+import { findParticipantsBySportsSeasonId } from '~/models/season-participant';
 import { getAllParticipantEVsForSeason, batchSaveSourceOdds, batchUpsertParticipantEVs } from '~/models/participant-expected-value';
 import { batchUpsertParticipantEvSnapshots } from '~/models/ev-snapshot';
 import { getSimulator, type SimulatorType } from '~/services/simulations/registry';
diff --git a/app/routes/admin.sports-seasons.$id.golf-skills.tsx b/app/routes/admin.sports-seasons.$id.golf-skills.tsx
index 5a0acea..efb5f8d 100644
--- a/app/routes/admin.sports-seasons.$id.golf-skills.tsx
+++ b/app/routes/admin.sports-seasons.$id.golf-skills.tsx
@@ -3,7 +3,7 @@ import type { Route } from './+types/admin.sports-seasons.$id.golf-skills';
 
 import { logger } from '~/lib/logger';
 import { findSportsSeasonById, updateSportsSeason } from '~/models/sports-season';
-import { findParticipantsBySportsSeasonId, findParticipantByName, createParticipant } from '~/models/participant';
+import { findParticipantsBySportsSeasonId, findParticipantByName, createParticipant } from '~/models/season-participant';
 import { batchUpsertParticipantEVs } from '~/models/participant-expected-value';
 import { batchUpsertParticipantEvSnapshots } from '~/models/ev-snapshot';
 import { getGolfSkillsForSeason, batchUpsertGolfSkills } from '~/models/golf-skills';
diff --git a/app/routes/admin.sports-seasons.$id.regular-standings.tsx b/app/routes/admin.sports-seasons.$id.regular-standings.tsx
index 7561f82..83e45ac 100644
--- a/app/routes/admin.sports-seasons.$id.regular-standings.tsx
+++ b/app/routes/admin.sports-seasons.$id.regular-standings.tsx
@@ -3,7 +3,7 @@ import type { Route } from "./+types/admin.sports-seasons.$id.regular-standings"
 
 import { logger } from "~/lib/logger";
 import { findSportsSeasonById } from "~/models/sports-season";
-import { findParticipantsBySportsSeasonId } from "~/models/participant";
+import { findParticipantsBySportsSeasonId } from "~/models/season-participant";
 import { getRegularSeasonStandings, upsertManualStanding } from "~/models/regular-season-standings";
 import { Button } from "~/components/ui/button";
 import { Input } from "~/components/ui/input";
diff --git a/app/routes/admin.sports-seasons.$id.simulate.tsx b/app/routes/admin.sports-seasons.$id.simulate.tsx
index 3e75431..41f763e 100644
--- a/app/routes/admin.sports-seasons.$id.simulate.tsx
+++ b/app/routes/admin.sports-seasons.$id.simulate.tsx
@@ -15,7 +15,7 @@ import type { Route } from "./+types/admin.sports-seasons.$id.simulate";
 import { findSportsSeasonById, updateSportsSeason } from "~/models/sports-season";
 import { batchUpsertParticipantEVs } from "~/models/participant-expected-value";
 import { batchUpsertParticipantEvSnapshots } from "~/models/ev-snapshot";
-import { findParticipantsBySportsSeasonId } from "~/models/participant";
+import { findParticipantsBySportsSeasonId } from "~/models/season-participant";
 import { getSimulator, type SimulatorType } from "~/services/simulations/registry";
 import { calculateEV } from "~/services/ev-calculator";
 import { DEFAULT_SCORING_RULES } from "~/lib/scoring-types";
diff --git a/app/routes/admin.sports-seasons.$id.standings.tsx b/app/routes/admin.sports-seasons.$id.standings.tsx
index 7b1cf81..2034543 100644
--- a/app/routes/admin.sports-seasons.$id.standings.tsx
+++ b/app/routes/admin.sports-seasons.$id.standings.tsx
@@ -3,7 +3,7 @@ import type { Route } from "./+types/admin.sports-seasons.$id.standings";
 
 import { logger } from "~/lib/logger";
 import { findSportsSeasonById } from "~/models/sports-season";
-import { findParticipantsBySportsSeasonId } from "~/models/participant";
+import { findParticipantsBySportsSeasonId } from "~/models/season-participant";
 import { getSeasonResults, upsertSeasonResultsBulk } from "~/models/participant-season-result";
 import { Button } from "~/components/ui/button";
 import { Input } from "~/components/ui/input";
diff --git a/app/routes/admin.sports-seasons.$id.surface-elo.tsx b/app/routes/admin.sports-seasons.$id.surface-elo.tsx
index 14c477e..95b548d 100644
--- a/app/routes/admin.sports-seasons.$id.surface-elo.tsx
+++ b/app/routes/admin.sports-seasons.$id.surface-elo.tsx
@@ -3,7 +3,7 @@ import type { Route } from './+types/admin.sports-seasons.$id.surface-elo';
 
 import { logger } from '~/lib/logger';
 import { findSportsSeasonById, updateSportsSeason } from '~/models/sports-season';
-import { findParticipantsBySportsSeasonId, findParticipantByName, createParticipant } from '~/models/participant';
+import { findParticipantsBySportsSeasonId, findParticipantByName, createParticipant } from '~/models/season-participant';
 import {
   batchUpsertParticipantEVs,
 } from '~/models/participant-expected-value';
diff --git a/app/routes/admin.sports-seasons.$id.tsx b/app/routes/admin.sports-seasons.$id.tsx
index 8107c85..7fc3699 100644
--- a/app/routes/admin.sports-seasons.$id.tsx
+++ b/app/routes/admin.sports-seasons.$id.tsx
@@ -16,7 +16,7 @@ import {
   getPendingStandingsMappings,
   deletePendingStandingsMapping,
 } from "~/models/pending-standings-mappings";
-import { findParticipantsBySportsSeasonId, updateParticipant } from "~/models/participant";
+import { findParticipantsBySportsSeasonId, updateParticipant } from "~/models/season-participant";
 import { getLastSyncedAt, upsertRegularSeasonStandings } from "~/models/regular-season-standings";
 import { Button } from "~/components/ui/button";
 import { Input } from "~/components/ui/input";
diff --git a/app/routes/api/__tests__/draft.force-manual-pick.test.ts b/app/routes/api/__tests__/draft.force-manual-pick.test.ts
index 61b467b..e1ec753 100644
--- a/app/routes/api/__tests__/draft.force-manual-pick.test.ts
+++ b/app/routes/api/__tests__/draft.force-manual-pick.test.ts
@@ -16,7 +16,7 @@ vi.mock("~/models/draft-pick", () => ({
   getDraftPicksWithSports: vi.fn(),
   getTeamDraftPicksWithSports: vi.fn(),
 }));
-vi.mock("~/models/participant", () => ({
+vi.mock("~/models/season-participant", () => ({
   getParticipantsForSeasonWithSports: vi.fn(),
 }));
 vi.mock("~/models/season-sport", () => ({
@@ -138,7 +138,7 @@ describe("draft.force-manual-pick action", () => {
     vi.mocked(getDraftPicksWithSports).mockResolvedValue([]);
     vi.mocked(getTeamDraftPicksWithSports).mockResolvedValue([]);
 
-    const { getParticipantsForSeasonWithSports } = await import("~/models/participant");
+    const { getParticipantsForSeasonWithSports } = await import("~/models/season-participant");
     vi.mocked(getParticipantsForSeasonWithSports).mockResolvedValue([]);
 
     const { getSeasonSportsSimple } = await import("~/models/season-sport");
diff --git a/app/routes/api/__tests__/draft.force-manual-pick.timer-mode.test.ts b/app/routes/api/__tests__/draft.force-manual-pick.timer-mode.test.ts
index 969fd67..e7f6620 100644
--- a/app/routes/api/__tests__/draft.force-manual-pick.timer-mode.test.ts
+++ b/app/routes/api/__tests__/draft.force-manual-pick.timer-mode.test.ts
@@ -22,7 +22,7 @@ vi.mock("~/models/draft-pick", () => ({
   getDraftPicksWithSports: vi.fn(),
   getTeamDraftPicksWithSports: vi.fn(),
 }));
-vi.mock("~/models/participant", () => ({
+vi.mock("~/models/season-participant", () => ({
   getParticipantsForSeasonWithSports: vi.fn(),
 }));
 vi.mock("~/models/season-sport", () => ({
@@ -141,7 +141,7 @@ describe("draft.force-manual-pick action — timer mode behavior", () => {
     vi.mocked(getDraftPicksWithSports).mockResolvedValue([]);
     vi.mocked(getTeamDraftPicksWithSports).mockResolvedValue([]);
 
-    const { getParticipantsForSeasonWithSports } = await import("~/models/participant");
+    const { getParticipantsForSeasonWithSports } = await import("~/models/season-participant");
     vi.mocked(getParticipantsForSeasonWithSports).mockResolvedValue([]);
 
     const { getSeasonSportsSimple } = await import("~/models/season-sport");
diff --git a/app/routes/api/__tests__/draft.make-pick.timer-mode.test.ts b/app/routes/api/__tests__/draft.make-pick.timer-mode.test.ts
index 63dc674..0a9ffd4 100644
--- a/app/routes/api/__tests__/draft.make-pick.timer-mode.test.ts
+++ b/app/routes/api/__tests__/draft.make-pick.timer-mode.test.ts
@@ -22,7 +22,7 @@ vi.mock("~/models/draft-pick", () => ({
   getDraftPicksWithSports: vi.fn(),
   getTeamDraftPicksWithSports: vi.fn(),
 }));
-vi.mock("~/models/participant", () => ({
+vi.mock("~/models/season-participant", () => ({
   getParticipantsForSeasonWithSports: vi.fn(),
 }));
 vi.mock("~/models/season-sport", () => ({
@@ -138,7 +138,7 @@ describe("draft.make-pick action — timer mode behavior", () => {
     vi.mocked(getDraftPicksWithSports).mockResolvedValue([]);
     vi.mocked(getTeamDraftPicksWithSports).mockResolvedValue([]);
 
-    const { getParticipantsForSeasonWithSports } = await import("~/models/participant");
+    const { getParticipantsForSeasonWithSports } = await import("~/models/season-participant");
     vi.mocked(getParticipantsForSeasonWithSports).mockResolvedValue([]);
 
     const { getSeasonSportsSimple } = await import("~/models/season-sport");
diff --git a/app/routes/api/draft.force-manual-pick.ts b/app/routes/api/draft.force-manual-pick.ts
index 8d58657..8ffe099 100644
--- a/app/routes/api/draft.force-manual-pick.ts
+++ b/app/routes/api/draft.force-manual-pick.ts
@@ -5,7 +5,7 @@ import { eq, and, sql } from "drizzle-orm";
 import { isUserAdmin } from "~/models/user";
 import { calculateDraftEligibility } from "~/lib/draft-eligibility";
 import { getDraftPicksWithSports, getTeamDraftPicksWithSports } from "~/models/draft-pick";
-import { getParticipantsForSeasonWithSports } from "~/models/participant";
+import { getParticipantsForSeasonWithSports } from "~/models/season-participant";
 import { getSeasonSportsSimple } from "~/models/season-sport";
 import { calculatePickInfo, checkAndTriggerNextAutodraft } from "~/models/draft-utils";
 import { logCommissionerAction } from "~/models/audit-log";
diff --git a/app/routes/api/draft.make-pick.ts b/app/routes/api/draft.make-pick.ts
index 3070e61..65db0a0 100644
--- a/app/routes/api/draft.make-pick.ts
+++ b/app/routes/api/draft.make-pick.ts
@@ -5,7 +5,7 @@ import { eq, and, sql } from "drizzle-orm";
 import { isUserAdmin } from "~/models/user";
 import { calculateDraftEligibility } from "~/lib/draft-eligibility";
 import { getDraftPicksWithSports, getTeamDraftPicksWithSports } from "~/models/draft-pick";
-import { getParticipantsForSeasonWithSports } from "~/models/participant";
+import { getParticipantsForSeasonWithSports } from "~/models/season-participant";
 import { getSeasonSportsSimple } from "~/models/season-sport";
 import { calculatePickInfo, checkAndTriggerNextAutodraft, pruneIneligibleQueueItems } from "~/models/draft-utils";
 import { getSocketIO, scheduleDraftRoomClosure } from "../../../server/socket";
diff --git a/app/routes/api/draft.replace-pick.ts b/app/routes/api/draft.replace-pick.ts
index 2fa2b42..b125360 100644
--- a/app/routes/api/draft.replace-pick.ts
+++ b/app/routes/api/draft.replace-pick.ts
@@ -5,7 +5,7 @@ import { eq, and } from "drizzle-orm";
 import { isCommissioner } from "~/models/commissioner";
 import { calculateDraftEligibility } from "~/lib/draft-eligibility";
 import { getDraftPicksWithSports, getTeamDraftPicksWithSports } from "~/models/draft-pick";
-import { getParticipantsForSeasonWithSports } from "~/models/participant";
+import { getParticipantsForSeasonWithSports } from "~/models/season-participant";
 import { getSeasonSportsSimple } from "~/models/season-sport";
 import { logCommissionerAction } from "~/models/audit-log";
 import { getSocketIO } from "../../../server/socket";
diff --git a/app/routes/leagues/$leagueId.draft.$seasonId.tsx b/app/routes/leagues/$leagueId.draft.$seasonId.tsx
index 0b79451..1c5bdeb 100644
--- a/app/routes/leagues/$leagueId.draft.$seasonId.tsx
+++ b/app/routes/leagues/$leagueId.draft.$seasonId.tsx
@@ -17,7 +17,7 @@ import { getTeamWatchlist } from "~/models/watchlist";
 import { findSeasonWithTeamsAndLeague } from "~/models/season";
 import { findDraftSlotsBySeasonId } from "~/models/draft-slot";
 import { getDraftPicksForSeason } from "~/models/draft-pick";
-import { getDraftParticipants } from "~/models/participant";
+import { getDraftParticipants } from "~/models/season-participant";
 import { getSeasonTimers } from "~/models/draft-timer";
 import { getSeasonAutodraftSettings } from "~/models/autodraft-settings";
 import { hasCommissionerRecord } from "~/models/commissioner";