diff --git a/EnvelopeGenerator.Application/DependencyInjection.cs b/EnvelopeGenerator.Application/DependencyInjection.cs
index 5f972325..2c33f529 100644
--- a/EnvelopeGenerator.Application/DependencyInjection.cs
+++ b/EnvelopeGenerator.Application/DependencyInjection.cs
@@ -8,8 +8,8 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using QRCoder;
 using System.Reflection;
 using MediatR;
-using EnvelopeGenerator.Application.Signatures.Commands;
-using EnvelopeGenerator.Application.Signatures.Behaviors;
+using EnvelopeGenerator.Application.DocReceiverElements.Commands;
+using EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 
 namespace EnvelopeGenerator.Application;
 
diff --git a/EnvelopeGenerator.Application/Signatures/Behaviors/AnnotationBehavior.cs b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs
similarity index 90%
rename from EnvelopeGenerator.Application/Signatures/Behaviors/AnnotationBehavior.cs
rename to EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs
index ba418143..1f369f16 100644
--- a/EnvelopeGenerator.Application/Signatures/Behaviors/AnnotationBehavior.cs
+++ b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs
@@ -1,10 +1,10 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Signatures.Commands;
+using EnvelopeGenerator.Application.DocReceiverElements.Commands;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 
-namespace EnvelopeGenerator.Application.Signatures.Behaviors;
+namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 
 /// <summary>
 /// Pipeline behavior that saves annotations.
diff --git a/EnvelopeGenerator.Application/Signatures/Behaviors/DocStatusBehavior.cs b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/DocStatusBehavior.cs
similarity index 91%
rename from EnvelopeGenerator.Application/Signatures/Behaviors/DocStatusBehavior.cs
rename to EnvelopeGenerator.Application/DocReceiverElements/Behaviors/DocStatusBehavior.cs
index 33383f8f..2541e549 100644
--- a/EnvelopeGenerator.Application/Signatures/Behaviors/DocStatusBehavior.cs
+++ b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/DocStatusBehavior.cs
@@ -1,11 +1,11 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.DocStatus.Commands;
-using EnvelopeGenerator.Application.Signatures.Commands;
+using EnvelopeGenerator.Application.DocReceiverElements.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using System.Text.Json;
 
-namespace EnvelopeGenerator.Application.Signatures.Behaviors;
+namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 
 /// <summary>
 /// Pipeline behavior that creates document status.
diff --git a/EnvelopeGenerator.Application/Signatures/Behaviors/EnvelopeReceiverResolutionBehavior.cs b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/EnvelopeReceiverResolutionBehavior.cs
similarity index 93%
rename from EnvelopeGenerator.Application/Signatures/Behaviors/EnvelopeReceiverResolutionBehavior.cs
rename to EnvelopeGenerator.Application/DocReceiverElements/Behaviors/EnvelopeReceiverResolutionBehavior.cs
index d83db5e7..8eeb1669 100644
--- a/EnvelopeGenerator.Application/Signatures/Behaviors/EnvelopeReceiverResolutionBehavior.cs
+++ b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/EnvelopeReceiverResolutionBehavior.cs
@@ -3,12 +3,12 @@ using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Signatures.Commands;
+using EnvelopeGenerator.Application.DocReceiverElements.Commands;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
-namespace EnvelopeGenerator.Application.Signatures.Behaviors;
+namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 
 /// <summary>
 /// Pipeline behavior that resolves and validates EnvelopeReceiver.
diff --git a/EnvelopeGenerator.Application/Signatures/Behaviors/HistoryBehavior.cs b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/HistoryBehavior.cs
similarity index 91%
rename from EnvelopeGenerator.Application/Signatures/Behaviors/HistoryBehavior.cs
rename to EnvelopeGenerator.Application/DocReceiverElements/Behaviors/HistoryBehavior.cs
index 2d46c7b3..ae8d41e4 100644
--- a/EnvelopeGenerator.Application/Signatures/Behaviors/HistoryBehavior.cs
+++ b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/HistoryBehavior.cs
@@ -1,10 +1,10 @@
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
-using EnvelopeGenerator.Application.Signatures.Commands;
+using EnvelopeGenerator.Application.DocReceiverElements.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 
-namespace EnvelopeGenerator.Application.Signatures.Behaviors;
+namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 
 /// <summary>
 /// Pipeline behavior that records history.
diff --git a/EnvelopeGenerator.Application/Signatures/Behaviors/SendSignedMailBehavior.cs b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SendSignedMailBehavior.cs
similarity index 97%
rename from EnvelopeGenerator.Application/Signatures/Behaviors/SendSignedMailBehavior.cs
rename to EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SendSignedMailBehavior.cs
index d9c9c7f6..43fe1cd7 100644
--- a/EnvelopeGenerator.Application/Signatures/Behaviors/SendSignedMailBehavior.cs
+++ b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SendSignedMailBehavior.cs
@@ -2,7 +2,7 @@ using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Signatures.Commands;
+using EnvelopeGenerator.Application.DocReceiverElements.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Domain.Interfaces;
@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
-namespace EnvelopeGenerator.Application.Signatures.Behaviors;
+namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 
 /// <summary>
 /// Pipeline behavior that sends signed mail notification.
diff --git a/EnvelopeGenerator.Application/Signatures/Commands/SigningCommand.cs b/EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs
similarity index 95%
rename from EnvelopeGenerator.Application/Signatures/Commands/SigningCommand.cs
rename to EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs
index 8ea08c6b..5c308650 100644
--- a/EnvelopeGenerator.Application/Signatures/Commands/SigningCommand.cs
+++ b/EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs
@@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Query;
 
-namespace EnvelopeGenerator.Application.Signatures.Commands;
+namespace EnvelopeGenerator.Application.DocReceiverElements.Commands;
 
 /// <summary>
 /// Command to sign a document by a receiver.