diff --git a/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs
index 8d3bd7fb..fcf6de9d 100644
--- a/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs
@@ -11,7 +11,7 @@ namespace EnvelopeGenerator.Application.Envelopes;
 /// <param name="Uuid">Die universell eindeutige Kennung des Umschlags.</param>
 public record EnvelopeQuery(
     int? Id = null,
-    UserQuery? Sender = null,
+    SenderQuery? Sender = null,
     int? Status = null,
     string? Uuid = null) : IRequest
 {
diff --git a/EnvelopeGenerator.Application/Envelopes/SenderQuery.cs b/EnvelopeGenerator.Application/Envelopes/SenderQuery.cs
new file mode 100644
index 00000000..ca0c70a1
--- /dev/null
+++ b/EnvelopeGenerator.Application/Envelopes/SenderQuery.cs
@@ -0,0 +1,11 @@
+namespace EnvelopeGenerator.Application.Envelopes;
+
+/// <summary>
+/// Repräsentiert eine Abfrage für einen Absender.
+/// </summary>
+/// <param name="Id">Die eindeutige Kennung des Absenders.</param>
+/// <param name="Username">Der Benutzername des Absenders.</param>
+/// <param name="Email">Die E-Mail-Adresse des Absenders.</param>
+public record SenderQuery(int? Id = null, string? Username = null, string? Email = null)
+{
+}
diff --git a/EnvelopeGenerator.Application/Envelopes/UserQuery.cs b/EnvelopeGenerator.Application/Envelopes/UserQuery.cs
deleted file mode 100644
index 0c57327b..00000000
--- a/EnvelopeGenerator.Application/Envelopes/UserQuery.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EnvelopeGenerator.Application.Envelopes;
-
-public record UserQuery(int? Id = null, string? Username = null, string? Email = null)
-{
-}