diff --git a/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs b/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs
index 95b10838..1f3ed9b3 100644
--- a/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs
@@ -1,6 +1,6 @@
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Model;
+using EnvelopeGenerator.Application.Common.Query;
 using EnvelopeGenerator.Domain.Interfaces;
 
 namespace EnvelopeGenerator.Application.Common.Extensions;
diff --git a/EnvelopeGenerator.Application/Common/Model/EnvelopeQueryBase.cs b/EnvelopeGenerator.Application/Common/Query/EnvelopeQueryBase.cs
similarity index 86%
rename from EnvelopeGenerator.Application/Common/Model/EnvelopeQueryBase.cs
rename to EnvelopeGenerator.Application/Common/Query/EnvelopeQueryBase.cs
index c974cfa5..9f2cba8c 100644
--- a/EnvelopeGenerator.Application/Common/Model/EnvelopeQueryBase.cs
+++ b/EnvelopeGenerator.Application/Common/Query/EnvelopeQueryBase.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Common.Model;
+namespace EnvelopeGenerator.Application.Common.Query;
 
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.
diff --git a/EnvelopeGenerator.Application/Common/Model/EnvelopeReceiverQueryBase.cs b/EnvelopeGenerator.Application/Common/Query/EnvelopeReceiverQueryBase.cs
similarity index 97%
rename from EnvelopeGenerator.Application/Common/Model/EnvelopeReceiverQueryBase.cs
rename to EnvelopeGenerator.Application/Common/Query/EnvelopeReceiverQueryBase.cs
index 63c72b4d..9c7a3f0f 100644
--- a/EnvelopeGenerator.Application/Common/Model/EnvelopeReceiverQueryBase.cs
+++ b/EnvelopeGenerator.Application/Common/Query/EnvelopeReceiverQueryBase.cs
@@ -1,7 +1,7 @@
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Common.Extensions;
 
-namespace EnvelopeGenerator.Application.Common.Model;
+namespace EnvelopeGenerator.Application.Common.Query;
 
 /// <summary>
 /// 
diff --git a/EnvelopeGenerator.Application/Common/Model/MappingProfile.cs b/EnvelopeGenerator.Application/Common/Query/MappingProfile.cs
similarity index 87%
rename from EnvelopeGenerator.Application/Common/Model/MappingProfile.cs
rename to EnvelopeGenerator.Application/Common/Query/MappingProfile.cs
index 7c2e208c..4fc8624e 100644
--- a/EnvelopeGenerator.Application/Common/Model/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Query/MappingProfile.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Common.Model;
+namespace EnvelopeGenerator.Application.Common.Query;
 
 /// <summary>
 /// 
diff --git a/EnvelopeGenerator.Application/Common/Model/ReceiverQueryBase.cs b/EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs
similarity index 90%
rename from EnvelopeGenerator.Application/Common/Model/ReceiverQueryBase.cs
rename to EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs
index 7c7088b4..9cd70341 100644
--- a/EnvelopeGenerator.Application/Common/Model/ReceiverQueryBase.cs
+++ b/EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Common.Model;
+namespace EnvelopeGenerator.Application.Common.Query;
 
 /// <summary>
 /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
diff --git a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
index 069b5aa6..a5ad6054 100644
--- a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Common.Model;
+using EnvelopeGenerator.Application.Common.Query;
 using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.DocStatus.Commands;
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
index 71648f66..211bee2a 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
@@ -7,7 +7,7 @@ using MediatR;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Model;
+using EnvelopeGenerator.Application.Common.Query;
 using EnvelopeGenerator.Application.Common.Extensions;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
index b023cb08..041d1afc 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Extensions;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.Common.Model;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 
diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
index 3c36d729..cad7dfb2 100644
--- a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
@@ -1,6 +1,6 @@
 using MediatR;
 using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.Common.Model;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 
diff --git a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
index 2fad46d0..109cc8d5 100644
--- a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
+++ b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
@@ -3,7 +3,7 @@ using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Model;
+using EnvelopeGenerator.Application.Common.Query;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
diff --git a/EnvelopeGenerator.Application/Receivers/Queries/ReadReceiverQuery.cs b/EnvelopeGenerator.Application/Receivers/Queries/ReadReceiverQuery.cs
index b9e2498c..7aec9c25 100644
--- a/EnvelopeGenerator.Application/Receivers/Queries/ReadReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/Receivers/Queries/ReadReceiverQuery.cs
@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Common.Model;
+using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.Receivers.Queries;