.gitreview                                            |    2 
 configure.ac                                          |    2 
 framework/source/helper/titlebarupdate.cxx            |    2 
 include/default.rc                                    |    2 
 instsetoo_native/CustomTarget_setup.mk                |    2 
 instsetoo_native/util/openoffice.lst.in               |   80 +++--
 postprocess/CustomTarget_registry.mk                  |    2 
 sc/source/filter/oox/workbookhelper.cxx               |    2 
 scp2/inc/macros.inc                                   |   30 -
 scp2/source/base/folderitem_base.scp                  |    2 
 scp2/source/base/registryitem_base.scp                |   26 -
 scp2/source/calc/folderitem_calc.scp                  |    2 
 scp2/source/calc/registryitem_calc.scp                |   94 +++---
 scp2/source/draw/folderitem_draw.scp                  |    2 
 scp2/source/draw/registryitem_draw.scp                |   96 +++---
 scp2/source/impress/folderitem_impress.scp            |    2 
 scp2/source/impress/registryitem_impress.scp          |  100 +++---
 scp2/source/math/folderitem_math.scp                  |    2 
 scp2/source/math/registryitem_math.scp                |   56 +--
 scp2/source/ooo/folderitem_ooo.scp                    |    6 
 scp2/source/writer/folderitem_writer.scp              |    2 
 scp2/source/writer/registryitem_writer.scp            |  182 ++++++------
 setup_native/source/packinfo/packinfo_brand.txt       |   32 +-
 setup_native/source/packinfo/packinfo_extensions.txt  |   16 -
 setup_native/source/packinfo/packinfo_office.txt      |  272 +++++++++---------
 setup_native/source/packinfo/packinfo_office_help.txt |    4 
 setup_native/source/packinfo/packinfo_office_lang.txt |   40 +-
 setup_native/source/packinfo/packinfo_sdkoo.txt       |    4 
 setup_native/source/packinfo/packinfo_ure.txt         |    8 
 sysui/Package_share.mk                                |    2 
 sysui/desktop/debian/control                          |    2 
 sysui/desktop/freedesktop/freedesktop-menus.spec      |    4 
 sysui/desktop/share/create_tree.sh                    |    8 
 sysui/productlist.mk                                  |    6 
 vcl/win/app/salinst.cxx                               |    2 
 35 files changed, 557 insertions(+), 539 deletions(-)

New commits:
commit 95c05533ae8bc7121f3a90eff4dd7e5bded7726c
Author:     Balazs Varga <balazs.va...@collabora.com>
AuthorDate: Wed Aug 20 20:39:28 2025 +0200
Commit:     Balazs Varga <balazs.va...@collabora.com>
CommitDate: Wed Aug 27 16:25:58 2025 +0200

    Branding for CIBOffice without any branding image
    
    Branding CIBOffice part 1, based on co-25.04 branch
    
    Change-Id: I732e2d4cb8aafd46e3d3b1dd57025be14436c195
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190012
    Reviewed-by: Balazs Varga <balazs.va...@collabora.com>
    Tested-by: Balazs Varga <balazs.va...@collabora.com>

diff --git a/.gitreview b/.gitreview
index ee48635e2bf0..bc58eeccf4cc 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=distro/collabora/co-25.04
+defaultbranch=distro/cib/office-25.04
 
diff --git a/configure.ac b/configure.ac
index af83b5c638b2..0dbde3f1a780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.5.0],[],[],[https://collaboraoffice.com/])
+AC_INIT([CIB Office],[25.04.5.0],[],[],[https://www.cib.de/office/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
diff --git a/framework/source/helper/titlebarupdate.cxx 
b/framework/source/helper/titlebarupdate.cxx
index a31770e60caa..ff65dbf1fdcc 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -143,7 +143,7 @@ void TitleBarUpdate::impl_updateApplicationID(const 
css::uno::Reference< css::fr
             sDesktopName = "Startcenter";
 #if defined(_WIN32)
         // We use a hardcoded product name matching the registry keys so 
applications can be associated with file types
-        sApplicationID = "Collabora.CollaboraOffice." + sDesktopName;
+        sApplicationID = "CIB.CIBOffice." + sDesktopName;
 #else
         sApplicationID = 
utl::ConfigManager::getProductName().toAsciiLowerCase() + "-" + 
sDesktopName.toAsciiLowerCase();
 #endif
diff --git a/include/default.rc b/include/default.rc
index 4bae263bf30e..153dda2aeb9d 100644
--- a/include/default.rc
+++ b/include/default.rc
@@ -45,7 +45,7 @@ VS_VERSION_INFO VERSIONINFO
             {
                 // International StringTable
                 VALUE "CompanyName",      PPS(RES_APP_VENDOR) "
-                VALUE "ProductName",      "Collabora Office
+                VALUE "ProductName",      "CIB Office
                 VALUE "ProductVersion",   PPS(VER_LEVEL) "
                 VALUE "FileVersion",      PPS(VER_LEVEL) "
                 VALUE "OriginalFilename", PPS(ORG_NAME) "
diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 406c3e823979..e1e693a7c10e 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -41,7 +41,7 @@ $(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call 
gb_Helper_get_rcfile,bo
                && echo 'InstallMode=<installmode>' \
                && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
                $(if $(ENABLE_RELEASE_BUILD),\
-                       && echo 'UserInstallation=$$SYSUSERCONFIG/$(if 
$(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr 
"[:upper:]" "[:lower:]" | tr -d " "),$(shell echo $(PRODUCTNAME) | tr -d " 
"))/4', \
+                       && echo 'UserInstallation=$$SYSUSERCONFIG/$(if 
$(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME_WITHOUT_SPACES) 
| tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME_WITHOUT_SPACES))/4', \
                        && echo 'UserInstallation=$$ORIGIN/..') \
        ) > $@
        $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index c9503aa531be..6c34a8b510f9 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -8,12 +8,12 @@ Globals
             UREPACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 4.1
-            WINDOWSBASISROOTNAME Collabora Office
-            UNIXBASISROOTNAME collaboraoffice
+            WINDOWSBASISROOTNAME CIB Office
+            UNIXBASISROOTNAME 
ciboffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             HIDELICENSEDIALOG 0
             PACKAGEPREFIX
-            BASISPACKAGEPREFIX collaboraofficebasis
-            UREPACKAGEPREFIX collaboraoffice
+            BASISPACKAGEPREFIX cibofficebasis
+            UREPACKAGEPREFIX ciboffice
             SOLSUREPACKAGEPREFIX libreoffice
             PROGRESSBARCOLOR 0,0,0
             PROGRESSSIZE 460,6
@@ -30,7 +30,8 @@ Globals
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
             PACKAGEMAP package_names.txt,package_names_ext.txt
             WINDOWSPATCHLEVEL @LIBO_VERSION_MICRO@
-            OOOVENDOR Collabora Productivity Ltd.
+            OOOVENDOR CIB software GmbH
+            OOODOWNLOADNAME 1
             64BITPRODUCT @WINDOWS_X64@
             WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@
             CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@
@@ -38,13 +39,13 @@ Globals
     }
 }
 
-CollaboraOffice
+CIBOffice
 {
     Settings
     {
         variables
         {
-            PRODUCTNAME Collabora Office
+            PRODUCTNAME CIB Office
             PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@
             POSTVERSIONEXTENSION
@@ -64,37 +65,42 @@ CollaboraOffice
             SPELLCHECKERFILE spellchecker_selection.txt
             CHANGETARGETDIR 1
             PATCHCODEFILE ooo_patchcodes.txt
+            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL https://www.cib.de/office
+            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+            STARTCENTER_HIDE_EXTERNAL_LINKS 0
         }
         active          1
         compression     5
         script          setup_osl
-        downloadname    
CollaboraOffice_{productversion}_{os}_install_{languages}
-        langpackdownloadname    
CollaboraOffice_{productversion}_languagepack_{os}_install_{languages}
-        helppackdownloadname    
CollaboraOffice_{productversion}_helppack_{os}_install_{languages}
+        downloadname    CIBOffice_{productversion}_{os}_install_{languages}
+        langpackdownloadname    
CIBOffice_{productversion}_languagepack_{os}_install_{languages}
+        helppackdownloadname    
CIBOffice_{productversion}_helppack_{os}_install_{languages}
         include         
{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
     }
 }
 
-LibreOfficeDev
+CIBOfficeDev
 {
     Settings
     {
         variables
         {
-            PRODUCTNAME LibreOfficeDev
+            PRODUCTNAME CIB Office Dev
             PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION 
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
-            WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
-            UNIXBASISROOTNAME 
libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+            WINDOWSBASISROOTNAME CIBOfficeDev @LIBO_VERSION_MAJOR@
+            UNIXBASISROOTNAME 
cibofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             POSTVERSIONEXTENSION
             BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
             BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             USERDIRPRODUCTVERSION 4
             BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             DEVELOPMENTPRODUCT 1
-            BASISPACKAGEPREFIX lodevbasis
-            UREPACKAGEPREFIX libreofficedev
-            SOLSUREPACKAGEPREFIX libreofficedev
+            BASISPACKAGEPREFIX cibofficedevbasis
+            UREPACKAGEPREFIX cibofficedev
+            SOLSUREPACKAGEPREFIX cibofficedev
             REGISTRYLAYERNAME LayerDev
             UPDATEURL https://update.libreoffice.org/check.php
             ADD_INCLUDE_FILES 
cli_ure/version/version.txt,unoil/climaker/version.txt
@@ -109,25 +115,29 @@ LibreOfficeDev
             PATCHCODEFILE ooodev_patchcodes.txt
             CODEFILENAME codes_ooodev.txt
             LOCALUSERDIR $ORIGIN/..
+            STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL https://www.cib.de/office
+            STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
+            DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }
         active          1
         compression     5
         script          setup_osl
-        downloadname    
LibreOfficeDev_{productversion}_{os}_install_{languages}
-        langpackdownloadname    
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
-        helppackdownloadname    
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
+        downloadname    CIBOfficeDev_{productversion}_{os}_install_{languages}
+        langpackdownloadname    
CIBOfficeDev_{productversion}_languagepack_{os}_install_{languages}
+        helppackdownloadname    
CIBOfficeDev_{productversion}_helppack_{os}_install_{languages}
         include         
{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
     }
 }
 
-LibreOffice_SDK
+CIBOffice_SDK
 {
     Settings
     {
-        downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages}
+        downloadname CIBOffice-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME LibreOffice
+            PRODUCTNAME CIB Office
             PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION 
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             POSTVERSIONEXTENSION SDK
@@ -146,6 +156,10 @@ LibreOffice_SDK
             NOSHORTDIRECTORYNAMES 1
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
+            STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL https://www.cib.de/office
+            STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
+            DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }
         active 1
         compression 5
@@ -154,26 +168,26 @@ LibreOffice_SDK
     }
 }
 
-LibreOfficeDev_SDK
+CIBOfficeDev_SDK
 {
     Settings
     {
-        downloadname 
LibreOfficeDev-SDK_{packageversion}_{os}_install_{languages}
+        downloadname CIBOfficeDev-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME LibreOfficeDev
+            PRODUCTNAME CIBOfficeDev
             PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION 
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
-            WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
-            UNIXBASISROOTNAME 
libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+            WINDOWSBASISROOTNAME CIBOfficeDev @LIBO_VERSION_MAJOR@
+            UNIXBASISROOTNAME 
cibofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             POSTVERSIONEXTENSION SDK
             BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK
             BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             PACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             PACKAGEREVISION {buildid}
-            BASISPACKAGEPREFIX lodevbasis
-            UREPACKAGEPREFIX libreofficedev
-            SOLSUREPACKAGEPREFIX libreofficedev
+            BASISPACKAGEPREFIX cibofficedevbasis
+            UREPACKAGEPREFIX cibofficedev
+            SOLSUREPACKAGEPREFIX cibofficedev
             REGISTRYLAYERNAME LayerDev
             DEVELOPMENTPRODUCT 1
             PACK_INSTALLED 1
@@ -187,6 +201,10 @@ LibreOfficeDev_SDK
             NOSHORTDIRECTORYNAMES 1
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
+            STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
+            STARTCENTER_INFO_URL https://www.cib.de/office
+            STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
+            DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }
         active 1
         compression 5
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 7b5e52edcc12..b6cba18d3914 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -578,7 +578,7 @@ postprocess_main_SED := \
        -e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
        -e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
        -e 
's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
 \
-       -e 's,$${STARTCENTER_INFO_URL},https://collaboraoffice.com,g' \
+       -e 's,$${STARTCENTER_INFO_URL},https://www.cib.de/office,g' \
        -e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \
        -e 's,$${SYSTEM_LIBNUMBERTEXT_DATA},$(SYSTEM_LIBNUMBERTEXT_DATA),g' \
        -e 's,$${PRIVACY_POLICY_URL},$(PRIVACY_POLICY_URL),g' \
diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 61c6630c26ba..796ea61ebca9 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -566,7 +566,7 @@ void WorkbookGlobals::initialize()
         aCalcConfig.SetStringRefSyntax( formula::FormulaGrammar::CONV_XL_A1 ) ;
         mpDoc->SetCalcConfig(aCalcConfig);
     }
-    else if (aGenerator.startsWithIgnoreAsciiCase("LibreOffice") || 
aGenerator.startsWithIgnoreAsciiCase("Collabora"))
+    else if (aGenerator.startsWithIgnoreAsciiCase("LibreOffice") || 
aGenerator.startsWithIgnoreAsciiCase("CIB") || 
aGenerator.startsWithIgnoreAsciiCase("Collabora"))
     {
         mbGeneratorKnownGood = true;
     }
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index dbdc45786cc5..1c5df09be4a1 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(CollaboraOffice.,name)); \
+        Name = STRING(CONCAT2(CIBOffice.,name)); \
         Value = " "; \
     End
 
@@ -249,7 +249,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(CollaboraOffice.,name)); \
+        Name = STRING(CONCAT2(CIBOffice.,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(CollaboraOffice.,name)); \
+        Value = STRING(CONCAT2(CIBOffice.,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(CollaboraOffice.,name)); \
+        Subkey = STRING(CONCAT2(CIBOffice.,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(CollaboraOffice.,name)); \
+        Subkey = STRING(CONCAT2(CIBOffice.,name)); \
         Name = STRING(AppUserModelID); \
-        Value = STRING(CONCAT2(Collabora.CollaboraOffice.,doc_type)); \
+        Value = STRING(CONCAT2(CIB.CIBOffice.,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(CollaboraOffice.,name,\DefaultIcon)); \
+        Subkey = STRING(CONCAT3(CIBOffice.,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(CollaboraOffice.,name,\shell)); \
+        Subkey = STRING(CONCAT3(CIBOffice.,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(CollaboraOffice.,name,\shell
ew)); \
+        Subkey = STRING(CONCAT3(CIBOffice.,name,\shell
ew)); \
         REG_VALUE_LNG(NEW) \
     End \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(CollaboraOffice.,name,\shell
ew+        Subkey = STRING(CONCAT3(CIBOffice.,name,\shell
ew         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(CollaboraOffice.,name,\shell\open+        
Subkey = STRING(CONCAT3(CIBOffice.,name,\shell\open         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(CollaboraOffice.,name,\shell\print+        
Subkey = STRING(CONCAT3(CIBOffice.,name,\shell\print         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(CollaboraOffice.,name,\shell\printto+        
Subkey = STRING(CONCAT3(CIBOffice.,name,\shell\printto         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(CollaboraOffice.,name)); \
+        Value = STRING(CONCAT2(CIBOffice.,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(CollaboraOffice.,name)); \
+        Value = STRING(CONCAT2(CIBOffice.,name)); \
         Styles = (); \
     End
 
diff --git a/scp2/source/base/folderitem_base.scp 
b/scp2/source/base/folderitem_base.scp
index 577566ce895f..622353b92aad 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 = "Collabora.CollaboraOffice.Base";
+    Value = "CIB.CIBOffice.Base";
 End
 #endif
diff --git a/scp2/source/base/registryitem_base.scp 
b/scp2/source/base/registryitem_base.scp
index db8f1ded0cd3..1926d392dcaf 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 = "CollaboraOffice.DatabaseDocument.1";
+    Value = "CIBOffice.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 = 
"CollaboraOffice.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.DatabaseDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DatabaseDocument.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DatabaseDocument.1";
+    Subkey = "CIBOffice.DatabaseDocument.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Base";
+    Value = "CIB.CIBOffice.Base";
 End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = "CollaboraOffice.DatabaseDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DatabaseDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DatabaseDocument.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DatabaseDocument.1\shell\open+//     Subkey = 
"CIBOffice.DatabaseDocument.1\shell\open //     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 = "CollaboraOffice.DatabaseDocument.1\shell\open+    Subkey = 
"CIBOffice.DatabaseDocument.1\shell\open     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 = "CollaboraOffice.DatabaseDocument.1";
+    Name = "CIBOffice.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 = "CollaboraOffice.DatabaseDocument.1";
+    Value = "CIBOffice.DatabaseDocument.1";
     Styles = ();
 End
 
diff --git a/scp2/source/calc/folderitem_calc.scp 
b/scp2/source/calc/folderitem_calc.scp
index 60273601be89..098ca42d993a 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 = "Collabora.CollaboraOffice.Calc";
+    Value = "CIB.CIBOffice.Calc";
 End
 #endif
diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index 424a4ff8f396..3c87946ef3ec 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 = "CollaboraOffice.CalcDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1";
+    Value = "CIBOffice.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 = "Collabora.CollaboraOffice.Calc";
+    Value = "CIB.CIBOffice.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 = "Collabora.CollaboraOffice.Calc";
+    Value = "CIB.CIBOffice.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 = 
"CollaboraOffice.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.CalcDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1";
+    Value = "CIBOffice.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\CollaboraOffice.CalcDocument.1\ShellNew";
+    Subkey = ".ods\CIBOffice.CalcDocument.1\ShellNew";
     Name = "FileName";
     Value = "<progpath>\share  emplate\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 = "CollaboraOffice.CalcDocument\CurVer";
-    Value = "CollaboraOffice.CalcDocument.1";
+    Subkey = "CIBOffice.CalcDocument\CurVer";
+    Value = "CIBOffice.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CollaboraOffice.CalcDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1\CLSID";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1";
+    Subkey = "CIBOffice.CalcDocument.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Calc";
+    Value = "CIB.CIBOffice.Calc";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CollaboraOffice.CalcDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1\Insertable";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1\protocol\StdFileEditingerb
+    Subkey = "CIBOffice.CalcDocument.1\protocol\StdFileEditingerb
     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 = "CollaboraOffice.CalcDocument.1\protocol\StdFileEditingerb\-1";
+    Subkey = "CIBOffice.CalcDocument.1\protocol\StdFileEditingerb\-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 = "CollaboraOffice.CalcDocument.1\protocol\StdFileEditingerb\-2";
+    Subkey = "CIBOffice.CalcDocument.1\protocol\StdFileEditingerb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CollaboraOffice.CalcDocument.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1\shell
ew";
+    Subkey = "CIBOffice.CalcDocument.1\shell
ew";
     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 = "CollaboraOffice.CalcDocument.1\shell
ew+    Subkey = "CIBOffice.CalcDocument.1\shell
ew     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 = "CollaboraOffice.CalcDocument.1\shell\open+    Subkey = 
"CIBOffice.CalcDocument.1\shell\open     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 = "CollaboraOffice.CalcDocument.1\shell\print+    Subkey = 
"CIBOffice.CalcDocument.1\shell\print     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 = "CollaboraOffice.CalcDocument.1\shell\printto+    Subkey = 
"CIBOffice.CalcDocument.1\shell\printto     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 = "CollaboraOffice.CalcDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.CalcDocument.1";
+    Value = "CIBOffice.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 = 
"CollaboraOffice.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.CalcTemplate.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.CalcTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcTemplate.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcTemplate.1";
+    Subkey = "CIBOffice.CalcTemplate.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Calc";
+    Value = "CIB.CIBOffice.Calc";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CollaboraOffice.CalcTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcTemplate.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.CalcTemplate.1\shell
ew";
+    Subkey = "CIBOffice.CalcTemplate.1\shell
ew";
     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 = "CollaboraOffice.CalcTemplate.1\shell
ew+    Subkey = "CIBOffice.CalcTemplate.1\shell
ew     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 = "CollaboraOffice.CalcTemplate.1\shell\open+    Subkey = 
"CIBOffice.CalcTemplate.1\shell\open     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 = "CollaboraOffice.CalcTemplate.1\shell\print+    Subkey = 
"CIBOffice.CalcTemplate.1\shell\print     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 = "CollaboraOffice.CalcTemplate.1\shell\printto+    Subkey = 
"CIBOffice.CalcTemplate.1\shell\printto     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 = "CollaboraOffice.CalcDocument.1";
+    Name = "CIBOffice.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 = "CollaboraOffice.CalcTemplate.1";
+    Name = "CIBOffice.CalcTemplate.1";
     Value = " ";
 End
 
diff --git a/scp2/source/draw/folderitem_draw.scp 
b/scp2/source/draw/folderitem_draw.scp
index d9bf7bcffd77..648e61b624a8 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 = "Collabora.CollaboraOffice.Draw";
+    Value = "CIB.CIBOffice.Draw";
 End
 #endif
diff --git a/scp2/source/draw/registryitem_draw.scp 
b/scp2/source/draw/registryitem_draw.scp
index f2012686579c..7266b4f6ea75 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 = "CollaboraOffice.DrawDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1";
+    Value = "CIBOffice.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 = "Collabora.CollaboraOffice.Draw";
+    Value = "CIB.CIBOffice.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 = "Collabora.CollaboraOffice.Draw";
+    Value = "CIB.CIBOffice.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 = 
"CollaboraOffice.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.DrawDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1";
+    Value = "CIBOffice.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\CollaboraOffice.DrawDocument.1\ShellNew";
+    Subkey = ".odg\CIBOffice.DrawDocument.1\ShellNew";
     Name = "FileName";
     Value = "<progpath>\share  emplate\shellnew\soffice.odg";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CollaboraOffice.DrawDocument\CurVer";
+    Subkey = "CIBOffice.DrawDocument\CurVer";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "CollaboraOffice.DrawDocument.1";
+    Value = "CIBOffice.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CollaboraOffice.DrawDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1\CLSID";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1";
+    Subkey = "CIBOffice.DrawDocument.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Draw";
+    Value = "CIB.CIBOffice.Draw";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CollaboraOffice.DrawDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1\shell
ew";
+    Subkey = "CIBOffice.DrawDocument.1\shell
ew";
     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 = "CollaboraOffice.DrawDocument.1\shell
ew+    Subkey = "CIBOffice.DrawDocument.1\shell
ew     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 = "CollaboraOffice.DrawDocument.1\shell\open+    Subkey = 
"CIBOffice.DrawDocument.1\shell\open     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 = "CollaboraOffice.DrawDocument.1\shell\print+    Subkey = 
"CIBOffice.DrawDocument.1\shell\print     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 = "CollaboraOffice.DrawDocument.1\shell\printto+    Subkey = 
"CIBOffice.DrawDocument.1\shell\printto     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 = "CollaboraOffice.DrawDocument.1\Insertable";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1\protocol\StdFileEditingerb
+    Subkey = "CIBOffice.DrawDocument.1\protocol\StdFileEditingerb
     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 = "CollaboraOffice.DrawDocument.1\protocol\StdFileEditingerb\-1";
+    Subkey = "CIBOffice.DrawDocument.1\protocol\StdFileEditingerb\-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 = "CollaboraOffice.DrawDocument.1\protocol\StdFileEditingerb\-2";
+    Subkey = "CIBOffice.DrawDocument.1\protocol\StdFileEditingerb\-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 = "CollaboraOffice.DrawDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.DrawDocument.1";
+    Value = "CIBOffice.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 = 
"CollaboraOffice.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.DrawTemplate.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.DrawTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawTemplate.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawTemplate.1";
+    Subkey = "CIBOffice.DrawTemplate.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Draw";
+    Value = "CIB.CIBOffice.Draw";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CollaboraOffice.DrawTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawTemplate.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.DrawTemplate.1\shell
ew";
+    Subkey = "CIBOffice.DrawTemplate.1\shell
ew";
     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 = "CollaboraOffice.DrawTemplate.1\shell
ew+    Subkey = "CIBOffice.DrawTemplate.1\shell
ew     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 = "CollaboraOffice.DrawTemplate.1\shell\open+    Subkey = 
"CIBOffice.DrawTemplate.1\shell\open     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 = "CollaboraOffice.DrawTemplate.1\shell\print+    Subkey = 
"CIBOffice.DrawTemplate.1\shell\print     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 = "CollaboraOffice.DrawTemplate.1\shell\printto+    Subkey = 
"CIBOffice.DrawTemplate.1\shell\printto     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 = "CollaboraOffice.DrawDocument.1";
+    Name = "CIBOffice.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 = "CollaboraOffice.DrawTemplate.1";
+    Name = "CIBOffice.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 = "CollaboraOffice.DrawTemplate.1";
+    Value = "CIBOffice.DrawTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/impress/folderitem_impress.scp 
b/scp2/source/impress/folderitem_impress.scp
index ce470edb211a..c92768cdc00c 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 = "Collabora.CollaboraOffice.Impress";
+    Value = "CIB.CIBOffice.Impress";
 End
 #endif
diff --git a/scp2/source/impress/registryitem_impress.scp 
b/scp2/source/impress/registryitem_impress.scp
index 39656bce1a8c..101e0e9f6771 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 = "CollaboraOffice.ImpressDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1";
+    Value = "CIBOffice.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 = "Collabora.CollaboraOffice.Impress";
+    Value = "CIB.CIBOffice.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 = "Collabora.CollaboraOffice.Impress";
+    Value = "CIB.CIBOffice.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 = 
"CollaboraOffice.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.ImpressDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1";
+    Value = "CIBOffice.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\CollaboraOffice.ImpressDocument.1\ShellNew";
+    Subkey = ".odp\CIBOffice.ImpressDocument.1\ShellNew";
     Name = "FileName";
     Value = "<progpath>\share  emplate\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 = "CollaboraOffice.ImpressDocument.1";
+    Value = "CIBOffice.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CollaboraOffice.ImpressDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1\CLSID";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1";
+    Subkey = "CIBOffice.ImpressDocument.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Impress";
+    Value = "CIB.CIBOffice.Impress";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CollaboraOffice.ImpressDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1\Insertable";
+    Subkey = "CIBOffice.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 = 
"CollaboraOffice.ImpressDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1\protocol\StdFileEditingerb
+    Subkey = "CIBOffice.ImpressDocument.1\protocol\StdFileEditingerb
     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 = "CollaboraOffice.ImpressDocument.1\protocol\StdFileEditing
erb\-1";
+    Subkey = "CIBOffice.ImpressDocument.1\protocol\StdFileEditingerb\-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 = "CollaboraOffice.ImpressDocument.1\protocol\StdFileEditing
erb\-2";
+    Subkey = "CIBOffice.ImpressDocument.1\protocol\StdFileEditingerb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CollaboraOffice.ImpressDocument.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1\shell
ew";
+    Subkey = "CIBOffice.ImpressDocument.1\shell
ew";
     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 = "CollaboraOffice.ImpressDocument.1\shell
ew+    Subkey = "CIBOffice.ImpressDocument.1\shell
ew     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 = "CollaboraOffice.ImpressDocument.1\shell\open+    Subkey = 
"CIBOffice.ImpressDocument.1\shell\open     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 = "CollaboraOffice.ImpressDocument.1\shell\print+    Subkey = 
"CIBOffice.ImpressDocument.1\shell\print     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 = "CollaboraOffice.ImpressDocument.1\shell\printto+    Subkey = 
"CIBOffice.ImpressDocument.1\shell\printto     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 = "CollaboraOffice.ImpressDocument.1\shell\show";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1\shell\show+    Subkey = 
"CIBOffice.ImpressDocument.1\shell\show     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 = "CollaboraOffice.ImpressDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1";
+    Value = "CIBOffice.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 = 
"CollaboraOffice.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1";
+    Subkey = "CIBOffice.ImpressTemplate.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Impress";
+    Value = "CIB.CIBOffice.Impress";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CollaboraOffice.ImpressTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1\shell
ew";
+    Subkey = "CIBOffice.ImpressTemplate.1\shell
ew";
     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 = "CollaboraOffice.ImpressTemplate.1\shell
ew+    Subkey = "CIBOffice.ImpressTemplate.1\shell
ew     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 = "CollaboraOffice.ImpressTemplate.1\shell\open+    Subkey = 
"CIBOffice.ImpressTemplate.1\shell\open     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 = "CollaboraOffice.ImpressTemplate.1\shell\print+    Subkey = 
"CIBOffice.ImpressTemplate.1\shell\print     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 = "CollaboraOffice.ImpressTemplate.1\shell\printto+    Subkey = 
"CIBOffice.ImpressTemplate.1\shell\printto     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 = "CollaboraOffice.ImpressDocument.1";
+    Name = "CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1";
+    Name = "CIBOffice.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 = "CollaboraOffice.ImpressDocument.1";
+    Name = "CIBOffice.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 = "CollaboraOffice.ImpressTemplate.1";
+    Value = "CIBOffice.ImpressTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/math/folderitem_math.scp 
b/scp2/source/math/folderitem_math.scp
index cdc4d1fb3a54..1c5b4615b209 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 = "Collabora.CollaboraOffice.Math";
+    Value = "CIB.CIBOffice.Math";
 End
 #endif
diff --git a/scp2/source/math/registryitem_math.scp 
b/scp2/source/math/registryitem_math.scp
index e629c08d5255..4868e36a8e84 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 = "CollaboraOffice.MathDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.MathDocument.1";
+    Value = "CIBOffice.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 = "Collabora.CollaboraOffice.Math";
+    Value = "CIB.CIBOffice.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 = 
"CollaboraOffice.MathDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.MathDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.MathDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.MathDocument.1";
+    Value = "CIBOffice.MathDocument.1";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CollaboraOffice.MathDocument\CurVer";
+    Subkey = "CIBOffice.MathDocument\CurVer";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Value = "CollaboraOffice.MathDocument.1";
+    Value = "CIBOffice.MathDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CollaboraOffice.MathDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.MathDocument.1\CLSID";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.MathDocument.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.MathDocument.1";
+    Subkey = "CIBOffice.MathDocument.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Math";
+    Value = "CIB.CIBOffice.Math";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CollaboraOffice.MathDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.MathDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.MathDocument.1\Insertable";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.MathDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.MathDocument.1\protocol\StdFileEditingerb
+    Subkey = "CIBOffice.MathDocument.1\protocol\StdFileEditingerb
     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 = "CollaboraOffice.MathDocument.1\protocol\StdFileEditingerb\-1";
+    Subkey = "CIBOffice.MathDocument.1\protocol\StdFileEditingerb\-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 = "CollaboraOffice.MathDocument.1\protocol\StdFileEditingerb\-2";
+    Subkey = "CIBOffice.MathDocument.1\protocol\StdFileEditingerb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CollaboraOffice.MathDocument.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.MathDocument.1\shell
ew";
+    Subkey = "CIBOffice.MathDocument.1\shell
ew";
     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 = "CollaboraOffice.MathDocument.1\shell
ew+    Subkey = "CIBOffice.MathDocument.1\shell
ew     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 = "CollaboraOffice.MathDocument.1\shell\open+    Subkey = 
"CIBOffice.MathDocument.1\shell\open     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 = "CollaboraOffice.MathDocument.1\shell\print+    Subkey = 
"CIBOffice.MathDocument.1\shell\print     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 = "CollaboraOffice.MathDocument.1\shell\printto+    Subkey = 
"CIBOffice.MathDocument.1\shell\printto     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 = "CollaboraOffice.MathDocument.1";
+    Name = "CIBOffice.MathDocument.1";
     Value = " ";
 End
 
diff --git a/scp2/source/ooo/folderitem_ooo.scp 
b/scp2/source/ooo/folderitem_ooo.scp
index 332cc832ef23..de377ba7b9cc 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 = "Collabora.CollaboraOffice.Startcenter";
+    Value = "CIB.CIBOffice.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 = "Collabora.CollaboraOffice.Startcenter";
+    Value = "CIB.CIBOffice.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 = "Collabora.CollaboraOffice.SafeMode";
+    Value = "CIB.CIBOffice.SafeMode";
 End
diff --git a/scp2/source/writer/folderitem_writer.scp 
b/scp2/source/writer/folderitem_writer.scp
index 20dce0b2f05f..16d6475d39dc 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 = "Collabora.CollaboraOffice.Writer";
+    Value = "CIB.CIBOffice.Writer";
 End
 #endif
diff --git a/scp2/source/writer/registryitem_writer.scp 
b/scp2/source/writer/registryitem_writer.scp
index 28cb146f3646..e153907f95bf 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 = "CollaboraOffice.WriterDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1";
+    Value = "CIBOffice.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 = "Collabora.CollaboraOffice.Writer";
+    Value = "CIB.CIBOffice.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 = "Collabora.CollaboraOffice.Writer";
+    Value = "CIB.CIBOffice.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 = "Collabora.CollaboraOffice.Writer";
+    Value = "CIB.CIBOffice.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 = 
"CollaboraOffice.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = 
"CIBOffice.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 = "CollaboraOffice.WriterDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1";
+    Value = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1";
+    Value = "CIBOffice.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\CollaboraOffice.WriterDocument.1\ShellNew";
+    Subkey = ".odt\CIBOffice.WriterDocument.1\ShellNew";
     Name = "FileName";
     Value = "<progpath>\share  emplate\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 = "CollaboraOffice.WriterDocument\CurVer";
-    Value = "CollaboraOffice.WriterDocument.1";
+    Subkey = "CIBOffice.WriterDocument\CurVer";
+    Value = "CIBOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CollaboraOffice.WriterDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1\CLSID";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1\DefaultIcon";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1";
+    Subkey = "CIBOffice.WriterDocument.1";
     Name = "AppUserModelID";
-    Value = "Collabora.CollaboraOffice.Writer";
+    Value = "CIB.CIBOffice.Writer";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CollaboraOffice.WriterDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1\Insertable";
+    Subkey = "CIBOffice.WriterDocument.1\Insertable";
 End
 
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odt_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
-    Subkey = "CollaboraOffice.WriterDocument.1";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1\protocol\StdFileEditing\server";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1\protocol\StdFileEditingerb
+    Subkey = "CIBOffice.WriterDocument.1\protocol\StdFileEditingerb
     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 = "CollaboraOffice.WriterDocument.1\protocol\StdFileEditingerb\-1";
+    Subkey = "CIBOffice.WriterDocument.1\protocol\StdFileEditingerb\-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 = "CollaboraOffice.WriterDocument.1\protocol\StdFileEditingerb\-2";
+    Subkey = "CIBOffice.WriterDocument.1\protocol\StdFileEditingerb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CollaboraOffice.WriterDocument.1\shell";
+    Subkey = "CIBOffice.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 = "CollaboraOffice.WriterDocument.1\shell
ew";
+    Subkey = "CIBOffice.WriterDocument.1\shell
ew";
     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 = "CollaboraOffice.WriterDocument.1\shell
ew+    Subkey = "CIBOffice.WriterDocument.1\shell
ew     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 = "CollaboraOffice.WriterDocument.1\shell\open+    Subkey = 
"CIBOffice.WriterDocument.1\shell\open     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 = "CollaboraOffice.WriterDocument.1\shell\print+    Subkey = 
"CIBOffice.WriterDocument.1\shell\print     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 = "CollaboraOffice.WriterDocument.1\shell\printto+    Subkey = 
"CIBOffice.WriterDocument.1\shell\printto-e 
... etc. - the rest is truncated

Reply via email to