From d9b5daee0e943e80b459ab701a60c50462f90959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 14 Mar 2018 14:37:56 +0300
Subject: [PATCH] #233 Rename audit properties (remove User keyword).

---
 .../Volo/Abp/Auditing/ICreationAudited.cs            |  4 ++--
 .../Volo/Abp/Auditing/IDeletionAudited.cs            |  4 ++--
 .../Volo/Abp/Auditing/IModificationAudited.cs        |  4 ++--
 .../Volo/Abp/Application/Dtos/AuditedEntityDto.cs    |  4 ++--
 .../Abp/Application/Dtos/AuditedEntityWithUserDto.cs |  8 ++++----
 .../Abp/Application/Dtos/CreationAuditedEntityDto.cs |  4 ++--
 .../Dtos/CreationAuditedEntityWithUserDto.cs         |  4 ++--
 .../Abp/Application/Dtos/FullAuditedEntityDto.cs     |  4 ++--
 .../Application/Dtos/FullAuditedEntityWithUserDto.cs | 12 ++++++------
 .../Domain/Entities/Auditing/AuditedAggregateRoot.cs |  4 ++--
 .../Auditing/AuditedAggregateRootWithUser.cs         |  8 ++++----
 .../Abp/Domain/Entities/Auditing/AuditedEntity.cs    |  4 ++--
 .../Entities/Auditing/AuditedEntityWithUser.cs       |  8 ++++----
 .../Auditing/CreationAuditedAggregateRoot.cs         |  4 ++--
 .../Auditing/CreationAuditedAggregateRootWithUser.cs |  4 ++--
 .../Entities/Auditing/CreationAuditedEntity.cs       |  4 ++--
 .../Auditing/CreationAuditedEntityWithUser.cs        |  4 ++--
 .../Entities/Auditing/FullAuditedAggregateRoot.cs    |  4 ++--
 .../Auditing/FullAuditedAggregateRootWithUser.cs     | 12 ++++++------
 .../Domain/Entities/Auditing/FullAuditedEntity.cs    |  4 ++--
 .../Entities/Auditing/FullAuditedEntityWithUser.cs   | 12 ++++++------
 21 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICreationAudited.cs b/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICreationAudited.cs
index e65021171f..ce9be3d8a4 100644
--- a/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICreationAudited.cs
+++ b/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICreationAudited.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.Auditing
         /// <summary>
         /// Id of the creator user.
         /// </summary>
-        Guid? CreatorUserId { get; set; }
+        Guid? CreatorId { get; set; }
     }
 
     /// <summary>
@@ -22,6 +22,6 @@ namespace Volo.Abp.Auditing
         /// <summary>
         /// Reference to the creator user.
         /// </summary>
-        TUser CreatorUser { get; set; }
+        TUser Creator { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IDeletionAudited.cs b/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IDeletionAudited.cs
index 5629d968c9..8b1d313ad0 100644
--- a/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IDeletionAudited.cs
+++ b/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IDeletionAudited.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.Auditing
         /// <summary>
         /// Id of the deleter user.
         /// </summary>
-        Guid? DeleterUserId { get; set; }
+        Guid? DeleterId { get; set; }
     }
 
     /// <summary>
@@ -22,6 +22,6 @@ namespace Volo.Abp.Auditing
         /// <summary>
         /// Reference to the deleter user.
         /// </summary>
-        TUser DeleterUser { get; set; }
+        TUser Deleter { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IModificationAudited.cs b/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IModificationAudited.cs
index 7f87759627..56a81a3d79 100644
--- a/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IModificationAudited.cs
+++ b/src/Volo.Abp.Auditing/Volo/Abp/Auditing/IModificationAudited.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.Auditing
         /// <summary>
         /// Last modifier user for this entity.
         /// </summary>
-        Guid? LastModifierUserId { get; set; }
+        Guid? LastModifierId { get; set; }
     }
 
     /// <summary>
@@ -22,6 +22,6 @@ namespace Volo.Abp.Auditing
         /// <summary>
         /// Reference to the last modifier user of this entity.
         /// </summary>
-        TUser LastModifierUser { get; set; }
+        TUser LastModifier { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/AuditedEntityDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/AuditedEntityDto.cs
index 5197694a58..12a0bd356b 100644
--- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/AuditedEntityDto.cs
+++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/AuditedEntityDto.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Application.Dtos
         public DateTime? LastModificationTime { get; set; }
 
         /// <inheritdoc />
-        public Guid? LastModifierUserId { get; set; }
+        public Guid? LastModifierId { get; set; }
     }
 
     /// <summary>
@@ -27,6 +27,6 @@ namespace Volo.Abp.Application.Dtos
         public DateTime? LastModificationTime { get; set; }
 
         /// <inheritdoc />
-        public Guid? LastModifierUserId { get; set; }
+        public Guid? LastModifierId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs
index d18ce732fd..fad4c11389 100644
--- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs
+++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/AuditedEntityWithUserDto.cs
@@ -11,10 +11,10 @@ namespace Volo.Abp.Application.Dtos
     public abstract class AuditedEntityWithUserDto<TUserDto> : AuditedEntityDto, IAudited<TUserDto>
     {
         /// <inheritdoc />
-        public TUserDto CreatorUser { get; set; }
+        public TUserDto Creator { get; set; }
 
         /// <inheritdoc />
-        public TUserDto LastModifierUser { get; set; }
+        public TUserDto LastModifier { get; set; }
     }
 
     /// <summary>
@@ -26,9 +26,9 @@ namespace Volo.Abp.Application.Dtos
     public abstract class AuditedEntityWithUserDto<TPrimaryKey, TUserDto> : AuditedEntityDto<TPrimaryKey>, IAudited<TUserDto>
     {
         /// <inheritdoc />
-        public TUserDto CreatorUser { get; set; }
+        public TUserDto Creator { get; set; }
 
         /// <inheritdoc />
-        public TUserDto LastModifierUser { get; set; }
+        public TUserDto LastModifier { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/CreationAuditedEntityDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/CreationAuditedEntityDto.cs
index 5b4e1bbb0c..a92293b624 100644
--- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/CreationAuditedEntityDto.cs
+++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/CreationAuditedEntityDto.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Application.Dtos
         public DateTime CreationTime { get; set; }
 
         /// <inheritdoc />
-        public Guid? CreatorUserId { get; set; }
+        public Guid? CreatorId { get; set; }
     }
 
     /// <summary>
@@ -27,6 +27,6 @@ namespace Volo.Abp.Application.Dtos
         public DateTime CreationTime { get; set; }
 
         /// <inheritdoc />
-        public Guid? CreatorUserId { get; set; }
+        public Guid? CreatorId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs
index 3986b8da00..a8cfbf851f 100644
--- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs
+++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/CreationAuditedEntityWithUserDto.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.Application.Dtos
     [Serializable]
     public abstract class CreationAuditedEntityWithUserDto<TUserDto> : CreationAuditedEntityDto, ICreationAudited<TUserDto>
     {
-        public TUserDto CreatorUser { get; set; }
+        public TUserDto Creator { get; set; }
     }
 
     /// <summary>
@@ -21,6 +21,6 @@ namespace Volo.Abp.Application.Dtos
     [Serializable]
     public abstract class CreationAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : CreationAuditedEntityDto<TPrimaryKey>, ICreationAudited<TUserDto>
     {
-        public TUserDto CreatorUser { get; set; }
+        public TUserDto Creator { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/FullAuditedEntityDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/FullAuditedEntityDto.cs
index e40c2efb05..0b59201da0 100644
--- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/FullAuditedEntityDto.cs
+++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/FullAuditedEntityDto.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Application.Dtos
         public bool IsDeleted { get; set; }
 
         /// <inheritdoc />
-        public Guid? DeleterUserId { get; set; }
+        public Guid? DeleterId { get; set; }
 
         /// <inheritdoc />
         public DateTime? DeletionTime { get; set; }
@@ -30,7 +30,7 @@ namespace Volo.Abp.Application.Dtos
         public bool IsDeleted { get; set; }
 
         /// <inheritdoc />
-        public Guid? DeleterUserId { get; set; }
+        public Guid? DeleterId { get; set; }
 
         /// <inheritdoc />
         public DateTime? DeletionTime { get; set; }
diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs
index f3c727e6d9..f7870d0771 100644
--- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs
+++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/FullAuditedEntityWithUserDto.cs
@@ -11,13 +11,13 @@ namespace Volo.Abp.Application.Dtos
     public abstract class FullAuditedEntityWithUserDto<TUserDto> : FullAuditedEntityDto, IFullAudited<TUserDto>
     {
         /// <inheritdoc />
-        public TUserDto CreatorUser { get; set; }
+        public TUserDto Creator { get; set; }
 
         /// <inheritdoc />
-        public TUserDto LastModifierUser { get; set; }
+        public TUserDto LastModifier { get; set; }
 
         /// <inheritdoc />
-        public TUserDto DeleterUser { get; set; }
+        public TUserDto Deleter { get; set; }
     }
 
     /// <summary>
@@ -29,12 +29,12 @@ namespace Volo.Abp.Application.Dtos
     public abstract class FullAuditedEntityWithUserDto<TPrimaryKey, TUserDto> : FullAuditedEntityDto<TPrimaryKey>, IFullAudited<TUserDto>
     {
         /// <inheritdoc />
-        public TUserDto CreatorUser { get; set; }
+        public TUserDto Creator { get; set; }
         
         /// <inheritdoc />
-        public TUserDto LastModifierUser { get; set; }
+        public TUserDto LastModifier { get; set; }
         
         /// <inheritdoc />
-        public TUserDto DeleterUser { get; set; }
+        public TUserDto Deleter { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRoot.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRoot.cs
index cceb41c4a8..c0988b98a9 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRoot.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRoot.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual DateTime? LastModificationTime { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? LastModifierUserId { get; set; }
+        public virtual Guid? LastModifierId { get; set; }
     }
 
     /// <summary>
@@ -27,6 +27,6 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual DateTime? LastModificationTime { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? LastModifierUserId { get; set; }
+        public virtual Guid? LastModifierId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRootWithUser.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRootWithUser.cs
index 95812c3160..46f74a37cf 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRootWithUser.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRootWithUser.cs
@@ -12,10 +12,10 @@ namespace Volo.Abp.Domain.Entities.Auditing
         where TUser : IEntity<long>
     {
         /// <inheritdoc />
-        public virtual TUser CreatorUser { get; set; }
+        public virtual TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public virtual TUser LastModifierUser { get; set; }
+        public virtual TUser LastModifier { get; set; }
     }
 
     /// <summary>
@@ -28,9 +28,9 @@ namespace Volo.Abp.Domain.Entities.Auditing
         where TUser : IEntity<long>
     {
         /// <inheritdoc />
-        public virtual TUser CreatorUser { get; set; }
+        public virtual TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public virtual TUser LastModifierUser { get; set; }
+        public virtual TUser LastModifier { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntity.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntity.cs
index d6b2ecbe8b..9fc060a418 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntity.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntity.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual DateTime? LastModificationTime { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? LastModifierUserId { get; set; }
+        public virtual Guid? LastModifierId { get; set; }
     }
 
     /// <summary>
@@ -27,6 +27,6 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual DateTime? LastModificationTime { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? LastModifierUserId { get; set; }
+        public virtual Guid? LastModifierId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntityWithUser.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntityWithUser.cs
index be410c89ee..5df2331bed 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntityWithUser.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntityWithUser.cs
@@ -12,10 +12,10 @@ namespace Volo.Abp.Domain.Entities.Auditing
         where TUser : IEntity<long>
     {
         /// <inheritdoc />
-        public virtual TUser CreatorUser { get; set; }
+        public virtual TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public virtual TUser LastModifierUser { get; set; }
+        public virtual TUser LastModifier { get; set; }
     }
 
     /// <summary>
@@ -28,9 +28,9 @@ namespace Volo.Abp.Domain.Entities.Auditing
         where TUser : IEntity<long>
     {
         /// <inheritdoc />
-        public virtual TUser CreatorUser { get; set; }
+        public virtual TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public virtual TUser LastModifierUser { get; set; }
+        public virtual TUser LastModifier { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRoot.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRoot.cs
index a023073c72..8522472047 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRoot.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRoot.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual DateTime CreationTime { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? CreatorUserId { get; set; }
+        public virtual Guid? CreatorId { get; set; }
     }
 
     /// <summary>
@@ -27,6 +27,6 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual DateTime CreationTime { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? CreatorUserId { get; set; }
+        public virtual Guid? CreatorId { get; set; }
     }
 }
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRootWithUser.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRootWithUser.cs
index 1487dbeedc..3a8266c02a 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRootWithUser.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRootWithUser.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
     public abstract class CreationAuditedAggregateRootWithUser<TUser> : CreationAuditedAggregateRoot, ICreationAudited<TUser>
     {
         /// <inheritdoc />
-        public virtual TUser CreatorUser { get; set; }
+        public virtual TUser Creator { get; set; }
     }
 
     /// <summary>
@@ -23,6 +23,6 @@ namespace Volo.Abp.Domain.Entities.Auditing
     public abstract class CreationAuditedAggregateRootWithUser<TPrimaryKey, TUser> : CreationAuditedAggregateRoot<TPrimaryKey>, ICreationAudited<TUser>
     {
         /// <inheritdoc />
-        public virtual TUser CreatorUser { get; set; }
+        public virtual TUser Creator { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntity.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntity.cs
index cb658d99b3..7f490ba570 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntity.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntity.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual DateTime CreationTime { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? CreatorUserId { get; set; }
+        public virtual Guid? CreatorId { get; set; }
     }
 
     /// <summary>
@@ -27,6 +27,6 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual DateTime CreationTime { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? CreatorUserId { get; set; }
+        public virtual Guid? CreatorId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntityWithUser.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntityWithUser.cs
index 9c01bffcba..9b14080820 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntityWithUser.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntityWithUser.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
     public abstract class CreationAuditedEntityWithUser<TUser> : CreationAuditedEntity, ICreationAudited<TUser>
     {
         /// <inheritdoc />
-        public virtual TUser CreatorUser { get; set; }
+        public virtual TUser Creator { get; set; }
     }
 
     /// <summary>
@@ -23,6 +23,6 @@ namespace Volo.Abp.Domain.Entities.Auditing
     public abstract class CreationAuditedEntityWithUser<TPrimaryKey, TUser> : CreationAuditedEntity<TPrimaryKey>, ICreationAudited<TUser>
     {
         /// <inheritdoc />
-        public virtual TUser CreatorUser { get; set; }
+        public virtual TUser Creator { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRoot.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRoot.cs
index 7ca08b348c..30a7f44975 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRoot.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRoot.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual bool IsDeleted { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? DeleterUserId { get; set; }
+        public virtual Guid? DeleterId { get; set; }
 
         /// <inheritdoc />
         public virtual DateTime? DeletionTime { get; set; }
@@ -30,7 +30,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual bool IsDeleted { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? DeleterUserId { get; set; }
+        public virtual Guid? DeleterId { get; set; }
 
         /// <inheritdoc />
         public virtual DateTime? DeletionTime { get; set; }
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRootWithUser.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRootWithUser.cs
index c99f24cfa0..766b6301ba 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRootWithUser.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRootWithUser.cs
@@ -12,13 +12,13 @@ namespace Volo.Abp.Domain.Entities.Auditing
         where TUser : IEntity<long>
     {
         /// <inheritdoc />
-        public virtual TUser DeleterUser { get; set; }
+        public virtual TUser Deleter { get; set; }
 
         /// <inheritdoc />
-        public TUser CreatorUser { get; set; }
+        public TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public TUser LastModifierUser { get; set; }
+        public TUser LastModifier { get; set; }
     }
 
     /// <summary>
@@ -31,12 +31,12 @@ namespace Volo.Abp.Domain.Entities.Auditing
         where TUser : IEntity<long>
     {
         /// <inheritdoc />
-        public virtual TUser DeleterUser { get; set; }
+        public virtual TUser Deleter { get; set; }
 
         /// <inheritdoc />
-        public TUser CreatorUser { get; set; }
+        public TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public TUser LastModifierUser { get; set; }
+        public TUser LastModifier { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntity.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntity.cs
index 099ea8d988..25cacc92c3 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntity.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntity.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual bool IsDeleted { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? DeleterUserId { get; set; }
+        public virtual Guid? DeleterId { get; set; }
 
         /// <inheritdoc />
         public virtual DateTime? DeletionTime { get; set; }
@@ -30,7 +30,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
         public virtual bool IsDeleted { get; set; }
 
         /// <inheritdoc />
-        public virtual Guid? DeleterUserId { get; set; }
+        public virtual Guid? DeleterId { get; set; }
 
         /// <inheritdoc />
         public virtual DateTime? DeletionTime { get; set; }
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs
index 683cb2dd5c..a6f241c6ea 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs
@@ -12,13 +12,13 @@ namespace Volo.Abp.Domain.Entities.Auditing
         where TUser : IEntity<long>
     {
         /// <inheritdoc />
-        public virtual TUser DeleterUser { get; set; }
+        public virtual TUser Deleter { get; set; }
 
         /// <inheritdoc />
-        public TUser CreatorUser { get; set; }
+        public TUser Creator { get; set; }
 
         /// <inheritdoc />
-        public TUser LastModifierUser { get; set; }
+        public TUser LastModifier { get; set; }
     }
 
     /// <summary>
@@ -31,12 +31,12 @@ namespace Volo.Abp.Domain.Entities.Auditing
         where TUser : IEntity<long>
     {
         /// <inheritdoc />
-        public virtual TUser DeleterUser { get; set; }
+        public virtual TUser Deleter { get; set; }
 
         /// <inheritdoc />
-        public TUser CreatorUser { get; set; }
+        public TUser Creator { get; set; }
         
         /// <inheritdoc />
-        public TUser LastModifierUser { get; set; }
+        public TUser LastModifier { get; set; }
     }
 }
\ No newline at end of file