diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 3619048..514140b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,13 +1,13 @@
 <script>
     import Menu from "$components/ui/menu/Menu.svelte";
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
-    import { activeProfileStore, maintenanceProfilesStore } from "$stores/maintenance-profiles-store";
+    import { activeProfileStore, maintenanceProfiles } from "$stores/entities/maintenance-profiles";
     import MenuCheckboxItem from "$components/ui/menu/MenuCheckboxItem.svelte";
 
     /** @type {import('$entities/MaintenanceProfile').default|undefined} */
     let activeProfile;
 
-    $: activeProfile = $maintenanceProfilesStore.find(profile => profile.id === $activeProfileStore);
+    $: activeProfile = $maintenanceProfiles.find(profile => profile.id === $activeProfileStore);
 
     function turnOffActiveProfile() {
         $activeProfileStore = null;
diff --git a/src/routes/features/groups/+page.svelte b/src/routes/features/groups/+page.svelte
index fe55a73..c4dc03a 100644
--- a/src/routes/features/groups/+page.svelte
+++ b/src/routes/features/groups/+page.svelte
@@ -1,12 +1,12 @@
 <script>
     import Menu from "$components/ui/menu/Menu.svelte";
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
-    import { tagGroupsStore } from "$stores/tag-groups-store";
+    import { tagGroups } from "$stores/entities/tag-groups";
 
     /** @type {import('$entities/TagGroup').default[]} */
     let groups = [];
 
-    $: groups = $tagGroupsStore.sort((a, b) => a.settings.name.localeCompare(b.settings.name));
+    $: groups = $tagGroups.sort((a, b) => a.settings.name.localeCompare(b.settings.name));
 </script>
 
 <Menu>
diff --git a/src/routes/features/groups/[id]/+page.svelte b/src/routes/features/groups/[id]/+page.svelte
index 47c96b3..c10af17 100644
--- a/src/routes/features/groups/[id]/+page.svelte
+++ b/src/routes/features/groups/[id]/+page.svelte
@@ -4,7 +4,7 @@
     import GroupView from "$components/features/GroupView.svelte";
     import Menu from "$components/ui/menu/Menu.svelte";
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
-    import { tagGroupsStore } from "$stores/tag-groups-store";
+    import { tagGroups } from "$stores/entities/tag-groups";
 
     const groupId = $page.params.id;
     /** @type {import('$entities/TagGroup').default|null} */
@@ -15,7 +15,7 @@
     }
 
     $: {
-        group = $tagGroupsStore.find(group => group.id === groupId) || null;
+        group = $tagGroups.find(group => group.id === groupId) || null;
 
         if (!group) {
             console.warn(`Group ${groupId} not found.`);
diff --git a/src/routes/features/groups/[id]/delete/+page.svelte b/src/routes/features/groups/[id]/delete/+page.svelte
index 638d106..84a0506 100644
--- a/src/routes/features/groups/[id]/delete/+page.svelte
+++ b/src/routes/features/groups/[id]/delete/+page.svelte
@@ -3,10 +3,10 @@
     import { page } from "$app/stores";
     import Menu from "$components/ui/menu/Menu.svelte";
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
-    import { tagGroupsStore } from "$stores/tag-groups-store";
+    import { tagGroups } from "$stores/entities/tag-groups";
 
     const groupId = $page.params.id;
-    const targetGroup = $tagGroupsStore.find(group => group.id === groupId);
+    const targetGroup = $tagGroups.find(group => group.id === groupId);
 
     if (!targetGroup) {
         void goto('/features/groups');
diff --git a/src/routes/features/groups/[id]/edit/+page.svelte b/src/routes/features/groups/[id]/edit/+page.svelte
index e769a63..85c2077 100644
--- a/src/routes/features/groups/[id]/edit/+page.svelte
+++ b/src/routes/features/groups/[id]/edit/+page.svelte
@@ -10,7 +10,7 @@
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
     import TagsEditor from "$components/tags/TagsEditor.svelte";
     import TagGroup from "$entities/TagGroup";
-    import { tagGroupsStore } from "$stores/tag-groups-store";
+    import { tagGroups } from "$stores/entities/tag-groups";
 
     const groupId = $page.params.id;
     /** @type {TagGroup|null} */
@@ -26,7 +26,7 @@
     if (groupId === 'new') {
         targetGroup = new TagGroup(crypto.randomUUID(), {});
     } else {
-        targetGroup = $tagGroupsStore.find(group => group.id === groupId) || null;
+        targetGroup = $tagGroups.find(group => group.id === groupId) || null;
 
         if (targetGroup) {
             groupName = targetGroup.settings.name;
diff --git a/src/routes/features/groups/[id]/export/+page.svelte b/src/routes/features/groups/[id]/export/+page.svelte
index 739bd9d..c583fa5 100644
--- a/src/routes/features/groups/[id]/export/+page.svelte
+++ b/src/routes/features/groups/[id]/export/+page.svelte
@@ -7,11 +7,11 @@
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
     import TagGroup from "$entities/TagGroup";
     import EntitiesTransporter from "$lib/extension/EntitiesTransporter";
-    import { tagGroupsStore } from "$stores/tag-groups-store";
+    import { tagGroups } from "$stores/entities/tag-groups";
 
     const groupId = $page.params.id;
     const groupTransporter = new EntitiesTransporter(TagGroup);
-    const group = $tagGroupsStore.find(group => group.id === groupId);
+    const group = $tagGroups.find(group => group.id === groupId);
 
     /** @type {string} */
     let rawExportedGroup;
diff --git a/src/routes/features/groups/import/+page.svelte b/src/routes/features/groups/import/+page.svelte
index 5fa1712..c2cf41b 100644
--- a/src/routes/features/groups/import/+page.svelte
+++ b/src/routes/features/groups/import/+page.svelte
@@ -7,7 +7,7 @@
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
     import TagGroup from "$entities/TagGroup";
     import EntitiesTransporter from "$lib/extension/EntitiesTransporter";
-    import { tagGroupsStore } from "$stores/tag-groups-store";
+    import { tagGroups } from "$stores/entities/tag-groups";
 
     const groupTransporter = new EntitiesTransporter(TagGroup);
 
@@ -46,7 +46,7 @@
         }
 
         if (candidateGroup) {
-            existingGroup = $tagGroupsStore.find(group => group.id === candidateGroup?.id) ?? null;
+            existingGroup = $tagGroups.find(group => group.id === candidateGroup?.id) ?? null;
         }
     }
 
diff --git a/src/routes/features/maintenance/+page.svelte b/src/routes/features/maintenance/+page.svelte
index 36c9eb7..05a4352 100644
--- a/src/routes/features/maintenance/+page.svelte
+++ b/src/routes/features/maintenance/+page.svelte
@@ -2,12 +2,12 @@
     import Menu from "$components/ui/menu/Menu.svelte";
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
     import MenuRadioItem from "$components/ui/menu/MenuRadioItem.svelte";
-    import { activeProfileStore, maintenanceProfilesStore } from "$stores/maintenance-profiles-store";
+    import { activeProfileStore, maintenanceProfiles } from "$stores/entities/maintenance-profiles";
 
     /** @type {import('$entities/MaintenanceProfile').default[]} */
     let profiles = [];
 
-    $: profiles = $maintenanceProfilesStore.sort((a, b) => a.settings.name.localeCompare(b.settings.name));
+    $: profiles = $maintenanceProfiles.sort((a, b) => a.settings.name.localeCompare(b.settings.name));
 
     function resetActiveProfile() {
         $activeProfileStore = null;
diff --git a/src/routes/features/maintenance/[id]/+page.svelte b/src/routes/features/maintenance/[id]/+page.svelte
index c9e49d2..c775d46 100644
--- a/src/routes/features/maintenance/[id]/+page.svelte
+++ b/src/routes/features/maintenance/[id]/+page.svelte
@@ -3,7 +3,7 @@
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
     import { page } from "$app/stores";
     import { goto } from "$app/navigation";
-    import { activeProfileStore, maintenanceProfilesStore } from "$stores/maintenance-profiles-store";
+    import { activeProfileStore, maintenanceProfiles } from "$stores/entities/maintenance-profiles";
     import ProfileView from "$components/features/ProfileView.svelte";
     import MenuCheckboxItem from "$components/ui/menu/MenuCheckboxItem.svelte";
 
@@ -16,7 +16,7 @@
     }
 
     $: {
-        const resolvedProfile = $maintenanceProfilesStore.find(profile => profile.id === profileId);
+        const resolvedProfile = $maintenanceProfiles.find(profile => profile.id === profileId);
 
         if (resolvedProfile) {
             profile = resolvedProfile;
diff --git a/src/routes/features/maintenance/[id]/delete/+page.svelte b/src/routes/features/maintenance/[id]/delete/+page.svelte
index 5e59699..683741c 100644
--- a/src/routes/features/maintenance/[id]/delete/+page.svelte
+++ b/src/routes/features/maintenance/[id]/delete/+page.svelte
@@ -3,10 +3,10 @@
     import Menu from "$components/ui/menu/Menu.svelte";
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
     import { page } from "$app/stores";
-    import { maintenanceProfilesStore } from "$stores/maintenance-profiles-store";
+    import { maintenanceProfiles } from "$stores/entities/maintenance-profiles";
 
     const profileId = $page.params.id;
-    const targetProfile = $maintenanceProfilesStore.find(profile => profile.id === profileId);
+    const targetProfile = $maintenanceProfiles.find(profile => profile.id === profileId);
 
     if (!targetProfile) {
         void goto('/features/maintenance');
diff --git a/src/routes/features/maintenance/[id]/edit/+page.svelte b/src/routes/features/maintenance/[id]/edit/+page.svelte
index b57f7f8..021f324 100644
--- a/src/routes/features/maintenance/[id]/edit/+page.svelte
+++ b/src/routes/features/maintenance/[id]/edit/+page.svelte
@@ -7,7 +7,7 @@
     import FormContainer from "$components/ui/forms/FormContainer.svelte";
     import { page } from "$app/stores";
     import { goto } from "$app/navigation";
-    import { maintenanceProfilesStore } from "$stores/maintenance-profiles-store";
+    import { maintenanceProfiles } from "$stores/entities/maintenance-profiles";
     import MaintenanceProfile from "$entities/MaintenanceProfile";
 
     /** @type {string} */
@@ -23,7 +23,7 @@
     if (profileId === 'new') {
         targetProfile = new MaintenanceProfile(crypto.randomUUID(), {});
     } else {
-        const maybeExistingProfile = $maintenanceProfilesStore.find(profile => profile.id === profileId);
+        const maybeExistingProfile = $maintenanceProfiles.find(profile => profile.id === profileId);
 
         if (maybeExistingProfile) {
             targetProfile = maybeExistingProfile;
diff --git a/src/routes/features/maintenance/[id]/export/+page.svelte b/src/routes/features/maintenance/[id]/export/+page.svelte
index 6c0a15f..028a69b 100644
--- a/src/routes/features/maintenance/[id]/export/+page.svelte
+++ b/src/routes/features/maintenance/[id]/export/+page.svelte
@@ -1,7 +1,7 @@
 <script>
     import { page } from "$app/stores";
     import { goto } from "$app/navigation";
-    import { maintenanceProfilesStore } from "$stores/maintenance-profiles-store";
+    import { maintenanceProfiles } from "$stores/entities/maintenance-profiles";
     import Menu from "$components/ui/menu/Menu.svelte";
     import MenuItem from "$components/ui/menu/MenuItem.svelte";
     import FormContainer from "$components/ui/forms/FormContainer.svelte";
@@ -10,7 +10,7 @@
     import MaintenanceProfile from "$entities/MaintenanceProfile";
 
     const profileId = $page.params.id;
-    const profile = $maintenanceProfilesStore.find(profile => profile.id === profileId);
+    const profile = $maintenanceProfiles.find(profile => profile.id === profileId);
 
     const profilesTransporter = new EntitiesTransporter(MaintenanceProfile);
     /** @type {string} */
diff --git a/src/routes/features/maintenance/import/+page.svelte b/src/routes/features/maintenance/import/+page.svelte
index 9572b17..6b4b31c 100644
--- a/src/routes/features/maintenance/import/+page.svelte
+++ b/src/routes/features/maintenance/import/+page.svelte
@@ -5,7 +5,7 @@
     import MaintenanceProfile from "$entities/MaintenanceProfile";
     import FormControl from "$components/ui/forms/FormControl.svelte";
     import ProfileView from "$components/features/ProfileView.svelte";
-    import { maintenanceProfilesStore } from "$stores/maintenance-profiles-store";
+    import { maintenanceProfiles } from "$stores/entities/maintenance-profiles";
     import { goto } from "$app/navigation";
     import EntitiesTransporter from "$lib/extension/EntitiesTransporter";
 
@@ -46,7 +46,7 @@
         }
 
         if (candidateProfile) {
-            existingProfile = $maintenanceProfilesStore.find(profile => profile.id === candidateProfile?.id) ?? null;
+            existingProfile = $maintenanceProfiles.find(profile => profile.id === candidateProfile?.id) ?? null;
         }
     }
 
diff --git a/src/stores/maintenance-profiles-store.ts b/src/stores/entities/maintenance-profiles.ts
similarity index 89%
rename from src/stores/maintenance-profiles-store.ts
rename to src/stores/entities/maintenance-profiles.ts
index 32baef1..e3f0271 100644
--- a/src/stores/maintenance-profiles-store.ts
+++ b/src/stores/entities/maintenance-profiles.ts
@@ -5,7 +5,7 @@ import MaintenanceSettings from "$lib/extension/settings/MaintenanceSettings";
 /**
  * Store for working with maintenance profiles in the Svelte popup.
  */
-export const maintenanceProfilesStore: Writable<MaintenanceProfile[]> = writable([]);
+export const maintenanceProfiles: Writable<MaintenanceProfile[]> = writable([]);
 
 /**
  * Store for the active maintenance profile ID.
@@ -22,7 +22,7 @@ let lastActiveProfileId: string|null = null;
 Promise.allSettled([
   // Read the initial values from the storages first
   MaintenanceProfile.readAll().then(profiles => {
-    maintenanceProfilesStore.set(profiles);
+    maintenanceProfiles.set(profiles);
   }),
   maintenanceSettings.resolveActiveProfileId().then(activeProfileId => {
     activeProfileStore.set(activeProfileId);
@@ -30,7 +30,7 @@ Promise.allSettled([
 ]).then(() => {
   // And only after initial values are loaded, start watching for changes from storage and from user's interaction
   MaintenanceProfile.subscribe(profiles => {
-    maintenanceProfilesStore.set(profiles);
+    maintenanceProfiles.set(profiles);
   });
 
   maintenanceSettings.subscribe(settings => {
diff --git a/src/stores/entities/tag-groups.ts b/src/stores/entities/tag-groups.ts
new file mode 100644
index 0000000..1a2b40a
--- /dev/null
+++ b/src/stores/entities/tag-groups.ts
@@ -0,0 +1,11 @@
+import { type Writable, writable } from "svelte/store";
+import TagGroup from "$entities/TagGroup";
+
+export const tagGroups: Writable<TagGroup[]> = writable([]);
+
+TagGroup
+  .readAll()
+  .then(groups => tagGroups.set(groups))
+  .then(() => {
+    TagGroup.subscribe(groups => tagGroups.set(groups));
+  });
diff --git a/src/stores/tag-groups-store.ts b/src/stores/tag-groups-store.ts
deleted file mode 100644
index 7dd7717..0000000
--- a/src/stores/tag-groups-store.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { type Writable, writable } from "svelte/store";
-import TagGroup from "$entities/TagGroup";
-
-export const tagGroupsStore: Writable<TagGroup[]> = writable([]);
-
-TagGroup
-  .readAll()
-  .then(groups => tagGroupsStore.set(groups))
-  .then(() => {
-    TagGroup.subscribe(groups => tagGroupsStore.set(groups));
-  });