diff --git a/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs b/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
index 92bb41b7d5..0603fa3250 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Tests.Visual.Online
                 Child = section = new HistoricalSection(),
             });
 
-            AddStep("Show peppy", () => section.UserProfile.Value = new UserProfile(new APIUser { Id = 2 }));
-            AddStep("Show WubWoofWolf", () => section.UserProfile.Value = new UserProfile(new APIUser { Id = 39828 }));
+            AddStep("Show peppy", () => section.UserProfile.Value = new UserProfileData(new APIUser { Id = 2 }));
+            AddStep("Show WubWoofWolf", () => section.UserProfile.Value = new UserProfileData(new APIUser { Id = 39828 }));
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs b/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
index a486d77f97..8bd4e398e4 100644
--- a/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
+++ b/osu.Game.Tests/Visual/Online/TestScenePlayHistorySubsection.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
 
-        private readonly Bindable<UserProfile?> user = new Bindable<UserProfile?>();
+        private readonly Bindable<UserProfileData?> user = new Bindable<UserProfileData?>();
         private readonly PlayHistorySubsection section;
 
         public TestScenePlayHistorySubsection()
@@ -44,49 +44,49 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestNullValues()
         {
-            AddStep("Load user", () => user.Value = new UserProfile(user_with_null_values));
+            AddStep("Load user", () => user.Value = new UserProfileData(user_with_null_values));
             AddAssert("Section is hidden", () => section.Alpha == 0);
         }
 
         [Test]
         public void TestEmptyValues()
         {
-            AddStep("Load user", () => user.Value = new UserProfile(user_with_empty_values));
+            AddStep("Load user", () => user.Value = new UserProfileData(user_with_empty_values));
             AddAssert("Section is hidden", () => section.Alpha == 0);
         }
 
         [Test]
         public void TestOneValue()
         {
-            AddStep("Load user", () => user.Value = new UserProfile(user_with_one_value));
+            AddStep("Load user", () => user.Value = new UserProfileData(user_with_one_value));
             AddAssert("Section is hidden", () => section.Alpha == 0);
         }
 
         [Test]
         public void TestTwoValues()
         {
-            AddStep("Load user", () => user.Value = new UserProfile(user_with_two_values));
+            AddStep("Load user", () => user.Value = new UserProfileData(user_with_two_values));
             AddAssert("Section is visible", () => section.Alpha == 1);
         }
 
         [Test]
         public void TestConstantValues()
         {
-            AddStep("Load user", () => user.Value = new UserProfile(user_with_constant_values));
+            AddStep("Load user", () => user.Value = new UserProfileData(user_with_constant_values));
             AddAssert("Section is visible", () => section.Alpha == 1);
         }
 
         [Test]
         public void TestConstantZeroValues()
         {
-            AddStep("Load user", () => user.Value = new UserProfile(user_with_zero_values));
+            AddStep("Load user", () => user.Value = new UserProfileData(user_with_zero_values));
             AddAssert("Section is visible", () => section.Alpha == 1);
         }
 
         [Test]
         public void TestFilledValues()
         {
-            AddStep("Load user", () => user.Value = new UserProfile(user_with_filled_values));
+            AddStep("Load user", () => user.Value = new UserProfileData(user_with_filled_values));
             AddAssert("Section is visible", () => section.Alpha == 1);
             AddAssert("Array length is the same", () => user_with_filled_values.MonthlyPlayCounts.Length == getChartValuesLength());
         }
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestMissingValues()
         {
-            AddStep("Load user", () => user.Value = new UserProfile(user_with_missing_values));
+            AddStep("Load user", () => user.Value = new UserProfileData(user_with_missing_values));
             AddAssert("Section is visible", () => section.Alpha == 1);
             AddAssert("Array length is 7", () => getChartValuesLength() == 7);
         }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
index 4caab98f63..75de033497 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
@@ -29,13 +29,13 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestBasic()
         {
-            AddStep("Show example user", () => header.UserProfile.Value = new UserProfile(TestSceneUserProfileOverlay.TEST_USER));
+            AddStep("Show example user", () => header.UserProfile.Value = new UserProfileData(TestSceneUserProfileOverlay.TEST_USER));
         }
 
         [Test]
         public void TestOnlineState()
         {
-            AddStep("Show online user", () => header.UserProfile.Value = new UserProfile(new APIUser
+            AddStep("Show online user", () => header.UserProfile.Value = new UserProfileData(new APIUser
             {
                 Id = 1001,
                 Username = "IAmOnline",
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Online
                 IsOnline = true,
             }));
 
-            AddStep("Show offline user", () => header.UserProfile.Value = new UserProfile(new APIUser
+            AddStep("Show offline user", () => header.UserProfile.Value = new UserProfileData(new APIUser
             {
                 Id = 1002,
                 Username = "IAmOffline",
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestRankedState()
         {
-            AddStep("Show ranked user", () => header.UserProfile.Value = new UserProfile(new APIUser
+            AddStep("Show ranked user", () => header.UserProfile.Value = new UserProfileData(new APIUser
             {
                 Id = 2001,
                 Username = "RankedUser",
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Visual.Online
                 }
             }));
 
-            AddStep("Show unranked user", () => header.UserProfile.Value = new UserProfile(new APIUser
+            AddStep("Show unranked user", () => header.UserProfile.Value = new UserProfileData(new APIUser
             {
                 Id = 2002,
                 Username = "UnrankedUser",
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
index 184b969279..503719add4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddStep("Show cookiezi", () => ranks.UserProfile.Value = new UserProfile(new APIUser { Id = 124493 }));
+            AddStep("Show cookiezi", () => ranks.UserProfile.Value = new UserProfileData(new APIUser { Id = 124493 }));
         }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 64a333dff7..a13f3585a5 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Profile.Header
 {
     public partial class BottomHeaderContainer : CompositeDrawable
     {
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         private LinkFlowContainer topLinkContainer = null!;
         private LinkFlowContainer bottomLinkContainer = null!;
diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 701c4a1464..6675b5f52a 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Profile.Header
     public partial class CentreHeaderContainer : CompositeDrawable
     {
         public readonly BindableBool DetailsVisible = new BindableBool(true);
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         private OverlinedInfoContainer hiddenDetailGlobal = null!;
         private OverlinedInfoContainer hiddenDetailCountry = null!;
diff --git a/osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs b/osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
index 48e9718a7c..959212413f 100644
--- a/osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public partial class FollowersButton : ProfileHeaderStatisticsButton
     {
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         public override LocalisableString TooltipText => FriendsStrings.ButtonsDisabled;
 
diff --git a/osu.Game/Overlays/Profile/Header/Components/LevelBadge.cs b/osu.Game/Overlays/Profile/Header/Components/LevelBadge.cs
index f68c9838a0..3e5582a1c8 100644
--- a/osu.Game/Overlays/Profile/Header/Components/LevelBadge.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/LevelBadge.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public partial class LevelBadge : CompositeDrawable, IHasTooltip
     {
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         public LocalisableString TooltipText { get; private set; }
 
diff --git a/osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs b/osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs
index e3100c5af5..69be4c7b7a 100644
--- a/osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public partial class LevelProgressBar : CompositeDrawable, IHasTooltip
     {
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         public LocalisableString TooltipText { get; }
 
diff --git a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
index 29b42cb223..cae407ef91 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public partial class MappingSubscribersButton : ProfileHeaderStatisticsButton
     {
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         public override LocalisableString TooltipText => FollowsStrings.MappingFollowers;
 
diff --git a/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs b/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
index f57b43c3a4..45e20957c8 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public partial class MessageUserButton : ProfileHeaderButton
     {
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         public override LocalisableString TooltipText => UsersStrings.CardSendMessage;
 
diff --git a/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs b/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
index 1de13ba7c7..687382ed90 100644
--- a/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public partial class OverlinedTotalPlayTime : CompositeDrawable, IHasTooltip
     {
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         public LocalisableString TooltipText { get; set; }
 
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             UserProfile.BindValueChanged(updateTime, true);
         }
 
-        private void updateTime(ValueChangedEvent<UserProfile?> userProfile)
+        private void updateTime(ValueChangedEvent<UserProfileData?> userProfile)
         {
             int? playTime = userProfile.NewValue?.User.Statistics?.PlayTime;
             TooltipText = (playTime ?? 0) / 3600 + " hours";
diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index 8b9a90c9a3..b7b9fd52c7 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Header
         private FillFlowContainer? fillFlow;
         private RankGraph rankGraph = null!;
 
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         private bool expanded = true;
 
@@ -170,7 +170,7 @@ namespace osu.Game.Overlays.Profile.Header
             };
         }
 
-        private void updateDisplay(UserProfile? userProfile)
+        private void updateDisplay(UserProfileData? userProfile)
         {
             var user = userProfile?.User;
 
diff --git a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
index b41c60ed4e..df51a82cc9 100644
--- a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Header
     {
         private FillFlowContainer badgeFlowContainer = null!;
 
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 69258c914f..0889c36b16 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Profile.Header
     {
         private const float avatar_size = 110;
 
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
@@ -173,7 +173,7 @@ namespace osu.Game.Overlays.Profile.Header
             UserProfile.BindValueChanged(user => updateUser(user.NewValue));
         }
 
-        private void updateUser(UserProfile? userProfile)
+        private void updateUser(UserProfileData? userProfile)
         {
             var user = userProfile?.User;
 
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 447e9148e8..f87ee707ff 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile
     {
         private UserCoverBackground coverContainer = null!;
 
-        public Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         private CentreHeaderContainer centreHeaderContainer;
         private DetailHeaderContainer detailHeaderContainer;
@@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Profile
 
         protected override OverlayTitle CreateTitle() => new ProfileHeaderTitle();
 
-        private void updateDisplay(UserProfile? userProfile) => coverContainer.User = userProfile?.User;
+        private void updateDisplay(UserProfileData? userProfile) => coverContainer.User = userProfile?.User;
 
         private partial class ProfileHeaderTitle : OverlayTitle
         {
diff --git a/osu.Game/Overlays/Profile/ProfileSection.cs b/osu.Game/Overlays/Profile/ProfileSection.cs
index 97b8f2b13f..1e85411bc6 100644
--- a/osu.Game/Overlays/Profile/ProfileSection.cs
+++ b/osu.Game/Overlays/Profile/ProfileSection.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Profile
 
         protected override Container<Drawable> Content => content;
 
-        public readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        public readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         protected ProfileSection()
         {
diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 3b1f26ee7d..0e74aba369 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
 
         protected override int InitialItemsCount => type == BeatmapSetType.Graveyard ? 2 : 6;
 
-        public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<UserProfile?> user, LocalisableString headerText)
+        public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<UserProfileData?> user, LocalisableString headerText)
             : base(user, headerText)
         {
             this.type = type;
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index 724733c7a9..0ba93200d9 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         /// </summary>
         protected abstract LocalisableString GraphCounterName { get; }
 
-        protected ChartProfileSubsection(Bindable<UserProfile?> userProfile, LocalisableString headerText)
+        protected ChartProfileSubsection(Bindable<UserProfileData?> userProfile, LocalisableString headerText)
             : base(userProfile, headerText)
         {
         }
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             UserProfile.BindValueChanged(onUserChanged, true);
         }
 
-        private void onUserChanged(ValueChangedEvent<UserProfile?> e)
+        private void onUserChanged(ValueChangedEvent<UserProfileData?> e)
         {
             var values = GetValues(e.NewValue?.User);
 
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index 5851262229..6b08b68962 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public partial class PaginatedMostPlayedBeatmapContainer : PaginatedProfileSubsection<APIUserMostPlayedBeatmap>
     {
-        public PaginatedMostPlayedBeatmapContainer(Bindable<UserProfile?> userProfile)
+        public PaginatedMostPlayedBeatmapContainer(Bindable<UserProfileData?> userProfile)
             : base(userProfile, UsersStrings.ShowExtraHistoricalMostPlayedTitle)
         {
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
index 5fa58dbdab..5d83610f84 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     {
         protected override LocalisableString GraphCounterName => UsersStrings.ShowExtraHistoricalMonthlyPlaycountsCountLabel;
 
-        public PlayHistorySubsection(Bindable<UserProfile?> userProfile)
+        public PlayHistorySubsection(Bindable<UserProfileData?> userProfile)
             : base(userProfile, UsersStrings.ShowExtraHistoricalMonthlyPlaycountsTitle)
         {
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
index 04e70afa36..0a82f79310 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     {
         protected override LocalisableString GraphCounterName => UsersStrings.ShowExtraHistoricalReplaysWatchedCountsCountLabel;
 
-        public ReplaysSubsection(Bindable<UserProfile?> userProfile)
+        public ReplaysSubsection(Bindable<UserProfileData?> userProfile)
             : base(userProfile, UsersStrings.ShowExtraHistoricalReplaysWatchedCountsTitle)
         {
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index 7fd0759fac..c2de0efb69 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -19,9 +19,9 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
 {
     public partial class KudosuInfo : Container
     {
-        private readonly Bindable<UserProfile?> userProfile = new Bindable<UserProfile?>();
+        private readonly Bindable<UserProfileData?> userProfile = new Bindable<UserProfileData?>();
 
-        public KudosuInfo(Bindable<UserProfile?> userProfile)
+        public KudosuInfo(Bindable<UserProfileData?> userProfile)
         {
             this.userProfile.BindTo(userProfile);
             CountSection total;
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index 6addd86894..0173e7ce74 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
 {
     public partial class PaginatedKudosuHistoryContainer : PaginatedProfileSubsection<APIKudosuHistory>
     {
-        public PaginatedKudosuHistoryContainer(Bindable<UserProfile?> userProfile)
+        public PaginatedKudosuHistoryContainer(Bindable<UserProfileData?> userProfile)
             : base(userProfile, missingText: UsersStrings.ShowExtraKudosuEntryEmpty)
         {
         }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index d77844fd56..df881ad2a7 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Profile.Sections
         private OsuSpriteText missing = null!;
         private readonly LocalisableString? missingText;
 
-        protected PaginatedProfileSubsection(Bindable<UserProfile?> userProfile, LocalisableString? headerText = null, LocalisableString? missingText = null)
+        protected PaginatedProfileSubsection(Bindable<UserProfileData?> userProfile, LocalisableString? headerText = null, LocalisableString? missingText = null)
             : base(userProfile, headerText, CounterVisibilityState.AlwaysVisible)
         {
             this.missingText = missingText;
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Profile.Sections
             UserProfile.BindValueChanged(onUserChanged, true);
         }
 
-        private void onUserChanged(ValueChangedEvent<UserProfile?> e)
+        private void onUserChanged(ValueChangedEvent<UserProfileData?> e)
         {
             loadCancellation?.Cancel();
             retrievalRequest?.Cancel();
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
index 5df8688659..e85d5f22ef 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileSubsection.cs
@@ -11,14 +11,14 @@ namespace osu.Game.Overlays.Profile.Sections
 {
     public abstract partial class ProfileSubsection : FillFlowContainer
     {
-        protected readonly Bindable<UserProfile?> UserProfile = new Bindable<UserProfile?>();
+        protected readonly Bindable<UserProfileData?> UserProfile = new Bindable<UserProfileData?>();
 
         private readonly LocalisableString headerText;
         private readonly CounterVisibilityState counterVisibilityState;
 
         private ProfileSubsectionHeader header = null!;
 
-        protected ProfileSubsection(Bindable<UserProfile?> userProfile, LocalisableString? headerText = null, CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
+        protected ProfileSubsection(Bindable<UserProfileData?> userProfile, LocalisableString? headerText = null, CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
         {
             this.headerText = headerText ?? string.Empty;
             this.counterVisibilityState = counterVisibilityState;
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index cdd1738c8e..968deecad4 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     {
         private readonly ScoreType type;
 
-        public PaginatedScoreContainer(ScoreType type, Bindable<UserProfile?> userProfile, LocalisableString headerText)
+        public PaginatedScoreContainer(ScoreType type, Bindable<UserProfileData?> userProfile, LocalisableString headerText)
             : base(userProfile, headerText)
         {
             this.type = type;
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index c08ea58b5a..ad7242c339 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
 {
     public partial class PaginatedRecentActivityContainer : PaginatedProfileSubsection<APIRecentActivity>
     {
-        public PaginatedRecentActivityContainer(Bindable<UserProfile?> userProfile)
+        public PaginatedRecentActivityContainer(Bindable<UserProfileData?> userProfile)
             : base(userProfile, missingText: EventsStrings.Empty)
         {
         }
diff --git a/osu.Game/Overlays/Profile/UserProfile.cs b/osu.Game/Overlays/Profile/UserProfileData.cs
similarity index 88%
rename from osu.Game/Overlays/Profile/UserProfile.cs
rename to osu.Game/Overlays/Profile/UserProfileData.cs
index 12a469ddf9..1a1cb8f7d4 100644
--- a/osu.Game/Overlays/Profile/UserProfile.cs
+++ b/osu.Game/Overlays/Profile/UserProfileData.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Overlays.Profile
     /// <summary>
     /// Contains data about a profile presented on the <see cref="UserProfileOverlay"/>.
     /// </summary>
-    public class UserProfile
+    public class UserProfileData
     {
         /// <summary>
         /// The user whose profile is being presented.
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Profile
 
         // TODO: add ruleset
 
-        public UserProfile(APIUser user)
+        public UserProfileData(APIUser user)
         {
             User = user;
         }
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 5ec92efdbb..40933d9179 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays
         {
             Debug.Assert(sections != null && sectionsContainer != null && tabs != null);
 
-            var userProfile = new UserProfile(user);
+            var userProfile = new UserProfileData(user);
             Header.UserProfile.Value = userProfile;
 
             if (user.ProfileOrder != null)