diff --git a/src/Discord.Net.Rest/Extensions/ServiceCollectionExtensions.cs b/src/Discord.Net.Rest/Extensions/ServiceCollectionExtensions.cs
index 8cf85e118..b83bf2486 100644
--- a/src/Discord.Net.Rest/Extensions/ServiceCollectionExtensions.cs
+++ b/src/Discord.Net.Rest/Extensions/ServiceCollectionExtensions.cs
@@ -18,7 +18,7 @@ namespace Discord.Rest.Extensions
     {
         public static IServiceCollection AddScopedDiscordRestClient(this IServiceCollection services, bool useProxy = false)
         {
-            services.AddHttpClient("HttpFactoryRestClientProvider")
+            services.AddHttpClient("HttpClientFactoryRestClientProvider")
                 .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler
                 {
                     AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip,
@@ -28,12 +28,12 @@ namespace Discord.Rest.Extensions
 
 
 
-            services.AddTransient<HttpFactoryRestClientProvider>(provider => new HttpFactoryRestClientProvider(provider.GetRequiredService<IHttpClientFactory>()));
+            services.AddTransient<HttpClientFactoryRestClientProvider>(provider => new HttpClientFactoryRestClientProvider(provider.GetRequiredService<IHttpClientFactory>()));
             services.AddScoped<DiscordRestClient>(provider =>
             {
                 var config = new DiscordRestConfig
                 {
-                    RestClientProvider = provider.GetRequiredService<HttpFactoryRestClientProvider>().Instance
+                    RestClientProvider = provider.GetRequiredService<HttpClientFactoryRestClientProvider>().Instance
                 };
                 return new DiscordRestClient(config);
             });
@@ -43,7 +43,7 @@ namespace Discord.Rest.Extensions
 
         public static IServiceCollection AddTransientDiscordRestClient(this IServiceCollection services, bool useProxy = false) //where should we put this useProxy options, I haven't fully understood where the original code takes this from.
         {
-            services.AddHttpClient("HttpFactoryRestClientProvider")
+            services.AddHttpClient("HttpClientFactoryRestClientProvider")
                 .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler
                 {
                     AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip,
@@ -53,12 +53,12 @@ namespace Discord.Rest.Extensions
 
 
 
-            services.AddTransient<HttpFactoryRestClientProvider>(provider => new HttpFactoryRestClientProvider(provider.GetRequiredService<IHttpClientFactory>()));
+            services.AddTransient<HttpClientFactoryRestClientProvider>(provider => new HttpClientFactoryRestClientProvider(provider.GetRequiredService<IHttpClientFactory>()));
             services.AddTransient<DiscordRestClient>(provider =>
             {
                 var config = new DiscordRestConfig
                 {
-                    RestClientProvider = provider.GetRequiredService<HttpFactoryRestClientProvider>().Instance
+                    RestClientProvider = provider.GetRequiredService<HttpClientFactoryRestClientProvider>().Instance
                 };
                 return new DiscordRestClient(config);
             });
diff --git a/src/Discord.Net.Rest/Net/HttpClientFactoryClientProvider.cs b/src/Discord.Net.Rest/Net/HttpClientFactoryClientProvider.cs
index 11e70dc0f..88e80ad80 100644
--- a/src/Discord.Net.Rest/Net/HttpClientFactoryClientProvider.cs
+++ b/src/Discord.Net.Rest/Net/HttpClientFactoryClientProvider.cs
@@ -8,17 +8,17 @@ using System.Threading.Tasks;
 
 namespace Discord.Rest.Net
 {
-    public class HttpFactoryRestClientProvider
+    public class HttpClientFactoryRestClientProvider
     {
         public readonly RestClientProvider Instance;
 
         private readonly IHttpClientFactory _httpClientFactory;
 
-        public HttpFactoryRestClientProvider(IHttpClientFactory httpClientFactory)
+        public HttpClientFactoryRestClientProvider(IHttpClientFactory httpClientFactory)
         {
             _httpClientFactory = httpClientFactory;
 
-            Instance = url => new HttpClientFactoryClient(url, _httpClientFactory.CreateClient("HttpFactoryRestClientProvider"), useProxy: false);
+            Instance = url => new HttpClientFactoryRestClient(url, _httpClientFactory.CreateClient("HttpClientFactoryRestClientProvider"), useProxy: false);
         }
 
 
diff --git a/src/Discord.Net.Rest/Net/HttpClientFactoryClient.cs b/src/Discord.Net.Rest/Net/HttpClientFactoryRestClient.cs
similarity index 97%
rename from src/Discord.Net.Rest/Net/HttpClientFactoryClient.cs
rename to src/Discord.Net.Rest/Net/HttpClientFactoryRestClient.cs
index b27918557..85e3b68c7 100644
--- a/src/Discord.Net.Rest/Net/HttpClientFactoryClient.cs
+++ b/src/Discord.Net.Rest/Net/HttpClientFactoryRestClient.cs
@@ -14,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace Discord.Rest.Net
 {
-    internal sealed class HttpClientFactoryClient : IRestClient, IDisposable
+    internal sealed class HttpClientFactoryRestClient : IRestClient, IDisposable
     {
             private const int HR_SECURECHANNELFAILED = -2146233079;
 
@@ -24,7 +24,7 @@ namespace Discord.Rest.Net
             private CancellationToken _cancelToken;
             private bool _isDisposed;
 
-            public HttpClientFactoryClient(string baseUrl, HttpClient httpClient, bool useProxy = false)
+            public HttpClientFactoryRestClient(string baseUrl, HttpClient httpClient, bool useProxy = false)
             {
                 _baseUrl = baseUrl;
                 //this client would be given to use through DI. The advantage would be that it would be managed by DI, and no socket Exhaustation possible.