diff --git a/src/models/leaderboardModel.ts b/src/models/leaderboardModel.ts
index 656631cd..1dc50429 100644
--- a/src/models/leaderboardModel.ts
+++ b/src/models/leaderboardModel.ts
@@ -5,7 +5,7 @@ const leaderboardEntrySchema = new Schema<ILeaderboardEntryDatabase>(
     {
         leaderboard: { type: String, required: true },
         displayName: { type: String, required: true },
-        accountId: { type: Schema.Types.ObjectId, required: true },
+        ownerId: { type: Schema.Types.ObjectId, required: true },
         score: { type: Number, required: true },
         expiry: { type: Date, required: true }
     },
diff --git a/src/services/leaderboardService.ts b/src/services/leaderboardService.ts
index 0b301f11..5827bd6f 100644
--- a/src/services/leaderboardService.ts
+++ b/src/services/leaderboardService.ts
@@ -3,7 +3,7 @@ import { ILeaderboardEntryClient } from "../types/leaderboardTypes";
 
 export const submitLeaderboardScore = async (
     leaderboard: string,
-    accountId: string,
+    ownerId: string,
     displayName: string,
     score: number
 ): Promise<void> => {
@@ -21,7 +21,7 @@ export const submitLeaderboardScore = async (
     }
     await Leaderboard.findOneAndUpdate(
         { leaderboard, displayName },
-        { $max: { score }, $set: { accountId, expiry } },
+        { $max: { score }, $set: { ownerId, expiry } },
         { upsert: true }
     );
 };
@@ -35,7 +35,7 @@ export const getLeaderboard = async (
     let entries: TLeaderboardEntryDocument[];
     let r: number;
     if (pivotId) {
-        const pivotDoc = await Leaderboard.findOne({ leaderboard, accountId: pivotId });
+        const pivotDoc = await Leaderboard.findOne({ leaderboard, ownerId: pivotId });
         if (!pivotDoc) {
             return [];
         }
@@ -67,7 +67,7 @@ export const getLeaderboard = async (
     const res: ILeaderboardEntryClient[] = [];
     for (const entry of entries) {
         res.push({
-            _id: entry.accountId.toString(),
+            _id: entry.ownerId.toString(),
             s: entry.score,
             r: ++r,
             n: entry.displayName
diff --git a/src/types/leaderboardTypes.ts b/src/types/leaderboardTypes.ts
index c2fec490..80ca29b2 100644
--- a/src/types/leaderboardTypes.ts
+++ b/src/types/leaderboardTypes.ts
@@ -2,7 +2,7 @@ import { Types } from "mongoose";
 
 export interface ILeaderboardEntryDatabase {
     leaderboard: string;
-    accountId: Types.ObjectId;
+    ownerId: Types.ObjectId;
     displayName: string;
     score: number;
     expiry: Date;