[cp] Collabora Office branding

Change-Id: I694d9a6c508853d2d980f76cc259ce1e39149da4

14 files changed, 301 insertions, 301 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8f507c510346..dbdc45786cc5 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -240,7 +240,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(LibreOffice.,name)); \
+        Name = STRING(CONCAT2(CollaboraOffice.,name)); \
         Value = " "; \
     End
 
@@ -249,7 +249,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(LibreOffice.,name)); \
+        Name = STRING(CONCAT2(CollaboraOffice.,name)); \
         Value = " "; \
     End
 
@@ -258,7 +258,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = gid_Module_Root_Reg_##name; \
         Subkey = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(LibreOffice.,name)); \
+        Value = STRING(CONCAT2(CollaboraOffice.,name)); \
         ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
@@ -276,7 +276,7 @@ End
     RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT2(LibreOffice.,name)); \
+        Subkey = STRING(CONCAT2(CollaboraOffice.,name)); \
         REG_VALUE_LNG(disp_name) \
     End
 
@@ -284,16 +284,16 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT2(LibreOffice.,name)); \
+        Subkey = STRING(CONCAT2(CollaboraOffice.,name)); \
         Name = STRING(AppUserModelID); \
-        Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \
+        Value = STRING(CONCAT2(Collabora.CollaboraOffice.,doc_type)); \
     End
 
 #define REGISTRY_ENTRY_ICON(name,modid,icon_id) \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\DefaultIcon)); \
+        Subkey = STRING(CONCAT3(CollaboraOffice.,name,\DefaultIcon)); \
         Value = "<progpath>\program\soffice.bin," STRING(icon_id); \
     End
 
@@ -301,7 +301,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell)); \
+        Subkey = STRING(CONCAT3(CollaboraOffice.,name,\shell)); \
         Value = STRING(default); \
     End
 
@@ -309,13 +309,13 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new)); \
+        Subkey = STRING(CONCAT3(CollaboraOffice.,name,\shell\new)); \
         REG_VALUE_LNG(NEW) \
     End \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \
+        Subkey = STRING(CONCAT3(CollaboraOffice.,name,\shell\new\command)); \
         Value = "\"" STRING(progpath_program_app) "\" -n \"%1\""; \
     End
 
@@ -326,7 +326,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \
+        Subkey = STRING(CONCAT3(CollaboraOffice.,name,\shell\open\command)); \
         Value = "\"" STRING(progpath_program_app) "\" -o \"%1\""; \
     End
 
@@ -337,7 +337,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \
+        Subkey = STRING(CONCAT3(CollaboraOffice.,name,\shell\print\command)); \
         Value = "\"" STRING(progpath_program_app) "\" -p \"%1\""; \
     End
 
@@ -348,7 +348,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \
+        Subkey = STRING(CONCAT3(CollaboraOffice.,name,\shell\printto\command)); \
         Value = "\"" STRING(progpath_program_app) "\" -pt \"%2\" \"%1\""; \
     End
 
@@ -361,7 +361,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(LibreOffice.,name)); \
+        Value = STRING(CONCAT2(CollaboraOffice.,name)); \
         Styles = (); \
     End
 
@@ -371,7 +371,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(LibreOffice.,name)); \
+        Value = STRING(CONCAT2(CollaboraOffice.,name)); \
         Styles = (); \
     End
 
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index 75e1d5d05b01..577566ce895f 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -35,6 +35,6 @@ End
 FolderItemProperty gid_Fip_Sbase_AppID
     ShortcutID = gid_Folderitem_Sbase;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.Base";
+    Value = "Collabora.CollaboraOffice.Base";
 End
 #endif
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index ee7932ccd451..db8f1ded0cd3 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -24,7 +24,7 @@ RegistryItem gid_Regitem_Odb
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odb";
     ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "LibreOffice.DatabaseDocument.1";
+    Value = "CollaboraOffice.DatabaseDocument.1";
 End
 
 RegistryItem gid_Regitem_Odb_PersistentHandler
@@ -44,7 +44,7 @@ End
 RegistryItem gid_Regitem_DatabaseDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = "LibreOffice.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -66,14 +66,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.DatabaseDocument.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DatabaseDocument.1\DefaultIcon";
+    Subkey = "CollaboraOffice.DatabaseDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Base_Bin;
     Value = "<progpath>\program\soffice.bin,11";
 End
@@ -81,15 +81,15 @@ End
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = "LibreOffice.DatabaseDocument.1";
+    Subkey = "CollaboraOffice.DatabaseDocument.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Base";
+    Value = "Collabora.CollaboraOffice.Base";
 End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = "LibreOffice.DatabaseDocument.1";
+    Subkey = "CollaboraOffice.DatabaseDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_DATABASE)
 End
@@ -98,7 +98,7 @@ End
 RegistryItem gid_Regitem_odb_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.DatabaseDocument.1";
+    Subkey = "CollaboraOffice.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
@@ -114,21 +114,21 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.DatabaseDocument.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DatabaseDocument.1\shell\open\command";
+//     Subkey = "CollaboraOffice.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 = "LibreOffice.DatabaseDocument.1\shell\open\command";
+    Subkey = "CollaboraOffice.DatabaseDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Base_Bin;
     Value = "\"<progpath>\program\sbase.exe\" -o \"%1\"";
     Styles = ();
@@ -140,7 +140,7 @@ RegistryItem gid_Regitem_OpenOffice_ODB_OpenWith_Database
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odb\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Base_Bin;
-    Name = "LibreOffice.DatabaseDocument.1";
+    Name = "CollaboraOffice.DatabaseDocument.1";
     Value = " ";
 End
 
@@ -149,7 +149,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 = "LibreOffice.DatabaseDocument.1";
+    Value = "CollaboraOffice.DatabaseDocument.1";
     Styles = ();
 End
 
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index a41ade695864..60273601be89 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -35,6 +35,6 @@ End
 FolderItemProperty gid_Fip_Scalc_AppID
     ShortcutID = gid_Folderitem_Scalc;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.Calc";
+    Value = "Collabora.CollaboraOffice.Calc";
 End
 #endif
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index b6cf9c3df5c3..424a4ff8f396 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -219,7 +219,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 = "LibreOffice.CalcDocument.1";
+    Value = "CollaboraOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Programmable
@@ -253,7 +253,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 = "LibreOffice.CalcDocument.1";
+    Value = "CollaboraOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
@@ -282,7 +282,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_AppUserModelID
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "soffice.StarCalcDocument.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Calc";
+    Value = "Collabora.CollaboraOffice.Calc";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_FriendlyTypeName
@@ -395,7 +395,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_AppUserModelID
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "soffice.StarCalcTemplate.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Calc";
+    Value = "Collabora.CollaboraOffice.Calc";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_FriendlyTypeName
@@ -614,7 +614,7 @@ End
 RegistryItem gid_Regitem_CalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -622,7 +622,7 @@ RegistryItem gid_Regitem__Ods
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".ods";
-    Value = "LibreOffice.CalcDocument.1";
+    Value = "CollaboraOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_ods
@@ -630,7 +630,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 = "LibreOffice.CalcDocument.1";
+    Value = "CollaboraOffice.CalcDocument.1";
     Styles = ();
 End
 
@@ -639,7 +639,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 = "LibreOffice.CalcDocument.1";
+    Value = "CollaboraOffice.CalcDocument.1";
     Styles = ();
 End
 
@@ -662,7 +662,7 @@ End
 RegistryItem gid_Regitem_Ods_Openoffice_Calcdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods\LibreOffice.CalcDocument.1\ShellNew";
+    Subkey = ".ods\CollaboraOffice.CalcDocument.1\ShellNew";
     Name = "FileName";
     Value = "<progpath>\share\template\shellnew\soffice.ods";
 End
@@ -670,43 +670,43 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcDocument\CurVer";
-    Value = "LibreOffice.CalcDocument.1";
+    Subkey = "CollaboraOffice.CalcDocument\CurVer";
+    Value = "CollaboraOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcDocument.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\CLSID";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\DefaultIcon";
+    Subkey = "CollaboraOffice.CalcDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,3";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcDocument.1";
+    Subkey = "CollaboraOffice.CalcDocument.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Calc";
+    Value = "Collabora.CollaboraOffice.Calc";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcDocument.1";
+    Subkey = "CollaboraOffice.CalcDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_CALC)
 End
@@ -715,7 +715,7 @@ End
 RegistryItem gid_Regitem_ods_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.CalcDocument.1";
+    Subkey = "CollaboraOffice.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
@@ -732,62 +732,62 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcDocument.1\Insertable";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\shell\open\command";
+    Subkey = "CollaboraOffice.CalcDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -795,14 +795,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcDocument.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcDocument.1\shell\printto\command";
+    Subkey = "CollaboraOffice.CalcDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -827,7 +827,7 @@ RegistryItem gid_Regitem__Fods
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".fods";
-    Value = "LibreOffice.CalcDocument.1";
+    Value = "CollaboraOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fods
@@ -835,7 +835,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fods";
-    Value = "LibreOffice.CalcDocument.1";
+    Value = "CollaboraOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Fods_Contenttype
@@ -880,7 +880,7 @@ End
 RegistryItem gid_Regitem_CalcTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -888,7 +888,7 @@ RegistryItem gid_Regitem_Ots
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "LibreOffice.CalcTemplate.1";
+    Value = "CollaboraOffice.CalcTemplate.1";
 End
 
 RegistryItem gid_Regitem_Ots_Contenttype
@@ -901,14 +901,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.CalcTemplate.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcTemplate.1\DefaultIcon";
+    Subkey = "CollaboraOffice.CalcTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "<progpath>\program\soffice.bin,4";
 End
@@ -916,15 +916,15 @@ End
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcTemplate.1";
+    Subkey = "CollaboraOffice.CalcTemplate.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Calc";
+    Value = "Collabora.CollaboraOffice.Calc";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "LibreOffice.CalcTemplate.1";
+    Subkey = "CollaboraOffice.CalcTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_CALC_TEMPLATE)
 End
@@ -933,7 +933,7 @@ End
 RegistryItem gid_Regitem_ots_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.CalcTemplate.1";
+    Subkey = "CollaboraOffice.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
@@ -949,42 +949,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.CalcTemplate.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcTemplate.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcTemplate.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcTemplate.1\shell\open\command";
+    Subkey = "CollaboraOffice.CalcTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.CalcTemplate.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.CalcTemplate.1\shell\printto\command";
+    Subkey = "CollaboraOffice.CalcTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -996,7 +996,7 @@ RegistryItem gid_Regitem_OpenOffice_ODS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ods\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "LibreOffice.CalcDocument.1";
+    Name = "CollaboraOffice.CalcDocument.1";
     Value = " ";
 End
 
@@ -1005,7 +1005,7 @@ RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "LibreOffice.CalcTemplate.1";
+    Name = "CollaboraOffice.CalcTemplate.1";
     Value = " ";
 End
 
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 5dc8757e96f3..d9bf7bcffd77 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -35,6 +35,6 @@ End
 FolderItemProperty gid_Fip_Sdraw_AppID
     ShortcutID = gid_Folderitem_Sdraw;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.Draw";
+    Value = "Collabora.CollaboraOffice.Draw";
 End
 #endif
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 515b55fb58f7..99bc96399805 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -219,7 +219,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 = "LibreOffice.DrawDocument.1";
+    Value = "CollaboraOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Programmable
@@ -253,7 +253,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 = "LibreOffice.DrawDocument.1";
+    Value = "CollaboraOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
@@ -282,7 +282,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_AppUserModelID
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "soffice.StarDrawDocument.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Draw";
+    Value = "Collabora.CollaboraOffice.Draw";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_FriendlyTypeName
@@ -395,7 +395,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_AppUserModelID
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "soffice.StarDrawTemplate.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Draw";
+    Value = "Collabora.CollaboraOffice.Draw";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_FriendlyTypeName
@@ -613,7 +613,7 @@ End
 RegistryItem gid_Regitem_DrawDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -637,7 +637,7 @@ RegistryItem gid_Regitem__Odg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = ".odg";
-    Value = "LibreOffice.DrawDocument.1";
+    Value = "CollaboraOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odg
@@ -645,7 +645,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 = "LibreOffice.DrawDocument.1";
+    Value = "CollaboraOffice.DrawDocument.1";
     Styles = ();
 End
 
@@ -654,58 +654,58 @@ 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 = "LibreOffice.DrawDocument.1";
+    Value = "CollaboraOffice.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\LibreOffice.DrawDocument.1\ShellNew";
+    Subkey = ".odg\CollaboraOffice.DrawDocument.1\ShellNew";
     Name = "FileName";
     Value = "<progpath>\share\template\shellnew\soffice.odg";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.DrawDocument\CurVer";
+    Subkey = "CollaboraOffice.DrawDocument\CurVer";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "LibreOffice.DrawDocument.1";
+    Value = "CollaboraOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawDocument.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\CLSID";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\DefaultIcon";
+    Subkey = "CollaboraOffice.DrawDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,5";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawDocument.1";
+    Subkey = "CollaboraOffice.DrawDocument.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Draw";
+    Value = "Collabora.CollaboraOffice.Draw";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawDocument.1";
+    Subkey = "CollaboraOffice.DrawDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_DRAW)
 End
@@ -714,7 +714,7 @@ End
 RegistryItem gid_Regitem_odg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.DrawDocument.1";
+    Subkey = "CollaboraOffice.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
@@ -731,28 +731,28 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawDocument.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\shell\open\command";
+    Subkey = "CollaboraOffice.DrawDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -760,48 +760,48 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawDocument.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\shell\printto\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\Insertable";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "CollaboraOffice.DrawDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
@@ -819,7 +819,7 @@ RegistryItem gid_Regitem__Fodg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = ".fodg";
-    Value = "LibreOffice.DrawDocument.1";
+    Value = "CollaboraOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodg
@@ -827,7 +827,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fodg";
-    Value = "LibreOffice.DrawDocument.1";
+    Value = "CollaboraOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_fodg_KindMap
@@ -864,7 +864,7 @@ End
 RegistryItem gid_Regitem_DrawTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -872,7 +872,7 @@ RegistryItem gid_Regitem_Otg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otg";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "LibreOffice.DrawTemplate.1";
+    Value = "CollaboraOffice.DrawTemplate.1";
 End
 
 RegistryItem gid_Regitem_Otg_Contenttype
@@ -885,14 +885,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.DrawTemplate.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawTemplate.1\DefaultIcon";
+    Subkey = "CollaboraOffice.DrawTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "<progpath>\program\soffice.bin,6";
 End
@@ -900,15 +900,15 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawTemplate.1";
+    Subkey = "CollaboraOffice.DrawTemplate.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Draw";
+    Value = "Collabora.CollaboraOffice.Draw";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "LibreOffice.DrawTemplate.1";
+    Subkey = "CollaboraOffice.DrawTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_DRAW_TEMPLATE)
 End
@@ -917,7 +917,7 @@ End
 RegistryItem gid_Regitem_otg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.DrawTemplate.1";
+    Subkey = "CollaboraOffice.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
@@ -933,42 +933,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.DrawTemplate.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawTemplate.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawTemplate.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawTemplate.1\shell\open\command";
+    Subkey = "CollaboraOffice.DrawTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.DrawTemplate.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.DrawTemplate.1\shell\printto\command";
+    Subkey = "CollaboraOffice.DrawTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -980,7 +980,7 @@ RegistryItem gid_Regitem_OpenOffice_ODG_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "LibreOffice.DrawDocument.1";
+    Name = "CollaboraOffice.DrawDocument.1";
     Value = " ";
 End
 
@@ -989,7 +989,7 @@ RegistryItem gid_Regitem_OpenOffice_OTG_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "LibreOffice.DrawTemplate.1";
+    Name = "CollaboraOffice.DrawTemplate.1";
     Value = " ";
 End
 
@@ -1017,7 +1017,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 = "LibreOffice.DrawTemplate.1";
+    Value = "CollaboraOffice.DrawTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index c35221b533b4..ce470edb211a 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -35,6 +35,6 @@ End
 FolderItemProperty gid_Fip_Simpress_AppID
     ShortcutID = gid_Folderitem_Simpress;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.Impress";
+    Value = "Collabora.CollaboraOffice.Impress";
 End
 #endif
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index c0b173dc2f04..39656bce1a8c 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -219,7 +219,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 = "LibreOffice.ImpressDocument.1";
+    Value = "CollaboraOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Programmable
@@ -253,7 +253,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 = "LibreOffice.ImpressDocument.1";
+    Value = "CollaboraOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
@@ -282,7 +282,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_AppUserModelID
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "soffice.StarImpressDocument.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Impress";
+    Value = "Collabora.CollaboraOffice.Impress";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_FriendlyTypeName
@@ -409,7 +409,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_AppUserModelID
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "soffice.StarImpressTemplate.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Impress";
+    Value = "Collabora.CollaboraOffice.Impress";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_FriendlyTypeName
@@ -627,7 +627,7 @@ End
 RegistryItem gid_Regitem_ImpressDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -635,7 +635,7 @@ RegistryItem gid_Regitem__Odp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = ".odp";
-    Value = "LibreOffice.ImpressDocument.1";
+    Value = "CollaboraOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odp
@@ -643,7 +643,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 = "LibreOffice.ImpressDocument.1";
+    Value = "CollaboraOffice.ImpressDocument.1";
     Styles = ();
 End
 
@@ -652,7 +652,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 = "LibreOffice.ImpressDocument.1";
+    Value = "CollaboraOffice.ImpressDocument.1";
     Styles = ();
 End
 
@@ -676,7 +676,7 @@ End
 RegistryItem gid_Regitem_Odp_Openoffice_Impressdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".odp\LibreOffice.ImpressDocument.1\ShellNew";
+    Subkey = ".odp\CollaboraOffice.ImpressDocument.1\ShellNew";
     Name = "FileName";
     Value = "<progpath>\share\template\shellnew\soffice.odp";
 End
@@ -685,42 +685,42 @@ RegistryItem gid_Regitem_Openoffice_Starimpressdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressDocument\CurVer";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "LibreOffice.ImpressDocument.1";
+    Value = "CollaboraOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressDocument.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\CLSID";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\DefaultIcon";
+    Subkey = "CollaboraOffice.ImpressDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,7";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressDocument.1";
+    Subkey = "CollaboraOffice.ImpressDocument.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Impress";
+    Value = "Collabora.CollaboraOffice.Impress";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressDocument.1";
+    Subkey = "CollaboraOffice.ImpressDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_PRESENT)
 End
@@ -729,7 +729,7 @@ End
 RegistryItem gid_Regitem_odp_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.ImpressDocument.1";
+    Subkey = "CollaboraOffice.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
@@ -746,62 +746,62 @@ End
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressDocument.1\Insertable";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\shell\open\command";
+    Subkey = "CollaboraOffice.ImpressDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -809,28 +809,28 @@ End
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressDocument.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\shell\printto\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\shell\show";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressDocument.1\shell\show\command";
+    Subkey = "CollaboraOffice.ImpressDocument.1\shell\show\command";
     Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
 End
 
@@ -840,7 +840,7 @@ RegistryItem gid_Regitem__Fodp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = ".fodp";
-    Value = "LibreOffice.ImpressDocument.1";
+    Value = "CollaboraOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodp
@@ -848,7 +848,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fodp";
-    Value = "LibreOffice.ImpressDocument.1";
+    Value = "CollaboraOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Fodp_Contenttype
@@ -893,7 +893,7 @@ End
 RegistryItem gid_Regitem_ImpressTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -901,7 +901,7 @@ RegistryItem gid_Regitem_Otp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otp";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "LibreOffice.ImpressTemplate.1";
+    Value = "CollaboraOffice.ImpressTemplate.1";
 End
 
 RegistryItem gid_Regitem_Otp_Contenttype
@@ -914,14 +914,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.ImpressTemplate.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressTemplate.1\DefaultIcon";
+    Subkey = "CollaboraOffice.ImpressTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "<progpath>\program\soffice.bin,8";
 End
@@ -929,15 +929,15 @@ End
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressTemplate.1";
+    Subkey = "CollaboraOffice.ImpressTemplate.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Impress";
+    Value = "Collabora.CollaboraOffice.Impress";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "LibreOffice.ImpressTemplate.1";
+    Subkey = "CollaboraOffice.ImpressTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_PRESENT_TEMPLATE)
 End
@@ -946,7 +946,7 @@ End
 RegistryItem gid_Regitem_otp_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.ImpressTemplate.1";
+    Subkey = "CollaboraOffice.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
@@ -962,42 +962,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.ImpressTemplate.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressTemplate.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressTemplate.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressTemplate.1\shell\open\command";
+    Subkey = "CollaboraOffice.ImpressTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.ImpressTemplate.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.ImpressTemplate.1\shell\printto\command";
+    Subkey = "CollaboraOffice.ImpressTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1009,7 +1009,7 @@ RegistryItem gid_Regitem_OpenOffice_ODP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "LibreOffice.ImpressDocument.1";
+    Name = "CollaboraOffice.ImpressDocument.1";
     Value = " ";
 End
 
@@ -1018,7 +1018,7 @@ RegistryItem gid_Regitem_OpenOffice_OTP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "LibreOffice.ImpressTemplate.1";
+    Name = "CollaboraOffice.ImpressTemplate.1";
     Value = " ";
 End
 
@@ -1054,7 +1054,7 @@ RegistryItem gid_Regitem_OpenOffice_ODG_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "LibreOffice.ImpressDocument.1";
+    Name = "CollaboraOffice.ImpressDocument.1";
     Value = " ";
 End
 
@@ -1064,7 +1064,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 = "LibreOffice.ImpressTemplate.1";
+    Value = "CollaboraOffice.ImpressTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index 44ddc078e47b..cdc4d1fb3a54 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -35,6 +35,6 @@ End
 FolderItemProperty gid_Fip_Smath_AppID
     ShortcutID = gid_Folderitem_Smath;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.Math";
+    Value = "Collabora.CollaboraOffice.Math";
 End
 #endif
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index bf59735883d9..e629c08d5255 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -218,7 +218,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 = "LibreOffice.MathDocument.1";
+    Value = "CollaboraOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Programmable
@@ -252,7 +252,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 = "LibreOffice.MathDocument.1";
+    Value = "CollaboraOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6
@@ -281,7 +281,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_AppUserModelID
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "soffice.StarMathDocument.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Math";
+    Value = "Collabora.CollaboraOffice.Math";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_FriendlyTypeName
@@ -479,7 +479,7 @@ End
 RegistryItem gid_Regitem_MathDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "LibreOffice.MathDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.MathDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -503,7 +503,7 @@ RegistryItem gid_Regitem__Odf
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = ".odf";
-    Value = "LibreOffice.MathDocument.1";
+    Value = "CollaboraOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odf
@@ -511,7 +511,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 = "LibreOffice.MathDocument.1";
+    Value = "CollaboraOffice.MathDocument.1";
     Styles = ();
 End
 
@@ -520,50 +520,50 @@ 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 = "LibreOffice.MathDocument.1";
+    Value = "CollaboraOffice.MathDocument.1";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.MathDocument\CurVer";
+    Subkey = "CollaboraOffice.MathDocument\CurVer";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Value = "LibreOffice.MathDocument.1";
+    Value = "CollaboraOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "LibreOffice.MathDocument.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\CLSID";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\DefaultIcon";
+    Subkey = "CollaboraOffice.MathDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,12";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "LibreOffice.MathDocument.1";
+    Subkey = "CollaboraOffice.MathDocument.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Math";
+    Value = "Collabora.CollaboraOffice.Math";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "LibreOffice.MathDocument.1";
+    Subkey = "CollaboraOffice.MathDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_FORMULA)
 End
@@ -572,7 +572,7 @@ End
 RegistryItem gid_Regitem_odf_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.MathDocument.1";
+    Subkey = "CollaboraOffice.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
@@ -589,62 +589,62 @@ End
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "LibreOffice.MathDocument.1\Insertable";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\shell\open\command";
+    Subkey = "CollaboraOffice.MathDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -652,14 +652,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "LibreOffice.MathDocument.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.MathDocument.1\shell\printto\command";
+    Subkey = "CollaboraOffice.MathDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -670,7 +670,7 @@ RegistryItem gid_Regitem_OpenOffice_ODF_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "LibreOffice.MathDocument.1";
+    Name = "CollaboraOffice.MathDocument.1";
     Value = " ";
 End
 
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index a9f68ffd3dea..183d2f6c04be 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -38,7 +38,7 @@ End
 FolderItemProperty gid_Fip_LibreOffice_AppID
     ShortcutID = gid_Folderitem_LibreOffice;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.Startcenter";
+    Value = "Collabora.CollaboraOffice.Startcenter";
 End
 
 FolderItem gid_Folderitem_Soffice_Desktop
@@ -63,7 +63,7 @@ End
 FolderItemProperty gid_Fip_Soffice_Desktop_AppID
     ShortcutID = gid_Folderitem_Soffice_Desktop;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.Startcenter";
+    Value = "Collabora.CollaboraOffice.Startcenter";
 End
 
 FolderItem gid_Folderitem_LibreOffice_SafeMode
@@ -86,5 +86,5 @@ End
 FolderItemProperty gid_Fip_LibreOffice_SafeMode
     ShortcutID = gid_Folderitem_LibreOffice_SafeMode;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.SafeMode";
+    Value = "Collabora.CollaboraOffice.SafeMode";
 End
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index 306fc888d230..20dce0b2f05f 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -35,6 +35,6 @@ End
 FolderItemProperty gid_Fip_Swriter_AppID
     ShortcutID = gid_Folderitem_Swriter;
     Key = "System.AppUserModel.ID";
-    Value = "TheDocumentFoundation.LibreOffice.Writer";
+    Value = "Collabora.CollaboraOffice.Writer";
 End
 #endif
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index e8b931314a90..28cb146f3646 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -219,7 +219,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 = "LibreOffice.WriterDocument.1";
+    Value = "CollaboraOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Programmable
@@ -253,7 +253,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 = "LibreOffice.WriterDocument.1";
+    Value = "CollaboraOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
@@ -282,7 +282,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_AppUserModelID
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterDocument.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Writer";
+    Value = "Collabora.CollaboraOffice.Writer";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_FriendlyTypeName
@@ -402,7 +402,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_AppUserModelID
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterGlobalDocument.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Writer";
+    Value = "Collabora.CollaboraOffice.Writer";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_FriendlyTypeName
@@ -488,7 +488,7 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_AppUserModelID
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterTemplate.6";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Writer";
+    Value = "Collabora.CollaboraOffice.Writer";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_FriendlyTypeName
@@ -761,7 +761,7 @@ End
 RegistryItem gid_Regitem_WriterDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -769,7 +769,7 @@ RegistryItem gid_Regitem__Odt
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".odt";
-    Value = "LibreOffice.WriterDocument.1";
+    Value = "CollaboraOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odt
@@ -777,7 +777,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 = "LibreOffice.WriterDocument.1";
+    Value = "CollaboraOffice.WriterDocument.1";
     Styles = ();
 End
 
@@ -786,7 +786,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 = "LibreOffice.WriterDocument.1";
+    Value = "CollaboraOffice.WriterDocument.1";
     Styles = ();
 End
 
@@ -809,7 +809,7 @@ End
 RegistryItem gid_Regitem_Odt_Openoffice_Writerdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt\LibreOffice.WriterDocument.1\ShellNew";
+    Subkey = ".odt\CollaboraOffice.WriterDocument.1\ShellNew";
     Name = "FileName";
     Value = "<progpath>\share\template\shellnew\soffice.odt";
 End
@@ -817,43 +817,43 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterDocument\CurVer";
-    Value = "LibreOffice.WriterDocument.1";
+    Subkey = "CollaboraOffice.WriterDocument\CurVer";
+    Value = "CollaboraOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterDocument.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\CLSID";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\DefaultIcon";
+    Subkey = "CollaboraOffice.WriterDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterDocument.1";
+    Subkey = "CollaboraOffice.WriterDocument.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Writer";
+    Value = "Collabora.CollaboraOffice.Writer";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterDocument.1";
+    Subkey = "CollaboraOffice.WriterDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WRITER)
 End
@@ -861,14 +861,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterDocument.1\Insertable";
+    Subkey = "CollaboraOffice.WriterDocument.1\Insertable";
 End
 
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odt_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.WriterDocument.1";
+    Subkey = "CollaboraOffice.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
@@ -885,56 +885,56 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\shell\open\command";
+    Subkey = "CollaboraOffice.WriterDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -942,14 +942,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterDocument.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterDocument.1\shell\printto\command";
+    Subkey = "CollaboraOffice.WriterDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -957,21 +957,21 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerwebdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterWebDocument\CurVer";
-    Value = "LibreOffice.WriterWebDocument.1";
+    Subkey = "CollaboraOffice.WriterWebDocument\CurVer";
+    Value = "CollaboraOffice.WriterWebDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterWebDocument.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterWebDocument.1\shell\open\command";
+    Subkey = "CollaboraOffice.WriterWebDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -997,7 +997,7 @@ RegistryItem gid_Regitem__Fodt
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".fodt";
-    Value = "LibreOffice.WriterDocument.1";
+    Value = "CollaboraOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodt
@@ -1005,7 +1005,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fodt";
-    Value = "LibreOffice.WriterDocument.1";
+    Value = "CollaboraOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Fodt_Contenttype
@@ -1050,7 +1050,7 @@ End
 RegistryItem gid_Regitem_WriterTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1058,7 +1058,7 @@ RegistryItem gid_Regitem_Ott
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "LibreOffice.WriterTemplate.1";
+    Value = "CollaboraOffice.WriterTemplate.1";
 End
 
 RegistryItem gid_Regitem_Ott_Contenttype
@@ -1079,14 +1079,14 @@ End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterTemplate.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterTemplate.1\DefaultIcon";
+    Subkey = "CollaboraOffice.WriterTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,2";
 End
@@ -1094,15 +1094,15 @@ End
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterTemplate.1";
+    Subkey = "CollaboraOffice.WriterTemplate.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Writer";
+    Value = "Collabora.CollaboraOffice.Writer";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterTemplate.1";
+    Subkey = "CollaboraOffice.WriterTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WRITER_TEMPLATE)
 End
@@ -1111,7 +1111,7 @@ End
 RegistryItem gid_Regitem_ott_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.WriterTemplate.1";
+    Subkey = "CollaboraOffice.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
@@ -1128,41 +1128,41 @@ End
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterTemplate.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterTemplate.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterTemplate.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterTemplate.1\shell\open\command";
+    Subkey = "CollaboraOffice.WriterTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterTemplate.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterTemplate.1\shell\printto\command";
+    Subkey = "CollaboraOffice.WriterTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1193,7 +1193,7 @@ End
 RegistryItem gid_Regitem_WriterGlobalDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1201,7 +1201,7 @@ RegistryItem gid_Regitem_Odm
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".odm";
-    Value = "LibreOffice.WriterGlobalDocument.1";
+    Value = "CollaboraOffice.WriterGlobalDocument.1";
 End
 
 RegistryItem gid_Regitem_Odm_Contenttype
@@ -1222,21 +1222,21 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterGlobalDocument\CurVer";
+    Subkey = "CollaboraOffice.WriterGlobalDocument\CurVer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "LibreOffice.WriterGlobalDocument.1";
+    Value = "CollaboraOffice.WriterGlobalDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterGlobalDocument.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterGlobalDocument.1\DefaultIcon";
+    Subkey = "CollaboraOffice.WriterGlobalDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,9";
 End
@@ -1244,15 +1244,15 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterGlobalDocument.1";
+    Subkey = "CollaboraOffice.WriterGlobalDocument.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Writer";
+    Value = "Collabora.CollaboraOffice.Writer";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterGlobalDocument.1";
+    Subkey = "CollaboraOffice.WriterGlobalDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_MASTERDOC)
 End
@@ -1261,7 +1261,7 @@ End
 RegistryItem gid_Regitem_odm_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.WriterGlobalDocument.1";
+    Subkey = "CollaboraOffice.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
@@ -1277,42 +1277,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterGlobalDocument.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterGlobalDocument.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterGlobalDocument.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterGlobalDocument.1\shell\open\command";
+    Subkey = "CollaboraOffice.WriterGlobalDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterGlobalDocument.1\shell\printto\command";
+    Subkey = "CollaboraOffice.WriterGlobalDocument.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1343,7 +1343,7 @@ End
 RegistryItem gid_Regitem_WriterWebTemplate_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "CollaboraOffice.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1351,7 +1351,7 @@ RegistryItem gid_Regitem_Oth
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".oth";
-    Value = "LibreOffice.WriterWebTemplate.1";
+    Value = "CollaboraOffice.WriterWebTemplate.1";
 End
 
 RegistryItem gid_Regitem_Oth_Contenttype
@@ -1372,21 +1372,21 @@ End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterWebTemplate\CurVer";
+    Subkey = "CollaboraOffice.WriterWebTemplate\CurVer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "LibreOffice.WriterWebTemplate.1";
+    Value = "CollaboraOffice.WriterWebTemplate.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterWebTemplate.1";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterWebTemplate.1\DefaultIcon";
+    Subkey = "CollaboraOffice.WriterWebTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,10";
 End
@@ -1394,57 +1394,57 @@ End
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterWebTemplate.1";
+    Subkey = "CollaboraOffice.WriterWebTemplate.1";
     Name = "AppUserModelID";
-    Value = "TheDocumentFoundation.LibreOffice.Writer";
+    Value = "Collabora.CollaboraOffice.Writer";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "LibreOffice.WriterWebTemplate.1";
+    Subkey = "CollaboraOffice.WriterWebTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WEBDOC)
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterWebTemplate.1\shell";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterWebTemplate.1\shell\new";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterWebTemplate.1\shell\new\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterWebTemplate.1\shell\open\command";
+    Subkey = "CollaboraOffice.WriterWebTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "LibreOffice.WriterWebTemplate.1\shell\print\command";
+    Subkey = "CollaboraOffice.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 = "LibreOffice.WriterWebTemplate.1\shell\printto\command";
+    Subkey = "CollaboraOffice.WriterWebTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1453,7 +1453,7 @@ End
 RegistryItem gid_Regitem_oth_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "LibreOffice.WriterWebTemplate.1";
+    Subkey = "CollaboraOffice.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
@@ -1474,7 +1474,7 @@ RegistryItem gid_Regitem_OpenOffice_ODT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "LibreOffice.WriterDocument.1";
+    Name = "CollaboraOffice.WriterDocument.1";
     Value = " ";
 End
 
@@ -1483,7 +1483,7 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "LibreOffice.WriterTemplate.1";
+    Name = "CollaboraOffice.WriterTemplate.1";
     Value = " ";
 End
 
@@ -1492,7 +1492,7 @@ RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".oth\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "LibreOffice.WriterWebTemplate.1";
+    Name = "CollaboraOffice.WriterWebTemplate.1";
     Value = " ";
 End
 
@@ -1501,7 +1501,7 @@ RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "LibreOffice.WriterGlobalDocument.1";
+    Name = "CollaboraOffice.WriterGlobalDocument.1";
     Value = " ";
 End
 
@@ -1573,7 +1573,7 @@ RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wps\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "LibreOffice.WriterDocument.1";
+    Name = "CollaboraOffice.WriterDocument.1";
     Value = " ";
 End
 
@@ -1582,7 +1582,7 @@ RegistryItem gid_Regitem_OpenOffice_WRI_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wri\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "LibreOffice.WriterDocument.1";
+    Name = "CollaboraOffice.WriterDocument.1";
     Value = " ";
 End
 
@@ -1610,7 +1610,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 = "LibreOffice.WriterTemplate.1";
+    Value = "CollaboraOffice.WriterTemplate.1";
     Styles = ();
 End
 
@@ -1691,7 +1691,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 = "LibreOffice.WriterWebTemplate.1";
+    Value = "CollaboraOffice.WriterWebTemplate.1";
     Styles = ();
 End
 
@@ -1700,7 +1700,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 = "LibreOffice.WriterGlobalDocument.1";
+    Value = "CollaboraOffice.WriterGlobalDocument.1";
     Styles = ();
 End