diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index 583493181b..006cfdea3b 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Chat.ChannelList
         private Box? hoverBox;
         private Box? selectBox;
         private OsuSpriteText? text;
-        private ChannelListItemClose? close;
+        private ChannelListItemCloseButton? close;
 
         [Resolved]
         private Bindable<Channel> selectedChannel { get; set; } = null!;
@@ -97,14 +97,14 @@ namespace osu.Game.Overlays.Chat.ChannelList
                                     RelativeSizeAxes = Axes.X,
                                     Truncate = true,
                                 },
-                                new ChannelListItemMention
+                                new ChannelListItemMentionPill
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
                                     Margin = new MarginPadding { Right = 3 },
                                     Mentions = { BindTarget = Mentions },
                                 },
-                                close = new ChannelListItemClose
+                                close = new ChannelListItemCloseButton
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItemClose.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItemCloseButton.cs
similarity index 93%
rename from osu.Game/Overlays/Chat/ChannelList/ChannelListItemClose.cs
rename to osu.Game/Overlays/Chat/ChannelList/ChannelListItemCloseButton.cs
index 37a1fcdde7..3e595093b4 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItemClose.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItemCloseButton.cs
@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Chat.ChannelList
 {
-    public class ChannelListItemClose : OsuAnimatedButton
+    public class ChannelListItemCloseButton : OsuAnimatedButton
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour osuColour)
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItemMention.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItemMentionPill.cs
similarity index 96%
rename from osu.Game/Overlays/Chat/ChannelList/ChannelListItemMention.cs
rename to osu.Game/Overlays/Chat/ChannelList/ChannelListItemMentionPill.cs
index 3a1c3b7619..165756cfcd 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItemMention.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItemMentionPill.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Chat.ChannelList
 {
-    public class ChannelListItemMention : CircularContainer
+    public class ChannelListItemMentionPill : CircularContainer
     {
         public readonly BindableInt Mentions = new BindableInt();