diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 6d37a483a9..f4d167a193 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         private CachedModelDependencyContainer<Room> dependencies;
 
         [Resolved(canBeNull: true)]
-        private MultiplayerScreen multiplayer { get; set; }
+        private OnlinePlayScreen parentScreen { get; set; }
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
             {
-                multiplayer?.OpenNewRoom(Room.CreateCopy());
+                parentScreen?.OpenNewRoom(Room.CreateCopy());
             })
         };
     }
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2b0035c8bc..3a5af90824 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private BeatmapManager beatmapManager { get; set; }
 
         [Resolved(canBeNull: true)]
-        protected MultiplayerScreen Multiplayer { get; private set; }
+        protected OnlinePlayScreen ParentScreen { get; private set; }
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         protected void StartPlay(Func<Player> player)
         {
             sampleStart?.Play();
-            Multiplayer?.Push(new PlayerLoader(player));
+            ParentScreen?.Push(new PlayerLoader(player));
         }
 
         private void selectedItemChanged()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index ce4918dae1..76f5c74433 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.OnlinePlay.Lounge;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class Multiplayer : MultiplayerScreen
+    public class Multiplayer : OnlinePlayScreen
     {
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
similarity index 99%
rename from osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 3693e897ae..08741ef4fe 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -27,7 +27,7 @@ using osuTK;
 namespace osu.Game.Screens.OnlinePlay
 {
     [Cached]
-    public abstract class MultiplayerScreen : OsuScreen
+    public abstract class OnlinePlayScreen : OsuScreen
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly Drawable header;
         private readonly Drawable headerBackground;
 
-        protected MultiplayerScreen()
+        protected OnlinePlayScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
index a7fb391fbc..5b132c97fd 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.OnlinePlay.Match;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public class Playlists : MultiplayerScreen
+    public class Playlists : OnlinePlayScreen
     {
         protected override void UpdatePollingRate(bool isIdle)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 51a9ae569e..e76ca995bf 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -28,9 +28,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private MultiplayerScreen multiplayer { get; set; }
-
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
 
@@ -124,7 +121,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                             RequestShowResults = item =>
                                                                             {
                                                                                 Debug.Assert(roomId.Value != null);
-                                                                                multiplayer?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
+                                                                                ParentScreen?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
                                                                             }
                                                                         }
                                                                     },