diff --git a/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs b/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs
index 64a1e909..3685a7b1 100644
--- a/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs
+++ b/EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs
@@ -8,7 +8,7 @@ using EnvelopeGenerator.Domain.Interfaces.Auditing;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")]
-    public class ElementAnnotation : IHasAddedWhen, IHasChangedWhen, IHasChangedWho
+    public class ElementAnnotation : IHasAddedWhen, IUpdateAuditable
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverReadOnly.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverReadOnly.cs
index 43e87bd3..5702e020 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverReadOnly.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverReadOnly.cs
@@ -7,7 +7,7 @@ using EnvelopeGenerator.Domain.Interfaces.Auditing;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_RECEIVER_READ_ONLY")]
-    public class EnvelopeReceiverReadOnly : IHasAddedWhen, IHasChangedWhen, IHasAddedWho
+    public class EnvelopeReceiverReadOnly : IHasChangedWhen, ICreationAuditable
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
diff --git a/EnvelopeGenerator.Domain/Entities/Signature.cs b/EnvelopeGenerator.Domain/Entities/Signature.cs
index 42aad668..6ec2330d 100644
--- a/EnvelopeGenerator.Domain/Entities/Signature.cs
+++ b/EnvelopeGenerator.Domain/Entities/Signature.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-    public class Signature : ISignature, IHasReceiver, IHasAddedWhen, IHasChangedWhen, IHasChangedWho
+    public class Signature : ISignature, IHasReceiver, IHasAddedWhen, IUpdateAuditable
     {
         public Signature()
         {