diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 66761fad35..2335891229 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -3,7 +3,10 @@
 
 using System.Collections.Generic;
 using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Modes;
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 12a2545ad6..260a9fd54c 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics.Colour;
 using osu.Game.Modes.Mods;
 using osu.Game.Users;
 
diff --git a/osu.Game/Users/Badge.cs b/osu.Game/Users/Team.cs
similarity index 70%
rename from osu.Game/Users/Badge.cs
rename to osu.Game/Users/Team.cs
index 341d3fab1d..ae89aef293 100644
--- a/osu.Game/Users/Badge.cs
+++ b/osu.Game/Users/Team.cs
@@ -7,16 +7,16 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Users
 {
-    public class Badge : IHasDrawableRepresentation<Sprite>
+    public class Team : IHasDrawableRepresentation<Sprite>
     {
         public string Name;
-        public Texture Texture; // TODO: Replace this with something better
+        public Texture Flag; // TODO: Replace this with something better
 
         public Sprite CreateDrawable()
         {
             return new Sprite
             {
-                Texture = Texture,
+                Texture = Flag,
             };
         }
     }
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index d6da17483c..30126e39b8 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Users
         public int Id;
         public string Username;
         public Region Region;
-        public IEnumerable<Badge> Badges;
+        public Team Team;
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c8227afb7d..4b1f19c7cf 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -330,7 +330,7 @@
     <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
     <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
     <Compile Include="Users\Region.cs" />
-    <Compile Include="Users\Badge.cs" />
+    <Compile Include="Users\Team.cs" />
     <Compile Include="Modes\ScoreRank.cs" />
     <Compile Include="Users\Avatar.cs" />
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />