diff --git a/SpotifyAPI.Example/WebControl.cs b/SpotifyAPI.Example/WebControl.cs
index d871475a..fffe0af5 100644
--- a/SpotifyAPI.Example/WebControl.cs
+++ b/SpotifyAPI.Example/WebControl.cs
@@ -128,7 +128,7 @@ namespace SpotifyAPI.Example
 
         private async void RunAuthentication()
         {
-            AuthenticationFactory authenticationFactory = new AuthenticationFactory(
+            WebApiFactory webApiFactory = new WebApiFactory(
                 "http://localhost",
                 8000,
                 "26d287105e31491889f3cd293d85bfea",
@@ -138,7 +138,7 @@ namespace SpotifyAPI.Example
 
             try
             {
-                _spotify = await authenticationFactory.GetWebApi();
+                _spotify = await webApiFactory.GetWebApi();
             }
             catch (Exception ex)
             {
diff --git a/SpotifyAPI/SpotifyAPI.csproj b/SpotifyAPI/SpotifyAPI.csproj
index e414942c..9c5f2c17 100644
--- a/SpotifyAPI/SpotifyAPI.csproj
+++ b/SpotifyAPI/SpotifyAPI.csproj
@@ -58,7 +58,7 @@
     </Compile>
     <Compile Include="Local\Models\SpotifyUri.cs" />
     <Compile Include="Local\VolumeMixerControl.cs" />
-    <Compile Include="Web\Auth\AuthenticationFactory.cs" />
+    <Compile Include="Web\Auth\WebApiFactory.cs" />
     <Compile Include="Web\Enums\TimeRangeType.cs" />
     <Compile Include="Web\IClient.cs" />
     <Compile Include="Local\Models\CFID.cs" />
diff --git a/SpotifyAPI/Web/Auth/AuthenticationFactory.cs b/SpotifyAPI/Web/Auth/WebApiFactory.cs
similarity index 91%
rename from SpotifyAPI/Web/Auth/AuthenticationFactory.cs
rename to SpotifyAPI/Web/Auth/WebApiFactory.cs
index a8a52a2c..b76ab436 100644
--- a/SpotifyAPI/Web/Auth/AuthenticationFactory.cs
+++ b/SpotifyAPI/Web/Auth/WebApiFactory.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using SpotifyAPI.Web.Enums;
@@ -9,7 +6,7 @@ using SpotifyAPI.Web.Models;
 
 namespace SpotifyAPI.Web.Auth
 {
-    public class AuthenticationFactory
+    public class WebApiFactory
     {
         private readonly string m_RedirectUrl;
         private readonly int m_ListeningPort;
@@ -17,7 +14,7 @@ namespace SpotifyAPI.Web.Auth
         private readonly TimeSpan m_Timeout;
         private Scope m_Scope;
 
-        public AuthenticationFactory(string redirectUrl, int listeningPort, string clientId, Scope scope, TimeSpan timeout)
+        public WebApiFactory(string redirectUrl, int listeningPort, string clientId, Scope scope, TimeSpan timeout)
         {
             m_RedirectUrl = redirectUrl;
             m_ListeningPort = listeningPort;