diff --git a/C/Util/7zipInstall/7zipInstall.c b/C/Util/7zipInstall/7zipInstall.c
index d8ee9238..667ef47e 100644
--- a/C/Util/7zipInstall/7zipInstall.c
+++ b/C/Util/7zipInstall/7zipInstall.c
@@ -68,7 +68,7 @@ static const WCHAR *k_Reg_Path32 = L"Path"
   #define k_Reg_WOW_Flag_32 0
 #endif
 
-#define k_7zip_CLSID L"{23170F69-40C1-278A-1000-000100020001}"
+#define k_7zip_CLSID L"{23170F69-0803-278A-1000-000100020001}"
 
 static const WCHAR *k_Reg_CLSID_7zip = L"CLSID\\" k_7zip_CLSID;
 static const WCHAR *k_Reg_CLSID_7zip_Inproc = L"CLSID\\" k_7zip_CLSID L"\\InprocServer32";
diff --git a/C/Util/7zipUninstall/7zipUninstall.c b/C/Util/7zipUninstall/7zipUninstall.c
index 80a8ee52..51fa133e 100644
--- a/C/Util/7zipUninstall/7zipUninstall.c
+++ b/C/Util/7zipUninstall/7zipUninstall.c
@@ -62,7 +62,7 @@ static const WCHAR *k_Reg_Path32 = L"Path"
   #define k_Reg_WOW_Flag_32 0
 #endif
 
-#define k_7zip_CLSID L"{23170F69-40C1-278A-1000-000100020001}"
+#define k_7zip_CLSID L"{23170F69-0803-278A-1000-000100020001}"
 
 static const WCHAR *k_Reg_CLSID_7zip = L"CLSID\\" k_7zip_CLSID;
 static const WCHAR *k_Reg_CLSID_7zip_Inproc = L"CLSID\\" k_7zip_CLSID L"\\InprocServer32";
diff --git a/CPP/7zip/IDecl.h b/CPP/7zip/IDecl.h
index 5a34b0e4..d8e585ca 100644
--- a/CPP/7zip/IDecl.h
+++ b/CPP/7zip/IDecl.h
@@ -6,7 +6,7 @@
 #include "../Common/MyUnknown.h"
 
 #define k_7zip_GUID_Data1 0x23170F69
-#define k_7zip_GUID_Data2 0x40C1
+#define k_7zip_GUID_Data2 0x0803
 
 #define k_7zip_GUID_Data3_Common  0x278A
 
diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp
index 5f25f191..e79efeda 100644
--- a/CPP/7zip/UI/Client7z/Client7z.cpp
+++ b/CPP/7zip/UI/Client7z/Client7z.cpp
@@ -33,7 +33,7 @@ HINSTANCE g_hInstance = 0;
 
 // Tou can find the list of all GUIDs in Guid.txt file.
 // use another CLSIDs, if you want to support other formats (zip, rar, ...).
-// {23170F69-40C1-278A-1000-000110070000}
+// {23170F69-0803-278A-1000-000110070000}
 
 DEFINE_GUID(CLSID_CFormat7z,
   0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00);
diff --git a/CPP/7zip/UI/Explorer/ContextMenu.cpp b/CPP/7zip/UI/Explorer/ContextMenu.cpp
index 1095d297..ca058f4b 100644
--- a/CPP/7zip/UI/Explorer/ContextMenu.cpp
+++ b/CPP/7zip/UI/Explorer/ContextMenu.cpp
@@ -129,9 +129,9 @@ HRESULT CZipContextMenu::InitContextMenu(const wchar_t * /* folder */, const wch
 /////////////////////////////
 // IContextMenu
 
-static LPCWSTR kMainVerb = L"SevenZip";
-static LPCWSTR kOpenCascadedVerb = L"SevenZip.OpenWithType.";
-static LPCWSTR kCheckSumCascadedVerb = L"SevenZip.Checksum";
+static LPCWSTR kMainVerb = L"SevenZipZS";
+static LPCWSTR kOpenCascadedVerb = L"SevenZipZS.OpenWithType.";
+static LPCWSTR kCheckSumCascadedVerb = L"SevenZipZS.Checksum";
 
 /*
 static LPCTSTR kOpenVerb = TEXT("SevenOpen");
@@ -768,7 +768,7 @@ STDMETHODIMP CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu,
       mi.fMask |= MIIM_CHECKMARKS;
     mi.wID = currentCommandID++;
     mi.hSubMenu = popupMenu.Detach();
-    mi.StringValue.SetFromAscii("7-Zip-ZStandard"); // LangString(IDS_CONTEXT_POPUP_CAPTION);
+    mi.StringValue.SetFromAscii("7-Zip ZStandard"); // LangString(IDS_CONTEXT_POPUP_CAPTION);
     mi.hbmpUnchecked = bitmap;
     
     CMenu menu;
@@ -804,7 +804,7 @@ STDMETHODIMP CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu,
         mi.fMask |= MIIM_CHECKMARKS;
       mi.wID = currentCommandID++;
       mi.hSubMenu = subMenu;
-      mi.StringValue.SetFromAscii("CRC SHA");
+      mi.StringValue.SetFromAscii("CRC SHA ZS");
       mi.hbmpUnchecked = bitmap;
       
       CMenu menu;
diff --git a/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp b/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
index 1190550c..e6121fe0 100644
--- a/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
+++ b/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
@@ -28,8 +28,8 @@
 static LPCTSTR k_ShellExtName = TEXT("7-Zip-ZStandard Shell Extension");
 static LPCTSTR k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved");
 
-// {23170F69-40C1-278A-1000-000100020000}
-static LPCTSTR k_Clsid = TEXT("{23170F69-40C1-278A-1000-000100020001}");
+// {23170F69-0803-278A-1000-000100020000}
+static LPCTSTR k_Clsid = TEXT("{23170F69-0803-278A-1000-000100020001}");
 
 DEFINE_GUID(CLSID_CZipContextMenu,
     k_7zip_GUID_Data1,
diff --git a/CPP/7zip/UI/Explorer/RegistryContextMenu.cpp b/CPP/7zip/UI/Explorer/RegistryContextMenu.cpp
index ff5903a3..95f29f8a 100644
--- a/CPP/7zip/UI/Explorer/RegistryContextMenu.cpp
+++ b/CPP/7zip/UI/Explorer/RegistryContextMenu.cpp
@@ -17,7 +17,7 @@ using namespace NRegistry;
 // CLISID (and Approved ?) items are separated for 32-bit and 64-bit code.
 // shellex items shared by 32-bit and 64-bit code?
 
-static LPCTSTR k_Clsid = TEXT("{23170F69-40C1-278A-1000-000100020001}");
+static LPCTSTR k_Clsid = TEXT("{23170F69-0803-278A-1000-000100020001}");
 static LPCTSTR k_ShellExtName = TEXT("7-Zip Shell Extension");
 
 static LPCTSTR k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved");
diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi
index 6de8e914..b28d12d5 100644
--- a/DOC/7zip.nsi
+++ b/DOC/7zip.nsi
@@ -30,7 +30,7 @@
 !define FM_LINK "7-Zip File Manager.lnk"
 !define HELP_LINK "7-Zip Help.lnk"
 
-!define CLSID_CONTEXT_MENU {23170F69-40C1-278A-1000-000100020000}
+!define CLSID_CONTEXT_MENU {23170F69-0803-278A-1000-000100020000}
 
 #!define NO_COMPRESSION
 
diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs
index c4252fab..82539960 100644
--- a/DOC/7zip.wxs
+++ b/DOC/7zip.wxs
@@ -38,9 +38,9 @@
 <?endif ?>
 
 
-<?define ShellExtId = "{23170F69-40C1-278A-1000-000100020000}" ?>
+<?define ShellExtId = "{23170F69-0803-278A-1000-000100020000}" ?>
 
-<?define BaseId = "23170F69-40C1-270$(var.CpuId)" ?>
+<?define BaseId = "23170F69-0803-270$(var.CpuId)" ?>
 <?define BaseIdVer = "$(var.BaseId)-$(var.MmHex)-$(var.VerBuild)00" ?>
 <?define ProductId   = "$(var.BaseIdVer)01000000" ?>
 <?define PackageId   = "$(var.BaseIdVer)02000000" ?>