diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs
index c458b87cac..2fb3f4f5ce 100644
--- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs
+++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs
@@ -35,6 +35,7 @@ namespace Volo.Abp.Identity
 
         public async Task<IdentityUser> FindByLoginAsync(string loginProvider, string providerKey, CancellationToken cancellationToken)
         {
+            //TODO: This should be changed since loginProvider, providerKey are not PKs.
             var userLogin = await DbContext.UserLogins.FindAsync(new object[] { loginProvider, providerKey }, cancellationToken);
             if (userLogin == null)
             {
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs
index 5efadf1df6..11e19c6795 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.Identity
     public class IdentityRoleManager : RoleManager<IdentityRole>, IDomainService
     {
         public IdentityRoleManager(
-            RoleStore store,
+            IdentityRoleStore store,
             IEnumerable<IRoleValidator<IdentityRole>> roleValidators,
             ILookupNormalizer keyNormalizer,
             IdentityErrorDescriber errors,
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/RoleStore.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
similarity index 98%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/RoleStore.cs
rename to src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
index 97905b08f5..b61f7fed1a 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/RoleStore.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
@@ -16,23 +16,23 @@ namespace Volo.Abp.Identity
     /// <summary>
     /// Creates a new instance of a persistence store for roles.
     /// </summary>
-    public class RoleStore :
+    public class IdentityRoleStore :
         IRoleStore<IdentityRole>,
         IRoleClaimStore<IdentityRole>,
         ITransientDependency
     {
         private readonly IIdentityRoleRepository _roleRepository;
         private readonly IUnitOfWorkManager _unitOfWorkManager;
-        private readonly ILogger<RoleStore> _logger;
+        private readonly ILogger<IdentityRoleStore> _logger;
         private readonly IGuidGenerator _guidGenerator;
 
         /// <summary>
-        /// Constructs a new instance of <see cref="RoleStore"/>.
+        /// Constructs a new instance of <see cref="IdentityRoleStore"/>.
         /// </summary>
-        public RoleStore(
+        public IdentityRoleStore(
             IUnitOfWorkManager unitOfWorkManager,
             IIdentityRoleRepository roleRepository, 
-            ILogger<RoleStore> logger,
+            ILogger<IdentityRoleStore> logger,
             IGuidGenerator guidGenerator,
             IdentityErrorDescriber describer = null)
         {
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserManager.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserManager.cs
index 3b1b66c799..6e34ac11a4 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserManager.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserManager.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp.Identity
     public class IdentityUserManager : UserManager<IdentityUser>, IDomainService
     {
         public IdentityUserManager(
-            UserStore store,
+            IdentityUserStore store,
             IOptions<IdentityOptions> optionsAccessor,
             IPasswordHasher<IdentityUser> passwordHasher,
             IEnumerable<IUserValidator<IdentityUser>> userValidators,
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/UserStore.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
similarity index 99%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/UserStore.cs
rename to src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
index 904637e1f6..c4fa3d3830 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/UserStore.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
@@ -17,7 +17,7 @@ namespace Volo.Abp.Identity
     /// <summary>
     /// Represents a new instance of a persistence store for the specified user and role types.
     /// </summary>
-    public class UserStore :
+    public class IdentityUserStore :
         IUserLoginStore<IdentityUser>,
         IUserRoleStore<IdentityUser>,
         IUserClaimStore<IdentityUser>,
@@ -45,16 +45,16 @@ namespace Volo.Abp.Identity
 
         private readonly IIdentityRoleRepository _roleRepository;
         private readonly IGuidGenerator _guidGenerator;
-        private readonly ILogger<RoleStore> _logger;
+        private readonly ILogger<IdentityRoleStore> _logger;
         private readonly IIdentityUserRepository _userRepository;
         private readonly IUnitOfWorkManager _unitOfWorkManager;
 
-        public UserStore(
+        public IdentityUserStore(
             IUnitOfWorkManager unitOfWorkManager,
             IIdentityUserRepository userRepository,
             IIdentityRoleRepository roleRepository,
             IGuidGenerator guidGenerator,
-            ILogger<RoleStore> logger,
+            ILogger<IdentityRoleStore> logger,
             IdentityErrorDescriber describer = null)
         {
             _unitOfWorkManager = unitOfWorkManager;