diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index 59086f448f..20f085b24f 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -133,12 +133,12 @@ namespace Bit.Api
             services.AddScoped<AuthenticatorTokenProvider>();
 
             // Services
-            services.AddSingleton<IMailService, MailService>();
+            services.AddSingleton<IMailService, SendGridMailService>();
             services.AddSingleton<ICipherService, CipherService>();
             services.AddScoped<IUserService, UserService>();
-            services.AddScoped<IPushService, PushService>();
+            services.AddScoped<IPushService, PushSharpPushService>();
             services.AddScoped<IDeviceService, DeviceService>();
-            services.AddScoped<IBlockIpService, AzureBlockIpService>();
+            services.AddScoped<IBlockIpService, AzureQueueBlockIpService>();
 
             // Cors
             services.AddCors(config =>
diff --git a/src/Core/Services/Implementations/AzureBlockIpService.cs b/src/Core/Services/Implementations/AzureQueueBlockIpService.cs
similarity index 91%
rename from src/Core/Services/Implementations/AzureBlockIpService.cs
rename to src/Core/Services/Implementations/AzureQueueBlockIpService.cs
index 233261d91f..439a890a75 100644
--- a/src/Core/Services/Implementations/AzureBlockIpService.cs
+++ b/src/Core/Services/Implementations/AzureQueueBlockIpService.cs
@@ -5,12 +5,12 @@ using System;
 
 namespace Bit.Core.Services
 {
-    public class AzureBlockIpService : IBlockIpService
+    public class AzureQueueBlockIpService : IBlockIpService
     {
         private readonly CloudQueue _blockIpQueue;
         private readonly CloudQueue _unblockIpQueue;
 
-        public AzureBlockIpService(
+        public AzureQueueBlockIpService(
             GlobalSettings globalSettings)
         {
             var storageAccount = CloudStorageAccount.Parse(globalSettings.Storage.ConnectionString);
diff --git a/src/Core/Services/Implementations/NoopBlockIpService.cs b/src/Core/Services/Implementations/NoopBlockIpService.cs
new file mode 100644
index 0000000000..2b2a8b5c93
--- /dev/null
+++ b/src/Core/Services/Implementations/NoopBlockIpService.cs
@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+
+namespace Bit.Core.Services
+{
+    public class NoopBlockIpService : IBlockIpService
+    {
+        public Task BlockIpAsync(string ipAddress, bool permanentBlock)
+        {
+            // Do nothing
+            return Task.FromResult(0);
+        }
+    }
+}
diff --git a/src/Core/Services/Implementations/PushService.cs b/src/Core/Services/Implementations/PushSharpPushService.cs
similarity index 99%
rename from src/Core/Services/Implementations/PushService.cs
rename to src/Core/Services/Implementations/PushSharpPushService.cs
index 136cc4db3f..3be03bd871 100644
--- a/src/Core/Services/Implementations/PushService.cs
+++ b/src/Core/Services/Implementations/PushSharpPushService.cs
@@ -18,7 +18,7 @@ using System.Diagnostics;
 
 namespace Bit.Core.Services
 {
-    public class PushService : IPushService
+    public class PushSharpPushService : IPushService
     {
         private readonly IDeviceRepository _deviceRepository;
         private readonly ILogger<IPushService> _logger;
@@ -26,7 +26,7 @@ namespace Bit.Core.Services
         private GcmServiceBroker _gcmBroker;
         private ApnsServiceBroker _apnsBroker;
 
-        public PushService(
+        public PushSharpPushService(
             IDeviceRepository deviceRepository,
             ILogger<IPushService> logger,
             CurrentContext currentContext,
diff --git a/src/Core/Services/Implementations/MailService.cs b/src/Core/Services/Implementations/SendGridMailService.cs
similarity index 97%
rename from src/Core/Services/Implementations/MailService.cs
rename to src/Core/Services/Implementations/SendGridMailService.cs
index ba27e3e3bf..833447bf74 100644
--- a/src/Core/Services/Implementations/MailService.cs
+++ b/src/Core/Services/Implementations/SendGridMailService.cs
@@ -7,7 +7,7 @@ using SendGrid;
 
 namespace Bit.Core.Services
 {
-    public class MailService : IMailService
+    public class SendGridMailService : IMailService
     {
         private const string WelcomeTemplateId = "045f8ad5-5547-4fa2-8d3d-6d46e401164d";
         private const string ChangeEmailAlreadyExistsTemplateId = "b69d2038-6ad9-4cf6-8f7f-7880921cba43";
@@ -21,7 +21,7 @@ namespace Bit.Core.Services
         private readonly GlobalSettings _globalSettings;
         private readonly Web _web;
 
-        public MailService(GlobalSettings globalSettings)
+        public SendGridMailService(GlobalSettings globalSettings)
         {
             _globalSettings = globalSettings;
             _web = new Web(_globalSettings.Mail.ApiKey);