diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs
index 40d8a694c..bd2922f8e 100644
--- a/BTCPayServer.Tests/UnitTest1.cs
+++ b/BTCPayServer.Tests/UnitTest1.cs
@@ -889,7 +889,7 @@ namespace BTCPayServer.Tests
                 acc.GrantAccess();
                 acc.RegisterDerivationScheme("BTC");
 
-                var rateController = acc.GetController<RateController>();
+                var rateController = acc.GetController<BitpayRateController>();
                 var GetBaseCurrencyRatesResult = JObject.Parse(((JsonResult)rateController
                     .GetBaseCurrencyRates("BTC", default)
                     .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
@@ -908,7 +908,7 @@ namespace BTCPayServer.Tests
                 ratesVM.DefaultCurrencyPairs = "BTC_USD,LTC_USD";
                 await store.Rates(ratesVM);
                 store = acc.GetController<StoresController>();
-                rateController = acc.GetController<RateController>();
+                rateController = acc.GetController<BitpayRateController>();
                 GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, default)
                     .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
                 // Now we should have a result
diff --git a/BTCPayServer/Controllers/AccessTokenController.cs b/BTCPayServer/Controllers/BitpayAccessTokenController.cs
similarity index 96%
rename from BTCPayServer/Controllers/AccessTokenController.cs
rename to BTCPayServer/Controllers/BitpayAccessTokenController.cs
index 844c7a998..205cffb13 100644
--- a/BTCPayServer/Controllers/AccessTokenController.cs
+++ b/BTCPayServer/Controllers/BitpayAccessTokenController.cs
@@ -12,10 +12,10 @@ namespace BTCPayServer.Controllers
 {
     [Authorize(AuthenticationSchemes = AuthenticationSchemes.Bitpay)]
     [BitpayAPIConstraint()]
-    public class AccessTokenController : Controller
+    public class BitpayAccessTokenController : Controller
     {
         readonly TokenRepository _TokenRepository;
-        public AccessTokenController(TokenRepository tokenRepository)
+        public BitpayAccessTokenController(TokenRepository tokenRepository)
         {
             _TokenRepository = tokenRepository ?? throw new ArgumentNullException(nameof(tokenRepository));
         }
diff --git a/BTCPayServer/Controllers/InvoiceController.API.cs b/BTCPayServer/Controllers/BitpayInvoiceController.cs
similarity index 96%
rename from BTCPayServer/Controllers/InvoiceController.API.cs
rename to BTCPayServer/Controllers/BitpayInvoiceController.cs
index 520601ff6..0affe1e93 100644
--- a/BTCPayServer/Controllers/InvoiceController.API.cs
+++ b/BTCPayServer/Controllers/BitpayInvoiceController.cs
@@ -16,12 +16,12 @@ namespace BTCPayServer.Controllers
 {
     [BitpayAPIConstraint]
     [Authorize(Policies.CanCreateInvoice, AuthenticationSchemes = AuthenticationSchemes.Bitpay)]
-    public class InvoiceControllerAPI : Controller
+    public class BitpayInvoiceController : Controller
     {
         private readonly InvoiceController _InvoiceController;
         private readonly InvoiceRepository _InvoiceRepository;
 
-        public InvoiceControllerAPI(InvoiceController invoiceController,
+        public BitpayInvoiceController(InvoiceController invoiceController,
                                     InvoiceRepository invoiceRepository)
         {
             _InvoiceController = invoiceController;
diff --git a/BTCPayServer/Controllers/RateController.cs b/BTCPayServer/Controllers/BitpayRateController.cs
similarity index 98%
rename from BTCPayServer/Controllers/RateController.cs
rename to BTCPayServer/Controllers/BitpayRateController.cs
index cea64e559..4c4819113 100644
--- a/BTCPayServer/Controllers/RateController.cs
+++ b/BTCPayServer/Controllers/BitpayRateController.cs
@@ -23,7 +23,7 @@ namespace BTCPayServer.Controllers
 {
     [EnableCors(CorsPolicies.All)]
     [Authorize(Policy = ServerPolicies.CanGetRates.Key, AuthenticationSchemes = AuthenticationSchemes.Bitpay)]
-    public class RateController : Controller
+    public class BitpayRateController : Controller
     {
         public StoreData CurrentStore
         {
@@ -40,7 +40,7 @@ namespace BTCPayServer.Controllers
 
         public TokenRepository TokenRepository { get; }
 
-        public RateController(
+        public BitpayRateController(
             RateFetcher rateProviderFactory,
             BTCPayNetworkProvider networkProvider,
             TokenRepository tokenRepository,
diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs
index b839d18b7..f128c041a 100644
--- a/BTCPayServer/Controllers/StoresController.cs
+++ b/BTCPayServer/Controllers/StoresController.cs
@@ -47,7 +47,7 @@ namespace BTCPayServer.Controllers
             StoreRepository repo,
             TokenRepository tokenRepo,
             UserManager<ApplicationUser> userManager,
-            AccessTokenController tokenController,
+            BitpayAccessTokenController tokenController,
             BTCPayWalletProvider walletProvider,
             BTCPayNetworkProvider networkProvider,
             RateFetcher rateFactory,
@@ -90,7 +90,7 @@ namespace BTCPayServer.Controllers
         readonly BTCPayNetworkProvider _NetworkProvider;
         private readonly ExplorerClientProvider _ExplorerProvider;
         readonly BTCPayWalletProvider _WalletProvider;
-        readonly AccessTokenController _TokenController;
+        readonly BitpayAccessTokenController _TokenController;
         readonly StoreRepository _Repo;
         readonly TokenRepository _TokenRepository;
         readonly UserManager<ApplicationUser> _UserManager;
diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs
index 65a4de617..56a69097d 100644
--- a/BTCPayServer/Hosting/BTCPayServerServices.cs
+++ b/BTCPayServer/Hosting/BTCPayServerServices.cs
@@ -381,7 +381,7 @@ namespace BTCPayServer.Hosting
             services.TryAddSingleton<RateFetcher>();
 
             services.TryAddScoped<IHttpContextAccessor, HttpContextAccessor>();
-            services.AddTransient<AccessTokenController>();
+            services.AddTransient<BitpayAccessTokenController>();
             services.AddTransient<InvoiceController>();
             services.AddTransient<AppsPublicController>();
             services.AddTransient<PaymentRequestController>();