diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementApplicationContractsModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs
similarity index 50%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementApplicationContractsModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs
index 4bf76a2c02..f5d03e7167 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementApplicationContractsModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs
@@ -1,5 +1,4 @@
 using Volo.Abp.Application;
-using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.FeatureManagement.Localization;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
@@ -8,28 +7,23 @@ using Volo.Abp.VirtualFileSystem;
 namespace Volo.Abp.FeatureManagement
 {
     [DependsOn(
-        typeof(FeatureManagementDomainSharedModule),
+        typeof(AbpFeatureManagementDomainSharedModule),
         typeof(AbpDddApplicationModule)
         )]
-    public class FeatureManagementApplicationContractsModule : AbpModule
+    public class AbpFeatureManagementApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<FeatureManagementPermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<FeatureManagementApplicationContractsModule>();
+                options.FileSets.AddEmbedded<AbpFeatureManagementApplicationContractsModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Get<FeatureManagementResource>()
-                    .AddVirtualJson("/Abp/FeatureManagement/Localization/ApplicationContracts");
+                    .Get<AbpFeatureManagementResource>()
+                    .AddVirtualJson("/Volo/Abp/FeatureManagement/Localization/ApplicationContracts");
             });
         }
     }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementPermissionDefinitionProvider.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementPermissionDefinitionProvider.cs
deleted file mode 100644
index 773cf77b78..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementPermissionDefinitionProvider.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.FeatureManagement.Localization;
-using Volo.Abp.Localization;
-
-namespace Volo.Abp.FeatureManagement
-{
-    public class FeatureManagementPermissionDefinitionProvider : PermissionDefinitionProvider
-    {
-        public override void Define(IPermissionDefinitionContext context)
-        {
-            //var moduleGroup = context.AddGroup(FeatureManagementPermissions.GroupName, L("Permission:FeatureManagement"));
-        }
-
-        private static LocalizableString L(string name)
-        {
-            return LocalizableString.Create<FeatureManagementResource>(name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementPermissions.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementPermissions.cs
deleted file mode 100644
index bad17f8be6..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementPermissions.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Volo.Abp.FeatureManagement
-{
-    public class FeatureManagementPermissions
-    {
-        public const string GroupName = "FeatureManagement";
-
-        public static string[] GetAll()
-        {
-            return new[]
-            {
-                GroupName
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/en.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/en.json
index cf27bb4d23..92e4e9582b 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/en.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/en.json
@@ -1,6 +1,6 @@
 {
   "culture": "en",
   "texts": {
-    "Permission:FeatureManagement": "FeatureManagement"
+
   }
 }
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/pt-BR.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/pt-BR.json
deleted file mode 100644
index 81d730c60d..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/pt-BR.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-    "Permission:FeatureManagement": "FeatureManagement"
-  }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/zh-Hans.json
deleted file mode 100644
index 6e9648b5be..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/zh-Hans.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-      "Permission:FeatureManagement": "FeatureManagement"
-    }
-  }
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementApplicationModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationModule.cs
similarity index 78%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementApplicationModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationModule.cs
index fa365380f2..8116e436b0 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementApplicationModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationModule.cs
@@ -5,11 +5,11 @@ using Volo.Abp.Settings;
 namespace Volo.Abp.FeatureManagement
 {
     [DependsOn(
-        typeof(FeatureManagementDomainModule),
-        typeof(FeatureManagementApplicationContractsModule),
+        typeof(AbpFeatureManagementDomainModule),
+        typeof(AbpFeatureManagementApplicationContractsModule),
         typeof(AbpAutoMapperModule)
         )]
-    public class FeatureManagementApplicationModule : AbpModule
+    public class AbpFeatureManagementApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementSettings.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementSettings.cs
index e243562aa9..ed634b9bca 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementSettings.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementSettings.cs
@@ -2,7 +2,7 @@
 {
     public static class FeatureManagementSettings
     {
-        public const string GroupName = "FeatureManagement";
+        public const string GroupName = "AbpFeatureManagement";
 
         /* Add constants for setting names. Example:
          * public const string MySettingName = GroupName + ".MySettingName";
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainSharedModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
similarity index 74%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainSharedModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
index a8db249b6d..7931f91374 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainSharedModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
@@ -7,13 +7,13 @@ namespace Volo.Abp.FeatureManagement
     [DependsOn(
         typeof(AbpLocalizationModule)
         )]
-    public class FeatureManagementDomainSharedModule : AbpModule
+    public class AbpFeatureManagementDomainSharedModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<AbpLocalizationOptions>(options =>
             {
-                options.Resources.Add<FeatureManagementResource>("en");
+                options.Resources.Add<AbpFeatureManagementResource>("en");
             });
         }
     }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainErrorCodes.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainErrorCodes.cs
index a7d1dee96f..010c64efbb 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainErrorCodes.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/FeatureManagementDomainErrorCodes.cs
@@ -2,6 +2,6 @@
 {
     public static class FeatureManagementDomainErrorCodes
     {
-        //Add your business exception error codes here...
+        
     }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/FeatureManagementResource.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/AbpFeatureManagementResource.cs
similarity index 51%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/FeatureManagementResource.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/AbpFeatureManagementResource.cs
index f64f7c90df..32291a60a1 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/FeatureManagementResource.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/AbpFeatureManagementResource.cs
@@ -2,8 +2,8 @@
 
 namespace Volo.Abp.FeatureManagement.Localization
 {
-    [LocalizationResourceName("FeatureManagement")]
-    public class FeatureManagementResource
+    [LocalizationResourceName("AbpFeatureManagement")]
+    public class AbpFeatureManagementResource
     {
         
     }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementDomainModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
similarity index 57%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementDomainModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
index 469c232ea7..1eddabad52 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementDomainModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
@@ -7,25 +7,27 @@ using Volo.Abp.VirtualFileSystem;
 namespace Volo.Abp.FeatureManagement
 {
     [DependsOn(
-        typeof(FeatureManagementDomainSharedModule)
+        typeof(AbpFeatureManagementDomainSharedModule)
         )]
-    public class FeatureManagementDomainModule : AbpModule
+    public class AbpFeatureManagementDomainModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<VirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<FeatureManagementDomainModule>();
+                options.FileSets.AddEmbedded<AbpFeatureManagementDomainModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
-                options.Resources.Get<FeatureManagementResource>().AddVirtualJson("/Abp/FeatureManagement/Localization/Domain");
+                options.Resources
+                    .Get<AbpFeatureManagementResource>()
+                    .AddVirtualJson("/Volo/Abp/FeatureManagement/Localization/Domain");
             });
 
             Configure<ExceptionLocalizationOptions>(options =>
             {
-                options.MapCodeNamespace("FeatureManagement", typeof(FeatureManagementResource));
+                options.MapCodeNamespace("AbpFeatureManagement", typeof(AbpFeatureManagementResource));
             });
         }
     }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementConsts.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementConsts.cs
index 1ce80d6ccb..d78f1d75f7 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementConsts.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementConsts.cs
@@ -2,7 +2,7 @@
 {
     public static class FeatureManagementConsts
     {
-        public const string DefaultDbTablePrefix = "FeatureManagement";
+        public const string DefaultDbTablePrefix = "Abp";
 
         public const string DefaultDbSchema = null;
     }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json
deleted file mode 100644
index 6d746df04c..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-
-  }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json
deleted file mode 100644
index e4557f0ad2..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-  
-    }
-  }
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementEntityFrameworkCoreModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreModule.cs
similarity index 83%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementEntityFrameworkCoreModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreModule.cs
index ad3a98cf9d..f5fc6e2c84 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementEntityFrameworkCoreModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreModule.cs
@@ -5,10 +5,10 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.FeatureManagement.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(FeatureManagementDomainModule),
+        typeof(AbpFeatureManagementDomainModule),
         typeof(AbpEntityFrameworkCoreModule)
     )]
-    public class FeatureManagementEntityFrameworkCoreModule : AbpModule
+    public class AbpFeatureManagementEntityFrameworkCoreModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContext.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContext.cs
index f68793806c..605192d01f 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContext.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContext.cs
@@ -4,17 +4,13 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.FeatureManagement.EntityFrameworkCore
 {
-    [ConnectionStringName("FeatureManagement")]
+    [ConnectionStringName("AbpFeatureManagement")]
     public class FeatureManagementDbContext : AbpDbContext<FeatureManagementDbContext>, IFeatureManagementDbContext
     {
         public static string TablePrefix { get; set; } = FeatureManagementConsts.DefaultDbTablePrefix;
 
         public static string Schema { get; set; } = FeatureManagementConsts.DefaultDbSchema;
 
-        /* Add DbSet for each Aggregate Root here. Example:
-         * public DbSet<Question> Questions { get; set; }
-         */
-
         public FeatureManagementDbContext(DbContextOptions<FeatureManagementDbContext> options) 
             : base(options)
         {
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/IFeatureManagementDbContext.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/IFeatureManagementDbContext.cs
index 1234a14de2..fce0720ea2 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/IFeatureManagementDbContext.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/IFeatureManagementDbContext.cs
@@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.FeatureManagement.EntityFrameworkCore
 {
-    [ConnectionStringName("FeatureManagement")]
+    [ConnectionStringName("AbpFeatureManagement")]
     public interface IFeatureManagementDbContext : IEfCoreDbContext
     {
         /* Add DbSet for each Aggregate Root here. Example:
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo/Abp/FeatureManagement/FeatureManagementHttpApiClientModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiClientModule.cs
similarity index 59%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo/Abp/FeatureManagement/FeatureManagementHttpApiClientModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiClientModule.cs
index d41cb4842e..002a7c3a9a 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo/Abp/FeatureManagement/FeatureManagementHttpApiClientModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiClientModule.cs
@@ -5,16 +5,16 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.FeatureManagement
 {
     [DependsOn(
-        typeof(FeatureManagementApplicationContractsModule),
+        typeof(AbpFeatureManagementApplicationContractsModule),
         typeof(AbpHttpClientModule))]
-    public class FeatureManagementHttpApiClientModule : AbpModule
+    public class AbpFeatureManagementHttpApiClientModule : AbpModule
     {
-        public const string RemoteServiceName = "FeatureManagement";
+        public const string RemoteServiceName = "AbpFeatureManagement";
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddHttpClientProxies(
-                typeof(FeatureManagementApplicationContractsModule).Assembly,
+                typeof(AbpFeatureManagementApplicationContractsModule).Assembly,
                 RemoteServiceName
             );
         }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeatureManagementHttpApiModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiModule.cs
similarity index 58%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeatureManagementHttpApiModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiModule.cs
index f8322228e0..27cf7fa605 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeatureManagementHttpApiModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiModule.cs
@@ -4,9 +4,9 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.FeatureManagement
 {
     [DependsOn(
-        typeof(FeatureManagementApplicationContractsModule),
+        typeof(AbpFeatureManagementApplicationContractsModule),
         typeof(AbpAspNetCoreMvcModule))]
-    public class FeatureManagementHttpApiModule : AbpModule
+    public class AbpFeatureManagementHttpApiModule : AbpModule
     {
         
     }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbModule.cs
similarity index 84%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbModule.cs
index e6d93f54dc..0daff832d0 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbModule.cs
@@ -5,10 +5,10 @@ using Volo.Abp.MongoDB;
 namespace Volo.Abp.FeatureManagement.MongoDB
 {
     [DependsOn(
-        typeof(FeatureManagementDomainModule),
+        typeof(AbpFeatureManagementDomainModule),
         typeof(AbpMongoDbModule)
         )]
-    public class FeatureManagementMongoDbModule : AbpModule
+    public class AbpFeatureManagementMongoDbModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs
index 224a5e4c94..e89b38c1ab 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs
@@ -3,15 +3,11 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.FeatureManagement.MongoDB
 {
-    [ConnectionStringName("FeatureManagement")]
+    [ConnectionStringName("AbpFeatureManagement")]
     public class FeatureManagementMongoDbContext : AbpMongoDbContext, IFeatureManagementMongoDbContext
     {
         public static string CollectionPrefix { get; set; } = FeatureManagementConsts.DefaultDbTablePrefix;
 
-        /* Add mongo collections here. Example:
-         * public IMongoCollection<Question> Questions => Collection<Question>();
-         */
-
         protected override void CreateModel(IMongoModelBuilder modelBuilder)
         {
             base.CreateModel(modelBuilder);
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoModelBuilderConfigurationOptions.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoModelBuilderConfigurationOptions.cs
index e534dacc5b..88361e345d 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoModelBuilderConfigurationOptions.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoModelBuilderConfigurationOptions.cs
@@ -9,6 +9,7 @@ namespace Volo.Abp.FeatureManagement.MongoDB
             [NotNull] string tablePrefix = FeatureManagementConsts.DefaultDbTablePrefix)
             : base(tablePrefix)
         {
+
         }
     }
 }
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs
index 633f631f36..8e89368cbd 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs
@@ -3,11 +3,9 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.FeatureManagement.MongoDB
 {
-    [ConnectionStringName("FeatureManagement")]
+    [ConnectionStringName("AbpFeatureManagement")]
     public interface IFeatureManagementMongoDbContext : IAbpMongoDbContext
     {
-        /* Define mongo collections here. Example:
-         * IMongoCollection<Question> Questions { get; }
-         */
+
     }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementWebModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs
similarity index 69%
rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementWebModule.cs
rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs
index 1705bacf37..1d5f99c086 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementWebModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs
@@ -8,40 +8,36 @@ using Volo.Abp.FeatureManagement.Localization;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
-using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.FeatureManagement
 {
-    [DependsOn(typeof(FeatureManagementHttpApiModule))]
-    [DependsOn(typeof(AbpAspNetCoreMvcUiThemeSharedModule))]
-    [DependsOn(typeof(AbpAutoMapperModule))]
-    public class FeatureManagementWebModule : AbpModule
+    [DependsOn(
+        typeof(AbpFeatureManagementHttpApiModule),
+        typeof(AbpAspNetCoreMvcUiThemeSharedModule),
+        typeof(AbpAutoMapperModule)
+        )]
+    public class AbpFeatureManagementWebModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.PreConfigure<AbpMvcDataAnnotationsLocalizationOptions>(options =>
             {
-                options.AddAssemblyResource(typeof(FeatureManagementResource), typeof(FeatureManagementWebModule).Assembly);
+                options.AddAssemblyResource(typeof(AbpFeatureManagementResource), typeof(AbpFeatureManagementWebModule).Assembly);
             });
         }
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<NavigationOptions>(options =>
-            {
-                options.MenuContributors.Add(new FeatureManagementMenuContributor());
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<FeatureManagementWebModule>("Abp.FeatureManagement");
+                options.FileSets.AddEmbedded<AbpFeatureManagementWebModule>("Volo.Abp.FeatureManagement");
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Get<FeatureManagementResource>()
+                    .Get<AbpFeatureManagementResource>()
                     .AddBaseTypes(
                         typeof(AbpValidationResource),
                         typeof(AbpUiResource)
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementMenuContributor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementMenuContributor.cs
deleted file mode 100644
index 9dc5ae4070..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementMenuContributor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.UI.Navigation;
-
-namespace Volo.Abp.FeatureManagement
-{
-    public class FeatureManagementMenuContributor : IMenuContributor
-    {
-        public async Task ConfigureMenuAsync(MenuConfigurationContext context)
-        {
-            if (context.Menu.Name == StandardMenus.Main)
-            {
-                await ConfigureMainMenu(context);
-            }
-        }
-
-        private Task ConfigureMainMenu(MenuConfigurationContext context)
-        {
-            //Add main menu items.
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/pt-BR.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/pt-BR.json
deleted file mode 100644
index 6d746df04c..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/pt-BR.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-
-  }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json
deleted file mode 100644
index e4557f0ad2..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-  
-    }
-  }
\ No newline at end of file
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationTestModule.cs
new file mode 100644
index 0000000000..fb65739dca
--- /dev/null
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationTestModule.cs
@@ -0,0 +1,13 @@
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.FeatureManagement
+{
+    [DependsOn(
+        typeof(AbpFeatureManagementApplicationModule),
+        typeof(AbpFeatureManagementDomainTestModule)
+        )]
+    public class AbpFeatureManagementApplicationTestModule : AbpModule
+    {
+
+    }
+}
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/FeatureManagementApplicationTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/FeatureManagementApplicationTestModule.cs
deleted file mode 100644
index e3372964ad..0000000000
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/FeatureManagementApplicationTestModule.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.FeatureManagement
-{
-    [DependsOn(
-        typeof(FeatureManagementApplicationModule),
-        typeof(FeatureManagementDomainTestModule)
-        )]
-    public class FeatureManagementApplicationTestModule : AbpModule
-    {
-
-    }
-}
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/FeatureManagementDomainTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainTestModule.cs
similarity index 56%
rename from modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/FeatureManagementDomainTestModule.cs
rename to modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainTestModule.cs
index 4a314d55e9..03a7e715ed 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/FeatureManagementDomainTestModule.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainTestModule.cs
@@ -4,9 +4,9 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.FeatureManagement
 {
     [DependsOn(
-        typeof(FeatureManagementEntityFrameworkCoreTestModule)
+        typeof(AbpFeatureManagementEntityFrameworkCoreTestModule)
         )]
-    public class FeatureManagementDomainTestModule : AbpModule
+    public class AbpFeatureManagementDomainTestModule : AbpModule
     {
         
     }
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/FeatureManagementDomainTestBase.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/FeatureManagementDomainTestBase.cs
index baa13791de..43221f9722 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/FeatureManagementDomainTestBase.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/FeatureManagementDomainTestBase.cs
@@ -2,7 +2,7 @@
 
 namespace Volo.Abp.FeatureManagement
 {
-    public abstract class FeatureManagementDomainTestBase : FeatureManagementTestBase<FeatureManagementDomainTestModule>
+    public abstract class FeatureManagementDomainTestBase : FeatureManagementTestBase<AbpFeatureManagementDomainTestModule>
     {
 
     }
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementEntityFrameworkCoreTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreTestModule.cs
similarity index 87%
rename from modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementEntityFrameworkCoreTestModule.cs
rename to modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreTestModule.cs
index 1e15a07370..9d0d365137 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementEntityFrameworkCoreTestModule.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreTestModule.cs
@@ -9,10 +9,10 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.FeatureManagement.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(FeatureManagementTestBaseModule),
-        typeof(FeatureManagementEntityFrameworkCoreModule)
+        typeof(AbpFeatureManagementTestBaseModule),
+        typeof(AbpFeatureManagementEntityFrameworkCoreModule)
         )]
-    public class FeatureManagementEntityFrameworkCoreTestModule : AbpModule
+    public class AbpFeatureManagementEntityFrameworkCoreTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/MyEntityRepository_Tests.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/MyEntityRepository_Tests.cs
index 6851a7e9b6..3fb7ce94a2 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/MyEntityRepository_Tests.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/MyEntityRepository_Tests.cs
@@ -2,7 +2,7 @@
 
 namespace Volo.Abp.FeatureManagement.EntityFrameworkCore
 {
-    public class MyEntityRepository_Tests : MyEntityRepository_Tests<FeatureManagementEntityFrameworkCoreTestModule>
+    public class MyEntityRepository_Tests : MyEntityRepository_Tests<AbpFeatureManagementEntityFrameworkCoreTestModule>
     {
 
     }
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
similarity index 75%
rename from modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbTestModule.cs
rename to modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
index ee5be68aef..bde5a3aac2 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbTestModule.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using Mongo2Go;
+using Mongo2Go;
 using Volo.Abp;
 using Volo.Abp.Data;
 using Volo.Abp.FeatureManagement.MongoDB;
@@ -8,10 +7,10 @@ using Volo.Abp.Modularity;
 namespace Abp.FeatureManagement.MongoDB
 {
     [DependsOn(
-        typeof(FeatureManagementTestBaseModule),
-        typeof(FeatureManagementMongoDbModule)
+        typeof(AbpFeatureManagementTestBaseModule),
+        typeof(AbpFeatureManagementMongoDbModule)
         )]
-    public class FeatureManagementMongoDbTestModule : AbpModule
+    public class AbpFeatureManagementMongoDbTestModule : AbpModule
     {
         private MongoDbRunner _mongoDbRunner;
 
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/MyEntityRepository_Tests.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/MyEntityRepository_Tests.cs
index e8c2483b00..b486522b80 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/MyEntityRepository_Tests.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Abp/FeatureManagement/MongoDB/MyEntityRepository_Tests.cs
@@ -1,6 +1,6 @@
 namespace Abp.FeatureManagement.MongoDB
 {
-    public class MyEntityRepository_Tests : MyEntityRepository_Tests<FeatureManagementMongoDbTestModule>
+    public class MyEntityRepository_Tests : MyEntityRepository_Tests<AbpFeatureManagementMongoDbTestModule>
     {
 
     }
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/FeatureManagementTestBaseModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/AbpFeatureManagementTestBaseModule.cs
similarity index 90%
rename from modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/FeatureManagementTestBaseModule.cs
rename to modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/AbpFeatureManagementTestBaseModule.cs
index 162ce53188..6234c62978 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/FeatureManagementTestBaseModule.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/AbpFeatureManagementTestBaseModule.cs
@@ -11,9 +11,9 @@ namespace Abp.FeatureManagement
         typeof(AbpAutofacModule),
         typeof(AbpTestBaseModule),
         typeof(AbpAuthorizationModule),
-        typeof(FeatureManagementDomainModule)
+        typeof(AbpFeatureManagementDomainModule)
         )]
-    public class FeatureManagementTestBaseModule : AbpModule
+    public class AbpFeatureManagementTestBaseModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/FeatureManagementTestData.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/FeatureManagementTestData.cs
index 72a230ec30..272230d17e 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/FeatureManagementTestData.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Abp/FeatureManagement/FeatureManagementTestData.cs
@@ -4,5 +4,6 @@ namespace Abp.FeatureManagement
 {
     public class FeatureManagementTestData : ISingletonDependency
     {
+
     }
 }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementProvider.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementProvider.cs
index 01251029ee..0b83f37fd1 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementProvider.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementProvider.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
 
@@ -24,8 +23,7 @@ namespace Volo.Abp.PermissionManagement
             GuidGenerator = guidGenerator;
             CurrentTenant = currentTenant;
         }
-
-
+        
         public virtual async Task<PermissionValueProviderGrantInfo> CheckAsync(string name, string providerName, string providerKey)
         {
             if (providerName != Name)