diff --git a/Crypter.API/Controllers/ConsentController.cs b/Crypter.API/Controllers/ConsentController.cs
index e347741a9..dbe805f18 100644
--- a/Crypter.API/Controllers/ConsentController.cs
+++ b/Crypter.API/Controllers/ConsentController.cs
@@ -38,11 +38,11 @@ namespace Crypter.API.Controllers;
 [Route("api/user/consent")]
 public class ConsentController : CrypterControllerBase
 {
-    private readonly IMediator _mediator;
+    private readonly ISender _sender;
 
-    public ConsentController(IMediator mediator)
+    public ConsentController(ISender sender)
     {
-        _mediator = mediator;
+        _sender = sender;
     }
 
     [HttpPost("recovery-key-risk")]
@@ -52,7 +52,7 @@ public ConsentController(IMediator mediator)
     public async Task<IActionResult> ConsentToRecoveryKeyRisksAsync()
     {
         SaveAcknowledgementOfRecoveryKeyRisksCommand request = new SaveAcknowledgementOfRecoveryKeyRisksCommand(UserId);
-        await _mediator.Send(request);
+        await _sender.Send(request);
         return Ok();
     }
 }
diff --git a/Crypter.API/Controllers/MetricsController.cs b/Crypter.API/Controllers/MetricsController.cs
index 8b74fe751..41982666a 100644
--- a/Crypter.API/Controllers/MetricsController.cs
+++ b/Crypter.API/Controllers/MetricsController.cs
@@ -38,11 +38,11 @@ namespace Crypter.API.Controllers;
 [Route("api/metrics")]
 public class MetricsController : CrypterControllerBase
 {
-    private readonly IMediator _mediator;
+    private readonly ISender _sender;
 
-    public MetricsController(IMediator mediator)
+    public MetricsController(ISender sender)
     {
-        _mediator = mediator;
+        _sender = sender;
     }
 
     [HttpGet("storage/public")]
@@ -50,7 +50,7 @@ public MetricsController(IMediator mediator)
     public async Task<IActionResult> GetPublicStorageMetricsAsync(CancellationToken cancellationToken)
     {
         GetDiskMetricsQuery request = new GetDiskMetricsQuery();
-        GetDiskMetricsResult result = await _mediator.Send(request, cancellationToken);
+        GetDiskMetricsResult result = await _sender.Send(request, cancellationToken);
         PublicStorageMetricsResponse response = new PublicStorageMetricsResponse(result.AllocatedBytes, result.FreeBytes);
         return Ok(response);
     }
diff --git a/Crypter.API/Controllers/UserContactController.cs b/Crypter.API/Controllers/UserContactController.cs
index 0461ff236..6ce5bfde1 100644
--- a/Crypter.API/Controllers/UserContactController.cs
+++ b/Crypter.API/Controllers/UserContactController.cs
@@ -46,11 +46,11 @@ namespace Crypter.API.Controllers;
 [Route("api/user/contact")]
 public class UserContactController : CrypterControllerBase
 {
-    private readonly IMediator _mediator;
+    private readonly ISender _sender;
 
-    public UserContactController(IMediator mediator)
+    public UserContactController(ISender sender)
     {
-        _mediator = mediator;
+        _sender = sender;
     }
 
     /// <summary>
@@ -65,7 +65,7 @@ public UserContactController(IMediator mediator)
     public async Task<IActionResult> GetUserContactsAsync(CancellationToken cancellationToken)
     {
         GetUserContactsQuery request = new GetUserContactsQuery(UserId);
-        List<UserContact> result = await _mediator.Send(request, cancellationToken);
+        List<UserContact> result = await _sender.Send(request, cancellationToken);
         return Ok(result);
     }
 
@@ -96,7 +96,7 @@ IActionResult MakeErrorResponse(AddUserContactError error)
         }
 
         AddUserContactCommand request = new AddUserContactCommand(UserId, username);
-        return await _mediator.Send(request)
+        return await _sender.Send(request)
             .MatchAsync(
                 MakeErrorResponse,
                 Ok,
@@ -115,7 +115,7 @@ IActionResult MakeErrorResponse(AddUserContactError error)
     public async Task<IActionResult> RemoveUserContactAsync([FromQuery] string username)
     {
         RemoveUserContactCommand request = new RemoveUserContactCommand(UserId, username);
-        await _mediator.Send(request);
+        await _sender.Send(request);
         return Ok();
     }
 }
diff --git a/Crypter.API/Controllers/UserKeyController.cs b/Crypter.API/Controllers/UserKeyController.cs
index 8b6599c8a..901f071a1 100644
--- a/Crypter.API/Controllers/UserKeyController.cs
+++ b/Crypter.API/Controllers/UserKeyController.cs
@@ -42,11 +42,11 @@ namespace Crypter.API.Controllers;
 [Route("api/user/key")]
 public class UserKeyController : CrypterControllerBase
 {
-    private readonly IMediator _mediator;
+    private readonly ISender _sender;
 
-    public UserKeyController(IMediator mediator)
+    public UserKeyController(ISender sender)
     {
-        _mediator = mediator;
+        _sender = sender;
     }
 
     [HttpGet("master")]
@@ -69,7 +69,7 @@ IActionResult MakeErrorResponse(GetMasterKeyError error)
         }
 
         GetMasterKeyQuery request = new GetMasterKeyQuery(UserId);
-        return await _mediator.Send(request, cancellationToken)
+        return await _sender.Send(request, cancellationToken)
             .MatchAsync(
                 MakeErrorResponse,
                 Ok,
@@ -99,7 +99,7 @@ IActionResult MakeErrorResponse(InsertMasterKeyError error)
         }
 
         UpsertMasterKeyCommand request = new UpsertMasterKeyCommand(UserId, body, false);
-        return await _mediator.Send(request)
+        return await _sender.Send(request)
             .MatchAsync(
                 MakeErrorResponse,
                 _ => Ok(),
@@ -131,7 +131,7 @@ IActionResult MakeErrorResponse(GetMasterKeyRecoveryProofError error)
         }
 
         GetMasterKeyProofQuery request = new GetMasterKeyProofQuery(UserId, body);
-        return await _mediator.Send(request, cancellationToken)
+        return await _sender.Send(request, cancellationToken)
             .MatchAsync(
                 MakeErrorResponse,
                 Ok,
@@ -158,7 +158,7 @@ IActionResult MakeErrorResponse(GetPrivateKeyError error)
         }
 
         GetPrivateKeyQuery request = new GetPrivateKeyQuery(UserId);
-        return await _mediator.Send(request, cancellationToken)
+        return await _sender.Send(request, cancellationToken)
             .MatchAsync(
                 MakeErrorResponse,
                 Ok,
@@ -185,7 +185,7 @@ IActionResult MakeErrorResponse(InsertKeyPairError error)
         }
 
         InsertKeyPairCommand request = new InsertKeyPairCommand(UserId, body);
-        return await _mediator.Send(request)
+        return await _sender.Send(request)
             .MatchAsync(
                 MakeErrorResponse,
                 _ => Ok(),