diff --git a/src/LogAlligator.App/Controls/FileView.axaml b/src/LogAlligator.App/Controls/FileView.axaml
index de8b999..62bcd24 100644
--- a/src/LogAlligator.App/Controls/FileView.axaml
+++ b/src/LogAlligator.App/Controls/FileView.axaml
@@ -38,7 +38,7 @@
             <Border Grid.Column="2"
                     BorderBrush="{DynamicResource ThemeControlMidBrush}"
                     BorderThickness="1">
-                <controls:LogView Name="RootLogView" textView:EndlessTextView.AddBookmark="OnAddBookmark"/>
+                <controls:LogView Name="RootLogView" textView:TextAreaView.AddBookmark="OnAddBookmark"/>
             </Border>
         </Grid>
     </Border>
diff --git a/src/LogAlligator.App/Controls/FileView.axaml.cs b/src/LogAlligator.App/Controls/FileView.axaml.cs
index 339eb83..cee2c03 100644
--- a/src/LogAlligator.App/Controls/FileView.axaml.cs
+++ b/src/LogAlligator.App/Controls/FileView.axaml.cs
@@ -48,7 +48,7 @@ public FileView()
         BookmarksView.JumpToBookmark += OnJumpToBookmark;
     }
 
-    public async void OnAddBookmark(object? sender, EndlessTextView.BookmarkEventArgs bookmarkEvent)
+    public async void OnAddBookmark(object? sender, TextAreaView.BookmarkEventArgs bookmarkEvent)
     {
         var bookmarkDialog = new BookmarkDialog();
         try
diff --git a/src/LogAlligator.App/Controls/LogView.axaml b/src/LogAlligator.App/Controls/LogView.axaml
index ba119ac..7b1ccdd 100644
--- a/src/LogAlligator.App/Controls/LogView.axaml
+++ b/src/LogAlligator.App/Controls/LogView.axaml
@@ -54,7 +54,7 @@
                         <ToggleButton Content="_All occurrences" IsEnabled="False"/>
                     </StackPanel>
                 </Border>
-                <textView:EndlessTextView Name="TextView" />
+                <textView:TextAreaView Name="TextView" />
             </DockPanel>
         </TabItem>
     </TabControl>
diff --git a/src/LogAlligator.App/Controls/TextView/LineNumbers.cs b/src/LogAlligator.App/Controls/TextArea/LineNumbers.cs
similarity index 100%
rename from src/LogAlligator.App/Controls/TextView/LineNumbers.cs
rename to src/LogAlligator.App/Controls/TextArea/LineNumbers.cs
diff --git a/src/LogAlligator.App/Controls/TextView/Style.cs b/src/LogAlligator.App/Controls/TextArea/Style.cs
similarity index 100%
rename from src/LogAlligator.App/Controls/TextView/Style.cs
rename to src/LogAlligator.App/Controls/TextArea/Style.cs
diff --git a/src/LogAlligator.App/Controls/TextView/TextArea.cs b/src/LogAlligator.App/Controls/TextArea/TextAreaControl.cs
similarity index 90%
rename from src/LogAlligator.App/Controls/TextView/TextArea.cs
rename to src/LogAlligator.App/Controls/TextArea/TextAreaControl.cs
index 7ddfdbb..b56a2d3 100644
--- a/src/LogAlligator.App/Controls/TextView/TextArea.cs
+++ b/src/LogAlligator.App/Controls/TextArea/TextAreaControl.cs
@@ -7,13 +7,13 @@
 
 namespace LogAlligator.App.Controls.TextView;
 
-internal class TextArea : Control
+internal class TextAreaControl : Control
 {
     private TextAreaLine[] _lines = [];
     private double _lineHeight;
 
     public static readonly StyledProperty<IBrush> BackgroundProperty =
-        AvaloniaProperty.Register<TextArea, IBrush>(nameof(Background), new SolidColorBrush(Colors.Transparent));
+        AvaloniaProperty.Register<TextAreaControl, IBrush>(nameof(Background), new SolidColorBrush(Colors.Transparent));
 
     public IBrush Background
     {
@@ -22,7 +22,7 @@ public IBrush Background
     }
 
     public static readonly StyledProperty<IBrush> ForegroundProperty =
-        AvaloniaProperty.Register<TextArea, IBrush>(nameof(Foreground), new SolidColorBrush(Colors.Black));
+        AvaloniaProperty.Register<TextAreaControl, IBrush>(nameof(Foreground), new SolidColorBrush(Colors.Black));
 
     public IBrush Foreground
     {
@@ -34,7 +34,7 @@ public IBrush Foreground
     public Color BackgroundColor => ((SolidColorBrush)Background).Color;
 
     public static readonly StyledProperty<double> FontSizeProperty =
-        AvaloniaProperty.Register<TextArea, double>(nameof(FontSize), 12);
+        AvaloniaProperty.Register<TextAreaControl, double>(nameof(FontSize), 12);
 
     public double FontSize
     {
@@ -43,7 +43,7 @@ public double FontSize
     }
 
     public static readonly StyledProperty<Thickness> PaddingProperty =
-        Decorator.PaddingProperty.AddOwner<TextArea>();
+        Decorator.PaddingProperty.AddOwner<TextAreaControl>();
 
     public Thickness Padding
     {
@@ -52,7 +52,7 @@ public Thickness Padding
     }
 
     public static readonly StyledProperty<FontFamily> FontFamilyProperty =
-        AvaloniaProperty.Register<TextArea, FontFamily>(nameof(FontFamily), FontFamily.Default);
+        AvaloniaProperty.Register<TextAreaControl, FontFamily>(nameof(FontFamily), FontFamily.Default);
 
     public FontFamily FontFamily
     {
@@ -78,13 +78,13 @@ public int NumberOfLines
 
     public int NumberOfLinesThatCanFit => (int)Math.Ceiling(Bounds.Height / _lineHeight);
 
-    static TextArea()
+    static TextAreaControl()
     {
-        FontSizeProperty.Changed.AddClassHandler<TextArea>((o, _) => o.OnFontSizeChanged());
-        FontFamilyProperty.Changed.AddClassHandler<TextArea>((o, _) => o.OnFontFamilyChanged());
+        FontSizeProperty.Changed.AddClassHandler<TextAreaControl>((o, _) => o.OnFontSizeChanged());
+        FontFamilyProperty.Changed.AddClassHandler<TextAreaControl>((o, _) => o.OnFontFamilyChanged());
     }
 
-    public TextArea()
+    public TextAreaControl()
     {
         _lineHeight = GetInitialLineHeight(FontFamily, FontSize);
     }
@@ -122,7 +122,7 @@ public void SetLineBackground(int lineIndex, IBrush? background)
     /// <summary>
     /// Gets position of the character in the text pointed by <paramref name="position"/> (usually mouse cursor)
     /// </summary>
-    /// <param name="position">Position (X,Y) relative to <see cref="TextArea"/>.</param>
+    /// <param name="position">Position (X,Y) relative to <see cref="TextAreaControl"/>.</param>
     /// <returns>
     /// <para>A tuple containing the index of pointed line and index of pointer character in that line.</para>
     /// <para>If <paramref name="position"/> points above the first line, then <c>(0, 0)</c> is returned.</para>
diff --git a/src/LogAlligator.App/Controls/TextView/TextAreaLine.cs b/src/LogAlligator.App/Controls/TextArea/TextAreaLine.cs
similarity index 100%
rename from src/LogAlligator.App/Controls/TextView/TextAreaLine.cs
rename to src/LogAlligator.App/Controls/TextArea/TextAreaLine.cs
diff --git a/src/LogAlligator.App/Controls/TextView/EndlessTextView.axaml b/src/LogAlligator.App/Controls/TextArea/TextAreaView.axaml
similarity index 94%
rename from src/LogAlligator.App/Controls/TextView/EndlessTextView.axaml
rename to src/LogAlligator.App/Controls/TextArea/TextAreaView.axaml
index ebb97f5..237e1cf 100644
--- a/src/LogAlligator.App/Controls/TextView/EndlessTextView.axaml
+++ b/src/LogAlligator.App/Controls/TextArea/TextAreaView.axaml
@@ -6,12 +6,12 @@
              xmlns:textView="clr-namespace:LogAlligator.App.Controls.TextView"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="250"
              DataContext="{Binding RelativeSource={RelativeSource Self}}"
-             x:Class="LogAlligator.App.Controls.TextView.EndlessTextView">
+             x:Class="LogAlligator.App.Controls.TextView.TextAreaView">
     <UserControl.Styles>
         <Style Selector="Border#TextViewBorder">
             <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
         </Style>
-        <Style Selector="textView|EndlessTextView:focus Border#TextViewBorder">
+        <Style Selector="textView|TextAreaView:focus Border#TextViewBorder">
             <Setter Property="BorderBrush" Value="{DynamicResource HighlightBrush2}" />
         </Style>
     </UserControl.Styles>
@@ -57,7 +57,7 @@
             </StackPanel>
             <Panel Name="TextAreaContainer"
                    ClipToBounds="True">
-                <textView:TextArea Name="TextArea"
+                <textView:TextAreaControl Name="TextArea"
                                    Cursor="Ibeam"
                                    FontFamily="Arial"
                                    FontSize="12"
diff --git a/src/LogAlligator.App/Controls/TextView/EndlessTextView.axaml.cs b/src/LogAlligator.App/Controls/TextArea/TextAreaView.axaml.cs
similarity index 96%
rename from src/LogAlligator.App/Controls/TextView/EndlessTextView.axaml.cs
rename to src/LogAlligator.App/Controls/TextArea/TextAreaView.axaml.cs
index 17cd8f1..3b2026b 100644
--- a/src/LogAlligator.App/Controls/TextView/EndlessTextView.axaml.cs
+++ b/src/LogAlligator.App/Controls/TextArea/TextAreaView.axaml.cs
@@ -17,7 +17,7 @@
 
 namespace LogAlligator.App.Controls.TextView;
 
-public partial class EndlessTextView : UserControl
+public partial class TextAreaView : UserControl
 {
     private ILineProvider _lines = new EmptyLineProvider();
     private int _topLineIndex = 0;
@@ -32,7 +32,7 @@ public partial class EndlessTextView : UserControl
     private SearchPattern? _searchHighlight;
 
     private static readonly StyledProperty<IBrush> HighlightBackgroundProperty =
-    AvaloniaProperty.Register<EndlessTextView, IBrush>(nameof(HighlightBackground), new SolidColorBrush(Color.FromRgb(0, 120, 215)));
+    AvaloniaProperty.Register<TextAreaView, IBrush>(nameof(HighlightBackground), new SolidColorBrush(Color.FromRgb(0, 120, 215)));
     public IBrush HighlightBackground
     {
         get => GetValue(HighlightBackgroundProperty);
@@ -40,7 +40,7 @@ public IBrush HighlightBackground
     }
 
     private static readonly StyledProperty<IBrush> HighlightForegroundProperty =
-    AvaloniaProperty.Register<EndlessTextView, IBrush>(nameof(HighlightForeground), new SolidColorBrush(Colors.Black));
+    AvaloniaProperty.Register<TextAreaView, IBrush>(nameof(HighlightForeground), new SolidColorBrush(Colors.Black));
     public IBrush HighlightForeground
     {
         get => GetValue(HighlightForegroundProperty);
@@ -53,13 +53,13 @@ public class BookmarkEventArgs : RoutedEventArgs
         public required string LineText { get; init; }
         public required string SelectedText { get; init; }
 
-        public BookmarkEventArgs() : base(EndlessTextView.AddBookmarkEvent)
+        public BookmarkEventArgs() : base(TextAreaView.AddBookmarkEvent)
         {
         }
     }
 
     public static readonly RoutedEvent<BookmarkEventArgs> AddBookmarkEvent =
-        RoutedEvent.Register<EndlessTextView, BookmarkEventArgs>(nameof(AddBookmark2), RoutingStrategies.Bubble);
+        RoutedEvent.Register<TextAreaView, BookmarkEventArgs>(nameof(AddBookmark2), RoutingStrategies.Bubble);
 
     public event EventHandler<BookmarkEventArgs> AddBookmark2
     {
@@ -96,7 +96,7 @@ private set
         }
     }
 
-    public EndlessTextView()
+    public TextAreaView()
     {
         InitializeComponent();
 
@@ -115,7 +115,7 @@ public EndlessTextView()
         TextArea.PointerReleased += TextArea_PointerReleased;
         TextArea.PointerMoved += TextArea_PointerMoved;
 
-        WeakEventHandlerManager.Subscribe<Application, EventArgs, EndlessTextView>(
+        WeakEventHandlerManager.Subscribe<Application, EventArgs, TextAreaView>(
             Application.Current!, nameof(Application.ActualThemeVariantChanged), OnActualThemeVariantChanged);
 
         if (Design.IsDesignMode)