diff --git a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs
index d06eb60566..3873b48db3 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs
@@ -98,12 +98,12 @@ public class MauiBlazorRemoteTenantStore : ITenantStore, ITransientDependency
             return null;
         }
 
-        return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name!);
+        return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name!, tenantResultDto.NormalizedName!);
     }
 
-    protected virtual string CreateCacheKey(string tenantName)
+    protected virtual string CreateCacheKey(string normalizedName)
     {
-        return $"RemoteTenantStore_Name_{tenantName}";
+        return $"RemoteTenantStore_Name_{normalizedName}";
     }
 
     protected virtual string CreateCacheKey(Guid tenantId)
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 6567cf8efd..c6c5c3edee 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
@@ -22,11 +22,11 @@ public class Tenant : FullAuditedAggregateRoot<Guid>, IHasEntityVersion
 
     }
 
-    protected internal Tenant(Guid id, [NotNull] string name, [CanBeNull] string normalizedTenantName)
+    protected internal Tenant(Guid id, [NotNull] string name, [CanBeNull] string normalizedName)
         : base(id)
     {
         SetName(name);
-        SetNormalizedTenantName(normalizedTenantName);
+        SetNormalizedName(normalizedName);
 
         ConnectionStrings = new List<TenantConnectionString>();
     }
@@ -82,8 +82,8 @@ public class Tenant : FullAuditedAggregateRoot<Guid>, IHasEntityVersion
         Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConsts.MaxNameLength);
     }
 
-    protected internal virtual void SetNormalizedTenantName([CanBeNull] string normalizedTenantName)
+    protected internal virtual void SetNormalizedName([CanBeNull] string normalizedName)
     {
-        NormalizedName = normalizedTenantName;
+        NormalizedName = normalizedName;
     }
 }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
index 43594dfde7..648e02d381 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
@@ -10,7 +10,6 @@ public class TenantManager : DomainService, ITenantManager
 {
     protected ITenantRepository TenantRepository { get; }
     protected IDistributedCache<TenantConfigurationCacheItem> Cache { get; }
-
     protected ITenantNormalizer TenantNormalizer { get; }
 
     public TenantManager(ITenantRepository tenantRepository, IDistributedCache<TenantConfigurationCacheItem> cache, ITenantNormalizer tenantNormalizer)
@@ -24,9 +23,9 @@ public class TenantManager : DomainService, ITenantManager
     {
         Check.NotNull(name, nameof(name));
 
-        var normalizedTenantName = TenantNormalizer.NormalizeName(name);
-        await ValidateNameAsync(normalizedTenantName);
-        return new Tenant(GuidGenerator.Create(), name, normalizedTenantName);
+        var normalizedName = TenantNormalizer.NormalizeName(name);
+        await ValidateNameAsync(normalizedName);
+        return new Tenant(GuidGenerator.Create(), name, normalizedName);
     }
 
     public virtual async Task ChangeNameAsync(Tenant tenant, string name)
@@ -34,12 +33,12 @@ public class TenantManager : DomainService, ITenantManager
         Check.NotNull(tenant, nameof(tenant));
         Check.NotNull(name, nameof(name));
 
-        var normalizedTenantName = TenantNormalizer.NormalizeName(name);
+        var normalizedName = TenantNormalizer.NormalizeName(name);
 
-        await ValidateNameAsync(normalizedTenantName, tenant.Id);
+        await ValidateNameAsync(normalizedName, tenant.Id);
         await Cache.RemoveAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenant.NormalizedName));
         tenant.SetName(name);
-        tenant.SetNormalizedTenantName(normalizedTenantName);
+        tenant.SetNormalizedName(normalizedName);
     }
 
     protected virtual async Task ValidateNameAsync(string normalizeName, Guid? expectedId = null)
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
index f2ef1ed066..d334c124a6 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
@@ -77,7 +77,7 @@ public class TenantStore : ITenantStore, ITransientDependency
             }
         }
 
-        throw new AbpException("Both id and name can't be invalid.");
+        throw new AbpException("Both id and normalizedName can't be invalid.");
     }
 
     protected virtual async Task<TenantConfigurationCacheItem> SetCacheAsync(string cacheKey, [CanBeNull] Tenant tenant)
@@ -117,7 +117,7 @@ public class TenantStore : ITenantStore, ITransientDependency
             }
         }
 
-        throw new AbpException("Both id and name can't be invalid.");
+        throw new AbpException("Both id and normalizedName can't be invalid.");
     }
 
     [Obsolete("Use SetCacheAsync method.")]