31 files changed, 366 insertions, 258 deletions

diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index bcdc3d7..a886a16 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -19,22 +19,24 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { readFileSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
 import { arch } from 'node:os';
 import path from 'node:path';
 import { URL } from 'node:url';
 
 import {
   ServiceToMainIpcMessage,
-  unreadCount,
+  UnreadCount,
   WebSource,
 } from '@sophie/service-shared';
 import {
-  action,
+  Action,
   MainToRendererIpcMessage,
   RendererToMainIpcMessage,
 } from '@sophie/shared';
 import { app, BrowserView, BrowserWindow, ipcMain } from 'electron';
-import { ensureDirSync, readFile, readFileSync } from 'fs-extra';
+import { ensureDirSync } from 'fs-extra';
 import { autorun } from 'mobx';
 import { getSnapshot, onAction, onPatch } from 'mobx-state-tree';
 import osName from 'os-name';
@@ -45,7 +47,7 @@ import {
   installDevToolsExtensions,
   openDevToolsWhenReady,
 } from './devTools';
-import init from './init';
+import initReactions from './initReactions';
 import { createMainStore } from './stores/MainStore';
 import { getLogger } from './utils/log';
 
@@ -128,7 +130,7 @@ let mainWindow: BrowserWindow | undefined;
 
 const store = createMainStore();
 
-init(store)
+initReactions(store)
   // eslint-disable-next-line promise/always-return -- `then` instead of top-level await.
   .then((disposeCompositionRoot) => {
     app.on('will-quit', disposeCompositionRoot);
@@ -267,7 +269,7 @@ async function createWindow(): Promise<unknown> {
       return;
     }
     try {
-      const actionToDispatch = action.parse(rawAction);
+      const actionToDispatch = Action.parse(rawAction);
       switch (actionToDispatch.action) {
         case 'set-selected-service-id':
           store.shared.setSelectedServiceId(actionToDispatch.serviceId);
@@ -331,7 +333,7 @@ async function createWindow(): Promise<unknown> {
           // otherwise electron emits a no handler registered warning.
           break;
         case ServiceToMainIpcMessage.SetUnreadCount:
-          log.log('Unread count:', unreadCount.parse(args[0]));
+          log.log('Unread count:', UnreadCount.parse(args[0]));
           break;
         default:
           log.error('Unknown IPC message:', channel, args);
diff --git a/packages/main/src/infrastructure/impl/FileBasedConfigPersistence.ts b/packages/main/src/infrastructure/config/ConfigFile.ts
index 88d8bf8..193a20d 100644
--- a/packages/main/src/infrastructure/impl/FileBasedConfigPersistence.ts
+++ b/packages/main/src/infrastructure/config/ConfigFile.ts
@@ -17,48 +17,52 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+
 import { watch } from 'node:fs';
 import { readFile, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 
 import JSON5 from 'json5';
-import throttle from 'lodash-es/throttle';
+import { throttle } from 'lodash-es';
 
 import type { Config } from '../../stores/SharedStore';
 import type Disposer from '../../utils/Disposer';
 import { getLogger } from '../../utils/log';
-import type ConfigPersistence from '../ConfigPersistence';
-import type { ReadConfigResult } from '../ConfigPersistence';
 
-const log = getLogger('fileBasedConfigPersistence');
+import type ConfigRepository from './ConfigRepository';
+import type ReadConfigResult from './ReadConfigResult';
+
+const log = getLogger('ConfigFile');
+
+export default class ConfigFile implements ConfigRepository {
+  readonly #userDataDir: string;
+
+  readonly #configFileName: string;
 
-export default class FileBasedConfigPersistence implements ConfigPersistence {
-  private readonly configFilePath: string;
+  readonly #configFilePath: string;
 
-  private writingConfig = false;
+  #writingConfig = false;
 
-  private timeLastWritten: Date | undefined;
+  #timeLastWritten: Date | undefined;
 
-  constructor(
-    private readonly userDataDir: string,
-    private readonly configFileName: string = 'config.json5',
-  ) {
-    this.configFileName = configFileName;
-    this.configFilePath = path.join(this.userDataDir, this.configFileName);
+  constructor(userDataDir: string, configFileName = 'config.json5') {
+    this.#userDataDir = userDataDir;
+    this.#configFileName = configFileName;
+    this.#configFilePath = path.join(userDataDir, configFileName);
   }
 
   async readConfig(): Promise<ReadConfigResult> {
     let configStr: string;
     try {
-      configStr = await readFile(this.configFilePath, 'utf8');
+      configStr = await readFile(this.#configFilePath, 'utf8');
     } catch (error) {
       if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
-        log.debug('Config file', this.configFilePath, 'was not found');
+        log.debug('Config file', this.#configFilePath, 'was not found');
         return { found: false };
       }
       throw error;
     }
-    log.info('Read config file', this.configFilePath);
+    log.info('Read config file', this.#configFilePath);
     return {
       found: true,
       data: JSON5.parse(configStr),
@@ -69,32 +73,32 @@ export default class FileBasedConfigPersistence implements ConfigPersistence {
     const configJson = JSON5.stringify(configSnapshot, {
       space: 2,
     });
-    this.writingConfig = true;
+    this.#writingConfig = true;
     try {
-      await writeFile(this.configFilePath, configJson, 'utf8');
-      const { mtime } = await stat(this.configFilePath);
-      log.trace('Config file', this.configFilePath, 'last written at', mtime);
-      this.timeLastWritten = mtime;
+      await writeFile(this.#configFilePath, configJson, 'utf8');
+      const { mtime } = await stat(this.#configFilePath);
+      log.trace('Config file', this.#configFilePath, 'last written at', mtime);
+      this.#timeLastWritten = mtime;
     } finally {
-      this.writingConfig = false;
+      this.#writingConfig = false;
     }
-    log.info('Wrote config file', this.configFilePath);
+    log.info('Wrote config file', this.#configFilePath);
   }
 
   watchConfig(callback: () => Promise<void>, throttleMs: number): Disposer {
-    log.debug('Installing watcher for', this.userDataDir);
+    log.debug('Installing watcher for', this.#userDataDir);
 
     const configChanged = throttle(async () => {
       let mtime: Date;
       try {
-        const stats = await stat(this.configFilePath);
+        const stats = await stat(this.#configFilePath);
         mtime = stats.mtime;
         log.trace('Config file last modified at', mtime);
       } catch (error) {
         if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
           log.debug(
             'Config file',
-            this.configFilePath,
+            this.#configFilePath,
             'was deleted after being changed',
           );
           return;
@@ -102,27 +106,27 @@ export default class FileBasedConfigPersistence implements ConfigPersistence {
         throw error;
       }
       if (
-        !this.writingConfig &&
-        (this.timeLastWritten === undefined || mtime > this.timeLastWritten)
+        !this.#writingConfig &&
+        (this.#timeLastWritten === undefined || mtime > this.#timeLastWritten)
       ) {
         log.debug(
           'Found a config file modified at',
           mtime,
           'whish is newer than last written',
-          this.timeLastWritten,
+          this.#timeLastWritten,
         );
         await callback();
       }
     }, throttleMs);
 
-    const watcher = watch(this.userDataDir, {
+    const watcher = watch(this.#userDataDir, {
       persistent: false,
     });
 
     watcher.on('change', (eventType, filename) => {
       if (
         eventType === 'change' &&
-        (filename === this.configFileName || filename === null)
+        (filename === this.#configFileName || filename === null)
       ) {
         configChanged()?.catch((err) => {
           log.error('Unhandled error while listening for config changes', err);
@@ -131,7 +135,7 @@ export default class FileBasedConfigPersistence implements ConfigPersistence {
     });
 
     return () => {
-      log.trace('Removing watcher for', this.configFilePath);
+      log.trace('Removing watcher for', this.#configFilePath);
       watcher.close();
     };
   }
diff --git a/packages/main/src/infrastructure/ConfigPersistence.ts b/packages/main/src/infrastructure/config/ConfigRepository.ts
index 184fa8d..0ce7fc1 100644
--- a/packages/main/src/infrastructure/ConfigPersistence.ts
+++ b/packages/main/src/infrastructure/config/ConfigRepository.ts
@@ -18,8 +18,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { Config } from '../stores/SharedStore';
-import type Disposer from '../utils/Disposer';
+import type { Config } from '../../stores/SharedStore';
+import type Disposer from '../../utils/Disposer';
 
 export type ReadConfigResult =
   | { found: true; data: unknown }
diff --git a/packages/main/src/infrastructure/config/ReadConfigResult.ts b/packages/main/src/infrastructure/config/ReadConfigResult.ts
new file mode 100644
index 0000000..3b3ee55
--- /dev/null
+++ b/packages/main/src/infrastructure/config/ReadConfigResult.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C)  2022 Kristóf Marussy <kristof@marussy.com>
+ *
+ * This file is part of Sophie.
+ *
+ * Sophie is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+type ReadConfigResult = { found: true; data: unknown } | { found: false };
+
+export default ReadConfigResult;
diff --git a/packages/main/src/init.ts b/packages/main/src/initReactions.ts
index fd8dd94..50e561d 100644
--- a/packages/main/src/init.ts
+++ b/packages/main/src/initReactions.ts
@@ -20,21 +20,21 @@
 
 import { app } from 'electron';
 
-import initConfig from './controllers/initConfig';
-import initNativeTheme from './controllers/initNativeTheme';
-import FileBasedConfigPersistence from './infrastructure/impl/FileBasedConfigPersistence';
-import { MainStore } from './stores/MainStore';
+import ConfigFile from './infrastructure/config/ConfigFile';
+import synchronizeConfig from './reactions/synchronizeConfig';
+import synchronizeNativeTheme from './reactions/synchronizeNativeTheme';
+import type MainStore from './stores/MainStore';
 import type Disposer from './utils/Disposer';
 
-export default async function init(store: MainStore): Promise<Disposer> {
-  const configPersistenceService = new FileBasedConfigPersistence(
-    app.getPath('userData'),
-  );
-  const disposeConfigController = await initConfig(
+export default async function initReactions(
+  store: MainStore,
+): Promise<Disposer> {
+  const configRepository = new ConfigFile(app.getPath('userData'));
+  const disposeConfigController = await synchronizeConfig(
     store.shared,
-    configPersistenceService,
+    configRepository,
   );
-  const disposeNativeThemeController = initNativeTheme(store.shared);
+  const disposeNativeThemeController = synchronizeNativeTheme(store.shared);
 
   return () => {
     disposeNativeThemeController();
diff --git a/packages/main/src/controllers/__tests__/initConfig.spec.ts b/packages/main/src/reactions/__tests__/synchronizeConfig.spec.ts
index fdd22c9..c145bf3 100644
--- a/packages/main/src/controllers/__tests__/initConfig.spec.ts
+++ b/packages/main/src/reactions/__tests__/synchronizeConfig.spec.ts
@@ -22,14 +22,14 @@ import { jest } from '@jest/globals';
 import { mocked } from 'jest-mock';
 import ms from 'ms';
 
-import type ConfigPersistence from '../../infrastructure/ConfigPersistence';
-import { sharedStore, SharedStore } from '../../stores/SharedStore';
+import type ConfigRepository from '../../infrastructure/config/ConfigRepository';
+import SharedStore from '../../stores/SharedStore';
 import type Disposer from '../../utils/Disposer';
 import { silenceLogger } from '../../utils/log';
-import initConfig from '../initConfig';
+import synchronizeConfig from '../synchronizeConfig';
 
 let store: SharedStore;
-const persistenceService: ConfigPersistence = {
+const repository: ConfigRepository = {
   readConfig: jest.fn(),
   writeConfig: jest.fn(),
   watchConfig: jest.fn(),
@@ -43,35 +43,33 @@ beforeAll(() => {
 });
 
 beforeEach(() => {
-  store = sharedStore.create();
+  store = SharedStore.create();
 });
 
-describe('when initializing', () => {
+describe('when synchronizeializing', () => {
   describe('when there is no config file', () => {
     beforeEach(() => {
-      mocked(persistenceService.readConfig).mockResolvedValueOnce({
+      mocked(repository.readConfig).mockResolvedValueOnce({
         found: false,
       });
     });
 
     it('should create a new config file', async () => {
-      await initConfig(store, persistenceService);
-      expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
+      await synchronizeConfig(store, repository);
+      expect(repository.writeConfig).toHaveBeenCalledTimes(1);
     });
 
     it('should bail if there is an an error creating the config file', async () => {
-      mocked(persistenceService.writeConfig).mockRejectedValue(
-        new Error('boo'),
-      );
+      mocked(repository.writeConfig).mockRejectedValue(new Error('boo'));
       await expect(() =>
-        initConfig(store, persistenceService),
+        synchronizeConfig(store, repository),
       ).rejects.toBeInstanceOf(Error);
     });
   });
 
   describe('when there is a valid config file', () => {
     beforeEach(() => {
-      mocked(persistenceService.readConfig).mockResolvedValueOnce({
+      mocked(repository.readConfig).mockResolvedValueOnce({
         found: true,
         data: {
           // Use a default empty config file to not trigger config rewrite.
@@ -82,23 +80,23 @@ describe('when initializing', () => {
     });
 
     it('should read the existing config file is there is one', async () => {
-      await initConfig(store, persistenceService);
-      expect(persistenceService.writeConfig).not.toHaveBeenCalled();
+      await synchronizeConfig(store, repository);
+      expect(repository.writeConfig).not.toHaveBeenCalled();
       expect(store.settings.themeSource).toBe('dark');
     });
 
     it('should bail if it cannot set up a watcher', async () => {
-      mocked(persistenceService.watchConfig).mockImplementationOnce(() => {
+      mocked(repository.watchConfig).mockImplementationOnce(() => {
         throw new Error('boo');
       });
       await expect(() =>
-        initConfig(store, persistenceService),
+        synchronizeConfig(store, repository),
       ).rejects.toBeInstanceOf(Error);
     });
   });
 
   it('should update the config file if new details are added during read', async () => {
-    mocked(persistenceService.readConfig).mockResolvedValueOnce({
+    mocked(repository.readConfig).mockResolvedValueOnce({
       found: true,
       data: {
         themeSource: 'light',
@@ -107,26 +105,26 @@ describe('when initializing', () => {
         },
       },
     });
-    await initConfig(store, persistenceService);
-    expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
+    await synchronizeConfig(store, repository);
+    expect(repository.writeConfig).toHaveBeenCalledTimes(1);
   });
 
   it('should not apply an invalid config file but should not overwrite it', async () => {
-    mocked(persistenceService.readConfig).mockResolvedValueOnce({
+    mocked(repository.readConfig).mockResolvedValueOnce({
       found: true,
       data: {
         themeSource: -1,
       },
     });
-    await initConfig(store, persistenceService);
+    await synchronizeConfig(store, repository);
     expect(store.settings.themeSource).not.toBe(-1);
-    expect(persistenceService.writeConfig).not.toHaveBeenCalled();
+    expect(repository.writeConfig).not.toHaveBeenCalled();
   });
 
   it('should bail if it cannot determine whether there is a config file', async () => {
-    mocked(persistenceService.readConfig).mockRejectedValue(new Error('boo'));
+    mocked(repository.readConfig).mockRejectedValue(new Error('boo'));
     await expect(() =>
-      initConfig(store, persistenceService),
+      synchronizeConfig(store, repository),
     ).rejects.toBeInstanceOf(Error);
   });
 });
@@ -137,36 +135,34 @@ describe('when it has loaded the config', () => {
   let configChangedCallback: () => Promise<void>;
 
   beforeEach(async () => {
-    mocked(persistenceService.readConfig).mockResolvedValueOnce({
+    mocked(repository.readConfig).mockResolvedValueOnce({
       found: true,
       data: store.config,
     });
-    mocked(persistenceService.watchConfig).mockReturnValueOnce(watcherDisposer);
-    sutDisposer = await initConfig(store, persistenceService, throttleMs);
-    [[configChangedCallback]] = mocked(
-      persistenceService.watchConfig,
-    ).mock.calls;
+    mocked(repository.watchConfig).mockReturnValueOnce(watcherDisposer);
+    sutDisposer = await synchronizeConfig(store, repository, throttleMs);
+    [[configChangedCallback]] = mocked(repository.watchConfig).mock.calls;
     jest.resetAllMocks();
   });
 
   it('should throttle saving changes to the config file', () => {
-    mocked(persistenceService.writeConfig).mockResolvedValue();
+    mocked(repository.writeConfig).mockResolvedValue();
     store.settings.setThemeSource('dark');
     jest.advanceTimersByTime(lessThanThrottleMs);
     store.settings.setThemeSource('light');
     jest.advanceTimersByTime(throttleMs);
-    expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
+    expect(repository.writeConfig).toHaveBeenCalledTimes(1);
   });
 
   it('should handle config writing errors gracefully', () => {
-    mocked(persistenceService.writeConfig).mockRejectedValue(new Error('boo'));
+    mocked(repository.writeConfig).mockRejectedValue(new Error('boo'));
     store.settings.setThemeSource('dark');
     jest.advanceTimersByTime(throttleMs);
-    expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
+    expect(repository.writeConfig).toHaveBeenCalledTimes(1);
   });
 
   it('should read the config file when it has changed', async () => {
-    mocked(persistenceService.readConfig).mockResolvedValueOnce({
+    mocked(repository.readConfig).mockResolvedValueOnce({
       found: true,
       data: {
         // Use a default empty config file to not trigger config rewrite.
@@ -176,12 +172,12 @@ describe('when it has loaded the config', () => {
     });
     await configChangedCallback();
     // Do not write back the changes we have just read.
-    expect(persistenceService.writeConfig).not.toHaveBeenCalled();
+    expect(repository.writeConfig).not.toHaveBeenCalled();
     expect(store.settings.themeSource).toBe('dark');
   });
 
   it('should update the config file if new details are added', async () => {
-    mocked(persistenceService.readConfig).mockResolvedValueOnce({
+    mocked(repository.readConfig).mockResolvedValueOnce({
       found: true,
       data: {
         themeSource: 'light',
@@ -191,11 +187,11 @@ describe('when it has loaded the config', () => {
       },
     });
     await configChangedCallback();
-    expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
+    expect(repository.writeConfig).toHaveBeenCalledTimes(1);
   });
 
   it('should not apply an invalid config file when it has changed but should not overwrite it', async () => {
-    mocked(persistenceService.readConfig).mockResolvedValueOnce({
+    mocked(repository.readConfig).mockResolvedValueOnce({
       found: true,
       data: {
         themeSource: -1,
@@ -203,11 +199,11 @@ describe('when it has loaded the config', () => {
     });
     await configChangedCallback();
     expect(store.settings.themeSource).not.toBe(-1);
-    expect(persistenceService.writeConfig).not.toHaveBeenCalled();
+    expect(repository.writeConfig).not.toHaveBeenCalled();
   });
 
   it('should handle config reading errors gracefully', async () => {
-    mocked(persistenceService.readConfig).mockRejectedValue(new Error('boo'));
+    mocked(repository.readConfig).mockRejectedValue(new Error('boo'));
     await expect(configChangedCallback()).resolves.not.toThrow();
   });
 
@@ -223,7 +219,7 @@ describe('when it has loaded the config', () => {
     it('should not listen to store changes any more', () => {
       store.settings.setThemeSource('dark');
       jest.advanceTimersByTime(2 * throttleMs);
-      expect(persistenceService.writeConfig).not.toHaveBeenCalled();
+      expect(repository.writeConfig).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/packages/main/src/controllers/__tests__/initNativeTheme.spec.ts b/packages/main/src/reactions/__tests__/synchronizeNativeTheme.spec.ts
index 9107c78..cf37568 100644
--- a/packages/main/src/controllers/__tests__/initNativeTheme.spec.ts
+++ b/packages/main/src/reactions/__tests__/synchronizeNativeTheme.spec.ts
@@ -21,7 +21,7 @@
 import { jest } from '@jest/globals';
 import { mocked } from 'jest-mock';
 
-import { sharedStore, SharedStore } from '../../stores/SharedStore';
+import SharedStore from '../../stores/SharedStore';
 import type Disposer from '../../utils/Disposer';
 
 let shouldUseDarkColors = false;
@@ -38,14 +38,16 @@ jest.unstable_mockModule('electron', () => ({
 }));
 
 const { nativeTheme } = await import('electron');
-const { default: initNativeTheme } = await import('../initNativeTheme');
+const { default: synchronizeNativeTheme } = await import(
+  '../synchronizeNativeTheme'
+);
 
 let store: SharedStore;
 let disposeSut: Disposer;
 
 beforeEach(() => {
-  store = sharedStore.create();
-  disposeSut = initNativeTheme(store);
+  store = SharedStore.create();
+  disposeSut = synchronizeNativeTheme(store);
 });
 
 it('should register a nativeTheme updated listener', () => {
diff --git a/packages/main/src/controllers/initConfig.ts b/packages/main/src/reactions/synchronizeConfig.ts
index 55bf6df..480cc1a 100644
--- a/packages/main/src/controllers/initConfig.ts
+++ b/packages/main/src/reactions/synchronizeConfig.ts
@@ -23,32 +23,31 @@ import { debounce } from 'lodash-es';
 import { reaction } from 'mobx';
 import ms from 'ms';
 
-import type ConfigPersistence from '../infrastructure/ConfigPersistence';
-import { Config, SharedStore } from '../stores/SharedStore';
+import type ConfigRepository from '../infrastructure/config/ConfigRepository';
+import type SharedStore from '../stores/SharedStore';
+import type { Config } from '../stores/SharedStore';
 import type Disposer from '../utils/Disposer';
 import { getLogger } from '../utils/log';
 
 const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s');
 
-const log = getLogger('config');
+const log = getLogger('synchronizeConfig');
 
-export default async function initConfig(
+export default async function synchronizeConfig(
   sharedStore: SharedStore,
-  persistenceService: ConfigPersistence,
+  repository: ConfigRepository,
   debounceTime: number = DEFAULT_CONFIG_DEBOUNCE_TIME,
 ): Promise<Disposer> {
-  log.trace('Initializing config controller');
-
   let lastConfigOnDisk: Config | undefined;
 
   async function writeConfig(): Promise<void> {
     const { config } = sharedStore;
-    await persistenceService.writeConfig(config);
+    await repository.writeConfig(config);
     lastConfigOnDisk = config;
   }
 
   async function readConfig(): Promise<boolean> {
-    const result = await persistenceService.readConfig();
+    const result = await repository.readConfig();
     if (result.found) {
       try {
         // This cast is unsound if the config file is invalid,
@@ -84,7 +83,7 @@ export default async function initConfig(
     }, debounceTime),
   );
 
-  const disposeWatcher = persistenceService.watchConfig(async () => {
+  const disposeWatcher = repository.watchConfig(async () => {
     try {
       await readConfig();
     } catch (error) {
@@ -93,7 +92,6 @@ export default async function initConfig(
   }, debounceTime);
 
   return () => {
-    log.trace('Disposing config controller');
     disposeWatcher();
     disposeReaction();
   };
diff --git a/packages/main/src/controllers/initNativeTheme.ts b/packages/main/src/reactions/synchronizeNativeTheme.ts
index ce7972a..8c4edb3 100644
--- a/packages/main/src/controllers/initNativeTheme.ts
+++ b/packages/main/src/reactions/synchronizeNativeTheme.ts
@@ -21,15 +21,13 @@
 import { nativeTheme } from 'electron';
 import { autorun } from 'mobx';
 
-import type { SharedStore } from '../stores/SharedStore';
+import type SharedStore from '../stores/SharedStore';
 import type Disposer from '../utils/Disposer';
 import { getLogger } from '../utils/log';
 
-const log = getLogger('nativeTheme');
+const log = getLogger('synchronizeNativeTheme');
 
 export default function initNativeTheme(store: SharedStore): Disposer {
-  log.trace('Initializing nativeTheme controller');
-
   const disposeThemeSourceReaction = autorun(() => {
     nativeTheme.themeSource = store.settings.themeSource;
     log.debug('Set theme source:', store.settings.themeSource);
@@ -43,7 +41,6 @@ export default function initNativeTheme(store: SharedStore): Disposer {
   nativeTheme.on('updated', shouldUseDarkColorsListener);
 
   return () => {
-    log.trace('Disposing nativeTheme controller');
     nativeTheme.off('updated', shouldUseDarkColorsListener);
     disposeThemeSourceReaction();
   };
diff --git a/packages/main/src/stores/GlobalSettings.ts b/packages/main/src/stores/GlobalSettings.ts
index 1eb13b3..0a54aa3 100644
--- a/packages/main/src/stores/GlobalSettings.ts
+++ b/packages/main/src/stores/GlobalSettings.ts
@@ -19,18 +19,24 @@
  */
 
 import {
-  globalSettings as originalGlobalSettings,
+  GlobalSettings as GlobalSettingsBase,
   ThemeSource,
 } from '@sophie/shared';
 import { Instance } from 'mobx-state-tree';
 
-export const globalSettings = originalGlobalSettings.actions((self) => ({
+const GlobalSettings = GlobalSettingsBase.actions((self) => ({
   setThemeSource(mode: ThemeSource): void {
     self.themeSource = mode;
   },
 }));
 
-export interface GlobalSettings extends Instance<typeof globalSettings> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface GlobalSettings extends Instance<typeof GlobalSettings> {}
+
+export default GlobalSettings;
 
 export type {
   GlobalSettingsSnapshotIn,
diff --git a/packages/main/src/stores/MainStore.ts b/packages/main/src/stores/MainStore.ts
index 18f5bf9..ff014c9 100644
--- a/packages/main/src/stores/MainStore.ts
+++ b/packages/main/src/stores/MainStore.ts
@@ -21,12 +21,12 @@
 import type { BrowserViewBounds } from '@sophie/shared';
 import { applySnapshot, Instance, types } from 'mobx-state-tree';
 
-import { GlobalSettings } from './GlobalSettings';
-import { Profile } from './Profile';
-import { Service } from './Service';
-import { sharedStore } from './SharedStore';
+import GlobalSettings from './GlobalSettings';
+import Profile from './Profile';
+import Service from './Service';
+import SharedStore from './SharedStore';
 
-export const mainStore = types
+const MainStore = types
   .model('MainStore', {
     browserViewBounds: types.optional(
       types.model('BrowserViewBounds', {
@@ -37,7 +37,7 @@ export const mainStore = types
       }),
       {},
     ),
-    shared: types.optional(sharedStore, {}),
+    shared: types.optional(SharedStore, {}),
   })
   .views((self) => ({
     get settings(): GlobalSettings {
@@ -56,8 +56,14 @@ export const mainStore = types
     },
   }));
 
-export interface MainStore extends Instance<typeof mainStore> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface MainStore extends Instance<typeof MainStore> {}
+
+export default MainStore;
 
 export function createMainStore(): MainStore {
-  return mainStore.create();
+  return MainStore.create();
 }
diff --git a/packages/main/src/stores/Profile.ts b/packages/main/src/stores/Profile.ts
index 5f77fe4..ec2a64b 100644
--- a/packages/main/src/stores/Profile.ts
+++ b/packages/main/src/stores/Profile.ts
@@ -19,7 +19,7 @@
  */
 
 import {
-  profile as originalProfile,
+  Profile as ProfileBase,
   ProfileSettingsSnapshotIn,
 } from '@sophie/shared';
 import { getSnapshot, Instance } from 'mobx-state-tree';
@@ -30,14 +30,20 @@ export interface ProfileConfig extends ProfileSettingsSnapshotIn {
   id?: string | undefined;
 }
 
-export const profile = originalProfile.views((self) => ({
+const Profile = ProfileBase.views((self) => ({
   get config(): ProfileConfig {
     const { id, settings } = self;
     return { ...getSnapshot(settings), id };
   },
 }));
 
-export interface Profile extends Instance<typeof profile> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface Profile extends Instance<typeof Profile> {}
+
+export default Profile;
 
 export type ProfileSettingsSnapshotWithId = [string, ProfileSettingsSnapshotIn];
 
diff --git a/packages/main/src/stores/Service.ts b/packages/main/src/stores/Service.ts
index 331805b..e70caa6 100644
--- a/packages/main/src/stores/Service.ts
+++ b/packages/main/src/stores/Service.ts
@@ -19,14 +19,14 @@
  */
 
 import type { UnreadCount } from '@sophie/service-shared';
-import { service as originalService } from '@sophie/shared';
+import { Service as ServiceBase } from '@sophie/shared';
 import { Instance, getSnapshot, ReferenceIdentifier } from 'mobx-state-tree';
 
 import generateId from '../utils/generateId';
 import overrideProps from '../utils/overrideProps';
 
 import { ProfileSettingsSnapshotWithId } from './Profile';
-import { serviceSettings, ServiceSettingsSnapshotIn } from './ServiceSettings';
+import ServiceSettings, { ServiceSettingsSnapshotIn } from './ServiceSettings';
 
 export interface ServiceConfig
   extends Omit<ServiceSettingsSnapshotIn, 'profile'> {
@@ -35,8 +35,8 @@ export interface ServiceConfig
   profile?: ReferenceIdentifier | undefined;
 }
 
-export const service = overrideProps(originalService, {
-  settings: serviceSettings,
+const Service = overrideProps(ServiceBase, {
+  settings: ServiceSettings,
 })
   .views((self) => ({
     get config(): ServiceConfig {
@@ -83,7 +83,13 @@ export const service = overrideProps(originalService, {
     },
   }));
 
-export interface Service extends Instance<typeof service> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface Service extends Instance<typeof Service> {}
+
+export default Service;
 
 export type ServiceSettingsSnapshotWithId = [string, ServiceSettingsSnapshotIn];
 
diff --git a/packages/main/src/stores/ServiceSettings.ts b/packages/main/src/stores/ServiceSettings.ts
index 960de9b..e6f48c6 100644
--- a/packages/main/src/stores/ServiceSettings.ts
+++ b/packages/main/src/stores/ServiceSettings.ts
@@ -18,18 +18,24 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { serviceSettings as originalServiceSettings } from '@sophie/shared';
+import { ServiceSettings as ServiceSettingsBase } from '@sophie/shared';
 import { Instance, types } from 'mobx-state-tree';
 
 import overrideProps from '../utils/overrideProps';
 
-import { profile } from './Profile';
+import Profile from './Profile';
 
-export const serviceSettings = overrideProps(originalServiceSettings, {
-  profile: types.reference(profile),
+const ServiceSettings = overrideProps(ServiceSettingsBase, {
+  profile: types.reference(Profile),
 });
 
-export interface ServiceSettings extends Instance<typeof serviceSettings> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface ServiceSettings extends Instance<typeof ServiceSettings> {}
+
+export default ServiceSettings;
 
 export type {
   ServiceSettingsSnapshotIn,
diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts
index 499d1ee..c34af75 100644
--- a/packages/main/src/stores/SharedStore.ts
+++ b/packages/main/src/stores/SharedStore.ts
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { sharedStore as originalSharedStore } from '@sophie/shared';
+import { SharedStore as SharedStoreBase } from '@sophie/shared';
 import {
   applySnapshot,
   getSnapshot,
@@ -28,18 +28,16 @@ import {
   IReferenceType,
   IStateTreeNode,
   IType,
-  resolveIdentifier,
   types,
 } from 'mobx-state-tree';
 
 import { getLogger } from '../utils/log';
 import overrideProps from '../utils/overrideProps';
 
-import { globalSettings, GlobalSettingsSnapshotIn } from './GlobalSettings';
-import { addMissingProfileIds, profile, ProfileConfig } from './Profile';
-import {
+import GlobalSettings, { GlobalSettingsSnapshotIn } from './GlobalSettings';
+import Profile, { addMissingProfileIds, ProfileConfig } from './Profile';
+import Service, {
   addMissingServiceIdsAndProfiles,
-  service,
   ServiceConfig,
 } from './Service';
 
@@ -86,13 +84,13 @@ function applySettings<
   current.push(...toApply.map(([id]) => id));
 }
 
-export const sharedStore = overrideProps(originalSharedStore, {
-  settings: types.optional(globalSettings, {}),
-  profilesById: types.map(profile),
-  profiles: types.array(types.reference(profile)),
-  servicesById: types.map(service),
-  services: types.array(types.reference(service)),
-  selectedService: types.safeReference(service),
+const SharedStore = overrideProps(SharedStoreBase, {
+  settings: types.optional(GlobalSettings, {}),
+  profilesById: types.map(Profile),
+  profiles: types.array(types.reference(Profile)),
+  servicesById: types.map(Service),
+  services: types.array(types.reference(Service)),
+  selectedService: types.safeReference(Service),
 })
   .views((self) => ({
     get config(): Config {
@@ -142,7 +140,7 @@ export const sharedStore = overrideProps(originalSharedStore, {
       self.shouldUseDarkColors = shouldUseDarkColors;
     },
     setSelectedServiceId(serviceId: string): void {
-      const serviceInstance = resolveIdentifier(service, self, serviceId);
+      const serviceInstance = self.servicesById.get(serviceId);
       if (serviceInstance === undefined) {
         log.warn('Trying to select unknown service', serviceId);
         return;
@@ -152,7 +150,13 @@ export const sharedStore = overrideProps(originalSharedStore, {
     },
   }));
 
-export interface SharedStore extends Instance<typeof sharedStore> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface SharedStore extends Instance<typeof SharedStore> {}
+
+export default SharedStore;
 
 export type {
   SharedStoreSnapshotIn,
diff --git a/packages/main/src/stores/__tests__/SharedStore.spec.ts b/packages/main/src/stores/__tests__/SharedStore.spec.ts
index 3ea187c..dfd59a1 100644
--- a/packages/main/src/stores/__tests__/SharedStore.spec.ts
+++ b/packages/main/src/stores/__tests__/SharedStore.spec.ts
@@ -20,7 +20,7 @@
 
 import type { ProfileConfig } from '../Profile';
 import type { ServiceConfig } from '../Service';
-import { Config, sharedStore, SharedStore } from '../SharedStore';
+import SharedStore, { Config } from '../SharedStore';
 
 const profileProps: ProfileConfig = {
   name: 'Test profile',
@@ -34,7 +34,7 @@ const serviceProps: ServiceConfig = {
 let sut: SharedStore;
 
 beforeEach(() => {
-  sut = sharedStore.create();
+  sut = SharedStore.create();
 });
 
 describe('loadConfig', () => {
diff --git a/packages/preload/src/contextBridge/createSophieRenderer.ts b/packages/preload/src/contextBridge/createSophieRenderer.ts
index 6003c8b..8bdf07e 100644
--- a/packages/preload/src/contextBridge/createSophieRenderer.ts
+++ b/packages/preload/src/contextBridge/createSophieRenderer.ts
@@ -20,7 +20,6 @@
 
 import {
   Action,
-  action,
   MainToRendererIpcMessage,
   RendererToMainIpcMessage,
   SharedStoreListener,
@@ -32,30 +31,33 @@ import log from 'loglevel';
 import type { IJsonPatch } from 'mobx-state-tree';
 
 class SharedStoreConnector {
-  private onSharedStoreChangeCalled = false;
+  readonly #allowReplaceListener: boolean;
 
-  private listener: SharedStoreListener | undefined;
+  #onSharedStoreChangeCalled = false;
 
-  constructor(private readonly allowReplaceListener: boolean) {
+  #listener: SharedStoreListener | undefined;
+
+  constructor(allowReplaceListener: boolean) {
+    this.#allowReplaceListener = allowReplaceListener;
     ipcRenderer.on(
       MainToRendererIpcMessage.SharedStorePatch,
       (_event, patch) => {
         try {
           // `mobx-state-tree` will validate the patch, so we can safely cast here.
-          this.listener?.onPatch(patch as IJsonPatch[]);
+          this.#listener?.onPatch(patch as IJsonPatch[]);
         } catch (error) {
           log.error('Shared store listener onPatch failed', error);
-          this.listener = undefined;
+          this.#listener = undefined;
         }
       },
     );
   }
 
   async onSharedStoreChange(listener: SharedStoreListener): Promise<void> {
-    if (this.onSharedStoreChangeCalled && !this.allowReplaceListener) {
+    if (this.#onSharedStoreChangeCalled && !this.#allowReplaceListener) {
       throw new Error('Shared store change listener was already set');
     }
-    this.onSharedStoreChangeCalled = true;
+    this.#onSharedStoreChangeCalled = true;
     let success = false;
     let snapshot: unknown;
     try {
@@ -71,14 +73,14 @@ class SharedStoreConnector {
     }
     // `mobx-state-tree` will validate the snapshot, so we can safely cast here.
     listener.onSnapshot(snapshot as SharedStoreSnapshotIn);
-    this.listener = listener;
+    this.#listener = listener;
   }
 }
 
 function dispatchAction(actionToDispatch: Action): void {
   // Let the full zod parse error bubble up to the main world,
   // since all data it may contain was provided from the main world.
-  const parsedAction = action.parse(actionToDispatch);
+  const parsedAction = Action.parse(actionToDispatch);
   try {
     ipcRenderer.send(RendererToMainIpcMessage.DispatchAction, parsedAction);
   } catch (error) {
diff --git a/packages/renderer/src/components/StoreProvider.tsx b/packages/renderer/src/components/StoreProvider.tsx
index 3360a43..de63083 100644
--- a/packages/renderer/src/components/StoreProvider.tsx
+++ b/packages/renderer/src/components/StoreProvider.tsx
@@ -20,9 +20,8 @@
 
 import React, { createContext, useContext } from 'react';
 
-import type { RendererStore } from '../stores/RendererStore';
+import type RendererStore from '../stores/RendererStore';
 
-// eslint-disable-next-line unicorn/no-useless-undefined -- `createContext` expects 1 parameter.
 const StoreContext = createContext<RendererStore | undefined>(undefined);
 
 export function useStore(): RendererStore {
diff --git a/packages/renderer/src/stores/RendererStore.ts b/packages/renderer/src/stores/RendererStore.ts
index 4cbf6aa..c5a94df 100644
--- a/packages/renderer/src/stores/RendererStore.ts
+++ b/packages/renderer/src/stores/RendererStore.ts
@@ -20,18 +20,12 @@
 
 import {
   BrowserViewBounds,
-  sharedStore,
+  SharedStore,
   Service,
   SophieRenderer,
   ThemeSource,
 } from '@sophie/shared';
-import {
-  applySnapshot,
-  applyPatch,
-  Instance,
-  types,
-  IJsonPatch,
-} from 'mobx-state-tree';
+import { applySnapshot, applyPatch, Instance, types } from 'mobx-state-tree';
 
 import RendererEnv from '../env/RendererEnv';
 import getEnv from '../env/getEnv';
@@ -39,9 +33,9 @@ import { getLogger } from '../utils/log';
 
 const log = getLogger('RendererStore');
 
-export const rendererStore = types
+const RendererStore = types
   .model('RendererStore', {
-    shared: types.optional(sharedStore, {}),
+    shared: types.optional(SharedStore, {}),
   })
   .views((self) => ({
     get services(): Service[] {
@@ -79,7 +73,13 @@ export const rendererStore = types
     },
   }));
 
-export interface RendererStore extends Instance<typeof rendererStore> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface RendererStore extends Instance<typeof RendererStore> {}
+
+export default RendererStore;
 
 /**
  * Creates a new `RootStore` with a new environment and connects it to `ipc`.
@@ -95,7 +95,7 @@ export function createAndConnectRendererStore(
   const env: RendererEnv = {
     dispatchMainAction: ipc.dispatchAction,
   };
-  const store = rendererStore.create({}, env);
+  const store = RendererStore.create({}, env);
 
   ipc
     .onSharedStoreChange({
diff --git a/packages/renderer/vite.config.js b/packages/renderer/vite.config.js
index cb0203c..63c4f77 100644
--- a/packages/renderer/vite.config.js
+++ b/packages/renderer/vite.config.js
@@ -48,6 +48,9 @@ export default {
   optimizeDeps: {
     exclude: ['@sophie/shared'],
   },
+  define: {
+    __DEV__: JSON.stringify(isDevelopment), // For mobx
+  },
   build: {
     target: chrome,
     assetsDir: '.',
diff --git a/packages/service-preload/src/index.ts b/packages/service-preload/src/index.ts
index 8b6630a..5383f42 100644
--- a/packages/service-preload/src/index.ts
+++ b/packages/service-preload/src/index.ts
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { ServiceToMainIpcMessage, webSource } from '@sophie/service-shared';
+import { ServiceToMainIpcMessage, WebSource } from '@sophie/service-shared';
 import { ipcRenderer, webFrame } from 'electron';
 
 if (webFrame.parent === null) {
@@ -52,7 +52,7 @@ async function fetchAndExecuteInjectScript(): Promise<void> {
   const apiExposedResponse: unknown = await ipcRenderer.invoke(
     ServiceToMainIpcMessage.ApiExposedInMainWorld,
   );
-  const injectSource = webSource.parse(apiExposedResponse);
+  const injectSource = WebSource.parse(apiExposedResponse);
   // Isolated world 0 is the main world.
   await webFrame.executeJavaScriptInIsolatedWorld(0, [injectSource]);
 }
diff --git a/packages/service-shared/src/index.ts b/packages/service-shared/src/index.ts
index 94be734..a2e5ee5 100644
--- a/packages/service-shared/src/index.ts
+++ b/packages/service-shared/src/index.ts
@@ -20,5 +20,4 @@
 
 export { MainToServiceIpcMessage, ServiceToMainIpcMessage } from './ipc';
 
-export type { UnreadCount, WebSource } from './schemas';
-export { unreadCount, webSource } from './schemas';
+export { UnreadCount, WebSource } from './schemas';
diff --git a/packages/service-shared/src/schemas.ts b/packages/service-shared/src/schemas.ts
index 586750c..0b31eb7 100644
--- a/packages/service-shared/src/schemas.ts
+++ b/packages/service-shared/src/schemas.ts
@@ -20,16 +20,24 @@
 
 import { z } from 'zod';
 
-export const unreadCount = z.object({
+export const UnreadCount = z.object({
   direct: z.number().nonnegative().optional(),
   indirect: z.number().nonnegative().optional(),
 });
 
-export type UnreadCount = z.infer<typeof unreadCount>;
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the schema definition.
+*/
+export type UnreadCount = z.infer<typeof UnreadCount>;
 
-export const webSource = z.object({
+export const WebSource = z.object({
   code: z.string(),
   url: z.string().nonempty(),
 });
 
-export type WebSource = z.infer<typeof webSource>;
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the schema definition.
+*/
+export type WebSource = z.infer<typeof WebSource>;
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index 55cf5ce..3d30488 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -22,40 +22,33 @@ export type { default as SophieRenderer } from './contextBridge/SophieRenderer';
 
 export { MainToRendererIpcMessage, RendererToMainIpcMessage } from './ipc';
 
-export type { Action, BrowserViewBounds, ThemeSource } from './schemas';
-export { action, browserViewBounds, themeSource } from './schemas';
+export { Action, BrowserViewBounds, ThemeSource } from './schemas';
 
 export type {
-  GlobalSettings,
   GlobalSettingsSnapshotIn,
   GlobalSettingsSnapshotOut,
 } from './stores/GlobalSettings';
-export { globalSettings } from './stores/GlobalSettings';
+export { default as GlobalSettings } from './stores/GlobalSettings';
 
-export type { Profile } from './stores/Profile';
-export { profile } from './stores/Profile';
+export { default as Profile } from './stores/Profile';
 
 export type {
-  ProfileSettings,
   ProfileSettingsSnapshotIn,
   ProfileSettingsSnapshotOut,
 } from './stores/ProfileSettings';
-export { profileSettings } from './stores/ProfileSettings';
+export { default as ProfileSettings } from './stores/ProfileSettings';
 
-export type { Service } from './stores/Service';
-export { service } from './stores/Service';
+export { default as Service } from './stores/Service';
 
 export type {
-  ServiceSettings,
   ServiceSettingsSnapshotIn,
   ServiceSettingsSnapshotOut,
 } from './stores/ServiceSettings';
-export { serviceSettings } from './stores/ServiceSettings';
+export { default as ServiceSettings } from './stores/ServiceSettings';
 
 export type {
-  SharedStore,
   SharedStoreListener,
   SharedStoreSnapshotIn,
   SharedStoreSnapshotOut,
 } from './stores/SharedStore';
-export { sharedStore } from './stores/SharedStore';
+export { default as SharedStore } from './stores/SharedStore';
diff --git a/packages/shared/src/schemas.ts b/packages/shared/src/schemas.ts
index 7fb9717..edf3741 100644
--- a/packages/shared/src/schemas.ts
+++ b/packages/shared/src/schemas.ts
@@ -20,43 +20,55 @@
 
 import { z } from 'zod';
 
-const setSelectedServiceId = z.object({
+const SetSelectedServiceId = z.object({
   action: z.literal('set-selected-service-id'),
   serviceId: z.string(),
 });
 
-export const browserViewBounds = z.object({
+export const BrowserViewBounds = z.object({
   x: z.number().int().nonnegative(),
   y: z.number().int().nonnegative(),
   width: z.number().int().nonnegative(),
   height: z.number().int().nonnegative(),
 });
 
-export type BrowserViewBounds = z.infer<typeof browserViewBounds>;
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the schema definition.
+*/
+export type BrowserViewBounds = z.infer<typeof BrowserViewBounds>;
 
-const setBrowserViewBoundsAction = z.object({
+const SetBrowserViewBoundsAction = z.object({
   action: z.literal('set-browser-view-bounds'),
-  browserViewBounds,
+  browserViewBounds: BrowserViewBounds,
 });
 
-export const themeSource = z.enum(['system', 'light', 'dark']);
+export const ThemeSource = z.enum(['system', 'light', 'dark']);
 
-export type ThemeSource = z.infer<typeof themeSource>;
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the schema definition.
+*/
+export type ThemeSource = z.infer<typeof ThemeSource>;
 
-const setThemeSourceAction = z.object({
+const SetThemeSourceAction = z.object({
   action: z.literal('set-theme-source'),
-  themeSource,
+  themeSource: ThemeSource,
 });
 
-const reloadAllServicesAction = z.object({
+const ReloadAllServicesAction = z.object({
   action: z.literal('reload-all-services'),
 });
 
-export const action = z.union([
-  setSelectedServiceId,
-  setBrowserViewBoundsAction,
-  setThemeSourceAction,
-  reloadAllServicesAction,
+export const Action = z.union([
+  SetSelectedServiceId,
+  SetBrowserViewBoundsAction,
+  SetThemeSourceAction,
+  ReloadAllServicesAction,
 ]);
 
-export type Action = z.infer<typeof action>;
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the schema definition.
+*/
+export type Action = z.infer<typeof Action>;
diff --git a/packages/shared/src/stores/GlobalSettings.ts b/packages/shared/src/stores/GlobalSettings.ts
index bd0155a..3a813b8 100644
--- a/packages/shared/src/stores/GlobalSettings.ts
+++ b/packages/shared/src/stores/GlobalSettings.ts
@@ -20,16 +20,22 @@
 
 import { Instance, types, SnapshotIn, SnapshotOut } from 'mobx-state-tree';
 
-import { themeSource } from '../schemas';
+import { ThemeSource } from '../schemas';
 
-export const globalSettings = types.model('GlobalSettings', {
-  themeSource: types.optional(types.enumeration(themeSource.options), 'system'),
+const GlobalSettings = types.model('GlobalSettings', {
+  themeSource: types.optional(types.enumeration(ThemeSource.options), 'system'),
 });
 
-export interface GlobalSettings extends Instance<typeof globalSettings> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface GlobalSettings extends Instance<typeof GlobalSettings> {}
+
+export default GlobalSettings;
 
 export interface GlobalSettingsSnapshotIn
-  extends SnapshotIn<typeof globalSettings> {}
+  extends SnapshotIn<typeof GlobalSettings> {}
 
 export interface GlobalSettingsSnapshotOut
-  extends SnapshotOut<typeof globalSettings> {}
+  extends SnapshotOut<typeof GlobalSettings> {}
diff --git a/packages/shared/src/stores/Profile.ts b/packages/shared/src/stores/Profile.ts
index bb058f6..256c33e 100644
--- a/packages/shared/src/stores/Profile.ts
+++ b/packages/shared/src/stores/Profile.ts
@@ -20,11 +20,17 @@
 
 import { Instance, types } from 'mobx-state-tree';
 
-import { profileSettings } from './ProfileSettings';
+import ProfileSettings from './ProfileSettings';
 
-export const profile = types.model('Profile', {
+const Profile = types.model('Profile', {
   id: types.identifier,
-  settings: profileSettings,
+  settings: ProfileSettings,
 });
 
-export interface Profile extends Instance<typeof profile> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface Profile extends Instance<typeof Profile> {}
+
+export default Profile;
diff --git a/packages/shared/src/stores/ProfileSettings.ts b/packages/shared/src/stores/ProfileSettings.ts
index ec8da5f..9f2b27c 100644
--- a/packages/shared/src/stores/ProfileSettings.ts
+++ b/packages/shared/src/stores/ProfileSettings.ts
@@ -20,14 +20,20 @@
 
 import { Instance, types, SnapshotIn, SnapshotOut } from 'mobx-state-tree';
 
-export const profileSettings = types.model('ProfileSettings', {
+const ProfileSettings = types.model('ProfileSettings', {
   name: types.string,
 });
 
-export interface ProfileSettings extends Instance<typeof profileSettings> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface ProfileSettings extends Instance<typeof ProfileSettings> {}
+
+export default ProfileSettings;
 
 export interface ProfileSettingsSnapshotIn
-  extends SnapshotIn<typeof profileSettings> {}
+  extends SnapshotIn<typeof ProfileSettings> {}
 
 export interface ProfileSettingsSnapshotOut
-  extends SnapshotOut<typeof profileSettings> {}
+  extends SnapshotOut<typeof ProfileSettings> {}
diff --git a/packages/shared/src/stores/Service.ts b/packages/shared/src/stores/Service.ts
index 36acd3d..4a7334d 100644
--- a/packages/shared/src/stores/Service.ts
+++ b/packages/shared/src/stores/Service.ts
@@ -20,11 +20,11 @@
 
 import { Instance, types } from 'mobx-state-tree';
 
-import { serviceSettings } from './ServiceSettings';
+import ServiceSettings from './ServiceSettings';
 
-export const service = types.model('Service', {
+const Service = types.model('Service', {
   id: types.identifier,
-  settings: serviceSettings,
+  settings: ServiceSettings,
   currentUrl: types.maybe(types.string),
   canGoBack: false,
   canGoForward: false,
@@ -37,4 +37,10 @@ export const service = types.model('Service', {
   indirectMessageCount: 0,
 });
 
-export interface Service extends Instance<typeof service> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface Service extends Instance<typeof Service> {}
+
+export default Service;
diff --git a/packages/shared/src/stores/ServiceSettings.ts b/packages/shared/src/stores/ServiceSettings.ts
index 54cd7eb..6ba1dfa 100644
--- a/packages/shared/src/stores/ServiceSettings.ts
+++ b/packages/shared/src/stores/ServiceSettings.ts
@@ -20,19 +20,25 @@
 
 import { Instance, types, SnapshotIn, SnapshotOut } from 'mobx-state-tree';
 
-import { profile } from './Profile';
+import Profile from './Profile';
 
-export const serviceSettings = types.model('ServiceSettings', {
+const ServiceSettings = types.model('ServiceSettings', {
   name: types.string,
-  profile: types.reference(profile),
+  profile: types.reference(Profile),
   // TODO: Remove this once recipes are added.
   url: types.string,
 });
 
-export interface ServiceSettings extends Instance<typeof serviceSettings> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface ServiceSettings extends Instance<typeof ServiceSettings> {}
+
+export default ServiceSettings;
 
 export interface ServiceSettingsSnapshotIn
-  extends SnapshotIn<typeof serviceSettings> {}
+  extends SnapshotIn<typeof ServiceSettings> {}
 
 export interface ServiceSettingsSnapshotOut
-  extends SnapshotOut<typeof serviceSettings> {}
+  extends SnapshotOut<typeof ServiceSettings> {}
diff --git a/packages/shared/src/stores/SharedStore.ts b/packages/shared/src/stores/SharedStore.ts
index f301b9d..0cac3a5 100644
--- a/packages/shared/src/stores/SharedStore.ts
+++ b/packages/shared/src/stores/SharedStore.ts
@@ -26,26 +26,32 @@ import {
   SnapshotOut,
 } from 'mobx-state-tree';
 
-import { globalSettings } from './GlobalSettings';
-import { profile } from './Profile';
-import { service } from './Service';
-
-export const sharedStore = types.model('SharedStore', {
-  settings: types.optional(globalSettings, {}),
-  profilesById: types.map(profile),
-  profiles: types.array(types.reference(profile)),
-  servicesById: types.map(service),
-  services: types.array(types.reference(service)),
-  selectedService: types.safeReference(service),
+import GlobalSettings from './GlobalSettings';
+import Profile from './Profile';
+import Service from './Service';
+
+const SharedStore = types.model('SharedStore', {
+  settings: types.optional(GlobalSettings, {}),
+  profilesById: types.map(Profile),
+  profiles: types.array(types.reference(Profile)),
+  servicesById: types.map(Service),
+  services: types.array(types.reference(Service)),
+  selectedService: types.safeReference(Service),
   shouldUseDarkColors: false,
 });
 
-export interface SharedStore extends Instance<typeof sharedStore> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface SharedStore extends Instance<typeof SharedStore> {}
+
+export default SharedStore;
 
-export interface SharedStoreSnapshotIn extends SnapshotIn<typeof sharedStore> {}
+export interface SharedStoreSnapshotIn extends SnapshotIn<typeof SharedStore> {}
 
 export interface SharedStoreSnapshotOut
-  extends SnapshotOut<typeof sharedStore> {}
+  extends SnapshotOut<typeof SharedStore> {}
 
 export interface SharedStoreListener {
   onSnapshot(snapshot: SharedStoreSnapshotIn): void;