diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index 4a1ed04..deded6b 100644
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useCalendar } from '@/stores/calendar'
+import { useCalendar } from '@/stores/CalendarStore'
 import CalendarMenu from './CalendarMenu.vue'
 import Century from './state/Century.vue'
 import Decade from './state/Decade.vue'
diff --git a/src/components/calendar/CalendarEventDetails.vue b/src/components/calendar/CalendarEventDetails.vue
index 790d30b..4bb8521 100644
--- a/src/components/calendar/CalendarEventDetails.vue
+++ b/src/components/calendar/CalendarEventDetails.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { PopoverContent } from '@/components/ui/popover'
 import type { CalendarEvent } from '@/models/Events'
-import { useCalendar } from '@/stores/calendar'
+import { useCalendar } from '@/stores/CalendarStore'
 
 const { getFormattedDateTitle } = useCalendar()
 
diff --git a/src/components/calendar/CalendarMenu.vue b/src/components/calendar/CalendarMenu.vue
index c613bfc..22c3247 100644
--- a/src/components/calendar/CalendarMenu.vue
+++ b/src/components/calendar/CalendarMenu.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { getRelativeString } from '@/models/Date'
-import { useCalendar } from '@/stores/calendar'
+import { useCalendar } from '@/stores/CalendarStore'
 import { PhMapPin } from '@phosphor-icons/vue'
 import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
diff --git a/src/components/calendar/CalendarMenuNav.vue b/src/components/calendar/CalendarMenuNav.vue
index bd1e153..060d9c4 100644
--- a/src/components/calendar/CalendarMenuNav.vue
+++ b/src/components/calendar/CalendarMenuNav.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useCalendar } from '@/stores/calendar'
+import { useCalendar } from '@/stores/CalendarStore'
 import {
   PhCaretDoubleLeft,
   PhCaretDoubleRight,
diff --git a/src/components/calendar/CalendarMenuToday.vue b/src/components/calendar/CalendarMenuToday.vue
index 15537d0..345c31c 100644
--- a/src/components/calendar/CalendarMenuToday.vue
+++ b/src/components/calendar/CalendarMenuToday.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useCalendar } from '@/stores/calendar'
+import { useCalendar } from '@/stores/CalendarStore'
 import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
 import Button from '../ui/button/Button.vue'
diff --git a/src/components/calendar/CalendarSwitch.vue b/src/components/calendar/CalendarSwitch.vue
index 8432b47..99f0f02 100644
--- a/src/components/calendar/CalendarSwitch.vue
+++ b/src/components/calendar/CalendarSwitch.vue
@@ -7,7 +7,7 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
-import { useCalendar } from '@/stores/calendar'
+import { useCalendar } from '@/stores/CalendarStore'
 import { PhCalendarBlank } from '@phosphor-icons/vue'
 import { computed } from 'vue'
 import Button from '../ui/button/Button.vue'
diff --git a/src/components/calendar/CalendarTile.vue b/src/components/calendar/CalendarTile.vue
index 4d7e993..e3be10d 100644
--- a/src/components/calendar/CalendarTile.vue
+++ b/src/components/calendar/CalendarTile.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { areDatesIdentical, type LeimDate } from '@/models/Date'
-import { useCalendar } from '@/stores/calendar'
-import { useCalendarEvents } from '@/stores/events'
+import { useCalendar } from '@/stores/CalendarStore'
+import { useCalendarEvents } from '@/stores/EventStore'
 import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
 import CalendarEvent from './CalendarEvent.vue'
diff --git a/src/components/calendar/search/CalendarSearch.vue b/src/components/calendar/search/CalendarSearch.vue
index 10c2ad2..caffa45 100644
--- a/src/components/calendar/search/CalendarSearch.vue
+++ b/src/components/calendar/search/CalendarSearch.vue
@@ -13,8 +13,8 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/comp
 import { isCharacter, type Character } from '@/models/Characters'
 import type { LeimDateOrder } from '@/models/Date'
 import { isCalendarEvent, type CalendarEvent } from '@/models/Events'
-import { useCharacters } from '@/stores/characters'
-import { useCalendarEvents } from '@/stores/events'
+import { useCharacters } from '@/stores/CharacterStore'
+import { useCalendarEvents } from '@/stores/EventStore'
 import { PhCaretDoubleDown, PhCaretDoubleUp, PhMagnifyingGlass } from '@phosphor-icons/vue'
 import { useMagicKeys, useStorage, useTimeoutFn, whenever } from '@vueuse/core'
 import { VisuallyHidden } from 'radix-vue'
diff --git a/src/components/calendar/search/lists/SearchList.vue b/src/components/calendar/search/lists/SearchList.vue
index 521265d..30767da 100644
--- a/src/components/calendar/search/lists/SearchList.vue
+++ b/src/components/calendar/search/lists/SearchList.vue
@@ -3,7 +3,7 @@ import { Button } from '@/components/ui/button'
 import { isCharacter, type Character } from '@/models/Characters'
 import { compareDates, type LeimDate, type LeimDateOrder } from '@/models/Date'
 import { isCalendarEvent, type CalendarEvent } from '@/models/Events'
-import { useCalendar } from '@/stores/calendar'
+import { useCalendar } from '@/stores/CalendarStore'
 import { computed } from 'vue'
 import type { SearchMode } from '../../Search'
 
diff --git a/src/components/calendar/state/Century.vue b/src/components/calendar/state/Century.vue
index 1c83776..63d8978 100644
--- a/src/components/calendar/state/Century.vue
+++ b/src/components/calendar/state/Century.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useCalendarEvents } from '@/stores/events'
+import { useCalendarEvents } from '@/stores/EventStore'
 
 const { currentEvents } = useCalendarEvents()
 </script>
diff --git a/src/components/calendar/state/Monthly.vue b/src/components/calendar/state/Monthly.vue
index 60cceaa..dcd3d03 100644
--- a/src/components/calendar/state/Monthly.vue
+++ b/src/components/calendar/state/Monthly.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { LeimDate } from '@/models/Date'
-import { useCalendar } from '@/stores/calendar'
+import { useCalendar } from '@/stores/CalendarStore'
 import { useThrottleFn } from '@vueuse/core'
 import { computed } from 'vue'
 import CalendarTile from '../CalendarTile.vue'
diff --git a/src/stores/calendar.ts b/src/stores/CalendarStore.ts
similarity index 100%
rename from src/stores/calendar.ts
rename to src/stores/CalendarStore.ts
diff --git a/src/stores/characters.ts b/src/stores/CharacterStore.ts
similarity index 100%
rename from src/stores/characters.ts
rename to src/stores/CharacterStore.ts
diff --git a/src/stores/events.ts b/src/stores/EventStore.ts
similarity index 97%
rename from src/stores/events.ts
rename to src/stores/EventStore.ts
index d505ef9..ebade07 100644
--- a/src/stores/events.ts
+++ b/src/stores/EventStore.ts
@@ -1,8 +1,8 @@
 import type { CalendarEvent } from '@/models/Events'
 import { defineStore } from 'pinia'
 import { computed, ref, watch, type Ref } from 'vue'
-import { useCalendar } from './calendar'
-import { useCharacters } from './characters'
+import { useCalendar } from './CalendarStore'
+import { useCharacters } from './CharacterStore'
 
 export const useCalendarEvents = defineStore('calendar-events', () => {
   const { currentDate, currentConfig } = useCalendar()