diff --git a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
index 97420bff..97088c19 100644
--- a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
@@ -6,7 +6,7 @@ namespace EnvelopeGenerator.Application.DocStatus.Commands;
 /// <summary>
 /// 
 /// </summary>
-public record ModifyDocStatusCommandBase : EnvelopeReceiverQuery
+public record ModifyDocStatusCommandBase : EnvelopeReceiverQueryBase
 {
     /// <summary>
     /// Gets the current status code.
diff --git a/EnvelopeGenerator.Application/Model/EnvelopeQuery.cs b/EnvelopeGenerator.Application/Model/EnvelopeQueryBase.cs
similarity index 92%
rename from EnvelopeGenerator.Application/Model/EnvelopeQuery.cs
rename to EnvelopeGenerator.Application/Model/EnvelopeQueryBase.cs
index 76fc0570..7e6edaa4 100644
--- a/EnvelopeGenerator.Application/Model/EnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Model/EnvelopeQueryBase.cs
@@ -3,7 +3,7 @@
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.
 /// </summary>
-public record EnvelopeQuery
+public record EnvelopeQueryBase
 {
     /// <summary>
     /// Die eindeutige Kennung des Umschlags.
diff --git a/EnvelopeGenerator.Application/Model/EnvelopeReceiverQuery.cs b/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
similarity index 83%
rename from EnvelopeGenerator.Application/Model/EnvelopeReceiverQuery.cs
rename to EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
index 11cc38da..fb4a47c4 100644
--- a/EnvelopeGenerator.Application/Model/EnvelopeReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
@@ -6,16 +6,16 @@ namespace EnvelopeGenerator.Application.Model;
 /// <summary>
 /// 
 /// </summary>
-public record EnvelopeReceiverQuery : EnvelopeReceiverQuery<EnvelopeQuery, ReceiverQuery>;
+public record EnvelopeReceiverQueryBase : EnvelopeReceiverQueryBase<EnvelopeQueryBase, ReceiverQueryBase>;
 
 /// <summary>
 /// 
 /// </summary>
 /// <typeparam name="TEnvelopeQuery"></typeparam>
 /// <typeparam name="TReceiverQuery"></typeparam>
-public record EnvelopeReceiverQuery<TEnvelopeQuery, TReceiverQuery>
-    where TEnvelopeQuery : EnvelopeQuery, new()
-    where TReceiverQuery : ReceiverQuery, new()
+public record EnvelopeReceiverQueryBase<TEnvelopeQuery, TReceiverQuery>
+    where TEnvelopeQuery : EnvelopeQueryBase, new()
+    where TReceiverQuery : ReceiverQueryBase, new()
 {
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Model/ReceiverQuery.cs b/EnvelopeGenerator.Application/Model/ReceiverQueryBase.cs
similarity index 94%
rename from EnvelopeGenerator.Application/Model/ReceiverQuery.cs
rename to EnvelopeGenerator.Application/Model/ReceiverQueryBase.cs
index 4ce7b16c..db8cfa84 100644
--- a/EnvelopeGenerator.Application/Model/ReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/Model/ReceiverQueryBase.cs
@@ -4,7 +4,7 @@
 /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
 /// um spezifische Informationen über einen Empfänger abzurufen.
 /// </summary>
-public record ReceiverQuery
+public record ReceiverQueryBase
 {
     /// <summary>
     /// ID des Empfängers