diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs
index d31b27e00d..fb6d59ddba 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs
@@ -123,9 +123,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
             }
 
-            public bool HitMarkersVisible => HitMarkers.Alpha > 0 && HitMarkers.Entries.Any();
-            public bool AimMarkersVisible => AimMarkers.Alpha > 0 && AimMarkers.Entries.Any();
-            public bool AimLinesVisible => AimLines.Alpha > 0 && AimLines.Vertices.Count > 1;
+            public bool HitMarkersVisible => ClickMarkers.Alpha > 0 && ClickMarkers.Entries.Any();
+            public bool AimMarkersVisible => MovementMarkers.Alpha > 0 && MovementMarkers.Entries.Any();
+            public bool AimLinesVisible => MovementPath.Alpha > 0 && MovementPath.Vertices.Count > 1;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/HitMarkersContainer.cs b/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/ClickMarkerContainer.cs
similarity index 85%
rename from osu.Game.Rulesets.Osu/UI/ReplayAnalysis/HitMarkersContainer.cs
rename to osu.Game.Rulesets.Osu/UI/ReplayAnalysis/ClickMarkerContainer.cs
index fcc5fa28c2..be56e26caf 100644
--- a/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/HitMarkersContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/ClickMarkerContainer.cs
@@ -6,12 +6,12 @@ using osu.Game.Rulesets.Objects.Pooling;
 
 namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
 {
-    public partial class HitMarkersContainer : PooledDrawableWithLifetimeContainer<HitMarkerEntry, HitMarker>
+    public partial class ClickMarkerContainer : PooledDrawableWithLifetimeContainer<HitMarkerEntry, HitMarker>
     {
         private readonly DrawablePool<HitMarkerLeftClick> leftPool;
         private readonly DrawablePool<HitMarkerRightClick> rightPool;
 
-        public HitMarkersContainer()
+        public ClickMarkerContainer()
         {
             AddInternal(leftPool = new DrawablePool<HitMarkerLeftClick>(15));
             AddInternal(rightPool = new DrawablePool<HitMarkerRightClick>(15));
diff --git a/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/AimMarkersContainer.cs b/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/MovementMarkerContainer.cs
similarity index 78%
rename from osu.Game.Rulesets.Osu/UI/ReplayAnalysis/AimMarkersContainer.cs
rename to osu.Game.Rulesets.Osu/UI/ReplayAnalysis/MovementMarkerContainer.cs
index 76e88ad5b0..8c2bdd5908 100644
--- a/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/AimMarkersContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/MovementMarkerContainer.cs
@@ -6,11 +6,11 @@ using osu.Game.Rulesets.Objects.Pooling;
 
 namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
 {
-    public partial class AimMarkersContainer : PooledDrawableWithLifetimeContainer<AimPointEntry, HitMarker>
+    public partial class MovementMarkerContainer : PooledDrawableWithLifetimeContainer<AimPointEntry, HitMarker>
     {
         private readonly DrawablePool<HitMarkerMovement> pool;
 
-        public AimMarkersContainer()
+        public MovementMarkerContainer()
         {
             AddInternal(pool = new DrawablePool<HitMarkerMovement>(80));
         }
diff --git a/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/AimLinesContainer.cs b/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/MovementPathContainer.cs
similarity index 92%
rename from osu.Game.Rulesets.Osu/UI/ReplayAnalysis/AimLinesContainer.cs
rename to osu.Game.Rulesets.Osu/UI/ReplayAnalysis/MovementPathContainer.cs
index db747e2775..58c5993f34 100644
--- a/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/AimLinesContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/ReplayAnalysis/MovementPathContainer.cs
@@ -9,12 +9,12 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
 {
-    public partial class AimLinesContainer : Path
+    public partial class MovementPathContainer : Path
     {
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
         private readonly SortedSet<AimPointEntry> aliveEntries = new SortedSet<AimPointEntry>(new AimLinePointComparator());
 
-        public AimLinesContainer()
+        public MovementPathContainer()
         {
             lifetimeManager.EntryBecameAlive += entryBecameAlive;
             lifetimeManager.EntryBecameDead += entryBecameDead;
@@ -32,8 +32,6 @@ namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
 
         public void Add(AimPointEntry entry) => lifetimeManager.AddEntry(entry);
 
-        public void Clear() => lifetimeManager.ClearEntries();
-
         private void entryBecameAlive(LifetimeEntry entry)
         {
             aliveEntries.Add((AimPointEntry)entry);
diff --git a/osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs b/osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs
index 2cc1948474..d33d468c7e 100644
--- a/osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Rulesets.Osu.UI
         private BindableBool aimMarkersEnabled { get; } = new BindableBool();
         private BindableBool aimLinesEnabled { get; } = new BindableBool();
 
-        protected readonly HitMarkersContainer HitMarkers;
-        protected readonly AimMarkersContainer AimMarkers;
-        protected readonly AimLinesContainer AimLines;
+        protected readonly ClickMarkerContainer ClickMarkers;
+        protected readonly MovementMarkerContainer MovementMarkers;
+        protected readonly MovementPathContainer MovementPath;
 
         private readonly Replay replay;
 
@@ -32,9 +32,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
             InternalChildren = new Drawable[]
             {
-                HitMarkers = new HitMarkersContainer(),
-                AimLines = new AimLinesContainer(),
-                AimMarkers = new AimMarkersContainer(),
+                ClickMarkers = new ClickMarkerContainer(),
+                MovementPath = new MovementPathContainer(),
+                MovementMarkers = new MovementMarkerContainer(),
             };
         }
 
@@ -52,9 +52,9 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             base.LoadComplete();
 
-            hitMarkersEnabled.BindValueChanged(enabled => HitMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
-            aimMarkersEnabled.BindValueChanged(enabled => AimMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
-            aimLinesEnabled.BindValueChanged(enabled => AimLines.FadeTo(enabled.NewValue ? 1 : 0), true);
+            hitMarkersEnabled.BindValueChanged(enabled => ClickMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
+            aimMarkersEnabled.BindValueChanged(enabled => MovementMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
+            aimLinesEnabled.BindValueChanged(enabled => MovementPath.FadeTo(enabled.NewValue ? 1 : 0), true);
         }
 
         private void loadReplay()
@@ -66,8 +66,8 @@ namespace osu.Game.Rulesets.Osu.UI
             {
                 var osuFrame = (OsuReplayFrame)frame;
 
-                AimMarkers.Add(new AimPointEntry(osuFrame.Time, osuFrame.Position));
-                AimLines.Add(new AimPointEntry(osuFrame.Time, osuFrame.Position));
+                MovementMarkers.Add(new AimPointEntry(osuFrame.Time, osuFrame.Position));
+                MovementPath.Add(new AimPointEntry(osuFrame.Time, osuFrame.Position));
 
                 bool leftButton = osuFrame.Actions.Contains(OsuAction.LeftButton);
                 bool rightButton = osuFrame.Actions.Contains(OsuAction.RightButton);
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.UI
                     leftHeld = false;
                 else if (!leftHeld && leftButton)
                 {
-                    HitMarkers.Add(new HitMarkerEntry(osuFrame.Time, osuFrame.Position, true));
+                    ClickMarkers.Add(new HitMarkerEntry(osuFrame.Time, osuFrame.Position, true));
                     leftHeld = true;
                 }
 
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.UI
                     rightHeld = false;
                 else if (!rightHeld && rightButton)
                 {
-                    HitMarkers.Add(new HitMarkerEntry(osuFrame.Time, osuFrame.Position, false));
+                    ClickMarkers.Add(new HitMarkerEntry(osuFrame.Time, osuFrame.Position, false));
                     rightHeld = true;
                 }
             }