diff --git a/Plugins/Wox.Plugin.CMD/CMDStorage.cs b/Plugins/Wox.Plugin.CMD/CMDHistory.cs
similarity index 86%
rename from Plugins/Wox.Plugin.CMD/CMDStorage.cs
rename to Plugins/Wox.Plugin.CMD/CMDHistory.cs
index a99772678c..22e8877b59 100644
--- a/Plugins/Wox.Plugin.CMD/CMDStorage.cs
+++ b/Plugins/Wox.Plugin.CMD/CMDHistory.cs
@@ -1,7 +1,4 @@
 using System.Collections.Generic;
-using System.ComponentModel;
-using Newtonsoft.Json;
-using Wox.Infrastructure.Storage;
 
 namespace Wox.Plugin.CMD
 {
diff --git a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj
index 2ba30128e6..9089e79eb8 100644
--- a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj
+++ b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj
@@ -59,10 +59,10 @@
       <Link>Properties\SolutionAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="CMD.cs" />
+    <Compile Include="CMDHistory.cs" />
     <Compile Include="CMDSetting.xaml.cs">
       <DependentUpon>CMDSetting.xaml</DependentUpon>
     </Compile>
-    <Compile Include="CMDStorage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs b/Plugins/Wox.Plugin.Everything/Settings.cs
similarity index 100%
rename from Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs
rename to Plugins/Wox.Plugin.Everything/Settings.cs
diff --git a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj
index 4314340236..4881790955 100644
--- a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj
+++ b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj
@@ -62,7 +62,7 @@
     <Compile Include="Everything\Exceptions\RegisterClassExException.cs" />
     <Compile Include="Everything\ResultType.cs" />
     <Compile Include="Everything\SearchResult.cs" />
-    <Compile Include="ContextMenuStorage.cs" />
+    <Compile Include="Settings.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/Plugins/Wox.Plugin.Folder/FolderStorage.cs b/Plugins/Wox.Plugin.Folder/Settings.cs
similarity index 99%
rename from Plugins/Wox.Plugin.Folder/FolderStorage.cs
rename to Plugins/Wox.Plugin.Folder/Settings.cs
index 015db6bce6..5c29c0c39f 100644
--- a/Plugins/Wox.Plugin.Folder/FolderStorage.cs
+++ b/Plugins/Wox.Plugin.Folder/Settings.cs
@@ -8,6 +8,5 @@ namespace Wox.Plugin.Folder
     {
         [JsonProperty]
         public List<FolderLink> FolderLinks { get; set; }
-
     }
 }
diff --git a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj
index 10dc7ee357..2f75eff337 100644
--- a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj
+++ b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj
@@ -59,7 +59,7 @@
     <Compile Include="FolderPluginSettings.xaml.cs">
       <DependentUpon>FolderPluginSettings.xaml</DependentUpon>
     </Compile>
-    <Compile Include="FolderStorage.cs" />
+    <Compile Include="Settings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Plugins/Wox.Plugin.Program/ProgramCacheStorage.cs b/Plugins/Wox.Plugin.Program/ProgramIndexCache.cs
similarity index 100%
rename from Plugins/Wox.Plugin.Program/ProgramCacheStorage.cs
rename to Plugins/Wox.Plugin.Program/ProgramIndexCache.cs
diff --git a/Plugins/Wox.Plugin.Program/ProgramStorage.cs b/Plugins/Wox.Plugin.Program/Settings.cs
similarity index 100%
rename from Plugins/Wox.Plugin.Program/ProgramStorage.cs
rename to Plugins/Wox.Plugin.Program/Settings.cs
diff --git a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
index e34125ec9e..06fa9d46e4 100644
--- a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
+++ b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
@@ -59,7 +59,7 @@
     <Compile Include="FileChangeWatcher.cs" />
     <Compile Include="IProgramSource.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="ProgramCacheStorage.cs" />
+    <Compile Include="ProgramIndexCache.cs" />
     <Compile Include="Programs.cs" />
     <Compile Include="ProgramSetting.xaml.cs">
       <DependentUpon>ProgramSetting.xaml</DependentUpon>
@@ -69,7 +69,7 @@
     <Compile Include="ProgramSources\CommonStartMenuProgramSource.cs" />
     <Compile Include="ProgramSources\FileSystemProgramSource.cs" />
     <Compile Include="ProgramSources\UserStartMenuProgramSource.cs" />
-    <Compile Include="ProgramStorage.cs" />
+    <Compile Include="Settings.cs" />
     <Compile Include="ProgramSuffixes.xaml.cs">
       <DependentUpon>ProgramSuffixes.xaml</DependentUpon>
     </Compile>
diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchStorage.cs b/Plugins/Wox.Plugin.WebSearch/Settings.cs
similarity index 100%
rename from Plugins/Wox.Plugin.WebSearch/WebSearchStorage.cs
rename to Plugins/Wox.Plugin.WebSearch/Settings.cs
diff --git a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj
index db504c724c..c691b8f7e6 100644
--- a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj
+++ b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj
@@ -67,7 +67,7 @@
     <Compile Include="WebSearchSetting.xaml.cs">
       <DependentUpon>WebSearchSetting.xaml</DependentUpon>
     </Compile>
-    <Compile Include="WebSearchStorage.cs" />
+    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Images\google.png">
diff --git a/Wox.Core/UserSettings/CustomizedPluginConfig.cs b/Wox.Core/UserSettings/PluginConfig.cs
similarity index 100%
rename from Wox.Core/UserSettings/CustomizedPluginConfig.cs
rename to Wox.Core/UserSettings/PluginConfig.cs
diff --git a/Wox.Core/UserSettings/UserSettingStorage.cs b/Wox.Core/UserSettings/Settings.cs
similarity index 100%
rename from Wox.Core/UserSettings/UserSettingStorage.cs
rename to Wox.Core/UserSettings/Settings.cs
diff --git a/Wox.Core/Wox.Core.csproj b/Wox.Core/Wox.Core.csproj
index e2ce7e54b3..02cd8f869b 100644
--- a/Wox.Core/Wox.Core.csproj
+++ b/Wox.Core/Wox.Core.csproj
@@ -84,9 +84,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resource\FontHelper.cs" />
     <Compile Include="Resource\Theme.cs" />
-    <Compile Include="UserSettings\CustomizedPluginConfig.cs" />
+    <Compile Include="UserSettings\PluginConfig.cs" />
     <Compile Include="UserSettings\PluginHotkey.cs" />
-    <Compile Include="UserSettings\UserSettingStorage.cs" />
+    <Compile Include="UserSettings\Settings.cs" />
     <Compile Include="Updater\SemanticVersion.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Wox.Infrastructure/Wox.Infrastructure.csproj b/Wox.Infrastructure/Wox.Infrastructure.csproj
index 40db92072a..51bb7ab5c8 100644
--- a/Wox.Infrastructure/Wox.Infrastructure.csproj
+++ b/Wox.Infrastructure/Wox.Infrastructure.csproj
@@ -67,12 +67,10 @@
     <Compile Include="WoxDirectroy.cs" />
     <Compile Include="Stopwatch.cs" />
     <Compile Include="Storage\BinaryStorage.cs" />
-    <Compile Include="Storage\IStorage.cs" />
     <Compile Include="Storage\JsonStorage.cs" />
     <Compile Include="StringMatcher.cs" />
     <Compile Include="Unidecoder.Characters.cs" />
     <Compile Include="Http\HttpRequest.cs" />
-    <Compile Include="Storage\BaseStorage.cs" />
     <Compile Include="FuzzyMatcher.cs" />
     <Compile Include="Hotkey\GlobalHotkey.cs" />
     <Compile Include="Hotkey\HotkeyModel.cs" />
diff --git a/Wox/Storage/QueryHistoryStorage.cs b/Wox/Storage/QueryHistory.cs
similarity index 100%
rename from Wox/Storage/QueryHistoryStorage.cs
rename to Wox/Storage/QueryHistory.cs
diff --git a/Wox/Storage/TopMostRecordStorage.cs b/Wox/Storage/TopMostRecord.cs
similarity index 100%
rename from Wox/Storage/TopMostRecordStorage.cs
rename to Wox/Storage/TopMostRecord.cs
diff --git a/Wox/Storage/UserSelectedRecordStorage.cs b/Wox/Storage/UserSelectedRecord.cs
similarity index 100%
rename from Wox/Storage/UserSelectedRecordStorage.cs
rename to Wox/Storage/UserSelectedRecord.cs
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index 8e64ddf635..3a96cbe4fa 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -131,9 +131,9 @@
     <Compile Include="ResultListBox.xaml.cs">
       <DependentUpon>ResultListBox.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Storage\QueryHistoryStorage.cs" />
-    <Compile Include="Storage\TopMostRecordStorage.cs" />
-    <Compile Include="Storage\UserSelectedRecordStorage.cs" />
+    <Compile Include="Storage\QueryHistory.cs" />
+    <Compile Include="Storage\TopMostRecord.cs" />
+    <Compile Include="Storage\UserSelectedRecord.cs" />
     <Compile Include="ViewModel\BaseViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
     <Compile Include="ViewModel\ResultViewModel.cs" />