diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
index 7a7679c376..0bc71924ce 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Menus
 
             AddStep("click on flag", () =>
             {
-                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<ClickableUpdateableFlag>().First());
+                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<UpdateableFlag>().First());
                 InputManager.Click(MouseButton.Left);
             });
             AddAssert("login overlay is hidden", () => loginOverlay.State.Value == Visibility.Hidden);
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 114ef5db22..136c9cc8e7 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Online.Leaderboards
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        new ClickableUpdateableFlag(user.CountryCode)
+                                                        new UpdateableFlag(user.CountryCode)
                                                         {
                                                             Anchor = Anchor.CentreLeft,
                                                             Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index e144a55a96..1fc997fdad 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     Margin = new MarginPadding { Right = horizontal_inset },
                     Text = score.DisplayAccuracy,
                 },
-                new ClickableUpdateableFlag(score.User.CountryCode)
+                new UpdateableFlag(score.User.CountryCode)
                 {
                     Size = new Vector2(19, 14),
                     ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index e38e6efd06..9dc2ce204f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly UpdateableAvatar avatar;
         private readonly LinkFlowContainer usernameText;
         private readonly DrawableDate achievedOn;
-        private readonly ClickableUpdateableFlag flag;
+        private readonly UpdateableFlag flag;
 
         public TopScoreUserSection()
         {
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                     },
                                 }
                             },
-                            flag = new ClickableUpdateableFlag
+                            flag = new UpdateableFlag
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 15aaf333f4..36bd8a5af5 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Profile.Header
         private OsuSpriteText usernameText = null!;
         private ExternalLinkButton openUserExternally = null!;
         private OsuSpriteText titleText = null!;
-        private ClickableUpdateableFlag userFlag = null!;
+        private UpdateableFlag userFlag = null!;
         private OsuHoverContainer userCountryContainer = null!;
         private OsuSpriteText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
@@ -162,7 +162,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                     Direction = FillDirection.Horizontal,
                                                     Children = new Drawable[]
                                                     {
-                                                        userFlag = new ClickableUpdateableFlag
+                                                        userFlag = new UpdateableFlag
                                                         {
                                                             Size = new Vector2(28, 20),
                                                             ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Overlays/Rankings/CountryPill.cs b/osu.Game/Overlays/Rankings/CountryPill.cs
index bfa7363de8..294b6df34d 100644
--- a/osu.Game/Overlays/Rankings/CountryPill.cs
+++ b/osu.Game/Overlays/Rankings/CountryPill.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Rankings
 
         private readonly Container content;
         private readonly Box background;
-        private readonly ClickableUpdateableFlag flag;
+        private readonly UpdateableFlag flag;
         private readonly OsuSpriteText countryName;
 
         public CountryPill()
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Rankings
                                 Spacing = new Vector2(5, 0),
                                 Children = new Drawable[]
                                 {
-                                    flag = new ClickableUpdateableFlag
+                                    flag = new UpdateableFlag
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
index b68ecd709a..27d894cdc2 100644
--- a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Overlays.Rankings.Tables
             Margin = new MarginPadding { Bottom = row_spacing },
             Children = new[]
             {
-                new ClickableUpdateableFlag(GetCountryCode(item))
+                new UpdateableFlag(GetCountryCode(item))
                 {
                     Size = new Vector2(28, 20),
                     ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 1f922073ec..c79c210e30 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                             FillMode = FillMode.Fit,
                                             User = user
                                         },
-                                        new ClickableUpdateableFlag
+                                        new UpdateableFlag
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Screens/Play/HUD/PlayerFlag.cs b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
index 7234db71b5..85799c03d3 100644
--- a/osu.Game/Screens/Play/HUD/PlayerFlag.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class PlayerFlag : CompositeDrawable, ISerialisableDrawable
     {
-        private readonly ClickableUpdateableFlag flag;
+        private readonly UpdateableFlag flag;
 
         private const float default_size = 40f;
 
         public PlayerFlag()
         {
             Size = new Vector2(default_size, default_size / 1.4f);
-            InternalChild = flag = new ClickableUpdateableFlag
+            InternalChild = flag = new UpdateableFlag
             {
                 RelativeSizeAxes = Axes.Both,
             };
diff --git a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs b/osu.Game/Users/Drawables/UpdateableFlag.cs
similarity index 91%
rename from osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
rename to osu.Game/Users/Drawables/UpdateableFlag.cs
index d19234fc17..8f8d7052e5 100644
--- a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/UpdateableFlag.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class ClickableUpdateableFlag : ModelBackedDrawable<CountryCode>
+    public partial class UpdateableFlag : ModelBackedDrawable<CountryCode>
     {
         public CountryCode CountryCode
         {
@@ -30,7 +30,7 @@ namespace osu.Game.Users.Drawables
         /// </summary>
         public Action? Action;
 
-        public ClickableUpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
+        public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
         {
             CountryCode = countryCode;
         }
diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
index e798c8cc11..3c1b68f9ef 100644
--- a/osu.Game/Users/ExtendedUserPanel.cs
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Users
 
         protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar(User, false);
 
-        protected ClickableUpdateableFlag CreateFlag() => new ClickableUpdateableFlag(User.CountryCode)
+        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.CountryCode)
         {
             Size = new Vector2(36, 26),
             Action = Action,