diff --git a/osu.Game/Online/HubClient.cs b/osu.Game/Online/HubClient.cs
index e80931eeae..583f15a4a4 100644
--- a/osu.Game/Online/HubClient.cs
+++ b/osu.Game/Online/HubClient.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.SignalR.Client;
 
 namespace osu.Game.Online
 {
-    public class HubClient : SocketClient
+    public class HubClient : PersistentEndpointClient
     {
         public readonly HubConnection Connection;
 
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 33e9f92817..6f246f6dd3 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -14,7 +14,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online
 {
-    public class HubClientConnector : SocketClientConnector, IHubClientConnector
+    public class HubClientConnector : PersistentEndpointClientConnector, IHubClientConnector
     {
         public const string SERVER_SHUTDOWN_MESSAGE = "Server is shutting down.";
 
@@ -51,7 +51,7 @@ namespace osu.Game.Online
             this.preferMessagePack = preferMessagePack;
         }
 
-        protected override Task<SocketClient> BuildConnectionAsync(CancellationToken cancellationToken)
+        protected override Task<PersistentEndpointClient> BuildConnectionAsync(CancellationToken cancellationToken)
         {
             var builder = new HubConnectionBuilder()
                 .WithUrl(endpoint, options =>
@@ -91,7 +91,7 @@ namespace osu.Game.Online
 
             ConfigureConnection?.Invoke(newConnection);
 
-            return Task.FromResult((SocketClient)new HubClient(newConnection));
+            return Task.FromResult((PersistentEndpointClient)new HubClient(newConnection));
         }
 
         protected override string ClientName { get; }
diff --git a/osu.Game/Online/Notifications/NotificationsClient.cs b/osu.Game/Online/Notifications/NotificationsClient.cs
index 8c41ae10d7..5c575e828d 100644
--- a/osu.Game/Online/Notifications/NotificationsClient.cs
+++ b/osu.Game/Online/Notifications/NotificationsClient.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Notifications
     /// <summary>
     /// An abstract client which receives notification-related events (chat/notifications).
     /// </summary>
-    public abstract class NotificationsClient : SocketClient
+    public abstract class NotificationsClient : PersistentEndpointClient
     {
         public Action<Channel>? ChannelJoined;
         public Action<List<Message>>? NewMessages;
diff --git a/osu.Game/Online/Notifications/NotificationsClientConnector.cs b/osu.Game/Online/Notifications/NotificationsClientConnector.cs
index 5b2d6a4e13..5aa49a7783 100644
--- a/osu.Game/Online/Notifications/NotificationsClientConnector.cs
+++ b/osu.Game/Online/Notifications/NotificationsClientConnector.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Online.Notifications
     /// <summary>
     /// An abstract connector or <see cref="NotificationsClient"/>s.
     /// </summary>
-    public abstract class NotificationsClientConnector : SocketClientConnector
+    public abstract class NotificationsClientConnector : PersistentEndpointClientConnector
     {
         public event Action<Channel>? ChannelJoined;
         public event Action<List<Message>>? NewMessages;
@@ -34,7 +34,7 @@ namespace osu.Game.Online.Notifications
                 client.EnableChat = true;
         }
 
-        protected sealed override async Task<SocketClient> BuildConnectionAsync(CancellationToken cancellationToken)
+        protected sealed override async Task<PersistentEndpointClient> BuildConnectionAsync(CancellationToken cancellationToken)
         {
             var client = await BuildNotificationClientAsync(cancellationToken);
 
diff --git a/osu.Game/Online/SocketClient.cs b/osu.Game/Online/PersistentEndpointClient.cs
similarity index 90%
rename from osu.Game/Online/SocketClient.cs
rename to osu.Game/Online/PersistentEndpointClient.cs
index 748e77fc0b..e0307f7c6a 100644
--- a/osu.Game/Online/SocketClient.cs
+++ b/osu.Game/Online/PersistentEndpointClient.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace osu.Game.Online
 {
-    public abstract class SocketClient : IAsyncDisposable
+    public abstract class PersistentEndpointClient : IAsyncDisposable
     {
         public event Func<Exception?, Task>? Closed;
 
diff --git a/osu.Game/Online/SocketClientConnector.cs b/osu.Game/Online/PersistentEndpointClientConnector.cs
similarity index 95%
rename from osu.Game/Online/SocketClientConnector.cs
rename to osu.Game/Online/PersistentEndpointClientConnector.cs
index abf19fbba3..202f7abe4a 100644
--- a/osu.Game/Online/SocketClientConnector.cs
+++ b/osu.Game/Online/PersistentEndpointClientConnector.cs
@@ -11,7 +11,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online
 {
-    public abstract class SocketClientConnector : IDisposable
+    public abstract class PersistentEndpointClientConnector : IDisposable
     {
         /// <summary>
         /// Whether this is connected to the hub, use <see cref="CurrentConnection"/> to access the connection, if this is <c>true</c>.
@@ -21,7 +21,7 @@ namespace osu.Game.Online
         /// <summary>
         /// The current connection opened by this connector.
         /// </summary>
-        public SocketClient? CurrentConnection { get; private set; }
+        public PersistentEndpointClient? CurrentConnection { get; private set; }
 
         protected readonly IAPIProvider API;
 
@@ -34,7 +34,7 @@ namespace osu.Game.Online
         /// Constructs a new <see cref="HubClientConnector"/>.
         /// </summary>
         /// <param name="api"> An API provider used to react to connection state changes.</param>
-        protected SocketClientConnector(IAPIProvider api)
+        protected PersistentEndpointClientConnector(IAPIProvider api)
         {
             API = api;
 
@@ -126,7 +126,7 @@ namespace osu.Game.Online
             await Task.Delay(5000, cancellationToken).ConfigureAwait(false);
         }
 
-        protected abstract Task<SocketClient> BuildConnectionAsync(CancellationToken cancellationToken);
+        protected abstract Task<PersistentEndpointClient> BuildConnectionAsync(CancellationToken cancellationToken);
 
         private async Task onConnectionClosed(Exception? ex, CancellationToken cancellationToken)
         {