diff --git a/EnvelopeGenerator.Application/EnvelopeHistories/EnvelopeHistoryQuery.cs b/EnvelopeGenerator.Application/EnvelopeHistories/EnvelopeHistoryQuery.cs
index 6fc487cc..3d917027 100644
--- a/EnvelopeGenerator.Application/EnvelopeHistories/EnvelopeHistoryQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeHistories/EnvelopeHistoryQuery.cs
@@ -22,7 +22,7 @@ public record EnvelopeHistoryQuery<TEnvelopeQuery, TReceiverQuery>(int EnvelopeI
     /// Ist keiner von beiden definiert, wird der Referenztyp als System betrachtet.
     /// </summary>
     public ReferenceType ReferenceType =>
-        Envelope?.User is not null
+        Envelope?.Sender is not null
             ? ReferenceType.Receiver
             : Receiver is not null
                 ? ReferenceType.Receiver
diff --git a/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs
index 39bd71a5..8d3bd7fb 100644
--- a/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs
@@ -6,27 +6,27 @@ namespace EnvelopeGenerator.Application.Envelopes;
 /// Repräsentiert eine Abfrage für Umschläge.
 /// </summary>
 /// <param name="Id">Die eindeutige Kennung des Umschlags.</param>
-/// <param name="User">Absender des Schreibens</param>
+/// <param name="Sender">Absender des Schreibens</param>
 /// <param name="Status">Der Status des Umschlags.</param>
 /// <param name="Uuid">Die universell eindeutige Kennung des Umschlags.</param>
 public record EnvelopeQuery(
     int? Id = null,
-    UserQuery? User = null,
+    UserQuery? Sender = null,
     int? Status = null,
     string? Uuid = null) : IRequest
 {
     /// <summary>
     /// Die eindeutige Kennung des Benutzers.
     /// </summary>
-    public int? UserId => User?.Id;
+    public int? SenderId => Sender?.Id;
 
     /// <summary>
     /// Der Benutzername des Absenders.
     /// </summary>
-    public string? Username => User?.Username;
+    public string? SenderUsername => Sender?.Username;
 
     /// <summary>
     /// Die E-Mail-Adresse des Benutzers.
     /// </summary>
-    public string? UserEmail => User?.Username;
+    public string? SenderEmail => Sender?.Username;
 };
\ No newline at end of file