diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
index ff8fb902..520f5836 100644
--- a/AudioCuesheetEditor/AudioCuesheetEditor.csproj
+++ b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -41,8 +41,8 @@
     <Content Remove="Resources\Localization\RecordControl\en.json" />
     <Content Remove="Resources\Localization\EditRecordOptions\de.json" />
     <Content Remove="Resources\Localization\EditRecordOptions\en.json" />
-    <Content Remove="Resources\Localization\TracksTable\de.json" />
-    <Content Remove="Resources\Localization\TracksTable\en.json" />
+    <Content Remove="Resources\Localization\TrackList\de.json" />
+    <Content Remove="Resources\Localization\TrackList\en.json" />
     <Content Remove="Resources\Localization\CultureSelector\de.json" />
     <Content Remove="Resources\Localization\CultureSelector\en.json" />
     <Content Remove="Resources\Localization\FileEdit\de.json" />
@@ -88,8 +88,8 @@
     <EmbeddedResource Include="Resources\Localization\RecordControl\en.json" />
     <EmbeddedResource Include="Resources\Localization\EditRecordOptions\de.json" />
     <EmbeddedResource Include="Resources\Localization\EditRecordOptions\en.json" />
-    <EmbeddedResource Include="Resources\Localization\TracksTable\de.json" />
-    <EmbeddedResource Include="Resources\Localization\TracksTable\en.json" />
+    <EmbeddedResource Include="Resources\Localization\TrackList\de.json" />
+    <EmbeddedResource Include="Resources\Localization\TrackList\en.json" />
     <EmbeddedResource Include="Resources\Localization\CultureSelector\de.json" />
     <EmbeddedResource Include="Resources\Localization\CultureSelector\en.json" />
     <EmbeddedResource Include="Resources\Localization\FileEdit\de.json" />
diff --git a/AudioCuesheetEditor/Pages/Index.razor b/AudioCuesheetEditor/Pages/Index.razor
index b9d76fc5..5630bb5c 100644
--- a/AudioCuesheetEditor/Pages/Index.razor
+++ b/AudioCuesheetEditor/Pages/Index.razor
@@ -59,7 +59,7 @@ along with Foobar.  If not, see
                             <Button Clicked="(() => cuesheetTracksVisible = !cuesheetTracksVisible)"><Heading Size="HeadingSize.Is3">@_localizer["Tracks"]</Heading></Button>
                         </CollapseHeader>
                         <CollapseBody>
-                            <TracksTable AudioPlayer="audioPlayer" />
+                            <TrackList AudioPlayer="audioPlayer" />
                         </CollapseBody>
                     </Collapse>
                 </Accordion>
diff --git a/AudioCuesheetEditor/Pages/ViewModeImport.razor b/AudioCuesheetEditor/Pages/ViewModeImport.razor
index 05cf22ba..8f302f3c 100644
--- a/AudioCuesheetEditor/Pages/ViewModeImport.razor
+++ b/AudioCuesheetEditor/Pages/ViewModeImport.razor
@@ -135,7 +135,7 @@ along with Foobar.  If not, see
                                     <Button Clicked="(() => cuesheetTracksVisible = !cuesheetTracksVisible)"><Heading Size="HeadingSize.Is3">@_localizer["Tracks"]</Heading></Button>
                                 </CollapseHeader>
                                 <CollapseBody>
-                                    <TracksTable />
+                                    <TrackList />
                                 </CollapseBody>
                             </Collapse>
                         </Accordion>
diff --git a/AudioCuesheetEditor/Pages/ViewModeRecord.razor b/AudioCuesheetEditor/Pages/ViewModeRecord.razor
index b68a38fd..100ac4fb 100644
--- a/AudioCuesheetEditor/Pages/ViewModeRecord.razor
+++ b/AudioCuesheetEditor/Pages/ViewModeRecord.razor
@@ -108,7 +108,7 @@ along with Foobar.  If not, see
                 <Button Clicked="(() => cuesheetTracksVisible = !cuesheetTracksVisible)"><Heading Size="HeadingSize.Is3">@_localizer["Tracks"]</Heading></Button>
             </CollapseHeader>
             <CollapseBody>
-                <TracksTable />
+                <TrackList />
             </CollapseBody>
         </Collapse>
     </Accordion>
diff --git a/AudioCuesheetEditor/Resources/Localization/TracksTable/de.json b/AudioCuesheetEditor/Resources/Localization/TrackList/de.json
similarity index 100%
rename from AudioCuesheetEditor/Resources/Localization/TracksTable/de.json
rename to AudioCuesheetEditor/Resources/Localization/TrackList/de.json
diff --git a/AudioCuesheetEditor/Resources/Localization/TracksTable/en.json b/AudioCuesheetEditor/Resources/Localization/TrackList/en.json
similarity index 100%
rename from AudioCuesheetEditor/Resources/Localization/TracksTable/en.json
rename to AudioCuesheetEditor/Resources/Localization/TrackList/en.json
diff --git a/AudioCuesheetEditor/Shared/TracksTable.razor b/AudioCuesheetEditor/Shared/TrackList.razor
similarity index 99%
rename from AudioCuesheetEditor/Shared/TracksTable.razor
rename to AudioCuesheetEditor/Shared/TrackList.razor
index 61947058..c3fd2e20 100644
--- a/AudioCuesheetEditor/Shared/TracksTable.razor
+++ b/AudioCuesheetEditor/Shared/TrackList.razor
@@ -18,11 +18,11 @@ along with Foobar.  If not, see
 
 @implements IDisposable
 
-@inject ITextLocalizer<TracksTable> _localizer
+@inject ITextLocalizer<TrackList> _localizer
 @inject SessionStateContainer _sessionStateContainer
 @inject ILocalStorageOptionsProvider _localStorageOptionsProvider
 @inject TraceChangeManager _traceChangeManager
-@inject ILogger<TracksTable> _logger
+@inject ILogger<TrackList> _logger
 @inject ITextLocalizerService _localizationService
 @inject MusicBrainzDataProvider _musicBrainzDataProvider
 @inject ITextLocalizer<ValidationMessage> _validationMessageLocalizer