diff --git a/Documents/ContextMenu.png b/Documents/ContextMenu.png
index ca12364e..34e7bc44 100644
Binary files a/Documents/ContextMenu.png and b/Documents/ContextMenu.png differ
diff --git a/Documents/MainWindow.png b/Documents/MainWindow.png
index 24579170..3a734eb4 100644
Binary files a/Documents/MainWindow.png and b/Documents/MainWindow.png differ
diff --git a/Documents/ReleaseNotes.md b/Documents/ReleaseNotes.md
index c9e73ab8..095a39a0 100644
--- a/Documents/ReleaseNotes.md
+++ b/Documents/ReleaseNotes.md
@@ -3,7 +3,7 @@
 For preview versions, please read 
 [NanaZip Preview Release Notes](ReleaseNotesPreview.md).
 
-**NanaZip 2.0 (2.0.xxx.0)**
+**NanaZip 2.0 (2.0.396.0)**
 
 - Notes
   - Update the minimum system requirement to Windows 10 Version 2004 (Build 
diff --git a/NanaZip/Mile.Project.Properties.h b/NanaZip/Mile.Project.Properties.h
index c5313eee..d77bab8a 100644
Binary files a/NanaZip/Mile.Project.Properties.h and b/NanaZip/Mile.Project.Properties.h differ
diff --git a/NanaZipConsole/Mile.Project.Properties.h b/NanaZipConsole/Mile.Project.Properties.h
index cdb73c00..ae7170e8 100644
Binary files a/NanaZipConsole/Mile.Project.Properties.h and b/NanaZipConsole/Mile.Project.Properties.h differ
diff --git a/NanaZipCore/Mile.Project.Properties.h b/NanaZipCore/Mile.Project.Properties.h
index 3c221856..30a1f0a0 100644
Binary files a/NanaZipCore/Mile.Project.Properties.h and b/NanaZipCore/Mile.Project.Properties.h differ
diff --git a/NanaZipInstaller/Mile.Project.Properties.h b/NanaZipInstaller/Mile.Project.Properties.h
index cf82a727..4652b892 100644
Binary files a/NanaZipInstaller/Mile.Project.Properties.h and b/NanaZipInstaller/Mile.Project.Properties.h differ
diff --git a/NanaZipInstaller/NanaZipInstaller.rc b/NanaZipInstaller/NanaZipInstaller.rc
index 24b4a4a0..a581f514 100644
Binary files a/NanaZipInstaller/NanaZipInstaller.rc and b/NanaZipInstaller/NanaZipInstaller.rc differ
diff --git a/NanaZipPackage/NanaZipPackage.wapproj b/NanaZipPackage/NanaZipPackage.wapproj
index e41a55f8..728d1d6a 100644
--- a/NanaZipPackage/NanaZipPackage.wapproj
+++ b/NanaZipPackage/NanaZipPackage.wapproj
@@ -27,7 +27,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Image Assets -->
-    <Content Include="..\Assets\PreviewPackageAssets\**\*">
+    <Content Include="..\Assets\PackageAssets\**\*">
       <DeploymentContent>true</DeploymentContent>
       <Link>Assets\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
diff --git a/NanaZipPackage/Package.appxmanifest b/NanaZipPackage/Package.appxmanifest
index 56b0e6d3..5f468f4a 100644
--- a/NanaZipPackage/Package.appxmanifest
+++ b/NanaZipPackage/Package.appxmanifest
@@ -16,12 +16,12 @@
   IgnorableNamespaces="uap rescap desktop uap2 uap3 com desktop4 desktop5 uap8 uap10 virtualization">
 
   <Identity
-    Name="40174MouriNaruto.NanaZipPreview"
+    Name="40174MouriNaruto.NanaZip"
     Publisher="CN=E310A153-74A9-4D81-800B-857A8D58408A"
-    Version="2.0.376.0" />
+    Version="2.0.396.0" />
 
   <Properties>
-    <DisplayName>NanaZip Preview</DisplayName>
+    <DisplayName>NanaZip</DisplayName>
     <PublisherDisplayName>Kenji Mouri</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
     <uap10:PackageIntegrity>
@@ -134,7 +134,7 @@
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements 
         AppListEntry="none"
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -157,7 +157,7 @@
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements 
         AppListEntry="none"
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -179,7 +179,7 @@
       Executable="NanaZip.exe"
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -264,17 +264,17 @@
             <!-- Our verb name starts with "C" to work around a bug preventing our shell menu from appearing in the
                  classic context menu. -->
             <desktop5:ItemType Type="Directory">
-              <desktop5:Verb Id="CNanaZipShellExtension" Clsid="469D94E9-6AF4-4395-B396-99B1308F8CE5" />
+              <desktop5:Verb Id="CNanaZipShellExtension" Clsid="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" />
             </desktop5:ItemType>
             <desktop5:ItemType Type="*">
-              <desktop5:Verb Id="CNanaZipShellExtension" Clsid="469D94E9-6AF4-4395-B396-99B1308F8CE5" />
+              <desktop5:Verb Id="CNanaZipShellExtension" Clsid="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" />
             </desktop5:ItemType>
           </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
         <com:Extension Category="windows.comServer">
           <com:ComServer>
             <com:SurrogateServer DisplayName="NanaZip Shell Extension">
-              <com:Class Id="469D94E9-6AF4-4395-B396-99B1308F8CE5" Path="NanaZipShellExtension.dll" ThreadingModel="STA"/>
+              <com:Class Id="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" Path="NanaZipShellExtension.dll" ThreadingModel="STA"/>
             </com:SurrogateServer>
           </com:ComServer>
         </com:Extension>
diff --git a/NanaZipSfxConsole/Mile.Project.Properties.h b/NanaZipSfxConsole/Mile.Project.Properties.h
index e6d3bf5f..fb832aa0 100644
Binary files a/NanaZipSfxConsole/Mile.Project.Properties.h and b/NanaZipSfxConsole/Mile.Project.Properties.h differ
diff --git a/NanaZipSfxSetup/Mile.Project.Properties.h b/NanaZipSfxSetup/Mile.Project.Properties.h
index 75c0fd87..d357f52e 100644
Binary files a/NanaZipSfxSetup/Mile.Project.Properties.h and b/NanaZipSfxSetup/Mile.Project.Properties.h differ
diff --git a/NanaZipSfxWindows/Mile.Project.Properties.h b/NanaZipSfxWindows/Mile.Project.Properties.h
index b70be5c4..2ff1ecc5 100644
Binary files a/NanaZipSfxWindows/Mile.Project.Properties.h and b/NanaZipSfxWindows/Mile.Project.Properties.h differ
diff --git a/NanaZipShellExtension/Mile.Project.Properties.h b/NanaZipShellExtension/Mile.Project.Properties.h
index 5dd2614f..3e190a45 100644
Binary files a/NanaZipShellExtension/Mile.Project.Properties.h and b/NanaZipShellExtension/Mile.Project.Properties.h differ
diff --git a/NanaZipShellExtension/NanaZipShellExtension.cpp b/NanaZipShellExtension/NanaZipShellExtension.cpp
index 976a60da..e44a02b9 100644
--- a/NanaZipShellExtension/NanaZipShellExtension.cpp
+++ b/NanaZipShellExtension/NanaZipShellExtension.cpp
@@ -916,7 +916,7 @@ namespace NanaZip::ShellExtension
                 return E_NOTIMPL;
             }
 
-            return ::SHStrDupW(L"NanaZip Preview", ppszName);
+            return ::SHStrDupW(L"NanaZip", ppszName);
         }
 
         HRESULT STDMETHODCALLTYPE GetIcon(
@@ -1042,7 +1042,7 @@ namespace NanaZip::ShellExtension
 #pragma endregion
     };
 
-    struct DECLSPEC_UUID("469D94E9-6AF4-4395-B396-99B1308F8CE5")
+    struct DECLSPEC_UUID("CAE3F1D4-7765-4D98-A060-52CD14D56EAB")
         ClassFactory : public winrt::implements<
         ClassFactory, IClassFactory>
     {
diff --git a/NanaZipWindows/Mile.Project.Properties.h b/NanaZipWindows/Mile.Project.Properties.h
index 0b749f37..2f9eee27 100644
Binary files a/NanaZipWindows/Mile.Project.Properties.h and b/NanaZipWindows/Mile.Project.Properties.h differ
diff --git a/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc b/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc
index 24096cc2..ccf4d5a8 100644
--- a/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc
+++ b/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc
@@ -1 +1 @@
-101 ICON "../../../../../Assets/NanaZipPreviewSfx.ico"
\ No newline at end of file
+101 ICON "../../../../../Assets/NanaZipSfx.ico"
\ No newline at end of file
diff --git a/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc b/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc
index e48d312b..c98a73ba 100644
--- a/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc
+++ b/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc
@@ -1,6 +1,6 @@
 #include "resource.h"
 
-IDI_ICON  ICON "../../../../../Assets/NanaZipPreviewSfx.ico"
+IDI_ICON  ICON "../../../../../Assets/NanaZipSfx.ico"
 
 STRINGTABLE
 BEGIN
diff --git a/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc b/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc
index ef28e4cf..6aa0729e 100644
--- a/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc
+++ b/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc
@@ -7,7 +7,7 @@
 #define xc 240
 #define yc 64
 
-IDI_ICON ICON "../../../../../Assets/NanaZipPreviewSfx.ico"
+IDI_ICON ICON "../../../../../Assets/NanaZipSfx.ico"
 
 IDD_EXTRACT  DIALOG  0, 0, xs, ys  MY_MODAL_DIALOG_STYLE  MY_FONT
 CAPTION "NanaZip SFX"
diff --git a/SevenZip/CPP/7zip/UI/FileManager/resource.rc b/SevenZip/CPP/7zip/UI/FileManager/resource.rc
index 8c52ab8f..d2f4abb1 100644
--- a/SevenZip/CPP/7zip/UI/FileManager/resource.rc
+++ b/SevenZip/CPP/7zip/UI/FileManager/resource.rc
@@ -138,7 +138,7 @@ BEGIN
 END
 
 
-IDI_ICON  ICON  "../../../../../Assets/NanaZipPreview.ico"
+IDI_ICON  ICON  "../../../../../Assets/NanaZip.ico"
 
 IDB_ADD        BITMAP  "../../../../../NanaZip/Assets/Toolbar/Add_32x32.bmp"
 IDB_EXTRACT    BITMAP  "../../../../../NanaZip/Assets/Toolbar/Extract_32x32.bmp"
diff --git a/SevenZip/CPP/7zip/UI/GUI/resource.rc b/SevenZip/CPP/7zip/UI/GUI/resource.rc
index 75203f22..3dd8afa2 100644
--- a/SevenZip/CPP/7zip/UI/GUI/resource.rc
+++ b/SevenZip/CPP/7zip/UI/GUI/resource.rc
@@ -3,7 +3,7 @@
 
 #include "../FileManager/resourceGui.rc"
 
-IDI_ICON ICON "../../../../../Assets/NanaZipPreview.ico"
+IDI_ICON ICON "../../../../../Assets/NanaZip.ico"
 
 #include "../FileManager/PropertyName.rc"
 #include "../FileManager/OverwriteDialog.rc"