diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 089de223fc..2244dcfc56 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             OsuScreenStack screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
 
-            screenStack.Push(new TestMultiplayerSubScreen(index));
+            screenStack.Push(new TestOnlinePlaySubScreen(index));
 
             Children = new Drawable[]
             {
@@ -26,16 +26,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 new Header("Multiplayer", screenStack)
             };
 
-            AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestMultiplayerSubScreen(++index)));
+            AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestOnlinePlaySubScreen(++index)));
         }
 
-        private class TestMultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen
+        private class TestOnlinePlaySubScreen : OsuScreen, IOnlinePlaySubScreen
         {
             private readonly int index;
 
             public string ShortTitle => $"Screen {index}";
 
-            public TestMultiplayerSubScreen(int index)
+            public TestOnlinePlaySubScreen(int index)
             {
                 this.index = index;
             }
diff --git a/osu.Game/Screens/OnlinePlay/Header.cs b/osu.Game/Screens/OnlinePlay/Header.cs
index bffd744fdc..bf0a53cbb6 100644
--- a/osu.Game/Screens/OnlinePlay/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Header.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Screens.OnlinePlay
 
             breadcrumbs.Current.ValueChanged += screen =>
             {
-                if (screen.NewValue is IMultiplayerSubScreen multiScreen)
-                    title.Screen = multiScreen;
+                if (screen.NewValue is IOnlinePlaySubScreen onlineSubScreen)
+                    title.Screen = onlineSubScreen;
             };
 
             breadcrumbs.Current.TriggerChange();
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.OnlinePlay
             private readonly OsuSpriteText dot;
             private readonly OsuSpriteText pageTitle;
 
-            public IMultiplayerSubScreen Screen
+            public IOnlinePlaySubScreen Screen
             {
                 set => pageTitle.Text = value.ShortTitle.Titleize();
             }
diff --git a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
similarity index 82%
rename from osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
index fc149cd2b2..a4762292a9 100644
--- a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public interface IMultiplayerSubScreen : IOsuScreen
+    public interface IOnlinePlaySubScreen : IOsuScreen
     {
         string Title { get; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 76869300e8..0842574f54 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen
+    public class MultiplayerMatchSongSelect : SongSelect, IOnlinePlaySubScreen
     {
         public string ShortTitle => "song selection";
 
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 60897e8b4c..9ba2e41d12 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay
     [Cached]
     public abstract class OnlinePlayScreen : OsuScreen
     {
-        public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
+        public override bool CursorVisible => (screenStack.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
 
         // this is required due to PlayerLoader eventually being pushed to the main stack
         // while leases may be taken out by a subscreen.
@@ -245,7 +245,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnBackButton()
         {
-            if ((screenStack.CurrentScreen as IMultiplayerSubScreen)?.OnBackButton() == true)
+            if ((screenStack.CurrentScreen as IOnlinePlaySubScreen)?.OnBackButton() == true)
                 return true;
 
             if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
index b6dcfe6dab..e1bd889088 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
@@ -7,7 +7,7 @@ using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public abstract class OnlinePlaySubScreen : OsuScreen, IMultiplayerSubScreen
+    public abstract class OnlinePlaySubScreen : OsuScreen, IOnlinePlaySubScreen
     {
         public override bool DisallowExternalBeatmapRulesetChanges => false;
 
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 1b89a58b40..0948a4d19a 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.OnlinePlay.Components;
 
 namespace osu.Game.Screens.Select
 {
-    public class MatchSongSelect : SongSelect, IMultiplayerSubScreen
+    public class MatchSongSelect : SongSelect, IOnlinePlaySubScreen
     {
         public Action<PlaylistItem> Selected;