diff --git a/src/App.vue b/src/App.vue
index 76bb080..c2c3a83 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import Notifications from '@/components/utilities/Notifications.vue'
 import Login from '@/screens/Login.vue'
 // import Register from '@/screens/Register.vue'
diff --git a/src/components/gameMaster/GmPanel.vue b/src/components/gameMaster/GmPanel.vue
index cf5c9db..f7f9b93 100644
--- a/src/components/gameMaster/GmPanel.vue
+++ b/src/components/gameMaster/GmPanel.vue
@@ -21,7 +21,7 @@
 import { ref } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
 import AssetManager from '@/components/gameMaster/assetManager/AssetManager.vue'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
 
diff --git a/src/components/gameMaster/GmTools.vue b/src/components/gameMaster/GmTools.vue
index f746809..01f62d8 100644
--- a/src/components/gameMaster/GmTools.vue
+++ b/src/components/gameMaster/GmTools.vue
@@ -13,8 +13,8 @@
 </template>
 <script setup lang="ts">
 import Modal from '@/components/utilities/Modal.vue'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
-import { useGameStore } from '@/stores/game'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref } from 'vue'
 
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/assetManager/AssetManager.vue b/src/components/gameMaster/assetManager/AssetManager.vue
index 9d2d083..ef692f5 100644
--- a/src/components/gameMaster/assetManager/AssetManager.vue
+++ b/src/components/gameMaster/assetManager/AssetManager.vue
@@ -57,7 +57,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManager'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import TileList from '@/components/gameMaster/assetManager/partials/tile/TileList.vue'
 import TileDetails from '@/components/gameMaster/assetManager/partials/tile/TileDetails.vue'
 import ObjectList from '@/components/gameMaster/assetManager/partials/object/ObjectList.vue'
diff --git a/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue b/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
index 5dc9011..a6dbede 100644
--- a/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
@@ -52,9 +52,9 @@
 <script setup lang="ts">
 import type { Object } from '@/types'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManager'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
-import { useGameStore } from '@/stores/game'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { useGameStore } from '@/stores/gameStore'
 import config from '@/config'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
 
diff --git a/src/components/gameMaster/assetManager/partials/object/ObjectList.vue b/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
index 279c1e9..b02b5b2 100644
--- a/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
+++ b/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
@@ -29,9 +29,9 @@
 
 <script setup lang="ts">
 import config from '@/config'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManager'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import type { Object } from '@/types'
 import { useVirtualList } from '@vueuse/core'
 
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
index 71129b6..a22758d 100644
--- a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
@@ -67,8 +67,8 @@
 <script setup lang="ts">
 import type { Sprite, SpriteAction } from '@/types'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManager'
-import { useGameStore } from '@/stores/game'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import Accordion from '@/components/utilities/Accordion.vue'
 import SpriteActionsInput from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
 import { uuidv4 } from '@/utilities'
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
index c27d2cd..1be0214 100644
--- a/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
+++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
@@ -25,9 +25,9 @@
 
 <script setup lang="ts">
 import config from '@/config'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManager'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useVirtualList } from '@vueuse/core'
 import type { Sprite } from '@/types'
 
diff --git a/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue b/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
index d9ce974..91fc1ba 100644
--- a/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
@@ -25,9 +25,9 @@
 <script setup lang="ts">
 import type { Tile } from '@/types'
 import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManager'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
-import { useGameStore } from '@/stores/game'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { useGameStore } from '@/stores/gameStore'
 import config from '@/config'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
 
diff --git a/src/components/gameMaster/assetManager/partials/tile/TileList.vue b/src/components/gameMaster/assetManager/partials/tile/TileList.vue
index e6f842e..8ee8d7b 100644
--- a/src/components/gameMaster/assetManager/partials/tile/TileList.vue
+++ b/src/components/gameMaster/assetManager/partials/tile/TileList.vue
@@ -29,9 +29,9 @@
 
 <script setup lang="ts">
 import config from '@/config'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManager'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import type { Tile } from '@/types'
 import { useVirtualList } from '@vueuse/core'
 
diff --git a/src/components/gameMaster/zoneEditor/ZoneEditor.vue b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
index 83eb019..d1d24f5 100644
--- a/src/components/gameMaster/zoneEditor/ZoneEditor.vue
+++ b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
@@ -27,8 +27,8 @@
 import { computed, onBeforeMount, onMounted, onUnmounted, ref, watch } from 'vue'
 import { Container, Image, useScene } from 'phavuer'
 import { storeToRefs } from 'pinia'
-import { useGameStore } from '@/stores/game'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import {
   calculateIsometricDepth,
   loadAssets,
diff --git a/src/components/gameMaster/zoneEditor/partials/CreateZone.vue b/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
index 607f395..496b434 100644
--- a/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
+++ b/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
@@ -38,8 +38,8 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
-import { useGameStore } from '@/stores/game'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import type { Zone } from '@/types'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/ObjectList.vue b/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
index 368325c..8fc5592 100644
--- a/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
@@ -49,8 +49,8 @@
 <script setup lang="ts">
 import config from '@/config'
 import { ref, onMounted, computed, watch } from 'vue'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
-import { useGameStore } from '@/stores/game'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { useGameStore } from '@/stores/gameStore'
 import Modal from '@/components/utilities/Modal.vue'
 import type { Object } from '@/types'
 
diff --git a/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue b/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
index 3c83382..215df75 100644
--- a/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
+++ b/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script setup lang="ts">
-import { useZoneEditorStore } from '@/stores/zoneEditor'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { ref, computed, watch } from 'vue'
 
 const emit = defineEmits(['update_depth', 'move', 'delete'])
diff --git a/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue b/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
index 2a0d590..ed4ae65 100644
--- a/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
+++ b/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
@@ -33,8 +33,8 @@
 <script setup lang="ts">
 import { onMounted, ref, watch } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
-import { useGameStore } from '@/stores/game'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { useGameStore } from '@/stores/gameStore'
 import type { Zone } from '@/types'
 
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/TileList.vue b/src/components/gameMaster/zoneEditor/partials/TileList.vue
index 25d81fd..e6c060b 100644
--- a/src/components/gameMaster/zoneEditor/partials/TileList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/TileList.vue
@@ -45,8 +45,8 @@
 <script setup lang="ts">
 import config from '@/config'
 import { ref, onMounted, computed } from 'vue'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
-import { useGameStore } from '@/stores/game'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { useGameStore } from '@/stores/gameStore'
 import Modal from '@/components/utilities/Modal.vue'
 import type { Tile } from '@/types'
 
diff --git a/src/components/gameMaster/zoneEditor/partials/Toolbar.vue b/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
index 77695da..e1e90d1 100644
--- a/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
+++ b/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
@@ -87,7 +87,7 @@
 import { onBeforeUnmount, onMounted, ref } from 'vue'
 import { useScene } from 'phavuer'
 import { getTile } from '@/composables/zoneComposable'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { onClickOutside } from '@vueuse/core'
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 
diff --git a/src/components/gameMaster/zoneEditor/partials/ZoneList.vue b/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
index 0e17e90..f4c8ef1 100644
--- a/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
@@ -30,10 +30,10 @@
 
 <script setup lang="ts">
 import { onMounted } from 'vue'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import Modal from '@/components/utilities/Modal.vue'
 import type { Zone } from '@/types'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import CreateZone from '@/components/gameMaster/zoneEditor/partials/CreateZone.vue'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue b/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
index 78280d7..2777bce 100644
--- a/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
@@ -37,7 +37,7 @@
 <script setup>
 import { ref, watch } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
-import { useZoneEditorStore } from '@/stores/zoneEditor.ts'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 
 const zoneEditorStore = useZoneEditorStore()
 
diff --git a/src/components/gui/Chat.vue b/src/components/gui/Chat.vue
index dab3561..668e9af 100644
--- a/src/components/gui/Chat.vue
+++ b/src/components/gui/Chat.vue
@@ -20,7 +20,7 @@
 
 <script setup lang="ts">
 import { onBeforeUnmount, onMounted, ref, nextTick } from 'vue'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import type { Character } from '@/types'
 
 const gameStore = useGameStore()
diff --git a/src/components/gui/Hud.vue b/src/components/gui/Hud.vue
index 86b3134..eb62590 100644
--- a/src/components/gui/Hud.vue
+++ b/src/components/gui/Hud.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
 </script>
diff --git a/src/components/gui/Menu.vue b/src/components/gui/Menu.vue
index f68acfb..d60f0c5 100644
--- a/src/components/gui/Menu.vue
+++ b/src/components/gui/Menu.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
 </script>
diff --git a/src/components/gui/UserPanel.vue b/src/components/gui/UserPanel.vue
index 2a32f5f..69d3b1f 100644
--- a/src/components/gui/UserPanel.vue
+++ b/src/components/gui/UserPanel.vue
@@ -31,7 +31,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import Inventory from '@/components/gui/partials/Inventory.vue'
 import Equipment from '@/components/gui/partials/Equipment.vue'
 import CharacterScreen from '@/components/gui/partials/CharacterScreen.vue'
diff --git a/src/components/gui/partials/CharacterScreen.vue b/src/components/gui/partials/CharacterScreen.vue
index 37963bb..fae73ca 100644
--- a/src/components/gui/partials/CharacterScreen.vue
+++ b/src/components/gui/partials/CharacterScreen.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
 </script>
diff --git a/src/components/gui/partials/Equipment.vue b/src/components/gui/partials/Equipment.vue
index 8110c18..1414fb8 100644
--- a/src/components/gui/partials/Equipment.vue
+++ b/src/components/gui/partials/Equipment.vue
@@ -83,7 +83,7 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
 </script>
diff --git a/src/components/sprites/Character.vue b/src/components/sprites/Character.vue
index a1e9ea2..aeb0533 100644
--- a/src/components/sprites/Character.vue
+++ b/src/components/sprites/Character.vue
@@ -21,7 +21,7 @@ import { type ExtendedCharacter as CharacterT } from '@/types'
 import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { watch, computed, ref, onMounted, onUnmounted } from 'vue'
 import config from '@/config'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 enum Direction {
   POSITIVE,
diff --git a/src/components/utilities/Notifications.vue b/src/components/utilities/Notifications.vue
index 5435a6b..ffbf519 100644
--- a/src/components/utilities/Notifications.vue
+++ b/src/components/utilities/Notifications.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import Modal from '@/components/utilities/Modal.vue'
 import { onBeforeMount, onBeforeUnmount, watch } from 'vue'
 
diff --git a/src/components/zone/Characters.vue b/src/components/zone/Characters.vue
index 044f94d..32e3cfe 100644
--- a/src/components/zone/Characters.vue
+++ b/src/components/zone/Characters.vue
@@ -4,7 +4,7 @@
 
 <script setup lang="ts">
 import Character from '@/components/sprites/Character.vue'
-import { useZoneStore } from '@/stores/zone'
+import { useZoneStore } from '@/stores/zoneStore'
 import { calculateIsometricDepth } from '@/composables/zoneComposable'
 
 const zoneStore = useZoneStore()
diff --git a/src/components/zone/Objects.vue b/src/components/zone/Objects.vue
index 2a180c7..2095209 100644
--- a/src/components/zone/Objects.vue
+++ b/src/components/zone/Objects.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { Image, Text } from 'phavuer'
-import { useZoneStore } from '@/stores/zone'
+import { useZoneStore } from '@/stores/zoneStore'
 import type { ZoneObject } from '@/types'
 
 const zoneStore = useZoneStore()
diff --git a/src/components/zone/Tiles.vue b/src/components/zone/Tiles.vue
index 5c1401d..74e2608 100644
--- a/src/components/zone/Tiles.vue
+++ b/src/components/zone/Tiles.vue
@@ -5,7 +5,7 @@
 <script setup lang="ts">
 import config from '@/config'
 import { useScene } from 'phavuer'
-import { useZoneStore } from '@/stores/zone'
+import { useZoneStore } from '@/stores/zoneStore'
 import { onBeforeMount, onBeforeUnmount } from 'vue'
 import { placeTile, setAllTiles } from '@/composables/zoneComposable'
 import Controls from '@/components/utilities/Controls.vue'
diff --git a/src/components/zone/Zone.vue b/src/components/zone/Zone.vue
index 3ab2293..d633b86 100644
--- a/src/components/zone/Zone.vue
+++ b/src/components/zone/Zone.vue
@@ -6,8 +6,8 @@
 
 <script setup lang="ts">
 import { useScene } from 'phavuer'
-import { useGameStore } from '@/stores/game'
-import { useZoneStore } from '@/stores/zone'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneStore } from '@/stores/zoneStore'
 import { onBeforeUnmount, ref } from 'vue'
 import type { Character as CharacterT, Zone as ZoneT, ExtendedCharacter as ExtendedCharacterT } from '@/types'
 import Tiles from '@/components/zone/Tiles.vue'
diff --git a/src/composables/pointerHandlers/useGamePointerHandlers.ts b/src/composables/pointerHandlers/useGamePointerHandlers.ts
index 20916b6..508d161 100644
--- a/src/composables/pointerHandlers/useGamePointerHandlers.ts
+++ b/src/composables/pointerHandlers/useGamePointerHandlers.ts
@@ -1,6 +1,6 @@
 import { type Ref } from 'vue'
 import { getTile, tileToWorldXY } from '@/composables/zoneComposable'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import config from '@/config'
 
 export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Ref<Phaser.Cameras.Scene2D.Camera>, isDragging: Ref<boolean>) {
diff --git a/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts b/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
index 77d4ae6..305120a 100644
--- a/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
+++ b/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
@@ -1,6 +1,6 @@
 import { computed, type Ref, ref } from 'vue'
 import { getTile, tileToWorldXY } from '@/composables/zoneComposable'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import config from '@/config'
 
 export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Ref<Phaser.Cameras.Scene2D.Camera>, isDragging: Ref<boolean>) {
diff --git a/src/composables/useCameraControls.ts b/src/composables/useCameraControls.ts
index 8f908a5..be94cfb 100644
--- a/src/composables/useCameraControls.ts
+++ b/src/composables/useCameraControls.ts
@@ -1,5 +1,5 @@
 import { ref } from 'vue'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 export function useCameraControls(scene: Phaser.Scene): any {
   const gameStore = useGameStore()
diff --git a/src/composables/usePointerHandlers.ts b/src/composables/usePointerHandlers.ts
index 3e67772..93d1056 100644
--- a/src/composables/usePointerHandlers.ts
+++ b/src/composables/usePointerHandlers.ts
@@ -1,8 +1,8 @@
 import { computed, type Ref, watch } from 'vue'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { useGamePointerHandlers } from '@/composables/pointerHandlers/useGamePointerHandlers'
 import { useZoneEditorPointerHandlers } from '@/composables/pointerHandlers/useZoneEditorPointerHandlers'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 export function usePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Ref<Phaser.Cameras.Scene2D.Camera>, isDragging: Ref<boolean>) {
   const gameStore = useGameStore()
diff --git a/src/composables/zoneComposable.ts b/src/composables/zoneComposable.ts
index 402c6a1..9f12b66 100644
--- a/src/composables/zoneComposable.ts
+++ b/src/composables/zoneComposable.ts
@@ -2,7 +2,7 @@ import config from '@/config'
 import Tilemap = Phaser.Tilemaps.Tilemap
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 import Tileset = Phaser.Tilemaps.Tileset
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 
 export function getTile(x: number, y: number, layer: Phaser.Tilemaps.TilemapLayer): Phaser.Tilemaps.Tile | undefined {
   const tile: Phaser.Tilemaps.Tile = layer.getTileAtWorldXY(x, y)
diff --git a/src/screens/Characters.vue b/src/screens/Characters.vue
index cc3afbc..724bfa0 100644
--- a/src/screens/Characters.vue
+++ b/src/screens/Characters.vue
@@ -96,7 +96,7 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import { onBeforeUnmount, onMounted, ref } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { type Character as CharacterT } from '@/types'
diff --git a/src/screens/Game.vue b/src/screens/Game.vue
index 046c177..f4e3028 100644
--- a/src/screens/Game.vue
+++ b/src/screens/Game.vue
@@ -38,8 +38,8 @@
 import 'phaser'
 import { ref, onBeforeUnmount } from 'vue'
 import { Game, Scene } from 'phavuer'
-import { useGameStore } from '@/stores/game'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import Hud from '@/components/gui/Hud.vue'
 import Zone from '@/components/zone/Zone.vue'
 import Chat from '@/components/gui/Chat.vue'
diff --git a/src/screens/Login.vue b/src/screens/Login.vue
index 4f242bf..8b55899 100644
--- a/src/screens/Login.vue
+++ b/src/screens/Login.vue
@@ -30,7 +30,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import { login, register } from '@/services/authentication'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
 
 const gameStore = useGameStore()
diff --git a/src/services/authentication.ts b/src/services/authentication.ts
index 09391c7..2171871 100644
--- a/src/services/authentication.ts
+++ b/src/services/authentication.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 import config from '@/config'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
 
 export async function register(username: string, password: string, gameStore = useGameStore()) {
diff --git a/src/stores/assetManager.ts b/src/stores/assetManagerStore.ts
similarity index 100%
rename from src/stores/assetManager.ts
rename to src/stores/assetManagerStore.ts
diff --git a/src/stores/game.ts b/src/stores/gameStore.ts
similarity index 100%
rename from src/stores/game.ts
rename to src/stores/gameStore.ts
diff --git a/src/stores/zoneEditor.ts b/src/stores/zoneEditorStore.ts
similarity index 98%
rename from src/stores/zoneEditor.ts
rename to src/stores/zoneEditorStore.ts
index a26e0b5..5396b5b 100644
--- a/src/stores/zoneEditor.ts
+++ b/src/stores/zoneEditorStore.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { useGameStore } from '@/stores/game'
+import { useGameStore } from '@/stores/gameStore'
 import type { Zone, Object, Tile, ZoneObject } from '@/types'
 
 type TeleportSettings = {
diff --git a/src/stores/zone.ts b/src/stores/zoneStore.ts
similarity index 100%
rename from src/stores/zone.ts
rename to src/stores/zoneStore.ts