diff --git a/src/data/trainer-type.ts b/src/data/trainer-type.ts
index 155ef866da6..333b9faeaae 100644
--- a/src/data/trainer-type.ts
+++ b/src/data/trainer-type.ts
@@ -642,7 +642,7 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.NURSE]: new TrainerConfig(++t).setMoneyMultiplier(1.8).setEncounterBgm('lass').setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.CHARM) || !!s.getLevelMoves().find(plm => plm[1] === Moves.HEAL_PULSE)),
   [TrainerType.NURSERY_AIDE]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm('lass'),
   [TrainerType.OFFICER]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.CLERK)
-    .setPartyTemplates(trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, )
+    .setPartyTemplates(trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG)
     .setSpeciesPools({ 
       [TrainerPoolTier.COMMON]: [ Species.VULPIX, Species.GROWLITHE, Species.SNUBBULL, Species.POOCHYENA, Species.ELECTRIKE, Species.LILLIPUP, Species.YAMPER /* , Species.FIDOUGH */ ],
       [TrainerPoolTier.UNCOMMON]: [ Species.HOUNDOUR, Species.ROCKRUFF /*, Species.MASCHIFF */ ],
diff --git a/src/ui/abstact-option-select-ui-handler.ts b/src/ui/abstact-option-select-ui-handler.ts
index 1486351d543..88ae5953d8f 100644
--- a/src/ui/abstact-option-select-ui-handler.ts
+++ b/src/ui/abstact-option-select-ui-handler.ts
@@ -1,7 +1,7 @@
 import BattleScene, { Button } from "../battle-scene";
 import { TextStyle, addTextObject } from "./text";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 
 export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
   protected handlers: Function[];
diff --git a/src/ui/awaitable-ui-handler.ts b/src/ui/awaitable-ui-handler.ts
index afcfc406e5d..079aca554aa 100644
--- a/src/ui/awaitable-ui-handler.ts
+++ b/src/ui/awaitable-ui-handler.ts
@@ -1,6 +1,6 @@
 import BattleScene from "../battle-scene";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 
 export default abstract class AwaitableUiHandler extends UiHandler {
   protected awaitingActionInput: boolean;
diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts
index 0cf5a3cbc33..2e0f8cd8fb8 100644
--- a/src/ui/ball-ui-handler.ts
+++ b/src/ui/ball-ui-handler.ts
@@ -4,7 +4,7 @@ import { getPokeballName, PokeballType } from "../data/pokeball";
 import { addTextObject, TextStyle } from "./text";
 import { Command } from "./command-ui-handler";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 
 export default class BallUiHandler extends UiHandler {
   private pokeballSelectContainer: Phaser.GameObjects.Container;
diff --git a/src/ui/biome-select-ui-handler.ts b/src/ui/biome-select-ui-handler.ts
index 2d729d4e989..752307b93e8 100644
--- a/src/ui/biome-select-ui-handler.ts
+++ b/src/ui/biome-select-ui-handler.ts
@@ -2,7 +2,7 @@ import BattleScene, { Button } from "../battle-scene";
 import { Biome, biomeLinks, getBiomeName } from "../data/biome";
 import { addTextObject, TextStyle } from "./text";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 import * as Utils from "../utils";
 
 export default class BiomeSelectUiHandler extends UiHandler {
diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts
index 8bbe16d2148..2294fdfbf72 100644
--- a/src/ui/command-ui-handler.ts
+++ b/src/ui/command-ui-handler.ts
@@ -3,7 +3,7 @@ import BattleScene, { Button } from "../battle-scene";
 import { addTextObject, TextStyle } from "./text";
 import PartyUiHandler, { PartyUiMode } from "./party-ui-handler";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 
 export enum Command {
   FIGHT = 0,
diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/egg-hatch-scene-handler.ts
index 8d050637a81..db282b3ddb4 100644
--- a/src/ui/egg-hatch-scene-handler.ts
+++ b/src/ui/egg-hatch-scene-handler.ts
@@ -1,6 +1,6 @@
 import BattleScene, { Button } from "../battle-scene";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 
 export default class EggHatchSceneHandler extends UiHandler {
   public eggHatchContainer: Phaser.GameObjects.Container;
diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/evolution-scene-handler.ts
index f1f976e4932..e139f4e9437 100644
--- a/src/ui/evolution-scene-handler.ts
+++ b/src/ui/evolution-scene-handler.ts
@@ -1,6 +1,6 @@
 import BattleScene, { Button } from "../battle-scene";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 
 export default class EvolutionSceneHandler extends UiHandler {
     public evolutionContainer: Phaser.GameObjects.Container;
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index fed53fb2bb5..3ae3360ec7c 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -3,7 +3,7 @@ import { addTextObject, TextStyle } from "./text";
 import { Type } from "../data/type";
 import { Command } from "./command-ui-handler";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 import * as Utils from "../utils";
 import { CommandPhase } from "../battle-phases";
 
diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index f6282e849f8..1dc3aecaf63 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -1,7 +1,7 @@
 import BattleScene, { Button } from "../battle-scene";
 import { TextStyle, addTextObject } from "./text";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 import * as Utils from "../utils";
 
 export enum MenuOptions {
diff --git a/src/ui/settings-ui-handler.ts b/src/ui/settings-ui-handler.ts
index a2d608fe86d..b75736c657d 100644
--- a/src/ui/settings-ui-handler.ts
+++ b/src/ui/settings-ui-handler.ts
@@ -2,7 +2,7 @@ import BattleScene, { Button } from "../battle-scene";
 import { Setting, settingDefaults, settingOptions } from "../system/settings";
 import { TextStyle, addTextObject, getTextColor } from "./text";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 
 export default class SettingsUiHandler extends UiHandler {
   private settingsContainer: Phaser.GameObjects.Container;
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index f949b08bb9c..0a7e067811d 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -1,6 +1,6 @@
 import BattleScene, { Button } from "../battle-scene";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 import * as Utils from "../utils";
 import { PlayerPokemon } from "../pokemon";
 import { Type } from "../data/type";
diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/target-select-ui-handler.ts
index 9ae6c0139fc..9a1b9436692 100644
--- a/src/ui/target-select-ui-handler.ts
+++ b/src/ui/target-select-ui-handler.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "../battle";
 import BattleScene, { Button } from "../battle-scene";
 import { Moves, getMoveTargets } from "../data/move";
 import { Mode } from "./ui";
-import UiHandler from "./uiHandler";
+import UiHandler from "./ui-handler";
 import * as Utils from "../utils";
 
 export type TargetSelectCallback = (cursor: integer) => void;
diff --git a/src/ui/uiHandler.ts b/src/ui/ui-handler.ts
similarity index 100%
rename from src/ui/uiHandler.ts
rename to src/ui/ui-handler.ts
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index 0d36bdba138..110189f5a79 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -1,5 +1,5 @@
 import { Button, default as BattleScene } from '../battle-scene';
-import UiHandler from './uiHandler';
+import UiHandler from './ui-handler';
 import BattleMessageUiHandler from './battle-message-ui-handler';
 import CommandUiHandler from './command-ui-handler';
 import PartyUiHandler from './party-ui-handler';