diff --git a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
index 5323ac44b1..8ffb54f2c7 100644
--- a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
@@ -16,9 +16,9 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestCaseEditorComposeTimeline : OsuTestCase
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineContainer), typeof(Timeline), typeof(BeatmapWaveformGraph), typeof(TimelineButton) };
+        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineArea), typeof(Timeline), typeof(BeatmapWaveformGraph), typeof(TimelineButton) };
 
-        private readonly TimelineContainer timelineContainer;
+        private readonly TimelineArea timelineArea;
 
         public TestCaseEditorComposeTimeline()
         {
@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual
                     Origin = Anchor.TopCentre,
                     State = Visibility.Visible
                 },
-                timelineContainer = new TimelineContainer
+                timelineArea = new TimelineArea
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(OsuGameBase osuGame)
         {
-            timelineContainer.Beatmap.BindTo(osuGame.Beatmap);
+            timelineArea.Beatmap.BindTo(osuGame.Beatmap);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Compose.cs b/osu.Game/Screens/Edit/Screens/Compose/Compose.cs
index d04c4c9c0f..9306a3394c 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Compose.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Compose.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
         {
             dependencies.Cache(beatDivisor);
 
-            TimelineContainer timelineContainer;
+            TimelineArea timelineArea;
             Children = new Drawable[]
             {
                 new GridContainer
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
                                                     {
                                                         RelativeSizeAxes = Axes.Both,
                                                         Padding = new MarginPadding { Right = 5 },
-                                                        Child = timelineContainer = new TimelineContainer { RelativeSizeAxes = Axes.Both }
+                                                        Child = timelineArea = new TimelineArea { RelativeSizeAxes = Axes.Both }
                                                     },
                                                     new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
                                                 },
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
                 },
             };
 
-            timelineContainer.Beatmap.BindTo(Beatmap);
+            timelineArea.Beatmap.BindTo(Beatmap);
 
             var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance();
             if (ruleset == null)
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineArea.cs
similarity index 96%
rename from osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineContainer.cs
rename to osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineArea.cs
index 95a8937b9b..6793c30409 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineContainer.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineArea.cs
@@ -12,13 +12,13 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
 {
-    public class TimelineContainer : CompositeDrawable
+    public class TimelineArea : CompositeDrawable
     {
         public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
         private readonly Timeline timeline;
 
-        public TimelineContainer()
+        public TimelineArea()
         {
             Masking = true;
             CornerRadius = 5;
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ZoomableScrollContainer.cs
index 592419b336..a5be41bb9f 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ZoomableScrollContainer.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
             private float startScrollOffset;
 
             /// <summary>
-            /// Transforms <see cref="Timeline.zoom"/> to a new value.
+            /// Transforms <see cref="TimeTimelinem"/> to a new value.
             /// </summary>
             /// <param name="focusPoint">The focus point in the waveform, in absolute coordinates local to the waveform.</param>
             /// <param name="waveformSize">The size of the waveform.</param>