diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs
index a162f1750e..4b473cbf38 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs
@@ -8,7 +8,7 @@ namespace Volo.Abp.MultiTenancy
         public static void AddDomainTenantResolver(this TenantResolveOptions options, string domainFormat)
         {
             options.TenantResolvers.InsertAfter(
-                r => r is CurrentClaimsPrincipalTenantResolveContributor,
+                r => r is CurrentUserTenantResolveContributor,
                 new DomainTenantResolveContributor(domainFormat)
             );
         }
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentUserTenantResolveContributor.cs
similarity index 78%
rename from framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentUserTenantResolveContributor.cs
index 61e49cea81..d326421682 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentUserTenantResolveContributor.cs
@@ -3,9 +3,9 @@ using Volo.Abp.Users;
 
 namespace Volo.Abp.MultiTenancy
 {
-    public class CurrentClaimsPrincipalTenantResolveContributor : TenantResolveContributorBase
+    public class CurrentUserTenantResolveContributor : TenantResolveContributorBase
     {
-        public const string ContributorName = "CurrentClaims";
+        public const string ContributorName = "CurrentUser";
 
         public override string Name => ContributorName;
 
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs
index 9d12f2b0b6..b431aaa6d3 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.MultiTenancy
         {
             TenantResolvers = new List<ITenantResolveContributor>
             {
-                new CurrentClaimsPrincipalTenantResolveContributor()
+                new CurrentUserTenantResolveContributor()
             };
         }
     }