diff --git a/src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentContext.cs b/src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentDto.cs
similarity index 97%
rename from src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentContext.cs
rename to src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentDto.cs
index 720d87d..3b0f3b2 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentContext.cs
+++ b/src/core/DigitalData.MessagingService.Abstraction/EmailAttachmentDto.cs
@@ -3,7 +3,7 @@ namespace DigitalData.MessagingService.Abstraction;
 /// <summary>
 /// Represents a single email attachment.
 /// </summary>
-public sealed class EmailAttachmentContext
+public sealed class EmailAttachmentDto
 {
     /// <summary>
     /// Display name of the attachment (e.g. "invoice.pdf").
diff --git a/src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs b/src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs
index 919e444..5ad2c00 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs
+++ b/src/core/DigitalData.MessagingService.Abstraction/EmailContext.cs
@@ -48,8 +48,8 @@ public record EmailContext
 
     /// <summary>
     /// Optional list of attachments to include with the email.
-    /// Each entry may carry its content as a byte array (<see cref="EmailAttachmentContext.Content"/>)
-    /// or reference a file on disk via <see cref="EmailAttachmentContext.FilePath"/>.
+    /// Each entry may carry its content as a byte array (<see cref="EmailAttachmentDto.Content"/>)
+    /// or reference a file on disk via <see cref="EmailAttachmentDto.FilePath"/>.
     /// </summary>
-    public IEnumerable<EmailAttachmentContext> Attachments { get; set; } = [];
+    public IEnumerable<EmailAttachmentDto> Attachments { get; set; } = [];
 }
\ No newline at end of file
diff --git a/src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailContext.cs b/src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailDto.cs
similarity index 91%
rename from src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailContext.cs
rename to src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailDto.cs
index 83be50f..8a4fe62 100644
--- a/src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailContext.cs
+++ b/src/core/DigitalData.MessagingService.Abstraction/ReceivedEmailDto.cs
@@ -3,7 +3,7 @@ namespace DigitalData.MessagingService.Abstraction;
 /// <summary>
 /// Represents an email message received via IMAP.
 /// </summary>
-public sealed record ReceivedEmailContext
+public sealed record ReceivedEmailDto
 {
     /// <summary>
     /// Unique identifier of the message on the IMAP server (UID).
@@ -81,9 +81,9 @@ public sealed record ReceivedEmailContext
     /// Attachments included with this message.
     /// </summary>
 #if NET
-    public IEnumerable<EmailAttachmentContext> Attachments { get; init; } = [];
+    public IEnumerable<EmailAttachmentDto> Attachments { get; init; } = [];
 #else
-    public IEnumerable<EmailAttachmentContext> Attachments { get; set; } = [];
+    public IEnumerable<EmailAttachmentDto> Attachments { get; set; } = [];
 #endif
 
     /// <summary>
diff --git a/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IImapEmailService.cs b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IImapEmailService.cs
index 445127b..e11851d 100644
--- a/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IImapEmailService.cs
+++ b/src/core/DigitalData.MessagingService.Application/Common/Interfaces/IImapEmailService.cs
@@ -17,7 +17,7 @@ public interface IImapEmailService
     /// Set to <see langword="false"/> for a non-destructive read (uses <c>BODY.PEEK</c> internally).
     /// </param>
     /// <param name="cancellationToken">Cancellation token.</param>
-    Task<IEnumerable<ReceivedEmailContext>> FetchEmailsAsync(
+    Task<IEnumerable<ReceivedEmailDto>> FetchEmailsAsync(
         EmailAccountDto account,
         MailSearchFilter filter,
         CancellationToken cancellationToken = default);
diff --git a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
index 9b1a6bb..7a5d610 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailReceiving/Queries/FetchEmailsQuery.cs
@@ -10,7 +10,7 @@ namespace DigitalData.MessagingService.Application.EmailReceiving.Queries;
 /// <summary>
 /// Query to fetch emails from an IMAP mailbox.
 /// </summary>
-public record FetchEmailsQuery : IRequest<IEnumerable<ReceivedEmailContext>>
+public record FetchEmailsQuery : IRequest<IEnumerable<ReceivedEmailDto>>
 {
     /// <summary>
     /// Identifies the email account to use.
@@ -25,9 +25,9 @@ public record FetchEmailsQuery : IRequest<IEnumerable<ReceivedEmailContext>>
 
 public class FetchEmailsQueryHandler(
     ISender Sender,
-    IImapEmailService ImapService) : IRequestHandler<FetchEmailsQuery, IEnumerable<ReceivedEmailContext>>
+    IImapEmailService ImapService) : IRequestHandler<FetchEmailsQuery, IEnumerable<ReceivedEmailDto>>
 {
-    public async Task<IEnumerable<ReceivedEmailContext>> Handle(FetchEmailsQuery request, CancellationToken cancellationToken)
+    public async Task<IEnumerable<ReceivedEmailDto>> Handle(FetchEmailsQuery request, CancellationToken cancellationToken)
     {
         var account = await Sender.Send(request.Account, cancellationToken)
             ?? throw new NotFoundException(
diff --git a/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/PublishEmailCommand.cs b/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/PublishEmailCommand.cs
index 6edb84b..016e7f2 100644
--- a/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/PublishEmailCommand.cs
+++ b/src/core/DigitalData.MessagingService.Application/EmailSending/Commands/PublishEmailCommand.cs
@@ -35,13 +35,13 @@ public record PublishEmailCommand : IRequest<Guid>
     public bool IsHtml { get; init; } = true;
 
     [JsonIgnore]
-    internal IEnumerable<EmailAttachmentContext> Attachments { get; private init; } = [];
+    internal IEnumerable<EmailAttachmentDto> Attachments { get; private init; } = [];
 
     /// <summary>
     /// Returns a new command instance with the supplied attachments.
     /// Called by the controller after resolving uploaded files.
     /// </summary>
-    public PublishEmailCommand WithAttachments(IEnumerable<EmailAttachmentContext> attachments)
+    public PublishEmailCommand WithAttachments(IEnumerable<EmailAttachmentDto> attachments)
         => this with { Attachments = attachments };
 }
 
diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs
index 7616fbc..6f865ee 100644
--- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsEmailService.cs
@@ -111,7 +111,7 @@ public class LimilabsEmailService(
         return message.ToString();
     }
 
-    private static void AddAttachments(MailBuilder builder, IEnumerable<EmailAttachmentContext> attachments)
+    private static void AddAttachments(MailBuilder builder, IEnumerable<EmailAttachmentDto> attachments)
     {
         foreach (var attachment in attachments)
         {
diff --git a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsImapEmailService.cs b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsImapEmailService.cs
index 9aba1e5..69b6b2e 100644
--- a/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsImapEmailService.cs
+++ b/src/infrastructure/DigitalData.MessagingService.Infrastructure/Services/LimilabsImapEmailService.cs
@@ -28,7 +28,7 @@ public class LimilabsImapEmailService(
     }
 
     // Public API
-    public async Task<IEnumerable<ReceivedEmailContext>> FetchEmailsAsync(
+    public async Task<IEnumerable<ReceivedEmailDto>> FetchEmailsAsync(
         EmailAccountDto account,
         MailSearchFilter filter,
         CancellationToken cancellationToken = default)
@@ -60,7 +60,7 @@ public class LimilabsImapEmailService(
             if (uids.Count == 0)
                 return [];
             
-            var results = new List<ReceivedEmailContext>(uids.Count);
+            var results = new List<ReceivedEmailDto>(uids.Count);
 
             foreach (var uid in uids)
             {
@@ -77,11 +77,11 @@ public class LimilabsImapEmailService(
                             var mail = new MailBuilder().CreateFromEml(eml);
                             var flags = await imap.GetFlagsByUIDAsync(uid, cancellationToken);
 
-                            var attachments = new List<EmailAttachmentContext>();
+                            var attachments = new List<EmailAttachmentDto>();
 
                             foreach (var att in mail.Attachments)
                             {
-                                attachments.Add(new EmailAttachmentContext
+                                attachments.Add(new EmailAttachmentDto
                                 {
                                     FileName = att.FileName ?? "attachment",
                                     Content = att.Data,
@@ -93,7 +93,7 @@ public class LimilabsImapEmailService(
 
                             foreach (var vis in mail.Visuals)
                             {
-                                attachments.Add(new EmailAttachmentContext
+                                attachments.Add(new EmailAttachmentDto
                                 {
                                     FileName = vis.FileName ?? "inline",
                                     Content = vis.Data,
@@ -103,7 +103,7 @@ public class LimilabsImapEmailService(
                                 });
                             }
 
-                            return new ReceivedEmailContext
+                            return new ReceivedEmailDto
                             {
                                 Uid = uid,
                                 From = mail.From.FirstOrDefault()?.Address ?? string.Empty,
diff --git a/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs b/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
index 97913db..cfdcfd2 100644
--- a/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
+++ b/src/presentation/DigitalData.MessagingService.API/Controllers/EmailController.cs
@@ -56,21 +56,21 @@ public class EmailController(IMediator mediator) : ControllerBase
         return Accepted(new { Id = eventId });
     }
 
-    private static async Task<IEnumerable<EmailAttachmentContext>> BuildAttachmentsAsync(
+    private static async Task<IEnumerable<EmailAttachmentDto>> BuildAttachmentsAsync(
         IFormFileCollection? files,
         CancellationToken cancellationToken)
     {
         if (files is null || files.Count == 0)
             return [];
 
-        var result = new List<EmailAttachmentContext>(files.Count);
+        var result = new List<EmailAttachmentDto>(files.Count);
 
         foreach (var file in files)
         {
             using var ms = new MemoryStream();
             await file.CopyToAsync(ms, cancellationToken);
 
-            result.Add(new EmailAttachmentContext
+            result.Add(new EmailAttachmentDto
             {
                 FileName    = file.FileName,
                 Content     = ms.ToArray(),