diff --git a/osu.Game.Tests/Visual/TestCaseMenuOverlay.cs b/osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs
similarity index 91%
rename from osu.Game.Tests/Visual/TestCaseMenuOverlay.cs
rename to osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs
index 6c1c615ca9..ecb107085a 100644
--- a/osu.Game.Tests/Visual/TestCaseMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs
@@ -11,11 +11,11 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual
 {
     [Description("player pause/fail screens")]
-    internal class TestCaseMenuOverlay : OsuTestCase
+    internal class TestCaseGameplayMenuOverlay : OsuTestCase
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseContainer) };
 
-        public TestCaseMenuOverlay()
+        public TestCaseGameplayMenuOverlay()
         {
             FailOverlay failOverlay;
             PauseContainer.PauseOverlay pauseOverlay;
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index cf91ca0c15..5442ce63dd 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -120,7 +120,7 @@
     <Compile Include="Visual\TestCaseLeaderboard.cs" />
     <Compile Include="Visual\TestCaseMedalOverlay.cs" />
     <Compile Include="Visual\TestCaseButtonSystem.cs" />
-    <Compile Include="Visual\TestCaseMenuOverlay.cs" />
+    <Compile Include="Visual\TestCaseGameplayMenuOverlay.cs" />
     <Compile Include="Visual\TestCaseMods.cs" />
     <Compile Include="Visual\TestCaseMusicController.cs" />
     <Compile Include="Visual\TestCaseNotificationOverlay.cs" />
diff --git a/osu.Game/Screens/Play/FailOverlay.cs b/osu.Game/Screens/Play/FailOverlay.cs
index 3e31da2348..3242d8bb6e 100644
--- a/osu.Game/Screens/Play/FailOverlay.cs
+++ b/osu.Game/Screens/Play/FailOverlay.cs
@@ -10,7 +10,7 @@ using System.Linq;
 
 namespace osu.Game.Screens.Play
 {
-    public class FailOverlay : MenuOverlay
+    public class FailOverlay : GameplayMenuOverlay
     {
         public override string Header => "failed";
         public override string Description => "you're dead, try again?";
diff --git a/osu.Game/Screens/Play/MenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
similarity index 94%
rename from osu.Game/Screens/Play/MenuOverlay.cs
rename to osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 6e3c1a4d44..996717cbb5 100644
--- a/osu.Game/Screens/Play/MenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -17,7 +17,7 @@ using OpenTK.Input;
 
 namespace osu.Game.Screens.Play
 {
-    public abstract class MenuOverlay : OverlayContainer, IRequireHighFrequencyMousePosition
+    public abstract class GameplayMenuOverlay : OverlayContainer, IRequireHighFrequencyMousePosition
     {
         private const int transition_duration = 200;
         private const int button_height = 70;
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play
 
         private FillFlowContainer retryCounterContainer;
 
-        protected MenuOverlay()
+        protected GameplayMenuOverlay()
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.Play
 
         protected void AddButton(string text, Color4 colour, Action action)
         {
-            var button = new MenuOverlayButton
+            var button = new Button
             {
                 Text = text,
                 ButtonColour = colour,
@@ -247,7 +247,7 @@ namespace osu.Game.Screens.Play
                 selectionIndex = Buttons.IndexOf(button);
         }
 
-        private class MenuOverlayButton : DialogButton
+        private class Button : DialogButton
         {
             protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
             {
diff --git a/osu.Game/Screens/Play/PauseContainer.cs b/osu.Game/Screens/Play/PauseContainer.cs
index 5f5eeb63a0..6812ac5fc5 100644
--- a/osu.Game/Screens/Play/PauseContainer.cs
+++ b/osu.Game/Screens/Play/PauseContainer.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.Play
             base.Update();
         }
 
-        public class PauseOverlay : MenuOverlay
+        public class PauseOverlay : GameplayMenuOverlay
         {
             public Action OnResume;
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c190d988fa..155f08fd66 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -719,7 +719,7 @@
     <Compile Include="Screens\Play\KeyCounterCollection.cs" />
     <Compile Include="Screens\Play\KeyCounterKeyboard.cs" />
     <Compile Include="Screens\Play\KeyCounterMouse.cs" />
-    <Compile Include="Screens\Play\MenuOverlay.cs" />
+    <Compile Include="Screens\Play\GameplayMenuOverlay.cs" />
     <Compile Include="Screens\Play\PauseContainer.cs" />
     <Compile Include="Screens\Play\Player.cs" />
     <Compile Include="Screens\Play\PlayerLoader.cs" />