diff --git a/lib/Controllers/DefaultController.php b/lib/Controllers/DefaultController.php
index 2447665..63548e8 100644
--- a/lib/Controllers/DefaultController.php
+++ b/lib/Controllers/DefaultController.php
@@ -14,8 +14,8 @@ use KTXC\Http\Response\JsonResponse;
 use KTXC\Http\Response\Response;
 use KTXC\Http\Response\StreamedNdJsonResponse;
 use KTXC\Http\Response\StreamedResponse;
-use KTXC\SessionIdentity;
-use KTXC\SessionTenant;
+use KTXC\Context\IdentityContextInterface;
+use KTXC\Context\TenantContextInterface;
 use KTXF\Controller\ControllerAbstract;
 use KTXF\Json\JsonSerializable;
 use KTXF\Resource\Identifier\CollectionIdentifier;
@@ -51,8 +51,8 @@ class DefaultController extends ControllerAbstract {
     private const ERR_INVALID_DATA = 'Invalid parameter: data must be an array';
 
     public function __construct(
-        private readonly SessionTenant $tenantIdentity,
-        private readonly SessionIdentity $userIdentity,
+        private readonly TenantContextInterface $tenantContext,
+        private readonly IdentityContextInterface $identityContext,
         private Manager $manager,
         private readonly LoggerInterface $logger
     ) {}
@@ -80,13 +80,13 @@ class DefaultController extends ControllerAbstract {
     ): Response {
 
         // authorize request
-        $tenantId = $this->tenantIdentity->identifier();
-        $userId = $this->userIdentity->identifier();
+        $tenantId = $this->tenantContext->identifier();
+        $userId = $this->identityContext->identifier();
 
         // acting-user override: only the reserved system context is permitted,
         // gated on the system mail management permission
         if ($user !== null && $user !== $userId) {
-            if ($user !== ProviderBaseInterface::USER_SYSTEM || !$this->userIdentity->hasPermission('mail_manager.system')) {
+            if ($user !== ProviderBaseInterface::USER_SYSTEM || !$this->identityContext->hasPermission('mail_manager.system')) {
                 return new JsonResponse([
                     'version' => $version,
                     'transaction' => $transaction,