diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
index 46b61905..9fe666d8 100644
--- a/AudioCuesheetEditor/AudioCuesheetEditor.csproj
+++ b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -22,8 +22,8 @@
     <Content Remove="Resources\Localization\CatalogueNumber\en.json" />
     <Content Remove="Resources\Localization\CuesheetData\de.json" />
     <Content Remove="Resources\Localization\CuesheetData\en.json" />
-    <Content Remove="Resources\Localization\EditSplitpoints\de.json" />
-    <Content Remove="Resources\Localization\EditSplitpoints\en.json" />
+    <Content Remove="Resources\Localization\EditSections\de.json" />
+    <Content Remove="Resources\Localization\EditSections\en.json" />
     <Content Remove="Resources\Localization\EditTrackModal\de.json" />
     <Content Remove="Resources\Localization\EditTrackModal\en.json" />
     <Content Remove="Resources\Localization\MainLayout\de.json" />
@@ -61,8 +61,8 @@
     <EmbeddedResource Include="Resources\Localization\CatalogueNumber\de.json" />
     <EmbeddedResource Include="Resources\Localization\CuesheetData\de.json" />
     <EmbeddedResource Include="Resources\Localization\CuesheetData\en.json" />
-    <EmbeddedResource Include="Resources\Localization\EditSplitpoints\de.json" />
-    <EmbeddedResource Include="Resources\Localization\EditSplitpoints\en.json" />
+    <EmbeddedResource Include="Resources\Localization\EditSections\de.json" />
+    <EmbeddedResource Include="Resources\Localization\EditSections\en.json" />
     <EmbeddedResource Include="Resources\Localization\EditTrackModal\de.json" />
     <EmbeddedResource Include="Resources\Localization\EditTrackModal\en.json" />
     <EmbeddedResource Include="Resources\Localization\MainLayout\en.json" />
diff --git a/AudioCuesheetEditor/Model/IO/Export/CuesheetSection.cs b/AudioCuesheetEditor/Model/IO/Export/CuesheetSection.cs
index b38598c4..084e1307 100644
--- a/AudioCuesheetEditor/Model/IO/Export/CuesheetSection.cs
+++ b/AudioCuesheetEditor/Model/IO/Export/CuesheetSection.cs
@@ -128,6 +128,8 @@ protected override ValidationResult Validate(string property)
         {
             ValidationStatus validationStatus = ValidationStatus.NoValidation;
             List<ValidationMessage>? validationMessages = null;
+            //TODO: Validate end also
+            //TODO: Change validation of begin to this entitys
             switch (property)
             {
                 case nameof(Begin):
diff --git a/AudioCuesheetEditor/Pages/EditSplitpoints.razor b/AudioCuesheetEditor/Pages/EditSections.razor
similarity index 77%
rename from AudioCuesheetEditor/Pages/EditSplitpoints.razor
rename to AudioCuesheetEditor/Pages/EditSections.razor
index 5f43ef00..4f9c19ea 100644
--- a/AudioCuesheetEditor/Pages/EditSplitpoints.razor
+++ b/AudioCuesheetEditor/Pages/EditSections.razor
@@ -17,7 +17,7 @@ along with Foobar.  If not, see
 -->
 @implements IDisposable
 
-@inject ITextLocalizer<EditSplitpoints> _localizer
+@inject ITextLocalizer<EditSections> _localizer
 @inject SessionStateContainer _sessionStateContainer
 @inject ITextLocalizer<ValidationMessage> _validationMessageLocalizer
 @inject DateTimeUtility _dateTimeUtility
@@ -25,20 +25,20 @@ along with Foobar.  If not, see
 @inject TraceChangeManager _traceChangeManager
 @inject IJSRuntime _jsRuntime
 
-@* <Validations @ref="validations">
+<Validations @ref="validations">
     @if (Cuesheet != null)
     {
         @if (_sessionStateContainer.CurrentViewMode == ViewMode.ViewModeFull)
         {
             <Buttons Role="ButtonsRole.Toolbar">
                 <Buttons Margin="Margin.Is2.FromEnd">
-                    <Button Color="Color.Primary" Clicked="AddSplitPointClicked" Margin="Margin.Is2.OnY.OnMobile.Is0.OnTablet">
+                    <Button Color="Color.Primary" Clicked="AddSectionClicked" Margin="Margin.Is2.OnY.OnMobile.Is0.OnTablet">
                         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-square" viewBox="0 0 16 16">
                             <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z" />
                             <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" />
                         </svg>
                         <Span Display="Display.None.OnMobile.None.OnTablet.None.OnDesktop.Inline.OnWidescreen">
-                            @_localizer["Add new split point"]
+                            @_localizer["Add new section"]
                         </Span>
                     </Button>
                 </Buttons>
@@ -49,22 +49,23 @@ along with Foobar.  If not, see
             <TableHeader>
                 <TableRow>
                     <TableHeaderCell>@_localizer["Controls"]</TableHeaderCell>
-                    <TableHeaderCell>@_localizer["Moment"]</TableHeaderCell>
+                    <TableHeaderCell>@_localizer["Begin"]</TableHeaderCell>
+                    <TableHeaderCell>@_localizer["End"]</TableHeaderCell>
                     <TableHeaderCell>@_localizer["CD artist"]</TableHeaderCell>
                     <TableHeaderCell>@_localizer["CD title"]</TableHeaderCell>
                     <TableHeaderCell>@_localizer["Audiofile name"]</TableHeaderCell>
                 </TableRow>
             </TableHeader>
             <TableBody>
-                @foreach (var splitPoint in Cuesheet.Sections)
+                @foreach (var cuesheetSection in Cuesheet.Sections)
                 {
                     <TableRow>
                         <TableRowCell>
                             <Buttons Role="ButtonsRole.Toolbar">
                                 <Div Flex="Flex.JustifyContent.Start.AlignItems.Center">
                                     <Buttons Margin="Margin.Is1.FromEnd">
-                                        <Tooltip Placement="TooltipPlacement.Right" Text="@_localizer["Delete split tooltip"]">
-                                            <Button Size="Size.Small" Color="Color.Danger" Clicked="() => DeleteSplitPointClicked(splitPoint)">
+                                        <Tooltip Placement="TooltipPlacement.Right" Text="@_localizer["Delete section tooltip"]">
+                                            <Button Size="Size.Small" Color="Color.Danger" Clicked="() => DeleteSectionClicked(cuesheetSection)">
                                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x" viewBox="0 0 16 16">
                                                     <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
                                                 </svg>
@@ -75,8 +76,8 @@ along with Foobar.  If not, see
                             </Buttons>
                         </TableRowCell>
                         <TableRowCell>
-                            <Validation AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, splitPoint, x => x.Begin, _validationMessageLocalizer, token)">
-                                <TextEdit Text="@splitPoint.Begin?.ToString()" TextChanged="(value) => _dateTimeUtility.TimespanTextChanged<CuesheetSection, TimeSpan?>(splitPoint, x => x.Begin, value)" Immediate="false">
+                            <Validation AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, cuesheetSection, x => x.Begin, _validationMessageLocalizer, token)">
+                                <TextEdit Text="@cuesheetSection.Begin?.ToString()" TextChanged="(value) => _dateTimeUtility.TimespanTextChanged<CuesheetSection, TimeSpan?>(cuesheetSection, x => x.Begin, value)" Immediate="false">
                                     <Feedback>
                                         <ValidationError />
                                     </Feedback>
@@ -84,8 +85,8 @@ along with Foobar.  If not, see
                             </Validation>
                         </TableRowCell>
                         <TableRowCell>
-                            <Validation AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, splitPoint, x => x.Artist, _validationMessageLocalizer, token)">
-                                <TextEdit @bind-Text="splitPoint.Artist" Immediate="false">
+                            <Validation AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, cuesheetSection, x => x.End, _validationMessageLocalizer, token)">
+                                <TextEdit Text="@cuesheetSection.End?.ToString()" TextChanged="(value) => _dateTimeUtility.TimespanTextChanged<CuesheetSection, TimeSpan?>(cuesheetSection, x => x.End, value)" Immediate="false">
                                     <Feedback>
                                         <ValidationError />
                                     </Feedback>
@@ -93,8 +94,8 @@ along with Foobar.  If not, see
                             </Validation>
                         </TableRowCell>
                         <TableRowCell>
-                            <Validation AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, splitPoint, x => x.Title, _validationMessageLocalizer, token)">
-                                <TextEdit @bind-Text="splitPoint.Title" Immediate="false">
+                            <Validation AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, cuesheetSection, x => x.Artist, _validationMessageLocalizer, token)">
+                                <TextEdit @bind-Text="cuesheetSection.Artist" Immediate="false">
                                     <Feedback>
                                         <ValidationError />
                                     </Feedback>
@@ -102,10 +103,19 @@ along with Foobar.  If not, see
                             </Validation>
                         </TableRowCell>
                         <TableRowCell>
-                            <Validation @ref="audiofileValidation" AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, splitPoint, x => x.AudiofileName, _validationMessageLocalizer, token)">
-                                @if (String.IsNullOrEmpty(splitPoint.AudiofileName))
+                            <Validation AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, cuesheetSection, x => x.Title, _validationMessageLocalizer, token)">
+                                <TextEdit @bind-Text="cuesheetSection.Title" Immediate="false">
+                                    <Feedback>
+                                        <ValidationError />
+                                    </Feedback>
+                                </TextEdit>
+                            </Validation>
+                        </TableRowCell>
+                        <TableRowCell>
+                            <Validation @ref="audiofileValidation" AsyncValidator="(args, token) => ValidatorUtility<CuesheetSection>.Validate(args, cuesheetSection, x => x.AudiofileName, _validationMessageLocalizer, token)">
+                                @if (String.IsNullOrEmpty(cuesheetSection.AudiofileName))
                                 {
-                                    <FileEdit id="@fileEditAudiofileIds[splitPoint]" Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" Changed="(args) => OnSplitpointAudiofileChanged(args, splitPoint)" AutoReset="false">
+                                    <FileEdit id="@fileEditAudiofileIds[cuesheetSection]" Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" Changed="(args) => OnSectionAudiofileChanged(args, cuesheetSection)" AutoReset="false">
                                         <Feedback>
                                             <ValidationError />
                                         </Feedback>
@@ -115,14 +125,14 @@ along with Foobar.  If not, see
                                 {
                                     <Addons>
                                         <Addon AddonType="AddonType.Body">
-                                            <TextEdit ReadOnly Text="@splitPoint.AudiofileName">
+                                            <TextEdit ReadOnly Text="@cuesheetSection.AudiofileName">
                                                 <Feedback>
                                                     <ValidationError Tooltip />
                                                 </Feedback>
                                             </TextEdit>
                                         </Addon>
                                         <Addon AddonType="AddonType.End">
-                                            <Button Color="Color.Secondary" Outline Clicked="(args) => OnSplitpointAudiofileChangedCliccked(splitPoint)">@_localizer["Change"]</Button>
+                                            <Button Color="Color.Secondary" Outline Clicked="(args) => OnSectionAudiofileChangedClicked(cuesheetSection)">@_localizer["Change"]</Button>
                                         </Addon>
                                     </Addons>
                                 }
@@ -133,12 +143,11 @@ along with Foobar.  If not, see
             </TableBody>
         </Table>
     }
-</Validations> *@
+</Validations>
 
 <ModalDialog @ref="modalDialog" />
 
 @code {
-    //TODO: Rename component!
     Validations? validations;
     ModalDialog? modalDialog;
     Validation? audiofileValidation;
@@ -201,22 +210,22 @@ along with Foobar.  If not, see
         validations?.ValidateAll();
     }
 
-    Task AddSplitPointClicked()
+    Task AddSectionClicked()
     {
         if (Cuesheet != null)
         {
-            var splitPoint = Cuesheet.AddSection();
-            _traceChangeManager.TraceChanges(splitPoint);
-            fileEditAudiofileIds.Add(splitPoint, Guid.NewGuid());
+            var section = Cuesheet.AddSection();
+            _traceChangeManager.TraceChanges(section);
+            fileEditAudiofileIds.Add(section, Guid.NewGuid());
         }
         return Task.CompletedTask;
     }
 
-    Task DeleteSplitPointClicked(CuesheetSection splitPoint)
+    Task DeleteSectionClicked(CuesheetSection section)
     {
         if (Cuesheet != null)
         {
-            Cuesheet.RemoveSection(splitPoint);
+            Cuesheet.RemoveSection(section);
         }
         return Task.CompletedTask;
     }
@@ -266,15 +275,15 @@ along with Foobar.  If not, see
         StateHasChanged();
     }
 
-    async Task OnSplitpointAudiofileChangedCliccked(CuesheetSection splitPoint)
+    async Task OnSectionAudiofileChangedClicked(CuesheetSection section)
     {
-        splitPoint.AudiofileName = null;
+        section.AudiofileName = null;
         StateHasChanged();
         await Task.Delay(1);
-        await _jsRuntime.InvokeVoidAsync("triggerClick", fileEditAudiofileIds[splitPoint]);
+        await _jsRuntime.InvokeVoidAsync("triggerClick", fileEditAudiofileIds[section]);
     }
 
-    async Task OnSplitpointAudiofileChanged(FileChangedEventArgs e, CuesheetSection splitPoint)
+    async Task OnSectionAudiofileChanged(FileChangedEventArgs e, CuesheetSection section)
     {
         if (e.Files.FirstOrDefault() != null)
         {
@@ -283,7 +292,7 @@ along with Foobar.  If not, see
                 var file = e.Files.First();
                 if (IOUtility.CheckFileMimeTypeForAudioCodec(file) == true)
                 {
-                    splitPoint.AudiofileName = file.Name;
+                    section.AudiofileName = file.Name;
                 }
                 else
                 {
diff --git a/AudioCuesheetEditor/Pages/Index.razor b/AudioCuesheetEditor/Pages/Index.razor
index 887d2a1e..7eb0dbd9 100644
--- a/AudioCuesheetEditor/Pages/Index.razor
+++ b/AudioCuesheetEditor/Pages/Index.razor
@@ -41,10 +41,10 @@ along with Foobar.  If not, see
                 <Accordion>
                     <Collapse Visible="cuesheetSplitPointsVisible">
                         <CollapseHeader>
-                            <Button Clicked="(() => cuesheetSplitPointsVisible = !cuesheetSplitPointsVisible)"><Heading Size="HeadingSize.Is3">@_localizer["Cuesheet split points"]</Heading></Button>
+                            <Button Clicked="(() => cuesheetSplitPointsVisible = !cuesheetSplitPointsVisible)"><Heading Size="HeadingSize.Is3">@_localizer["Cuesheet sections"]</Heading></Button>
                         </CollapseHeader>
                         <CollapseBody>
-                            <EditSplitpoints />
+                            <EditSections />
                         </CollapseBody>
                     </Collapse>
                     <Collapse Visible="cuesheetDataVisible">
diff --git a/AudioCuesheetEditor/Pages/ViewModeImport.razor b/AudioCuesheetEditor/Pages/ViewModeImport.razor
index dcf33b2d..b1de7655 100644
--- a/AudioCuesheetEditor/Pages/ViewModeImport.razor
+++ b/AudioCuesheetEditor/Pages/ViewModeImport.razor
@@ -274,10 +274,10 @@ along with Foobar.  If not, see
                             {
                                 <Collapse Visible="cuesheetSplitPointsVisible">
                                     <CollapseHeader>
-                                        <Button Clicked="(() => cuesheetSplitPointsVisible = !cuesheetSplitPointsVisible)"><Heading Size="HeadingSize.Is3">@_localizer["Cuesheet split points"]</Heading></Button>
+                                        <Button Clicked="(() => cuesheetSplitPointsVisible = !cuesheetSplitPointsVisible)"><Heading Size="HeadingSize.Is3">@_localizer["Cuesheet sections"]</Heading></Button>
                                     </CollapseHeader>
                                     <CollapseBody>
-                                        <EditSplitpoints />
+                                        <EditSections />
                                     </CollapseBody>
                                 </Collapse>
                             }
diff --git a/AudioCuesheetEditor/Resources/Localization/EditSplitpoints/de.json b/AudioCuesheetEditor/Resources/Localization/EditSections/de.json
similarity index 75%
rename from AudioCuesheetEditor/Resources/Localization/EditSplitpoints/de.json
rename to AudioCuesheetEditor/Resources/Localization/EditSections/de.json
index 1ade6c3a..2c343c56 100644
--- a/AudioCuesheetEditor/Resources/Localization/EditSplitpoints/de.json
+++ b/AudioCuesheetEditor/Resources/Localization/EditSections/de.json
@@ -1,10 +1,11 @@
 {
   "culture": "de",
   "translations": {
-    "Add new split point": "Neuen Aufteilungspunkt hinzufügen",
+    "Add new section": "Neuen Abschnitt hinzufügen",
     "Controls": "Steuerung",
-    "Moment": "Zeitpunkt",
-    "Delete split tooltip": "Löscht diesen Aufteilungspunkt",
+    "Begin": "Anfang",
+    "End": "Ende",
+    "Delete section tooltip": "Löscht diesen Abschnitt",
     "CD artist": "CD Künstler",
     "CD title": "CD Titel",
     "Audiofile name": "Audiodatei",
diff --git a/AudioCuesheetEditor/Resources/Localization/EditSplitpoints/en.json b/AudioCuesheetEditor/Resources/Localization/EditSections/en.json
similarity index 76%
rename from AudioCuesheetEditor/Resources/Localization/EditSplitpoints/en.json
rename to AudioCuesheetEditor/Resources/Localization/EditSections/en.json
index 7256528d..f6bb71d4 100644
--- a/AudioCuesheetEditor/Resources/Localization/EditSplitpoints/en.json
+++ b/AudioCuesheetEditor/Resources/Localization/EditSections/en.json
@@ -1,10 +1,11 @@
 {
   "culture": "en",
   "translations": {
-    "Add new split point": "Add new split point",
+    "Add new section": "Add new section",
     "Controls": "Controls",
-    "Moment": "Moment",
-    "Delete split tooltip": "Deletes this split point",
+    "Begin": "Begin",
+    "End": "End",
+    "Delete section tooltip": "Deletes this section",
     "CD artist": "CD artist",
     "CD title": "CD title",
     "Audiofile name": "Audiofile",
diff --git a/AudioCuesheetEditor/Resources/Localization/Index/de.json b/AudioCuesheetEditor/Resources/Localization/Index/de.json
index 32530bad..65c4083c 100644
--- a/AudioCuesheetEditor/Resources/Localization/Index/de.json
+++ b/AudioCuesheetEditor/Resources/Localization/Index/de.json
@@ -44,6 +44,6 @@
     "DateTime": "Datum und Uhrzeit",
     "Time": "Uhrzeit",
     "Save changes": "Änderungen speichern",
-    "Cuesheet split points": "Cuesheet Aufteilungspunkte"
+    "Cuesheet sections": "Cuesheet Abschnitte"
   }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Resources/Localization/Index/en.json b/AudioCuesheetEditor/Resources/Localization/Index/en.json
index 494ed278..2e8bd0f6 100644
--- a/AudioCuesheetEditor/Resources/Localization/Index/en.json
+++ b/AudioCuesheetEditor/Resources/Localization/Index/en.json
@@ -44,6 +44,6 @@
     "DateTime": "Date and Time",
     "Time": "Time",
     "Save changes": "Save changes",
-    "Cuesheet split points": "Cuesheet split points"
+    "Cuesheet sections": "Cuesheet sections"
   }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Resources/Localization/ViewModeImport/de.json b/AudioCuesheetEditor/Resources/Localization/ViewModeImport/de.json
index 2e2bd675..4d8539a4 100644
--- a/AudioCuesheetEditor/Resources/Localization/ViewModeImport/de.json
+++ b/AudioCuesheetEditor/Resources/Localization/ViewModeImport/de.json
@@ -61,6 +61,6 @@
     "Please confirm": "Bestätigung erforderlich",
     "Do you really want to reset the import options to default? This can not be undone!": "Möchten Sie wirklich die Import Optionen zurücksetzen? Dies kann nicht rückgängig gemacht werden!",
     "Abort import of displayed data": "Import der angezeigten Daten abbrechen",
-    "Cuesheet split points": "Cuesheet Aufteilungspunkte"
+    "Cuesheet sections": "Cuesheet Abschnitte"
   }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Resources/Localization/ViewModeImport/en.json b/AudioCuesheetEditor/Resources/Localization/ViewModeImport/en.json
index 39c0634f..960cb5a1 100644
--- a/AudioCuesheetEditor/Resources/Localization/ViewModeImport/en.json
+++ b/AudioCuesheetEditor/Resources/Localization/ViewModeImport/en.json
@@ -60,6 +60,6 @@
     "Please confirm": "Please confirm",
     "Do you really want to reset the import options to default? This can not be undone!": "Do you really want to reset the import options to default? This can not be undone!",
     "Abort import of displayed data": "Abort import of displayed data",
-    "Cuesheet split points": "Cuesheet split points"
+    "Cuesheet sections": "Cuesheet sections"
   }
 }
\ No newline at end of file