diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
index 4c76a04bdb..f12e647b4e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs
@@ -46,11 +46,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddStep(@"Seek track to 6 second", () => musicController.SeekTo(6000));
-            AddStep(@"Call PrevTrack", () => musicController.PrevTrack());
+            AddStep(@"Call PrevTrack", () => musicController.PreviousTrack());
             AddAssert(@"Check if it restarted", () => currentTrack == Beatmap.Value);
 
             AddStep(@"Seek track to 2 second", () => musicController.SeekTo(2000));
-            AddStep(@"Call PrevTrack", () => musicController.PrevTrack());
+            AddStep(@"Call PrevTrack", () => musicController.PreviousTrack());
             // If the track isn't changing, check the current track's time instead
             AddAssert(@"Check if it changed to prev track'", () => currentTrack != Beatmap.Value || currentTrack.Track.CurrentTime < 2000);
         }
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index b2b0a0afd9..bb246763c7 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Overlays
 
         public IBindableList<BeatmapSetInfo> BeatmapSets => beatmapSets;
 
+        /// <summary>
+        /// Point in time after which the current track will be restarted on triggering a "previous track" action.
+        /// </summary>
         private const double restart_cutoff_point = 5000;
 
         private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
@@ -155,15 +158,15 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Play the previous track or restart the current track if it's current time below <see cref="restart_cutoff_point"/>
         /// </summary>
-        /// <returns>The <see cref="PreviousButtonAction"/> that indicate the decided action</returns>
-        public PreviousButtonAction PrevTrack()
+        /// <returns>The <see cref="PreviousTrackResult"/> that indicate the decided action</returns>
+        public PreviousTrackResult PreviousTrack()
         {
             var currentTrackPosition = current?.Track.CurrentTime;
 
             if (currentTrackPosition >= restart_cutoff_point)
             {
                 SeekTo(0);
-                return PreviousButtonAction.Restart;
+                return PreviousTrackResult.Restart;
             }
 
             queuedDirection = TrackChangeDirection.Prev;
@@ -176,10 +179,10 @@ namespace osu.Game.Overlays
                     working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
                 beatmap.Value.Track.Restart();
 
-                return PreviousButtonAction.Previous;
+                return PreviousTrackResult.Previous;
             }
 
-            return PreviousButtonAction.None;
+            return PreviousTrackResult.None;
         }
 
         /// <summary>
@@ -285,13 +288,13 @@ namespace osu.Game.Overlays
                     return true;
 
                 case GlobalAction.MusicPrev:
-                    switch (PrevTrack())
+                    switch (PreviousTrack())
                     {
-                        case PreviousButtonAction.Restart:
+                        case PreviousTrackResult.Restart:
                             onScreenDisplay?.Display(new MusicControllerToast("Restart track"));
                             break;
 
-                        case PreviousButtonAction.Previous:
+                        case PreviousTrackResult.Previous:
                             onScreenDisplay?.Display(new MusicControllerToast("Previous track"));
                             break;
                     }
@@ -320,7 +323,7 @@ namespace osu.Game.Overlays
         Prev
     }
 
-    public enum PreviousButtonAction
+    public enum PreviousTrackResult
     {
         None,
         Restart,
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 6b79f2af07..c1c871aade 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Overlays
                                                 {
                                                     Anchor = Anchor.Centre,
                                                     Origin = Anchor.Centre,
-                                                    Action = () => musicController.PrevTrack(),
+                                                    Action = () => musicController.PreviousTrack(),
                                                     Icon = FontAwesome.Solid.StepBackward,
                                                 },
                                                 playButton = new MusicIconButton