diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConnectionStringConsts.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConnectionStringConsts.cs
index 526d12b7d6..4cdf8dee2a 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConnectionStringConsts.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConnectionStringConsts.cs
@@ -2,7 +2,7 @@
 {
     public static class TenantConnectionStringConsts
     {
-        public const int MaxNameLength = 128;
+        public const int MaxNameLength = 64;
 
         public const int MaxValueLength = 1024;
     }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs
index d9da76e254..74b9a7ebc0 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs
@@ -2,12 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using Volo.Abp.Data;
-using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Auditing;
 
 namespace Volo.Abp.TenantManagement
 {
-    public class Tenant : AggregateRoot<Guid>
+    public class Tenant : FullAuditedAggregateRoot<Guid>
     {
         public virtual string Name { get; protected set; }
 
@@ -20,10 +19,8 @@ namespace Volo.Abp.TenantManagement
 
         protected internal Tenant(Guid id, [NotNull] string name)
         {
-            Check.NotNull(name, nameof(name));
-
             Id = id;
-            Name = name;
+            SetName(name);
 
             ConnectionStrings = new List<TenantConnectionString>();
             ExtraProperties = new Dictionary<string, object>();
@@ -43,9 +40,7 @@ namespace Volo.Abp.TenantManagement
 
         internal void SetName([NotNull] string name)
         {
-            Check.NotNull(name, nameof(name));
-
-            Name = name;
+            Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConsts.MaxNameLength);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantConnectionString.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantConnectionString.cs
index daa8832110..71fea8c50c 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantConnectionString.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantConnectionString.cs
@@ -19,17 +19,19 @@ namespace Volo.Abp.TenantManagement
 
         public TenantConnectionString(Guid tenantId, [NotNull] string name, [NotNull] string value)
         {
-            Check.NotNull(name, nameof(name));
-            Check.NotNull(value, nameof(value));
-
             TenantId = tenantId;
-            Name = name;
-            Value = value;
+            Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConnectionStringConsts.MaxNameLength);
+            SetValue(value);
+        }
+
+        public virtual void SetValue([NotNull] string value)
+        {
+            Value = Check.NotNullOrWhiteSpace(value, nameof(value), TenantConnectionStringConsts.MaxValueLength);
         }
 
         public override object[] GetKeys()
         {
-            return new object[] { TenantId, Name, Value };
+            return new object[] { TenantId, Name };
         }
     }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementDbContextModelCreatingExtensions.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementDbContextModelCreatingExtensions.cs
index 0022ee8475..0c5b20a638 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementDbContextModelCreatingExtensions.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementDbContextModelCreatingExtensions.cs
@@ -22,7 +22,9 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore
             {
                 b.ToTable(tablePrefix + "Tenants", schema);
 
+                b.ConfigureFullAudited();
                 b.ConfigureExtraProperties();
+                b.ConfigureConcurrencyStamp();
 
                 b.Property(t => t.Name).IsRequired().HasMaxLength(TenantConsts.MaxNameLength);