diff --git a/src/Billing/BillingSettings.cs b/src/Billing/BillingSettings.cs
index 851cf1c2e2..ed7672ed76 100644
--- a/src/Billing/BillingSettings.cs
+++ b/src/Billing/BillingSettings.cs
@@ -6,9 +6,9 @@
         public virtual string StripeWebhookKey { get; set; }
         public virtual string StripeWebhookSecret { get; set; }
         public virtual string BraintreeWebhookKey { get; set; }
-        public virtual PaypalSettings Paypal { get; set; } = new PaypalSettings();
+        public virtual PayPalSettings PayPal { get; set; } = new PayPalSettings();
 
-        public class PaypalSettings
+        public class PayPalSettings
         {
             public virtual bool Production { get; set; }
             public virtual string ClientId { get; set; }
diff --git a/src/Billing/Controllers/PaypalController.cs b/src/Billing/Controllers/PaypalController.cs
index 73f04b4e33..ddf1501791 100644
--- a/src/Billing/Controllers/PaypalController.cs
+++ b/src/Billing/Controllers/PaypalController.cs
@@ -11,15 +11,15 @@ using System.Threading.Tasks;
 namespace Bit.Billing.Controllers
 {
     [Route("paypal")]
-    public class PaypalController : Controller
+    public class PayPalController : Controller
     {
         private readonly BillingSettings _billingSettings;
-        private readonly PaypalClient _paypalClient;
+        private readonly PayPalClient _paypalClient;
         private readonly ITransactionRepository _transactionRepository;
 
-        public PaypalController(
+        public PayPalController(
             IOptions<BillingSettings> billingSettings,
-            PaypalClient paypalClient,
+            PayPalClient paypalClient,
             ITransactionRepository transactionRepository)
         {
             _billingSettings = billingSettings?.Value;
@@ -47,7 +47,7 @@ namespace Bit.Billing.Controllers
             }
 
             var verified = await _paypalClient.VerifyWebhookAsync(body, HttpContext.Request.Headers,
-                _billingSettings.Paypal.WebhookId);
+                _billingSettings.PayPal.WebhookId);
             if(!verified)
             {
                 return new BadRequestResult();
@@ -55,7 +55,7 @@ namespace Bit.Billing.Controllers
 
             if(body.Contains("\"PAYMENT.SALE.COMPLETED\""))
             {
-                var ev = JsonConvert.DeserializeObject<PaypalClient.Event<PaypalClient.Sale>>(body);
+                var ev = JsonConvert.DeserializeObject<PayPalClient.Event<PayPalClient.Sale>>(body);
                 var sale = ev.Resource;
                 var saleTransaction = await _transactionRepository.GetByGatewayIdAsync(
                     GatewayType.PayPal, sale.Id);
@@ -80,7 +80,7 @@ namespace Bit.Billing.Controllers
             }
             else if(body.Contains("\"PAYMENT.SALE.REFUNDED\""))
             {
-                var ev = JsonConvert.DeserializeObject<PaypalClient.Event<PaypalClient.Refund>>(body);
+                var ev = JsonConvert.DeserializeObject<PayPalClient.Event<PayPalClient.Refund>>(body);
                 var refund = ev.Resource;
                 var refundTransaction = await _transactionRepository.GetByGatewayIdAsync(
                     GatewayType.PayPal, refund.Id);
diff --git a/src/Billing/Startup.cs b/src/Billing/Startup.cs
index 871d507d57..6e85974981 100644
--- a/src/Billing/Startup.cs
+++ b/src/Billing/Startup.cs
@@ -39,8 +39,8 @@ namespace Bit.Billing
             // Repositories
             services.AddSqlServerRepositories(globalSettings);
 
-            // Paypal Client
-            services.AddSingleton<Utilities.PaypalClient>();
+            // PayPal Client
+            services.AddSingleton<Utilities.PayPalClient>();
 
             // Context
             services.AddScoped<CurrentContext>();
diff --git a/src/Billing/Utilities/PaypalClient.cs b/src/Billing/Utilities/PaypalClient.cs
index 95281baf17..df40df9360 100644
--- a/src/Billing/Utilities/PaypalClient.cs
+++ b/src/Billing/Utilities/PaypalClient.cs
@@ -9,7 +9,7 @@ using Newtonsoft.Json;
 
 namespace Bit.Billing.Utilities
 {
-    public class PaypalClient
+    public class PayPalClient
     {
         private readonly HttpClient _httpClient = new HttpClient();
         private readonly string _baseApiUrl;
@@ -18,12 +18,12 @@ namespace Bit.Billing.Utilities
 
         private AuthResponse _authResponse;
 
-        public PaypalClient(BillingSettings billingSettings)
+        public PayPalClient(BillingSettings billingSettings)
         {
-            _baseApiUrl = _baseApiUrl = !billingSettings.Paypal.Production ? "https://api.sandbox.paypal.com/{0}" :
+            _baseApiUrl = _baseApiUrl = !billingSettings.PayPal.Production ? "https://api.sandbox.paypal.com/{0}" :
                 "https://api.paypal.com/{0}";
-            _clientId = billingSettings.Paypal.ClientId;
-            _clientSecret = billingSettings.Paypal.ClientSecret;
+            _clientId = billingSettings.PayPal.ClientId;
+            _clientSecret = billingSettings.PayPal.ClientSecret;
         }
 
         public async Task<bool> VerifyWebhookAsync(string webhookJson, IHeaderDictionary headers, string webhookId)
diff --git a/src/Billing/appsettings.Production.json b/src/Billing/appsettings.Production.json
index add96fc3bc..370128a2e4 100644
--- a/src/Billing/appsettings.Production.json
+++ b/src/Billing/appsettings.Production.json
@@ -17,7 +17,7 @@
     }
   },
   "billingSettings": {
-    "paypal": {
+    "payPal": {
       "production": false
     }
   }
diff --git a/src/Billing/appsettings.json b/src/Billing/appsettings.json
index 3f34debdab..b07ca558fc 100644
--- a/src/Billing/appsettings.json
+++ b/src/Billing/appsettings.json
@@ -58,7 +58,7 @@
     "stripeWebhookKey": "SECRET",
     "stripeWebhookSecret": "SECRET",
     "braintreeWebhookKey": "SECRET",
-    "paypal": {
+    "payPal": {
       "production": false,
       "clientId": "SECRET",
       "clientSecret": "SECRET",
diff --git a/src/Core/Enums/GlobalEquivalentDomainsType.cs b/src/Core/Enums/GlobalEquivalentDomainsType.cs
index f5370398db..39d0a72e29 100644
--- a/src/Core/Enums/GlobalEquivalentDomainsType.cs
+++ b/src/Core/Enums/GlobalEquivalentDomainsType.cs
@@ -16,7 +16,7 @@
         United = 11,
         Yahoo = 12,
         Zonelabs = 13,
-        Paypal = 14,
+        PayPal = 14,
         Avon = 15,
         Diapers = 16,
         Contacts = 17,
diff --git a/src/Core/Utilities/StaticStore.cs b/src/Core/Utilities/StaticStore.cs
index 0374a710ac..02ff300f81 100644
--- a/src/Core/Utilities/StaticStore.cs
+++ b/src/Core/Utilities/StaticStore.cs
@@ -26,7 +26,7 @@ namespace Bit.Core.Utilities
             GlobalDomains.Add(GlobalEquivalentDomainsType.United, new List<string> { "ua2go.com", "ual.com", "united.com", "unitedwifi.com" });
             GlobalDomains.Add(GlobalEquivalentDomainsType.Yahoo, new List<string> { "overture.com", "yahoo.com", "flickr.com" });
             GlobalDomains.Add(GlobalEquivalentDomainsType.Zonelabs, new List<string> { "zonealarm.com", "zonelabs.com" });
-            GlobalDomains.Add(GlobalEquivalentDomainsType.Paypal, new List<string> { "paypal.com", "paypal-search.com" });
+            GlobalDomains.Add(GlobalEquivalentDomainsType.PayPal, new List<string> { "paypal.com", "paypal-search.com" });
             GlobalDomains.Add(GlobalEquivalentDomainsType.Avon, new List<string> { "avon.com", "youravon.com" });
             GlobalDomains.Add(GlobalEquivalentDomainsType.Diapers, new List<string> { "diapers.com", "soap.com", "wag.com", "yoyo.com", "beautybar.com", "casa.com", "afterschool.com", "vine.com", "bookworm.com", "look.com", "vinemarket.com" });
             GlobalDomains.Add(GlobalEquivalentDomainsType.Contacts, new List<string> { "1800contacts.com", "800contacts.com" });