diff --git a/src/DigitalData.EmailProfiler.Infrastructure/DependencyInjection.cs b/src/DigitalData.EmailProfiler.Infrastructure/DependencyInjection.cs
index e724498..48ad61a 100644
--- a/src/DigitalData.EmailProfiler.Infrastructure/DependencyInjection.cs
+++ b/src/DigitalData.EmailProfiler.Infrastructure/DependencyInjection.cs
@@ -31,7 +31,7 @@ public static class DependencyInjection
         services.AddSingleton<IEncryptionService, DataProtectionEncryptionService>();
 
         // --- Email Queue (RabbitMQ) ---
-        services.AddSingleton<IEmailQueue, RabbitMqEmailQueue>();
+        services.AddSingleton<IEmailQueue, OutgoingEmailQueue>();
 
         // --- RabbitMQ Configuration ---
         services.Configure<RabbitMqConfiguration>(
diff --git a/src/DigitalData.EmailProfiler.Infrastructure/Queue/RabbitMqEmailQueue.cs b/src/DigitalData.EmailProfiler.Infrastructure/Queue/OutgoingEmailQueue.cs
similarity index 97%
rename from src/DigitalData.EmailProfiler.Infrastructure/Queue/RabbitMqEmailQueue.cs
rename to src/DigitalData.EmailProfiler.Infrastructure/Queue/OutgoingEmailQueue.cs
index d6025c8..5377fd4 100644
--- a/src/DigitalData.EmailProfiler.Infrastructure/Queue/RabbitMqEmailQueue.cs
+++ b/src/DigitalData.EmailProfiler.Infrastructure/Queue/OutgoingEmailQueue.cs
@@ -16,16 +16,16 @@ namespace DigitalData.EmailProfiler.Infrastructure.Queue;
 /// Provides message persistence, scalability, and reliability.
 /// Uses Lazy<T> initialization pattern to avoid blocking constructor.
 /// </summary>
-public class RabbitMqEmailQueue : IEmailQueue, IDisposable
+public class OutgoingEmailQueue : IEmailQueue, IDisposable
 {
-    private readonly ILogger<RabbitMqEmailQueue> _logger;
+    private readonly ILogger<OutgoingEmailQueue> _logger;
     private readonly RabbitMqConfiguration _config;
     private IConnection? _connection;
     private IChannel _channel;
     private readonly IEmailService _emailService;
     
 #pragma warning disable CS8618 // channel and connection are initialized in InitAsync, not in constructor
-    public RabbitMqEmailQueue(IOptions<RabbitMqConfiguration> config, ILogger<RabbitMqEmailQueue> logger, IEmailService emailService)
+    public OutgoingEmailQueue(IOptions<RabbitMqConfiguration> config, ILogger<OutgoingEmailQueue> logger, IEmailService emailService)
 #pragma warning restore CS8618
     {
         _logger = logger;