diff --git a/app/soapbox/actions/auth.ts b/app/soapbox/actions/auth.ts
index 5a686d045..25b3f2196 100644
--- a/app/soapbox/actions/auth.ts
+++ b/app/soapbox/actions/auth.ts
@@ -16,7 +16,7 @@ import { obtainOAuthToken, revokeOAuthToken } from 'soapbox/actions/oauth';
 import { startOnboarding } from 'soapbox/actions/onboarding';
 import snackbar from 'soapbox/actions/snackbar';
 import { custom } from 'soapbox/custom';
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth';
 import sourceCode from 'soapbox/utils/code';
 import { getFeatures } from 'soapbox/utils/features';
diff --git a/app/soapbox/actions/instance.ts b/app/soapbox/actions/instance.ts
index 151ad3672..ca1fc3ef5 100644
--- a/app/soapbox/actions/instance.ts
+++ b/app/soapbox/actions/instance.ts
@@ -1,7 +1,7 @@
 import { createAsyncThunk } from '@reduxjs/toolkit';
 import get from 'lodash/get';
 
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { RootState } from 'soapbox/store';
 import { getAuthUserUrl } from 'soapbox/utils/auth';
 import { parseVersion } from 'soapbox/utils/features';
diff --git a/app/soapbox/actions/me.ts b/app/soapbox/actions/me.ts
index e76399d21..17beae21d 100644
--- a/app/soapbox/actions/me.ts
+++ b/app/soapbox/actions/me.ts
@@ -1,4 +1,4 @@
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { getAuthUserId, getAuthUserUrl } from 'soapbox/utils/auth';
 
 import api from '../api';
diff --git a/app/soapbox/actions/soapbox.ts b/app/soapbox/actions/soapbox.ts
index 89d3080d8..725ff1ae3 100644
--- a/app/soapbox/actions/soapbox.ts
+++ b/app/soapbox/actions/soapbox.ts
@@ -2,7 +2,7 @@ import { createSelector } from 'reselect';
 
 import { getHost } from 'soapbox/actions/instance';
 import { normalizeSoapboxConfig } from 'soapbox/normalizers';
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { removeVS16s } from 'soapbox/utils/emoji';
 import { getFeatures } from 'soapbox/utils/features';
 
diff --git a/app/soapbox/components/error-boundary.tsx b/app/soapbox/components/error-boundary.tsx
index 76adf9728..b4b6d8235 100644
--- a/app/soapbox/components/error-boundary.tsx
+++ b/app/soapbox/components/error-boundary.tsx
@@ -6,7 +6,7 @@ import { getSoapboxConfig } from 'soapbox/actions/soapbox';
 import * as BuildConfig from 'soapbox/build_config';
 import { Text, Stack } from 'soapbox/components/ui';
 import { captureException } from 'soapbox/monitoring';
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import sourceCode from 'soapbox/utils/code';
 import { unregisterSw } from 'soapbox/utils/sw';
 
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 2f0c773cd..55b9fd3ae 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -3,7 +3,7 @@ import trim from 'lodash/trim';
 
 import { MASTODON_PRELOAD_IMPORT } from 'soapbox/actions/preload';
 import { FE_SUBDIRECTORY } from 'soapbox/build_config';
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { validId, isURL } from 'soapbox/utils/auth';
 
 import {
diff --git a/app/soapbox/reducers/instance.ts b/app/soapbox/reducers/instance.ts
index 4c1456dc4..bf3c47463 100644
--- a/app/soapbox/reducers/instance.ts
+++ b/app/soapbox/reducers/instance.ts
@@ -3,7 +3,7 @@ import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 import { ADMIN_CONFIG_UPDATE_REQUEST, ADMIN_CONFIG_UPDATE_SUCCESS } from 'soapbox/actions/admin';
 import { PLEROMA_PRELOAD_IMPORT } from 'soapbox/actions/preload';
 import { normalizeInstance } from 'soapbox/normalizers/instance';
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { ConfigDB } from 'soapbox/utils/config_db';
 
 import {
diff --git a/app/soapbox/reducers/soapbox.js b/app/soapbox/reducers/soapbox.js
index 0affe2e36..0cd8ed9b4 100644
--- a/app/soapbox/reducers/soapbox.js
+++ b/app/soapbox/reducers/soapbox.js
@@ -1,7 +1,7 @@
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 import { PLEROMA_PRELOAD_IMPORT } from 'soapbox/actions/preload';
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { ConfigDB } from 'soapbox/utils/config_db';
 
 import { ADMIN_CONFIG_UPDATE_SUCCESS } from '../actions/admin';
diff --git a/app/soapbox/service-worker/entry.ts b/app/soapbox/service-worker/entry.ts
new file mode 100644
index 000000000..3dbfee2ce
--- /dev/null
+++ b/app/soapbox/service-worker/entry.ts
@@ -0,0 +1 @@
+import './web-push-notifications';
diff --git a/app/soapbox/service_worker/web_push_locales.js b/app/soapbox/service-worker/web-push-locales.js
similarity index 100%
rename from app/soapbox/service_worker/web_push_locales.js
rename to app/soapbox/service-worker/web-push-locales.js
diff --git a/app/soapbox/service_worker/web_push_notifications.ts b/app/soapbox/service-worker/web-push-notifications.ts
similarity index 99%
rename from app/soapbox/service_worker/web_push_notifications.ts
rename to app/soapbox/service-worker/web-push-notifications.ts
index 787e60941..c1da2b67d 100644
--- a/app/soapbox/service_worker/web_push_notifications.ts
+++ b/app/soapbox/service-worker/web-push-notifications.ts
@@ -2,7 +2,7 @@ import IntlMessageFormat from 'intl-messageformat';
 import 'intl-pluralrules';
 import unescape from 'lodash/unescape';
 
-import locales from './web_push_locales';
+import locales from './web-push-locales';
 
 import type {
   Account as AccountEntity,
diff --git a/app/soapbox/service_worker/entry.ts b/app/soapbox/service_worker/entry.ts
deleted file mode 100644
index 364b67066..000000000
--- a/app/soapbox/service_worker/entry.ts
+++ /dev/null
@@ -1 +0,0 @@
-import './web_push_notifications';
diff --git a/app/soapbox/storage/kv_store.ts b/app/soapbox/storage/kv-store.ts
similarity index 100%
rename from app/soapbox/storage/kv_store.ts
rename to app/soapbox/storage/kv-store.ts