Make Win32 LibO installable side by side with other StarOffice derivatives

6 files changed, 254 insertions, 254 deletions

diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index e584cdfed4a3..6cf2817b1dcb 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -33,7 +33,7 @@ RegistryItem gid_Regitem_Odb
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odb";
     ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "opendocument.DatabaseDocument.1";
+    Value = "LibreOffice.DatabaseDocument.1";
 End
 
 RegistryItem gid_Regitem_Odb_PersistentHandler
@@ -60,7 +60,7 @@ End
 RegistryItem gid_Regitem_DatabaseDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = "opendocument.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -82,14 +82,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DatabaseDocument.1";
+    Subkey = "LibreOffice.DatabaseDocument.1";
     ModuleID = gid_Module_Prg_Base_Bin;
     REG_VALUE_LNG(OO_DATABASE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DatabaseDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.DatabaseDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Base_Bin;
     Value = "<progpath>\program\soffice.bin,11";
 End
@@ -98,7 +98,7 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.DatabaseDocument.1";
+    Subkey = "LibreOffice.DatabaseDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Base";
 End
@@ -106,7 +106,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = "opendocument.DatabaseDocument.1";
+    Subkey = "LibreOffice.DatabaseDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_DATABASE)
 End
@@ -115,7 +115,7 @@ End
 RegistryItem gid_Regitem_odb_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.DatabaseDocument.1";
+    Subkey = "LibreOffice.DatabaseDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -132,21 +132,21 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DatabaseDocument.1\shell";
+    Subkey = "LibreOffice.DatabaseDocument.1\shell";
     ModuleID = gid_Module_Prg_Base_Bin;
     Value = "open";
 End
 
 // RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell_Open_Command
 //     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     Subkey = "opendocument.DatabaseDocument.1\shell\open\command";
+//     Subkey = "LibreOffice.DatabaseDocument.1\shell\open\command";
 //     ModuleID = gid_Module_Prg_Base_Bin;
 //     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 // End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DatabaseDocument.1\shell\open\command";
+    Subkey = "LibreOffice.DatabaseDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Base_Bin;
     Value = "\"<progpath>\program\sbase.exe\" -o \"%1\"";
     Styles = ();
@@ -158,7 +158,7 @@ RegistryItem gid_Regitem_OpenOffice_ODB_OpenWith_Database
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odb\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Base_Bin;
-    Name = "opendocument.DatabaseDocument.1";
+    Name = "LibreOffice.DatabaseDocument.1";
     Value = " ";
 End
 
@@ -167,7 +167,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Base_Bin;
     Name = ".odb";
-    Value = "opendocument.DatabaseDocument.1";
+    Value = "LibreOffice.DatabaseDocument.1";
     Styles = ();
 End
 
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 102dd624a0e4..d981008dc101 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -228,7 +228,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\ProgID";
-    Value = "opendocument.CalcDocument.1";
+    Value = "LibreOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Programmable
@@ -262,7 +262,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\VersionIndependentProgID";
-    Value = "opendocument.CalcDocument.1";
+    Value = "LibreOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
@@ -626,7 +626,7 @@ End
 RegistryItem gid_Regitem_CalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -634,7 +634,7 @@ RegistryItem gid_Regitem__Ods
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".ods";
-    Value = "opendocument.CalcDocument.1";
+    Value = "LibreOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_ods
@@ -642,7 +642,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".ods";
-    Value = "opendocument.CalcDocument.1";
+    Value = "LibreOffice.CalcDocument.1";
     Styles = ();
 End
 
@@ -651,7 +651,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = "application/vnd.oasis.opendocument.spreadsheet";
-    Value = "opendocument.CalcDocument.1";
+    Value = "LibreOffice.CalcDocument.1";
     Styles = ();
 End
 
@@ -674,7 +674,7 @@ End
 RegistryItem gid_Regitem_Ods_Openoffice_Calcdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods\opendocument.CalcDocument.1\ShellNew";
+    Subkey = ".ods\LibreOffice.CalcDocument.1\ShellNew";
     Name = "FileName";
     Value = "soffice.ods";
 End
@@ -682,28 +682,28 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument\CurVer";
-    Value = "opendocument.CalcDocument.1";
+    Subkey = "LibreOffice.CalcDocument\CurVer";
+    Value = "LibreOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1";
+    Subkey = "LibreOffice.CalcDocument.1";
     REG_VALUE_LNG(OO_CALC)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\CLSID";
+    Subkey = "LibreOffice.CalcDocument.1\CLSID";
     Value = "{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.CalcDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,3";
 End
 
@@ -711,7 +711,7 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.CalcDocument.1";
+    Subkey = "LibreOffice.CalcDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Calc";
 End
@@ -719,7 +719,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1";
+    Subkey = "LibreOffice.CalcDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_CALC)
 End
@@ -728,7 +728,7 @@ End
 RegistryItem gid_Regitem_ods_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.CalcDocument.1";
+    Subkey = "LibreOffice.CalcDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -746,62 +746,62 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\Insertable";
+    Subkey = "LibreOffice.CalcDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\server";
+    Subkey = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell";
+    Subkey = "LibreOffice.CalcDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\new";
+    Subkey = "LibreOffice.CalcDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\new\command";
+    Subkey = "LibreOffice.CalcDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\open\command";
+    Subkey = "LibreOffice.CalcDocument.1\shell\open\command";
     Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -809,14 +809,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\print\command";
+    Subkey = "LibreOffice.CalcDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\printto\command";
+    Subkey = "LibreOffice.CalcDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -847,7 +847,7 @@ RegistryItem gid_Regitem__Fods
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".fods";
-    Value = "opendocument.CalcDocument.1";
+    Value = "LibreOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fods
@@ -855,7 +855,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fods";
-    Value = "opendocument.CalcDocument.1";
+    Value = "LibreOffice.CalcDocument.1";
     Styles = (PATCH);
 End
 
@@ -902,7 +902,7 @@ End
 RegistryItem gid_Regitem_CalcTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -910,7 +910,7 @@ RegistryItem gid_Regitem_Ots
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "opendocument.CalcTemplate.1";
+    Value = "LibreOffice.CalcTemplate.1";
 End
 
 RegistryItem gid_Regitem_Ots_Contenttype
@@ -923,14 +923,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1";
+    Subkey = "LibreOffice.CalcTemplate.1";
     ModuleID = gid_Module_Prg_Calc_Bin;
     REG_VALUE_LNG(OO_CALC_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\DefaultIcon";
+    Subkey = "LibreOffice.CalcTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "<progpath>\program\soffice.bin,4";
 End
@@ -939,7 +939,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.CalcTemplate.1";
+    Subkey = "LibreOffice.CalcTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Calc";
 End
@@ -947,7 +947,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcTemplate.1";
+    Subkey = "LibreOffice.CalcTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_CALC_TEMPLATE)
 End
@@ -956,7 +956,7 @@ End
 RegistryItem gid_Regitem_ots_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.CalcTemplate.1";
+    Subkey = "LibreOffice.CalcTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -973,42 +973,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell";
+    Subkey = "LibreOffice.CalcTemplate.1\shell";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\new";
+    Subkey = "LibreOffice.CalcTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Calc_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\new\command";
+    Subkey = "LibreOffice.CalcTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\open\command";
+    Subkey = "LibreOffice.CalcTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\print\command";
+    Subkey = "LibreOffice.CalcTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\printto\command";
+    Subkey = "LibreOffice.CalcTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1020,7 +1020,7 @@ RegistryItem gid_Regitem_OpenOffice_ODS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ods\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "LibreOffice.CalcDocument.1";
     Value = " ";
 End
 
@@ -1029,7 +1029,7 @@ RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcTemplate.1";
+    Name = "LibreOffice.CalcTemplate.1";
     Value = " ";
 End
 
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 16f62bb53173..367b3a3d6d30 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -228,7 +228,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\ProgID";
-    Value = "opendocument.DrawDocument.1";
+    Value = "LibreOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Programmable
@@ -262,7 +262,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\VersionIndependentProgID";
-    Value = "opendocument.DrawDocument.1";
+    Value = "LibreOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
@@ -626,7 +626,7 @@ End
 RegistryItem gid_Regitem_DrawDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -650,7 +650,7 @@ RegistryItem gid_Regitem__Odg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = ".odg";
-    Value = "opendocument.DrawDocument.1";
+    Value = "LibreOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odg
@@ -658,7 +658,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".odg";
-    Value = "opendocument.DrawDocument.1";
+    Value = "LibreOffice.DrawDocument.1";
     Styles = ();
 End
 
@@ -667,43 +667,43 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = "application/vnd.oasis.opendocument.graphics";
-    Value = "opendocument.DrawDocument.1";
+    Value = "LibreOffice.DrawDocument.1";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_Odg_Openoffice_Drawdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".odg\opendocument.DrawDocument.1\ShellNew";
+    Subkey = ".odg\LibreOffice.DrawDocument.1\ShellNew";
     Name = "FileName";
     Value = "soffice.odg";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawDocument\CurVer";
+    Subkey = "LibreOffice.DrawDocument\CurVer";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "opendocument.DrawDocument.1";
+    Value = "LibreOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1";
+    Subkey = "LibreOffice.DrawDocument.1";
     REG_VALUE_LNG(OO_DRAW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\CLSID";
+    Subkey = "LibreOffice.DrawDocument.1\CLSID";
     Value = "{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.DrawDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,5";
 End
 
@@ -711,7 +711,7 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.DrawDocument.1";
+    Subkey = "LibreOffice.DrawDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Draw";
 End
@@ -719,7 +719,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1";
+    Subkey = "LibreOffice.DrawDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_DRAW)
 End
@@ -728,7 +728,7 @@ End
 RegistryItem gid_Regitem_odg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.DrawDocument.1";
+    Subkey = "LibreOffice.DrawDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -746,28 +746,28 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell";
+    Subkey = "LibreOffice.DrawDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\new";
+    Subkey = "LibreOffice.DrawDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\new\command";
+    Subkey = "LibreOffice.DrawDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\open\command";
+    Subkey = "LibreOffice.DrawDocument.1\shell\open\command";
     Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -775,48 +775,48 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\print\command";
+    Subkey = "LibreOffice.DrawDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\printto\command";
+    Subkey = "LibreOffice.DrawDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\Insertable";
+    Subkey = "LibreOffice.DrawDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\server";
+    Subkey = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
@@ -855,7 +855,7 @@ RegistryItem gid_Regitem__Fodg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = ".fodg";
-    Value = "opendocument.DrawDocument.1";
+    Value = "LibreOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodg
@@ -863,7 +863,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fodg";
-    Value = "opendocument.DrawDocument.1";
+    Value = "LibreOffice.DrawDocument.1";
     Styles = (PATCH);
 End
 
@@ -902,7 +902,7 @@ End
 RegistryItem gid_Regitem_DrawTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -910,7 +910,7 @@ RegistryItem gid_Regitem_Otg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otg";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "opendocument.DrawTemplate.1";
+    Value = "LibreOffice.DrawTemplate.1";
 End
 
 RegistryItem gid_Regitem_Otg_Contenttype
@@ -923,14 +923,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1";
+    Subkey = "LibreOffice.DrawTemplate.1";
     ModuleID = gid_Module_Prg_Draw_Bin;
     REG_VALUE_LNG(OO_DRAW_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\DefaultIcon";
+    Subkey = "LibreOffice.DrawTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "<progpath>\program\soffice.bin,6";
 End
@@ -939,7 +939,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.DrawTemplate.1";
+    Subkey = "LibreOffice.DrawTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Draw";
 End
@@ -947,7 +947,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawTemplate.1";
+    Subkey = "LibreOffice.DrawTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_DRAW_TEMPLATE)
 End
@@ -956,7 +956,7 @@ End
 RegistryItem gid_Regitem_otg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.DrawTemplate.1";
+    Subkey = "LibreOffice.DrawTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -973,42 +973,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell";
+    Subkey = "LibreOffice.DrawTemplate.1\shell";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\new";
+    Subkey = "LibreOffice.DrawTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Draw_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\new\command";
+    Subkey = "LibreOffice.DrawTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\open\command";
+    Subkey = "LibreOffice.DrawTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\print\command";
+    Subkey = "LibreOffice.DrawTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\printto\command";
+    Subkey = "LibreOffice.DrawTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1020,7 +1020,7 @@ RegistryItem gid_Regitem_OpenOffice_ODG_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "LibreOffice.DrawDocument.1";
     Value = " ";
 End
 
@@ -1029,7 +1029,7 @@ RegistryItem gid_Regitem_OpenOffice_OTG_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawTemplate.1";
+    Name = "LibreOffice.DrawTemplate.1";
     Value = " ";
 End
 
@@ -1057,7 +1057,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".otg";
-    Value = "opendocument.DrawTemplate.1";
+    Value = "LibreOffice.DrawTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index aef1116d6375..5a732fb1f388 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -228,7 +228,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\ProgID";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "LibreOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Programmable
@@ -262,7 +262,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\VersionIndependentProgID";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "LibreOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
@@ -640,7 +640,7 @@ End
 RegistryItem gid_Regitem_ImpressDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -648,7 +648,7 @@ RegistryItem gid_Regitem__Odp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = ".odp";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "LibreOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odp
@@ -656,7 +656,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".odp";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "LibreOffice.ImpressDocument.1";
     Styles = ();
 End
 
@@ -665,7 +665,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = "application/vnd.oasis.opendocument.presentation";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "LibreOffice.ImpressDocument.1";
     Styles = ();
 End
 
@@ -689,7 +689,7 @@ End
 RegistryItem gid_Regitem_Odp_Openoffice_Impressdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".odp\opendocument.ImpressDocument.1\ShellNew";
+    Subkey = ".odp\LibreOffice.ImpressDocument.1\ShellNew";
     Name = "FileName";
     Value = "soffice.odp";
 End
@@ -698,27 +698,27 @@ RegistryItem gid_Regitem_Openoffice_Starimpressdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressDocument\CurVer";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "opendocument.ImpressDocument.1";
+    Value = "LibreOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1";
+    Subkey = "LibreOffice.ImpressDocument.1";
     REG_VALUE_LNG(OO_PRESENT)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\CLSID";
+    Subkey = "LibreOffice.ImpressDocument.1\CLSID";
     Value = "{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.ImpressDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,7";
 End
 
@@ -726,7 +726,7 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.ImpressDocument.1";
+    Subkey = "LibreOffice.ImpressDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Impress";
 End
@@ -734,7 +734,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1";
+    Subkey = "LibreOffice.ImpressDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_PRESENT)
 End
@@ -743,7 +743,7 @@ End
 RegistryItem gid_Regitem_odp_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.ImpressDocument.1";
+    Subkey = "LibreOffice.ImpressDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -761,62 +761,62 @@ End
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\Insertable";
+    Subkey = "LibreOffice.ImpressDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\server";
+    Subkey = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell";
+    Subkey = "LibreOffice.ImpressDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\new";
+    Subkey = "LibreOffice.ImpressDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\new\command";
+    Subkey = "LibreOffice.ImpressDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\open\command";
+    Subkey = "LibreOffice.ImpressDocument.1\shell\open\command";
     Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -824,28 +824,28 @@ End
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\print\command";
+    Subkey = "LibreOffice.ImpressDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\printto\command";
+    Subkey = "LibreOffice.ImpressDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\show";
+    Subkey = "LibreOffice.ImpressDocument.1\shell\show";
     REG_VALUE_LNG(SO60_SHOW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\show\command";
+    Subkey = "LibreOffice.ImpressDocument.1\shell\show\command";
     Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
 End
 
@@ -876,7 +876,7 @@ RegistryItem gid_Regitem__Fodp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = ".fodp";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "LibreOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodp
@@ -884,7 +884,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fodp";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "LibreOffice.ImpressDocument.1";
     Styles = (PATCH);
 End
 
@@ -931,7 +931,7 @@ End
 RegistryItem gid_Regitem_ImpressTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -939,7 +939,7 @@ RegistryItem gid_Regitem_Otp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otp";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "opendocument.ImpressTemplate.1";
+    Value = "LibreOffice.ImpressTemplate.1";
 End
 
 RegistryItem gid_Regitem_Otp_Contenttype
@@ -952,14 +952,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1";
+    Subkey = "LibreOffice.ImpressTemplate.1";
     ModuleID = gid_Module_Prg_Impress_Bin;
     REG_VALUE_LNG(OO_PRESENT_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\DefaultIcon";
+    Subkey = "LibreOffice.ImpressTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "<progpath>\program\soffice.bin,8";
 End
@@ -968,7 +968,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.ImpressTemplate.1";
+    Subkey = "LibreOffice.ImpressTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Impress";
 End
@@ -976,7 +976,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressTemplate.1";
+    Subkey = "LibreOffice.ImpressTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_PRESENT_TEMPLATE)
 End
@@ -985,7 +985,7 @@ End
 RegistryItem gid_Regitem_otp_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.ImpressTemplate.1";
+    Subkey = "LibreOffice.ImpressTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -1002,42 +1002,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell";
+    Subkey = "LibreOffice.ImpressTemplate.1\shell";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\new";
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Impress_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\new\command";
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\open\command";
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\print\command";
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\printto\command";
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1049,7 +1049,7 @@ RegistryItem gid_Regitem_OpenOffice_ODP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "LibreOffice.ImpressDocument.1";
     Value = " ";
 End
 
@@ -1058,7 +1058,7 @@ RegistryItem gid_Regitem_OpenOffice_OTP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressTemplate.1";
+    Name = "LibreOffice.ImpressTemplate.1";
     Value = " ";
 End
 
@@ -1094,7 +1094,7 @@ RegistryItem gid_Regitem_OpenOffice_ODG_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "LibreOffice.ImpressDocument.1";
     Value = " ";
 End
 
@@ -1104,7 +1104,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".otp";
-    Value = "opendocument.ImpressTemplate.1";
+    Value = "LibreOffice.ImpressTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index bf840c65436f..1eea1a49101f 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -227,7 +227,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\ProgID";
-    Value = "opendocument.MathDocument.1";
+    Value = "LibreOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Programmable
@@ -261,7 +261,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\VersionIndependentProgID";
-    Value = "opendocument.MathDocument.1";
+    Value = "LibreOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6
@@ -490,7 +490,7 @@ End
 RegistryItem gid_Regitem_MathDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.MathDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -514,7 +514,7 @@ RegistryItem gid_Regitem__Odf
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = ".odf";
-    Value = "opendocument.MathDocument.1";
+    Value = "LibreOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odf
@@ -522,7 +522,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Math_Bin;
     Name = ".odf";
-    Value = "opendocument.MathDocument.1";
+    Value = "LibreOffice.MathDocument.1";
     Styles = ();
 End
 
@@ -531,35 +531,35 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
     ModuleID = gid_Module_Prg_Math_Bin;
     Name = "application/vnd.oasis.opendocument.formula";
-    Value = "opendocument.MathDocument.1";
+    Value = "LibreOffice.MathDocument.1";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.MathDocument\CurVer";
+    Subkey = "LibreOffice.MathDocument\CurVer";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Value = "opendocument.MathDocument.1";
+    Value = "LibreOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1";
+    Subkey = "LibreOffice.MathDocument.1";
     REG_VALUE_LNG(OO_FORMULA)
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\CLSID";
+    Subkey = "LibreOffice.MathDocument.1\CLSID";
     Value = "{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.MathDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,12";
 End
 
@@ -567,7 +567,7 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.MathDocument.1";
+    Subkey = "LibreOffice.MathDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Math";
 End
@@ -575,7 +575,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1";
+    Subkey = "LibreOffice.MathDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_FORMULA)
 End
@@ -584,7 +584,7 @@ End
 RegistryItem gid_Regitem_odf_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.MathDocument.1";
+    Subkey = "LibreOffice.MathDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -602,62 +602,62 @@ End
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\Insertable";
+    Subkey = "LibreOffice.MathDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\protocol\StdFileEditing\server";
+    Subkey = "LibreOffice.MathDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell";
+    Subkey = "LibreOffice.MathDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\new";
+    Subkey = "LibreOffice.MathDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\new\command";
+    Subkey = "LibreOffice.MathDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\open\command";
+    Subkey = "LibreOffice.MathDocument.1\shell\open\command";
     Value = "\"<progpath>\program\smath.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -665,14 +665,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\print\command";
+    Subkey = "LibreOffice.MathDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\printto\command";
+    Subkey = "LibreOffice.MathDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -683,7 +683,7 @@ RegistryItem gid_Regitem_OpenOffice_ODF_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "opendocument.MathDocument.1";
+    Name = "LibreOffice.MathDocument.1";
     Value = " ";
 End
 
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 791169170604..f29b5cb5a8cf 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -228,7 +228,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\ProgID";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Programmable
@@ -262,7 +262,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\VersionIndependentProgID";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
@@ -776,7 +776,7 @@ End
 RegistryItem gid_Regitem_WriterDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -784,7 +784,7 @@ RegistryItem gid_Regitem__Odt
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".odt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odt
@@ -792,7 +792,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
     Styles = ();
 End
 
@@ -801,7 +801,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = "application/vnd.oasis.opendocument.text";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
     Styles = ();
 End
 
@@ -824,7 +824,7 @@ End
 RegistryItem gid_Regitem_Odt_Openoffice_Writerdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt\opendocument.WriterDocument.1\ShellNew";
+    Subkey = ".odt\LibreOffice.WriterDocument.1\ShellNew";
     Name = "FileName";
     Value = "soffice.odt";
 End
@@ -832,28 +832,28 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument\CurVer";
-    Value = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument\CurVer";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument.1";
     REG_VALUE_LNG(OO_WRITER)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\CLSID";
+    Subkey = "LibreOffice.WriterDocument.1\CLSID";
     Value = "{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.WriterDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,1";
 End
 
@@ -861,7 +861,7 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
 End
@@ -869,7 +869,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WRITER)
 End
@@ -877,14 +877,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\Insertable";
+    Subkey = "LibreOffice.WriterDocument.1\Insertable";
 End
 
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odt_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -902,56 +902,56 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\server";
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell";
+    Subkey = "LibreOffice.WriterDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\new";
+    Subkey = "LibreOffice.WriterDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\new\command";
+    Subkey = "LibreOffice.WriterDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\open\command";
+    Subkey = "LibreOffice.WriterDocument.1\shell\open\command";
     Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -959,14 +959,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\print\command";
+    Subkey = "LibreOffice.WriterDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\printto\command";
+    Subkey = "LibreOffice.WriterDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -974,21 +974,21 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerwebdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument\CurVer";
-    Value = "opendocument.WriterWebDocument.1";
+    Subkey = "LibreOffice.WriterWebDocument\CurVer";
+    Value = "LibreOffice.WriterWebDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument.1";
+    Subkey = "LibreOffice.WriterWebDocument.1";
     REG_VALUE_LNG(OO_WRITER)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument.1\shell\open\command";
+    Subkey = "LibreOffice.WriterWebDocument.1\shell\open\command";
     Value = "\"<progpath>\program\sweb.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -1020,7 +1020,7 @@ RegistryItem gid_Regitem__Fodt
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".fodt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodt
@@ -1028,7 +1028,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fodt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
     Styles = (PATCH);
 End
 
@@ -1075,7 +1075,7 @@ End
 RegistryItem gid_Regitem_WriterTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1083,7 +1083,7 @@ RegistryItem gid_Regitem_Ott
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterTemplate.1";
+    Value = "LibreOffice.WriterTemplate.1";
 End
 
 RegistryItem gid_Regitem_Ott_Contenttype
@@ -1096,14 +1096,14 @@ End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1";
+    Subkey = "LibreOffice.WriterTemplate.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_WRITER_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\DefaultIcon";
+    Subkey = "LibreOffice.WriterTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,2";
 End
@@ -1112,7 +1112,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.WriterTemplate.1";
+    Subkey = "LibreOffice.WriterTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
 End
@@ -1120,7 +1120,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1";
+    Subkey = "LibreOffice.WriterTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WRITER_TEMPLATE)
 End
@@ -1129,7 +1129,7 @@ End
 RegistryItem gid_Regitem_ott_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterTemplate.1";
+    Subkey = "LibreOffice.WriterTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -1147,41 +1147,41 @@ End
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell";
+    Subkey = "LibreOffice.WriterTemplate.1\shell";
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell\new";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell\new\command";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\open\command";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\print\command";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\printto\command";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1212,7 +1212,7 @@ End
 RegistryItem gid_Regitem_WriterGlobalDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1220,7 +1220,7 @@ RegistryItem gid_Regitem_Odm
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".odm";
-    Value = "opendocument.WriterGlobalDocument.1";
+    Value = "LibreOffice.WriterGlobalDocument.1";
 End
 
 RegistryItem gid_Regitem_Odm_Contenttype
@@ -1241,21 +1241,21 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument\CurVer";
+    Subkey = "LibreOffice.WriterGlobalDocument\CurVer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterGlobalDocument.1";
+    Value = "LibreOffice.WriterGlobalDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_MASTERDOC)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,9";
 End
@@ -1264,7 +1264,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.WriterGlobalDocument.1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
 End
@@ -1272,7 +1272,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterGlobalDocument.1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_MASTERDOC)
 End
@@ -1281,7 +1281,7 @@ End
 RegistryItem gid_Regitem_odm_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterGlobalDocument.1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -1298,42 +1298,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\new";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\new";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\new\command";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\new\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\open\command";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\print\command";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\printto\command";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1364,7 +1364,7 @@ End
 RegistryItem gid_Regitem_WriterWebTemplate_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1372,7 +1372,7 @@ RegistryItem gid_Regitem_Oth
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".oth";
-    Value = "opendocument.WriterWebTemplate.1";
+    Value = "LibreOffice.WriterWebTemplate.1";
 End
 
 RegistryItem gid_Regitem_Oth_Contenttype
@@ -1393,21 +1393,21 @@ End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate\CurVer";
+    Subkey = "LibreOffice.WriterWebTemplate\CurVer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterWebTemplate.1";
+    Value = "LibreOffice.WriterWebTemplate.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1";
+    Subkey = "LibreOffice.WriterWebTemplate.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_WEBDOC)
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\DefaultIcon";
+    Subkey = "LibreOffice.WriterWebTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,10";
 End
@@ -1416,7 +1416,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.WriterWebTemplate.1";
+    Subkey = "LibreOffice.WriterWebTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
 End
@@ -1424,49 +1424,49 @@ End
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebTemplate.1";
+    Subkey = "LibreOffice.WriterWebTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WEBDOC)
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\new";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\new\command";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\open\command";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\print\command";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\printto\command";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1475,7 +1475,7 @@ End
 RegistryItem gid_Regitem_oth_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterWebTemplate.1";
+    Subkey = "LibreOffice.WriterWebTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -1497,7 +1497,7 @@ RegistryItem gid_Regitem_OpenOffice_ODT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "LibreOffice.WriterDocument.1";
     Value = " ";
 End
 
@@ -1506,7 +1506,7 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterTemplate.1";
+    Name = "LibreOffice.WriterTemplate.1";
     Value = " ";
 End
 
@@ -1515,7 +1515,7 @@ RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".oth\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebTemplate.1";
+    Name = "LibreOffice.WriterWebTemplate.1";
     Value = " ";
 End
 
@@ -1524,7 +1524,7 @@ RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterGlobalDocument.1";
+    Name = "LibreOffice.WriterGlobalDocument.1";
     Value = " ";
 End
 
@@ -1596,7 +1596,7 @@ RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wps\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "LibreOffice.WriterDocument.1";
     Value = " ";
 End
 
@@ -1624,7 +1624,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".ott";
-    Value = "opendocument.WriterTemplate.1";
+    Value = "LibreOffice.WriterTemplate.1";
     Styles = ();
 End
 
@@ -1705,7 +1705,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".oth";
-    Value = "opendocument.WriterWebTemplate.1";
+    Value = "LibreOffice.WriterWebTemplate.1";
     Styles = ();
 End
 
@@ -1714,7 +1714,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odm";
-    Value = "opendocument.WriterGlobalDocument.1";
+    Value = "LibreOffice.WriterGlobalDocument.1";
     Styles = ();
 End