diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index 01b71539fe..5c8ac5ce73 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -5,6 +5,7 @@ using System.ComponentModel;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -13,7 +14,7 @@ using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public partial class BeatmapTitle : OnlinePlayComposite
+    public partial class BeatmapTitle : CompositeDrawable
     {
         private readonly Room room;
         private readonly LinkFlowContainer textFlow;
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
index 09a3602cdd..d9cdcac7d7 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
     /// <summary>
     /// A header used in the multiplayer interface which shows text / details beneath a line.
     /// </summary>
-    public partial class OverlinedHeader : OnlinePlayComposite
+    public partial class OverlinedHeader : CompositeDrawable
     {
         private bool showLine = true;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
index f9744717d5..db9cf3f92d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
@@ -11,7 +11,7 @@ using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public partial class ParticipantCountDisplay : OnlinePlayComposite
+    public partial class ParticipantCountDisplay : CompositeDrawable
     {
         private const float text_size = 30;
         private const float transition_duration = 100;
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
index 5a040dcadb..a12d843b0a 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
@@ -4,12 +4,13 @@
 using System.ComponentModel;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public partial class ParticipantsDisplay : OnlinePlayComposite
+    public partial class ParticipantsDisplay : CompositeDrawable
     {
         public readonly Bindable<string> Details = new Bindable<string>();
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
index 1be23014bd..79084a5285 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public partial class ParticipantsList : OnlinePlayComposite
+    public partial class ParticipantsList : CompositeDrawable
     {
         public const float TILE_SIZE = 35;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
index b3e60d4318..39b5edbd26 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
@@ -12,7 +12,7 @@ using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public partial class RoomLocalUserInfo : OnlinePlayComposite
+    public partial class RoomLocalUserInfo : CompositeDrawable
     {
         private readonly Room room;
         private OsuSpriteText attemptDisplay = null!;
diff --git a/osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
index ff2eac0f30..2bdb41ce12 100644
--- a/osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
@@ -18,7 +18,7 @@ using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public partial class StarRatingRangeDisplay : OnlinePlayComposite
+    public partial class StarRatingRangeDisplay : CompositeDrawable
     {
         private readonly Room room;
 
diff --git a/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeTimeRemainingRing.cs b/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeTimeRemainingRing.cs
index bffbb664a3..bf01ee6b52 100644
--- a/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeTimeRemainingRing.cs
+++ b/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeTimeRemainingRing.cs
@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.DailyChallenge
 {
-    public partial class DailyChallengeTimeRemainingRing : OnlinePlayComposite
+    public partial class DailyChallengeTimeRemainingRing : CompositeDrawable
     {
         private readonly Room room;
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index c368666ac2..2a9bb93d94 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -346,7 +346,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
             if (Room.Type != MatchType.Playlists)
             {
-                pills.AddRange(new OnlinePlayComposite[]
+                pills.AddRange(new Drawable[]
                 {
                     new MatchTypePill(Room),
                     new QueueModePill(Room),
@@ -377,7 +377,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             Room.PropertyChanged -= onRoomPropertyChanged;
         }
 
-        private partial class RoomStatusText : OnlinePlayComposite
+        private partial class RoomStatusText : CompositeDrawable
         {
             public readonly IBindable<PlaylistItem?> SelectedItem = new Bindable<PlaylistItem?>();
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
index d989bd6c82..5bcc974c26 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
@@ -21,7 +21,7 @@ using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public partial class DrawableRoomParticipantsList : OnlinePlayComposite
+    public partial class DrawableRoomParticipantsList : CompositeDrawable
     {
         public const float SHEAR_WIDTH = 12f;
         private const float avatar_size = 36;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs
index 18c7972c06..3b03ce61f1 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/EndDateInfo.cs
@@ -5,12 +5,13 @@ using System;
 using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public partial class EndDateInfo : OnlinePlayComposite
+    public partial class EndDateInfo : CompositeDrawable
     {
         private readonly Room room;
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
index 3e6d7a2e54..c65a5e2469 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
@@ -3,13 +3,14 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public abstract partial class OnlinePlayPill : OnlinePlayComposite
+    public abstract partial class OnlinePlayPill : CompositeDrawable
     {
         protected PillContainer Pill { get; private set; } = null!;
         protected OsuTextFlowContainer TextFlow { get; private set; } = null!;
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
index 14d506a368..09aed176c4 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
         protected const float TRANSITION_DURATION = 350;
         protected const float FIELD_PADDING = 25;
 
-        protected OnlinePlayComposite Settings { get; set; } = null!;
+        protected Drawable Settings { get; set; } = null!;
 
         protected override bool BlockScrollInput => false;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected abstract void SelectBeatmap();
 
-        protected abstract OnlinePlayComposite CreateSettings(Room room);
+        protected abstract Drawable CreateSettings(Room room);
 
         protected override void PopIn()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index ec257a3d1b..1dbef079d4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         protected override void SelectBeatmap() => settings.SelectBeatmap();
 
-        protected override OnlinePlayComposite CreateSettings(Room room) => settings = new MatchSettings(room)
+        protected override Drawable CreateSettings(Room room) => settings = new MatchSettings(room)
         {
             RelativeSizeAxes = Axes.Both,
             RelativePositionAxes = Axes.Y,
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             SelectedItem = { BindTarget = SelectedItem }
         };
 
-        protected partial class MatchSettings : OnlinePlayComposite
+        protected partial class MatchSettings : CompositeDrawable
         {
             private const float disabled_alpha = 0.2f;
 
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
deleted file mode 100644
index 3b0e974a90..0000000000
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics.Containers;
-using osu.Game.Online.Rooms;
-
-namespace osu.Game.Screens.OnlinePlay
-{
-    /// <summary>
-    /// A <see cref="CompositeDrawable"/> that exposes bindables for <see cref="Room"/> properties.
-    /// </summary>
-    public partial class OnlinePlayComposite : CompositeDrawable;
-}
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
index 468c284d95..88af161cc8 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
@@ -47,14 +47,14 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         protected override void SelectBeatmap() => settings.SelectBeatmap();
 
-        protected override OnlinePlayComposite CreateSettings(Room room) => settings = new MatchSettings(room)
+        protected override Drawable CreateSettings(Room room) => settings = new MatchSettings(room)
         {
             RelativeSizeAxes = Axes.Both,
             RelativePositionAxes = Axes.Y,
             EditPlaylist = () => EditPlaylist?.Invoke()
         };
 
-        protected partial class MatchSettings : OnlinePlayComposite
+        protected partial class MatchSettings : CompositeDrawable
         {
             private const float disabled_alpha = 0.2f;