diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 0acf61fa..459a3573 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -22,7 +22,9 @@
       "mcp__tidewave__get_logs",
       "mcp__tidewave__project_eval",
       "Bash(mix format:*)",
-      "Bash(mise run dev:static-checks:*)"
+      "Bash(mise run dev:static-checks:*)",
+      "Bash(find:*)",
+      "Bash(xargs sed:*)"
     ]
   },
   "enableAllProjectMcpServers": false
diff --git a/docs/plans/scrobbled-tracks-crud.md b/docs/plans/scrobbled-tracks-crud.md
index f142d376..5e678507 100644
--- a/docs/plans/scrobbled-tracks-crud.md
+++ b/docs/plans/scrobbled-tracks-crud.md
@@ -84,7 +84,7 @@ Add to `LastFm` module (`lib/last_fm.ex`):
   - Album title
   - Scrobbled date/time
   - Edit/Delete action buttons
-- Pagination component at bottom using `MusicLibraryWeb.PaginationComponent`
+- Pagination component at bottom using `MusicLibraryWeb.Components.Pagination`
 - Empty state message when no tracks found
 
 ### Form Component Template
@@ -127,7 +127,7 @@ Add to the "More" dropdown menu (after line 58):
 ### Pagination Integration
 
 - **Pattern**: Follow `CollectionLive.Index` pagination approach
-- **Component**: Reuse `MusicLibraryWeb.PaginationComponent`
+- **Component**: Reuse `MusicLibraryWeb.Components.Pagination`
 - **Parameters**: Support `query`, `page`, `page_size`, and `order`
 - **URL Structure**: `/scrobbled-tracks?page=2&query=artist&page_size=50`
 
diff --git a/lib/music_library_web/components/add_record_component.ex b/lib/music_library_web/components/add_record.ex
similarity index 99%
rename from lib/music_library_web/components/add_record_component.ex
rename to lib/music_library_web/components/add_record.ex
index 8bb635ea..94c19ec7 100644
--- a/lib/music_library_web/components/add_record_component.ex
+++ b/lib/music_library_web/components/add_record.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibraryWeb.AddRecordComponent do
+defmodule MusicLibraryWeb.Components.AddRecord do
   use MusicLibraryWeb, :live_component
 
   import MusicLibraryWeb.RecordComponents, only: [format_label: 1, type_label: 1]
diff --git a/lib/music_library_web/components/barcode_scanner_component.ex b/lib/music_library_web/components/barcode_scanner.ex
similarity index 99%
rename from lib/music_library_web/components/barcode_scanner_component.ex
rename to lib/music_library_web/components/barcode_scanner.ex
index 48603f9d..103eebbe 100644
--- a/lib/music_library_web/components/barcode_scanner_component.ex
+++ b/lib/music_library_web/components/barcode_scanner.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibraryWeb.BarcodeScannerComponent do
+defmodule MusicLibraryWeb.Components.BarcodeScanner do
   use MusicLibraryWeb, :live_component
 
   alias MusicBrainz.ReleaseGroupSearchResult
diff --git a/lib/music_library_web/components/notes_component.ex b/lib/music_library_web/components/notes.ex
similarity index 99%
rename from lib/music_library_web/components/notes_component.ex
rename to lib/music_library_web/components/notes.ex
index 1ee636a0..e97bafa1 100644
--- a/lib/music_library_web/components/notes_component.ex
+++ b/lib/music_library_web/components/notes.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibraryWeb.NotesComponent do
+defmodule MusicLibraryWeb.Components.Notes do
   use MusicLibraryWeb, :live_component
 
   alias MusicLibrary.Notes
diff --git a/lib/music_library_web/components/pagination_component.ex b/lib/music_library_web/components/pagination.ex
similarity index 99%
rename from lib/music_library_web/components/pagination_component.ex
rename to lib/music_library_web/components/pagination.ex
index e660a495..63683cfe 100644
--- a/lib/music_library_web/components/pagination_component.ex
+++ b/lib/music_library_web/components/pagination.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibraryWeb.PaginationComponent do
+defmodule MusicLibraryWeb.Components.Pagination do
   use MusicLibraryWeb, :html
 
   attr :pagination_params, :map, required: true
diff --git a/lib/music_library_web/components/record_form.ex b/lib/music_library_web/components/record_form.ex
index c76da16c..1b148b41 100644
--- a/lib/music_library_web/components/record_form.ex
+++ b/lib/music_library_web/components/record_form.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibraryWeb.RecordForm do
+defmodule MusicLibraryWeb.Components.RecordForm do
   use MusicLibraryWeb, :live_component
 
   import MusicLibraryWeb.RecordComponents,
diff --git a/lib/music_library_web/components/release_component.ex b/lib/music_library_web/components/release.ex
similarity index 99%
rename from lib/music_library_web/components/release_component.ex
rename to lib/music_library_web/components/release.ex
index 6aeb9bce..f0e4e121 100644
--- a/lib/music_library_web/components/release_component.ex
+++ b/lib/music_library_web/components/release.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibraryWeb.ReleaseComponent do
+defmodule MusicLibraryWeb.Components.Release do
   use MusicLibraryWeb, :live_component
   use Gettext, backend: MusicLibraryWeb.Gettext
 
diff --git a/lib/music_library_web/live/artist_live/show.html.heex b/lib/music_library_web/live/artist_live/show.html.heex
index 00e7acc0..8eb902a3 100644
--- a/lib/music_library_web/live/artist_live/show.html.heex
+++ b/lib/music_library_web/live/artist_live/show.html.heex
@@ -10,7 +10,7 @@
         <div class="flex items-center">
           <button
             class="text-xs md:text-sm text-zinc-700 dark:text-zinc-300"
-            phx-click={MusicLibraryWeb.NotesComponent.open("artist-notes-sheet")}
+            phx-click={MusicLibraryWeb.Components.Notes.open("artist-notes-sheet")}
           >
             <span class="sr-only">{gettext("Open Notes")}</span>
             <.icon
@@ -237,7 +237,7 @@
     on_close={JS.patch(~p"/artists/#{@artist.musicbrainz_id}")}
   >
     <.live_component
-      module={MusicLibraryWeb.AddRecordComponent}
+      module={MusicLibraryWeb.Components.AddRecord}
       id={:search}
       title={@page_title}
       action={@live_action}
@@ -250,7 +250,7 @@
   <.live_component
     id="artist-notes"
     sheet_id="artist-notes-sheet"
-    module={MusicLibraryWeb.NotesComponent}
+    module={MusicLibraryWeb.Components.Notes}
     entity={:artist}
     musicbrainz_id={@artist.musicbrainz_id}
   />
diff --git a/lib/music_library_web/live/collection_live/index.ex b/lib/music_library_web/live/collection_live/index.ex
index 76bfff8a..8439b63d 100644
--- a/lib/music_library_web/live/collection_live/index.ex
+++ b/lib/music_library_web/live/collection_live/index.ex
@@ -1,8 +1,8 @@
 defmodule MusicLibraryWeb.CollectionLive.Index do
   use MusicLibraryWeb, :live_view
 
-  import MusicLibraryWeb.BarcodeScannerComponent, only: [barcode_icon: 1]
-  import MusicLibraryWeb.PaginationComponent
+  import MusicLibraryWeb.Components.BarcodeScanner, only: [barcode_icon: 1]
+  import MusicLibraryWeb.Components.Pagination
   import MusicLibraryWeb.RecordComponents
 
   alias MusicLibrary.Collection
@@ -73,7 +73,7 @@ defmodule MusicLibraryWeb.CollectionLive.Index do
   end
 
   @impl true
-  def handle_info({MusicLibraryWeb.RecordForm, {:saved, _record}}, socket) do
+  def handle_info({MusicLibraryWeb.Components.RecordForm, {:saved, _record}}, socket) do
     {:noreply, load_and_assign_records(socket, socket.assigns.record_list_params)}
   end
 
diff --git a/lib/music_library_web/live/collection_live/index.html.heex b/lib/music_library_web/live/collection_live/index.html.heex
index 774b3b8e..c8b9b654 100644
--- a/lib/music_library_web/live/collection_live/index.html.heex
+++ b/lib/music_library_web/live/collection_live/index.html.heex
@@ -67,7 +67,7 @@
     on_close={JS.patch(back_path(@record_list_params))}
   >
     <.live_component
-      module={MusicLibraryWeb.RecordForm}
+      module={MusicLibraryWeb.Components.RecordForm}
       id={@record.id}
       action={@live_action}
       show_purchased_at={true}
@@ -82,7 +82,7 @@
     on_close={JS.patch(back_path(@record_list_params))}
   >
     <.live_component
-      module={MusicLibraryWeb.AddRecordComponent}
+      module={MusicLibraryWeb.Components.AddRecord}
       id={:search}
       title={@page_title}
       action={@live_action}
@@ -99,7 +99,7 @@
     on_close={JS.patch(back_path(@record_list_params))}
   >
     <.live_component
-      module={MusicLibraryWeb.BarcodeScannerComponent}
+      module={MusicLibraryWeb.Components.BarcodeScanner}
       id={:barcode_scanner}
       title={@page_title}
       action={@live_action}
diff --git a/lib/music_library_web/live/collection_live/show.ex b/lib/music_library_web/live/collection_live/show.ex
index 8719bafd..75b19008 100644
--- a/lib/music_library_web/live/collection_live/show.ex
+++ b/lib/music_library_web/live/collection_live/show.ex
@@ -136,7 +136,7 @@ defmodule MusicLibraryWeb.CollectionLive.Show do
   end
 
   @impl true
-  def handle_info({MusicLibraryWeb.RecordForm, {:saved, record}}, socket) do
+  def handle_info({MusicLibraryWeb.Components.RecordForm, {:saved, record}}, socket) do
     {:noreply, assign(socket, :record, record)}
   end
 
diff --git a/lib/music_library_web/live/collection_live/show.html.heex b/lib/music_library_web/live/collection_live/show.html.heex
index d0bb1581..fa592a50 100644
--- a/lib/music_library_web/live/collection_live/show.html.heex
+++ b/lib/music_library_web/live/collection_live/show.html.heex
@@ -28,7 +28,7 @@
         <div class="min-w-12 text-right">
           <button
             class="text-xs md:text-sm text-zinc-700 dark:text-zinc-300"
-            phx-click={MusicLibraryWeb.NotesComponent.open("record-notes-sheet")}
+            phx-click={MusicLibraryWeb.Components.Notes.open("record-notes-sheet")}
           >
             <span class="sr-only">{gettext("Open Notes")}</span>
             <.icon
@@ -41,7 +41,7 @@
           <button
             :if={@record.selected_release_id}
             class="text-xs md:text-sm text-zinc-700 dark:text-zinc-300"
-            phx-click={MusicLibraryWeb.ReleaseComponent.open("release-with-tracks-sheet")}
+            phx-click={MusicLibraryWeb.Components.Release.open("release-with-tracks-sheet")}
           >
             <span class="sr-only">{gettext("Show Tracks")}</span>
             <.icon
@@ -331,14 +331,14 @@
   <.live_component
     id="release-with-tracks"
     sheet_id="release-with-tracks-sheet"
-    module={MusicLibraryWeb.ReleaseComponent}
+    module={MusicLibraryWeb.Components.Release}
     record={@record}
   />
 
   <.live_component
     id="record-notes"
     sheet_id="record-notes-sheet"
-    module={MusicLibraryWeb.NotesComponent}
+    module={MusicLibraryWeb.Components.Notes}
     entity={:record}
     musicbrainz_id={@record.musicbrainz_id}
   />
@@ -349,7 +349,7 @@
     on_close={JS.patch(~p"/collection/#{@record}")}
   >
     <.live_component
-      module={MusicLibraryWeb.RecordForm}
+      module={MusicLibraryWeb.Components.RecordForm}
       id={@record.id}
       action={@live_action}
       show_purchased_at={true}
diff --git a/lib/music_library_web/live/scrobbled_tracks_live/index.ex b/lib/music_library_web/live/scrobbled_tracks_live/index.ex
index c6fc49d5..cdcc2db6 100644
--- a/lib/music_library_web/live/scrobbled_tracks_live/index.ex
+++ b/lib/music_library_web/live/scrobbled_tracks_live/index.ex
@@ -1,7 +1,7 @@
 defmodule MusicLibraryWeb.ScrobbledTracksLive.Index do
   use MusicLibraryWeb, :live_view
 
-  import MusicLibraryWeb.PaginationComponent
+  import MusicLibraryWeb.Components.Pagination
   import MusicLibraryWeb.RecordComponents, only: [search_form: 1]
 
   alias LastFm.Track
diff --git a/lib/music_library_web/live/wishlist_live/index.ex b/lib/music_library_web/live/wishlist_live/index.ex
index 16eb63f1..07f516d1 100644
--- a/lib/music_library_web/live/wishlist_live/index.ex
+++ b/lib/music_library_web/live/wishlist_live/index.ex
@@ -1,7 +1,7 @@
 defmodule MusicLibraryWeb.WishlistLive.Index do
   use MusicLibraryWeb, :live_view
 
-  import MusicLibraryWeb.PaginationComponent
+  import MusicLibraryWeb.Components.Pagination
   import MusicLibraryWeb.RecordComponents
 
   alias MusicLibrary.Records
@@ -70,7 +70,7 @@ defmodule MusicLibraryWeb.WishlistLive.Index do
   end
 
   @impl true
-  def handle_info({MusicLibraryWeb.RecordForm, {:saved, _record}}, socket) do
+  def handle_info({MusicLibraryWeb.Components.RecordForm, {:saved, _record}}, socket) do
     {:noreply, load_and_assign_records(socket, socket.assigns.record_list_params)}
   end
 
diff --git a/lib/music_library_web/live/wishlist_live/index.html.heex b/lib/music_library_web/live/wishlist_live/index.html.heex
index b26b0b7f..75d31f3c 100644
--- a/lib/music_library_web/live/wishlist_live/index.html.heex
+++ b/lib/music_library_web/live/wishlist_live/index.html.heex
@@ -55,7 +55,7 @@
     on_close={JS.patch(back_path(@record_list_params))}
   >
     <.live_component
-      module={MusicLibraryWeb.RecordForm}
+      module={MusicLibraryWeb.Components.RecordForm}
       id={@record.id}
       action={@live_action}
       show_purchased_at={false}
@@ -70,7 +70,7 @@
     on_close={JS.patch(back_path(@record_list_params))}
   >
     <.live_component
-      module={MusicLibraryWeb.AddRecordComponent}
+      module={MusicLibraryWeb.Components.AddRecord}
       id={:search}
       title={@page_title}
       action={@live_action}
diff --git a/lib/music_library_web/live/wishlist_live/show.ex b/lib/music_library_web/live/wishlist_live/show.ex
index ed20e5ed..4f3917f1 100644
--- a/lib/music_library_web/live/wishlist_live/show.ex
+++ b/lib/music_library_web/live/wishlist_live/show.ex
@@ -144,7 +144,7 @@ defmodule MusicLibraryWeb.WishlistLive.Show do
   end
 
   @impl true
-  def handle_info({MusicLibraryWeb.RecordForm, {:saved, record}}, socket) do
+  def handle_info({MusicLibraryWeb.Components.RecordForm, {:saved, record}}, socket) do
     {:noreply, assign(socket, :record, record)}
   end
 
diff --git a/lib/music_library_web/live/wishlist_live/show.html.heex b/lib/music_library_web/live/wishlist_live/show.html.heex
index 18a096ac..8367aacd 100644
--- a/lib/music_library_web/live/wishlist_live/show.html.heex
+++ b/lib/music_library_web/live/wishlist_live/show.html.heex
@@ -310,7 +310,7 @@
     on_close={JS.patch(~p"/wishlist/#{@record}")}
   >
     <.live_component
-      module={MusicLibraryWeb.RecordForm}
+      module={MusicLibraryWeb.Components.RecordForm}
       id={@record.id}
       action={@live_action}
       show_purchased_at={false}
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 256b1947..70ce9fa9 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -45,7 +45,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #: lib/music_library_web/components/record_components.ex
 #: lib/music_library_web/live/artist_live/show.ex
 #: lib/music_library_web/live/artist_live/show.html.heex
@@ -117,12 +117,12 @@ msgstr ""
 msgid "MusicBrainz ID"
 msgstr ""
 
-#: lib/music_library_web/components/pagination_component.ex
+#: lib/music_library_web/components/pagination.ex
 #, elixir-autogen, elixir-format
 msgid "Next"
 msgstr ""
 
-#: lib/music_library_web/components/add_record_component.ex
+#: lib/music_library_web/components/add_record.ex
 #, elixir-autogen, elixir-format
 msgid "No results"
 msgstr ""
@@ -132,7 +132,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: lib/music_library_web/components/pagination_component.ex
+#: lib/music_library_web/components/pagination.ex
 #, elixir-autogen, elixir-format
 msgid "Previous"
 msgstr ""
@@ -164,14 +164,14 @@ msgstr ""
 msgid "Record updated successfully"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #: lib/music_library_web/components/record_form.ex
 #: lib/music_library_web/live/artist_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #: lib/music_library_web/components/record_form.ex
 #: lib/music_library_web/live/artist_live/form.ex
 #: lib/music_library_web/live/online_store_template_live/form.ex
@@ -257,19 +257,19 @@ msgstr ""
 msgid "Scrobble activity"
 msgstr ""
 
-#: lib/music_library_web/components/add_record_component.ex
+#: lib/music_library_web/components/add_record.ex
 #: lib/music_library_web/live/stats_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Choose which format to import"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #: lib/music_library_web/live/stats_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Collected"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #: lib/music_library_web/live/stats_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Wishlisted"
@@ -520,27 +520,27 @@ msgstr ""
 msgid "Scan barcodes · Collection"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Scan one or more barcodes"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Open camera"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Failed to search release for barcode %{number}"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Records imported successfully"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -583,12 +583,12 @@ msgstr ""
 msgid "Live Dashboard"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Barcode not found"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Some records could not be imported: %{summary}"
 msgstr ""
@@ -609,17 +609,17 @@ msgstr ""
 msgid "Add new Record · Wishlist"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Add releases"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Adding..."
 msgstr ""
 
-#: lib/music_library_web/components/add_record_component.ex
+#: lib/music_library_web/components/add_record.ex
 #, elixir-autogen, elixir-format
 msgid "Search for a record"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Albums"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #: lib/music_library_web/live/stats_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Tracks"
@@ -712,12 +712,12 @@ msgstr ""
 msgid "Selected Release"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Error loading tracks"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Loading release with tracks"
 msgstr ""
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Show Tracks"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Disc %{no}"
 msgstr ""
@@ -737,42 +737,42 @@ msgstr ""
 msgid "Successfully connected your Last.fm account"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Error scrobbling release"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Release scrobbled successfully"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Connect your Last.fm account"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Scrobbling..."
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Scrobble release"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Disc scrobbled successfully"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Error scrobbling disc"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Scrobble disc"
 msgstr ""
@@ -1373,12 +1373,12 @@ msgstr ""
 msgid "Update Track"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #, elixir-autogen, elixir-format
 msgid "Note created successfully"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #, elixir-autogen, elixir-format
 msgid "Note updated successfully"
 msgstr ""
@@ -1389,7 +1389,7 @@ msgstr ""
 msgid "Open Notes"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #, elixir-autogen, elixir-format
 msgid "Read"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 02c4a231..5877a53e 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -45,7 +45,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #: lib/music_library_web/components/record_components.ex
 #: lib/music_library_web/live/artist_live/show.ex
 #: lib/music_library_web/live/artist_live/show.html.heex
@@ -117,12 +117,12 @@ msgstr ""
 msgid "MusicBrainz ID"
 msgstr ""
 
-#: lib/music_library_web/components/pagination_component.ex
+#: lib/music_library_web/components/pagination.ex
 #, elixir-autogen, elixir-format
 msgid "Next"
 msgstr ""
 
-#: lib/music_library_web/components/add_record_component.ex
+#: lib/music_library_web/components/add_record.ex
 #, elixir-autogen, elixir-format
 msgid "No results"
 msgstr ""
@@ -132,7 +132,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: lib/music_library_web/components/pagination_component.ex
+#: lib/music_library_web/components/pagination.ex
 #, elixir-autogen, elixir-format
 msgid "Previous"
 msgstr ""
@@ -164,14 +164,14 @@ msgstr ""
 msgid "Record updated successfully"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #: lib/music_library_web/components/record_form.ex
 #: lib/music_library_web/live/artist_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #: lib/music_library_web/components/record_form.ex
 #: lib/music_library_web/live/artist_live/form.ex
 #: lib/music_library_web/live/online_store_template_live/form.ex
@@ -257,19 +257,19 @@ msgstr ""
 msgid "Scrobble activity"
 msgstr ""
 
-#: lib/music_library_web/components/add_record_component.ex
+#: lib/music_library_web/components/add_record.ex
 #: lib/music_library_web/live/stats_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Choose which format to import"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #: lib/music_library_web/live/stats_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Collected"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #: lib/music_library_web/live/stats_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Wishlisted"
@@ -520,27 +520,27 @@ msgstr ""
 msgid "Scan barcodes · Collection"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Scan one or more barcodes"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Open camera"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Failed to search release for barcode %{number}"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Records imported successfully"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "New"
 msgstr ""
@@ -583,12 +583,12 @@ msgstr ""
 msgid "Live Dashboard"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Barcode not found"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Some records could not be imported: %{summary}"
 msgstr ""
@@ -609,17 +609,17 @@ msgstr ""
 msgid "Add new Record · Wishlist"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Add releases"
 msgstr ""
 
-#: lib/music_library_web/components/barcode_scanner_component.ex
+#: lib/music_library_web/components/barcode_scanner.ex
 #, elixir-autogen, elixir-format
 msgid "Adding..."
 msgstr ""
 
-#: lib/music_library_web/components/add_record_component.ex
+#: lib/music_library_web/components/add_record.ex
 #, elixir-autogen, elixir-format
 msgid "Search for a record"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Albums"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #: lib/music_library_web/live/stats_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Tracks"
@@ -712,12 +712,12 @@ msgstr ""
 msgid "Selected Release"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Error loading tracks"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Loading release with tracks"
 msgstr ""
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Show Tracks"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Disc %{no}"
 msgstr ""
@@ -737,42 +737,42 @@ msgstr ""
 msgid "Successfully connected your Last.fm account"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Error scrobbling release"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Release scrobbled successfully"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Connect your Last.fm account"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Scrobbling..."
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Scrobble release"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format
 msgid "Disc scrobbled successfully"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Error scrobbling disc"
 msgstr ""
 
-#: lib/music_library_web/components/release_component.ex
+#: lib/music_library_web/components/release.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Scrobble disc"
 msgstr ""
@@ -1373,12 +1373,12 @@ msgstr ""
 msgid "Update Track"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Note created successfully"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Note updated successfully"
 msgstr ""
@@ -1389,7 +1389,7 @@ msgstr ""
 msgid "Open Notes"
 msgstr ""
 
-#: lib/music_library_web/components/notes_component.ex
+#: lib/music_library_web/components/notes.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Read"
 msgstr ""