diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
index 2eb4d6c10..126b97147 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
@@ -68,6 +68,7 @@
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\CutlureSelectorController.cs" />
     <Compile Include="Providers\CultureSelectorSelector.cs" />
+    <Compile Include="Services\DefaultCultureStorageProvider.cs" />
     <Compile Include="Services\ICultureService.cs" />
     <Compile Include="Drivers\LocalizationPartDriver.cs" />
     <Compile Include="Handlers\LocalizationPartHandler.cs" />
@@ -78,7 +79,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Routes.cs" />
-    <Compile Include="Services\ICultureStorage.cs" />
+    <Compile Include="Services\ICultureStorageProvider.cs" />
     <Compile Include="Services\ILocalizationService.cs" />
     <Compile Include="Services\LocalizationDateTimeFormatProvider.cs" />
     <Compile Include="Services\LocalizationService.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureStorage.cs b/src/Orchard.Web/Modules/Orchard.Localization/Services/DefaultCultureStorageProvider.cs
similarity index 89%
rename from src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureStorage.cs
rename to src/Orchard.Web/Modules/Orchard.Localization/Services/DefaultCultureStorageProvider.cs
index 0a72f984d..1c056d0b6 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureStorage.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Services/DefaultCultureStorageProvider.cs
@@ -6,13 +6,8 @@ using Orchard.Mvc;
 using Orchard.Services;
 
 namespace Orchard.Localization.Services {
-    public interface ICultureStorage : IDependency {
-        void SetCulture(string culture);
-        string GetCulture();
-    }
-
     [OrchardFeature("Orchard.Localization.CutlureSelector")]
-    public class DefaultCultureStorage : ICultureStorage {
+    public class DefaultCultureStorageProvider : ICultureStorageProvider {
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IClock _clock;
         private readonly ShellSettings _shellSettings;
@@ -20,7 +15,7 @@ namespace Orchard.Localization.Services {
         private const string CookieName = "OrchardCurrentCulture";
         private const int DefaultExpireTimeYear = 1;
 
-        public DefaultCultureStorage(IHttpContextAccessor httpContextAccessor,
+        public DefaultCultureStorageProvider(IHttpContextAccessor httpContextAccessor,
             IClock clock,
             ShellSettings shellSettings) {
             _httpContextAccessor = httpContextAccessor;
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureService.cs b/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureService.cs
index 5dc2aafd3..cd6bc3440 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureService.cs
@@ -8,17 +8,17 @@ namespace Orchard.Localization.Services {
 
     [OrchardFeature("Orchard.Localization.CutlureSelector")]
     public class CultureService : ICultureService {
-        private readonly ICultureStorage _cultureStorage;
+        private readonly ICultureStorageProvider _cultureStorageProvider;
 
-        public CultureService(ICultureStorage cultureStorage) {
-            _cultureStorage = cultureStorage;
+        public CultureService(ICultureStorageProvider cultureStorageProvider) {
+            _cultureStorageProvider = cultureStorageProvider;
         }
         public void SetCulture(string culture) {
-            _cultureStorage.SetCulture(culture);
+            _cultureStorageProvider.SetCulture(culture);
         }
 
         public string GetCulture() {
-            return _cultureStorage.GetCulture();
+            return _cultureStorageProvider.GetCulture();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureStorageProvider.cs b/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureStorageProvider.cs
new file mode 100644
index 000000000..3f30f1d63
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Services/ICultureStorageProvider.cs
@@ -0,0 +1,6 @@
+namespace Orchard.Localization.Services {
+    public interface ICultureStorageProvider : IDependency {
+        void SetCulture(string culture);
+        string GetCulture();
+    }
+}
\ No newline at end of file