diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/EditionFeatureManagementProvider.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/EditionFeatureManagementProvider.cs
index 6e16f73dfa..94500b35d9 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/EditionFeatureManagementProvider.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/EditionFeatureManagementProvider.cs
@@ -1,10 +1,10 @@
-namespace Volo.Abp.FeatureManagement
+using Volo.Abp.Features;
+
+namespace Volo.Abp.FeatureManagement
 {
     public class EditionFeatureManagementProvider : FeatureManagementProvider
     {
-        public const string ProviderName = "Edition";
-
-        public override string Name => ProviderName;
+        public override string Name => EditionFeatureValueProvider.ProviderName;
 
         public EditionFeatureManagementProvider(IFeatureManagementStore store) 
             : base(store)
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/FeatureManagementTestDataBuilder.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/FeatureManagementTestDataBuilder.cs
index 98c6218d8e..4cfc3ff667 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/FeatureManagementTestDataBuilder.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/FeatureManagementTestDataBuilder.cs
@@ -22,7 +22,7 @@ namespace Volo.Abp.FeatureManagement
 
         public void Build()
         {
-            // "Regular" edition features /////////////////////////////////////
+            #region "Regular" edition features
 
             //SocialLogins
             _featureValueRepository.Insert(
@@ -30,7 +30,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.SocialLogins,
                     true.ToString().ToLowerInvariant(),
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Regular
                 )
             );
@@ -41,7 +41,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.UserCount,
                     "10",
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Regular
                 )
             );
@@ -52,12 +52,14 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.ProjectCount,
                     "1",
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Regular
                 )
             );
 
-            // "Enterprise" edition features //////////////////////////////////
+            #endregion
+
+            #region "Enterprise" edition features
 
             //SocialLogins
             _featureValueRepository.Insert(
@@ -65,7 +67,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.SocialLogins,
                     true.ToString().ToLowerInvariant(),
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -76,7 +78,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.EmailSupport,
                     true.ToString().ToLowerInvariant(),
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -87,7 +89,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.UserCount,
                     "20",
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -98,7 +100,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.ProjectCount,
                     "3",
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -109,12 +111,14 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.BackupCount,
                     "5",
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
 
-            // "Ultimate" edition features ////////////////////////////////////
+            #endregion
+
+            #region "Ultimate" edition features
 
             //SocialLogins
             _featureValueRepository.Insert(
@@ -122,7 +126,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.SocialLogins,
                     true.ToString().ToLowerInvariant(),
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -133,7 +137,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.EmailSupport,
                     true.ToString().ToLowerInvariant(),
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -144,7 +148,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.DailyAnalysis,
                     true.ToString().ToLowerInvariant(),
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -155,7 +159,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.UserCount,
                     "100",
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -166,7 +170,7 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.ProjectCount,
                     "10",
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
@@ -177,10 +181,12 @@ namespace Volo.Abp.FeatureManagement
                     _guidGenerator.Create(),
                     TestFeatureDefinitionProvider.BackupCount,
                     "10",
-                    EditionFeatureManagementProvider.ProviderName,
+                    EditionFeatureValueProvider.ProviderName,
                     TestEditionNames.Enterprise
                 )
             );
+
+            #endregion
         }
     }
 }
\ No newline at end of file
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/FeatureValueRepository_Tests.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/FeatureValueRepository_Tests.cs
index ed32c8971d..e25b09ebcc 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/FeatureValueRepository_Tests.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.TestBase/Volo/Abp/FeatureManagement/FeatureValueRepository_Tests.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Shouldly;
+using Volo.Abp.Features;
 using Volo.Abp.Modularity;
 using Xunit;
 
@@ -22,7 +23,7 @@ namespace Volo.Abp.FeatureManagement
 
             var featureValue = await Repository.FindAsync(
                 TestFeatureDefinitionProvider.ProjectCount,
-                EditionFeatureManagementProvider.ProviderName,
+                EditionFeatureValueProvider.ProviderName,
                 TestEditionNames.Enterprise
             );
 
@@ -32,7 +33,7 @@ namespace Volo.Abp.FeatureManagement
             //feature value does not exists
             featureValue = await Repository.FindAsync(
                 TestFeatureDefinitionProvider.ProjectCount,
-                EditionFeatureManagementProvider.ProviderName,
+                EditionFeatureValueProvider.ProviderName,
                 "undefined-edition-name"
             );
 
@@ -42,7 +43,10 @@ namespace Volo.Abp.FeatureManagement
         [Fact]
         public async Task GetListAsync()
         {
-            var featureValues = await Repository.GetListAsync(EditionFeatureManagementProvider.ProviderName, TestEditionNames.Enterprise);
+            var featureValues = await Repository.GetListAsync(
+                EditionFeatureValueProvider.ProviderName,
+                TestEditionNames.Enterprise
+            );
 
             featureValues.Count.ShouldBeGreaterThan(0);