diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts
index 8b257923898..8f5f267f7ef 100644
--- a/src/data/abilities/ability.ts
+++ b/src/data/abilities/ability.ts
@@ -6991,7 +6991,7 @@ export function initAbilities() {
       .attr(HealFromBerryUseAbAttr, 1 / 3),
     new Ability(AbilityId.PROTEAN, 6)
       .attr(PokemonTypeChangeAbAttr),
-    //.condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.PROTEAN)), //Gen 9 Implementation
+    //.condition((p) => !p.summonData.abilitiesApplied.includes(AbilityId.PROTEAN)), //Gen 9 Implementation
     new Ability(AbilityId.FUR_COAT, 6)
       .attr(ReceivedMoveDamageMultiplierAbAttr, (target, user, move) => move.category === MoveCategory.PHYSICAL, 0.5)
       .ignorable(),
@@ -7237,7 +7237,7 @@ export function initAbilities() {
       .attr(PostSummonStatStageChangeAbAttr, [ Stat.DEF ], 1, true),
     new Ability(AbilityId.LIBERO, 8)
       .attr(PokemonTypeChangeAbAttr),
-    //.condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.LIBERO)), //Gen 9 Implementation
+    //.condition((p) => !p.summonData.abilitiesApplied.includes(AbilityId.LIBERO)), //Gen 9 Implementation
     new Ability(AbilityId.BALL_FETCH, 8)
       .attr(FetchBallAbAttr)
       .condition(getOncePerBattleCondition(AbilityId.BALL_FETCH)),
diff --git a/src/enums/MoveFlags.ts b/src/enums/MoveFlags.ts
index 0fc85fddec6..46a838cd38d 100644
--- a/src/enums/MoveFlags.ts
+++ b/src/enums/MoveFlags.ts
@@ -4,10 +4,10 @@ export enum MoveFlags {
   IGNORE_PROTECT = 1 << 1,
   /**
    * Sound-based moves have the following effects:
-   * - Pokemon with the {@linkcode Abilities.SOUNDPROOF Soundproof Ability} are unaffected by other Pokemon's sound-based moves.
+   * - Pokemon with the {@linkcode AbilityId.SOUNDPROOF Soundproof Ability} are unaffected by other Pokemon's sound-based moves.
    * - Pokemon affected by {@linkcode Moves.THROAT_CHOP Throat Chop} cannot use sound-based moves for two turns.
-   * - Sound-based moves used by a Pokemon with {@linkcode Abilities.LIQUID_VOICE Liquid Voice} become Water-type moves.
-   * - Sound-based moves used by a Pokemon with {@linkcode Abilities.PUNK_ROCK Punk Rock} are boosted by 30%. Pokemon with Punk Rock also take half damage from sound-based moves.
+   * - Sound-based moves used by a Pokemon with {@linkcode AbilityId.LIQUID_VOICE Liquid Voice} become Water-type moves.
+   * - Sound-based moves used by a Pokemon with {@linkcode AbilityId.PUNK_ROCK Punk Rock} are boosted by 30%. Pokemon with Punk Rock also take half damage from sound-based moves.
    * - All sound-based moves (except Howl) can hit Pokemon behind an active {@linkcode Moves.SUBSTITUTE Substitute}.
    *
    * cf https://bulbapedia.bulbagarden.net/wiki/Sound-based_move
@@ -20,19 +20,19 @@ export enum MoveFlags {
   PUNCHING_MOVE = 1 << 7,
   SLICING_MOVE = 1 << 8,
   /**
-   * Indicates a move should be affected by {@linkcode Abilities.RECKLESS}
+   * Indicates a move should be affected by {@linkcode AbilityId.RECKLESS}
    * @see {@linkcode Move.recklessMove()}
    */
   RECKLESS_MOVE = 1 << 9,
-  /** Indicates a move should be affected by {@linkcode Abilities.BULLETPROOF} */
+  /** Indicates a move should be affected by {@linkcode AbilityId.BULLETPROOF} */
   BALLBOMB_MOVE = 1 << 10,
-  /** Grass types and pokemon with {@linkcode Abilities.OVERCOAT} are immune to powder moves */
+  /** Grass types and pokemon with {@linkcode AbilityId.OVERCOAT} are immune to powder moves */
   POWDER_MOVE = 1 << 11,
-  /** Indicates a move should trigger {@linkcode Abilities.DANCER} */
+  /** Indicates a move should trigger {@linkcode AbilityId.DANCER} */
   DANCE_MOVE = 1 << 12,
-  /** Indicates a move should trigger {@linkcode Abilities.WIND_RIDER} */
+  /** Indicates a move should trigger {@linkcode AbilityId.WIND_RIDER} */
   WIND_MOVE = 1 << 13,
-  /** Indicates a move should trigger {@linkcode Abilities.TRIAGE} */
+  /** Indicates a move should trigger {@linkcode AbilityId.TRIAGE} */
   TRIAGE_MOVE = 1 << 14,
   IGNORE_ABILITIES = 1 << 15,
   /** Enables all hits of a multi-hit move to be accuracy checked individually */
@@ -41,6 +41,6 @@ export enum MoveFlags {
   IGNORE_SUBSTITUTE = 1 << 17,
   /** Indicates a move is able to be redirected to allies in a double battle if the attacker faints */
   REDIRECT_COUNTER = 1 << 18,
-  /** Indicates a move is able to be reflected by {@linkcode Abilities.MAGIC_BOUNCE} and {@linkcode Moves.MAGIC_COAT} */
+  /** Indicates a move is able to be reflected by {@linkcode AbilityId.MAGIC_BOUNCE} and {@linkcode Moves.MAGIC_COAT} */
   REFLECTABLE = 1 << 19
 }
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index e8b69084e5a..11631b64451 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -1627,7 +1627,7 @@ export class BypassSpeedChanceModifier extends PokemonHeldItemModifier {
 
 /**
  * Class for Pokemon held items like King's Rock
- * Because King's Rock can be stacked in PokeRogue, unlike mainline, it does not receive a boost from Abilities.SERENE_GRACE
+ * Because King's Rock can be stacked in PokeRogue, unlike mainline, it does not receive a boost from AbilityId.SERENE_GRACE
  */
 export class FlinchChanceModifier extends PokemonHeldItemModifier {
   private chance: number;
diff --git a/src/overrides.ts b/src/overrides.ts
index c5b847d3ca6..f8a808357ab 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -38,8 +38,8 @@ import { WeatherType } from "#enums/weather-type";
  * @example
  * ```
  * const overrides = {
- *   ABILITY_OVERRIDE: Abilities.PROTEAN,
- *   PASSIVE_ABILITY_OVERRIDE: Abilities.PIXILATE,
+ *   ABILITY_OVERRIDE: AbilityId.PROTEAN,
+ *   PASSIVE_ABILITY_OVERRIDE: AbilityId.PIXILATE,
  * }
  * ```
  */
diff --git a/src/phases/berry-phase.ts b/src/phases/berry-phase.ts
index b027469ea5e..989f19c944f 100644
--- a/src/phases/berry-phase.ts
+++ b/src/phases/berry-phase.ts
@@ -71,7 +71,7 @@ export class BerryPhase extends FieldPhase {
     }
     globalScene.updateModifiers(pokemon.isPlayer());
 
-    // Abilities.CHEEK_POUCH only works once per round of nom noms
+    // AbilityId.CHEEK_POUCH only works once per round of nom noms
     applyAbAttrs(HealFromBerryUseAbAttr, pokemon, new BooleanHolder(false));
   }
 }
diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index 85cd4cd6b14..636f85f0f82 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -609,7 +609,7 @@ export class MoveEffectPhase extends PokemonPhase {
    * @returns `true` if the move should bypass accuracy and semi-invulnerability
    *
    * Accuracy and semi-invulnerability can be bypassed by:
-   * - An ability like {@linkcode Abilities.NO_GUARD | No Guard}
+   * - An ability like {@linkcode AbilityId.NO_GUARD | No Guard}
    * - A poison type using {@linkcode MoveId.TOXIC | Toxic}
    * - A move like {@linkcode MoveId.LOCK_ON | Lock-On} or {@linkcode MoveId.MIND_READER | Mind Reader}.
    * - A field-targeted move like spikes
diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic_bounce.test.ts
index 996498dde0f..8c3eeec974c 100644
--- a/test/abilities/magic_bounce.test.ts
+++ b/test/abilities/magic_bounce.test.ts
@@ -173,7 +173,7 @@ describe("Abilities - Magic Bounce", () => {
   it("should not cause encore to be interrupted after bouncing", async () => {
     game.override.moveset([MoveId.SPLASH, MoveId.GROWL, MoveId.ENCORE]);
     game.override.enemyMoveset([MoveId.TACKLE, MoveId.GROWL]);
-    // game.override.ability(Abilities.MOLD_BREAKER);
+    // game.override.ability(AbilityId.MOLD_BREAKER);
     await game.classicMode.startBattle([SpeciesId.MAGIKARP]);
     const playerPokemon = game.scene.getPlayerPokemon()!;
     const enemyPokemon = game.scene.getEnemyPokemon()!;
diff --git a/test/abilities/sturdy.test.ts b/test/abilities/sturdy.test.ts
index 668e4c51c75..a50e2075fea 100644
--- a/test/abilities/sturdy.test.ts
+++ b/test/abilities/sturdy.test.ts
@@ -64,7 +64,7 @@ describe("Abilities - Sturdy", () => {
     expect(enemyPokemon.isFullHp()).toBe(true);
   });
 
-  test("Sturdy is ignored by pokemon with `Abilities.MOLD_BREAKER`", async () => {
+  test("Sturdy is ignored by pokemon with `AbilityId.MOLD_BREAKER`", async () => {
     game.override.ability(AbilityId.MOLD_BREAKER);
 
     await game.classicMode.startBattle();