diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
index dd5f52155c..e019de0f6f 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
@@ -3,12 +3,8 @@
 
 #nullable disable
 
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
@@ -24,8 +20,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         private void onMatchTypeChanged(ValueChangedEvent<MatchType> type)
         {
-            textFlow.Clear();
-            textFlow.AddText(type.NewValue.GetLocalisableDescription());
+            TextFlow.Clear();
+            TextFlow.AddText(type.NewValue.GetLocalisableDescription());
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
index 45a0fd2a1b..80e82c3856 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public partial class OnlinePlayPill : OnlinePlayComposite
     {
-        protected PillContainer pill;
-        protected OsuTextFlowContainer textFlow;
+        protected PillContainer Pill;
+        protected OsuTextFlowContainer TextFlow;
 
         public OnlinePlayPill()
         {
@@ -23,9 +23,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = pill = new PillContainer
+            InternalChild = Pill = new PillContainer
             {
-                Child = textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
+                Child = TextFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.GetFont(size: 12))
                 {
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreLeft,
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
index c3118ab285..6687f30bc0 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistCountPill.cs
@@ -32,10 +32,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 ? Playlist.Count(i => !i.Expired)
                 : PlaylistItemStats.Value.CountActive;
 
-            textFlow.Clear();
-            textFlow.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));
-            textFlow.AddText(" ");
-            textFlow.AddText("Beatmap".ToQuantity(activeItems, ShowQuantityAs.None));
+            TextFlow.Clear();
+            TextFlow.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));
+            TextFlow.AddText(" ");
+            TextFlow.AddText("Beatmap".ToQuantity(activeItems, ShowQuantityAs.None));
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
index d37dede961..e402653c2f 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         private void onQueueModeChanged(ValueChangedEvent<QueueMode> mode)
         {
-            textFlow.Clear();
-            textFlow.AddText(mode.NewValue.GetLocalisableDescription());
+            TextFlow.Clear();
+            TextFlow.AddText(mode.NewValue.GetLocalisableDescription());
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
index a01d14ab40..d266104cf5 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
@@ -18,17 +18,17 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             base.LoadComplete();
 
-            pill.Background.Colour = colours.Pink;
-            pill.Background.Alpha = 1;
+            Pill.Background.Colour = colours.Pink;
+            Pill.Background.Alpha = 1;
 
             Category.BindValueChanged(c =>
             {
-                textFlow.Clear();
-                textFlow.AddText(c.NewValue.GetLocalisableDescription());
+                TextFlow.Clear();
+                TextFlow.AddText(c.NewValue.GetLocalisableDescription());
 
                 var backgroundColour = colours.ForRoomCategory(Category.Value);
                 if (backgroundColour != null)
-                    pill.Background.Colour = backgroundColour.Value;
+                    Pill.Background.Colour = backgroundColour.Value;
             }, true);
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index a4fdd39236..fa5eba4b69 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -34,11 +34,11 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             RoomStatus status = getDisplayStatus();
 
-            pill.Background.Alpha = 1;
-            pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
+            Pill.Background.Alpha = 1;
+            Pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
 
-            textFlow.Clear();
-            textFlow.AddText(status.Message);
+            TextFlow.Clear();
+            TextFlow.AddText(status.Message);
         }
 
         private RoomStatus getDisplayStatus()