diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/AbpSecurityModule.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/AbpSecurityModule.cs
index 98759bcaa2..cf517f0de4 100644
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/AbpSecurityModule.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/AbpSecurityModule.cs
@@ -61,7 +61,7 @@ namespace Volo.Abp.Security
                 }
             });
 
-            services.Configure<AbpClaimsPrincipalOptions>(options =>
+            services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
             {
                 options.Contributors.AddIfNotContains(contributorTypes);
             });
diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactory.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactory.cs
index 7a3ec769c3..6ae077580c 100644
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactory.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactory.cs
@@ -9,14 +9,14 @@ namespace Volo.Abp.Security.Claims
     public class AbpClaimsPrincipalFactory : IAbpClaimsPrincipalFactory, ITransientDependency
     {
         protected IServiceScopeFactory ServiceScopeFactory { get; }
-        protected AbpClaimsPrincipalOptions Options { get; }
+        protected AbpClaimsPrincipalFactoryOptions FactoryOptions { get; }
 
         public AbpClaimsPrincipalFactory(
             IServiceScopeFactory serviceScopeFactory,
-            IOptions<AbpClaimsPrincipalOptions> abpClaimOptions)
+            IOptions<AbpClaimsPrincipalFactoryOptions> abpClaimOptions)
         {
             ServiceScopeFactory = serviceScopeFactory;
-            Options = abpClaimOptions.Value;
+            FactoryOptions = abpClaimOptions.Value;
         }
 
         public virtual async Task<ClaimsPrincipal> CreateAsync()
@@ -27,7 +27,7 @@ namespace Volo.Abp.Security.Claims
 
                 var context = new AbpClaimsPrincipalContributorContext(claimsPrincipal, scope.ServiceProvider);
 
-                foreach (var contributorType in Options.Contributors)
+                foreach (var contributorType in FactoryOptions.Contributors)
                 {
                     var contributor = (IAbpClaimsPrincipalContributor) scope.ServiceProvider.GetRequiredService(contributorType);
                     await contributor.ContributeAsync(context);
diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalOptions.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs
similarity index 60%
rename from framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalOptions.cs
rename to framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs
index 6e9b584aaa..febe0c5661 100644
--- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalOptions.cs
+++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimsPrincipalFactoryOptions.cs
@@ -3,16 +3,13 @@ using Volo.Abp.Collections;
 
 namespace Volo.Abp.Security.Claims
 {
-    public class AbpClaimsPrincipalOptions
+    public class AbpClaimsPrincipalFactoryOptions
     {
         public ITypeList<IAbpClaimsPrincipalContributor> Contributors { get; }
 
-        public List<string> RequestedClaims { get; }
-
-        public AbpClaimsPrincipalOptions()
+        public AbpClaimsPrincipalFactoryOptions()
         {
             Contributors = new TypeList<IAbpClaimsPrincipalContributor>();
-            RequestedClaims = new List<string>();
         }
     }
 }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs
index 50750ff567..80c275252c 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp.IdentityServer
 {
     public class AbpClaimsService : DefaultClaimsService
     {
-        protected readonly AbpClaimsPrincipalOptions Options;
+        protected readonly AbpClaimsServiceOptions Options;
 
         private static readonly string[] AdditionalOptionalClaimNames =
         {
@@ -26,7 +26,7 @@ namespace Volo.Abp.IdentityServer
         public AbpClaimsService(
             IProfileService profile,
             ILogger<DefaultClaimsService> logger,
-            IOptions<AbpClaimsPrincipalOptions> options)
+            IOptions<AbpClaimsServiceOptions> options)
             : base(profile, logger)
         {
             Options = options.Value;
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsServiceOptions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsServiceOptions.cs
new file mode 100644
index 0000000000..a940cb6119
--- /dev/null
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsServiceOptions.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.IdentityServer
+{
+    public class AbpClaimsServiceOptions
+    {
+        public List<string> RequestedClaims { get; }
+
+        public AbpClaimsServiceOptions()
+        {
+            RequestedClaims = new List<string>();
+        }
+    }
+}
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
index 92fd0501d3..55121aec99 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
@@ -54,7 +54,7 @@ namespace Volo.Abp.IdentityServer
                 options.EtoMappings.Add<IdentityResource, IdentityResourceEto>(typeof(AbpIdentityServerDomainModule));
             });
 
-            Configure<AbpClaimsPrincipalOptions>(options =>
+            Configure<AbpClaimsServiceOptions>(options =>
             {
                 options.RequestedClaims.AddRange(new []{
                     AbpClaimTypes.TenantId,