diff --git a/EnvelopeGenerator.API/Controllers/SignatureController.cs b/EnvelopeGenerator.API/Controllers/SignatureController.cs
index fcc11fe8..bd3ff352 100644
--- a/EnvelopeGenerator.API/Controllers/SignatureController.cs
+++ b/EnvelopeGenerator.API/Controllers/SignatureController.cs
@@ -44,7 +44,7 @@ public class SignatureController : ControllerBase
 
         var doc = await _mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);
 
-        if (doc.Elements is not IEnumerable<SignatureDto> docSignatures)
+        if (doc.Elements is not IEnumerable<DocReceiverElementDto> docSignatures)
             return NotFound("Document is empty.");
 
         var rcvSignatures = docSignatures.Where(s => s.ReceiverId == receiverId).ToList();
diff --git a/EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs b/EnvelopeGenerator.Application/Common/Dto/DocReceiverElementDto.cs
similarity index 98%
rename from EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs
rename to EnvelopeGenerator.Application/Common/Dto/DocReceiverElementDto.cs
index 976bf994..d24cee32 100644
--- a/EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/DocReceiverElementDto.cs
@@ -9,7 +9,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// Data Transfer Object representing a positioned element assigned to a document receiver.
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public class SignatureDto : IDocReceiverElement
+public class DocReceiverElementDto : IDocReceiverElement
 {
     /// <summary>
     /// Gets or sets the unique identifier of the element.
diff --git a/EnvelopeGenerator.Application/Common/Dto/DocumentDto.cs b/EnvelopeGenerator.Application/Common/Dto/DocumentDto.cs
index cdacfc8b..4fa3394e 100644
--- a/EnvelopeGenerator.Application/Common/Dto/DocumentDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/DocumentDto.cs
@@ -31,5 +31,5 @@ public class DocumentDto
     /// <summary>
     /// Gets or sets the collection of elements associated with the document for receiver interactions, if any.
     /// </summary>
-    public IEnumerable<SignatureDto>? Elements { get; set; }
+    public IEnumerable<DocReceiverElementDto>? Elements { get; set; }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
index 23c6ab0a..8397770a 100644
--- a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
@@ -23,7 +23,7 @@ public class MappingProfile : Profile
     {
         // Entity to DTO mappings
         CreateMap<Config, ConfigDto>();
-        CreateMap<DocReceiverElement, SignatureDto>();
+        CreateMap<DocReceiverElement, DocReceiverElementDto>();
         CreateMap<DocumentStatus, DocumentStatusDto>();
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
@@ -39,7 +39,7 @@ public class MappingProfile : Profile
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
-        CreateMap<SignatureDto, DocReceiverElement>();
+        CreateMap<DocReceiverElementDto, DocReceiverElement>();
         CreateMap<DocumentStatusDto, DocumentStatus>();
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
diff --git a/EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs b/EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs
index 15f54def..bbae058a 100644
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs
@@ -8,6 +8,6 @@ namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IDocumentReceiverElementService : IBasicCRUDService<SignatureDto, DocReceiverElement, int>
+public interface IDocumentReceiverElementService : IBasicCRUDService<DocReceiverElementDto, DocReceiverElement, int>
 {
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs b/EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs
index e0e00927..05a775e7 100644
--- a/EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs
+++ b/EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs
@@ -11,7 +11,7 @@ namespace EnvelopeGenerator.Application.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, SignatureDto, DocReceiverElement, int>, IDocumentReceiverElementService
+public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, DocReceiverElementDto, DocReceiverElement, int>, IDocumentReceiverElementService
 {
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestDocumentReceiverElementController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestDocumentReceiverElementController.cs
index f52073db..804af38e 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestDocumentReceiverElementController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestDocumentReceiverElementController.cs
@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.Common.Interfaces.Services;
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
 [Obsolete("Use MediatR")]
-public class TestDocumentReceiverElementController : TestControllerBase<IDocumentReceiverElementService, SignatureDto, DocReceiverElement, int>
+public class TestDocumentReceiverElementController : TestControllerBase<IDocumentReceiverElementService, DocReceiverElementDto, DocReceiverElement, int>
 {
     public TestDocumentReceiverElementController(ILogger<TestDocumentReceiverElementController> logger, IDocumentReceiverElementService service) : base(logger, service)
     {