diff --git a/docs/en/release-info/migration-guides/abp-10-7.md b/docs/en/release-info/migration-guides/abp-10-7.md
index 1b377aa848..8acaec90d7 100644
--- a/docs/en/release-info/migration-guides/abp-10-7.md
+++ b/docs/en/release-info/migration-guides/abp-10-7.md
@@ -145,7 +145,7 @@ Add a navigation property to the principal entity if you rely on the previous be
 
 **What changed**
 
-- The ABP token providers and their options moved from the `Volo.Abp.Identity.AspNetCore` assembly to `Volo.Abp.Identity.Domain`, and are now registered by `AbpIdentityDomainModule` instead of `AbpIdentityAspNetCoreModule`. An assembly compiled against an earlier version and not rebuilt cannot resolve them.
+- The ABP token providers and their options moved from the `Volo.Abp.Identity.AspNetCore` assembly to `Volo.Abp.Identity.Domain`, out of the `Volo.Abp.Identity.AspNetCore` namespace and into `Volo.Abp.Identity`, and are now registered by `AbpIdentityDomainModule` instead of `AbpIdentityAspNetCoreModule`. An assembly compiled against an earlier version and not rebuilt cannot resolve them. The types that stay in the ASP.NET Core layer, such as `AbpSignInManager` and `AbpIdentityAspNetCoreOptions`, keep their namespace.
 - Every host that loads `AbpIdentityDomainModule` therefore resolves the same providers, unless it registers something else itself. Previously the providers were only registered on hosts loading `AbpIdentityAspNetCoreModule`, so a host that generated a token could end up on a different provider than the host that validated it, and the link was rejected as an invalid token.
 - `AbpSingleActiveTokenProvider` no longer derives from ASP.NET Core's `DataProtectorTokenProvider<IdentityUser>`; it implements `IUserTwoFactorTokenProvider<IdentityUser>` and re-implements the same protected payload, so the token format is unchanged. Code that casts a provider to `DataProtectorTokenProvider<IdentityUser>` or uses it as a generic constraint no longer compiles, and the `Logger` property the old base class exposed publicly is now protected.
 - The provider options classes derive from `AbpDataProtectionTokenProviderOptions` instead of `DataProtectionTokenProviderOptions`. The `Name` and `TokenLifespan` properties are unchanged, but code that assigns one of them to `DataProtectionTokenProviderOptions`, passes it to a method taking that type, returns it, or uses it as a generic constraint no longer compiles.
@@ -155,6 +155,7 @@ Add a navigation property to the principal entity if you rely on the previous be
 
 **What to do**
 
+- Replace `using Volo.Abp.Identity.AspNetCore;` with `using Volo.Abp.Identity;` where you use one of the moved types, or add the second one when the file also uses a type that stayed behind.
 - Rebuild the solution. No further action is required for the common case: configuring the options and the provider names works exactly as before, and the compiler points at the source level changes below. The assembly move is not one of them, so a package you depend on that was built against the old assembly has to be rebuilt and republished against v10.7 as well.
 - If you derive from one of the five DataProtector-based providers, change the logger parameter to `ILogger<AbpSingleActiveTokenProvider>`.
 - If you derive from `AbpSingleActiveTokenProvider` directly, give your provider its own options class deriving from `AbpDataProtectionTokenProviderOptions` and inject `IOptions<YourTokenProviderOptions>`, the way the built-in providers do. `IOptions<T>` is covariant, so it satisfies the base constructor. Do not inject `IOptions<AbpDataProtectionTokenProviderOptions>`: the base options class is abstract and the options system cannot create it.
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Microsoft/Extensions/DependencyInjection/AbpIdentityBuilderExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Microsoft/Extensions/DependencyInjection/AbpIdentityBuilderExtensions.cs
index 3f251a42c3..deed3e32c4 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Microsoft/Extensions/DependencyInjection/AbpIdentityBuilderExtensions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Microsoft/Extensions/DependencyInjection/AbpIdentityBuilderExtensions.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 using Volo.Abp.Identity;
-using Volo.Abp.Identity.AspNetCore;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpChangeEmailTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpChangeEmailTokenProvider.cs
similarity index 95%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpChangeEmailTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpChangeEmailTokenProvider.cs
index 9a7d204205..9b81db3aaf 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpChangeEmailTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpChangeEmailTokenProvider.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Change email token provider that enforces only the most recently issued
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpChangeEmailTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpChangeEmailTokenProviderOptions.cs
similarity index 87%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpChangeEmailTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpChangeEmailTokenProviderOptions.cs
index 395143b5a6..d81e1d0741 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpChangeEmailTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpChangeEmailTokenProviderOptions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 public class AbpChangeEmailTokenProviderOptions : AbpDataProtectionTokenProviderOptions
 {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDataProtectionTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDataProtectionTokenProviderOptions.cs
similarity index 93%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDataProtectionTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDataProtectionTokenProviderOptions.cs
index b2b5e76ee1..c743775d5e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDataProtectionTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDataProtectionTokenProviderOptions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Stands in for ASP.NET Core's <c>DataProtectionTokenProviderOptions</c>, which is only available
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDefaultTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDefaultTokenProvider.cs
similarity index 96%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDefaultTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDefaultTokenProvider.cs
index 9b08a079bd..b821ad9c1c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDefaultTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDefaultTokenProvider.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Replaces ASP.NET Core Identity's default <c>DataProtectorTokenProvider&lt;IdentityUser&gt;</c>
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDefaultTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDefaultTokenProviderOptions.cs
similarity index 87%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDefaultTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDefaultTokenProviderOptions.cs
index 81564d2129..2f43897e8a 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpDefaultTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpDefaultTokenProviderOptions.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.AspNetCore.Identity;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 public class AbpDefaultTokenProviderOptions : AbpDataProtectionTokenProviderOptions
 {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailConfirmationTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailConfirmationTokenProvider.cs
similarity index 97%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailConfirmationTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailConfirmationTokenProvider.cs
index 5843e5346d..6d94e6ffba 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailConfirmationTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailConfirmationTokenProvider.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Email confirmation token provider that enforces only the most recently issued
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailConfirmationTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailConfirmationTokenProviderOptions.cs
similarity index 87%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailConfirmationTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailConfirmationTokenProviderOptions.cs
index b0844b1385..b8b76f5ef6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailConfirmationTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailConfirmationTokenProviderOptions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 public class AbpEmailConfirmationTokenProviderOptions : AbpDataProtectionTokenProviderOptions
 {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailTwoFactorTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailTwoFactorTokenProvider.cs
similarity index 97%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailTwoFactorTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailTwoFactorTokenProvider.cs
index 45e3e8eccb..e8a014dced 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailTwoFactorTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailTwoFactorTokenProvider.cs
@@ -6,7 +6,7 @@ using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 using Volo.Abp.Timing;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Single-use email 2FA code provider; replaces the ASP.NET Core Identity TOTP-based
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailTwoFactorTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailTwoFactorTokenProviderOptions.cs
similarity index 69%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailTwoFactorTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailTwoFactorTokenProviderOptions.cs
index 6ec9e96e1a..1b0307090a 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpEmailTwoFactorTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpEmailTwoFactorTokenProviderOptions.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 public class AbpEmailTwoFactorTokenProviderOptions : AbpTwoFactorTokenProviderOptions
 {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpLinkUserTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpLinkUserTokenProviderOptions.cs
similarity index 87%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpLinkUserTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpLinkUserTokenProviderOptions.cs
index e86b3d85a7..7959e6634c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpLinkUserTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpLinkUserTokenProviderOptions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 public class AbpLinkUserTokenProviderOptions : AbpDataProtectionTokenProviderOptions
 {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPasswordResetTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPasswordResetTokenProvider.cs
similarity index 95%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPasswordResetTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPasswordResetTokenProvider.cs
index 3359b0f594..0ceab67572 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPasswordResetTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPasswordResetTokenProvider.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Password reset token provider that enforces only the most recently issued
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPasswordResetTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPasswordResetTokenProviderOptions.cs
similarity index 87%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPasswordResetTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPasswordResetTokenProviderOptions.cs
index cf76fb5604..0dddeee77c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPasswordResetTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPasswordResetTokenProviderOptions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 public class AbpPasswordResetTokenProviderOptions : AbpDataProtectionTokenProviderOptions
 {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPhoneNumberTwoFactorTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPhoneNumberTwoFactorTokenProvider.cs
similarity index 97%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPhoneNumberTwoFactorTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPhoneNumberTwoFactorTokenProvider.cs
index 068e94cb20..160a06e57b 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPhoneNumberTwoFactorTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPhoneNumberTwoFactorTokenProvider.cs
@@ -6,7 +6,7 @@ using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 using Volo.Abp.Timing;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Single-use phone 2FA code provider; replaces the ASP.NET Core Identity TOTP-based
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPhoneNumberTwoFactorTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPhoneNumberTwoFactorTokenProviderOptions.cs
similarity index 70%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPhoneNumberTwoFactorTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPhoneNumberTwoFactorTokenProviderOptions.cs
index a477ecc594..6ad408db1e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpPhoneNumberTwoFactorTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpPhoneNumberTwoFactorTokenProviderOptions.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 public class AbpPhoneNumberTwoFactorTokenProviderOptions : AbpTwoFactorTokenProviderOptions
 {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpSingleActiveTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpSingleActiveTokenProvider.cs
similarity index 99%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpSingleActiveTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpSingleActiveTokenProvider.cs
index 175d7fc36e..8dd6abe26d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpSingleActiveTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpSingleActiveTokenProvider.cs
@@ -11,7 +11,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Threading;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Base class for ABP token providers that enforce a "single active token" policy: generating a token
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpTwoFactorTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpTwoFactorTokenProvider.cs
similarity index 97%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpTwoFactorTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpTwoFactorTokenProvider.cs
index 11fabf3c6b..5cd82af73c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpTwoFactorTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpTwoFactorTokenProvider.cs
@@ -10,7 +10,7 @@ using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 using Volo.Abp.Timing;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Base class for ABP two-factor verification code providers (e.g. Email, Phone).
@@ -25,6 +25,9 @@ public abstract class AbpTwoFactorTokenProvider : IUserTwoFactorTokenProvider<Id
 
     protected const char StoredValueSeparator = '|';
 
+    /// <summary>
+    /// A Data Protection purpose, not a type name. Changing it invalidates every outstanding code.
+    /// </summary>
     protected const string DataProtectionPurposeRoot = "Volo.Abp.Identity.AspNetCore.AbpTwoFactorTokenProvider";
 
     protected AbpTwoFactorTokenProviderOptions Options { get; }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpTwoFactorTokenProviderOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpTwoFactorTokenProviderOptions.cs
similarity index 88%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpTwoFactorTokenProviderOptions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpTwoFactorTokenProviderOptions.cs
index 973d677091..8980a90a80 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/AbpTwoFactorTokenProviderOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpTwoFactorTokenProviderOptions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 public abstract class AbpTwoFactorTokenProviderOptions
 {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/IdentityUserManagerSingleActiveTokenExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManagerSingleActiveTokenExtensions.cs
similarity index 99%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/IdentityUserManagerSingleActiveTokenExtensions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManagerSingleActiveTokenExtensions.cs
index e8caab81ec..7bd734766b 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/IdentityUserManagerSingleActiveTokenExtensions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManagerSingleActiveTokenExtensions.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Provides extension methods on <see cref="IdentityUserManager"/> for invalidating
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/LinkUserTokenProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/LinkUserTokenProvider.cs
similarity index 95%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/LinkUserTokenProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/LinkUserTokenProvider.cs
index 7203fdb243..6b9afa340d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AspNetCore/LinkUserTokenProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/LinkUserTokenProvider.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 
-namespace Volo.Abp.Identity.AspNetCore;
+namespace Volo.Abp.Identity;
 
 /// <summary>
 /// Link-user token provider that enforces, per purpose, only the most recently issued
diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/CrossHostTokenProvider_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/CrossHostTokenProvider_Tests.cs
index c7add3c454..d0eca1ad21 100644
--- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/CrossHostTokenProvider_Tests.cs
+++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/CrossHostTokenProvider_Tests.cs
@@ -13,7 +13,6 @@ using Shouldly;
 using Volo.Abp.Autofac;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Identity.AspNetCore;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;