diff --git a/create-test-boilerplate.js b/create-test-boilerplate.js
index d47b7c4afeb..895e974fae9 100644
--- a/create-test-boilerplate.js
+++ b/create-test-boilerplate.js
@@ -71,15 +71,17 @@ async function runInteractive() {
   const fileNameAnswer = await promptFileName(typeAnswer.selectedOption);
 
   const type = typeAnswer.selectedOption.toLowerCase();
-  // Convert fileName from kebab-case or camelCase to snake_case
-  const fileName = fileNameAnswer.userInput
-    .replace(/-+/g, "_") // Convert kebab-case (dashes) to underscores
-    .replace(/([a-z])([A-Z])/g, "$1_$2") // Convert camelCase to snake_case
-    .replace(/\s+/g, "_") // Replace spaces with underscores
+  // Convert fileName to kebab-case
+  // Ex: "Cud Chew/Cud-Chew" --> "cud-chew"
+  const fileName = fileNameAnswer.userInput;
+  replace(/_+/g, "-") // Convert snake-case (underscores) to dashes
+    .replace(/([a-z])([A-Z])/g, "$1-$2") // Convert camelCase to kebab-case
+    .replace(/\s+/g, "-") // Replace spaces with dashes
     .toLowerCase(); // Ensure all lowercase
-  // Format the description for the test case
 
-  const formattedName = fileName.replace(/_/g, " ").replace(/\b\w/g, char => char.toUpperCase());
+  // Get Title Case name for the test header ("cud-chew" --> Cud Chew)
+  const formattedName = fileName.replace(/-/g, " ").replace(/\b\w/g, char => char.toUpperCase());
+
   // Determine the directory based on the type
   let dir;
   let description;
@@ -130,9 +132,9 @@ describe("${description}", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
+      .moveset(Moves.SPLASH)
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
diff --git a/src/@types/DexData.ts b/src/@types/dex-data.ts
similarity index 100%
rename from src/@types/DexData.ts
rename to src/@types/dex-data.ts
diff --git a/src/@types/PokerogueAccountApi.ts b/src/@types/pokerogue-account-api.ts
similarity index 83%
rename from src/@types/PokerogueAccountApi.ts
rename to src/@types/pokerogue-account-api.ts
index 68d0a5e7730..d09cba630a9 100644
--- a/src/@types/PokerogueAccountApi.ts
+++ b/src/@types/pokerogue-account-api.ts
@@ -1,4 +1,4 @@
-import type { UserInfo } from "#app/@types/UserInfo";
+import type { UserInfo } from "#app/@types/user-Info";
 
 export interface AccountInfoResponse extends UserInfo {}
 
diff --git a/src/@types/PokerogueAdminApi.ts b/src/@types/pokerogue-admin-api.ts
similarity index 100%
rename from src/@types/PokerogueAdminApi.ts
rename to src/@types/pokerogue-admin-api.ts
diff --git a/src/@types/PokerogueApi.ts b/src/@types/pokerogue-api.ts
similarity index 100%
rename from src/@types/PokerogueApi.ts
rename to src/@types/pokerogue-api.ts
diff --git a/src/@types/PokerogueDailyApi.ts b/src/@types/pokerogue-daily-api.ts
similarity index 100%
rename from src/@types/PokerogueDailyApi.ts
rename to src/@types/pokerogue-daily-api.ts
diff --git a/src/@types/PokerogueSavedataApi.ts b/src/@types/pokerogue-save-data-api.ts
similarity index 100%
rename from src/@types/PokerogueSavedataApi.ts
rename to src/@types/pokerogue-save-data-api.ts
diff --git a/src/@types/PokerogueSessionSavedataApi.ts b/src/@types/pokerogue-session-save-data-api.ts
similarity index 100%
rename from src/@types/PokerogueSessionSavedataApi.ts
rename to src/@types/pokerogue-session-save-data-api.ts
diff --git a/src/@types/PokerogueSystemSavedataApi.ts b/src/@types/pokerogue-system-save-data-api.ts
similarity index 100%
rename from src/@types/PokerogueSystemSavedataApi.ts
rename to src/@types/pokerogue-system-save-data-api.ts
diff --git a/src/@types/SessionSaveMigrator.ts b/src/@types/session-save-migrator.ts
similarity index 100%
rename from src/@types/SessionSaveMigrator.ts
rename to src/@types/session-save-migrator.ts
diff --git a/src/@types/SettingsSaveMigrator.ts b/src/@types/settings-save-migrator.ts
similarity index 100%
rename from src/@types/SettingsSaveMigrator.ts
rename to src/@types/settings-save-migrator.ts
diff --git a/src/@types/SystemSaveMigrator.ts b/src/@types/system-save-migrator.ts
similarity index 100%
rename from src/@types/SystemSaveMigrator.ts
rename to src/@types/system-save-migrator.ts
diff --git a/src/@types/UserInfo.ts b/src/@types/user-Info.ts
similarity index 100%
rename from src/@types/UserInfo.ts
rename to src/@types/user-Info.ts
diff --git a/src/account.ts b/src/account.ts
index 3416fa6ed5e..7ac4420cf2a 100644
--- a/src/account.ts
+++ b/src/account.ts
@@ -1,5 +1,5 @@
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
-import type { UserInfo } from "#app/@types/UserInfo";
+import type { UserInfo } from "#app/@types/user-Info";
 import { bypassLogin } from "./global-vars/bypass-login";
 import { randomString } from "#app/utils/common";
 
diff --git a/src/configs/inputs/cfg_keyboard_qwerty.ts b/src/configs/inputs/cfg-keyboard-qwerty.ts
similarity index 100%
rename from src/configs/inputs/cfg_keyboard_qwerty.ts
rename to src/configs/inputs/cfg-keyboard-qwerty.ts
diff --git a/src/configs/inputs/configHandler.ts b/src/configs/inputs/config-handler.ts
similarity index 100%
rename from src/configs/inputs/configHandler.ts
rename to src/configs/inputs/config-handler.ts
diff --git a/src/configs/inputs/pad_dualshock.ts b/src/configs/inputs/pad-dualshock.ts
similarity index 100%
rename from src/configs/inputs/pad_dualshock.ts
rename to src/configs/inputs/pad-dualshock.ts
diff --git a/src/configs/inputs/pad_generic.ts b/src/configs/inputs/pad-generic.ts
similarity index 100%
rename from src/configs/inputs/pad_generic.ts
rename to src/configs/inputs/pad-generic.ts
diff --git a/src/configs/inputs/pad_procon.ts b/src/configs/inputs/pad-procon.ts
similarity index 100%
rename from src/configs/inputs/pad_procon.ts
rename to src/configs/inputs/pad-procon.ts
diff --git a/src/configs/inputs/pad_unlicensedSNES.ts b/src/configs/inputs/pad-unlicensed-snes.ts
similarity index 100%
rename from src/configs/inputs/pad_unlicensedSNES.ts
rename to src/configs/inputs/pad-unlicensed-snes.ts
diff --git a/src/configs/inputs/pad_xbox360.ts b/src/configs/inputs/pad-xbox360.ts
similarity index 100%
rename from src/configs/inputs/pad_xbox360.ts
rename to src/configs/inputs/pad-xbox360.ts
diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts
index 705de6f242d..55540dfa1f1 100644
--- a/src/data/abilities/ability.ts
+++ b/src/data/abilities/ability.ts
@@ -57,9 +57,9 @@ import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { SwitchType } from "#enums/switch-type";
-import { MoveFlags } from "#enums/MoveFlags";
-import { MoveTarget } from "#enums/MoveTarget";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveFlags } from "#enums/move-flags";
+import { MoveTarget } from "#enums/move-target";
+import { MoveCategory } from "#enums/move-category";
 import type { BerryType } from "#enums/berry-type";
 import { CommonAnimPhase } from "#app/phases/common-anim-phase";
 import { CommonAnim } from "../battle-anims";
diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index 19c94a8a045..6b301407c12 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -3,8 +3,8 @@ import type { Arena } from "#app/field/arena";
 import { PokemonType } from "#enums/pokemon-type";
 import { BooleanHolder, NumberHolder, toDmgValue } from "#app/utils/common";
 import { allMoves } from "#app/data/moves/move";
-import { MoveTarget } from "#enums/MoveTarget";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveTarget } from "#enums/move-target";
+import { MoveCategory } from "#enums/move-category";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type Pokemon from "#app/field/pokemon";
 import { HitResult } from "#app/field/pokemon";
diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts
index 454bd40130c..5f6d75b6e9d 100644
--- a/src/data/battle-anims.ts
+++ b/src/data/battle-anims.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import { AttackMove, BeakBlastHeaderAttr, DelayedAttackAttr, SelfStatusMove, allMoves } from "./moves/move";
-import { MoveFlags } from "#enums/MoveFlags";
+import { MoveFlags } from "#enums/move-flags";
 import type Pokemon from "../field/pokemon";
 import { type nil, getFrameMs, getEnumKeys, getEnumValues, animationFileName } from "../utils/common";
 import type { BattlerIndex } from "../battle";
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 8a512f3c16c..0cb1efd62ac 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -18,8 +18,8 @@ import {
   HealOnAllyAttr,
   StatusCategoryOnAllyAttr,
 } from "#app/data/moves/move";
-import { MoveFlags } from "#enums/MoveFlags";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveFlags } from "#enums/move-flags";
+import { MoveCategory } from "#enums/move-category";
 import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms";
 import { getStatusEffectHealText } from "#app/data/status-effect";
 import { TerrainType } from "#app/data/terrain";
diff --git a/src/data/moves/move-utils.ts b/src/data/moves/move-utils.ts
index 3323d6f4a0c..f5e6516cdcd 100644
--- a/src/data/moves/move-utils.ts
+++ b/src/data/moves/move-utils.ts
@@ -1,4 +1,4 @@
-import { MoveTarget } from "#enums/MoveTarget";
+import { MoveTarget } from "#enums/move-target";
 import type Move from "./move";
 
 /**
diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index d09613123bb..62d1eff7ca3 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -116,11 +116,11 @@ import { LoadMoveAnimPhase } from "#app/phases/load-move-anim-phase";
 import { PokemonTransformPhase } from "#app/phases/pokemon-transform-phase";
 import { MoveAnimPhase } from "#app/phases/move-anim-phase";
 import { loggedInUser } from "#app/account";
-import { MoveCategory } from "#enums/MoveCategory";
-import { MoveTarget } from "#enums/MoveTarget";
-import { MoveFlags } from "#enums/MoveFlags";
-import { MoveEffectTrigger } from "#enums/MoveEffectTrigger";
-import { MultiHitType } from "#enums/MultiHitType";
+import { MoveCategory } from "#enums/move-category";
+import { MoveTarget } from "#enums/move-target";
+import { MoveFlags } from "#enums/move-flags";
+import { MoveEffectTrigger } from "#enums/move-effect-trigger";
+import { MultiHitType } from "#enums/multi-hit-yype";
 import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSleepTalkMoves } from "./invalid-moves";
 import { SelectBiomePhase } from "#app/phases/select-biome-phase";
 
diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
index 87b223d5245..f6fff98de0c 100644
--- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
+++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
@@ -10,8 +10,8 @@ import {
   transitionMysteryEncounterIntroVisuals,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { getRandomPartyMemberFunc, trainerConfigs } from "#app/data/trainers/trainer-config";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { TrainerSlot } from "#enums/trainer-slot";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PartyMemberStrength } from "#enums/party-member-strength";
@@ -144,20 +144,14 @@ const POOL_3_POKEMON: { species: Species; formIndex?: number }[] = [
 
 const POOL_4_POKEMON = [Species.GENESECT, Species.SLITHER_WING, Species.BUZZWOLE, Species.PHEROMOSA];
 
-const PHYSICAL_TUTOR_MOVES = [
-  Moves.MEGAHORN,
-  Moves.ATTACK_ORDER,
-  Moves.BUG_BITE,
-  Moves.FIRST_IMPRESSION,
-  Moves.LUNGE
-];
+const PHYSICAL_TUTOR_MOVES = [Moves.MEGAHORN, Moves.ATTACK_ORDER, Moves.BUG_BITE, Moves.FIRST_IMPRESSION, Moves.LUNGE];
 
 const SPECIAL_TUTOR_MOVES = [
   Moves.SILVER_WIND,
   Moves.SIGNAL_BEAM,
   Moves.BUG_BUZZ,
   Moves.POLLEN_PUFF,
-  Moves.STRUGGLE_BUG
+  Moves.STRUGGLE_BUG,
 ];
 
 const STATUS_TUTOR_MOVES = [
@@ -165,16 +159,10 @@ const STATUS_TUTOR_MOVES = [
   Moves.DEFEND_ORDER,
   Moves.RAGE_POWDER,
   Moves.STICKY_WEB,
-  Moves.SILK_TRAP
+  Moves.SILK_TRAP,
 ];
 
-const MISC_TUTOR_MOVES = [
-  Moves.LEECH_LIFE,
-  Moves.U_TURN,
-  Moves.HEAL_ORDER,
-  Moves.QUIVER_DANCE,
-  Moves.INFESTATION,
-];
+const MISC_TUTOR_MOVES = [Moves.LEECH_LIFE, Moves.U_TURN, Moves.HEAL_ORDER, Moves.QUIVER_DANCE, Moves.INFESTATION];
 
 /**
  * Wave breakpoints that determine how strong to make the Bug-Type Superfan's team
diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
index ce5eb2cfdd1..f53142101d8 100644
--- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
+++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
@@ -9,8 +9,8 @@ import {
   transitionMysteryEncounterIntroVisuals,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { ModifierPoolType, modifierTypes } from "#app/modifier/modifier-type";
@@ -44,7 +44,7 @@ import { BerryType } from "#enums/berry-type";
 import { BattlerIndex } from "#app/battle";
 import { Moves } from "#enums/moves";
 import { EncounterBattleAnim } from "#app/data/battle-anims";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveCategory } from "#enums/move-category";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { EncounterAnim } from "#enums/encounter-anims";
diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
index 2cd6123838b..b6a6d55c225 100644
--- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts
+++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
@@ -1,4 +1,4 @@
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveCategory } from "#enums/move-category";
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import {
   generateModifierTypeOption,
diff --git a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
index 6907e18cfdc..92546d08034 100644
--- a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
+++ b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
@@ -4,9 +4,9 @@ import {
   setEncounterRewards,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { trainerPartyTemplates } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
diff --git a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
index cceda25fcb4..3f8a66ae12d 100644
--- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
+++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
@@ -41,7 +41,7 @@ import PokemonData from "#app/system/pokemon-data";
 import { Nature } from "#enums/nature";
 import type HeldModifierConfig from "#app/interfaces/held-modifier-config";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 
 /** i18n namespace for encounter */
diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts
index f76462d2725..677055b588c 100644
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@@ -2,7 +2,7 @@ import { PokemonFormChangeItemModifier } from "../modifier/modifier";
 import type Pokemon from "../field/pokemon";
 import { StatusEffect } from "#enums/status-effect";
 import { allMoves } from "./moves/move";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveCategory } from "#enums/move-category";
 import type { Constructor, nil } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
diff --git a/src/data/trainers/evil-admin-trainer-pools.ts b/src/data/trainers/evil-admin-trainer-pools.ts
index fe68cf50c9c..4c793493c23 100644
--- a/src/data/trainers/evil-admin-trainer-pools.ts
+++ b/src/data/trainers/evil-admin-trainer-pools.ts
@@ -1,4 +1,4 @@
-import type { TrainerTierPools } from "#app/data/trainers/typedefs";
+import type { TrainerTierPools } from "#app/data/trainers/type-defs";
 import { TrainerPoolTier } from "#enums/trainer-pool-tier";
 import { Species } from "#enums/species";
 
diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 50acf84efa6..aad8804ff74 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -18,7 +18,7 @@ import {
   TrainerPartyCompoundTemplate,
   TrainerPartyTemplate,
   trainerPartyTemplates,
-} from "./TrainerPartyTemplate";
+} from "./trainer-party-template";
 import { evilAdminTrainerPools } from "./evil-admin-trainer-pools";
 
 // Enum imports
@@ -48,7 +48,7 @@ import type {
   TrainerTierPools,
   TrainerConfigs,
   PartyMemberFuncs,
-} from "./typedefs";
+} from "./type-defs";
 
 /** Minimum BST for Pokemon generated onto the Elite Four's teams */
 const ELITE_FOUR_MINIMUM_BST = 460;
@@ -2856,21 +2856,29 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["LORELEI"], false, PokemonType.ICE, 2)
     .setBattleBgm("battle_kanto_gym")
     .setMixedBattleBgm("battle_kanto_gym")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DEWGONG], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.DEWGONG], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 0; // Thick Fat
         p.generateAndPopulateMoveset();
       }),
     )
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.SLOWBRO, Species.GALAR_SLOWBRO], TrainerSlot.TRAINER, true, p => { // Tera Ice Slowbro/G-Slowbro
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SLOWBRO, Species.GALAR_SLOWBRO], TrainerSlot.TRAINER, true, p => {
+        // Tera Ice Slowbro/G-Slowbro
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.ICE_BEAM)) { // Check if Ice Beam is in the moveset, if not, replace the third move with Ice Beam.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.ICE_BEAM)) {
+          // Check if Ice Beam is in the moveset, if not, replace the third move with Ice Beam.
           p.moveset[2] = new PokemonMove(Moves.ICE_BEAM);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.JYNX]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CLOYSTER, Species.ALOLA_SANDSLASH]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.LAPRAS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.LAPRAS], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -2880,9 +2888,13 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_kanto_gym")
     .setMixedBattleBgm("battle_kanto_gym")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.HITMONLEE, Species.HITMONCHAN, Species.HITMONTOP]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.STEELIX], TrainerSlot.TRAINER, true, p => { // Tera Fighting Steelix
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.STEELIX], TrainerSlot.TRAINER, true, p => {
+        // Tera Fighting Steelix
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.BODY_PRESS)) { // Check if Body Press is in the moveset, if not, replace the third move with Body Press.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.BODY_PRESS)) {
+          // Check if Body Press is in the moveset, if not, replace the third move with Body Press.
           p.moveset[2] = new PokemonMove(Moves.BODY_PRESS);
         }
       }),
@@ -2901,16 +2913,22 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_kanto_gym")
     .setMixedBattleBgm("battle_kanto_gym")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MISMAGIUS]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.ARBOK, Species.WEEZING], TrainerSlot.TRAINER, true, p => { // Tera Ghost Arbok/Weezing
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.ARBOK, Species.WEEZING], TrainerSlot.TRAINER, true, p => {
+        // Tera Ghost Arbok/Weezing
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) { // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
           p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ALOLA_MAROWAK]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CURSOLA]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -2921,16 +2939,22 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_kanto_gym")
     .setMixedBattleBgm("battle_kanto_gym")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.KINGDRA]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GYARADOS, Species.AERODACTYL], TrainerSlot.TRAINER, true, p => { // Tera Dragon Gyarados/Aerodactyl
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GYARADOS, Species.AERODACTYL], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Gyarados/Aerodactyl
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) { // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
           p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ALOLA_EXEGGUTOR]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SALAMENCE]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.DRAGONITE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DRAGONITE], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -2943,7 +2967,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.SLOWKING, Species.GALAR_SLOWKING])) // Tera Psychic Slowking/G-Slowking
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.EXEGGUTOR]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.WYRDEER, Species.FARIGIRAF]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.XATU], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.XATU], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -2952,7 +2978,9 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["KOGA"], true, PokemonType.POISON, 2)
     .setBattleBgm("battle_johto_gym")
     .setMixedBattleBgm("battle_johto_gym")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.VENOMOTH], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.VENOMOTH], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 1; // Tinted Lens
         p.generateAndPopulateMoveset();
       }),
@@ -2960,7 +2988,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MUK, Species.WEEZING])) // Tera Poison Muk/Weezing
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TENTACRUEL]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SNEASLER, Species.OVERQWIL]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.CROBAT], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CROBAT], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -2970,16 +3000,22 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_johto_gym")
     .setMixedBattleBgm("battle_johto_gym")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.UMBREON]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => { // Tera Dark Gengar
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => {
+        // Tera Dark Gengar
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.DARK_PULSE)) { // Check if Dark Pulse is in the moveset, if not, replace the third move with Dark Pulse.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.DARK_PULSE)) {
+          // Check if Dark Pulse is in the moveset, if not, replace the third move with Dark Pulse.
           p.moveset[2] = new PokemonMove(Moves.DARK_PULSE);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.HONCHKROW]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.WEAVILE]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -2987,7 +3023,9 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.SIDNEY]: new TrainerConfig(++t)
     .initForEliteFour(signatureSpecies["SIDNEY"], true, PokemonType.DARK, 2)
     .setMixedBattleBgm("battle_hoenn_elite")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MIGHTYENA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.MIGHTYENA], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 0; // Intimidate
         p.generateAndPopulateMoveset();
       }),
@@ -3008,12 +3046,16 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SABLEYE]))
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.BANETTE])) // Tera Ghost Banette
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRIFBLIM, Species.MISMAGIUS]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ORICORIO, Species.ALOLA_MAROWAK], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.ORICORIO, Species.ALOLA_MAROWAK], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.formIndex = p.species.speciesId === Species.ORICORIO ? 3 : 0; // Oricorio-Sensu
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.DUSKNOIR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DUSKNOIR], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3021,7 +3063,9 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.GLACIA]: new TrainerConfig(++t)
     .initForEliteFour(signatureSpecies["GLACIA"], false, PokemonType.ICE, 2)
     .setMixedBattleBgm("battle_hoenn_elite")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ABOMASNOW], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.ABOMASNOW], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 0; // Snow Warning
         p.generateAndPopulateMoveset();
       }),
@@ -3029,7 +3073,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GLALIE])) // Tera Ice Glalie
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.FROSLASS]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ALOLA_NINETALES]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.WALREIN], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.WALREIN], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3038,16 +3084,22 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["DRAKE"], true, PokemonType.DRAGON, 2)
     .setMixedBattleBgm("battle_hoenn_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ALTARIA]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DHELMISE], TrainerSlot.TRAINER, true, p => { // Tera Dragon Dhelmise
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.DHELMISE], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Dhelmise
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) { // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
           p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.FLYGON]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.KINGDRA]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.SALAMENCE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.SALAMENCE], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3060,11 +3112,15 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HERACROSS]))
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.VESPIQUEN]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SCIZOR, Species.KLEAVOR]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.DRAPION], TrainerSlot.TRAINER, true, p => { // Tera Bug Drapion
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DRAPION], TrainerSlot.TRAINER, true, p => {
+        // Tera Bug Drapion
         p.setBoss(true, 2);
         p.abilityIndex = 1; // Sniper
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.X_SCISSOR)) { // Check if X-Scissor is in the moveset, if not, replace the third move with X-Scissor.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.X_SCISSOR)) {
+          // Check if X-Scissor is in the moveset, if not, replace the third move with X-Scissor.
           p.moveset[2] = new PokemonMove(Moves.X_SCISSOR);
         }
       }),
@@ -3074,14 +3130,19 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_sinnoh_gym")
     .setMixedBattleBgm("battle_sinnoh_gym")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.WHISCASH]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HIPPOWDON], TrainerSlot.TRAINER, true, p => { // Tera Ground Hippowdon
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.HIPPOWDON], TrainerSlot.TRAINER, true, p => {
+        // Tera Ground Hippowdon
         p.abilityIndex = 0; // Sand Stream
         p.generateAndPopulateMoveset();
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GLISCOR]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MAMOSWINE, Species.URSALUNA]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.RHYPERIOR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.RHYPERIOR], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.abilityIndex = 1; // Solid Rock
         p.generateAndPopulateMoveset();
@@ -3092,16 +3153,22 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_sinnoh_gym")
     .setMixedBattleBgm("battle_sinnoh_gym")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.RAPIDASH]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.STEELIX, Species.LOPUNNY], TrainerSlot.TRAINER, true, p => { // Tera Fire Steelix/Lopunny
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.STEELIX, Species.LOPUNNY], TrainerSlot.TRAINER, true, p => {
+        // Tera Fire Steelix/Lopunny
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) { // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
           p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.INFERNAPE]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ARCANINE, Species.HISUI_ARCANINE]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.MAGMORTAR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.MAGMORTAR], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3114,7 +3181,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.FARIGIRAF])) // Tera Psychic Farigiraf
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BRONZONG]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MR_RIME, Species.HISUI_BRAVIARY]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.GALLADE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GALLADE], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.abilityIndex = 1; // Sharpness
         p.generateAndPopulateMoveset();
@@ -3126,8 +3195,10 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.COFAGRIGUS]))
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GOLURK])) // Tera Ghost Golurk
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.JELLICENT]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MISMAGIUS, Species.FROSLASS ]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.CHANDELURE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MISMAGIUS, Species.FROSLASS]))
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CHANDELURE], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3139,7 +3210,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MIENSHAO])) // Tera Fighting Mienshao
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.EMBOAR]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.BRELOOM, Species.TOXICROAK]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.CONKELDURR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CONKELDURR], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3151,7 +3224,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.KROOKODILE])) // Tera Dark Krookodile
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SCRAFTY]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ZOROARK, Species.HISUI_SAMUROTT]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.KINGAMBIT], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.KINGAMBIT], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3161,7 +3236,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setMixedBattleBgm("battle_unova_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MUSHARNA]))
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.REUNICLUS])) // Tera Psychic Reuniclus
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GALLADE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.GALLADE], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 1; // Sharpness
         p.generateAndPopulateMoveset();
       }),
@@ -3177,19 +3254,25 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.MALVA]: new TrainerConfig(++t)
     .initForEliteFour(signatureSpecies["MALVA"], false, PokemonType.FIRE, 2)
     .setMixedBattleBgm("battle_kalos_elite")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.PYROAR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.PYROAR], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.gender = Gender.FEMALE;
       }),
     )
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HOUNDOOM])) // Tera Fire Houndoom
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 1; // Drought
         p.generateAndPopulateMoveset();
       }),
     )
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CHANDELURE, Species.DELPHOX]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.TALONFLAME], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.TALONFLAME], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3201,7 +3284,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GYARADOS])) // Tera Water Gyarados
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.STARMIE]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.BLASTOISE, Species.DONDOZO]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.BARBARACLE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.BARBARACLE], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.abilityIndex = 1; // Tough Claws
         p.generateAndPopulateMoveset();
@@ -3211,16 +3296,22 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["WIKSTROM"], true, PokemonType.STEEL, 2)
     .setMixedBattleBgm("battle_kalos_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.KLEFKI]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.CERULEDGE], TrainerSlot.TRAINER, true, p => { // Tera Steel Ceruledge
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.CERULEDGE], TrainerSlot.TRAINER, true, p => {
+        // Tera Steel Ceruledge
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.IRON_HEAD)) { // Check if Iron Head is in the moveset, if not, replace the third move with Iron Head.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.IRON_HEAD)) {
+          // Check if Iron Head is in the moveset, if not, replace the third move with Iron Head.
           p.moveset[2] = new PokemonMove(Moves.IRON_HEAD);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SCIZOR]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CORVIKNIGHT]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.AEGISLASH], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.AEGISLASH], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3232,7 +3323,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GARCHOMP])) // Tera Dragon Garchomp
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ALTARIA]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.DRUDDIGON]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.NOIVERN], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.NOIVERN], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3241,16 +3334,22 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["HALA"], true, PokemonType.FIGHTING, 2)
     .setMixedBattleBgm("battle_alola_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.HARIYAMA]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.INCINEROAR], TrainerSlot.TRAINER, true, p => { // Tera Fighting Incineroar
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.INCINEROAR], TrainerSlot.TRAINER, true, p => {
+        // Tera Fighting Incineroar
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.CROSS_CHOP)) { // Check if Cross Chop is in the moveset, if not, replace the third move with Cross Chop.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.CROSS_CHOP)) {
+          // Check if Cross Chop is in the moveset, if not, replace the third move with Cross Chop.
           p.moveset[2] = new PokemonMove(Moves.CROSS_CHOP);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BEWEAR]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.POLIWRATH, Species.ANNIHILAPE]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.CRABOMINABLE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CRABOMINABLE], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3262,7 +3361,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.ALOLA_SANDSLASH])) // Tera Steel A-Sandslash
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.MAGNEZONE]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.METAGROSS, Species.KINGAMBIT]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.ALOLA_DUGTRIO], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.ALOLA_DUGTRIO], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3270,7 +3371,9 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.OLIVIA]: new TrainerConfig(++t)
     .initForEliteFour(signatureSpecies["OLIVIA"], false, PokemonType.ROCK, 2)
     .setMixedBattleBgm("battle_alola_elite")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GIGALITH], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.GIGALITH], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 1; // Sand Stream
         p.generateAndPopulateMoveset();
       }),
@@ -3278,7 +3381,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.PROBOPASS])) // Tera Rock Probopass
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.ALOLA_GOLEM]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.RELICANTH, Species.CARBINK]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.formIndex = 1;
         p.generateAndPopulateMoveset();
@@ -3291,7 +3396,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MIMIKYU])) // Tera Ghost Mimikyu
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DHELMISE]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.FROSLASS]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.PALOSSAND], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.PALOSSAND], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3300,16 +3407,22 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["KAHILI"], false, PokemonType.FLYING, 2)
     .setMixedBattleBgm("battle_alola_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.HAWLUCHA]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DECIDUEYE], TrainerSlot.TRAINER, true, p => { // Tera Flying Decidueye
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.DECIDUEYE], TrainerSlot.TRAINER, true, p => {
+        // Tera Flying Decidueye
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.BRAVE_BIRD)) { // Check if Brave Bird is in the moveset, if not, replace the third move with Brave Bird.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.BRAVE_BIRD)) {
+          // Check if Brave Bird is in the moveset, if not, replace the third move with Brave Bird.
           p.moveset[2] = new PokemonMove(Moves.BRAVE_BIRD);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BRAVIARY, Species.MANDIBUZZ]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ORICORIO]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.TOUCANNON], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.TOUCANNON], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3319,7 +3432,10 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["MARNIE_ELITE"], false, PokemonType.DARK, 2)
     .setMixedBattleBgm("battle_galar_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.LIEPARD]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.TOXICROAK], TrainerSlot.TRAINER, true, p => { // Tera Dark Toxicroak
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.TOXICROAK], TrainerSlot.TRAINER, true, p => {
+        // Tera Dark Toxicroak
         p.generateAndPopulateMoveset();
         if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.SUCKER_PUNCH)) {
           // Check if Sucker Punch is in the moveset, if not, replace the third move with Sucker Punch.
@@ -3329,7 +3445,9 @@ export const trainerConfigs: TrainerConfigs = {
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SCRAFTY, Species.PANGORO]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MORPEKO]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.GRIMMSNARL], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GRIMMSNARL], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3339,20 +3457,28 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["NESSA_ELITE"], false, PokemonType.WATER, 2)
     .setMixedBattleBgm("battle_galar_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GOLISOPOD]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.EISCUE], TrainerSlot.TRAINER, true, p => { // Tera Water Eiscue
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.EISCUE], TrainerSlot.TRAINER, true, p => {
+        // Tera Water Eiscue
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.LIQUIDATION)) { // Check if Liquidation is in the moveset, if not, replace the third move with Liquidation.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.LIQUIDATION)) {
+          // Check if Liquidation is in the moveset, if not, replace the third move with Liquidation.
           p.moveset[2] = new PokemonMove(Moves.LIQUIDATION);
         }
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 1; // Drizzle
         p.generateAndPopulateMoveset();
       }),
     )
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.TOXAPEX]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.DREDNAW], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DREDNAW], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3365,7 +3491,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.SIRFETCHD])) // Tera Fighting Sirfetch'd
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GRAPPLOCT, Species.FALINKS]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HITMONTOP]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.MACHAMP], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.MACHAMP], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3378,7 +3506,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.RUNERIGUS])) // Tera Ghost Runerigus
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.POLTEAGEIST, Species.SINISTCHA]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CURSOLA]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GENGAR], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3388,17 +3518,23 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["RAIHAN_ELITE"], true, PokemonType.DRAGON, 2)
     .setMixedBattleBgm("battle_galar_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.FLYGON]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => { // Tera Dragon Torkoal
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.TORKOAL], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Torkoal
         p.abilityIndex = 1; // Drought
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) { // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
           p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOODRA]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.TURTONATOR]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3410,7 +3546,10 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DONPHAN]))
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SWAMPERT, Species.TORTERRA]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CAMERUPT]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.CLODSIRE], TrainerSlot.TRAINER, true, p => { // Tera Ground Clodsire
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CLODSIRE], TrainerSlot.TRAINER, true, p => {
+        // Tera Ground Clodsire
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3420,13 +3559,18 @@ export const trainerConfigs: TrainerConfigs = {
     .setMixedBattleBgm("battle_paldea_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.COPPERAJAH]))
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MAGNEZONE]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BRONZONG, Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.BRONZONG, Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = p.species.speciesId === Species.BRONZONG ? 0 : 1; // Levitate Bronzong, Unnerve Corviknight
         p.generateAndPopulateMoveset();
       }),
     )
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.STEELIX]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.TINKATON], TrainerSlot.TRAINER, true, p => { // Tera Steel Tinkaton
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.TINKATON], TrainerSlot.TRAINER, true, p => {
+        // Tera Steel Tinkaton
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3439,7 +3583,10 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.BOMBIRDIER]))
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TROPIUS]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.STARAPTOR]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.FLAMIGO], TrainerSlot.TRAINER, true, p => { // Tera Flying Flamigo
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.FLAMIGO], TrainerSlot.TRAINER, true, p => {
+        // Tera Flying Flamigo
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3451,7 +3598,10 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DRAGALGE]))
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.FLAPPLE, Species.APPLETUN, Species.HYDRAPPLE]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HAXORUS]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.BAXCALIBUR], TrainerSlot.TRAINER, true, p => { // Tera Dragon Baxcalibur
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.BAXCALIBUR], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Baxcalibur
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3459,27 +3609,38 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.CRISPIN]: new TrainerConfig(++t)
     .initForEliteFour(signatureSpecies["CRISPIN"], true, PokemonType.FIRE, 2)
     .setMixedBattleBgm("battle_bb_elite")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ROTOM], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.ROTOM], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // Heat Rotom
         p.generateAndPopulateMoveset();
       }),
     )
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.EXEGGUTOR], TrainerSlot.TRAINER, true, p => { // Tera Fire Exeggutor
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.EXEGGUTOR], TrainerSlot.TRAINER, true, p => {
+        // Tera Fire Exeggutor
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) { // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
           p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
         }
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TALONFLAME], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TALONFLAME], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.SUNNY_DAY)) { // Check if Sunny Day is in the moveset, if not, replace the third move with Sunny Day.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.SUNNY_DAY)) {
+          // Check if Sunny Day is in the moveset, if not, replace the third move with Sunny Day.
           p.moveset[2] = new PokemonMove(Moves.SUNNY_DAY);
         }
       }),
     )
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MAGMORTAR]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.BLAZIKEN], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.BLAZIKEN], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3488,16 +3649,22 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["AMARYS"], false, PokemonType.STEEL, 2)
     .setMixedBattleBgm("battle_bb_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SKARMORY]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.REUNICLUS], TrainerSlot.TRAINER, true, p => { // Tera Steel Reuniclus
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.REUNICLUS], TrainerSlot.TRAINER, true, p => {
+        // Tera Steel Reuniclus
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.FLASH_CANNON)) { // Check if Flash Cannon is in the moveset, if not, replace the third move with Flash Cannon.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.FLASH_CANNON)) {
+          // Check if Flash Cannon is in the moveset, if not, replace the third move with Flash Cannon.
           p.moveset[2] = new PokemonMove(Moves.FLASH_CANNON);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.EMPOLEON]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SCIZOR]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.METAGROSS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.METAGROSS], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3509,10 +3676,14 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.PRIMARINA]))
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GRANBULL]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ALCREMIE]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.EXCADRILL], TrainerSlot.TRAINER, true, p => { // Tera Fairy Excadrill
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.EXCADRILL], TrainerSlot.TRAINER, true, p => {
+        // Tera Fairy Excadrill
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) { // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
+          // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
           p.moveset[2] = new PokemonMove(Moves.TERA_BLAST);
         }
       }),
@@ -3521,16 +3692,22 @@ export const trainerConfigs: TrainerConfigs = {
     .initForEliteFour(signatureSpecies["DRAYTON"], true, PokemonType.DRAGON, 2)
     .setMixedBattleBgm("battle_bb_elite")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DRAGONITE]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.SCEPTILE], TrainerSlot.TRAINER, true, p => { // Tera Dragon Sceptile
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SCEPTILE], TrainerSlot.TRAINER, true, p => {
+        // Tera Dragon Sceptile
         p.generateAndPopulateMoveset();
-        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.DUAL_CHOP)) { // Check if Dual Chop is in the moveset, if not, replace the third move with Dual Chop.
+        if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.DUAL_CHOP)) {
+          // Check if Dual Chop is in the moveset, if not, replace the third move with Dual Chop.
           p.moveset[2] = new PokemonMove(Moves.DUAL_CHOP);
         }
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.HAXORUS]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.KINGDRA, Species.DRACOVISH]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
         p.setBoss(true, 2);
         p.generateAndPopulateMoveset();
       }),
@@ -3545,18 +3722,29 @@ export const trainerConfigs: TrainerConfigs = {
     .setDoubleTitle("champion_double")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ALAKAZAM]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MACHAMP]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HO_OH], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.HO_OH], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.RHYPERIOR, Species.ELECTIVIRE]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ARCANINE, Species.EXEGGUTOR, Species.GYARADOS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc(
+        [Species.ARCANINE, Species.EXEGGUTOR, Species.GYARADOS],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
           p.generateAndPopulateMoveset();
           p.setBoss(true, 2);
-      }),
+        },
+      ),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.PIDGEOT], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.PIDGEOT], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // Mega Pidgeot
         p.generateAndPopulateMoveset();
         p.generateName();
@@ -3571,7 +3759,9 @@ export const trainerConfigs: TrainerConfigs = {
     .setHasDouble("red_blue_double")
     .setDoubleTrainerType(TrainerType.BLUE)
     .setDoubleTitle("champion_double")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.PIKACHU], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.PIKACHU], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 8; // G-Max Pikachu
         p.generateAndPopulateMoveset();
         p.generateName();
@@ -3579,24 +3769,34 @@ export const trainerConfigs: TrainerConfigs = {
       }),
     )
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ESPEON, Species.UMBREON, Species.SYLVEON]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.LUGIA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.LUGIA], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SNORLAX], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.SNORLAX], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.setBoss(true, 2);
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc(
-        [Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc(
+        [Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
           p.formIndex = 1; // Mega Venusaur, Mega Charizard X, or Mega Blastoise
           p.generateAndPopulateMoveset();
           p.generateName();
           p.gender = Gender.MALE;
-      }),
+        },
+      ),
     )
     .setInstantTera(3), // Tera Grass Meganium / Fire Typhlosion / Water Feraligatr
   [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t)
@@ -3606,20 +3806,26 @@ export const trainerConfigs: TrainerConfigs = {
     .setMixedBattleBgm("battle_johto_champion")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GYARADOS, Species.KINGDRA]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.AERODACTYL]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.SALAMENCE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SALAMENCE], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // Mega Salamence
         p.generateAndPopulateMoveset();
         p.generateName();
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.CHARIZARD]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.TYRANITAR, Species.GARCHOMP, Species.KOMMO_O], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.TYRANITAR, Species.GARCHOMP, Species.KOMMO_O], TrainerSlot.TRAINER, true, p => {
         p.teraType = PokemonType.DRAGON;
         p.generateAndPopulateMoveset();
         p.abilityIndex = p.species.speciesId === Species.KOMMO_O ? 1 : 2; // Soundproof Kommo-o, Unnerve Tyranitar, Rough Skin Garchomp
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.DRAGONITE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DRAGONITE], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.gender = Gender.MALE;
         p.setBoss(true, 2);
@@ -3635,18 +3841,24 @@ export const trainerConfigs: TrainerConfigs = {
     .setDoubleTitle("champion_double")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SKARMORY]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.CRADILY, Species.ARMALDO]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.AGGRON], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.AGGRON], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.setBoss(true, 2);
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOLURK, Species.RUNERIGUS]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.REGIROCK, Species.REGICE, Species.REGISTEEL], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.REGIROCK, Species.REGICE, Species.REGISTEEL], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.METAGROSS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.METAGROSS], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // Mega Metagross
         p.generateAndPopulateMoveset();
         p.generateName();
@@ -3660,13 +3872,17 @@ export const trainerConfigs: TrainerConfigs = {
     .setHasDouble("wallace_steven_double")
     .setDoubleTrainerType(TrainerType.STEVEN)
     .setDoubleTitle("champion_double")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 1; // Drizzle
         p.generateAndPopulateMoveset();
       }),
     )
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.LUDICOLO]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.LATIAS, Species.LATIOS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.LATIAS, Species.LATIOS], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // Mega Latios or Mega Latias
         p.generateAndPopulateMoveset();
         p.generateName();
@@ -3674,12 +3890,16 @@ export const trainerConfigs: TrainerConfigs = {
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SWAMPERT, Species.GASTRODON, Species.SEISMITOAD]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.REGIELEKI, Species.REGIDRAGO], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.REGIELEKI, Species.REGIDRAGO], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.MILOTIC], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.MILOTIC], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.gender = Gender.FEMALE;
         p.setBoss(true, 2);
@@ -3692,22 +3912,35 @@ export const trainerConfigs: TrainerConfigs = {
     .setMixedBattleBgm("battle_sinnoh_champion")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SPIRITOMB]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.LUCARIO]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GIRATINA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GIRATINA], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.MILOTIC, Species.ROSERADE, Species.HISUI_ARCANINE], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.teraType = p.species.type1;
-      }),
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc(
+        [Species.MILOTIC, Species.ROSERADE, Species.HISUI_ARCANINE],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.teraType = p.species.type1;
+        },
+      ),
     )
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.TOGEKISS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.TOGEKISS], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.setBoss(true, 2);
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.GARCHOMP], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GARCHOMP], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // Mega Garchomp
         p.generateAndPopulateMoveset();
         p.generateName();
@@ -3723,28 +3956,47 @@ export const trainerConfigs: TrainerConfigs = {
     .setBattleBgm("battle_champion_alder")
     .setMixedBattleBgm("battle_champion_alder")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BOUFFALANT, Species.BRAVIARY]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HISUI_LILLIGANT, Species.HISUI_ZOROARK, Species.BASCULEGION], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc(
+        [Species.HISUI_LILLIGANT, Species.HISUI_ZOROARK, Species.BASCULEGION],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
           p.generateAndPopulateMoveset();
           p.pokeball = PokeballType.ROGUE_BALL;
-      }),
+        },
+      ),
     )
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.ZEKROM], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.ZEKROM], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.KELDEO], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.KELDEO], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc(
-        [Species.CHANDELURE, Species.KROOKODILE, Species.REUNICLUS, Species.CONKELDURR], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.teraType = p.species.speciesId === Species.KROOKODILE ? PokemonType.DARK : p.species.type1;
-      }),
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc(
+        [Species.CHANDELURE, Species.KROOKODILE, Species.REUNICLUS, Species.CONKELDURR],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.teraType = p.species.speciesId === Species.KROOKODILE ? PokemonType.DARK : p.species.type1;
+        },
+      ),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.VOLCARONA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.VOLCARONA], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.gender = Gender.MALE;
         p.setBoss(true, 2);
@@ -3760,23 +4012,36 @@ export const trainerConfigs: TrainerConfigs = {
     .setDoubleTitle("champion_double")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.DRUDDIGON]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ARCHEOPS]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.RESHIRAM], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.RESHIRAM], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.SALAMENCE, Species.HYDREIGON, Species.ARCHALUDON], TrainerSlot.TRAINER, true, p => {
-        p.generateAndPopulateMoveset();
-        p.teraType = PokemonType.DRAGON;
-      }),
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc(
+        [Species.SALAMENCE, Species.HYDREIGON, Species.ARCHALUDON],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.generateAndPopulateMoveset();
+          p.teraType = PokemonType.DRAGON;
+        },
+      ),
     )
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.LAPRAS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.LAPRAS], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // G-Max Lapras
         p.generateAndPopulateMoveset();
         p.generateName();
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.HAXORUS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.HAXORUS], TrainerSlot.TRAINER, true, p => {
         p.abilityIndex = 1; // Mold Breaker
         p.generateAndPopulateMoveset();
         p.gender = Gender.FEMALE;
@@ -3787,28 +4052,38 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.DIANTHA]: new TrainerConfig(++t)
     .initForChampion(false)
     .setMixedBattleBgm("battle_kalos_champion")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.HAWLUCHA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.HAWLUCHA], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
       }),
     )
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.TREVENANT, Species.GOURGEIST]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.XERNEAS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.XERNEAS], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TYRANTRUM, Species.AURORUS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TYRANTRUM, Species.AURORUS], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.abilityIndex = 2; // Rock Head Tyrantrum, Snow Warning Aurorus
         p.teraType = p.species.type2!;
       }),
     )
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GOODRA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.GOODRA], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.setBoss(true, 2);
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.GARDEVOIR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.GARDEVOIR], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // Mega Gardevoir
         p.generateAndPopulateMoveset();
         p.generateName();
@@ -3819,29 +4094,45 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.KUKUI]: new TrainerConfig(++t)
     .initForChampion(true)
     .setMixedBattleBgm("battle_champion_kukui")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.formIndex = 2; // Dusk Lycanroc
       }),
     )
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.MAGNEZONE, Species.ALOLA_NINETALES]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.TORNADUS, Species.THUNDURUS, Species.LANDORUS], TrainerSlot.TRAINER, true, p => { p.formIndex = 1; // Therian Formes
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc(
+        [Species.TORNADUS, Species.THUNDURUS, Species.LANDORUS],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
+          p.formIndex = 1; // Therian Formes
           p.generateAndPopulateMoveset();
           p.pokeball = PokeballType.ULTRA_BALL;
-      }),
+        },
+      ),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TAPU_KOKO, Species.TAPU_FINI], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TAPU_KOKO, Species.TAPU_FINI], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.setBoss(true, 2);
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SNORLAX], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.SNORLAX], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.formIndex = 1; // G-Max Snorlax
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.INCINEROAR, Species.HISUI_DECIDUEYE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.INCINEROAR, Species.HISUI_DECIDUEYE], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.gender = Gender.MALE;
         p.teraType = p.species.type2!;
@@ -3853,24 +4144,32 @@ export const trainerConfigs: TrainerConfigs = {
     .setMixedBattleBgm("battle_alola_champion")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.ALOLA_RAICHU]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.NOIVERN]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.SOLGALEO], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.SOLGALEO], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.TAPU_LELE, Species.TAPU_BULU], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.TAPU_LELE, Species.TAPU_BULU], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
         p.teraType = p.species.type1;
       }),
     )
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ZYGARDE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.ZYGARDE], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 1; // Zygarde 10% forme, Aura Break
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ROGUE_BALL;
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.DECIDUEYE, Species.PRIMARINA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.DECIDUEYE, Species.PRIMARINA], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.setBoss(true, 2);
         p.gender = p.species.speciesId === Species.PRIMARINA ? Gender.FEMALE : Gender.MALE;
@@ -3882,18 +4181,29 @@ export const trainerConfigs: TrainerConfigs = {
     .setMixedBattleBgm("battle_galar_champion")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.AEGISLASH]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.RHYPERIOR, Species.SEISMITOAD, Species.MR_RIME]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.ZACIAN], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.ZACIAN], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DRAGAPULT]))
-    .setPartyMemberFunc(4,getRandomPartyMemberFunc([Species.RILLABOOM, Species.CINDERACE, Species.INTELEON], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc(
+        [Species.RILLABOOM, Species.CINDERACE, Species.INTELEON],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
           p.generateAndPopulateMoveset();
           p.setBoss(true, 2);
-      }),
+        },
+      ),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.CHARIZARD], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.CHARIZARD], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 3; // G-Max Charizard
         p.generateAndPopulateMoveset();
         p.generateName();
@@ -3904,34 +4214,46 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.MUSTARD]: new TrainerConfig(++t)
     .initForChampion(true)
     .setMixedBattleBgm("battle_mustard")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.CORVIKNIGHT], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.KOMMO_O], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.KOMMO_O], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
         p.teraType = p.species.type1;
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GALAR_DARMANITAN], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.GALAR_DARMANITAN], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.BLASTOISE, Species.VENUSAUR], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.BLASTOISE, Species.VENUSAUR], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.setBoss(true, 2);
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.URSHIFU], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.URSHIFU], TrainerSlot.TRAINER, true, p => {
         p.formIndex = randSeedInt(2, 2); // Random G-Max Urshifu
         p.generateAndPopulateMoveset();
         p.generateName();
@@ -3943,21 +4265,27 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.GEETA]: new TrainerConfig(++t)
     .initForChampion(false)
     .setMixedBattleBgm("battle_champion_geeta")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GLIMMORA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.GLIMMORA], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.gender = Gender.MALE;
         p.setBoss(true, 2);
       }),
     )
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.ESPATHRA, Species.VELUZA]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.MIRAIDON], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.MIRAIDON], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.BAXCALIBUR]))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.KINGAMBIT], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.KINGAMBIT], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         if (!p.moveset.some(move => !isNullOrUndefined(move) && move.moveId === Moves.TERA_BLAST)) {
           // Check if Tera Blast is in the moveset, if not, replace the third move with Tera Blast.
@@ -3971,50 +4299,71 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.NEMONA]: new TrainerConfig(++t)
     .initForChampion(false)
     .setMixedBattleBgm("battle_champion_nemona")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      0,
+      getRandomPartyMemberFunc([Species.LYCANROC], TrainerSlot.TRAINER, true, p => {
         p.formIndex = 0; // Midday form
         p.generateAndPopulateMoveset();
       }),
     )
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.PAWMOT]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.KORAIDON], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.KORAIDON], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GHOLDENGO]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.ARMAROUGE, Species.CERULEDGE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.ARMAROUGE, Species.CERULEDGE], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.teraType = p.species.type2!;
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc(
+        [Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL],
+        TrainerSlot.TRAINER,
+        true,
+        p => {
           p.generateAndPopulateMoveset();
           p.gender = Gender.MALE;
           p.setBoss(true, 2);
-      }),
+        },
+      ),
     )
     .setInstantTera(4), // Tera Psychic Armarouge / Ghost Ceruledge
   [TrainerType.KIERAN]: new TrainerConfig(++t)
     .initForChampion(true)
     .setMixedBattleBgm("battle_champion_kieran")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.POLIWRATH, Species.POLITOED]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.INCINEROAR, Species.GRIMMSNARL], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      1,
+      getRandomPartyMemberFunc([Species.INCINEROAR, Species.GRIMMSNARL], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.abilityIndex = p.species.speciesId === Species.INCINEROAR ? 2 : 0; // Intimidate Incineroar, Prankster Grimmsnarl
       }),
     )
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.TERAPAGOS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      2,
+      getRandomPartyMemberFunc([Species.TERAPAGOS], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.MASTER_BALL;
       }),
     )
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.URSALUNA, Species.BLOODMOON_URSALUNA], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      3,
+      getRandomPartyMemberFunc([Species.URSALUNA, Species.BLOODMOON_URSALUNA], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
       }),
     )
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.OGERPON], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      4,
+      getRandomPartyMemberFunc([Species.OGERPON], TrainerSlot.TRAINER, true, p => {
         p.formIndex = randSeedInt(4); // Random Ogerpon Tera Mask
         p.generateAndPopulateMoveset();
         p.pokeball = PokeballType.ULTRA_BALL;
@@ -4024,7 +4373,9 @@ export const trainerConfigs: TrainerConfigs = {
         }
       }),
     )
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.HYDRAPPLE], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(
+      5,
+      getRandomPartyMemberFunc([Species.HYDRAPPLE], TrainerSlot.TRAINER, true, p => {
         p.generateAndPopulateMoveset();
         p.gender = Gender.MALE;
         p.setBoss(true, 2);
diff --git a/src/data/trainers/TrainerPartyTemplate.ts b/src/data/trainers/trainer-party-template.ts
similarity index 98%
rename from src/data/trainers/TrainerPartyTemplate.ts
rename to src/data/trainers/trainer-party-template.ts
index 1952bcc179e..c12b6176b9b 100644
--- a/src/data/trainers/TrainerPartyTemplate.ts
+++ b/src/data/trainers/trainer-party-template.ts
@@ -250,7 +250,7 @@ export function getGymLeaderPartyTemplate() {
   switch (gameMode.modeId) {
     case GameModes.DAILY:
       if (currentBattle?.waveIndex <= 20) {
-        return trainerPartyTemplates.GYM_LEADER_2
+        return trainerPartyTemplates.GYM_LEADER_2;
       }
       return trainerPartyTemplates.GYM_LEADER_3;
     case GameModes.CHALLENGE: // In the future, there may be a ChallengeType to call here. For now, use classic's.
@@ -258,13 +258,15 @@ export function getGymLeaderPartyTemplate() {
       if (currentBattle?.waveIndex <= 20) {
         return trainerPartyTemplates.GYM_LEADER_1; // 1 avg 1 strong
       }
-      else if (currentBattle?.waveIndex <= 30) {
+      if (currentBattle?.waveIndex <= 30) {
         return trainerPartyTemplates.GYM_LEADER_2; // 1 avg 1 strong 1 stronger
       }
-      else if (currentBattle?.waveIndex <= 60) { // 50 and 60
+      if (currentBattle?.waveIndex <= 60) {
+        // 50 and 60
         return trainerPartyTemplates.GYM_LEADER_3; // 2 avg 1 strong 1 stronger
       }
-      else if (currentBattle?.waveIndex <= 90) { // 80 and 90
+      if (currentBattle?.waveIndex <= 90) {
+        // 80 and 90
         return trainerPartyTemplates.GYM_LEADER_4; // 3 avg 1 strong 1 stronger
       }
       // 110+
diff --git a/src/data/trainers/typedefs.ts b/src/data/trainers/type-defs.ts
similarity index 91%
rename from src/data/trainers/typedefs.ts
rename to src/data/trainers/type-defs.ts
index c6d286e961e..038ab68ebd8 100644
--- a/src/data/trainers/typedefs.ts
+++ b/src/data/trainers/type-defs.ts
@@ -3,7 +3,7 @@ import type { PersistentModifier } from "#app/modifier/modifier";
 import type { PartyMemberStrength } from "#enums/party-member-strength";
 import type { Species } from "#enums/species";
 import type { TrainerConfig } from "./trainer-config";
-import type { TrainerPartyTemplate } from "./TrainerPartyTemplate";
+import type { TrainerPartyTemplate } from "./trainer-party-template";
 
 export type PartyTemplateFunc = () => TrainerPartyTemplate;
 export type PartyMemberFunc = (level: number, strength: PartyMemberStrength) => EnemyPokemon;
diff --git a/src/enums/MoveCategory.ts b/src/enums/move-category.ts
similarity index 100%
rename from src/enums/MoveCategory.ts
rename to src/enums/move-category.ts
diff --git a/src/enums/MoveEffectTrigger.ts b/src/enums/move-effect-trigger.ts
similarity index 100%
rename from src/enums/MoveEffectTrigger.ts
rename to src/enums/move-effect-trigger.ts
diff --git a/src/enums/MoveFlags.ts b/src/enums/move-flags.ts
similarity index 100%
rename from src/enums/MoveFlags.ts
rename to src/enums/move-flags.ts
diff --git a/src/enums/MoveTarget.ts b/src/enums/move-target.ts
similarity index 100%
rename from src/enums/MoveTarget.ts
rename to src/enums/move-target.ts
diff --git a/src/enums/MultiHitType.ts b/src/enums/multi-hit-yype.ts
similarity index 100%
rename from src/enums/MultiHitType.ts
rename to src/enums/multi-hit-yype.ts
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index b9c64ad071c..68c90eb7acf 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -41,8 +41,8 @@ import {
   VariableMoveTypeChartAttr,
   HpSplitAttr,
 } from "#app/data/moves/move";
-import { MoveTarget } from "#enums/MoveTarget";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveTarget } from "#enums/move-target";
+import { MoveCategory } from "#enums/move-category";
 import type { PokemonSpeciesForm } from "#app/data/pokemon-species";
 import {
   default as PokemonSpecies,
@@ -255,7 +255,7 @@ import {
 import { Nature } from "#enums/nature";
 import { StatusEffect } from "#enums/status-effect";
 import { doShinySparkleAnim } from "#app/field/anims";
-import { MoveFlags } from "#enums/MoveFlags";
+import { MoveFlags } from "#enums/move-flags";
 import { timedEventManager } from "#app/global-event-manager";
 import { loadMoveAnimations } from "#app/sprites/pokemon-asset-loader";
 import { ResetStatusPhase } from "#app/phases/reset-status-phase";
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 6b0a54b2103..ab8739683f0 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -3,10 +3,10 @@ import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import type { TrainerConfig } from "#app/data/trainers/trainer-config";
-import type { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import type { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { trainerPartyTemplates } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
 import { TrainerSlot } from "#enums/trainer-slot";
 import { TrainerPoolTier } from "#enums/trainer-pool-tier";
 import { TeraAIMode } from "#enums/tera-ai-mode";
diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts
index 02a95f71ac4..b7c692c732a 100644
--- a/src/inputs-controller.ts
+++ b/src/inputs-controller.ts
@@ -1,16 +1,16 @@
 import Phaser from "phaser";
 import { getEnumValues } from "#app/utils/common";
 import { deepCopy } from "#app/utils/data";
-import pad_generic from "./configs/inputs/pad_generic";
-import pad_unlicensedSNES from "./configs/inputs/pad_unlicensedSNES";
-import pad_xbox360 from "./configs/inputs/pad_xbox360";
-import pad_dualshock from "./configs/inputs/pad_dualshock";
-import pad_procon from "./configs/inputs/pad_procon";
+import pad_generic from "./configs/inputs/pad-generic";
+import pad_unlicensedSNES from "./configs/inputs/pad-unlicensed-snes";
+import pad_xbox360 from "./configs/inputs/pad-xbox360";
+import pad_dualshock from "./configs/inputs/pad-dualshock";
+import pad_procon from "./configs/inputs/pad-procon";
 import { UiMode } from "#enums/ui-mode";
 import type SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler";
 import type SettingsKeyboardUiHandler from "./ui/settings/settings-keyboard-ui-handler";
-import cfg_keyboard_qwerty from "./configs/inputs/cfg_keyboard_qwerty";
-import { assign, getButtonWithKeycode, getIconForLatestInput, swap } from "#app/configs/inputs/configHandler";
+import cfg_keyboard_qwerty from "./configs/inputs/cfg-keyboard-qwerty";
+import { assign, getButtonWithKeycode, getIconForLatestInput, swap } from "#app/configs/inputs/config-handler";
 import { globalScene } from "#app/global-scene";
 import type { SettingGamepad } from "#app/system/settings/settings-gamepad";
 import type { SettingKeyboard } from "#app/system/settings/settings-keyboard";
diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index 64cae923f07..a5fb1a75cc3 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -42,10 +42,10 @@ import {
   StatChangeBeforeDmgCalcAttr,
   ToxicAccuracyAttr,
 } from "#app/data/moves/move";
-import { MoveEffectTrigger } from "#enums/MoveEffectTrigger";
-import { MoveFlags } from "#enums/MoveFlags";
-import { MoveTarget } from "#enums/MoveTarget";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveEffectTrigger } from "#enums/move-effect-trigger";
+import { MoveFlags } from "#enums/move-flags";
+import { MoveTarget } from "#enums/move-target";
+import { MoveCategory } from "#enums/move-category";
 import { SpeciesFormChangePostMoveTrigger } from "#app/data/pokemon-forms";
 import { PokemonType } from "#enums/pokemon-type";
 import { DamageResult, PokemonMove, type TurnMove } from "#app/field/pokemon";
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
index e704b040d20..f9357e27351 100644
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@@ -27,7 +27,7 @@ import {
   PreMoveMessageAttr,
   PreUseInterruptAttr,
 } from "#app/data/moves/move";
-import { MoveFlags } from "#enums/MoveFlags";
+import { MoveFlags } from "#enums/move-flags";
 import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms";
 import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect";
 import { PokemonType } from "#enums/pokemon-type";
diff --git a/src/pipelines/field-sprite.ts b/src/pipelines/field-sprite.ts
index a6e248c9998..7ce3c1399bd 100644
--- a/src/pipelines/field-sprite.ts
+++ b/src/pipelines/field-sprite.ts
@@ -1,8 +1,8 @@
 import { globalScene } from "#app/global-scene";
 import { TerrainType, getTerrainColor } from "../data/terrain";
 import { getCurrentTime } from "#app/utils/common";
-import fieldSpriteFragShader from "./glsl/fieldSpriteFragShader.frag?raw";
-import spriteVertShader from "./glsl/spriteShader.vert?raw";
+import fieldSpriteFragShader from "./glsl/field-sprite-frag-shader.frag?raw";
+import spriteVertShader from "./glsl/sprite-shader.vert?raw";
 
 export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines.MultiPipeline {
   constructor(game: Phaser.Game, config?: Phaser.Types.Renderer.WebGL.WebGLPipelineConfig) {
diff --git a/src/pipelines/glsl/fieldSpriteFragShader.frag b/src/pipelines/glsl/field-sprite-frag-shader.frag
similarity index 100%
rename from src/pipelines/glsl/fieldSpriteFragShader.frag
rename to src/pipelines/glsl/field-sprite-frag-shader.frag
diff --git a/src/pipelines/glsl/spriteFragShader.frag b/src/pipelines/glsl/sprite-frag-shader.frag
similarity index 100%
rename from src/pipelines/glsl/spriteFragShader.frag
rename to src/pipelines/glsl/sprite-frag-shader.frag
diff --git a/src/pipelines/glsl/spriteShader.vert b/src/pipelines/glsl/sprite-shader.vert
similarity index 100%
rename from src/pipelines/glsl/spriteShader.vert
rename to src/pipelines/glsl/sprite-shader.vert
diff --git a/src/pipelines/sprite.ts b/src/pipelines/sprite.ts
index 307c2cee4cc..11bf4958d9a 100644
--- a/src/pipelines/sprite.ts
+++ b/src/pipelines/sprite.ts
@@ -5,8 +5,8 @@ import Trainer from "#app/field/trainer";
 import { globalScene } from "#app/global-scene";
 import { rgbHexToRgba } from "#app/utils/common";
 import FieldSpritePipeline from "./field-sprite";
-import spriteFragShader from "./glsl/spriteFragShader.frag?raw";
-import spriteVertShader from "./glsl/spriteShader.vert?raw";
+import spriteFragShader from "./glsl/sprite-frag-shader.frag?raw";
+import spriteVertShader from "./glsl/sprite-shader.vert?raw";
 
 export default class SpritePipeline extends FieldSpritePipeline {
   private _tone: number[];
diff --git a/src/plugins/api/pokerogue-account-api.ts b/src/plugins/api/pokerogue-account-api.ts
index 9cd82c24430..df0f06c4956 100644
--- a/src/plugins/api/pokerogue-account-api.ts
+++ b/src/plugins/api/pokerogue-account-api.ts
@@ -3,7 +3,7 @@ import type {
   AccountLoginRequest,
   AccountLoginResponse,
   AccountRegisterRequest,
-} from "#app/@types/PokerogueAccountApi";
+} from "#app/@types/pokerogue-account-api";
 import { SESSION_ID_COOKIE_NAME } from "#app/constants";
 import { ApiBase } from "#app/plugins/api/api-base";
 import { removeCookie, setCookie } from "#app/utils/cookies";
diff --git a/src/plugins/api/pokerogue-admin-api.ts b/src/plugins/api/pokerogue-admin-api.ts
index 5923f286430..27fd001ee6e 100644
--- a/src/plugins/api/pokerogue-admin-api.ts
+++ b/src/plugins/api/pokerogue-admin-api.ts
@@ -5,7 +5,7 @@ import type {
   SearchAccountResponse,
   UnlinkAccountFromDiscordIdRequest,
   UnlinkAccountFromGoogledIdRequest,
-} from "#app/@types/PokerogueAdminApi";
+} from "#app/@types/pokerogue-admin-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 
 export class PokerogueAdminApi extends ApiBase {
diff --git a/src/plugins/api/pokerogue-api.ts b/src/plugins/api/pokerogue-api.ts
index c6dfae019a5..7ea48caffce 100644
--- a/src/plugins/api/pokerogue-api.ts
+++ b/src/plugins/api/pokerogue-api.ts
@@ -1,4 +1,4 @@
-import type { TitleStatsResponse } from "#app/@types/PokerogueApi";
+import type { TitleStatsResponse } from "#app/@types/pokerogue-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 import { PokerogueAccountApi } from "#app/plugins/api/pokerogue-account-api";
 import { PokerogueAdminApi } from "#app/plugins/api/pokerogue-admin-api";
diff --git a/src/plugins/api/pokerogue-daily-api.ts b/src/plugins/api/pokerogue-daily-api.ts
index c9319ae7fdc..742014e169c 100644
--- a/src/plugins/api/pokerogue-daily-api.ts
+++ b/src/plugins/api/pokerogue-daily-api.ts
@@ -1,4 +1,4 @@
-import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/PokerogueDailyApi";
+import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/pokerogue-daily-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 import type { RankingEntry } from "#app/ui/daily-run-scoreboard";
 
diff --git a/src/plugins/api/pokerogue-savedata-api.ts b/src/plugins/api/pokerogue-savedata-api.ts
index b8531e82d4f..bf8601c0702 100644
--- a/src/plugins/api/pokerogue-savedata-api.ts
+++ b/src/plugins/api/pokerogue-savedata-api.ts
@@ -1,4 +1,4 @@
-import type { UpdateAllSavedataRequest } from "#app/@types/PokerogueSavedataApi";
+import type { UpdateAllSavedataRequest } from "#app/@types/pokerogue-save-data-api";
 import { MAX_INT_ATTR_VALUE } from "#app/constants";
 import { ApiBase } from "#app/plugins/api/api-base";
 import { PokerogueSessionSavedataApi } from "#app/plugins/api/pokerogue-session-savedata-api";
diff --git a/src/plugins/api/pokerogue-session-savedata-api.ts b/src/plugins/api/pokerogue-session-savedata-api.ts
index aac8b9b93ad..d6da2725e6c 100644
--- a/src/plugins/api/pokerogue-session-savedata-api.ts
+++ b/src/plugins/api/pokerogue-session-savedata-api.ts
@@ -5,7 +5,7 @@ import type {
   GetSessionSavedataRequest,
   NewClearSessionSavedataRequest,
   UpdateSessionSavedataRequest,
-} from "#app/@types/PokerogueSessionSavedataApi";
+} from "#app/@types/pokerogue-session-save-data-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 import type { SessionSaveData } from "#app/system/game-data";
 
diff --git a/src/plugins/api/pokerogue-system-savedata-api.ts b/src/plugins/api/pokerogue-system-savedata-api.ts
index d6fbb39ae0a..59e9ee6798c 100644
--- a/src/plugins/api/pokerogue-system-savedata-api.ts
+++ b/src/plugins/api/pokerogue-system-savedata-api.ts
@@ -3,7 +3,7 @@ import type {
   UpdateSystemSavedataRequest,
   VerifySystemSavedataRequest,
   VerifySystemSavedataResponse,
-} from "#app/@types/PokerogueSystemSavedataApi";
+} from "#app/@types/pokerogue-system-save-data-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 
 /**
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index e200fa6b3c7..b220edae4e2 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -55,7 +55,7 @@ import {
   applySessionVersionMigration,
   applySystemVersionMigration,
   applySettingsVersionMigration,
-} from "./version_migration/version_converter";
+} from "./version-migration/version-converter";
 import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
diff --git a/src/system/version_migration/version_converter.ts b/src/system/version-migration/version-converter.ts
similarity index 96%
rename from src/system/version_migration/version_converter.ts
rename to src/system/version-migration/version-converter.ts
index 798115e0395..090399b247d 100644
--- a/src/system/version_migration/version_converter.ts
+++ b/src/system/version-migration/version-converter.ts
@@ -1,6 +1,6 @@
-import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
-import type { SettingsSaveMigrator } from "#app/@types/SettingsSaveMigrator";
-import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import type { SessionSaveMigrator } from "#app/@types/session-save-migrator";
+import type { SettingsSaveMigrator } from "#app/@types/settings-save-migrator";
+import type { SystemSaveMigrator } from "#app/@types/system-save-migrator";
 import type { SessionSaveData, SystemSaveData } from "#app/system/game-data";
 import { compareVersions } from "compare-versions";
 import { version } from "../../../package.json";
diff --git a/src/system/version_migration/versions/v1_0_4.ts b/src/system/version-migration/versions/v1_0_4.ts
similarity index 97%
rename from src/system/version_migration/versions/v1_0_4.ts
rename to src/system/version-migration/versions/v1_0_4.ts
index 9e30ccdc2a7..0c6fc43b0b2 100644
--- a/src/system/version_migration/versions/v1_0_4.ts
+++ b/src/system/version-migration/versions/v1_0_4.ts
@@ -4,9 +4,9 @@ import { AbilityAttr, defaultStarterSpecies, DexAttr } from "#app/system/game-da
 import { allSpecies } from "#app/data/pokemon-species";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { isNullOrUndefined } from "#app/utils/common";
-import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
-import type { SettingsSaveMigrator } from "#app/@types/SettingsSaveMigrator";
-import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
+import type { SystemSaveMigrator } from "#app/@types/system-save-migrator";
+import type { SettingsSaveMigrator } from "#app/@types/settings-save-migrator";
+import type { SessionSaveMigrator } from "#app/@types/session-save-migrator";
 
 /**
  * Migrate ability starter data if empty for caught species.
diff --git a/src/system/version_migration/versions/v1_7_0.ts b/src/system/version-migration/versions/v1_7_0.ts
similarity index 94%
rename from src/system/version_migration/versions/v1_7_0.ts
rename to src/system/version-migration/versions/v1_7_0.ts
index dc7c0f48640..2e522077dc0 100644
--- a/src/system/version_migration/versions/v1_7_0.ts
+++ b/src/system/version-migration/versions/v1_7_0.ts
@@ -1,5 +1,5 @@
-import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
-import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import type { SessionSaveMigrator } from "#app/@types/session-save-migrator";
+import type { SystemSaveMigrator } from "#app/@types/system-save-migrator";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
 import { globalScene } from "#app/global-scene";
 import { DexAttr, type SessionSaveData, type SystemSaveData } from "#app/system/game-data";
diff --git a/src/system/version_migration/versions/v1_8_3.ts b/src/system/version-migration/versions/v1_8_3.ts
similarity index 93%
rename from src/system/version_migration/versions/v1_8_3.ts
rename to src/system/version-migration/versions/v1_8_3.ts
index 6e2d96d3673..2ac81db971e 100644
--- a/src/system/version_migration/versions/v1_8_3.ts
+++ b/src/system/version-migration/versions/v1_8_3.ts
@@ -1,4 +1,4 @@
-import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import type { SystemSaveMigrator } from "#app/@types/system-save-migrator";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { DexAttr, type SystemSaveData } from "#app/system/game-data";
 import { Species } from "#enums/species";
diff --git a/src/system/version_migration/versions/v1_9_0.ts b/src/system/version-migration/versions/v1_9_0.ts
similarity index 95%
rename from src/system/version_migration/versions/v1_9_0.ts
rename to src/system/version-migration/versions/v1_9_0.ts
index 9505a7138f8..fb61113cc3b 100644
--- a/src/system/version_migration/versions/v1_9_0.ts
+++ b/src/system/version-migration/versions/v1_9_0.ts
@@ -1,4 +1,4 @@
-import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
+import type { SessionSaveMigrator } from "#app/@types/session-save-migrator";
 import { Status } from "#app/data/status-effect";
 import { PokemonMove } from "#app/field/pokemon";
 import type { SessionSaveData } from "#app/system/game-data";
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index 5a0978a934d..1058cdedf04 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -7,7 +7,7 @@ import { Command } from "./command-ui-handler";
 import { UiMode } from "#enums/ui-mode";
 import UiHandler from "./ui-handler";
 import { getLocalizedSpriteKey, fixedInt, padInt } from "#app/utils/common";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveCategory } from "#enums/move-category";
 import i18next from "i18next";
 import { Button } from "#enums/buttons";
 import type { PokemonMove } from "#app/field/pokemon";
diff --git a/src/ui/move-info-overlay.ts b/src/ui/move-info-overlay.ts
index 2b230d609fd..4bc36b53add 100644
--- a/src/ui/move-info-overlay.ts
+++ b/src/ui/move-info-overlay.ts
@@ -4,7 +4,7 @@ import { TextStyle, addTextObject } from "./text";
 import { addWindow } from "./ui-theme";
 import { getLocalizedSpriteKey, fixedInt } from "#app/utils/common";
 import type Move from "../data/moves/move";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveCategory } from "#enums/move-category";
 import { PokemonType } from "#enums/pokemon-type";
 import i18next from "i18next";
 
diff --git a/src/ui/settings/abstract-binding-ui-handler.ts b/src/ui/settings/abstract-binding-ui-handler.ts
index a4707418b7c..0e1e52dcce1 100644
--- a/src/ui/settings/abstract-binding-ui-handler.ts
+++ b/src/ui/settings/abstract-binding-ui-handler.ts
@@ -3,7 +3,7 @@ import type { UiMode } from "#enums/ui-mode";
 import { addWindow } from "../ui-theme";
 import { addTextObject, TextStyle } from "../text";
 import { Button } from "#enums/buttons";
-import { NavigationManager } from "#app/ui/settings/navigationMenu";
+import { NavigationManager } from "#app/ui/settings/navigation-menu";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts
index 495a0f68540..73e7db89802 100644
--- a/src/ui/settings/abstract-control-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-control-settings-ui-handler.ts
@@ -4,8 +4,8 @@ import type { InterfaceConfig } from "#app/inputs-controller";
 import { addWindow } from "#app/ui/ui-theme";
 import { addTextObject, TextStyle } from "#app/ui/text";
 import { ScrollBar } from "#app/ui/scroll-bar";
-import { getIconWithSettingName } from "#app/configs/inputs/configHandler";
-import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigationMenu";
+import { getIconWithSettingName } from "#app/configs/inputs/config-handler";
+import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigation-menu";
 import type { Device } from "#enums/devices";
 import { Button } from "#enums/buttons";
 import i18next from "i18next";
diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts
index 27ca95c25ac..c9667fdac03 100644
--- a/src/ui/settings/abstract-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-settings-ui-handler.ts
@@ -5,7 +5,7 @@ import { addWindow } from "#app/ui/ui-theme";
 import { ScrollBar } from "#app/ui/scroll-bar";
 import { Button } from "#enums/buttons";
 import type { InputsIcons } from "#app/ui/settings/abstract-control-settings-ui-handler";
-import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigationMenu";
+import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigation-menu";
 import type { SettingType } from "#app/system/settings/settings";
 import { Setting, SettingKeys } from "#app/system/settings/settings";
 import i18next from "i18next";
diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts
index 0f226ddcafa..a41c20b3aca 100644
--- a/src/ui/settings/gamepad-binding-ui-handler.ts
+++ b/src/ui/settings/gamepad-binding-ui-handler.ts
@@ -1,7 +1,7 @@
 import AbstractBindingUiHandler from "./abstract-binding-ui-handler";
 import type { UiMode } from "#enums/ui-mode";
 import { Device } from "#enums/devices";
-import { getIconWithSettingName, getKeyWithKeycode } from "#app/configs/inputs/configHandler";
+import { getIconWithSettingName, getKeyWithKeycode } from "#app/configs/inputs/config-handler";
 import { addTextObject, TextStyle } from "#app/ui/text";
 import { globalScene } from "#app/global-scene";
 
diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts
index c05a31ca91e..531c6b9b990 100644
--- a/src/ui/settings/keyboard-binding-ui-handler.ts
+++ b/src/ui/settings/keyboard-binding-ui-handler.ts
@@ -1,6 +1,6 @@
 import AbstractBindingUiHandler from "./abstract-binding-ui-handler";
 import type { UiMode } from "#enums/ui-mode";
-import { getKeyWithKeycode } from "#app/configs/inputs/configHandler";
+import { getKeyWithKeycode } from "#app/configs/inputs/config-handler";
 import { Device } from "#enums/devices";
 import { addTextObject, TextStyle } from "#app/ui/text";
 import { globalScene } from "#app/global-scene";
diff --git a/src/ui/settings/navigationMenu.ts b/src/ui/settings/navigation-menu.ts
similarity index 100%
rename from src/ui/settings/navigationMenu.ts
rename to src/ui/settings/navigation-menu.ts
diff --git a/src/ui/settings/settings-gamepad-ui-handler.ts b/src/ui/settings/settings-gamepad-ui-handler.ts
index 7d269deab14..c60b2242e42 100644
--- a/src/ui/settings/settings-gamepad-ui-handler.ts
+++ b/src/ui/settings/settings-gamepad-ui-handler.ts
@@ -7,9 +7,9 @@ import {
   settingGamepadDefaults,
   settingGamepadOptions,
 } from "../../system/settings/settings-gamepad";
-import pad_xbox360 from "#app/configs/inputs/pad_xbox360";
-import pad_dualshock from "#app/configs/inputs/pad_dualshock";
-import pad_unlicensedSNES from "#app/configs/inputs/pad_unlicensedSNES";
+import pad_xbox360 from "#app/configs/inputs/pad-xbox360";
+import pad_dualshock from "#app/configs/inputs/pad-dualshock";
+import pad_unlicensedSNES from "#app/configs/inputs/pad-unlicensed-snes";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler";
 import { Device } from "#enums/devices";
diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts
index c334ee8f1fc..ce60ab4341e 100644
--- a/src/ui/settings/settings-keyboard-ui-handler.ts
+++ b/src/ui/settings/settings-keyboard-ui-handler.ts
@@ -1,5 +1,5 @@
 import { UiMode } from "#enums/ui-mode";
-import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty";
+import cfg_keyboard_qwerty from "#app/configs/inputs/cfg-keyboard-qwerty";
 import {
   setSettingKeyboard,
   SettingKeyboard,
@@ -11,9 +11,9 @@ import { reverseValueToKeySetting, truncateString } from "#app/utils/common";
 import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import { addTextObject, TextStyle } from "#app/ui/text";
-import { deleteBind } from "#app/configs/inputs/configHandler";
+import { deleteBind } from "#app/configs/inputs/config-handler";
 import { Device } from "#enums/devices";
-import { NavigationManager } from "#app/ui/settings/navigationMenu";
+import { NavigationManager } from "#app/ui/settings/navigation-menu";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index f93a1826b3e..eb94e7ccef7 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -19,7 +19,7 @@ import { getTypeRgb } from "#app/data/type";
 import { PokemonType } from "#enums/pokemon-type";
 import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#app/ui/text";
 import type Move from "#app/data/moves/move";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveCategory } from "#enums/move-category";
 import { getPokeballAtlasKey } from "#app/data/pokeball";
 import { getGenderColor, getGenderSymbol } from "#app/data/gender";
 import { getLevelRelExp, getLevelTotalExp } from "#app/data/exp";
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index ad496df6382..208a7325cc9 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -56,7 +56,7 @@ import { Device } from "#enums/devices";
 import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler";
 import PokedexScanUiHandler from "./pokedex-scan-ui-handler";
 import PokedexPageUiHandler from "./pokedex-page-ui-handler";
-import { NavigationManager } from "./settings/navigationMenu";
+import { NavigationManager } from "./settings/navigation-menu";
 import { UiMode } from "#enums/ui-mode";
 
 const transitionModes = [
diff --git a/test/abilities/ability_duplication.test.ts b/test/abilities/ability-duplication.test.ts
similarity index 96%
rename from test/abilities/ability_duplication.test.ts
rename to test/abilities/ability-duplication.test.ts
index de429045bb8..36083d396a5 100644
--- a/test/abilities/ability_duplication.test.ts
+++ b/test/abilities/ability-duplication.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/abilities/ability_timing.test.ts b/test/abilities/ability-timing.test.ts
similarity index 96%
rename from test/abilities/ability_timing.test.ts
rename to test/abilities/ability-timing.test.ts
index 6128a3e6196..19e104e80d9 100644
--- a/test/abilities/ability_timing.test.ts
+++ b/test/abilities/ability-timing.test.ts
@@ -5,7 +5,7 @@ import i18next from "#app/plugins/i18n";
 import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/analytic.test.ts b/test/abilities/analytic.test.ts
index 108c712da00..97bbb9a0f73 100644
--- a/test/abilities/analytic.test.ts
+++ b/test/abilities/analytic.test.ts
@@ -3,7 +3,7 @@ import { isBetween, toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/arena_trap.test.ts b/test/abilities/arena-trap.test.ts
similarity index 98%
rename from test/abilities/arena_trap.test.ts
rename to test/abilities/arena-trap.test.ts
index f37b8a2859f..627f4aa068c 100644
--- a/test/abilities/arena_trap.test.ts
+++ b/test/abilities/arena-trap.test.ts
@@ -2,7 +2,7 @@ import { allAbilities } from "#app/data/data-lists";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/abilities/aroma_veil.test.ts b/test/abilities/aroma-veil.test.ts
similarity index 97%
rename from test/abilities/aroma_veil.test.ts
rename to test/abilities/aroma-veil.test.ts
index 38683bcb1e3..42e6c9e1a07 100644
--- a/test/abilities/aroma_veil.test.ts
+++ b/test/abilities/aroma-veil.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerTagType } from "#enums/battler-tag-type";
diff --git a/test/abilities/aura_break.test.ts b/test/abilities/aura-break.test.ts
similarity index 97%
rename from test/abilities/aura_break.test.ts
rename to test/abilities/aura-break.test.ts
index 523a2773c99..1a06f161203 100644
--- a/test/abilities/aura_break.test.ts
+++ b/test/abilities/aura-break.test.ts
@@ -2,7 +2,7 @@ import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/battery.test.ts b/test/abilities/battery.test.ts
index 6a1f77f4b27..4599556714b 100644
--- a/test/abilities/battery.test.ts
+++ b/test/abilities/battery.test.ts
@@ -4,7 +4,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/battle_bond.test.ts b/test/abilities/battle-bond.test.ts
similarity index 96%
rename from test/abilities/battle_bond.test.ts
rename to test/abilities/battle-bond.test.ts
index d599b3212f9..176f5c2e87e 100644
--- a/test/abilities/battle_bond.test.ts
+++ b/test/abilities/battle-bond.test.ts
@@ -1,11 +1,11 @@
 import { allMoves, MultiHitAttr } from "#app/data/moves/move";
-import { MultiHitType } from "#enums/MultiHitType";
+import { MultiHitType } from "#enums/multi-hit-yype";
 import { Status } from "#app/data/status-effect";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Abilities - BATTLE BOND", () => {
diff --git a/test/abilities/beast_boost.test.ts b/test/abilities/beast-boost.test.ts
similarity index 98%
rename from test/abilities/beast_boost.test.ts
rename to test/abilities/beast-boost.test.ts
index a6b6ec0aacf..b44f21ca254 100644
--- a/test/abilities/beast_boost.test.ts
+++ b/test/abilities/beast-boost.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/commander.test.ts b/test/abilities/commander.test.ts
index 0e6cb1b9208..04ee119d442 100644
--- a/test/abilities/commander.test.ts
+++ b/test/abilities/commander.test.ts
@@ -9,7 +9,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/competitive.test.ts b/test/abilities/competitive.test.ts
index 1e0b5fcf40e..5f2873619f1 100644
--- a/test/abilities/competitive.test.ts
+++ b/test/abilities/competitive.test.ts
@@ -3,7 +3,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/contrary.test.ts b/test/abilities/contrary.test.ts
index 929d620c232..f9bbc1e0d94 100644
--- a/test/abilities/contrary.test.ts
+++ b/test/abilities/contrary.test.ts
@@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/corrosion.test.ts b/test/abilities/corrosion.test.ts
index c72aef9f0a3..d8d1d9f089e 100644
--- a/test/abilities/corrosion.test.ts
+++ b/test/abilities/corrosion.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/costar.test.ts b/test/abilities/costar.test.ts
index 7b1e362689d..977d4f8ff0a 100644
--- a/test/abilities/costar.test.ts
+++ b/test/abilities/costar.test.ts
@@ -4,7 +4,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MessagePhase } from "#app/phases/message-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/abilities/cud_chew.test.ts b/test/abilities/cud-chew.test.ts
similarity index 99%
rename from test/abilities/cud_chew.test.ts
rename to test/abilities/cud-chew.test.ts
index f99060cb744..0cc47799437 100644
--- a/test/abilities/cud_chew.test.ts
+++ b/test/abilities/cud-chew.test.ts
@@ -7,7 +7,7 @@ import { BerryType } from "#enums/berry-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/test/abilities/dancer.test.ts b/test/abilities/dancer.test.ts
index cdd1e3221e9..988535fb7bb 100644
--- a/test/abilities/dancer.test.ts
+++ b/test/abilities/dancer.test.ts
@@ -3,7 +3,7 @@ import type { MovePhase } from "#app/phases/move-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/defiant.test.ts b/test/abilities/defiant.test.ts
index d06aef4d785..b95f634376a 100644
--- a/test/abilities/defiant.test.ts
+++ b/test/abilities/defiant.test.ts
@@ -3,7 +3,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/desolate-land.test.ts b/test/abilities/desolate-land.test.ts
index d6f01f7aa5e..99b97f63396 100644
--- a/test/abilities/desolate-land.test.ts
+++ b/test/abilities/desolate-land.test.ts
@@ -5,7 +5,7 @@ import { Command } from "#app/ui/command-ui-handler";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/abilities/disguise.test.ts b/test/abilities/disguise.test.ts
index 0e62b8ad448..c6790169292 100644
--- a/test/abilities/disguise.test.ts
+++ b/test/abilities/disguise.test.ts
@@ -5,7 +5,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Abilities - Disguise", () => {
diff --git a/test/abilities/dry_skin.test.ts b/test/abilities/dry-skin.test.ts
similarity index 98%
rename from test/abilities/dry_skin.test.ts
rename to test/abilities/dry-skin.test.ts
index 398d09393ab..d29858e8c10 100644
--- a/test/abilities/dry_skin.test.ts
+++ b/test/abilities/dry-skin.test.ts
@@ -1,7 +1,7 @@
 import { Species } from "#app/enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/early_bird.test.ts b/test/abilities/early-bird.test.ts
similarity index 98%
rename from test/abilities/early_bird.test.ts
rename to test/abilities/early-bird.test.ts
index 0f298ba479d..6a9ee5ad59f 100644
--- a/test/abilities/early_bird.test.ts
+++ b/test/abilities/early-bird.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/flash_fire.test.ts b/test/abilities/flash-fire.test.ts
similarity index 98%
rename from test/abilities/flash_fire.test.ts
rename to test/abilities/flash-fire.test.ts
index 8d94d21adf8..5d43318b2d2 100644
--- a/test/abilities/flash_fire.test.ts
+++ b/test/abilities/flash-fire.test.ts
@@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/flower_gift.test.ts b/test/abilities/flower-gift.test.ts
similarity index 99%
rename from test/abilities/flower_gift.test.ts
rename to test/abilities/flower-gift.test.ts
index f2b32dc4c80..b20a3df560d 100644
--- a/test/abilities/flower_gift.test.ts
+++ b/test/abilities/flower-gift.test.ts
@@ -6,7 +6,7 @@ import { WeatherType } from "#app/enums/weather-type";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/flower_veil.test.ts b/test/abilities/flower-veil.test.ts
similarity index 99%
rename from test/abilities/flower_veil.test.ts
rename to test/abilities/flower-veil.test.ts
index 1fd7dbb3ed7..0c7c448aa26 100644
--- a/test/abilities/flower_veil.test.ts
+++ b/test/abilities/flower-veil.test.ts
@@ -4,7 +4,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { allMoves } from "#app/data/moves/move";
diff --git a/test/abilities/forecast.test.ts b/test/abilities/forecast.test.ts
index 03b5d993a54..3f95c1a4b6c 100644
--- a/test/abilities/forecast.test.ts
+++ b/test/abilities/forecast.test.ts
@@ -9,7 +9,7 @@ import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/friend_guard.test.ts b/test/abilities/friend-guard.test.ts
similarity index 97%
rename from test/abilities/friend_guard.test.ts
rename to test/abilities/friend-guard.test.ts
index 43a378c47a2..3e44c16132c 100644
--- a/test/abilities/friend_guard.test.ts
+++ b/test/abilities/friend-guard.test.ts
@@ -1,13 +1,13 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
 import { allAbilities } from "#app/data/data-lists";
 import { allMoves } from "#app/data/moves/move";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveCategory } from "#enums/move-category";
 
 describe("Moves - Friend Guard", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/abilities/good_as_gold.test.ts b/test/abilities/good-as-gold.test.ts
similarity index 99%
rename from test/abilities/good_as_gold.test.ts
rename to test/abilities/good-as-gold.test.ts
index 09bdaafb11f..f2b75a151d1 100644
--- a/test/abilities/good_as_gold.test.ts
+++ b/test/abilities/good-as-gold.test.ts
@@ -9,7 +9,7 @@ import { WeatherType } from "#app/enums/weather-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/gorilla_tactics.test.ts b/test/abilities/gorilla-tactics.test.ts
similarity index 97%
rename from test/abilities/gorilla_tactics.test.ts
rename to test/abilities/gorilla-tactics.test.ts
index edaf1669809..794fef2a475 100644
--- a/test/abilities/gorilla_tactics.test.ts
+++ b/test/abilities/gorilla-tactics.test.ts
@@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/gulp_missile.test.ts b/test/abilities/gulp-missile.test.ts
similarity index 99%
rename from test/abilities/gulp_missile.test.ts
rename to test/abilities/gulp-missile.test.ts
index 4db2ae4190d..2411ca8aaec 100644
--- a/test/abilities/gulp_missile.test.ts
+++ b/test/abilities/gulp-missile.test.ts
@@ -6,7 +6,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/harvest.test.ts b/test/abilities/harvest.test.ts
index 23c0ed9088c..404a901b3e5 100644
--- a/test/abilities/harvest.test.ts
+++ b/test/abilities/harvest.test.ts
@@ -10,7 +10,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/healer.test.ts b/test/abilities/healer.test.ts
index d292ad0f625..02030dd2e9c 100644
--- a/test/abilities/healer.test.ts
+++ b/test/abilities/healer.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi, type MockInstance } from "vitest";
 import { isNullOrUndefined } from "#app/utils/common";
diff --git a/test/abilities/heatproof.test.ts b/test/abilities/heatproof.test.ts
index 016237bb02f..76ee103fb52 100644
--- a/test/abilities/heatproof.test.ts
+++ b/test/abilities/heatproof.test.ts
@@ -4,7 +4,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/honey_gather.test.ts b/test/abilities/honey-gather.test.ts
similarity index 97%
rename from test/abilities/honey_gather.test.ts
rename to test/abilities/honey-gather.test.ts
index a74a40c9c1e..7549aed8d4f 100644
--- a/test/abilities/honey_gather.test.ts
+++ b/test/abilities/honey-gather.test.ts
@@ -3,7 +3,7 @@ import { Command } from "#app/ui/command-ui-handler";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/hustle.test.ts b/test/abilities/hustle.test.ts
index bf2889eab63..dd721df3aca 100644
--- a/test/abilities/hustle.test.ts
+++ b/test/abilities/hustle.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#app/enums/abilities";
 import { Stat } from "#app/enums/stat";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/hyper_cutter.test.ts b/test/abilities/hyper-cutter.test.ts
similarity index 96%
rename from test/abilities/hyper_cutter.test.ts
rename to test/abilities/hyper-cutter.test.ts
index 99a9db28025..a0c597bef37 100644
--- a/test/abilities/hyper_cutter.test.ts
+++ b/test/abilities/hyper-cutter.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/ice_face.test.ts b/test/abilities/ice-face.test.ts
similarity index 99%
rename from test/abilities/ice_face.test.ts
rename to test/abilities/ice-face.test.ts
index 38269c29af1..5f92a6bb4f5 100644
--- a/test/abilities/ice_face.test.ts
+++ b/test/abilities/ice-face.test.ts
@@ -8,7 +8,7 @@ import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/illuminate.test.ts b/test/abilities/illuminate.test.ts
index ba26ed3b7af..0fdf93e3a86 100644
--- a/test/abilities/illuminate.test.ts
+++ b/test/abilities/illuminate.test.ts
@@ -1,7 +1,7 @@
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/abilities/illusion.test.ts b/test/abilities/illusion.test.ts
index 998d29f169c..1701718880f 100644
--- a/test/abilities/illusion.test.ts
+++ b/test/abilities/illusion.test.ts
@@ -3,7 +3,7 @@ import { PokeballType } from "#app/enums/pokeball";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/immunity.test.ts b/test/abilities/immunity.test.ts
index dd9026cac50..f2b5e9d71d8 100644
--- a/test/abilities/immunity.test.ts
+++ b/test/abilities/immunity.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/imposter.test.ts b/test/abilities/imposter.test.ts
index b5e902f442f..771935379ab 100644
--- a/test/abilities/imposter.test.ts
+++ b/test/abilities/imposter.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
diff --git a/test/abilities/infiltrator.test.ts b/test/abilities/infiltrator.test.ts
index 1a9f802dd9c..c3ac2e245e4 100644
--- a/test/abilities/infiltrator.test.ts
+++ b/test/abilities/infiltrator.test.ts
@@ -7,7 +7,7 @@ import { StatusEffect } from "#enums/status-effect";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/insomnia.test.ts b/test/abilities/insomnia.test.ts
index 49765a641b0..8d832650103 100644
--- a/test/abilities/insomnia.test.ts
+++ b/test/abilities/insomnia.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/intimidate.test.ts b/test/abilities/intimidate.test.ts
index 8db39270dcf..c1afad81b7b 100644
--- a/test/abilities/intimidate.test.ts
+++ b/test/abilities/intimidate.test.ts
@@ -1,9 +1,9 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { UiMode } from "#enums/ui-mode";
 import { Stat } from "#enums/stat";
-import { getMovePosition } from "#test/testUtils/gameManagerUtils";
+import { getMovePosition } from "#test/test-utils/game-manager-utils";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
diff --git a/test/abilities/intrepid_sword.test.ts b/test/abilities/intrepid-sword.test.ts
similarity index 95%
rename from test/abilities/intrepid_sword.test.ts
rename to test/abilities/intrepid-sword.test.ts
index b30ae4a9bd0..fba96dfbf24 100644
--- a/test/abilities/intrepid_sword.test.ts
+++ b/test/abilities/intrepid-sword.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
diff --git a/test/abilities/libero.test.ts b/test/abilities/libero.test.ts
index 4adb828180e..eb8b4d66809 100644
--- a/test/abilities/libero.test.ts
+++ b/test/abilities/libero.test.ts
@@ -9,7 +9,7 @@ import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/abilities/lightningrod.test.ts b/test/abilities/lightning-rod.test.ts
similarity index 98%
rename from test/abilities/lightningrod.test.ts
rename to test/abilities/lightning-rod.test.ts
index 21a03baf12b..671da38ece3 100644
--- a/test/abilities/lightningrod.test.ts
+++ b/test/abilities/lightning-rod.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/limber.test.ts b/test/abilities/limber.test.ts
index 4cdaa86f44c..0fb7a0311d5 100644
--- a/test/abilities/limber.test.ts
+++ b/test/abilities/limber.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic-bounce.test.ts
similarity index 99%
rename from test/abilities/magic_bounce.test.ts
rename to test/abilities/magic-bounce.test.ts
index 11131640a0f..ef9afb34af4 100644
--- a/test/abilities/magic_bounce.test.ts
+++ b/test/abilities/magic-bounce.test.ts
@@ -9,7 +9,7 @@ import { StatusEffect } from "#app/enums/status-effect";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Abilities - Magic Bounce", () => {
diff --git a/test/abilities/magic_guard.test.ts b/test/abilities/magic_guard.test.ts
index 96a9f4dab74..97b5b11aab5 100644
--- a/test/abilities/magic_guard.test.ts
+++ b/test/abilities/magic_guard.test.ts
@@ -8,7 +8,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/magma_armor.test.ts b/test/abilities/magma-armor.test.ts
similarity index 96%
rename from test/abilities/magma_armor.test.ts
rename to test/abilities/magma-armor.test.ts
index c5af522ca6f..437f98d4077 100644
--- a/test/abilities/magma_armor.test.ts
+++ b/test/abilities/magma-armor.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/mimicry.test.ts b/test/abilities/mimicry.test.ts
index 598f5790aa8..6782039ed75 100644
--- a/test/abilities/mimicry.test.ts
+++ b/test/abilities/mimicry.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { PokemonType } from "#enums/pokemon-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/mirror_armor.test.ts b/test/abilities/mirror-armor.test.ts
similarity index 99%
rename from test/abilities/mirror_armor.test.ts
rename to test/abilities/mirror-armor.test.ts
index bd61f39ba75..47a2eceec35 100644
--- a/test/abilities/mirror_armor.test.ts
+++ b/test/abilities/mirror-armor.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerIndex } from "#app/battle";
diff --git a/test/abilities/mold_breaker.test.ts b/test/abilities/mold-breaker.test.ts
similarity index 96%
rename from test/abilities/mold_breaker.test.ts
rename to test/abilities/mold-breaker.test.ts
index ba33909364f..d4c35815462 100644
--- a/test/abilities/mold_breaker.test.ts
+++ b/test/abilities/mold-breaker.test.ts
@@ -3,7 +3,7 @@ import { globalScene } from "#app/global-scene";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/moody.test.ts b/test/abilities/moody.test.ts
index 9b658820391..40937164411 100644
--- a/test/abilities/moody.test.ts
+++ b/test/abilities/moody.test.ts
@@ -2,7 +2,7 @@ import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/moxie.test.ts b/test/abilities/moxie.test.ts
index bccdeda2b93..7a08481d91a 100644
--- a/test/abilities/moxie.test.ts
+++ b/test/abilities/moxie.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
diff --git a/test/abilities/mummy.test.ts b/test/abilities/mummy.test.ts
index c53b0b33598..9afa8487c14 100644
--- a/test/abilities/mummy.test.ts
+++ b/test/abilities/mummy.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/mycelium_might.test.ts b/test/abilities/mycelium-might.test.ts
similarity index 98%
rename from test/abilities/mycelium_might.test.ts
rename to test/abilities/mycelium-might.test.ts
index 4a5700045fa..6c7aca94a86 100644
--- a/test/abilities/mycelium_might.test.ts
+++ b/test/abilities/mycelium-might.test.ts
@@ -1,6 +1,6 @@
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { TurnStartPhase } from "#app/phases/turn-start-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { Stat } from "#enums/stat";
 import { Moves } from "#enums/moves";
diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing-gas.test.ts
similarity index 99%
rename from test/abilities/neutralizing_gas.test.ts
rename to test/abilities/neutralizing-gas.test.ts
index 32c61b72e4d..fdb545721e5 100644
--- a/test/abilities/neutralizing_gas.test.ts
+++ b/test/abilities/neutralizing-gas.test.ts
@@ -8,7 +8,7 @@ import { Moves } from "#enums/moves";
 import { PokeballType } from "#enums/pokeball";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/no_guard.test.ts b/test/abilities/no-guard.test.ts
similarity index 97%
rename from test/abilities/no_guard.test.ts
rename to test/abilities/no-guard.test.ts
index a09e16388ee..741979c83eb 100644
--- a/test/abilities/no_guard.test.ts
+++ b/test/abilities/no-guard.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { HitCheckResult } from "#enums/hit-check-result";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/abilities/normal-move-type-change.test.ts b/test/abilities/normal-move-type-change.test.ts
index 50c8e04af1f..1e3309bbf91 100644
--- a/test/abilities/normal-move-type-change.test.ts
+++ b/test/abilities/normal-move-type-change.test.ts
@@ -4,7 +4,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants";
diff --git a/test/abilities/normalize.test.ts b/test/abilities/normalize.test.ts
index 3256f0188d1..de18569de25 100644
--- a/test/abilities/normalize.test.ts
+++ b/test/abilities/normalize.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { PokemonType } from "#enums/pokemon-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/oblivious.test.ts b/test/abilities/oblivious.test.ts
index a86899ec9c6..dd95adec02f 100644
--- a/test/abilities/oblivious.test.ts
+++ b/test/abilities/oblivious.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/own_tempo.test.ts b/test/abilities/own-tempo.test.ts
similarity index 96%
rename from test/abilities/own_tempo.test.ts
rename to test/abilities/own-tempo.test.ts
index b2f2c2f3030..c10752afb2e 100644
--- a/test/abilities/own_tempo.test.ts
+++ b/test/abilities/own-tempo.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/parental_bond.test.ts b/test/abilities/parental-bond.test.ts
similarity index 99%
rename from test/abilities/parental_bond.test.ts
rename to test/abilities/parental-bond.test.ts
index a75fea82830..b445e9a5808 100644
--- a/test/abilities/parental_bond.test.ts
+++ b/test/abilities/parental-bond.test.ts
@@ -6,7 +6,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/pastel_veil.test.ts b/test/abilities/pastel-veil.test.ts
similarity index 97%
rename from test/abilities/pastel_veil.test.ts
rename to test/abilities/pastel-veil.test.ts
index 4ae9763c4a6..074b2099ebf 100644
--- a/test/abilities/pastel_veil.test.ts
+++ b/test/abilities/pastel-veil.test.ts
@@ -5,7 +5,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/perish_body.test.ts b/test/abilities/perish-body.test.ts
similarity index 98%
rename from test/abilities/perish_body.test.ts
rename to test/abilities/perish-body.test.ts
index 27e76cb52ad..9b8310e4216 100644
--- a/test/abilities/perish_body.test.ts
+++ b/test/abilities/perish-body.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/power_construct.test.ts b/test/abilities/power-construct.test.ts
similarity index 98%
rename from test/abilities/power_construct.test.ts
rename to test/abilities/power-construct.test.ts
index 0ff90a2c0df..bbee9266e4a 100644
--- a/test/abilities/power_construct.test.ts
+++ b/test/abilities/power-construct.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
 describe("Abilities - POWER CONSTRUCT", () => {
diff --git a/test/abilities/power_spot.test.ts b/test/abilities/power-spot.test.ts
similarity index 97%
rename from test/abilities/power_spot.test.ts
rename to test/abilities/power-spot.test.ts
index 3e4f79d7445..4b2d95315bd 100644
--- a/test/abilities/power_spot.test.ts
+++ b/test/abilities/power-spot.test.ts
@@ -4,7 +4,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/protean.test.ts b/test/abilities/protean.test.ts
index 8f7633e1327..e07ab7a1c39 100644
--- a/test/abilities/protean.test.ts
+++ b/test/abilities/protean.test.ts
@@ -9,7 +9,7 @@ import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/abilities/protosynthesis.test.ts b/test/abilities/protosynthesis.test.ts
index e312ebd572c..79891801001 100644
--- a/test/abilities/protosynthesis.test.ts
+++ b/test/abilities/protosynthesis.test.ts
@@ -3,7 +3,7 @@ import { Moves } from "#enums/moves";
 import { Nature } from "#enums/nature";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { BattlerIndex } from "#app/battle";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/test/abilities/quick_draw.test.ts b/test/abilities/quick-draw.test.ts
similarity index 98%
rename from test/abilities/quick_draw.test.ts
rename to test/abilities/quick-draw.test.ts
index 79a29b0ce77..f60f5cdfed6 100644
--- a/test/abilities/quick_draw.test.ts
+++ b/test/abilities/quick-draw.test.ts
@@ -4,7 +4,7 @@ import { FaintPhase } from "#app/phases/faint-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 
diff --git a/test/abilities/sand_spit.test.ts b/test/abilities/sand-spit.test.ts
similarity index 97%
rename from test/abilities/sand_spit.test.ts
rename to test/abilities/sand-spit.test.ts
index 2b655f92466..f156e926e48 100644
--- a/test/abilities/sand_spit.test.ts
+++ b/test/abilities/sand-spit.test.ts
@@ -2,7 +2,7 @@ import { WeatherType } from "#app/enums/weather-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/sand_veil.test.ts b/test/abilities/sand-veil.test.ts
similarity index 97%
rename from test/abilities/sand_veil.test.ts
rename to test/abilities/sand-veil.test.ts
index b82c79c681b..d1eff38a81b 100644
--- a/test/abilities/sand_veil.test.ts
+++ b/test/abilities/sand-veil.test.ts
@@ -8,7 +8,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 
diff --git a/test/abilities/sap_sipper.test.ts b/test/abilities/sap-sipper.test.ts
similarity index 98%
rename from test/abilities/sap_sipper.test.ts
rename to test/abilities/sap-sipper.test.ts
index 2157177b84c..18aada3dfdc 100644
--- a/test/abilities/sap_sipper.test.ts
+++ b/test/abilities/sap-sipper.test.ts
@@ -6,7 +6,7 @@ import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { allMoves, RandomMoveAttr } from "#app/data/moves/move";
diff --git a/test/abilities/schooling.test.ts b/test/abilities/schooling.test.ts
index 803b4d2062a..ab31b5ed341 100644
--- a/test/abilities/schooling.test.ts
+++ b/test/abilities/schooling.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
 describe("Abilities - SCHOOLING", () => {
diff --git a/test/abilities/screen_cleaner.test.ts b/test/abilities/screen-cleaner.test.ts
similarity index 97%
rename from test/abilities/screen_cleaner.test.ts
rename to test/abilities/screen-cleaner.test.ts
index 840291f6420..9e89be23648 100644
--- a/test/abilities/screen_cleaner.test.ts
+++ b/test/abilities/screen-cleaner.test.ts
@@ -4,7 +4,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/seed_sower.test.ts b/test/abilities/seed-sower.test.ts
similarity index 97%
rename from test/abilities/seed_sower.test.ts
rename to test/abilities/seed-sower.test.ts
index d8edbe59857..e3126d4b2b7 100644
--- a/test/abilities/seed_sower.test.ts
+++ b/test/abilities/seed-sower.test.ts
@@ -2,7 +2,7 @@ import { TerrainType } from "#app/data/terrain";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/serene_grace.test.ts b/test/abilities/serene-grace.test.ts
similarity index 96%
rename from test/abilities/serene_grace.test.ts
rename to test/abilities/serene-grace.test.ts
index 2547971a4b8..786e3081e94 100644
--- a/test/abilities/serene_grace.test.ts
+++ b/test/abilities/serene-grace.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { allMoves } from "#app/data/moves/move";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/test/abilities/sheer_force.test.ts b/test/abilities/sheer-force.test.ts
similarity index 98%
rename from test/abilities/sheer_force.test.ts
rename to test/abilities/sheer-force.test.ts
index ce3232a1869..9d76d152c08 100644
--- a/test/abilities/sheer_force.test.ts
+++ b/test/abilities/sheer-force.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { allMoves, FlinchAttr } from "#app/data/moves/move";
diff --git a/test/abilities/shield_dust.test.ts b/test/abilities/shield-dust.test.ts
similarity index 97%
rename from test/abilities/shield_dust.test.ts
rename to test/abilities/shield-dust.test.ts
index 4ab58e8c2a6..656f2d250de 100644
--- a/test/abilities/shield_dust.test.ts
+++ b/test/abilities/shield-dust.test.ts
@@ -11,7 +11,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/shields_down.test.ts b/test/abilities/shields-down.test.ts
similarity index 99%
rename from test/abilities/shields_down.test.ts
rename to test/abilities/shields-down.test.ts
index 2f9d2fb1f97..b337419a542 100644
--- a/test/abilities/shields_down.test.ts
+++ b/test/abilities/shields-down.test.ts
@@ -6,7 +6,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
 describe("Abilities - SHIELDS DOWN", () => {
diff --git a/test/abilities/simple.test.ts b/test/abilities/simple.test.ts
index 1f084b1bf4c..50bb1b984de 100644
--- a/test/abilities/simple.test.ts
+++ b/test/abilities/simple.test.ts
@@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/speed_boost.test.ts b/test/abilities/speed-boost.test.ts
similarity index 98%
rename from test/abilities/speed_boost.test.ts
rename to test/abilities/speed-boost.test.ts
index 45ee54ffb07..6d84cf756bf 100644
--- a/test/abilities/speed_boost.test.ts
+++ b/test/abilities/speed-boost.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import type { CommandPhase } from "#app/phases/command-phase";
diff --git a/test/abilities/stakeout.test.ts b/test/abilities/stakeout.test.ts
index 8a2231bba0b..ee919f7aec7 100644
--- a/test/abilities/stakeout.test.ts
+++ b/test/abilities/stakeout.test.ts
@@ -3,7 +3,7 @@ import { isBetween } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/stall.test.ts b/test/abilities/stall.test.ts
index 68b3fdedcd8..ff5859d0e52 100644
--- a/test/abilities/stall.test.ts
+++ b/test/abilities/stall.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { TurnStartPhase } from "#app/phases/turn-start-phase";
diff --git a/test/abilities/steely_spirit.test.ts b/test/abilities/steely-spirit.test.ts
similarity index 98%
rename from test/abilities/steely_spirit.test.ts
rename to test/abilities/steely-spirit.test.ts
index be759724c3a..953213a0eb6 100644
--- a/test/abilities/steely_spirit.test.ts
+++ b/test/abilities/steely-spirit.test.ts
@@ -3,7 +3,7 @@ import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/storm_drain.test.ts b/test/abilities/storm-drain.test.ts
similarity index 98%
rename from test/abilities/storm_drain.test.ts
rename to test/abilities/storm-drain.test.ts
index 0cbad796ad8..6da8a91a1b5 100644
--- a/test/abilities/storm_drain.test.ts
+++ b/test/abilities/storm-drain.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/sturdy.test.ts b/test/abilities/sturdy.test.ts
index bda8c6d1e35..78e49aa735a 100644
--- a/test/abilities/sturdy.test.ts
+++ b/test/abilities/sturdy.test.ts
@@ -4,7 +4,7 @@ import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/abilities/super_luck.test.ts b/test/abilities/super-luck.test.ts
similarity index 95%
rename from test/abilities/super_luck.test.ts
rename to test/abilities/super-luck.test.ts
index fbcbd02bdd2..1323da28adc 100644
--- a/test/abilities/super_luck.test.ts
+++ b/test/abilities/super-luck.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/supreme_overlord.test.ts b/test/abilities/supreme-overlord.test.ts
similarity index 99%
rename from test/abilities/supreme_overlord.test.ts
rename to test/abilities/supreme-overlord.test.ts
index 8af0a0ac37c..5472c6671d0 100644
--- a/test/abilities/supreme_overlord.test.ts
+++ b/test/abilities/supreme-overlord.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
 import { BattlerIndex } from "#app/battle";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { allMoves } from "#app/data/moves/move";
diff --git a/test/abilities/sweet_veil.test.ts b/test/abilities/sweet-veil.test.ts
similarity index 98%
rename from test/abilities/sweet_veil.test.ts
rename to test/abilities/sweet-veil.test.ts
index e609aa6e7d2..f7ffb25becc 100644
--- a/test/abilities/sweet_veil.test.ts
+++ b/test/abilities/sweet-veil.test.ts
@@ -5,7 +5,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/synchronize.test.ts b/test/abilities/synchronize.test.ts
index 783201d7a5b..03ed25a93f7 100644
--- a/test/abilities/synchronize.test.ts
+++ b/test/abilities/synchronize.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/tera_shell.test.ts b/test/abilities/tera-shell.test.ts
similarity index 98%
rename from test/abilities/tera_shell.test.ts
rename to test/abilities/tera-shell.test.ts
index fdbcb14947d..ef64f63909b 100644
--- a/test/abilities/tera_shell.test.ts
+++ b/test/abilities/tera-shell.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/thermal_exchange.test.ts b/test/abilities/thermal-exchange.test.ts
similarity index 96%
rename from test/abilities/thermal_exchange.test.ts
rename to test/abilities/thermal-exchange.test.ts
index c33b296d5ae..01a3d85f759 100644
--- a/test/abilities/thermal_exchange.test.ts
+++ b/test/abilities/thermal-exchange.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/trace.test.ts b/test/abilities/trace.test.ts
index 7ec8d62ab51..6d2b1c08ba4 100644
--- a/test/abilities/trace.test.ts
+++ b/test/abilities/trace.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/unburden.test.ts b/test/abilities/unburden.test.ts
index 2af889d1da4..5474c7b0f8f 100644
--- a/test/abilities/unburden.test.ts
+++ b/test/abilities/unburden.test.ts
@@ -9,7 +9,7 @@ import { BerryType } from "#enums/berry-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/unseen_fist.test.ts b/test/abilities/unseen-fist.test.ts
similarity index 98%
rename from test/abilities/unseen_fist.test.ts
rename to test/abilities/unseen-fist.test.ts
index 6c14e82fc39..e7b2678d5ae 100644
--- a/test/abilities/unseen_fist.test.ts
+++ b/test/abilities/unseen-fist.test.ts
@@ -2,7 +2,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
diff --git a/test/abilities/victory_star.test.ts b/test/abilities/victory-star.test.ts
similarity index 96%
rename from test/abilities/victory_star.test.ts
rename to test/abilities/victory-star.test.ts
index f3c0b5ad6b7..d980d250696 100644
--- a/test/abilities/victory_star.test.ts
+++ b/test/abilities/victory-star.test.ts
@@ -3,7 +3,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/vital_spirit.test.ts b/test/abilities/vital-spirit.test.ts
similarity index 96%
rename from test/abilities/vital_spirit.test.ts
rename to test/abilities/vital-spirit.test.ts
index bb274310cc0..54b4dc4cbb1 100644
--- a/test/abilities/vital_spirit.test.ts
+++ b/test/abilities/vital-spirit.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/volt_absorb.test.ts b/test/abilities/volt-absorb.test.ts
similarity index 98%
rename from test/abilities/volt_absorb.test.ts
rename to test/abilities/volt-absorb.test.ts
index 920c822eb90..0abbf9c2b75 100644
--- a/test/abilities/volt_absorb.test.ts
+++ b/test/abilities/volt-absorb.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerIndex } from "#app/battle";
diff --git a/test/abilities/wandering_spirit.test.ts b/test/abilities/wandering-spirit.test.ts
similarity index 97%
rename from test/abilities/wandering_spirit.test.ts
rename to test/abilities/wandering-spirit.test.ts
index 639241aecc8..5fa2f7fc6c2 100644
--- a/test/abilities/wandering_spirit.test.ts
+++ b/test/abilities/wandering-spirit.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/water_bubble.test.ts b/test/abilities/water-bubble.test.ts
similarity index 96%
rename from test/abilities/water_bubble.test.ts
rename to test/abilities/water-bubble.test.ts
index c1e2acbd468..85db8f9619c 100644
--- a/test/abilities/water_bubble.test.ts
+++ b/test/abilities/water-bubble.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/water_veil.test.ts b/test/abilities/water-veil.test.ts
similarity index 96%
rename from test/abilities/water_veil.test.ts
rename to test/abilities/water-veil.test.ts
index 8e187ad8e58..4be4fc7aa28 100644
--- a/test/abilities/water_veil.test.ts
+++ b/test/abilities/water-veil.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/wimp_out.test.ts b/test/abilities/wimp-out.test.ts
similarity index 99%
rename from test/abilities/wimp_out.test.ts
rename to test/abilities/wimp-out.test.ts
index f558efdb103..3aac9ccb2b6 100644
--- a/test/abilities/wimp_out.test.ts
+++ b/test/abilities/wimp-out.test.ts
@@ -1,7 +1,7 @@
 import { BattlerIndex } from "#app/battle";
 import { ArenaTagSide } from "#app/data/arena-tag";
 import { allMoves } from "#app/data/moves/move";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
diff --git a/test/abilities/wind_power.test.ts b/test/abilities/wind-power.test.ts
similarity index 98%
rename from test/abilities/wind_power.test.ts
rename to test/abilities/wind-power.test.ts
index 66c72d454ab..ee7b6509656 100644
--- a/test/abilities/wind_power.test.ts
+++ b/test/abilities/wind-power.test.ts
@@ -3,7 +3,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/wind_rider.test.ts b/test/abilities/wind-rider.test.ts
similarity index 98%
rename from test/abilities/wind_rider.test.ts
rename to test/abilities/wind-rider.test.ts
index f8301aa03fc..570576aca7c 100644
--- a/test/abilities/wind_rider.test.ts
+++ b/test/abilities/wind-rider.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
diff --git a/test/abilities/wonder_skin.test.ts b/test/abilities/wonder-skin.test.ts
similarity index 97%
rename from test/abilities/wonder_skin.test.ts
rename to test/abilities/wonder-skin.test.ts
index d039ba1e6a7..fe5e8e03e1c 100644
--- a/test/abilities/wonder_skin.test.ts
+++ b/test/abilities/wonder-skin.test.ts
@@ -3,7 +3,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/abilities/zen_mode.test.ts b/test/abilities/zen-mode.test.ts
similarity index 98%
rename from test/abilities/zen_mode.test.ts
rename to test/abilities/zen-mode.test.ts
index 1eb27a8f6c7..8ef867537a8 100644
--- a/test/abilities/zen_mode.test.ts
+++ b/test/abilities/zen-mode.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/abilities/zero_to_hero.test.ts b/test/abilities/zero-to-hero.test.ts
similarity index 98%
rename from test/abilities/zero_to_hero.test.ts
rename to test/abilities/zero-to-hero.test.ts
index 2cdc516dc6b..86d9198f626 100644
--- a/test/abilities/zero_to_hero.test.ts
+++ b/test/abilities/zero-to-hero.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Abilities - ZERO TO HERO", () => {
diff --git a/test/achievements/achievement.test.ts b/test/achievements/achievement.test.ts
index 0b49c4d23ab..1f1d9eef1e2 100644
--- a/test/achievements/achievement.test.ts
+++ b/test/achievements/achievement.test.ts
@@ -11,7 +11,7 @@ import {
   achvs,
 } from "#app/system/achv";
 import { NumberHolder } from "#app/utils/common";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import type BattleScene from "#app/battle-scene";
diff --git a/test/arena/arena_gravity.test.ts b/test/arena/arena-gravity.test.ts
similarity index 98%
rename from test/arena/arena_gravity.test.ts
rename to test/arena/arena-gravity.test.ts
index 0ce5ac0ea4c..45a22254f10 100644
--- a/test/arena/arena_gravity.test.ts
+++ b/test/arena/arena-gravity.test.ts
@@ -5,7 +5,7 @@ import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/arena/grassy_terrain.test.ts b/test/arena/grassy-terrain.test.ts
similarity index 97%
rename from test/arena/grassy_terrain.test.ts
rename to test/arena/grassy-terrain.test.ts
index f8ca07bd65e..820036ea314 100644
--- a/test/arena/grassy_terrain.test.ts
+++ b/test/arena/grassy-terrain.test.ts
@@ -2,7 +2,7 @@ import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/arena/weather_fog.test.ts b/test/arena/weather-fog.test.ts
similarity index 96%
rename from test/arena/weather_fog.test.ts
rename to test/arena/weather-fog.test.ts
index b1edf75704b..c73d3690291 100644
--- a/test/arena/weather_fog.test.ts
+++ b/test/arena/weather-fog.test.ts
@@ -4,7 +4,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/arena/weather_hail.test.ts b/test/arena/weather-hail.test.ts
similarity index 97%
rename from test/arena/weather_hail.test.ts
rename to test/arena/weather-hail.test.ts
index 2fa4f71d8ca..466a4dfe0fa 100644
--- a/test/arena/weather_hail.test.ts
+++ b/test/arena/weather-hail.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/arena/weather_sandstorm.test.ts b/test/arena/weather-sandstorm.test.ts
similarity index 98%
rename from test/arena/weather_sandstorm.test.ts
rename to test/arena/weather-sandstorm.test.ts
index e7620f6cf30..c3c0396b954 100644
--- a/test/arena/weather_sandstorm.test.ts
+++ b/test/arena/weather-sandstorm.test.ts
@@ -3,7 +3,7 @@ import { Stat } from "#app/enums/stat";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/arena/weather_strong_winds.test.ts b/test/arena/weather-strong-winds.test.ts
similarity index 98%
rename from test/arena/weather_strong_winds.test.ts
rename to test/arena/weather-strong-winds.test.ts
index 9fcdb18c872..65914400e97 100644
--- a/test/arena/weather_strong_winds.test.ts
+++ b/test/arena/weather-strong-winds.test.ts
@@ -4,7 +4,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/battle-scene.test.ts b/test/battle-scene.test.ts
index 44f1364441b..5b206d011b0 100644
--- a/test/battle-scene.test.ts
+++ b/test/battle-scene.test.ts
@@ -1,6 +1,6 @@
 import { LoadingScene } from "#app/loading-scene";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 
 describe("BattleScene", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/battle/ability_swap.test.ts b/test/battle/ability-swap.test.ts
similarity index 97%
rename from test/battle/ability_swap.test.ts
rename to test/battle/ability-swap.test.ts
index c9f91df3a48..c939b1afa4c 100644
--- a/test/battle/ability_swap.test.ts
+++ b/test/battle/ability-swap.test.ts
@@ -3,7 +3,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/battle/battle-order.test.ts b/test/battle/battle-order.test.ts
index 43fa1e59c14..c8aedbd4e4b 100644
--- a/test/battle/battle-order.test.ts
+++ b/test/battle/battle-order.test.ts
@@ -4,7 +4,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/battle/battle.test.ts b/test/battle/battle.test.ts
index e980984580e..2cbc035b485 100644
--- a/test/battle/battle.test.ts
+++ b/test/battle/battle.test.ts
@@ -16,8 +16,8 @@ import { SwitchPhase } from "#app/phases/switch-phase";
 import { TitlePhase } from "#app/phases/title-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { VictoryPhase } from "#app/phases/victory-phase";
-import GameManager from "#test/testUtils/gameManager";
-import { generateStarter } from "#test/testUtils/gameManagerUtils";
+import GameManager from "#test/test-utils/game-manager";
+import { generateStarter } from "#test/test-utils/game-manager-utils";
 import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
@@ -118,7 +118,7 @@ describe("Test Battle Phase", () => {
   }, 20000);
 
   it("load 100% data file", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
diff --git a/test/battle/damage_calculation.test.ts b/test/battle/damage-calculation.test.ts
similarity index 98%
rename from test/battle/damage_calculation.test.ts
rename to test/battle/damage-calculation.test.ts
index 26772cbc4f0..6dc34c61d99 100644
--- a/test/battle/damage_calculation.test.ts
+++ b/test/battle/damage-calculation.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/battle/double_battle.test.ts b/test/battle/double-battle.test.ts
similarity index 98%
rename from test/battle/double_battle.test.ts
rename to test/battle/double-battle.test.ts
index a30d55aac3d..58ade26bc17 100644
--- a/test/battle/double_battle.test.ts
+++ b/test/battle/double-battle.test.ts
@@ -6,7 +6,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/battle/inverse_battle.test.ts b/test/battle/inverse-battle.test.ts
similarity index 99%
rename from test/battle/inverse_battle.test.ts
rename to test/battle/inverse-battle.test.ts
index 799442bb603..3ae6f72ed5d 100644
--- a/test/battle/inverse_battle.test.ts
+++ b/test/battle/inverse-battle.test.ts
@@ -6,7 +6,7 @@ import { Challenges } from "#enums/challenges";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/battle/special_battle.test.ts b/test/battle/special-battle.test.ts
similarity index 98%
rename from test/battle/special_battle.test.ts
rename to test/battle/special-battle.test.ts
index 163f23e488d..79542946ebc 100644
--- a/test/battle/special_battle.test.ts
+++ b/test/battle/special-battle.test.ts
@@ -3,7 +3,7 @@ import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/battlerTags/octolock.test.ts b/test/battler-tags/octolock.test.ts
similarity index 96%
rename from test/battlerTags/octolock.test.ts
rename to test/battler-tags/octolock.test.ts
index 6189bd7febe..fb789ce8c27 100644
--- a/test/battlerTags/octolock.test.ts
+++ b/test/battler-tags/octolock.test.ts
@@ -3,7 +3,7 @@ import type Pokemon from "#app/field/pokemon";
 import { BattlerTagLapseType, OctolockTag, TrappedTag } from "#app/data/battler-tags";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 
 describe("BattlerTag - OctolockTag", () => {
   describe("lapse behavior", () => {
diff --git a/test/battlerTags/stockpiling.test.ts b/test/battler-tags/stockpiling.test.ts
similarity index 99%
rename from test/battlerTags/stockpiling.test.ts
rename to test/battler-tags/stockpiling.test.ts
index 20fade13d92..a5cc5c499fc 100644
--- a/test/battlerTags/stockpiling.test.ts
+++ b/test/battler-tags/stockpiling.test.ts
@@ -4,7 +4,7 @@ import { PokemonSummonData } from "#app/field/pokemon";
 import * as messages from "#app/messages";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 beforeEach(() => {
diff --git a/test/battlerTags/substitute.test.ts b/test/battler-tags/substitute.test.ts
similarity index 99%
rename from test/battlerTags/substitute.test.ts
rename to test/battler-tags/substitute.test.ts
index c2a99299716..ce9a761c324 100644
--- a/test/battlerTags/substitute.test.ts
+++ b/test/battler-tags/substitute.test.ts
@@ -9,7 +9,7 @@ import { PokemonAnimType } from "#app/enums/pokemon-anim-type";
 import * as messages from "#app/messages";
 import { allMoves } from "#app/data/moves/move";
 import type { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 
 describe("BattlerTag - SubstituteTag", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/boss-pokemon.test.ts b/test/boss-pokemon.test.ts
index ef95ae9bcc2..9b57de47fb7 100644
--- a/test/boss-pokemon.test.ts
+++ b/test/boss-pokemon.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#app/enums/species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Abilities } from "#app/enums/abilities";
diff --git a/test/daily_mode.test.ts b/test/daily-mode.test.ts
similarity index 98%
rename from test/daily_mode.test.ts
rename to test/daily-mode.test.ts
index a7f5784087a..49657194410 100644
--- a/test/daily_mode.test.ts
+++ b/test/daily-mode.test.ts
@@ -6,7 +6,7 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { Species } from "#enums/species";
 import { UiMode } from "#enums/ui-mode";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 
 //const TIMEOUT = 20 * 1000;
 
diff --git a/test/data/splash_messages.test.ts b/test/data/splash-messages.test.ts
similarity index 100%
rename from test/data/splash_messages.test.ts
rename to test/data/splash-messages.test.ts
diff --git a/test/data/status_effect.test.ts b/test/data/status-effect.test.ts
similarity index 99%
rename from test/data/status_effect.test.ts
rename to test/data/status-effect.test.ts
index 111136bf0a2..36585edd2c6 100644
--- a/test/data/status_effect.test.ts
+++ b/test/data/status-effect.test.ts
@@ -11,8 +11,8 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
-import { mockI18next } from "#test/testUtils/testUtils";
+import GameManager from "#test/test-utils/game-manager";
+import { mockI18next } from "#test/test-utils/test-utils";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const pokemonName = "PKM";
diff --git a/test/eggs/egg.test.ts b/test/eggs/egg.test.ts
index 0110aa5fdaf..a56d6c7f0f3 100644
--- a/test/eggs/egg.test.ts
+++ b/test/eggs/egg.test.ts
@@ -7,7 +7,7 @@ import { VariantTier } from "#app/enums/variant-tier";
 import EggData from "#app/system/egg-data";
 import * as Utils from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -29,7 +29,7 @@ describe("Egg Generation Tests", () => {
   });
 
   beforeEach(async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
   });
 
   it("should return Kyogre for the 10th of June", () => {
diff --git a/test/eggs/manaphy-egg.test.ts b/test/eggs/manaphy-egg.test.ts
index 1e7f67a7bb5..d5e49d710e9 100644
--- a/test/eggs/manaphy-egg.test.ts
+++ b/test/eggs/manaphy-egg.test.ts
@@ -2,7 +2,7 @@ import { Egg } from "#app/data/egg";
 import { EggSourceType } from "#app/enums/egg-source-types";
 import { EggTier } from "#app/enums/egg-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -25,7 +25,7 @@ describe("Manaphy Eggs", () => {
   });
 
   beforeEach(async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
 
     /**
      * In our tests, we will perform an "RNG sweep" by letting rngSweepProgress
diff --git a/test/endless_boss.test.ts b/test/endless-boss.test.ts
similarity index 98%
rename from test/endless_boss.test.ts
rename to test/endless-boss.test.ts
index 4be1e379215..0be48803dd9 100644
--- a/test/endless_boss.test.ts
+++ b/test/endless-boss.test.ts
@@ -2,7 +2,7 @@ import { Biome } from "#app/enums/biome";
 import { Species } from "#app/enums/species";
 import { GameModes } from "#app/game-mode";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 
 const EndlessBossWave = {
   Minor: 250,
diff --git a/test/enemy_command.test.ts b/test/enemy-command.test.ts
similarity index 96%
rename from test/enemy_command.test.ts
rename to test/enemy-command.test.ts
index ae1f2918798..af15c6442e6 100644
--- a/test/enemy_command.test.ts
+++ b/test/enemy-command.test.ts
@@ -1,13 +1,13 @@
 import type BattleScene from "#app/battle-scene";
 import { allMoves } from "#app/data/moves/move";
-import { MoveCategory } from "#enums/MoveCategory";
+import { MoveCategory } from "#enums/move-category";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import type { EnemyPokemon } from "#app/field/pokemon";
 import { AiType } from "#app/field/pokemon";
 import { randSeedInt } from "#app/utils/common";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/escape-calculations.test.ts b/test/escape-calculations.test.ts
index 56333432cee..29ccc588655 100644
--- a/test/escape-calculations.test.ts
+++ b/test/escape-calculations.test.ts
@@ -4,7 +4,7 @@ import { Command } from "#app/ui/command-ui-handler";
 import { NumberHolder } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/evolution.test.ts b/test/evolution.test.ts
index 4f91cd99382..3e60aaf6c4a 100644
--- a/test/evolution.test.ts
+++ b/test/evolution.test.ts
@@ -7,7 +7,7 @@ import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import * as Utils from "#app/utils/common";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/field/pokemon.test.ts b/test/field/pokemon.test.ts
index f763ab2c401..e55dbe835e1 100644
--- a/test/field/pokemon.test.ts
+++ b/test/field/pokemon.test.ts
@@ -1,6 +1,6 @@
 import { Species } from "#app/enums/species";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { PokeballType } from "#enums/pokeball";
 import type BattleScene from "#app/battle-scene";
 import { Moves } from "#app/enums/moves";
diff --git a/test/final_boss.test.ts b/test/final-boss.test.ts
similarity index 98%
rename from test/final_boss.test.ts
rename to test/final-boss.test.ts
index 1b0cdce60a0..098fc627d60 100644
--- a/test/final_boss.test.ts
+++ b/test/final-boss.test.ts
@@ -5,7 +5,7 @@ import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 const FinalWave = {
diff --git a/test/game-mode.test.ts b/test/game-mode.test.ts
index 0483d18e492..14d6f4a6105 100644
--- a/test/game-mode.test.ts
+++ b/test/game-mode.test.ts
@@ -2,7 +2,7 @@ import type { GameMode } from "#app/game-mode";
 import { GameModes, getGameMode } from "#app/game-mode";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as Utils from "#app/utils/common";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 
 describe("game-mode", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/inputs/inputs.test.ts b/test/inputs/inputs.test.ts
index 1f566672f00..2bfde616591 100644
--- a/test/inputs/inputs.test.ts
+++ b/test/inputs/inputs.test.ts
@@ -1,7 +1,7 @@
-import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty";
-import pad_xbox360 from "#app/configs/inputs/pad_xbox360";
-import GameManager from "#test/testUtils/gameManager";
-import InputsHandler from "#test/testUtils/inputsHandler";
+import cfg_keyboard_qwerty from "#app/configs/inputs/cfg-keyboard-qwerty";
+import pad_xbox360 from "#app/configs/inputs/pad-xbox360";
+import GameManager from "#test/test-utils/game-manager";
+import InputsHandler from "#test/test-utils/inputs-handler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/internals.test.ts b/test/internals.test.ts
index 558b363caf0..73c1b73c74f 100644
--- a/test/internals.test.ts
+++ b/test/internals.test.ts
@@ -1,6 +1,6 @@
 import { Abilities } from "#app/enums/abilities";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/items/dire_hit.test.ts b/test/items/dire-hit.test.ts
similarity index 98%
rename from test/items/dire_hit.test.ts
rename to test/items/dire-hit.test.ts
index 6e20bc723e5..3abf4abaded 100644
--- a/test/items/dire_hit.test.ts
+++ b/test/items/dire-hit.test.ts
@@ -1,7 +1,7 @@
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { BattleEndPhase } from "#app/phases/battle-end-phase";
diff --git a/test/items/double_battle_chance_booster.test.ts b/test/items/double-battle-chance-booster.test.ts
similarity index 98%
rename from test/items/double_battle_chance_booster.test.ts
rename to test/items/double-battle-chance-booster.test.ts
index 68a29ef823e..604f264bec6 100644
--- a/test/items/double_battle_chance_booster.test.ts
+++ b/test/items/double-battle-chance-booster.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
diff --git a/test/items/eviolite.test.ts b/test/items/eviolite.test.ts
index fafc0f4a10c..f5fe27d12c0 100644
--- a/test/items/eviolite.test.ts
+++ b/test/items/eviolite.test.ts
@@ -2,7 +2,7 @@ import { StatBoosterModifier } from "#app/modifier/modifier";
 import { NumberHolder, randItem } from "#app/utils/common";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/exp_booster.test.ts b/test/items/exp-booster.test.ts
similarity index 95%
rename from test/items/exp_booster.test.ts
rename to test/items/exp-booster.test.ts
index ec7528c3b23..a7911fa3f22 100644
--- a/test/items/exp_booster.test.ts
+++ b/test/items/exp-booster.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#app/enums/abilities";
 import { PokemonExpBoosterModifier } from "#app/modifier/modifier";
 import { NumberHolder } from "#app/utils/common";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/items/grip_claw.test.ts b/test/items/grip-claw.test.ts
similarity index 98%
rename from test/items/grip_claw.test.ts
rename to test/items/grip-claw.test.ts
index 2396a7ca072..de9d479aba8 100644
--- a/test/items/grip_claw.test.ts
+++ b/test/items/grip-claw.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { BerryType } from "#enums/berry-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/leek.test.ts b/test/items/leek.test.ts
index 9bde2c86339..4a570fddd88 100644
--- a/test/items/leek.test.ts
+++ b/test/items/leek.test.ts
@@ -2,7 +2,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { randInt } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/leftovers.test.ts b/test/items/leftovers.test.ts
index 19739703f19..d29e3db8295 100644
--- a/test/items/leftovers.test.ts
+++ b/test/items/leftovers.test.ts
@@ -3,7 +3,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/items/light_ball.test.ts b/test/items/light-ball.test.ts
similarity index 99%
rename from test/items/light_ball.test.ts
rename to test/items/light-ball.test.ts
index 91195d0b1e5..6d19a582802 100644
--- a/test/items/light_ball.test.ts
+++ b/test/items/light-ball.test.ts
@@ -4,7 +4,7 @@ import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
 import { NumberHolder } from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/lock_capsule.test.ts b/test/items/lock-capsule.test.ts
similarity index 96%
rename from test/items/lock_capsule.test.ts
rename to test/items/lock-capsule.test.ts
index 19829578d87..20da66f742d 100644
--- a/test/items/lock_capsule.test.ts
+++ b/test/items/lock-capsule.test.ts
@@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
 import { UiMode } from "#enums/ui-mode";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/items/metal_powder.test.ts b/test/items/metal-powder.test.ts
similarity index 99%
rename from test/items/metal_powder.test.ts
rename to test/items/metal-powder.test.ts
index 6be7655ec70..0e1ac3aab53 100644
--- a/test/items/metal_powder.test.ts
+++ b/test/items/metal-powder.test.ts
@@ -4,7 +4,7 @@ import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
 import { NumberHolder } from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/multi_lens.test.ts b/test/items/multi-lens.test.ts
similarity index 99%
rename from test/items/multi_lens.test.ts
rename to test/items/multi-lens.test.ts
index ff6154b8283..52fccf30d8d 100644
--- a/test/items/multi_lens.test.ts
+++ b/test/items/multi-lens.test.ts
@@ -3,7 +3,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/mystical_rock.test.ts b/test/items/mystical-rock.test.ts
similarity index 96%
rename from test/items/mystical_rock.test.ts
rename to test/items/mystical-rock.test.ts
index 59119ce8611..8de40c9cf3e 100644
--- a/test/items/mystical_rock.test.ts
+++ b/test/items/mystical-rock.test.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import { Moves } from "#enums/moves";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/items/quick_powder.test.ts b/test/items/quick-powder.test.ts
similarity index 99%
rename from test/items/quick_powder.test.ts
rename to test/items/quick-powder.test.ts
index d77f981f04d..ad375d73baf 100644
--- a/test/items/quick_powder.test.ts
+++ b/test/items/quick-powder.test.ts
@@ -4,7 +4,7 @@ import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
 import { NumberHolder } from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/reviver_seed.test.ts b/test/items/reviver-seed.test.ts
similarity index 99%
rename from test/items/reviver_seed.test.ts
rename to test/items/reviver-seed.test.ts
index c109794d3d2..fe4a4a6df9f 100644
--- a/test/items/reviver_seed.test.ts
+++ b/test/items/reviver-seed.test.ts
@@ -5,7 +5,7 @@ import type { PokemonInstantReviveModifier } from "#app/modifier/modifier";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/scope_lens.test.ts b/test/items/scope-lens.test.ts
similarity index 95%
rename from test/items/scope_lens.test.ts
rename to test/items/scope-lens.test.ts
index f67966ea3c9..ef1766d5361 100644
--- a/test/items/scope_lens.test.ts
+++ b/test/items/scope-lens.test.ts
@@ -1,7 +1,7 @@
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/temp_stat_stage_booster.test.ts b/test/items/temp-stat-stage-booster.test.ts
similarity index 98%
rename from test/items/temp_stat_stage_booster.test.ts
rename to test/items/temp-stat-stage-booster.test.ts
index a3cfc3256bb..e5721c0d228 100644
--- a/test/items/temp_stat_stage_booster.test.ts
+++ b/test/items/temp-stat-stage-booster.test.ts
@@ -1,5 +1,5 @@
 import { BATTLE_STATS, Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/test/items/thick_club.test.ts b/test/items/thick-club.test.ts
similarity index 99%
rename from test/items/thick_club.test.ts
rename to test/items/thick-club.test.ts
index 2a63a60a0e6..098b59b70f2 100644
--- a/test/items/thick_club.test.ts
+++ b/test/items/thick-club.test.ts
@@ -4,7 +4,7 @@ import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
 import { NumberHolder, randInt } from "#app/utils/common";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phase from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/toxic_orb.test.ts b/test/items/toxic-orb.test.ts
similarity index 96%
rename from test/items/toxic_orb.test.ts
rename to test/items/toxic-orb.test.ts
index d02679e17c1..09464cc487c 100644
--- a/test/items/toxic_orb.test.ts
+++ b/test/items/toxic-orb.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/misc.test.ts b/test/misc.test.ts
index 12ed165d9d9..8d572e422ab 100644
--- a/test/misc.test.ts
+++ b/test/misc.test.ts
@@ -1,6 +1,6 @@
 // import { apiFetch } from "#app/utils";
-import GameManager from "#test/testUtils/gameManager";
-import { waitUntil } from "#test/testUtils/gameManagerUtils";
+import GameManager from "#test/test-utils/game-manager";
+import { waitUntil } from "#test/test-utils/game-manager-utils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/after_you.test.ts b/test/moves/after-you.test.ts
similarity index 97%
rename from test/moves/after_you.test.ts
rename to test/moves/after-you.test.ts
index 3fa7c9ceb0a..c3577027b7d 100644
--- a/test/moves/after_you.test.ts
+++ b/test/moves/after-you.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { MovePhase } from "#app/phases/move-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/alluring_voice.test.ts b/test/moves/alluring-voice.test.ts
similarity index 96%
rename from test/moves/alluring_voice.test.ts
rename to test/moves/alluring-voice.test.ts
index 240e008f311..c7d35873062 100644
--- a/test/moves/alluring_voice.test.ts
+++ b/test/moves/alluring-voice.test.ts
@@ -4,7 +4,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type";
 import { BerryPhase } from "#app/phases/berry-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/aromatherapy.test.ts b/test/moves/aromatherapy.test.ts
index c361f4e8bbd..0e907ab271f 100644
--- a/test/moves/aromatherapy.test.ts
+++ b/test/moves/aromatherapy.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/assist.test.ts b/test/moves/assist.test.ts
index d0385399811..b612e955327 100644
--- a/test/moves/assist.test.ts
+++ b/test/moves/assist.test.ts
@@ -5,7 +5,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/astonish.test.ts b/test/moves/astonish.test.ts
index 1713df1de15..fbab0b1ce22 100644
--- a/test/moves/astonish.test.ts
+++ b/test/moves/astonish.test.ts
@@ -7,7 +7,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 
diff --git a/test/moves/aurora_veil.test.ts b/test/moves/aurora-veil.test.ts
similarity index 99%
rename from test/moves/aurora_veil.test.ts
rename to test/moves/aurora-veil.test.ts
index e9ab66d4203..687540cdceb 100644
--- a/test/moves/aurora_veil.test.ts
+++ b/test/moves/aurora-veil.test.ts
@@ -10,7 +10,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/autotomize.test.ts b/test/moves/autotomize.test.ts
index 08e55f242bc..dc1457d0ab1 100644
--- a/test/moves/autotomize.test.ts
+++ b/test/moves/autotomize.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/moves/baddy_bad.test.ts b/test/moves/baddy-bad.test.ts
similarity index 95%
rename from test/moves/baddy_bad.test.ts
rename to test/moves/baddy-bad.test.ts
index ed6c9239eea..e9b23744e86 100644
--- a/test/moves/baddy_bad.test.ts
+++ b/test/moves/baddy-bad.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/baneful_bunker.test.ts b/test/moves/baneful-bunker.test.ts
similarity index 98%
rename from test/moves/baneful_bunker.test.ts
rename to test/moves/baneful-bunker.test.ts
index 4d0d7237c00..507530faec3 100644
--- a/test/moves/baneful_bunker.test.ts
+++ b/test/moves/baneful-bunker.test.ts
@@ -1,6 +1,6 @@
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/baton_pass.test.ts b/test/moves/baton-pass.test.ts
similarity index 98%
rename from test/moves/baton_pass.test.ts
rename to test/moves/baton-pass.test.ts
index 143ed285023..6d6a2ce7a40 100644
--- a/test/moves/baton_pass.test.ts
+++ b/test/moves/baton-pass.test.ts
@@ -1,5 +1,5 @@
 import { BattlerIndex } from "#app/battle";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/beak_blast.test.ts b/test/moves/beak-blast.test.ts
similarity index 98%
rename from test/moves/beak_blast.test.ts
rename to test/moves/beak-blast.test.ts
index 45841cecd52..a017205c3ba 100644
--- a/test/moves/beak_blast.test.ts
+++ b/test/moves/beak-blast.test.ts
@@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/beat_up.test.ts b/test/moves/beat-up.test.ts
similarity index 97%
rename from test/moves/beat_up.test.ts
rename to test/moves/beat-up.test.ts
index ad6cad40d32..d345056ace7 100644
--- a/test/moves/beat_up.test.ts
+++ b/test/moves/beat-up.test.ts
@@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { StatusEffect } from "#app/enums/status-effect";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/belly_drum.test.ts b/test/moves/belly-drum.test.ts
similarity index 98%
rename from test/moves/belly_drum.test.ts
rename to test/moves/belly-drum.test.ts
index 8ee1026bf20..80f456a3f11 100644
--- a/test/moves/belly_drum.test.ts
+++ b/test/moves/belly-drum.test.ts
@@ -3,7 +3,7 @@ import { toDmgValue } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 import { Abilities } from "#app/enums/abilities";
diff --git a/test/moves/burning_jealousy.test.ts b/test/moves/burning-jealousy.test.ts
similarity index 98%
rename from test/moves/burning_jealousy.test.ts
rename to test/moves/burning-jealousy.test.ts
index ea02bf5f4f5..63007871938 100644
--- a/test/moves/burning_jealousy.test.ts
+++ b/test/moves/burning-jealousy.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#app/enums/abilities";
 import { StatusEffect } from "#app/enums/status-effect";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/camouflage.test.ts b/test/moves/camouflage.test.ts
index 38cdef80fc1..f86396f5a9c 100644
--- a/test/moves/camouflage.test.ts
+++ b/test/moves/camouflage.test.ts
@@ -4,7 +4,7 @@ import { Species } from "#enums/species";
 import { TerrainType } from "#app/data/terrain";
 import { PokemonType } from "#enums/pokemon-type";
 import { BattlerIndex } from "#app/battle";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/ceaseless_edge.test.ts b/test/moves/ceaseless-edge.test.ts
similarity index 98%
rename from test/moves/ceaseless_edge.test.ts
rename to test/moves/ceaseless-edge.test.ts
index 72e552bef6f..6606113d189 100644
--- a/test/moves/ceaseless_edge.test.ts
+++ b/test/moves/ceaseless-edge.test.ts
@@ -6,7 +6,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 
diff --git a/test/moves/chilly_reception.test.ts b/test/moves/chilly-reception.test.ts
similarity index 98%
rename from test/moves/chilly_reception.test.ts
rename to test/moves/chilly-reception.test.ts
index 56da5dd400c..7912e81be91 100644
--- a/test/moves/chilly_reception.test.ts
+++ b/test/moves/chilly-reception.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { WeatherType } from "#enums/weather-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 //import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/test/moves/chloroblast.test.ts b/test/moves/chloroblast.test.ts
index 175227bbd5e..69317cfc874 100644
--- a/test/moves/chloroblast.test.ts
+++ b/test/moves/chloroblast.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/clangorous_soul.test.ts b/test/moves/clangorous-soul.test.ts
similarity index 98%
rename from test/moves/clangorous_soul.test.ts
rename to test/moves/clangorous-soul.test.ts
index 56f19a0e088..63656cdbc85 100644
--- a/test/moves/clangorous_soul.test.ts
+++ b/test/moves/clangorous-soul.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
diff --git a/test/moves/copycat.test.ts b/test/moves/copycat.test.ts
index 2e6e8098835..ecc9214df7c 100644
--- a/test/moves/copycat.test.ts
+++ b/test/moves/copycat.test.ts
@@ -5,7 +5,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/crafty_shield.test.ts b/test/moves/crafty-shield.test.ts
similarity index 98%
rename from test/moves/crafty_shield.test.ts
rename to test/moves/crafty-shield.test.ts
index c61e6d3848a..cc2d70e926b 100644
--- a/test/moves/crafty_shield.test.ts
+++ b/test/moves/crafty-shield.test.ts
@@ -1,6 +1,6 @@
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/defog.test.ts b/test/moves/defog.test.ts
index 58631150b6f..55def09badf 100644
--- a/test/moves/defog.test.ts
+++ b/test/moves/defog.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/destiny_bond.test.ts b/test/moves/destiny-bond.test.ts
similarity index 99%
rename from test/moves/destiny_bond.test.ts
rename to test/moves/destiny-bond.test.ts
index 6e6446f464f..824b92249ed 100644
--- a/test/moves/destiny_bond.test.ts
+++ b/test/moves/destiny-bond.test.ts
@@ -5,7 +5,7 @@ import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
diff --git a/test/moves/diamond_storm.test.ts b/test/moves/diamond-storm.test.ts
similarity index 96%
rename from test/moves/diamond_storm.test.ts
rename to test/moves/diamond-storm.test.ts
index 9ba62bbc52d..9ebdb699f0b 100644
--- a/test/moves/diamond_storm.test.ts
+++ b/test/moves/diamond-storm.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/dig.test.ts b/test/moves/dig.test.ts
index 80d51a5c2d5..e415883e588 100644
--- a/test/moves/dig.test.ts
+++ b/test/moves/dig.test.ts
@@ -7,7 +7,7 @@ import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
 import { MoveResult } from "#app/field/pokemon";
 import { describe, beforeAll, afterEach, beforeEach, it, expect } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 
 describe("Moves - Dig", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/moves/disable.test.ts b/test/moves/disable.test.ts
index d21716145a4..49bcd41967a 100644
--- a/test/moves/disable.test.ts
+++ b/test/moves/disable.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Moves - Disable", () => {
diff --git a/test/moves/dive.test.ts b/test/moves/dive.test.ts
index 95c3349c8a6..19526e0392f 100644
--- a/test/moves/dive.test.ts
+++ b/test/moves/dive.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 import { WeatherType } from "#enums/weather-type";
diff --git a/test/moves/doodle.test.ts b/test/moves/doodle.test.ts
index 25dc0ddaede..48caa29a923 100644
--- a/test/moves/doodle.test.ts
+++ b/test/moves/doodle.test.ts
@@ -3,7 +3,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/double_team.test.ts b/test/moves/double-team.test.ts
similarity index 96%
rename from test/moves/double_team.test.ts
rename to test/moves/double-team.test.ts
index 8eac6be11f4..895ff024e80 100644
--- a/test/moves/double_team.test.ts
+++ b/test/moves/double-team.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#app/enums/abilities";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/dragon_cheer.test.ts b/test/moves/dragon-cheer.test.ts
similarity index 98%
rename from test/moves/dragon_cheer.test.ts
rename to test/moves/dragon-cheer.test.ts
index dcf7f13eb65..f7e0d144839 100644
--- a/test/moves/dragon_cheer.test.ts
+++ b/test/moves/dragon-cheer.test.ts
@@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/dragon_rage.test.ts b/test/moves/dragon_rage.test.ts
index 188c1511f37..11d6ae322c8 100644
--- a/test/moves/dragon_rage.test.ts
+++ b/test/moves/dragon_rage.test.ts
@@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts
index 31e5560d4e0..31088a56821 100644
--- a/test/moves/dragon_tail.test.ts
+++ b/test/moves/dragon_tail.test.ts
@@ -7,7 +7,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/dynamax_cannon.test.ts b/test/moves/dynamax-cannon.test.ts
similarity index 99%
rename from test/moves/dynamax_cannon.test.ts
rename to test/moves/dynamax-cannon.test.ts
index 84def8a821f..aa2de27581f 100644
--- a/test/moves/dynamax_cannon.test.ts
+++ b/test/moves/dynamax-cannon.test.ts
@@ -5,7 +5,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Moves } from "#enums/moves";
 import type Move from "#app/data/moves/move";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/effectiveness.test.ts b/test/moves/effectiveness.test.ts
index fb03f1c10a0..84c0fa8c118 100644
--- a/test/moves/effectiveness.test.ts
+++ b/test/moves/effectiveness.test.ts
@@ -6,7 +6,7 @@ import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import * as Messages from "#app/messages";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/electrify.test.ts b/test/moves/electrify.test.ts
index 25529e0b552..59e1ae22a2a 100644
--- a/test/moves/electrify.test.ts
+++ b/test/moves/electrify.test.ts
@@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/electro_shot.test.ts b/test/moves/electro-shot.test.ts
similarity index 98%
rename from test/moves/electro_shot.test.ts
rename to test/moves/electro-shot.test.ts
index 0122bf04281..1223b890f64 100644
--- a/test/moves/electro_shot.test.ts
+++ b/test/moves/electro-shot.test.ts
@@ -5,7 +5,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/moves/encore.test.ts b/test/moves/encore.test.ts
index 519e7860c04..2946b15d07f 100644
--- a/test/moves/encore.test.ts
+++ b/test/moves/encore.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/endure.test.ts b/test/moves/endure.test.ts
index 190a689f46e..75d6c7009d9 100644
--- a/test/moves/endure.test.ts
+++ b/test/moves/endure.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/entrainment.test.ts b/test/moves/entrainment.test.ts
index 31a8ffcab85..963dd3c1dd2 100644
--- a/test/moves/entrainment.test.ts
+++ b/test/moves/entrainment.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/fairy_lock.test.ts b/test/moves/fairy-lock.test.ts
similarity index 99%
rename from test/moves/fairy_lock.test.ts
rename to test/moves/fairy-lock.test.ts
index e967221bcae..8f28787c92a 100644
--- a/test/moves/fairy_lock.test.ts
+++ b/test/moves/fairy-lock.test.ts
@@ -3,7 +3,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/fake_out.test.ts b/test/moves/fake-out.test.ts
similarity index 98%
rename from test/moves/fake_out.test.ts
rename to test/moves/fake-out.test.ts
index 404473c8fa0..44162cd8b99 100644
--- a/test/moves/fake_out.test.ts
+++ b/test/moves/fake-out.test.ts
@@ -1,4 +1,4 @@
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
diff --git a/test/moves/false_swipe.test.ts b/test/moves/false-swipe.test.ts
similarity index 96%
rename from test/moves/false_swipe.test.ts
rename to test/moves/false-swipe.test.ts
index d6743477cae..cb6220a6d3a 100644
--- a/test/moves/false_swipe.test.ts
+++ b/test/moves/false-swipe.test.ts
@@ -2,7 +2,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/fell_stinger.test.ts b/test/moves/fell-stinger.test.ts
similarity index 99%
rename from test/moves/fell_stinger.test.ts
rename to test/moves/fell-stinger.test.ts
index 11731d8a06f..3555b09dea7 100644
--- a/test/moves/fell_stinger.test.ts
+++ b/test/moves/fell-stinger.test.ts
@@ -1,6 +1,6 @@
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/fillet_away.test.ts b/test/moves/fillet-away.test.ts
similarity index 98%
rename from test/moves/fillet_away.test.ts
rename to test/moves/fillet-away.test.ts
index 477cdf76fc7..06e0dcb1b40 100644
--- a/test/moves/fillet_away.test.ts
+++ b/test/moves/fillet-away.test.ts
@@ -3,7 +3,7 @@ import { toDmgValue } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/moves/fissure.test.ts b/test/moves/fissure.test.ts
index be6be079cf0..8fdf54c7607 100644
--- a/test/moves/fissure.test.ts
+++ b/test/moves/fissure.test.ts
@@ -5,7 +5,7 @@ import { DamageAnimPhase } from "#app/phases/damage-anim-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/flame_burst.test.ts b/test/moves/flame-burst.test.ts
similarity index 98%
rename from test/moves/flame_burst.test.ts
rename to test/moves/flame-burst.test.ts
index fb92537a238..0cc3b26cede 100644
--- a/test/moves/flame_burst.test.ts
+++ b/test/moves/flame-burst.test.ts
@@ -4,7 +4,7 @@ import type Pokemon from "#app/field/pokemon";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/flower_shield.test.ts b/test/moves/flower-shield.test.ts
similarity index 98%
rename from test/moves/flower_shield.test.ts
rename to test/moves/flower-shield.test.ts
index 4840c6f018f..a5dc75b68fa 100644
--- a/test/moves/flower_shield.test.ts
+++ b/test/moves/flower-shield.test.ts
@@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/fly.test.ts b/test/moves/fly.test.ts
index f200e976704..0fd659cb205 100644
--- a/test/moves/fly.test.ts
+++ b/test/moves/fly.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
diff --git a/test/moves/focus_punch.test.ts b/test/moves/focus-punch.test.ts
similarity index 98%
rename from test/moves/focus_punch.test.ts
rename to test/moves/focus-punch.test.ts
index e05eb008af7..70d96dbb718 100644
--- a/test/moves/focus_punch.test.ts
+++ b/test/moves/focus-punch.test.ts
@@ -6,7 +6,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/test/moves/follow_me.test.ts b/test/moves/follow-me.test.ts
similarity index 98%
rename from test/moves/follow_me.test.ts
rename to test/moves/follow-me.test.ts
index 68c4f111bb1..e80ca78e094 100644
--- a/test/moves/follow_me.test.ts
+++ b/test/moves/follow-me.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#app/enums/abilities";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/moves/foresight.test.ts b/test/moves/foresight.test.ts
index d33a00bf136..a9823a1c4a4 100644
--- a/test/moves/foresight.test.ts
+++ b/test/moves/foresight.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/forests_curse.test.ts b/test/moves/forests-curse.test.ts
similarity index 96%
rename from test/moves/forests_curse.test.ts
rename to test/moves/forests-curse.test.ts
index f363fdbd19d..02a8599f39b 100644
--- a/test/moves/forests_curse.test.ts
+++ b/test/moves/forests-curse.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { PokemonType } from "#enums/pokemon-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/freeze_dry.test.ts b/test/moves/freeze-dry.test.ts
similarity index 99%
rename from test/moves/freeze_dry.test.ts
rename to test/moves/freeze-dry.test.ts
index 62168afb960..f1367229a31 100644
--- a/test/moves/freeze_dry.test.ts
+++ b/test/moves/freeze-dry.test.ts
@@ -4,7 +4,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { PokemonType } from "#enums/pokemon-type";
 import { Challenges } from "#enums/challenges";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/freezy_frost.test.ts b/test/moves/freezy-frost.test.ts
similarity index 98%
rename from test/moves/freezy_frost.test.ts
rename to test/moves/freezy-frost.test.ts
index 4eb3114a5ba..14753372753 100644
--- a/test/moves/freezy_frost.test.ts
+++ b/test/moves/freezy-frost.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { allMoves } from "#app/data/moves/move";
diff --git a/test/moves/fusion_bolt.test.ts b/test/moves/fusion-bolt.test.ts
similarity index 95%
rename from test/moves/fusion_bolt.test.ts
rename to test/moves/fusion-bolt.test.ts
index 33498a857a9..8074b497b44 100644
--- a/test/moves/fusion_bolt.test.ts
+++ b/test/moves/fusion-bolt.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/fusion_flare_bolt.test.ts b/test/moves/fusion-flare-bolt.test.ts
similarity index 99%
rename from test/moves/fusion_flare_bolt.test.ts
rename to test/moves/fusion-flare-bolt.test.ts
index ce6bb62d1d0..15e4c752815 100644
--- a/test/moves/fusion_flare_bolt.test.ts
+++ b/test/moves/fusion-flare-bolt.test.ts
@@ -8,7 +8,7 @@ import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { MovePhase } from "#app/phases/move-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/fusion_flare.test.ts b/test/moves/fusion-flare.test.ts
similarity index 96%
rename from test/moves/fusion_flare.test.ts
rename to test/moves/fusion-flare.test.ts
index 61bb126a75a..7826fc76105 100644
--- a/test/moves/fusion_flare.test.ts
+++ b/test/moves/fusion-flare.test.ts
@@ -2,7 +2,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/future_sight.test.ts b/test/moves/future-sight.test.ts
similarity index 95%
rename from test/moves/future_sight.test.ts
rename to test/moves/future-sight.test.ts
index 48be2451195..75635c05df8 100644
--- a/test/moves/future_sight.test.ts
+++ b/test/moves/future-sight.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/gastro_acid.test.ts b/test/moves/gastro-acid.test.ts
similarity index 97%
rename from test/moves/gastro_acid.test.ts
rename to test/moves/gastro-acid.test.ts
index 8247d29c0a0..d5086ec71c2 100644
--- a/test/moves/gastro_acid.test.ts
+++ b/test/moves/gastro-acid.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { MoveResult } from "#app/field/pokemon";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Moves - Gastro Acid", () => {
diff --git a/test/moves/geomancy.test.ts b/test/moves/geomancy.test.ts
index 51659f01b12..895f83f1513 100644
--- a/test/moves/geomancy.test.ts
+++ b/test/moves/geomancy.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/moves/gigaton_hammer.test.ts b/test/moves/gigaton-hammer.test.ts
similarity index 97%
rename from test/moves/gigaton_hammer.test.ts
rename to test/moves/gigaton-hammer.test.ts
index 6275e5d2dcb..cd1fc2df9be 100644
--- a/test/moves/gigaton_hammer.test.ts
+++ b/test/moves/gigaton-hammer.test.ts
@@ -1,5 +1,5 @@
 import { BattlerIndex } from "#app/battle";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
diff --git a/test/moves/glaive_rush.test.ts b/test/moves/glaive-rush.test.ts
similarity index 98%
rename from test/moves/glaive_rush.test.ts
rename to test/moves/glaive-rush.test.ts
index 3c2bcea7884..effd18c7aac 100644
--- a/test/moves/glaive_rush.test.ts
+++ b/test/moves/glaive-rush.test.ts
@@ -2,7 +2,7 @@ import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/growth.test.ts b/test/moves/growth.test.ts
index 37cd84638ba..66e33b4355e 100644
--- a/test/moves/growth.test.ts
+++ b/test/moves/growth.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
diff --git a/test/moves/grudge.test.ts b/test/moves/grudge.test.ts
index ecde5351d6d..a77aebb2473 100644
--- a/test/moves/grudge.test.ts
+++ b/test/moves/grudge.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { BattlerIndex } from "#app/battle";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/guard_split.test.ts b/test/moves/guard-split.test.ts
similarity index 97%
rename from test/moves/guard_split.test.ts
rename to test/moves/guard-split.test.ts
index d182e94b203..c33c17d2da0 100644
--- a/test/moves/guard_split.test.ts
+++ b/test/moves/guard-split.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/guard_swap.test.ts b/test/moves/guard-swap.test.ts
similarity index 97%
rename from test/moves/guard_swap.test.ts
rename to test/moves/guard-swap.test.ts
index 2076f92ccb1..45c70d99391 100644
--- a/test/moves/guard_swap.test.ts
+++ b/test/moves/guard-swap.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/hard_press.test.ts b/test/moves/hard-press.test.ts
similarity index 97%
rename from test/moves/hard_press.test.ts
rename to test/moves/hard-press.test.ts
index 8fe768cb8e4..04755bbf73b 100644
--- a/test/moves/hard_press.test.ts
+++ b/test/moves/hard-press.test.ts
@@ -3,7 +3,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import type Move from "#app/data/moves/move";
diff --git a/test/moves/haze.test.ts b/test/moves/haze.test.ts
index 4ddb6d1c7c5..54148e2b771 100644
--- a/test/moves/haze.test.ts
+++ b/test/moves/haze.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
diff --git a/test/moves/heal_bell.test.ts b/test/moves/heal-bell.test.ts
similarity index 98%
rename from test/moves/heal_bell.test.ts
rename to test/moves/heal-bell.test.ts
index 8ffb602c24f..5e306b18fca 100644
--- a/test/moves/heal_bell.test.ts
+++ b/test/moves/heal-bell.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/heal_block.test.ts b/test/moves/heal-block.test.ts
similarity index 98%
rename from test/moves/heal_block.test.ts
rename to test/moves/heal-block.test.ts
index 4ef67214a91..71e4b5637fd 100644
--- a/test/moves/heal_block.test.ts
+++ b/test/moves/heal-block.test.ts
@@ -1,6 +1,6 @@
 import { BattlerIndex } from "#app/battle";
 import { ArenaTagSide } from "#app/data/arena-tag";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
diff --git a/test/moves/heart_swap.test.ts b/test/moves/heart-swap.test.ts
similarity index 96%
rename from test/moves/heart_swap.test.ts
rename to test/moves/heart-swap.test.ts
index 009db731951..6ff088bdafb 100644
--- a/test/moves/heart_swap.test.ts
+++ b/test/moves/heart-swap.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/hyper_beam.test.ts b/test/moves/hyper-beam.test.ts
similarity index 97%
rename from test/moves/hyper_beam.test.ts
rename to test/moves/hyper-beam.test.ts
index 5b370f49e4c..1102cd8f33f 100644
--- a/test/moves/hyper_beam.test.ts
+++ b/test/moves/hyper-beam.test.ts
@@ -5,7 +5,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { BerryPhase } from "#app/phases/berry-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/imprison.test.ts b/test/moves/imprison.test.ts
index cefbaa52cad..25b7653f9bb 100644
--- a/test/moves/imprison.test.ts
+++ b/test/moves/imprison.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerTagType } from "#enums/battler-tag-type";
diff --git a/test/moves/instruct.test.ts b/test/moves/instruct.test.ts
index dd25db4ec90..c38a00f1da2 100644
--- a/test/moves/instruct.test.ts
+++ b/test/moves/instruct.test.ts
@@ -5,7 +5,7 @@ import type { MovePhase } from "#app/phases/move-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/jaw_lock.test.ts b/test/moves/jaw-lock.test.ts
similarity index 98%
rename from test/moves/jaw_lock.test.ts
rename to test/moves/jaw-lock.test.ts
index 71896dc3b62..7b6e88de8e6 100644
--- a/test/moves/jaw_lock.test.ts
+++ b/test/moves/jaw-lock.test.ts
@@ -5,7 +5,7 @@ import { BerryPhase } from "#app/phases/berry-phase";
 import { FaintPhase } from "#app/phases/faint-phase";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
diff --git a/test/moves/lash_out.test.ts b/test/moves/lash-out.test.ts
similarity index 96%
rename from test/moves/lash_out.test.ts
rename to test/moves/lash-out.test.ts
index c80a8ce348a..1f7557ab786 100644
--- a/test/moves/lash_out.test.ts
+++ b/test/moves/lash-out.test.ts
@@ -3,7 +3,7 @@ import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/last-resort.test.ts b/test/moves/last-resort.test.ts
index a7b462f3ca4..d94905e727e 100644
--- a/test/moves/last-resort.test.ts
+++ b/test/moves/last-resort.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/last_respects.test.ts b/test/moves/last-respects.test.ts
similarity index 99%
rename from test/moves/last_respects.test.ts
rename to test/moves/last-respects.test.ts
index a69ecb2e989..b7fa64cba98 100644
--- a/test/moves/last_respects.test.ts
+++ b/test/moves/last-respects.test.ts
@@ -2,7 +2,7 @@ import { Moves } from "#enums/moves";
 import { BattlerIndex } from "#app/battle";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { allMoves } from "#app/data/moves/move";
 import type Move from "#app/data/moves/move";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
diff --git a/test/moves/light_screen.test.ts b/test/moves/light-screen.test.ts
similarity index 98%
rename from test/moves/light_screen.test.ts
rename to test/moves/light-screen.test.ts
index cea26f29542..32e45c8a766 100644
--- a/test/moves/light_screen.test.ts
+++ b/test/moves/light-screen.test.ts
@@ -9,7 +9,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { NumberHolder } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/lucky_chant.test.ts b/test/moves/lucky-chant.test.ts
similarity index 98%
rename from test/moves/lucky_chant.test.ts
rename to test/moves/lucky-chant.test.ts
index e2a28a7bbe3..0fa7c408541 100644
--- a/test/moves/lucky_chant.test.ts
+++ b/test/moves/lucky-chant.test.ts
@@ -5,7 +5,7 @@ import { Species } from "#app/enums/species";
 import { BerryPhase } from "#app/phases/berry-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 
 describe("Moves - Lucky Chant", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/moves/lunar_blessing.test.ts b/test/moves/lunar-blessing.test.ts
similarity index 97%
rename from test/moves/lunar_blessing.test.ts
rename to test/moves/lunar-blessing.test.ts
index ee35107fccd..bb8847dea4c 100644
--- a/test/moves/lunar_blessing.test.ts
+++ b/test/moves/lunar-blessing.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/lunar_dance.test.ts b/test/moves/lunar-dance.test.ts
similarity index 98%
rename from test/moves/lunar_dance.test.ts
rename to test/moves/lunar-dance.test.ts
index 30abe765291..6acd2d8f35b 100644
--- a/test/moves/lunar_dance.test.ts
+++ b/test/moves/lunar-dance.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/moves/magic_coat.test.ts b/test/moves/magic-coat.test.ts
similarity index 99%
rename from test/moves/magic_coat.test.ts
rename to test/moves/magic-coat.test.ts
index 23deef97318..3a036179b16 100644
--- a/test/moves/magic_coat.test.ts
+++ b/test/moves/magic-coat.test.ts
@@ -9,7 +9,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Moves - Magic Coat", () => {
diff --git a/test/moves/magnet_rise.test.ts b/test/moves/magnet-rise.test.ts
similarity index 97%
rename from test/moves/magnet_rise.test.ts
rename to test/moves/magnet-rise.test.ts
index 62ad0c88091..003cecc63b8 100644
--- a/test/moves/magnet_rise.test.ts
+++ b/test/moves/magnet-rise.test.ts
@@ -2,7 +2,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/make_it_rain.test.ts b/test/moves/make-it-rain.test.ts
similarity index 98%
rename from test/moves/make_it_rain.test.ts
rename to test/moves/make-it-rain.test.ts
index 4d94537bcec..cf8d2919f07 100644
--- a/test/moves/make_it_rain.test.ts
+++ b/test/moves/make-it-rain.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
diff --git a/test/moves/mat_block.test.ts b/test/moves/mat-block.test.ts
similarity index 98%
rename from test/moves/mat_block.test.ts
rename to test/moves/mat-block.test.ts
index 9ed0f497af9..11ab76faa49 100644
--- a/test/moves/mat_block.test.ts
+++ b/test/moves/mat-block.test.ts
@@ -1,6 +1,6 @@
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/metal_burst.test.ts b/test/moves/metal-burst.test.ts
similarity index 97%
rename from test/moves/metal_burst.test.ts
rename to test/moves/metal-burst.test.ts
index 7fa5434dc58..96c52e36289 100644
--- a/test/moves/metal_burst.test.ts
+++ b/test/moves/metal-burst.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/metronome.test.ts b/test/moves/metronome.test.ts
index bf177fb1a93..fcf26829dee 100644
--- a/test/moves/metronome.test.ts
+++ b/test/moves/metronome.test.ts
@@ -5,7 +5,7 @@ import { Stat } from "#app/enums/stat";
 import { CommandPhase } from "#app/phases/command-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/miracle_eye.test.ts b/test/moves/miracle-eye.test.ts
similarity index 96%
rename from test/moves/miracle_eye.test.ts
rename to test/moves/miracle-eye.test.ts
index 2dbfb962540..faf9e628070 100644
--- a/test/moves/miracle_eye.test.ts
+++ b/test/moves/miracle-eye.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/mirror_move.test.ts b/test/moves/mirror-move.test.ts
similarity index 98%
rename from test/moves/mirror_move.test.ts
rename to test/moves/mirror-move.test.ts
index 438c594d839..93d7869c18f 100644
--- a/test/moves/mirror_move.test.ts
+++ b/test/moves/mirror-move.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/mist.test.ts b/test/moves/mist.test.ts
index 70cdf5b55a0..c28762f4b8f 100644
--- a/test/moves/mist.test.ts
+++ b/test/moves/mist.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/moongeist_beam.test.ts b/test/moves/moongeist-beam.test.ts
similarity index 97%
rename from test/moves/moongeist_beam.test.ts
rename to test/moves/moongeist-beam.test.ts
index 82a2567377b..36e5470bada 100644
--- a/test/moves/moongeist_beam.test.ts
+++ b/test/moves/moongeist-beam.test.ts
@@ -2,7 +2,7 @@ import { allMoves, RandomMoveAttr } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/multi_target.test.ts b/test/moves/multi-target.test.ts
similarity index 98%
rename from test/moves/multi_target.test.ts
rename to test/moves/multi-target.test.ts
index ad47d540a14..dbc711e3a2d 100644
--- a/test/moves/multi_target.test.ts
+++ b/test/moves/multi-target.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#app/enums/abilities";
 import { Species } from "#app/enums/species";
 import { toDmgValue } from "#app/utils/common";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/nightmare.test.ts b/test/moves/nightmare.test.ts
index 044856ae33d..1bb9cdf1dc9 100644
--- a/test/moves/nightmare.test.ts
+++ b/test/moves/nightmare.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/obstruct.test.ts b/test/moves/obstruct.test.ts
index f35a5964bcb..b096c434255 100644
--- a/test/moves/obstruct.test.ts
+++ b/test/moves/obstruct.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/octolock.test.ts b/test/moves/octolock.test.ts
index fb57d0bfad5..207df34c497 100644
--- a/test/moves/octolock.test.ts
+++ b/test/moves/octolock.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/order_up.test.ts b/test/moves/order-up.test.ts
similarity index 98%
rename from test/moves/order_up.test.ts
rename to test/moves/order-up.test.ts
index b5df5bfba41..52cb7d8dd69 100644
--- a/test/moves/order_up.test.ts
+++ b/test/moves/order-up.test.ts
@@ -6,7 +6,7 @@ import { Stat } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/parting_shot.test.ts b/test/moves/parting-shot.test.ts
similarity index 99%
rename from test/moves/parting_shot.test.ts
rename to test/moves/parting-shot.test.ts
index a65c1a5b3a5..4ab0298a4cc 100644
--- a/test/moves/parting_shot.test.ts
+++ b/test/moves/parting-shot.test.ts
@@ -3,7 +3,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, test } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Stat } from "#enums/stat";
 import { BerryPhase } from "#app/phases/berry-phase";
 import { FaintPhase } from "#app/phases/faint-phase";
diff --git a/test/moves/plasma_fists.test.ts b/test/moves/plasma-fists.test.ts
similarity index 98%
rename from test/moves/plasma_fists.test.ts
rename to test/moves/plasma-fists.test.ts
index b6a5ceaed68..4fdf0ef97ea 100644
--- a/test/moves/plasma_fists.test.ts
+++ b/test/moves/plasma-fists.test.ts
@@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/pledge_moves.test.ts b/test/moves/pledge-moves.test.ts
similarity index 99%
rename from test/moves/pledge_moves.test.ts
rename to test/moves/pledge-moves.test.ts
index 2bfd408e5fb..0bab1e178f7 100644
--- a/test/moves/pledge_moves.test.ts
+++ b/test/moves/pledge-moves.test.ts
@@ -9,7 +9,7 @@ import { toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/pollen_puff.test.ts b/test/moves/pollen-puff.test.ts
similarity index 97%
rename from test/moves/pollen_puff.test.ts
rename to test/moves/pollen-puff.test.ts
index 31d5950b47d..b026075a1a2 100644
--- a/test/moves/pollen_puff.test.ts
+++ b/test/moves/pollen-puff.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts
index 457beb60f91..ba170366c75 100644
--- a/test/moves/powder.test.ts
+++ b/test/moves/powder.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
diff --git a/test/moves/power_shift.test.ts b/test/moves/power-shift.test.ts
similarity index 97%
rename from test/moves/power_shift.test.ts
rename to test/moves/power-shift.test.ts
index 0fee044f5ad..5c35682a8cc 100644
--- a/test/moves/power_shift.test.ts
+++ b/test/moves/power-shift.test.ts
@@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/power_split.test.ts b/test/moves/power-split.test.ts
similarity index 97%
rename from test/moves/power_split.test.ts
rename to test/moves/power-split.test.ts
index f15275fce9e..cb0ad5586dc 100644
--- a/test/moves/power_split.test.ts
+++ b/test/moves/power-split.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/power_swap.test.ts b/test/moves/power-swap.test.ts
similarity index 97%
rename from test/moves/power_swap.test.ts
rename to test/moves/power-swap.test.ts
index 5f6aa022a51..ffc61faaab5 100644
--- a/test/moves/power_swap.test.ts
+++ b/test/moves/power-swap.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/power_trick.test.ts b/test/moves/power-trick.test.ts
similarity index 98%
rename from test/moves/power_trick.test.ts
rename to test/moves/power-trick.test.ts
index 181eeca81bc..da627494109 100644
--- a/test/moves/power_trick.test.ts
+++ b/test/moves/power-trick.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Moves } from "#enums/moves";
 import { Stat } from "#enums/stat";
 import { Species } from "#enums/species";
diff --git a/test/moves/protect.test.ts b/test/moves/protect.test.ts
index 183430f8654..7c117340a4e 100644
--- a/test/moves/protect.test.ts
+++ b/test/moves/protect.test.ts
@@ -1,6 +1,6 @@
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/psycho_shift.test.ts b/test/moves/psycho-shift.test.ts
similarity index 96%
rename from test/moves/psycho_shift.test.ts
rename to test/moves/psycho-shift.test.ts
index 678742906c7..9a471aa8a16 100644
--- a/test/moves/psycho_shift.test.ts
+++ b/test/moves/psycho-shift.test.ts
@@ -2,7 +2,7 @@ import { StatusEffect } from "#app/enums/status-effect";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/purify.test.ts b/test/moves/purify.test.ts
index 191539d8cec..aca39bf4dfd 100644
--- a/test/moves/purify.test.ts
+++ b/test/moves/purify.test.ts
@@ -5,7 +5,7 @@ import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/moves/quash.test.ts b/test/moves/quash.test.ts
index 5bf8271320b..8c97b922714 100644
--- a/test/moves/quash.test.ts
+++ b/test/moves/quash.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#app/enums/abilities";
 import { BattlerIndex } from "#app/battle";
 import { WeatherType } from "#enums/weather-type";
 import { MoveResult } from "#app/field/pokemon";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { describe, beforeAll, afterEach, beforeEach, it, expect } from "vitest";
 
diff --git a/test/moves/quick_guard.test.ts b/test/moves/quick-guard.test.ts
similarity index 98%
rename from test/moves/quick_guard.test.ts
rename to test/moves/quick-guard.test.ts
index d9970ce64fa..1f2c07e799a 100644
--- a/test/moves/quick_guard.test.ts
+++ b/test/moves/quick-guard.test.ts
@@ -1,6 +1,6 @@
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/rage_fist.test.ts b/test/moves/rage-fist.test.ts
similarity index 99%
rename from test/moves/rage_fist.test.ts
rename to test/moves/rage-fist.test.ts
index f215c5955c6..bb6586f8d26 100644
--- a/test/moves/rage_fist.test.ts
+++ b/test/moves/rage-fist.test.ts
@@ -4,7 +4,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { allMoves } from "#app/data/moves/move";
 import type Move from "#app/data/moves/move";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { BattleType } from "#enums/battle-type";
diff --git a/test/moves/rage_powder.test.ts b/test/moves/rage-powder.test.ts
similarity index 97%
rename from test/moves/rage_powder.test.ts
rename to test/moves/rage-powder.test.ts
index 284b558f842..9b2d52df9cb 100644
--- a/test/moves/rage_powder.test.ts
+++ b/test/moves/rage-powder.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/moves/reflect_type.test.ts b/test/moves/reflect-type.test.ts
similarity index 97%
rename from test/moves/reflect_type.test.ts
rename to test/moves/reflect-type.test.ts
index efd58bfeadf..e436a06fb67 100644
--- a/test/moves/reflect_type.test.ts
+++ b/test/moves/reflect-type.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { PokemonType } from "#enums/pokemon-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/reflect.test.ts b/test/moves/reflect.test.ts
index b8338cea8cf..ff7028ff055 100644
--- a/test/moves/reflect.test.ts
+++ b/test/moves/reflect.test.ts
@@ -9,7 +9,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { NumberHolder } from "#app/utils/common";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/relic_song.test.ts b/test/moves/relic-song.test.ts
similarity index 97%
rename from test/moves/relic_song.test.ts
rename to test/moves/relic-song.test.ts
index 86195e81a24..9f41fa8aa8a 100644
--- a/test/moves/relic_song.test.ts
+++ b/test/moves/relic-song.test.ts
@@ -3,7 +3,7 @@ import { Challenges } from "#app/enums/challenges";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/retaliate.test.ts b/test/moves/retaliate.test.ts
index 9ad7cd7853b..39b4223c90c 100644
--- a/test/moves/retaliate.test.ts
+++ b/test/moves/retaliate.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Moves } from "#enums/moves";
 import { allMoves } from "#app/data/moves/move";
diff --git a/test/moves/revival_blessing.test.ts b/test/moves/revival-blessing.test.ts
similarity index 98%
rename from test/moves/revival_blessing.test.ts
rename to test/moves/revival-blessing.test.ts
index b36cd43eb83..e7ea2508767 100644
--- a/test/moves/revival_blessing.test.ts
+++ b/test/moves/revival-blessing.test.ts
@@ -4,7 +4,7 @@ import { toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/role_play.test.ts b/test/moves/role-play.test.ts
similarity index 96%
rename from test/moves/role_play.test.ts
rename to test/moves/role-play.test.ts
index d4893212003..9650427be14 100644
--- a/test/moves/role_play.test.ts
+++ b/test/moves/role-play.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/rollout.test.ts b/test/moves/rollout.test.ts
index b477fd8274f..5feefde8ae1 100644
--- a/test/moves/rollout.test.ts
+++ b/test/moves/rollout.test.ts
@@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/roost.test.ts b/test/moves/roost.test.ts
index e55c76ca220..95384b61c4e 100644
--- a/test/moves/roost.test.ts
+++ b/test/moves/roost.test.ts
@@ -5,7 +5,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/moves/round.test.ts b/test/moves/round.test.ts
index a58efb730f8..2cda1c842b7 100644
--- a/test/moves/round.test.ts
+++ b/test/moves/round.test.ts
@@ -4,7 +4,7 @@ import type { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/safeguard.test.ts b/test/moves/safeguard.test.ts
index 7804b63f5c5..87840fb37b7 100644
--- a/test/moves/safeguard.test.ts
+++ b/test/moves/safeguard.test.ts
@@ -3,7 +3,7 @@ import { PostDefendContactApplyStatusEffectAbAttr } from "#app/data/abilities/ab
 import { allAbilities } from "#app/data/data-lists";
 import { Abilities } from "#app/enums/abilities";
 import { StatusEffect } from "#app/enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import Phaser from "phaser";
diff --git a/test/moves/scale_shot.test.ts b/test/moves/scale-shot.test.ts
similarity index 98%
rename from test/moves/scale_shot.test.ts
rename to test/moves/scale-shot.test.ts
index 4731ccf9574..092f670025d 100644
--- a/test/moves/scale_shot.test.ts
+++ b/test/moves/scale-shot.test.ts
@@ -8,7 +8,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/secret_power.test.ts b/test/moves/secret-power.test.ts
similarity index 98%
rename from test/moves/secret_power.test.ts
rename to test/moves/secret-power.test.ts
index cbc0cded28b..bff0b36dcf7 100644
--- a/test/moves/secret_power.test.ts
+++ b/test/moves/secret-power.test.ts
@@ -4,7 +4,7 @@ import { Moves } from "#enums/moves";
 import { Stat } from "#enums/stat";
 import { allMoves } from "#app/data/moves/move";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { StatusEffect } from "#enums/status-effect";
diff --git a/test/moves/shed_tail.test.ts b/test/moves/shed-tail.test.ts
similarity index 97%
rename from test/moves/shed_tail.test.ts
rename to test/moves/shed-tail.test.ts
index 845399f6c27..03074816ee6 100644
--- a/test/moves/shed_tail.test.ts
+++ b/test/moves/shed-tail.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/moves/shell_side_arm.test.ts b/test/moves/shell-side-arm.test.ts
similarity index 97%
rename from test/moves/shell_side_arm.test.ts
rename to test/moves/shell-side-arm.test.ts
index e43bf6db037..565df970f72 100644
--- a/test/moves/shell_side_arm.test.ts
+++ b/test/moves/shell-side-arm.test.ts
@@ -4,7 +4,7 @@ import type Move from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/shell_trap.test.ts b/test/moves/shell-trap.test.ts
similarity index 98%
rename from test/moves/shell_trap.test.ts
rename to test/moves/shell-trap.test.ts
index f6501c2cd9e..c22ca218ab9 100644
--- a/test/moves/shell_trap.test.ts
+++ b/test/moves/shell-trap.test.ts
@@ -6,7 +6,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { BerryPhase } from "#app/phases/berry-phase";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
 import { MovePhase } from "#app/phases/move-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/simple_beam.test.ts b/test/moves/simple-beam.test.ts
similarity index 95%
rename from test/moves/simple_beam.test.ts
rename to test/moves/simple-beam.test.ts
index 225fda28083..49c135c562a 100644
--- a/test/moves/simple_beam.test.ts
+++ b/test/moves/simple-beam.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/sketch.test.ts b/test/moves/sketch.test.ts
index c9755189a71..06329ff3a3c 100644
--- a/test/moves/sketch.test.ts
+++ b/test/moves/sketch.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { MoveResult, PokemonMove } from "#app/field/pokemon";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { StatusEffect } from "#app/enums/status-effect";
diff --git a/test/moves/skill_swap.test.ts b/test/moves/skill-swap.test.ts
similarity index 96%
rename from test/moves/skill_swap.test.ts
rename to test/moves/skill-swap.test.ts
index 562e4bb56ed..f6c3a36f255 100644
--- a/test/moves/skill_swap.test.ts
+++ b/test/moves/skill-swap.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/sleep_talk.test.ts b/test/moves/sleep-talk.test.ts
similarity index 97%
rename from test/moves/sleep_talk.test.ts
rename to test/moves/sleep-talk.test.ts
index cbe3b6d7d3a..86c63c4b484 100644
--- a/test/moves/sleep_talk.test.ts
+++ b/test/moves/sleep-talk.test.ts
@@ -4,7 +4,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/solar_beam.test.ts b/test/moves/solar-beam.test.ts
similarity index 98%
rename from test/moves/solar_beam.test.ts
rename to test/moves/solar-beam.test.ts
index 49605a70c66..00c3d422e7d 100644
--- a/test/moves/solar_beam.test.ts
+++ b/test/moves/solar-beam.test.ts
@@ -5,7 +5,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/sparkly_swirl.test.ts b/test/moves/sparkly-swirl.test.ts
similarity index 98%
rename from test/moves/sparkly_swirl.test.ts
rename to test/moves/sparkly-swirl.test.ts
index b9df302933c..a7ac35f24e8 100644
--- a/test/moves/sparkly_swirl.test.ts
+++ b/test/moves/sparkly-swirl.test.ts
@@ -4,7 +4,7 @@ import { CommandPhase } from "#app/phases/command-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/spectral_thief.test.ts b/test/moves/spectral-thief.test.ts
similarity index 99%
rename from test/moves/spectral_thief.test.ts
rename to test/moves/spectral-thief.test.ts
index 2654ab1ad8d..66d5af84dc2 100644
--- a/test/moves/spectral_thief.test.ts
+++ b/test/moves/spectral-thief.test.ts
@@ -5,7 +5,7 @@ import { allMoves } from "#app/data/moves/move";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/speed_swap.test.ts b/test/moves/speed-swap.test.ts
similarity index 96%
rename from test/moves/speed_swap.test.ts
rename to test/moves/speed-swap.test.ts
index 2b010885e34..ac6ff27b57d 100644
--- a/test/moves/speed_swap.test.ts
+++ b/test/moves/speed-swap.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/spikes.test.ts b/test/moves/spikes.test.ts
index 3dfa398d7d6..473e4e088f5 100644
--- a/test/moves/spikes.test.ts
+++ b/test/moves/spikes.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
diff --git a/test/moves/spit_up.test.ts b/test/moves/spit-up.test.ts
similarity index 99%
rename from test/moves/spit_up.test.ts
rename to test/moves/spit-up.test.ts
index c034117bc64..3a726caf09c 100644
--- a/test/moves/spit_up.test.ts
+++ b/test/moves/spit-up.test.ts
@@ -4,7 +4,7 @@ import { allMoves } from "#app/data/moves/move";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
 import type { TurnMove } from "#app/field/pokemon";
 import { MoveResult } from "#app/field/pokemon";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import type Move from "#app/data/moves/move";
diff --git a/test/moves/spotlight.test.ts b/test/moves/spotlight.test.ts
index 2c4f652e408..5c0284ff2b7 100644
--- a/test/moves/spotlight.test.ts
+++ b/test/moves/spotlight.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
diff --git a/test/moves/steamroller.test.ts b/test/moves/steamroller.test.ts
index b32b4551c81..eaa30881372 100644
--- a/test/moves/steamroller.test.ts
+++ b/test/moves/steamroller.test.ts
@@ -5,7 +5,7 @@ import type { DamageCalculationResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/stockpile.test.ts b/test/moves/stockpile.test.ts
index 4b8f51c32b2..23688c72a1b 100644
--- a/test/moves/stockpile.test.ts
+++ b/test/moves/stockpile.test.ts
@@ -7,7 +7,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/struggle.test.ts b/test/moves/struggle.test.ts
index 61c6cd23e10..d54617d607e 100644
--- a/test/moves/struggle.test.ts
+++ b/test/moves/struggle.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/substitute.test.ts b/test/moves/substitute.test.ts
index 7f4a2e69f9e..ac3fba5946a 100644
--- a/test/moves/substitute.test.ts
+++ b/test/moves/substitute.test.ts
@@ -4,7 +4,7 @@ import { SubstituteTag, TrappedTag } from "#app/data/battler-tags";
 import { allMoves, StealHeldItemChanceAttr } from "#app/data/moves/move";
 import { MoveResult } from "#app/field/pokemon";
 import type { CommandPhase } from "#app/phases/command-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Command } from "#app/ui/command-ui-handler";
 import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
diff --git a/test/moves/swallow.test.ts b/test/moves/swallow.test.ts
index d548522068b..19d25e9799a 100644
--- a/test/moves/swallow.test.ts
+++ b/test/moves/swallow.test.ts
@@ -8,7 +8,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/syrup_bomb.test.ts b/test/moves/syrup-bomb.test.ts
similarity index 98%
rename from test/moves/syrup_bomb.test.ts
rename to test/moves/syrup-bomb.test.ts
index 8e9134497d0..ee4f28cd39b 100644
--- a/test/moves/syrup_bomb.test.ts
+++ b/test/moves/syrup-bomb.test.ts
@@ -3,7 +3,7 @@ import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { BattlerIndex } from "#app/battle";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/test/moves/tackle.test.ts b/test/moves/tackle.test.ts
index 162836cd181..d2cf1cde7e9 100644
--- a/test/moves/tackle.test.ts
+++ b/test/moves/tackle.test.ts
@@ -3,7 +3,7 @@ import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/tail_whip.test.ts b/test/moves/tail-whip.test.ts
similarity index 96%
rename from test/moves/tail_whip.test.ts
rename to test/moves/tail-whip.test.ts
index 2d3ade2691d..474dc953154 100644
--- a/test/moves/tail_whip.test.ts
+++ b/test/moves/tail-whip.test.ts
@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
diff --git a/test/moves/tailwind.test.ts b/test/moves/tailwind.test.ts
index 40bae67b514..b1ab30c3c8d 100644
--- a/test/moves/tailwind.test.ts
+++ b/test/moves/tailwind.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/tar_shot.test.ts b/test/moves/tar_shot.test.ts
index 68f19e3ab51..e96b3815b3f 100644
--- a/test/moves/tar_shot.test.ts
+++ b/test/moves/tar_shot.test.ts
@@ -4,7 +4,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/taunt.test.ts b/test/moves/taunt.test.ts
index e0bb13c61fb..050c24989cc 100644
--- a/test/moves/taunt.test.ts
+++ b/test/moves/taunt.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { MoveResult } from "#app/field/pokemon";
diff --git a/test/moves/telekinesis.test.ts b/test/moves/telekinesis.test.ts
index d11cc0861f0..0a32738e84d 100644
--- a/test/moves/telekinesis.test.ts
+++ b/test/moves/telekinesis.test.ts
@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { MoveResult } from "#app/field/pokemon";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
diff --git a/test/moves/tera_blast.test.ts b/test/moves/tera-blast.test.ts
similarity index 99%
rename from test/moves/tera_blast.test.ts
rename to test/moves/tera-blast.test.ts
index efdb75e8156..fadd968884d 100644
--- a/test/moves/tera_blast.test.ts
+++ b/test/moves/tera-blast.test.ts
@@ -6,7 +6,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#app/enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/tera_starstorm.test.ts b/test/moves/tera-starstorm.test.ts
similarity index 98%
rename from test/moves/tera_starstorm.test.ts
rename to test/moves/tera-starstorm.test.ts
index 5ae0c575599..d01b105ce4d 100644
--- a/test/moves/tera_starstorm.test.ts
+++ b/test/moves/tera-starstorm.test.ts
@@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 
diff --git a/test/moves/thousand_arrows.test.ts b/test/moves/thousand-arrows.test.ts
similarity index 98%
rename from test/moves/thousand_arrows.test.ts
rename to test/moves/thousand-arrows.test.ts
index 7259fda8560..a81d6986a87 100644
--- a/test/moves/thousand_arrows.test.ts
+++ b/test/moves/thousand-arrows.test.ts
@@ -4,7 +4,7 @@ import { BerryPhase } from "#app/phases/berry-phase";
 import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/throat_chop.test.ts b/test/moves/throat-chop.test.ts
similarity index 96%
rename from test/moves/throat_chop.test.ts
rename to test/moves/throat-chop.test.ts
index aaae9c0f5bb..946682e952c 100644
--- a/test/moves/throat_chop.test.ts
+++ b/test/moves/throat-chop.test.ts
@@ -3,7 +3,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/moves/thunder_wave.test.ts b/test/moves/thunder-wave.test.ts
similarity index 98%
rename from test/moves/thunder_wave.test.ts
rename to test/moves/thunder-wave.test.ts
index abfb5828d3b..a02e012e765 100644
--- a/test/moves/thunder_wave.test.ts
+++ b/test/moves/thunder-wave.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/tidy_up.test.ts b/test/moves/tidy-up.test.ts
similarity index 98%
rename from test/moves/tidy_up.test.ts
rename to test/moves/tidy-up.test.ts
index ba7a1e07959..0b71919176f 100644
--- a/test/moves/tidy_up.test.ts
+++ b/test/moves/tidy-up.test.ts
@@ -5,7 +5,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { SubstituteTag } from "#app/data/battler-tags";
diff --git a/test/moves/torment.test.ts b/test/moves/torment.test.ts
index d06837d2806..c280acdf4c2 100644
--- a/test/moves/torment.test.ts
+++ b/test/moves/torment.test.ts
@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { MoveResult } from "#app/field/pokemon";
diff --git a/test/moves/toxic_spikes.test.ts b/test/moves/toxic-spikes.test.ts
similarity index 98%
rename from test/moves/toxic_spikes.test.ts
rename to test/moves/toxic-spikes.test.ts
index b1fdc7f39c2..7927d716f49 100644
--- a/test/moves/toxic_spikes.test.ts
+++ b/test/moves/toxic-spikes.test.ts
@@ -7,7 +7,7 @@ import { ArenaTagType } from "#enums/arena-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/toxic.test.ts b/test/moves/toxic.test.ts
index f908d27ec7e..d38720f34a3 100644
--- a/test/moves/toxic.test.ts
+++ b/test/moves/toxic.test.ts
@@ -1,6 +1,6 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { StatusEffect } from "#enums/status-effect";
diff --git a/test/moves/transform.test.ts b/test/moves/transform.test.ts
index 8bfe7df688b..4bbd55a2071 100644
--- a/test/moves/transform.test.ts
+++ b/test/moves/transform.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/trick_or_treat.test.ts b/test/moves/trick-or-treat.test.ts
similarity index 96%
rename from test/moves/trick_or_treat.test.ts
rename to test/moves/trick-or-treat.test.ts
index 3b32e09f72d..69c3106650f 100644
--- a/test/moves/trick_or_treat.test.ts
+++ b/test/moves/trick-or-treat.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { PokemonType } from "#enums/pokemon-type";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/triple_arrows.test.ts b/test/moves/triple-arrows.test.ts
similarity index 97%
rename from test/moves/triple_arrows.test.ts
rename to test/moves/triple-arrows.test.ts
index 58ce8a9c528..23033e6222a 100644
--- a/test/moves/triple_arrows.test.ts
+++ b/test/moves/triple-arrows.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import type Move from "#app/data/moves/move";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/u_turn.test.ts b/test/moves/u-turn.test.ts
similarity index 98%
rename from test/moves/u_turn.test.ts
rename to test/moves/u-turn.test.ts
index 4ceb6865be0..6d744cbf856 100644
--- a/test/moves/u_turn.test.ts
+++ b/test/moves/u-turn.test.ts
@@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/upper_hand.test.ts b/test/moves/upper-hand.test.ts
similarity index 98%
rename from test/moves/upper_hand.test.ts
rename to test/moves/upper-hand.test.ts
index 66359a94ccb..6600e7d7345 100644
--- a/test/moves/upper_hand.test.ts
+++ b/test/moves/upper-hand.test.ts
@@ -3,7 +3,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts
index 6b5133ec7b1..3f74873c509 100644
--- a/test/moves/whirlwind.test.ts
+++ b/test/moves/whirlwind.test.ts
@@ -5,7 +5,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { Status } from "#app/data/status-effect";
diff --git a/test/moves/wide_guard.test.ts b/test/moves/wide-guard.test.ts
similarity index 98%
rename from test/moves/wide_guard.test.ts
rename to test/moves/wide-guard.test.ts
index 85ebad806d7..7b419f9ce29 100644
--- a/test/moves/wide_guard.test.ts
+++ b/test/moves/wide-guard.test.ts
@@ -1,6 +1,6 @@
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
diff --git a/test/moves/will_o_wisp.test.ts b/test/moves/will-o-wisp.test.ts
similarity index 96%
rename from test/moves/will_o_wisp.test.ts
rename to test/moves/will-o-wisp.test.ts
index b4e4975896b..30103714ff6 100644
--- a/test/moves/will_o_wisp.test.ts
+++ b/test/moves/will-o-wisp.test.ts
@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/mystery-encounter/encounter-test-utils.ts b/test/mystery-encounter/encounter-test-utils.ts
index 977f40bc90e..852f30d4a40 100644
--- a/test/mystery-encounter/encounter-test-utils.ts
+++ b/test/mystery-encounter/encounter-test-utils.ts
@@ -18,7 +18,7 @@ import { UiMode } from "#enums/ui-mode";
 import { isNullOrUndefined } from "#app/utils/common";
 import { Button } from "#enums/buttons";
 import { StatusEffect } from "#enums/status-effect";
-import type GameManager from "#test/testUtils/gameManager";
+import type GameManager from "#test/test-utils/game-manager";
 import { expect, vi } from "vitest";
 
 /**
diff --git a/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
index a4c043ad13f..fed3d029c80 100644
--- a/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
+++ b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
@@ -3,7 +3,7 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
@@ -13,7 +13,7 @@ import {
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter";
 import { EggTier } from "#enums/egg-type";
 import { CommandPhase } from "#app/phases/command-phase";
diff --git a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
index 36a284880c1..c55ccf9521c 100644
--- a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
+++ b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
@@ -1,7 +1,7 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
diff --git a/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
index 3c7bda8febd..13c2db3a24a 100644
--- a/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
+++ b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
@@ -3,7 +3,7 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
@@ -12,7 +12,7 @@ import { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
 import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Moves } from "#enums/moves";
 import { ShinyRateBoosterModifier } from "#app/modifier/modifier";
diff --git a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
index 3f85b0b89d9..3d04201f3f6 100644
--- a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
+++ b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   runMysteryEncounterToEnd,
@@ -14,7 +14,7 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { BerryModifier } from "#app/modifier/modifier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { BerriesAboundEncounter } from "#app/data/mystery-encounters/encounters/berries-abound-encounter";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import * as EncounterDialogueUtils from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
diff --git a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
index 455a5d28194..b2db847d24f 100644
--- a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
+++ b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   runMysteryEncounterToEnd,
@@ -15,7 +15,7 @@ import { PokemonMove } from "#app/field/pokemon";
 import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { TrainerType } from "#enums/trainer-type";
 import { MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
 import { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier";
@@ -116,20 +116,14 @@ const POOL_3_POKEMON: { species: Species; formIndex?: number }[] = [
 
 const POOL_4_POKEMON = [Species.GENESECT, Species.SLITHER_WING, Species.BUZZWOLE, Species.PHEROMOSA];
 
-const PHYSICAL_TUTOR_MOVES = [
-  Moves.MEGAHORN,
-  Moves.ATTACK_ORDER,
-  Moves.BUG_BITE,
-  Moves.FIRST_IMPRESSION,
-  Moves.LUNGE
-];
+const PHYSICAL_TUTOR_MOVES = [Moves.MEGAHORN, Moves.ATTACK_ORDER, Moves.BUG_BITE, Moves.FIRST_IMPRESSION, Moves.LUNGE];
 
 const SPECIAL_TUTOR_MOVES = [
   Moves.SILVER_WIND,
   Moves.SIGNAL_BEAM,
   Moves.BUG_BUZZ,
   Moves.POLLEN_PUFF,
-  Moves.STRUGGLE_BUG
+  Moves.STRUGGLE_BUG,
 ];
 
 const STATUS_TUTOR_MOVES = [
@@ -137,16 +131,10 @@ const STATUS_TUTOR_MOVES = [
   Moves.DEFEND_ORDER,
   Moves.RAGE_POWDER,
   Moves.STICKY_WEB,
-  Moves.SILK_TRAP
+  Moves.SILK_TRAP,
 ];
 
-const MISC_TUTOR_MOVES = [
-  Moves.LEECH_LIFE,
-  Moves.U_TURN,
-  Moves.HEAL_ORDER,
-  Moves.QUIVER_DANCE,
-  Moves.INFESTATION,
-];
+const MISC_TUTOR_MOVES = [Moves.LEECH_LIFE, Moves.U_TURN, Moves.HEAL_ORDER, Moves.QUIVER_DANCE, Moves.INFESTATION];
 
 describe("Bug-Type Superfan - Mystery Encounter", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
index afc4a83e9bf..c4f4c8079f8 100644
--- a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
+++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import * as BattleAnims from "#app/data/battle-anims";
@@ -19,7 +19,7 @@ import { PokemonMove } from "#app/field/pokemon";
 import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { ClowningAroundEncounter } from "#app/data/mystery-encounters/encounters/clowning-around-encounter";
 import { TrainerType } from "#enums/trainer-type";
diff --git a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
index 873bed2f213..2754682e7ec 100644
--- a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
+++ b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
@@ -1,7 +1,7 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
diff --git a/test/mystery-encounter/encounters/delibirdy-encounter.test.ts b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
index 94faf070a39..e81715aca89 100644
--- a/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
+++ b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
@@ -1,7 +1,7 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
diff --git a/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
index 2488d12dad1..aea0414f23c 100644
--- a/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
+++ b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
diff --git a/test/mystery-encounter/encounters/field-trip-encounter.test.ts b/test/mystery-encounter/encounters/field-trip-encounter.test.ts
index 75a6fe77492..2c025edcf5a 100644
--- a/test/mystery-encounter/encounters/field-trip-encounter.test.ts
+++ b/test/mystery-encounter/encounters/field-trip-encounter.test.ts
@@ -1,7 +1,7 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
diff --git a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
index 3d311134d4e..94b0aa72126 100644
--- a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#enums/biome";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter";
 import { Gender } from "#app/data/gender";
@@ -22,7 +22,7 @@ import { Status } from "#app/data/status-effect";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MovePhase } from "#app/phases/move-phase";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
diff --git a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
index d47266268ee..8cda58393e1 100644
--- a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   runMysteryEncounterToEnd,
@@ -16,7 +16,7 @@ import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { FightOrFlightEncounter } from "#app/data/mystery-encounters/encounters/fight-or-flight-encounter";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
diff --git a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
index f8375c1aa78..96b35a2e122 100644
--- a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
@@ -3,7 +3,7 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   runMysteryEncounterToEnd,
@@ -13,7 +13,7 @@ import type BattleScene from "#app/battle-scene";
 import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { Nature } from "#enums/nature";
diff --git a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
index 576e99c4e18..676e714a9fe 100644
--- a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
+++ b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
@@ -1,7 +1,7 @@
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
diff --git a/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
index f23bc8738f2..bc598afbcbe 100644
--- a/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
+++ b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
@@ -5,12 +5,12 @@ import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "../encounter-test-utils";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { PartyExpPhase } from "#app/phases/party-exp-phase";
diff --git a/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
index 2c61d03b29d..f279a64b910 100644
--- a/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
+++ b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
@@ -3,7 +3,7 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   runMysteryEncounterToEnd,
@@ -13,12 +13,12 @@ import type BattleScene from "#app/battle-scene";
 import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { MysteriousChallengersEncounter } from "#app/data/mystery-encounters/encounters/mysterious-challengers-encounter";
 import { TrainerConfig } from "#app/data/trainers/trainer-config";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
diff --git a/test/mystery-encounter/encounters/part-timer-encounter.test.ts b/test/mystery-encounter/encounters/part-timer-encounter.test.ts
index 639a2e140ff..7ba3cbfab32 100644
--- a/test/mystery-encounter/encounters/part-timer-encounter.test.ts
+++ b/test/mystery-encounter/encounters/part-timer-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
diff --git a/test/mystery-encounter/encounters/safari-zone.test.ts b/test/mystery-encounter/encounters/safari-zone.test.ts
index 3506020aae4..01bce249415 100644
--- a/test/mystery-encounter/encounters/safari-zone.test.ts
+++ b/test/mystery-encounter/encounters/safari-zone.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#enums/biome";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   runMysteryEncounterToEnd,
@@ -11,7 +11,7 @@ import {
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import {
diff --git a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
index 4ff94c5a9bd..8355638631a 100644
--- a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
+++ b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
@@ -8,7 +8,7 @@ import { Species } from "#enums/species";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
@@ -18,7 +18,7 @@ import {
   runSelectMysteryEncounterOption,
   skipBattleRunMysteryEncounterRewardsPhase,
 } from "#test/mystery-encounter/encounter-test-utils";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import i18next from "i18next";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
index 9160126ffc3..cae476b97cc 100644
--- a/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
@@ -3,7 +3,7 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   runMysteryEncounterToEnd,
@@ -12,7 +12,7 @@ import {
 import type BattleScene from "#app/battle-scene";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
 import { CommandPhase } from "#app/phases/command-phase";
diff --git a/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
index 4adb8c6b076..10218ed1e60 100644
--- a/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
@@ -18,7 +18,7 @@ import {
 } from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
 import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups";
 
diff --git a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
index e3440aee9e0..0998ecbdf56 100644
--- a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#enums/biome";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import * as BattleAnims from "#app/data/battle-anims";
@@ -23,7 +23,7 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { BerryModifier, PokemonBaseStatTotalModifier } from "#app/modifier/modifier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MovePhase } from "#app/phases/move-phase";
diff --git a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
index 4cb712ce779..ac5c5daf9f2 100644
--- a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
@@ -3,14 +3,14 @@ import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-e
 import { Biome } from "#enums/biome";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
 import type BattleScene from "#app/battle-scene";
 import { UiMode } from "#enums/ui-mode";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
diff --git a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
index 2f910a9250f..0201f124388 100644
--- a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
+++ b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
@@ -29,8 +29,8 @@ import {
   runMysteryEncounterToEnd,
   skipBattleRunMysteryEncounterRewardsPhase,
 } from "#test/mystery-encounter/encounter-test-utils";
-import GameManager from "#test/testUtils/gameManager";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import GameManager from "#test/test-utils/game-manager";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/trashToTreasure";
diff --git a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
index 452dfcf3784..9bd92fc0247 100644
--- a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
+++ b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   runMysteryEncounterToEnd,
@@ -13,7 +13,7 @@ import type BattleScene from "#app/battle-scene";
 import { PokemonMove } from "#app/field/pokemon";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
diff --git a/test/mystery-encounter/encounters/weird-dream-encounter.test.ts b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
index f51ab45e4d4..a9df72460de 100644
--- a/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
+++ b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
@@ -2,7 +2,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount
 import { Biome } from "#app/enums/biome";
 import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
 import { Species } from "#app/enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
@@ -14,7 +14,7 @@ import { UiMode } from "#enums/ui-mode";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { WeirdDreamEncounter } from "#app/data/mystery-encounters/encounters/weird-dream-encounter";
 import * as EncounterTransformationSequence from "#app/data/mystery-encounters/utils/encounter-transformation-sequence";
 import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
diff --git a/test/mystery-encounter/mystery-encounter-utils.test.ts b/test/mystery-encounter/mystery-encounter-utils.test.ts
index 1c4a2cf89bd..5ed72cd63f0 100644
--- a/test/mystery-encounter/mystery-encounter-utils.test.ts
+++ b/test/mystery-encounter/mystery-encounter-utils.test.ts
@@ -17,10 +17,10 @@ import {
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { PokemonType } from "#enums/pokemon-type";
 import { MessagePhase } from "#app/phases/message-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/mystery-encounter/mystery-encounter.test.ts b/test/mystery-encounter/mystery-encounter.test.ts
index c9d31f28717..4e4c7a32292 100644
--- a/test/mystery-encounter/mystery-encounter.test.ts
+++ b/test/mystery-encounter/mystery-encounter.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeAll, beforeEach, expect, describe, it } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { Species } from "#enums/species";
 import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
diff --git a/test/phases/form-change-phase.test.ts b/test/phases/form-change-phase.test.ts
index 974c64d9e5a..2ec9f85d660 100644
--- a/test/phases/form-change-phase.test.ts
+++ b/test/phases/form-change-phase.test.ts
@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { PokemonType } from "#enums/pokemon-type";
diff --git a/test/phases/frenzy-move-reset.test.ts b/test/phases/frenzy-move-reset.test.ts
index 6d3ec767722..03ead8c3742 100644
--- a/test/phases/frenzy-move-reset.test.ts
+++ b/test/phases/frenzy-move-reset.test.ts
@@ -4,7 +4,7 @@ import { BattlerTagType } from "#enums/battler-tag-type";
 import { StatusEffect } from "#enums/status-effect";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 
diff --git a/test/phases/game-over-phase.test.ts b/test/phases/game-over-phase.test.ts
index 40473a022cb..9fda7f7a79d 100644
--- a/test/phases/game-over-phase.test.ts
+++ b/test/phases/game-over-phase.test.ts
@@ -2,7 +2,7 @@ import { Biome } from "#enums/biome";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { achvs } from "#app/system/achv";
diff --git a/test/phases/learn-move-phase.test.ts b/test/phases/learn-move-phase.test.ts
index 019b833d386..9c35afde3b2 100644
--- a/test/phases/learn-move-phase.test.ts
+++ b/test/phases/learn-move-phase.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { Species } from "#enums/species";
 import { Moves } from "#enums/moves";
 import { LearnMovePhase } from "#app/phases/learn-move-phase";
diff --git a/test/phases/mystery-encounter-phase.test.ts b/test/phases/mystery-encounter-phase.test.ts
index 34078b65039..d04b989c53d 100644
--- a/test/phases/mystery-encounter-phase.test.ts
+++ b/test/phases/mystery-encounter-phase.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeAll, beforeEach, expect, describe, it, vi } from "vitest";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { Species } from "#enums/species";
 import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
diff --git a/test/phases/phases.test.ts b/test/phases/phases.test.ts
index 2483cfb317f..a2a297448b2 100644
--- a/test/phases/phases.test.ts
+++ b/test/phases/phases.test.ts
@@ -3,7 +3,7 @@ import { LoginPhase } from "#app/phases/login-phase";
 import { TitlePhase } from "#app/phases/title-phase";
 import { UnavailablePhase } from "#app/phases/unavailable-phase";
 import { UiMode } from "#enums/ui-mode";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts
index 85f8b472c4a..5218a2b25ad 100644
--- a/test/phases/select-modifier-phase.test.ts
+++ b/test/phases/select-modifier-phase.test.ts
@@ -12,8 +12,8 @@ import { Abilities } from "#enums/abilities";
 import { Button } from "#enums/buttons";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
-import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
+import GameManager from "#test/test-utils/game-manager";
+import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/plugins/api/pokerogue-account-api.test.ts b/test/plugins/api/pokerogue-account-api.test.ts
index 3c37451960a..8e7bbb531e1 100644
--- a/test/plugins/api/pokerogue-account-api.test.ts
+++ b/test/plugins/api/pokerogue-account-api.test.ts
@@ -1,12 +1,12 @@
-import type { AccountInfoResponse } from "#app/@types/PokerogueAccountApi";
+import type { AccountInfoResponse } from "#app/@types/pokerogue-account-api";
 import { SESSION_ID_COOKIE_NAME } from "#app/constants";
 import { PokerogueAccountApi } from "#app/plugins/api/pokerogue-account-api";
-import { getApiBaseUrl } from "#test/testUtils/testUtils";
+import { getApiBaseUrl } from "#test/test-utils/test-utils";
 import * as CookieUtils from "#app/utils/cookies";
 import * as cookies from "#app/utils/cookies";
 import { http, HttpResponse } from "msw";
 import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import { initServerForApiTests } from "#test/test-utils/test-file-initialization";
 import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
diff --git a/test/plugins/api/pokerogue-admin-api.test.ts b/test/plugins/api/pokerogue-admin-api.test.ts
index 08c4cf0dc45..0fd6bc93fcd 100644
--- a/test/plugins/api/pokerogue-admin-api.test.ts
+++ b/test/plugins/api/pokerogue-admin-api.test.ts
@@ -5,12 +5,12 @@ import type {
   SearchAccountResponse,
   UnlinkAccountFromDiscordIdRequest,
   UnlinkAccountFromGoogledIdRequest,
-} from "#app/@types/PokerogueAdminApi";
+} from "#app/@types/pokerogue-admin-api";
 import { PokerogueAdminApi } from "#app/plugins/api/pokerogue-admin-api";
-import { getApiBaseUrl } from "#test/testUtils/testUtils";
+import { getApiBaseUrl } from "#test/test-utils/test-utils";
 import { http, HttpResponse } from "msw";
 import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import { initServerForApiTests } from "#test/test-utils/test-file-initialization";
 import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
diff --git a/test/plugins/api/pokerogue-api.test.ts b/test/plugins/api/pokerogue-api.test.ts
index c53a38e23ab..3921bbbd606 100644
--- a/test/plugins/api/pokerogue-api.test.ts
+++ b/test/plugins/api/pokerogue-api.test.ts
@@ -1,9 +1,9 @@
-import type { TitleStatsResponse } from "#app/@types/PokerogueApi";
+import type { TitleStatsResponse } from "#app/@types/pokerogue-api";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
-import { getApiBaseUrl } from "#test/testUtils/testUtils";
+import { getApiBaseUrl } from "#test/test-utils/test-utils";
 import { http, HttpResponse } from "msw";
 import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import { initServerForApiTests } from "#test/test-utils/test-file-initialization";
 import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
diff --git a/test/plugins/api/pokerogue-daily-api.test.ts b/test/plugins/api/pokerogue-daily-api.test.ts
index 563e6d09009..a60dbc01982 100644
--- a/test/plugins/api/pokerogue-daily-api.test.ts
+++ b/test/plugins/api/pokerogue-daily-api.test.ts
@@ -1,10 +1,10 @@
-import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/PokerogueDailyApi";
+import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/pokerogue-daily-api";
 import { PokerogueDailyApi } from "#app/plugins/api/pokerogue-daily-api";
-import { getApiBaseUrl } from "#test/testUtils/testUtils";
+import { getApiBaseUrl } from "#test/test-utils/test-utils";
 import { ScoreboardCategory, type RankingEntry } from "#app/ui/daily-run-scoreboard";
 import { http, HttpResponse } from "msw";
 import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import { initServerForApiTests } from "#test/test-utils/test-file-initialization";
 import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
diff --git a/test/plugins/api/pokerogue-savedata-api.test.ts b/test/plugins/api/pokerogue-savedata-api.test.ts
index 481ba62c19d..ac56c07839d 100644
--- a/test/plugins/api/pokerogue-savedata-api.test.ts
+++ b/test/plugins/api/pokerogue-savedata-api.test.ts
@@ -1,9 +1,9 @@
-import type { UpdateAllSavedataRequest } from "#app/@types/PokerogueSavedataApi";
+import type { UpdateAllSavedataRequest } from "#app/@types/pokerogue-save-data-api";
 import { PokerogueSavedataApi } from "#app/plugins/api/pokerogue-savedata-api";
-import { getApiBaseUrl } from "#test/testUtils/testUtils";
+import { getApiBaseUrl } from "#test/test-utils/test-utils";
 import { http, HttpResponse } from "msw";
 import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import { initServerForApiTests } from "#test/test-utils/test-file-initialization";
 import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
diff --git a/test/plugins/api/pokerogue-session-savedata-api.test.ts b/test/plugins/api/pokerogue-session-savedata-api.test.ts
index 4d4774f2283..d7d3458b0ed 100644
--- a/test/plugins/api/pokerogue-session-savedata-api.test.ts
+++ b/test/plugins/api/pokerogue-session-savedata-api.test.ts
@@ -5,13 +5,13 @@ import type {
   GetSessionSavedataRequest,
   NewClearSessionSavedataRequest,
   UpdateSessionSavedataRequest,
-} from "#app/@types/PokerogueSessionSavedataApi";
+} from "#app/@types/pokerogue-session-save-data-api";
 import { PokerogueSessionSavedataApi } from "#app/plugins/api/pokerogue-session-savedata-api";
 import type { SessionSaveData } from "#app/system/game-data";
-import { getApiBaseUrl } from "#test/testUtils/testUtils";
+import { getApiBaseUrl } from "#test/test-utils/test-utils";
 import { http, HttpResponse } from "msw";
 import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
+import { initServerForApiTests } from "#test/test-utils/test-file-initialization";
 import type { SetupServerApi } from "msw/node";
 
 const apiBase = getApiBaseUrl();
diff --git a/test/plugins/api/pokerogue-system-savedata-api.test.ts b/test/plugins/api/pokerogue-system-savedata-api.test.ts
index 0c69ab8f922..81bc65521a6 100644
--- a/test/plugins/api/pokerogue-system-savedata-api.test.ts
+++ b/test/plugins/api/pokerogue-system-savedata-api.test.ts
@@ -3,11 +3,11 @@ import type {
   UpdateSystemSavedataRequest,
   VerifySystemSavedataRequest,
   VerifySystemSavedataResponse,
-} from "#app/@types/PokerogueSystemSavedataApi";
+} from "#app/@types/pokerogue-system-save-data-api";
 import { PokerogueSystemSavedataApi } from "#app/plugins/api/pokerogue-system-savedata-api";
 import type { SystemSaveData } from "#app/system/game-data";
-import { initServerForApiTests } from "#test/testUtils/testFileInitialization";
-import { getApiBaseUrl } from "#test/testUtils/testUtils";
+import { initServerForApiTests } from "#test/test-utils/test-file-initialization";
+import { getApiBaseUrl } from "#test/test-utils/test-utils";
 import { http, HttpResponse } from "msw";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import type { SetupServerApi } from "msw/node";
diff --git a/test/reload.test.ts b/test/reload.test.ts
index 93823e06cce..0ba39a60ec7 100644
--- a/test/reload.test.ts
+++ b/test/reload.test.ts
@@ -6,8 +6,8 @@ import { Biome } from "#enums/biome";
 import { Button } from "#enums/buttons";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
-import type { MockClock } from "#test/testUtils/mocks/mockClock";
+import GameManager from "#test/test-utils/game-manager";
+import type { MockClock } from "#test/test-utils/mocks/mock-clock";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Reload", () => {
diff --git a/test/settingMenu/helpers/inGameManip.ts b/test/setting-menu/helpers/in-game-manip.ts
similarity index 98%
rename from test/settingMenu/helpers/inGameManip.ts
rename to test/setting-menu/helpers/in-game-manip.ts
index ca1fac3bc65..5fe7171006e 100644
--- a/test/settingMenu/helpers/inGameManip.ts
+++ b/test/setting-menu/helpers/in-game-manip.ts
@@ -1,4 +1,4 @@
-import { getIconForLatestInput, getSettingNameWithKeycode } from "#app/configs/inputs/configHandler";
+import { getIconForLatestInput, getSettingNameWithKeycode } from "#app/configs/inputs/config-handler";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { expect } from "vitest";
 
diff --git a/test/settingMenu/helpers/menuManip.ts b/test/setting-menu/helpers/menu-manip.ts
similarity index 98%
rename from test/settingMenu/helpers/menuManip.ts
rename to test/setting-menu/helpers/menu-manip.ts
index 1ddd842c864..c5720fcb5f1 100644
--- a/test/settingMenu/helpers/menuManip.ts
+++ b/test/setting-menu/helpers/menu-manip.ts
@@ -9,7 +9,7 @@ import {
   getKeyWithKeycode,
   getKeyWithSettingName,
   getSettingNameWithKeycode,
-} from "#app/configs/inputs/configHandler";
+} from "#app/configs/inputs/config-handler";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { expect } from "vitest";
 
diff --git a/test/settingMenu/rebinding_setting.test.ts b/test/setting-menu/rebinding-setting.test.ts
similarity index 99%
rename from test/settingMenu/rebinding_setting.test.ts
rename to test/setting-menu/rebinding-setting.test.ts
index 20a1fe51484..597d34e3b2a 100644
--- a/test/settingMenu/rebinding_setting.test.ts
+++ b/test/setting-menu/rebinding-setting.test.ts
@@ -1,12 +1,12 @@
-import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty";
-import { getKeyWithKeycode, getKeyWithSettingName } from "#app/configs/inputs/configHandler";
+import cfg_keyboard_qwerty from "#app/configs/inputs/cfg-keyboard-qwerty";
+import { getKeyWithKeycode, getKeyWithSettingName } from "#app/configs/inputs/config-handler";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
 import { deepCopy } from "#app/utils/data";
 import { Button } from "#enums/buttons";
 import { Device } from "#enums/devices";
-import { InGameManip } from "#test/settingMenu/helpers/inGameManip";
-import { MenuManip } from "#test/settingMenu/helpers/menuManip";
+import { InGameManip } from "#test/setting-menu/helpers/in-game-manip";
+import { MenuManip } from "#test/setting-menu/helpers/menu-manip";
 import { beforeEach, describe, expect, it } from "vitest";
 
 describe("Test Rebinding", () => {
diff --git a/test/sprites/pokemonSprite.test.ts b/test/sprites/pokemon-sprite.test.ts
similarity index 99%
rename from test/sprites/pokemonSprite.test.ts
rename to test/sprites/pokemon-sprite.test.ts
index a008b75b42e..248ad8c8df8 100644
--- a/test/sprites/pokemonSprite.test.ts
+++ b/test/sprites/pokemon-sprite.test.ts
@@ -1,4 +1,4 @@
-import { getAppRootDir } from "#test/sprites/spritesUtils";
+import { getAppRootDir } from "#test/sprites/sprites-utils";
 import fs from "fs";
 import path from "path";
 import { beforeAll, describe, expect, it } from "vitest";
diff --git a/test/sprites/spritesUtils.ts b/test/sprites/sprites-utils.ts
similarity index 100%
rename from test/sprites/spritesUtils.ts
rename to test/sprites/sprites-utils.ts
diff --git a/test/system/game_data.test.ts b/test/system/game-data.test.ts
similarity index 97%
rename from test/system/game_data.test.ts
rename to test/system/game-data.test.ts
index 900fb672320..772cde8a629 100644
--- a/test/system/game_data.test.ts
+++ b/test/system/game-data.test.ts
@@ -3,7 +3,7 @@ import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import type { SessionSaveData } from "#app/system/game-data";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import * as account from "#app/account";
diff --git a/test/testUtils/errorInterceptor.ts b/test/test-utils/error-interceptor.ts
similarity index 100%
rename from test/testUtils/errorInterceptor.ts
rename to test/test-utils/error-interceptor.ts
diff --git a/test/testUtils/fakeMobile.html b/test/test-utils/fake-mobile.html
similarity index 100%
rename from test/testUtils/fakeMobile.html
rename to test/test-utils/fake-mobile.html
diff --git a/test/testUtils/gameManagerUtils.ts b/test/test-utils/game-manager-utils.ts
similarity index 100%
rename from test/testUtils/gameManagerUtils.ts
rename to test/test-utils/game-manager-utils.ts
diff --git a/test/testUtils/gameManager.ts b/test/test-utils/game-manager.ts
similarity index 95%
rename from test/testUtils/gameManager.ts
rename to test/test-utils/game-manager.ts
index 8dd90decf1a..418841a081a 100644
--- a/test/testUtils/gameManager.ts
+++ b/test/test-utils/game-manager.ts
@@ -22,8 +22,8 @@ import { TitlePhase } from "#app/phases/title-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { TurnStartPhase } from "#app/phases/turn-start-phase";
-import ErrorInterceptor from "#test/testUtils/errorInterceptor";
-import type InputsHandler from "#test/testUtils/inputsHandler";
+import ErrorInterceptor from "#test/test-utils/error-interceptor";
+import type InputsHandler from "#test/test-utils/inputs-handler";
 import type BallUiHandler from "#app/ui/ball-ui-handler";
 import type BattleMessageUiHandler from "#app/ui/battle-message-ui-handler";
 import type CommandUiHandler from "#app/ui/command-ui-handler";
@@ -40,24 +40,24 @@ import type { Moves } from "#enums/moves";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PlayerGender } from "#enums/player-gender";
 import type { Species } from "#enums/species";
-import { generateStarter, waitUntil } from "#test/testUtils/gameManagerUtils";
-import GameWrapper from "#test/testUtils/gameWrapper";
-import { ChallengeModeHelper } from "#test/testUtils/helpers/challengeModeHelper";
-import { ClassicModeHelper } from "#test/testUtils/helpers/classicModeHelper";
-import { DailyModeHelper } from "#test/testUtils/helpers/dailyModeHelper";
-import { ModifierHelper } from "#test/testUtils/helpers/modifiersHelper";
-import { MoveHelper } from "#test/testUtils/helpers/moveHelper";
-import { OverridesHelper } from "#test/testUtils/helpers/overridesHelper";
-import { ReloadHelper } from "#test/testUtils/helpers/reloadHelper";
-import { SettingsHelper } from "#test/testUtils/helpers/settingsHelper";
-import PhaseInterceptor from "#test/testUtils/phaseInterceptor";
-import TextInterceptor from "#test/testUtils/TextInterceptor";
+import { generateStarter, waitUntil } from "#test/test-utils/game-manager-utils";
+import GameWrapper from "#test/test-utils/game-wrapper";
+import { ChallengeModeHelper } from "#test/test-utils/helpers/challenge-mode-helper";
+import { ClassicModeHelper } from "#test/test-utils/helpers/classic-mode-helper";
+import { DailyModeHelper } from "#test/test-utils/helpers/daily-mode-helper";
+import { ModifierHelper } from "#test/test-utils/helpers/modifiers-helper";
+import { MoveHelper } from "#test/test-utils/helpers/move-helper";
+import { OverridesHelper } from "#test/test-utils/helpers/overrides-helper";
+import { ReloadHelper } from "#test/test-utils/helpers/reload-helper";
+import { SettingsHelper } from "#test/test-utils/helpers/settings-helper";
+import PhaseInterceptor from "#test/test-utils/phase-interceptor";
+import TextInterceptor from "#test/test-utils/text-interceptor";
 import { AES, enc } from "crypto-js";
 import fs from "node:fs";
 import { expect, vi } from "vitest";
 import { globalScene } from "#app/global-scene";
 import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler";
-import { MockFetch } from "#test/testUtils/mocks/mockFetch";
+import { MockFetch } from "#test/test-utils/mocks/mock-fetch";
 
 /**
  * Class to manage the game state and transitions between phases.
@@ -541,8 +541,8 @@ export default class GameManager {
   }
 
   /**
-   * Select a pokemon from the party menu during the given phase. 
-   * Only really handles the basic case of "navigate to party slot and press Action twice" - 
+   * Select a pokemon from the party menu during the given phase.
+   * Only really handles the basic case of "navigate to party slot and press Action twice" -
    * any menus that come up afterwards are ignored and must be handled separately by the caller.
    * @param slot - The 0-indexed position of the pokemon in your party to switch to
    * @param inPhase - Which phase to expect the selection to occur in. Defaults to `SwitchPhase`
diff --git a/test/testUtils/gameWrapper.ts b/test/test-utils/game-wrapper.ts
similarity index 93%
rename from test/testUtils/gameWrapper.ts
rename to test/test-utils/game-wrapper.ts
index 9264b68d421..3b2ad32babb 100644
--- a/test/testUtils/gameWrapper.ts
+++ b/test/test-utils/game-wrapper.ts
@@ -4,17 +4,17 @@ import { MoveAnim } from "#app/data/battle-anims";
 import Pokemon from "#app/field/pokemon";
 import { sessionIdKey } from "#app/utils/common";
 import { setCookie } from "#app/utils/cookies";
-import { blobToString } from "#test/testUtils/gameManagerUtils";
-import { MockClock } from "#test/testUtils/mocks/mockClock";
-import { MockFetch } from "#test/testUtils/mocks/mockFetch";
-import MockLoader from "#test/testUtils/mocks/mockLoader";
-import MockTextureManager from "#test/testUtils/mocks/mockTextureManager";
+import { blobToString } from "#test/test-utils/game-manager-utils";
+import { MockClock } from "#test/test-utils/mocks/mock-clock";
+import { MockFetch } from "#test/test-utils/mocks/mock-fetch";
+import MockLoader from "#test/test-utils/mocks/mock-loader";
+import MockTextureManager from "#test/test-utils/mocks/mock-texture-manager";
 import fs from "node:fs";
 import Phaser from "phaser";
 import { vi } from "vitest";
 import { version } from "../../package.json";
-import { MockGameObjectCreator } from "./mocks/mockGameObjectCreator";
-import { MockTimedEventManager } from "./mocks/mockTimedEventManager";
+import { MockGameObjectCreator } from "./mocks/mock-game-object-creator";
+import { MockTimedEventManager } from "./mocks/mock-timed-event-manager";
 import InputManager = Phaser.Input.InputManager;
 import KeyboardManager = Phaser.Input.Keyboard.KeyboardManager;
 import KeyboardPlugin = Phaser.Input.Keyboard.KeyboardPlugin;
@@ -22,7 +22,7 @@ import GamepadPlugin = Phaser.Input.Gamepad.GamepadPlugin;
 import EventEmitter = Phaser.Events.EventEmitter;
 import UpdateList = Phaser.GameObjects.UpdateList;
 import { PokedexMonContainer } from "#app/ui/pokedex-mon-container";
-import MockContainer from "./mocks/mocksContainer/mockContainer";
+import MockContainer from "./mocks/mocks-container/mock-container";
 // biome-ignore lint/style/noNamespaceImport: Necessary in order to mock the var
 import * as bypassLoginModule from "#app/global-vars/bypass-login";
 
diff --git a/test/testUtils/helpers/challengeModeHelper.ts b/test/test-utils/helpers/challenge-mode-helper.ts
similarity index 96%
rename from test/testUtils/helpers/challengeModeHelper.ts
rename to test/test-utils/helpers/challenge-mode-helper.ts
index 3a4f2adcd09..88720516191 100644
--- a/test/testUtils/helpers/challengeModeHelper.ts
+++ b/test/test-utils/helpers/challenge-mode-helper.ts
@@ -4,8 +4,8 @@ import overrides from "#app/overrides";
 import { EncounterPhase } from "#app/phases/encounter-phase";
 import { SelectStarterPhase } from "#app/phases/select-starter-phase";
 import { UiMode } from "#enums/ui-mode";
-import { generateStarter } from "../gameManagerUtils";
-import { GameManagerHelper } from "./gameManagerHelper";
+import { generateStarter } from "../game-manager-utils";
+import { GameManagerHelper } from "./game-manager-helper";
 import type { Challenge } from "#app/data/challenge";
 import { CommandPhase } from "#app/phases/command-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
diff --git a/test/testUtils/helpers/classicModeHelper.ts b/test/test-utils/helpers/classic-mode-helper.ts
similarity index 95%
rename from test/testUtils/helpers/classicModeHelper.ts
rename to test/test-utils/helpers/classic-mode-helper.ts
index 8e1ac95c733..20795be3a8b 100644
--- a/test/testUtils/helpers/classicModeHelper.ts
+++ b/test/test-utils/helpers/classic-mode-helper.ts
@@ -7,8 +7,8 @@ import { EncounterPhase } from "#app/phases/encounter-phase";
 import { SelectStarterPhase } from "#app/phases/select-starter-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { UiMode } from "#enums/ui-mode";
-import { generateStarter } from "../gameManagerUtils";
-import { GameManagerHelper } from "./gameManagerHelper";
+import { generateStarter } from "../game-manager-utils";
+import { GameManagerHelper } from "./game-manager-helper";
 
 /**
  * Helper to handle classic mode specifics
diff --git a/test/testUtils/helpers/dailyModeHelper.ts b/test/test-utils/helpers/daily-mode-helper.ts
similarity index 97%
rename from test/testUtils/helpers/dailyModeHelper.ts
rename to test/test-utils/helpers/daily-mode-helper.ts
index 8ee03ce5f89..cbaee4d4a29 100644
--- a/test/testUtils/helpers/dailyModeHelper.ts
+++ b/test/test-utils/helpers/daily-mode-helper.ts
@@ -7,7 +7,7 @@ import { TitlePhase } from "#app/phases/title-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import type SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler";
 import { UiMode } from "#enums/ui-mode";
-import { GameManagerHelper } from "./gameManagerHelper";
+import { GameManagerHelper } from "./game-manager-helper";
 
 /**
  * Helper to handle daily mode specifics
diff --git a/test/testUtils/helpers/gameManagerHelper.ts b/test/test-utils/helpers/game-manager-helper.ts
similarity index 80%
rename from test/testUtils/helpers/gameManagerHelper.ts
rename to test/test-utils/helpers/game-manager-helper.ts
index 85d7bc0df97..c964a77b892 100644
--- a/test/testUtils/helpers/gameManagerHelper.ts
+++ b/test/test-utils/helpers/game-manager-helper.ts
@@ -1,4 +1,4 @@
-import type GameManager from "../gameManager";
+import type GameManager from "../game-manager";
 
 /**
  * Base class for defining all game helpers.
diff --git a/test/testUtils/helpers/modifiersHelper.ts b/test/test-utils/helpers/modifiers-helper.ts
similarity index 97%
rename from test/testUtils/helpers/modifiersHelper.ts
rename to test/test-utils/helpers/modifiers-helper.ts
index 22500c87906..6a525f2d145 100644
--- a/test/testUtils/helpers/modifiersHelper.ts
+++ b/test/test-utils/helpers/modifiers-helper.ts
@@ -1,5 +1,5 @@
 import { expect } from "vitest";
-import { GameManagerHelper } from "./gameManagerHelper";
+import { GameManagerHelper } from "./game-manager-helper";
 import type { ModifierTypeKeys } from "#app/modifier/modifier-type";
 import { itemPoolChecks } from "#app/modifier/modifier-type";
 
diff --git a/test/testUtils/helpers/moveHelper.ts b/test/test-utils/helpers/move-helper.ts
similarity index 98%
rename from test/testUtils/helpers/moveHelper.ts
rename to test/test-utils/helpers/move-helper.ts
index 269cf65ea56..2bf186dd09e 100644
--- a/test/testUtils/helpers/moveHelper.ts
+++ b/test/test-utils/helpers/move-helper.ts
@@ -9,8 +9,8 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { Command } from "#app/ui/command-ui-handler";
 import { UiMode } from "#enums/ui-mode";
 import { Moves } from "#enums/moves";
-import { getMovePosition } from "#test/testUtils/gameManagerUtils";
-import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper";
+import { getMovePosition } from "#test/test-utils/game-manager-utils";
+import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper";
 import { vi } from "vitest";
 
 /**
diff --git a/test/testUtils/helpers/overridesHelper.ts b/test/test-utils/helpers/overrides-helper.ts
similarity index 99%
rename from test/testUtils/helpers/overridesHelper.ts
rename to test/test-utils/helpers/overrides-helper.ts
index acc2e4d5cd0..a13cbdd8e2b 100644
--- a/test/testUtils/helpers/overridesHelper.ts
+++ b/test/test-utils/helpers/overrides-helper.ts
@@ -13,7 +13,7 @@ import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
 import type { WeatherType } from "#enums/weather-type";
 import { expect, vi } from "vitest";
-import { GameManagerHelper } from "./gameManagerHelper";
+import { GameManagerHelper } from "./game-manager-helper";
 import { shiftCharCodes } from "#app/utils/common";
 import type { RandomTrainerOverride } from "#app/overrides";
 import type { BattleType } from "#enums/battle-type";
diff --git a/test/testUtils/helpers/reloadHelper.ts b/test/test-utils/helpers/reload-helper.ts
similarity index 96%
rename from test/testUtils/helpers/reloadHelper.ts
rename to test/test-utils/helpers/reload-helper.ts
index 4a9e5356968..7902f35d4c4 100644
--- a/test/testUtils/helpers/reloadHelper.ts
+++ b/test/test-utils/helpers/reload-helper.ts
@@ -1,4 +1,4 @@
-import { GameManagerHelper } from "./gameManagerHelper";
+import { GameManagerHelper } from "./game-manager-helper";
 import { TitlePhase } from "#app/phases/title-phase";
 import { UiMode } from "#enums/ui-mode";
 import { vi } from "vitest";
@@ -6,7 +6,7 @@ import { BattleStyle } from "#app/enums/battle-style";
 import { CommandPhase } from "#app/phases/command-phase";
 import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import type { SessionSaveData } from "#app/system/game-data";
-import type GameManager from "../gameManager";
+import type GameManager from "../game-manager";
 
 /**
  * Helper to allow reloading sessions in unit tests.
diff --git a/test/testUtils/helpers/settingsHelper.ts b/test/test-utils/helpers/settings-helper.ts
similarity index 96%
rename from test/testUtils/helpers/settingsHelper.ts
rename to test/test-utils/helpers/settings-helper.ts
index d5a60e6496a..a87d216f374 100644
--- a/test/testUtils/helpers/settingsHelper.ts
+++ b/test/test-utils/helpers/settings-helper.ts
@@ -1,6 +1,6 @@
 import { PlayerGender } from "#app/enums/player-gender";
 import { BattleStyle } from "#app/enums/battle-style";
-import { GameManagerHelper } from "./gameManagerHelper";
+import { GameManagerHelper } from "./game-manager-helper";
 import { ExpGainsSpeed } from "#app/enums/exp-gains-speed";
 
 /**
diff --git a/test/testUtils/inputsHandler.ts b/test/test-utils/inputs-handler.ts
similarity index 93%
rename from test/testUtils/inputsHandler.ts
rename to test/test-utils/inputs-handler.ts
index 6e9dd453541..7a200aefc17 100644
--- a/test/testUtils/inputsHandler.ts
+++ b/test/test-utils/inputs-handler.ts
@@ -1,8 +1,8 @@
 import type BattleScene from "#app/battle-scene";
-import pad_xbox360 from "#app/configs/inputs/pad_xbox360";
+import pad_xbox360 from "#app/configs/inputs/pad-xbox360";
 import type { InputsController } from "#app/inputs-controller";
 import TouchControl from "#app/touch-controls";
-import { holdOn } from "#test/testUtils/gameManagerUtils";
+import { holdOn } from "#test/test-utils/game-manager-utils";
 import fs from "node:fs";
 import { JSDOM } from "jsdom";
 import Phaser from "phaser";
@@ -98,7 +98,7 @@ class Fakepad extends Phaser.Input.Gamepad.Gamepad {
 
 class FakeMobile {
   constructor() {
-    const fakeMobilePage = fs.readFileSync("././test/testUtils/fakeMobile.html", { encoding: "utf8", flag: "r" });
+    const fakeMobilePage = fs.readFileSync("././test/test-utils/fake-mobile.html", { encoding: "utf8", flag: "r" });
     const dom = new JSDOM(fakeMobilePage);
     Object.defineProperty(window, "document", {
       value: dom.window.document,
diff --git a/test/testUtils/listenersManager.ts b/test/test-utils/listeners-manager.ts
similarity index 100%
rename from test/testUtils/listenersManager.ts
rename to test/test-utils/listeners-manager.ts
diff --git a/test/testUtils/mocks/mockClock.ts b/test/test-utils/mocks/mock-clock.ts
similarity index 100%
rename from test/testUtils/mocks/mockClock.ts
rename to test/test-utils/mocks/mock-clock.ts
diff --git a/test/testUtils/mocks/mockConsoleLog.ts b/test/test-utils/mocks/mock-console-log.ts
similarity index 100%
rename from test/testUtils/mocks/mockConsoleLog.ts
rename to test/test-utils/mocks/mock-console-log.ts
diff --git a/test/testUtils/mocks/mockContextCanvas.ts b/test/test-utils/mocks/mock-context-canvas.ts
similarity index 100%
rename from test/testUtils/mocks/mockContextCanvas.ts
rename to test/test-utils/mocks/mock-context-canvas.ts
diff --git a/test/testUtils/mocks/mockFetch.ts b/test/test-utils/mocks/mock-fetch.ts
similarity index 100%
rename from test/testUtils/mocks/mockFetch.ts
rename to test/test-utils/mocks/mock-fetch.ts
diff --git a/test/testUtils/mocks/mockGameObjectCreator.ts b/test/test-utils/mocks/mock-game-object-creator.ts
similarity index 78%
rename from test/testUtils/mocks/mockGameObjectCreator.ts
rename to test/test-utils/mocks/mock-game-object-creator.ts
index caf98b79a9f..5df5faba549 100644
--- a/test/testUtils/mocks/mockGameObjectCreator.ts
+++ b/test/test-utils/mocks/mock-game-object-creator.ts
@@ -1,5 +1,5 @@
-import MockGraphics from "./mocksContainer/mockGraphics";
-import type MockTextureManager from "./mockTextureManager";
+import MockGraphics from "./mocks-container/mock-graphics";
+import type MockTextureManager from "./mock-texture-manager";
 
 export class MockGameObjectCreator {
   private readonly textureManager: MockTextureManager;
diff --git a/test/testUtils/mocks/mockGameObject.ts b/test/test-utils/mocks/mock-game-object.ts
similarity index 100%
rename from test/testUtils/mocks/mockGameObject.ts
rename to test/test-utils/mocks/mock-game-object.ts
diff --git a/test/testUtils/mocks/mockLoader.ts b/test/test-utils/mocks/mock-loader.ts
similarity index 100%
rename from test/testUtils/mocks/mockLoader.ts
rename to test/test-utils/mocks/mock-loader.ts
diff --git a/test/testUtils/mocks/mockLocalStorage.ts b/test/test-utils/mocks/mock-local-storage.ts
similarity index 100%
rename from test/testUtils/mocks/mockLocalStorage.ts
rename to test/test-utils/mocks/mock-local-storage.ts
diff --git a/test/testUtils/mocks/mockTextureManager.ts b/test/test-utils/mocks/mock-texture-manager.ts
similarity index 77%
rename from test/testUtils/mocks/mockTextureManager.ts
rename to test/test-utils/mocks/mock-texture-manager.ts
index 585ee0a674a..48ff8df4ff7 100644
--- a/test/testUtils/mocks/mockTextureManager.ts
+++ b/test/test-utils/mocks/mock-texture-manager.ts
@@ -1,13 +1,13 @@
-import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer";
-import { MockImage } from "#test/testUtils/mocks/mocksContainer/mockImage";
-import MockNineslice from "#test/testUtils/mocks/mocksContainer/mockNineslice";
-import MockPolygon from "#test/testUtils/mocks/mocksContainer/mockPolygon";
-import MockRectangle from "#test/testUtils/mocks/mocksContainer/mockRectangle";
-import MockSprite from "#test/testUtils/mocks/mocksContainer/mockSprite";
-import MockText from "#test/testUtils/mocks/mocksContainer/mockText";
-import MockTexture from "#test/testUtils/mocks/mocksContainer/mockTexture";
-import type { MockGameObject } from "./mockGameObject";
-import { MockVideoGameObject } from "./mockVideoGameObject";
+import MockContainer from "#test/test-utils/mocks/mocks-container/mock-container";
+import { MockImage } from "#test/test-utils/mocks/mocks-container/mock-image";
+import MockNineslice from "#test/test-utils/mocks/mocks-container/mock-nineslice";
+import MockPolygon from "#test/test-utils/mocks/mocks-container/mock-polygon";
+import MockRectangle from "#test/test-utils/mocks/mocks-container/mock-rectangle";
+import MockSprite from "#test/test-utils/mocks/mocks-container/mock-sprite";
+import MockText from "#test/test-utils/mocks/mocks-container/mock-text";
+import MockTexture from "#test/test-utils/mocks/mocks-container/mock-texture";
+import type { MockGameObject } from "./mock-game-object";
+import { MockVideoGameObject } from "./mock-video-game-object";
 
 /**
  * Stub class for Phaser.Textures.TextureManager
diff --git a/test/testUtils/mocks/mockTimedEventManager.ts b/test/test-utils/mocks/mock-timed-event-manager.ts
similarity index 100%
rename from test/testUtils/mocks/mockTimedEventManager.ts
rename to test/test-utils/mocks/mock-timed-event-manager.ts
diff --git a/test/testUtils/mocks/mockVideoGameObject.ts b/test/test-utils/mocks/mock-video-game-object.ts
similarity index 84%
rename from test/testUtils/mocks/mockVideoGameObject.ts
rename to test/test-utils/mocks/mock-video-game-object.ts
index 65a5c37b244..7fbff9edec5 100644
--- a/test/testUtils/mocks/mockVideoGameObject.ts
+++ b/test/test-utils/mocks/mock-video-game-object.ts
@@ -1,4 +1,4 @@
-import type { MockGameObject } from "./mockGameObject";
+import type { MockGameObject } from "./mock-game-object";
 
 /** Mocks video-related stuff */
 export class MockVideoGameObject implements MockGameObject {
diff --git a/test/testUtils/mocks/mocksContainer/mockContainer.ts b/test/test-utils/mocks/mocks-container/mock-container.ts
similarity index 96%
rename from test/testUtils/mocks/mocksContainer/mockContainer.ts
rename to test/test-utils/mocks/mocks-container/mock-container.ts
index 5e739fbe3cc..f29d405697d 100644
--- a/test/testUtils/mocks/mocksContainer/mockContainer.ts
+++ b/test/test-utils/mocks/mocks-container/mock-container.ts
@@ -1,5 +1,5 @@
-import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager";
-import type { MockGameObject } from "../mockGameObject";
+import type MockTextureManager from "#test/test-utils/mocks/mock-texture-manager";
+import type { MockGameObject } from "../mock-game-object";
 
 export default class MockContainer implements MockGameObject {
   protected x;
diff --git a/test/testUtils/mocks/mocksContainer/mockGraphics.ts b/test/test-utils/mocks/mocks-container/mock-graphics.ts
similarity index 96%
rename from test/testUtils/mocks/mocksContainer/mockGraphics.ts
rename to test/test-utils/mocks/mocks-container/mock-graphics.ts
index ebf84e935e3..d7bb93b30c2 100644
--- a/test/testUtils/mocks/mocksContainer/mockGraphics.ts
+++ b/test/test-utils/mocks/mocks-container/mock-graphics.ts
@@ -1,4 +1,4 @@
-import type { MockGameObject } from "../mockGameObject";
+import type { MockGameObject } from "../mock-game-object";
 
 export default class MockGraphics implements MockGameObject {
   private scene;
diff --git a/test/testUtils/mocks/mocksContainer/mockImage.ts b/test/test-utils/mocks/mocks-container/mock-image.ts
similarity index 68%
rename from test/testUtils/mocks/mocksContainer/mockImage.ts
rename to test/test-utils/mocks/mocks-container/mock-image.ts
index d20b4663771..78f0031fec6 100644
--- a/test/testUtils/mocks/mocksContainer/mockImage.ts
+++ b/test/test-utils/mocks/mocks-container/mock-image.ts
@@ -1,4 +1,4 @@
-import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer";
+import MockContainer from "#test/test-utils/mocks/mocks-container/mock-container";
 
 export class MockImage extends MockContainer {
   private texture;
diff --git a/test/testUtils/mocks/mocksContainer/mockNineslice.ts b/test/test-utils/mocks/mocks-container/mock-nineslice.ts
similarity index 86%
rename from test/testUtils/mocks/mocksContainer/mockNineslice.ts
rename to test/test-utils/mocks/mocks-container/mock-nineslice.ts
index 90c0e13e725..3456dd65c38 100644
--- a/test/testUtils/mocks/mocksContainer/mockNineslice.ts
+++ b/test/test-utils/mocks/mocks-container/mock-nineslice.ts
@@ -1,4 +1,4 @@
-import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer";
+import MockContainer from "#test/test-utils/mocks/mocks-container/mock-container";
 
 export default class MockNineslice extends MockContainer {
   private texture;
diff --git a/test/testUtils/mocks/mocksContainer/mockPolygon.ts b/test/test-utils/mocks/mocks-container/mock-polygon.ts
similarity index 67%
rename from test/testUtils/mocks/mocksContainer/mockPolygon.ts
rename to test/test-utils/mocks/mocks-container/mock-polygon.ts
index 4a7f3baec78..531b92c784c 100644
--- a/test/testUtils/mocks/mocksContainer/mockPolygon.ts
+++ b/test/test-utils/mocks/mocks-container/mock-polygon.ts
@@ -1,4 +1,4 @@
-import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer";
+import MockContainer from "#test/test-utils/mocks/mocks-container/mock-container";
 
 export default class MockPolygon extends MockContainer {
   constructor(textureManager, x, y, _content, _fillColor, _fillAlpha) {
diff --git a/test/testUtils/mocks/mocksContainer/mockRectangle.ts b/test/test-utils/mocks/mocks-container/mock-rectangle.ts
similarity index 96%
rename from test/testUtils/mocks/mocksContainer/mockRectangle.ts
rename to test/test-utils/mocks/mocks-container/mock-rectangle.ts
index 7bdf343759d..55246dd7b5f 100644
--- a/test/testUtils/mocks/mocksContainer/mockRectangle.ts
+++ b/test/test-utils/mocks/mocks-container/mock-rectangle.ts
@@ -1,4 +1,4 @@
-import type { MockGameObject } from "../mockGameObject";
+import type { MockGameObject } from "../mock-game-object";
 
 export default class MockRectangle implements MockGameObject {
   private fillColor;
diff --git a/test/testUtils/mocks/mocksContainer/mockSprite.ts b/test/test-utils/mocks/mocks-container/mock-sprite.ts
similarity index 98%
rename from test/testUtils/mocks/mocksContainer/mockSprite.ts
rename to test/test-utils/mocks/mocks-container/mock-sprite.ts
index dcc3588f127..794b1b8ca1c 100644
--- a/test/testUtils/mocks/mocksContainer/mockSprite.ts
+++ b/test/test-utils/mocks/mocks-container/mock-sprite.ts
@@ -1,5 +1,5 @@
 import Phaser from "phaser";
-import type { MockGameObject } from "../mockGameObject";
+import type { MockGameObject } from "../mock-game-object";
 import Sprite = Phaser.GameObjects.Sprite;
 import Frame = Phaser.Textures.Frame;
 
diff --git a/test/testUtils/mocks/mocksContainer/mockText.ts b/test/test-utils/mocks/mocks-container/mock-text.ts
similarity index 99%
rename from test/testUtils/mocks/mocksContainer/mockText.ts
rename to test/test-utils/mocks/mocks-container/mock-text.ts
index 1f3f0ad792f..81791ea9980 100644
--- a/test/testUtils/mocks/mocksContainer/mockText.ts
+++ b/test/test-utils/mocks/mocks-container/mock-text.ts
@@ -1,5 +1,5 @@
 import UI from "#app/ui/ui";
-import type { MockGameObject } from "../mockGameObject";
+import type { MockGameObject } from "../mock-game-object";
 
 export default class MockText implements MockGameObject {
   private phaserText;
diff --git a/test/testUtils/mocks/mocksContainer/mockTexture.ts b/test/test-utils/mocks/mocks-container/mock-texture.ts
similarity index 86%
rename from test/testUtils/mocks/mocksContainer/mockTexture.ts
rename to test/test-utils/mocks/mocks-container/mock-texture.ts
index eb8b70902fa..9cf7eef61f7 100644
--- a/test/testUtils/mocks/mocksContainer/mockTexture.ts
+++ b/test/test-utils/mocks/mocks-container/mock-texture.ts
@@ -1,5 +1,5 @@
-import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager";
-import type { MockGameObject } from "../mockGameObject";
+import type MockTextureManager from "#test/test-utils/mocks/mock-texture-manager";
+import type { MockGameObject } from "../mock-game-object";
 
 /**
  * Stub for Phaser.Textures.Texture object
diff --git a/test/testUtils/phaseInterceptor.ts b/test/test-utils/phase-interceptor.ts
similarity index 99%
rename from test/testUtils/phaseInterceptor.ts
rename to test/test-utils/phase-interceptor.ts
index b1d76ecd4a6..6f3ec346ad5 100644
--- a/test/testUtils/phaseInterceptor.ts
+++ b/test/test-utils/phase-interceptor.ts
@@ -1,5 +1,5 @@
 import { Phase } from "#app/phase";
-import ErrorInterceptor from "#test/testUtils/errorInterceptor";
+import ErrorInterceptor from "#test/test-utils/error-interceptor";
 import { AttemptRunPhase } from "#app/phases/attempt-run-phase";
 import { BattleEndPhase } from "#app/phases/battle-end-phase";
 import { BerryPhase } from "#app/phases/berry-phase";
diff --git a/test/testUtils/saves/data_new.prsv b/test/test-utils/saves/data-new.prsv
similarity index 100%
rename from test/testUtils/saves/data_new.prsv
rename to test/test-utils/saves/data-new.prsv
diff --git a/test/testUtils/saves/data_pokedex_tests_v2.prsv b/test/test-utils/saves/data-pokedex-tests-v2.prsv
similarity index 100%
rename from test/testUtils/saves/data_pokedex_tests_v2.prsv
rename to test/test-utils/saves/data-pokedex-tests-v2.prsv
diff --git a/test/testUtils/saves/data_pokedex_tests.prsv b/test/test-utils/saves/data-pokedex-tests.prsv
similarity index 100%
rename from test/testUtils/saves/data_pokedex_tests.prsv
rename to test/test-utils/saves/data-pokedex-tests.prsv
diff --git a/test/testUtils/saves/everything.prsv b/test/test-utils/saves/everything.prsv
similarity index 100%
rename from test/testUtils/saves/everything.prsv
rename to test/test-utils/saves/everything.prsv
diff --git a/test/testUtils/testFileInitialization.ts b/test/test-utils/test-file-initialization.ts
similarity index 90%
rename from test/testUtils/testFileInitialization.ts
rename to test/test-utils/test-file-initialization.ts
index 15635289e6f..b5c44bb9e58 100644
--- a/test/testUtils/testFileInitialization.ts
+++ b/test/test-utils/test-file-initialization.ts
@@ -12,15 +12,15 @@ import { initAchievements } from "#app/system/achv";
 import { initVouchers } from "#app/system/voucher";
 import { initStatsKeys } from "#app/ui/game-stats-ui-handler";
 import { setCookie } from "#app/utils/cookies";
-import { blobToString } from "#test/testUtils/gameManagerUtils";
-import { MockConsoleLog } from "#test/testUtils/mocks/mockConsoleLog";
-import { mockContext } from "#test/testUtils/mocks/mockContextCanvas";
-import { mockLocalStorage } from "#test/testUtils/mocks/mockLocalStorage";
-import { MockImage } from "#test/testUtils/mocks/mocksContainer/mockImage";
+import { blobToString } from "#test/test-utils/game-manager-utils";
+import { MockConsoleLog } from "#test/test-utils/mocks/mock-console-log";
+import { mockContext } from "#test/test-utils/mocks/mock-context-canvas";
+import { mockLocalStorage } from "#test/test-utils/mocks/mock-local-storage";
+import { MockImage } from "#test/test-utils/mocks/mocks-container/mock-image";
 import Phaser from "phaser";
 import InputText from "phaser3-rex-plugins/plugins/inputtext";
 import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
-import { manageListeners } from "./listenersManager";
+import { manageListeners } from "./listeners-manager";
 import { initI18n } from "#app/plugins/i18n";
 
 let wasInitialized = false;
diff --git a/test/testUtils/testUtils.ts b/test/test-utils/test-utils.ts
similarity index 100%
rename from test/testUtils/testUtils.ts
rename to test/test-utils/test-utils.ts
diff --git a/test/testUtils/TextInterceptor.ts b/test/test-utils/text-interceptor.ts
similarity index 100%
rename from test/testUtils/TextInterceptor.ts
rename to test/test-utils/text-interceptor.ts
diff --git a/test/ui/battle_info.test.ts b/test/ui/battle-info.test.ts
similarity index 96%
rename from test/ui/battle_info.test.ts
rename to test/ui/battle-info.test.ts
index c4548adc49c..bc3fe44e910 100644
--- a/test/ui/battle_info.test.ts
+++ b/test/ui/battle-info.test.ts
@@ -3,7 +3,7 @@ import { Species } from "#app/enums/species";
 import { ExpPhase } from "#app/phases/exp-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts
index ff5ca116ba8..422b598f2a8 100644
--- a/test/ui/pokedex.test.ts
+++ b/test/ui/pokedex.test.ts
@@ -1,4 +1,4 @@
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, type MockInstance, vi } from "vitest";
 import PokedexUiHandler from "#app/ui/pokedex-ui-handler";
@@ -197,7 +197,7 @@ describe("UI - Pokedex", () => {
    ***************************/
 
   it("should filter to show only the pokemon with an ability when filtering by ability", async () => {
-    // await game.importData("test/testUtils/saves/everything.prsv");
+    // await game.importData("test/test-utils/saves/everything.prsv");
     const pokedexHandler = await runToOpenPokedex();
 
     // Get name of overgrow
@@ -305,7 +305,7 @@ describe("UI - Pokedex", () => {
 
   it("filtering for unlockable cost reduction only shows species with sufficient candies", async () => {
     // load the save file
-    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests.prsv");
     const pokedexHandler = await runToOpenPokedex();
 
     // @ts-expect-error - `filterBar` is private
@@ -334,7 +334,7 @@ describe("UI - Pokedex", () => {
   });
 
   it("filtering by passive unlocked only shows species that have their passive", async () => {
-    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests.prsv");
     const pokedexHandler = await runToOpenPokedex();
 
     // @ts-expect-error - `filterBar` is private
@@ -351,7 +351,7 @@ describe("UI - Pokedex", () => {
   });
 
   it("filtering for pokemon that can unlock passive shows only species with sufficient candies", async () => {
-    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests.prsv");
     const pokedexHandler = await runToOpenPokedex();
 
     // @ts-expect-error - `filterBar` is private
@@ -379,7 +379,7 @@ describe("UI - Pokedex", () => {
   });
 
   it("filtering for pokemon that have any cost reduction shows only the species that have unlocked a cost reduction", async () => {
-    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests.prsv");
     const pokedexHandler = await runToOpenPokedex();
 
     const expectedPokemon = new Set([Species.TREECKO, Species.CYNDAQUIL, Species.TOTODILE]);
@@ -398,7 +398,7 @@ describe("UI - Pokedex", () => {
   });
 
   it("filtering for pokemon that have a single cost reduction shows only the species that have unlocked a single cost reduction", async () => {
-    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests.prsv");
     const pokedexHandler = await runToOpenPokedex();
 
     const expectedPokemon = new Set([Species.CYNDAQUIL, Species.TOTODILE]);
@@ -418,7 +418,7 @@ describe("UI - Pokedex", () => {
   });
 
   it("filtering for pokemon that have two cost reductions sorts only shows the species that have unlocked both cost reductions", async () => {
-    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests.prsv");
     const pokedexHandler = await runToOpenPokedex();
 
     // @ts-expect-error - `filterBar` is private
@@ -437,7 +437,7 @@ describe("UI - Pokedex", () => {
   });
 
   it("filtering by shiny status shows the caught pokemon with the selected shiny tier", async () => {
-    await game.importData("./test/testUtils/saves/data_pokedex_tests.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests.prsv");
     const pokedexHandler = await runToOpenPokedex();
     // @ts-expect-error - `filterBar` is private
     const filter = pokedexHandler.filterBar.getFilter(DropDownColumn.CAUGHT);
@@ -517,7 +517,7 @@ describe("UI - Pokedex", () => {
    ****************************/
 
   it("should show caught battle form as caught", async () => {
-    await game.importData("./test/testUtils/saves/data_pokedex_tests_v2.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests-v2.prsv");
     const pageHandler = await runToPokedexPage(getPokemonSpecies(Species.VENUSAUR), { form: 1 });
 
     // @ts-expect-error - `species` is private
@@ -532,7 +532,7 @@ describe("UI - Pokedex", () => {
 
   //TODO: check tint of the sprite
   it("should show uncaught battle form as seen", async () => {
-    await game.importData("./test/testUtils/saves/data_pokedex_tests_v2.prsv");
+    await game.importData("./test/test-utils/saves/data-pokedex-tests-v2.prsv");
     const pageHandler = await runToPokedexPage(getPokemonSpecies(Species.VENUSAUR), { form: 2 });
 
     // @ts-expect-error - `species` is private
diff --git a/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts
index b402e02e2d7..865c704e84b 100644
--- a/test/ui/starter-select.test.ts
+++ b/test/ui/starter-select.test.ts
@@ -13,7 +13,7 @@ import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
 import { Button } from "#enums/buttons";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@@ -37,7 +37,7 @@ describe("UI - Starter select", () => {
   });
 
   it("Bulbasaur - shiny - variant 2 male", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
@@ -97,7 +97,7 @@ describe("UI - Starter select", () => {
   }, 20000);
 
   it("Bulbasaur - shiny - variant 2 female hardy overgrow", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
@@ -159,7 +159,7 @@ describe("UI - Starter select", () => {
   }, 20000);
 
   it("Bulbasaur - shiny - variant 2 female lonely chlorophyl", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
@@ -224,7 +224,7 @@ describe("UI - Starter select", () => {
   }, 20000);
 
   it("Bulbasaur - shiny - variant 2 female", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
@@ -285,7 +285,7 @@ describe("UI - Starter select", () => {
   }, 20000);
 
   it("Bulbasaur - not shiny", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
@@ -345,7 +345,7 @@ describe("UI - Starter select", () => {
   }, 20000);
 
   it("Bulbasaur - shiny - variant 1", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
@@ -407,7 +407,7 @@ describe("UI - Starter select", () => {
   }, 20000);
 
   it("Bulbasaur - shiny - variant 0", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
@@ -468,7 +468,7 @@ describe("UI - Starter select", () => {
   }, 20000);
 
   it("Check if first pokemon in party is caterpie from gen 1 and 1rd row, 3rd column", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
@@ -532,7 +532,7 @@ describe("UI - Starter select", () => {
   }, 20000);
 
   it("Check if first pokemon in party is nidoran_m from gen 1 and 2nd row, 4th column (cursor (9+4)-1)", async () => {
-    await game.importData("./test/testUtils/saves/everything.prsv");
+    await game.importData("./test/test-utils/saves/everything.prsv");
     const caughtCount = Object.keys(game.scene.gameData.dexData).filter(key => {
       const species = game.scene.gameData.dexData[key];
       return species.caughtAttr !== 0n;
diff --git a/test/ui/transfer-item.test.ts b/test/ui/transfer-item.test.ts
index f0ea8f84005..46e2db74ad1 100644
--- a/test/ui/transfer-item.test.ts
+++ b/test/ui/transfer-item.test.ts
@@ -5,7 +5,7 @@ import { Species } from "#app/enums/species";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
 import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler";
 import { UiMode } from "#enums/ui-mode";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/test/ui/type-hints.test.ts b/test/ui/type-hints.test.ts
index 2051af76754..ecf8aa4a41d 100644
--- a/test/ui/type-hints.test.ts
+++ b/test/ui/type-hints.test.ts
@@ -4,10 +4,10 @@ import { Species } from "#app/enums/species";
 import { CommandPhase } from "#app/phases/command-phase";
 import FightUiHandler from "#app/ui/fight-ui-handler";
 import { UiMode } from "#enums/ui-mode";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import type MockText from "#test/testUtils/mocks/mocksContainer/mockText";
+import type MockText from "#test/test-utils/mocks/mocks-container/mock-text";
 import i18next from "i18next";
 
 describe("UI - Type Hints", () => {
diff --git a/test/vitest.setup.ts b/test/vitest.setup.ts
index 93b439e540f..0662e7dcb6a 100644
--- a/test/vitest.setup.ts
+++ b/test/vitest.setup.ts
@@ -1,7 +1,7 @@
 import "vitest-canvas-mock";
 import { afterAll, beforeAll, vi } from "vitest";
 
-import { initTestFile } from "./testUtils/testFileInitialization";
+import { initTestFile } from "./test-utils/test-file-initialization";
 
 /** Set the timezone to UTC for tests. */