diff --git a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
index 4c01a07b..59d278e7 100644
--- a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
@@ -35,7 +35,7 @@ public class MappingProfile : Profile
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
-        CreateMap<Annotation, AnnotationDto>();
+        CreateMap<ElementAnnotation, AnnotationDto>();
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
@@ -51,7 +51,7 @@ public class MappingProfile : Profile
         CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
-        CreateMap<AnnotationCreateDto, Annotation>()
+        CreateMap<AnnotationCreateDto, ElementAnnotation>()
             .ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
 
         // Messaging mappings
diff --git a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
index 9b7f1cdd..044f009f 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
@@ -12,13 +12,13 @@ public class AnnotationHandler : INotificationHandler<DocSignedNotification>
     /// <summary>
     /// 
     /// </summary>
-    private readonly IRepository<Annotation> _repo;
+    private readonly IRepository<ElementAnnotation> _repo;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repository"></param>
-    public AnnotationHandler(IRepository<Annotation> repository)
+    public AnnotationHandler(IRepository<ElementAnnotation> repository)
     {
         _repo = repository;
     }
diff --git a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs
index 6829b751..237b0e6f 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs
@@ -9,13 +9,13 @@ namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Han
 /// </summary>
 public class RemoveAnnotationHandler : INotificationHandler<RemoveSignatureNotification>
 {
-    private readonly IRepository<Annotation> _repo;
+    private readonly IRepository<ElementAnnotation> _repo;
 
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repository"></param>
-    public RemoveAnnotationHandler(IRepository<Annotation> repository)
+    public RemoveAnnotationHandler(IRepository<ElementAnnotation> repository)
     {
         _repo = repository;
     }
diff --git a/EnvelopeGenerator.Domain/Entities/Annotation.cs b/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs
similarity index 97%
rename from EnvelopeGenerator.Domain/Entities/Annotation.cs
rename to EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs
index b0edcb2a..8068da64 100644
--- a/EnvelopeGenerator.Domain/Entities/Annotation.cs
+++ b/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs
@@ -12,7 +12,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #endif
 
 [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")]
-public class Annotation
+public class ElementAnnotation
 {
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
diff --git a/EnvelopeGenerator.Domain/Entities/Signature.cs b/EnvelopeGenerator.Domain/Entities/Signature.cs
index 798d4723..992e346d 100644
--- a/EnvelopeGenerator.Domain/Entities/Signature.cs
+++ b/EnvelopeGenerator.Domain/Entities/Signature.cs
@@ -114,7 +114,7 @@ public class Signature : ISignature, IHasReceiver
 #endif
         Receiver { get; set; }
 
-    public virtual IEnumerable<Annotation>
+    public virtual IEnumerable<ElementAnnotation>
 #if NET
         ?
 #endif