diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index 45f8a029a8..0d841dfef1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             typeof(FriendsOnlineStatusControl),
             typeof(FriendsOnlineStatusItem),
-            typeof(OverlayUpdateStreamControl<>),
-            typeof(OverlayUpdateStreamItem<>),
+            typeof(OverlayStreamControl<>),
+            typeof(OverlayStreamItem<>),
             typeof(FriendsBundle)
         };
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
index 555f0904d6..509a6dabae 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -5,8 +5,8 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Changelog
 {
-    public class ChangelogUpdateStreamControl : OverlayUpdateStreamControl<APIUpdateStream>
+    public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
     {
-        protected override OverlayUpdateStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
+        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
index 9590aefa49..f8e1ac0c84 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
@@ -8,7 +8,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Changelog
 {
-    public class ChangelogUpdateStreamItem : OverlayUpdateStreamItem<APIUpdateStream>
+    public class ChangelogUpdateStreamItem : OverlayStreamItem<APIUpdateStream>
     {
         public ChangelogUpdateStreamItem(APIUpdateStream stream)
             : base(stream)
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
index a92de9dbeb..196f01ab4a 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
@@ -7,9 +7,9 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Home.Friends
 {
-    public class FriendsOnlineStatusControl : OverlayUpdateStreamControl<FriendsBundle>
+    public class FriendsOnlineStatusControl : OverlayStreamControl<FriendsBundle>
     {
-        protected override OverlayUpdateStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
+        protected override OverlayStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
 
         public void Populate(List<User> users)
         {
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
index 5dd7ca2c18..d9b780ce46 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
@@ -7,7 +7,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Home.Friends
 {
-    public class FriendsOnlineStatusItem : OverlayUpdateStreamItem<FriendsBundle>
+    public class FriendsOnlineStatusItem : OverlayStreamItem<FriendsBundle>
     {
         public FriendsOnlineStatusItem(FriendsBundle value)
             : base(value)
diff --git a/osu.Game/Overlays/OverlayUpdateStreamControl.cs b/osu.Game/Overlays/OverlayStreamControl.cs
similarity index 84%
rename from osu.Game/Overlays/OverlayUpdateStreamControl.cs
rename to osu.Game/Overlays/OverlayStreamControl.cs
index 0fdf6c0111..8b6aca6d5d 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamControl.cs
+++ b/osu.Game/Overlays/OverlayStreamControl.cs
@@ -10,9 +10,9 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Overlays
 {
-    public abstract class OverlayUpdateStreamControl<T> : TabControl<T>
+    public abstract class OverlayStreamControl<T> : TabControl<T>
     {
-        protected OverlayUpdateStreamControl()
+        protected OverlayStreamControl()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays
         });
 
         [NotNull]
-        protected abstract OverlayUpdateStreamItem<T> CreateStreamItem(T value);
+        protected abstract OverlayStreamItem<T> CreateStreamItem(T value);
 
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
         {
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays
 
         protected override bool OnHover(HoverEvent e)
         {
-            foreach (var streamBadge in TabContainer.Children.OfType<OverlayUpdateStreamItem<T>>())
+            foreach (var streamBadge in TabContainer.Children.OfType<OverlayStreamItem<T>>())
                 streamBadge.UserHoveringArea = true;
 
             return base.OnHover(e);
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            foreach (var streamBadge in TabContainer.Children.OfType<OverlayUpdateStreamItem<T>>())
+            foreach (var streamBadge in TabContainer.Children.OfType<OverlayStreamItem<T>>())
                 streamBadge.UserHoveringArea = false;
 
             base.OnHoverLost(e);
diff --git a/osu.Game/Overlays/OverlayUpdateStreamItem.cs b/osu.Game/Overlays/OverlayStreamItem.cs
similarity index 97%
rename from osu.Game/Overlays/OverlayUpdateStreamItem.cs
rename to osu.Game/Overlays/OverlayStreamItem.cs
index 7bccb8da25..630d3a0a22 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamItem.cs
+++ b/osu.Game/Overlays/OverlayStreamItem.cs
@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public abstract class OverlayUpdateStreamItem<T> : TabItem<T>
+    public abstract class OverlayStreamItem<T> : TabItem<T>
     {
         public readonly Bindable<T> SelectedItem = new Bindable<T>();
 
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays
         private FillFlowContainer<SpriteText> text;
         private ExpandingBar expandingBar;
 
-        protected OverlayUpdateStreamItem(T value)
+        protected OverlayStreamItem(T value)
             : base(value)
         {
             Height = 60;