diff --git a/EnvelopeGenerator.Application/Dto/EnvelopeDto.cs b/EnvelopeGenerator.Application/Dto/EnvelopeDto.cs
index 81679f02..b39893eb 100644
--- a/EnvelopeGenerator.Application/Dto/EnvelopeDto.cs
+++ b/EnvelopeGenerator.Application/Dto/EnvelopeDto.cs
@@ -25,7 +25,7 @@ public record EnvelopeDto
     /// <summary>
     /// 
     /// </summary>
-    public required EnvelopeStatus Status { get; set; }
+    public required EnvelopeStatusQuery Status { get; set; }
 
     /// <summary>
     /// Default value is string.Empty
diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
index 6a896029..29c365b1 100644
--- a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
@@ -11,11 +11,11 @@ public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest
     /// <summary>
     /// Abfrage des Include des Umschlags
     /// </summary>
-    public EnvelopeStatus? Status { get; init; }
+    public EnvelopeStatusQuery? Status { get; init; }
 }
 
 /// <summary>
-/// Repräsentiert den Include eines Umschlags und dessen Beziehung zum Empfänger. (vgl. auch <see cref="EnvelopeStatus"/>
+/// Repräsentiert den Include eines Umschlags und dessen Beziehung zum Empfänger. (vgl. auch <see cref="EnvelopeStatusQuery"/>
 /// Invalid (0): Ungültiger Include.
 /// EnvelopeCreated (1001): Der Umschlag wurde erstellt.
 /// EnvelopeSaved (1002): Der Umschlag wurde gespeichert.
@@ -43,7 +43,7 @@ public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest
 /// MessageCompletionSent (3005): Abschlussbenachrichtigung wurde gesendet.
 /// </summary>
 
-public record EnvelopeStatus
+public record EnvelopeStatusQuery
 {
     /// <summary>
     /// Der minimale Statuswert, der berücksichtigt werden.
diff --git a/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs b/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs
index 0844e843..55b32ec9 100644
--- a/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs
@@ -84,7 +84,7 @@ public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver,
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
+    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, params EnvelopeStatusQuery[] ignore_statuses);
 
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs
index 82d3862f..1868af7f 100644
--- a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs
@@ -122,7 +122,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatus[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatusQuery[] ignore_statuses);
 
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
index 0e27b85e..fa6a18d7 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
@@ -239,7 +239,7 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatus[] ignore_statuses)
+    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatusQuery[] ignore_statuses)
     {
         var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
         
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
index d5cd2e42..4e7b46a8 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
@@ -69,7 +69,7 @@ public class EnvelopeController : ControllerBase
                     if (envelope.Id is int id)
                         envelopes = envelopes.Where(e => e.Id == id);
 
-                    if (envelope.Status is EnvelopeStatus status)
+                    if (envelope.Status is EnvelopeStatusQuery status)
                         envelopes = envelopes.Where(e => e.Status == status);
 
                     if (envelope.Uuid is string uuid)
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
index e05a2095..da91b735 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
@@ -104,7 +104,7 @@ public class EnvelopeReceiverController : ControllerBase
             max_status: envelopeReceiver.Envelope.Status?.Max,
             envelopeQuery: envelopeReceiver.Envelope,
             receiverQuery: envelopeReceiver.Receiver,
-            ignore_statuses: envelopeReceiver.Envelope.Status?.Ignore ?? Array.Empty<EnvelopeStatus>())
+            ignore_statuses: envelopeReceiver.Envelope.Status?.Ignore ?? Array.Empty<EnvelopeStatusQuery>())
             .ThenAsync(
                 Success: Ok,
                 Fail: IActionResult (msg, ntc) =>
diff --git a/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs b/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs
index d8a928aa..9bd1a714 100644
--- a/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs
+++ b/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs
@@ -844,7 +844,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .HasColumnType("int")
                         .HasColumnName("ENVELOPE_ID");
 
-                    b.Property<int>("EnvelopeStatus")
+                    b.Property<int>("EnvelopeStatusQuery")
                         .HasColumnType("int")
                         .HasColumnName("ENVELOPE_STATUS");
 
diff --git a/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs b/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs
index 1a11934f..ecef0449 100644
--- a/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs
+++ b/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs
@@ -841,7 +841,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .HasColumnType("int")
                         .HasColumnName("ENVELOPE_ID");
 
-                    b.Property<int>("EnvelopeStatus")
+                    b.Property<int>("EnvelopeStatusQuery")
                         .HasColumnType("int")
                         .HasColumnName("ENVELOPE_STATUS");
 
diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index 2244a257..3d5b51b9 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -231,7 +231,7 @@ public class HomeController : ViewControllerBase
         //check the access code verification
         if (er_secret.AccessCode != auth.AccessCode)
         {
-            //EnvelopeStatus.AccessCodeIncorrect
+            //EnvelopeStatusQuery.AccessCodeIncorrect
             await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeIncorrect);
             Response.StatusCode = StatusCodes.Status401Unauthorized;
             return View("EnvelopeLocked")