diff --git a/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs b/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs
index 34bf69df5..73247aa12 100644
--- a/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs
+++ b/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs
@@ -32,7 +32,7 @@ public class TwilioOrgsTokenRestClient
         /// <summary>
         /// Client to make HTTP requests
         /// </summary>
-        public BearerTokenHttpClient HttpClient { get; }
+        public TokenHttpClient HttpClient { get; }
 
         /// <summary>
         /// Twilio region to make requests to
@@ -78,7 +78,7 @@ public class TwilioOrgsTokenRestClient
         public TwilioOrgsTokenRestClient(
             TokenManager tokenManager,
             string region = null,
-            BearerTokenHttpClient httpClient = null,
+            TokenHttpClient httpClient = null,
             string edge = null
         )
         {
@@ -262,12 +262,12 @@ public async Task<Response> RequestAsync(TokenRequest request)
             return ProcessResponse(response);
         }
 
-        private static BearerTokenHttpClient DefaultClient()
+        private static TokenHttpClient DefaultClient()
         {
-            return new SystemNetBearerTokenHttpClient();
+            return new SystemNetTokenHttpClient();
         }
 #else
-        private static BearerTokenHttpClient DefaultClient()
+        private static TokenHttpClient DefaultClient()
         {
             return new WebBearerTokenRequestClient();
         }
@@ -325,7 +325,7 @@ public static void ValidateSslCertificate()
         /// </summary>
         ///
         /// <param name="client">HTTP Client to use for testing the request</param>
-        public static void ValidateSslCertificate(BearerTokenHttpClient client)
+        public static void ValidateSslCertificate(TokenHttpClient client)
         {
             TokenRequest request = new TokenRequest("GET", "tls-test", ":443/", null);
 
diff --git a/src/Twilio/Http/BearerToken/SystemNetBearerTokenHttpClient.cs b/src/Twilio/Http/BearerToken/SystemNetTokenHttpClient.cs
similarity index 97%
rename from src/Twilio/Http/BearerToken/SystemNetBearerTokenHttpClient.cs
rename to src/Twilio/Http/BearerToken/SystemNetTokenHttpClient.cs
index 6d0e98449..63dc28100 100644
--- a/src/Twilio/Http/BearerToken/SystemNetBearerTokenHttpClient.cs
+++ b/src/Twilio/Http/BearerToken/SystemNetTokenHttpClient.cs
@@ -13,7 +13,7 @@ namespace Twilio.Http.BearerToken
     /// <summary>
     /// Sample client to make HTTP requests
     /// </summary>
-    public class SystemNetBearerTokenHttpClient : BearerTokenHttpClient
+    public class SystemNetTokenHttpClient : TokenHttpClient
     {
 #if NET462
         private string PlatVersion = ".NET Framework 4.6.2+";
@@ -27,7 +27,7 @@ public class SystemNetBearerTokenHttpClient : BearerTokenHttpClient
         /// Create new HttpClient
         /// </summary>
         /// <param name="httpClient">HTTP client to use</param>
-        public SystemNetBearerTokenHttpClient(System.Net.Http.HttpClient httpClient = null)
+        public SystemNetTokenHttpClient(System.Net.Http.HttpClient httpClient = null)
         {
             _httpClient = httpClient ?? new System.Net.Http.HttpClient(new HttpClientHandler() { AllowAutoRedirect = false });
         }
diff --git a/src/Twilio/Http/BearerToken/BearerTokenHttpClient.cs b/src/Twilio/Http/BearerToken/TokenHttpClient.cs
similarity index 96%
rename from src/Twilio/Http/BearerToken/BearerTokenHttpClient.cs
rename to src/Twilio/Http/BearerToken/TokenHttpClient.cs
index 710a9dcc0..86e5ff79d 100644
--- a/src/Twilio/Http/BearerToken/BearerTokenHttpClient.cs
+++ b/src/Twilio/Http/BearerToken/TokenHttpClient.cs
@@ -5,7 +5,7 @@ namespace Twilio.Http.BearerToken
     /// <summary>
     /// Base http client used to make Twilio requests
     /// </summary>
-    public abstract class BearerTokenHttpClient
+    public abstract class TokenHttpClient
     {
         /// <summary>
         /// The last request made by this client
diff --git a/src/Twilio/Http/Net35/WebBearerTokenRequestClient.cs b/src/Twilio/Http/Net35/WebBearerTokenRequestClient.cs
index 4df6b1dac..48c5f3aab 100644
--- a/src/Twilio/Http/Net35/WebBearerTokenRequestClient.cs
+++ b/src/Twilio/Http/Net35/WebBearerTokenRequestClient.cs
@@ -8,7 +8,7 @@ namespace Twilio.Http.Net35
     /// <summary>
     /// Sample client to make requests
     /// </summary>
-    public class WebBearerTokenRequestClient : BearerTokenHttpClient
+    public class WebBearerTokenRequestClient : TokenHttpClient
     {
         private const string PlatVersion = ".NET/3.5";
         private HttpWebRequestFactory factory;