diff --git a/app/javascript/packs/admin.tsx b/app/javascript/entrypoints/admin.tsx
similarity index 100%
rename from app/javascript/packs/admin.tsx
rename to app/javascript/entrypoints/admin.tsx
diff --git a/app/javascript/packs/application.js b/app/javascript/entrypoints/application.js
similarity index 100%
rename from app/javascript/packs/application.js
rename to app/javascript/entrypoints/application.js
diff --git a/app/javascript/packs/error.js b/app/javascript/entrypoints/error.js
similarity index 100%
rename from app/javascript/packs/error.js
rename to app/javascript/entrypoints/error.js
diff --git a/app/javascript/packs/inert.js b/app/javascript/entrypoints/inert.js
similarity index 100%
rename from app/javascript/packs/inert.js
rename to app/javascript/entrypoints/inert.js
diff --git a/app/javascript/packs/mailer.js b/app/javascript/entrypoints/mailer.js
similarity index 100%
rename from app/javascript/packs/mailer.js
rename to app/javascript/entrypoints/mailer.js
diff --git a/app/javascript/packs/public-path.js b/app/javascript/entrypoints/public-path.js
similarity index 100%
rename from app/javascript/packs/public-path.js
rename to app/javascript/entrypoints/public-path.js
diff --git a/app/javascript/packs/public.tsx b/app/javascript/entrypoints/public.tsx
similarity index 100%
rename from app/javascript/packs/public.tsx
rename to app/javascript/entrypoints/public.tsx
diff --git a/app/javascript/packs/remote_interaction_helper.ts b/app/javascript/entrypoints/remote_interaction_helper.ts
similarity index 100%
rename from app/javascript/packs/remote_interaction_helper.ts
rename to app/javascript/entrypoints/remote_interaction_helper.ts
diff --git a/app/javascript/packs/share.jsx b/app/javascript/entrypoints/share.jsx
similarity index 100%
rename from app/javascript/packs/share.jsx
rename to app/javascript/entrypoints/share.jsx
diff --git a/app/javascript/packs/sign_up.js b/app/javascript/entrypoints/sign_up.js
similarity index 100%
rename from app/javascript/packs/sign_up.js
rename to app/javascript/entrypoints/sign_up.js
diff --git a/app/javascript/packs/two_factor_authentication.js b/app/javascript/entrypoints/two_factor_authentication.js
similarity index 100%
rename from app/javascript/packs/two_factor_authentication.js
rename to app/javascript/entrypoints/two_factor_authentication.js
diff --git a/config/webpacker.yml b/config/webpacker.yml
index f8462e53a..e07f577c5 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -2,7 +2,7 @@
 
 default: &default
   source_path: app/javascript
-  source_entry_path: packs
+  source_entry_path: entrypoints
   public_root_path: public
   public_output_path: packs
   cache_path: tmp/cache/webpacker
diff --git a/tsconfig.json b/tsconfig.json
index a193ea35f..7010dda1f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,7 @@
   },
   "include": [
     "app/javascript/mastodon",
-    "app/javascript/packs",
+    "app/javascript/entrypoints",
     "app/javascript/types"
   ]
 }