diff --git a/src/data/balance/biomes.ts b/src/data/balance/biomes.ts
index f39b129260f..713ab9637ab 100644
--- a/src/data/balance/biomes.ts
+++ b/src/data/balance/biomes.ts
@@ -7913,12 +7913,12 @@ export function initBiomes() {
   //     }
   //   }
 
-  //   console.log(beautify(pokemonOutput, null, 2, 180).replace(/(        |        (?:\{ "\d+": \[ )?|    "(?:.*?)": \[ |(?:,|\[) (?:"\w+": \[ |(?:\{ )?"\d+": \[ )?)"(\w+)"(?= |,|\n)/g, "$1Species.$2").replace(/"(\d+)": /g, "$1: ").replace(/((?:      )|(?:(?!\n)    "(?:.*?)": \{) |\[(?: .*? )?\], )"(\w+)"/g, "$1[TimeOfDay.$2]").replace(/(    )"(.*?)"/g, "$1[BiomePoolTier.$2]").replace(/(  )"(.*?)"/g, "$1[BiomeId.$2]"));
+  //   console.log(beautify(pokemonOutput, null, 2, 180).replace(/(        |        (?:\{ "\d+": \[ )?|    "(?:.*?)": \[ |(?:,|\[) (?:"\w+": \[ |(?:\{ )?"\d+": \[ )?)"(\w+)"(?= |,|\n)/g, "$1SpeciesId.$2").replace(/"(\d+)": /g, "$1: ").replace(/((?:      )|(?:(?!\n)    "(?:.*?)": \{) |\[(?: .*? )?\], )"(\w+)"/g, "$1[TimeOfDay.$2]").replace(/(    )"(.*?)"/g, "$1[BiomePoolTier.$2]").replace(/(  )"(.*?)"/g, "$1[BiomeId.$2]"));
   //   console.log(beautify(trainerOutput, null, 2, 120).replace(/(      |      (?:\{ "\d+": \[ )?|    "(?:.*?)": \[ |, (?:(?:\{ )?"\d+": \[ )?)"(.*?)"/g, "$1TrainerType.$2").replace(/"(\d+)": /g, "$1: ").replace(/(    )"(.*?)"/g, "$1[BiomePoolTier.$2]").replace(/(  )"(.*?)"/g, "$1[BiomeId.$2]"));
   // }
 
   /*for (let pokemon of allSpecies) {
-    if (pokemon.speciesId >= Species.XERNEAS)
+    if (pokemon.speciesId >= SpeciesId.XERNEAS)
       break;
     pokemonBiomes[pokemon.speciesId - 1][0] = Species[pokemonBiomes[pokemon.speciesId - 1][0]];
     pokemonBiomes[pokemon.speciesId - 1][1] = Type[pokemonBiomes[pokemon.speciesId - 1][1]];
diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts
index 6dda464131f..436e6bc6e76 100644
--- a/src/data/balance/egg-moves.ts
+++ b/src/data/balance/egg-moves.ts
@@ -610,7 +610,7 @@ function parseEggMoves(content: string): void {
     }
 
     if (eggMoves.find(m => m !== MoveId.NONE)) {
-      output += `[Species.${SpeciesId[species]}]: [ ${eggMoves.map(m => `MoveId.${MoveId[m]}`).join(", ")} ],\n`;
+      output += `[SpeciesId.${SpeciesId[species]}]: [ ${eggMoves.map(m => `MoveId.${MoveId[m]}`).join(", ")} ],\n`;
     }
   }
 
diff --git a/src/overrides.ts b/src/overrides.ts
index f8a808357ab..86e1708248d 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -124,7 +124,7 @@ class DefaultOverrides {
    * @example
    * ```
    * const STARTER_FORM_OVERRIDES = {
-   *   [Species.DARMANITAN]: 1
+   *   [SpeciesId.DARMANITAN]: 1
    * }
    * ```
    */
@@ -136,7 +136,7 @@ class DefaultOverrides {
    * SPECIES OVERRIDE
    * will only apply to the first starter in your party or each enemy pokemon
    * default is 0 to not override
-   * @example SPECIES_OVERRIDE = Species.Bulbasaur;
+   * @example SPECIES_OVERRIDE = SpeciesId.Bulbasaur;
    */
   readonly STARTER_SPECIES_OVERRIDE: SpeciesId | number = 0;
   /**
diff --git a/test/abilities/magic_guard.test.ts b/test/abilities/magic_guard.test.ts
index e42e3fdd295..c36b35c09b7 100644
--- a/test/abilities/magic_guard.test.ts
+++ b/test/abilities/magic_guard.test.ts
@@ -301,7 +301,7 @@ describe("Abilities - Magic Guard", () => {
 
   /*
   it("Magic Guard does not prevent self-damage from confusion", async () => {
-    await game.classicMode.startBattle([Species.MAGIKARP]);
+    await game.classicMode.startBattle([SpeciesId.MAGIKARP]);
 
     game.move.select(MoveId.CHARM);