diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 0c44436ec8..c4d65f4f10 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Database
         /// 14   2022-03-01    Added BeatmapUserSettings to BeatmapInfo.
         /// 15   2022-07-13    Added LastPlayed to BeatmapInfo.
         /// 16   2022-07-15    Removed HasReplay from ScoreInfo.
-        /// 17   2022-07-16    Added Country to RealmUser.
+        /// 17   2022-07-16    Added CountryCode to RealmUser.
         /// </summary>
         private const int schema_version = 17;
 
diff --git a/osu.Game/Models/RealmUser.cs b/osu.Game/Models/RealmUser.cs
index 1668739bb5..4b9269a922 100644
--- a/osu.Game/Models/RealmUser.cs
+++ b/osu.Game/Models/RealmUser.cs
@@ -16,14 +16,14 @@ namespace osu.Game.Models
         public string Username { get; set; } = string.Empty;
 
         [Ignored]
-        public Country Country
+        public CountryCode CountryCode
         {
-            get => Enum.TryParse(CountryString, out Country country) ? country : default;
+            get => Enum.TryParse(CountryString, out CountryCode country) ? country : default;
             set => CountryString = value.ToString();
         }
 
-        [MapTo(nameof(Country))]
-        public string CountryString { get; set; } = default(Country).ToString();
+        [MapTo(nameof(CountryCode))]
+        public string CountryString { get; set; } = default(CountryCode).ToString();
 
         public bool IsBot => false;
 
diff --git a/osu.Game/Rulesets/Mods/ICreateReplayData.cs b/osu.Game/Rulesets/Mods/ICreateReplayData.cs
index 6c195f623c..3ed5c2b7f8 100644
--- a/osu.Game/Rulesets/Mods/ICreateReplayData.cs
+++ b/osu.Game/Rulesets/Mods/ICreateReplayData.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Mods
     public class ModCreatedUser : IUser
     {
         public int OnlineID => APIUser.SYSTEM_USER_ID;
-        public Country Country => default;
+        public CountryCode CountryCode => default;
         public bool IsBot => true;
 
         public string Username { get; set; } = string.Empty;
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index f5942e4639..d32d611a27 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Scoring
             {
                 Id = RealmUser.OnlineID,
                 Username = RealmUser.Username,
-                Country = RealmUser.Country,
+                CountryCode = RealmUser.CountryCode,
             };
             set
             {
@@ -97,7 +97,7 @@ namespace osu.Game.Scoring
                 {
                     OnlineID = user.OnlineID,
                     Username = user.Username,
-                    Country = user.Country,
+                    CountryCode = user.CountryCode,
                 };
             }
         }
@@ -137,7 +137,7 @@ namespace osu.Game.Scoring
             {
                 OnlineID = RealmUser.OnlineID,
                 Username = RealmUser.Username,
-                Country = RealmUser.Country,
+                CountryCode = RealmUser.CountryCode,
             };
 
             return clone;
diff --git a/osu.Game/Users/IUser.cs b/osu.Game/Users/IUser.cs
index a520660c4d..b7f545f68b 100644
--- a/osu.Game/Users/IUser.cs
+++ b/osu.Game/Users/IUser.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Users
     {
         string Username { get; }
 
-        Country Country { get; }
+        CountryCode CountryCode { get; }
 
         bool IsBot { get; }