LibreOffice Branding: first cut

15 files changed, 80 insertions, 80 deletions

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index ec904cd5e904..aad2b7ee3db0 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -284,7 +284,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html"
+en-US = "Build contributed in collaboration with the community by The Document Foundation. For credits, see: http://www.documentfoundation.org"
 
 [OOO_CONTROL_125]
 en-US = "&Next >"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 2fb2d2963727..2c3517369d69 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,5 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-installuser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser	1	Software\LibreOffice\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine	2	Software\LibreOffice\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 5121f7870124..d2b233364f98 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,5 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-basisinstalluser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser	1	Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine	2	Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index a391ff38130e..4e6b7db69348 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -8,18 +8,18 @@ Globals
 			OOOPACKAGEVERSION 3.3.0
 			UREPACKAGEVERSION 1.7.0
 			URELAYERVERSION 1
-			BASISROOTNAME OpenOffice.org
-			UNIXBASISROOTNAME openoffice.org
-			SERVICETAG_PRODUCTNAME OpenOffice.org 3.3 
+			BASISROOTNAME LibreOffice
+			UNIXBASISROOTNAME libreoffice
+			SERVICETAG_PRODUCTNAME LibreOffice 3.3
 			SERVICETAG_PRODUCTVERSION 3.3
-			SERVICETAG_PARENTNAME OpenOffice.org 3.3 
+			SERVICETAG_PARENTNAME LibreOffice 3.3
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
 			SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
 			HIDELICENSEDIALOG 1
 			PACKAGEPREFIX 
 			BASISPACKAGEPREFIX ooobasis
-			UREPACKAGEPREFIX openoffice.org
-			SOLSUREPACKAGEPREFIX openofficeorg
+			UREPACKAGEPREFIX libreoffice
+			SOLSUREPACKAGEPREFIX libreoffice
 			USE_FILEVERSION 1
 			LIBRARYVERSION 9.3.0
             POOLPRODUCT 1
@@ -52,7 +52,7 @@ OpenOffice
 	{
 		variables
 		{
-			PRODUCTNAME OpenOffice.org
+			PRODUCTNAME LibreOffice
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
@@ -98,15 +98,15 @@ OpenOffice
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
 		script			setup_osl
-		downloadname	OOo_{productversion}_{os}_install_{languages}
-		langpackdownloadname	OOo_{productversion}_languagepack_{os}_install_{languages}
+		downloadname	LO_{productversion}_{os}_install_{languages}
+		langpackdownloadname	LO_{productversion}_languagepack_{os}_install_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
@@ -117,7 +117,7 @@ OpenOffice_wJRE
 	{
 		variables
 		{
-			PRODUCTNAME OpenOffice.org
+			PRODUCTNAME LibreOffice
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
@@ -164,14 +164,14 @@ OpenOffice_wJRE
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
 		script			setup_osljre
-		downloadname	OOo_{productversion}_{os}_installwjre_{languages}
+		downloadname	LO_{productversion}_{os}_installwjre_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
@@ -182,13 +182,13 @@ OpenOffice_Dev
 	{
 		variables
 		{
-			PRODUCTNAME OOo-dev
+			PRODUCTNAME LO-dev
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
-			BASISROOTNAME OOo-dev
-			UNIXBASISROOTNAME ooo-dev
+			BASISROOTNAME LO-dev
+			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
@@ -197,8 +197,8 @@ OpenOffice_Dev
 			BASEPRODUCTVERSION 3.3
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX ooobasis-dev
-			UREPACKAGEPREFIX ooodev
-			SOLSUREPACKAGEPREFIX ooodev
+			UREPACKAGEPREFIX lodev
+			SOLSUREPACKAGEPREFIX lodev
 			REGISTRYLAYERNAME LayerDev
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
@@ -236,15 +236,15 @@ OpenOffice_Dev
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
 		script			setup_osljre
-		downloadname	OOo-dev_{productversion}_{os}_install_{languages}
-		langpackdownloadname	OOo_{productversion}_languagepack_{os}_install_{languages}
+		downloadname	LO-dev_{productversion}_{os}_install_{languages}
+		langpackdownloadname	LO_{productversion}_languagepack_{os}_install_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
@@ -298,7 +298,7 @@ OpenOffice_SDK
         downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME OpenOffice.org
+            PRODUCTNAME LibreOffice
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
@@ -311,7 +311,7 @@ OpenOffice_SDK
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg33sdk
+            DATABASENAME libreoffice33sdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -343,27 +343,27 @@ OpenOffice_Dev_SDK
         downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME OOo-dev
+            PRODUCTNAME LO-dev
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
-            BASISROOTNAME OOo-dev
-            UNIXBASISROOTNAME ooo-dev
+            BASISROOTNAME LO-dev
+            UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
             PACKAGEVERSION 3.3.0
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX ooobasis-dev
-            UREPACKAGEPREFIX ooodev
-            SOLSUREPACKAGEPREFIX ooodev
+            UREPACKAGEPREFIX lodev
+            SOLSUREPACKAGEPREFIX lodev
             REGISTRYLAYERNAME LayerDev
 			DEVELOPMENTPRODUCT 1
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg33devsdk
+            DATABASENAME libreoffice33devsdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -445,7 +445,7 @@ BrOffice
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
@@ -517,7 +517,7 @@ BrOffice_wJRE
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
@@ -540,8 +540,8 @@ BrOffice_Dev
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
-			BASISROOTNAME OOo-dev
-			UNIXBASISROOTNAME ooo-dev
+			BASISROOTNAME LO-dev
+			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
@@ -549,8 +549,8 @@ BrOffice_Dev
 			ABOUTBOXPRODUCTVERSION 3.3.0
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX ooobasis-dev
-			UREPACKAGEPREFIX ooodev
-			SOLSUREPACKAGEPREFIX ooodev
+			UREPACKAGEPREFIX lodev
+			SOLSUREPACKAGEPREFIX lodev
 			REGISTRYLAYERNAME LayerDevBroffice
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
@@ -589,7 +589,7 @@ BrOffice_Dev
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OpenOffice.org
+            REGISTRATION_PRODUCT LibreOffice
             REGISTRATION_CID 926117
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
index 93d938531abe..2c4696dacc43 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -32,4 +32,4 @@ en-US = "From Template"
 en-US = "Open Document"
 
 [STR_FI_TOOLTIP_SOFFICE]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle."
+en-US = "LibreOffice, the office productivity suite provided by The Document Foundation. See http://www.documentfoundation.org"
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 59ef1673d727..787244a98f71 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -206,7 +206,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "HelpLink";
-    Value = "http://www.openoffice.org/servlets/HelpTOC";
+    Value = "http://www.documentfoundation.org";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Modifypath
@@ -222,7 +222,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "Publisher";
-    Value = "Sun Microsystems, Inc. for the OpenOffice.org-Community";
+    Value = "The The Document Foundation for the LibreOffice Community";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
@@ -238,7 +238,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "URLInfoAbout";
-    Value = "http://www.openoffice.org/";
+    Value = "http://www.documentfoundation.org/";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlupdateinfo
@@ -246,12 +246,12 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "URLUpdateInfo";
-    Value = "http://www.openoffice.org/dev_docs/source/download.html#newsoftware";
+    Value = "http://download.libreoffice.org";
 End
 
 RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION";
+    Subkey = "Software\LibreOffice\%PRODUCTNAME\%PRODUCTVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "Path";
 	Value = "<progpath>\program\soffice.exe";
@@ -277,7 +277,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
@@ -322,7 +322,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
@@ -349,7 +349,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]Basis\\";
@@ -358,7 +358,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]Basis\\";
@@ -385,7 +385,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]URE\\";
@@ -394,7 +394,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]URE\\";
@@ -517,14 +517,14 @@ End
 
 RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\LibreOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Value  = "<progpath>\program";
 End
 
 RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\LibreOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Name = "%PRODUCTNAME %PRODUCTVERSION";
     Value  = "<progpath>\program";
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index d37db89c113a..f8dd53c43c32 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -38,4 +38,4 @@ en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
 en-US = "StarOffice 5.0 Template"
 
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
-en-US = "OpenOffice.org"
+en-US = "LibreOffice"
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index 5fad8fadcbba..8579139f95e3 100755
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -42,9 +42,9 @@ End
 Directory gid_Dir_Ooo_Openofficeorg
     ParentID = PREDEFINED_PROGDIR;
   #ifdef WNT
-    HostName = "OpenOffice.org";
+    HostName = "LibreOffice";
   #else
-    HostName = "openoffice.org";
+    HostName = "libreoffice";
   #endif
     Styles = (ISINSTALLLOCATION);
 End
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
index 4c8b4c5ad2a5..31e0e951102d 100644
--- a/scp2/source/quickstart/registryitem_quickstart.scp
+++ b/scp2/source/quickstart/registryitem_quickstart.scp
@@ -29,7 +29,7 @@
 
 RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org";
+    Subkey = "Software\LibreOffice";
     ModuleID = gid_Module_Optional_Quickstart;
     Name = "QuickStarterInstalled";
     Value = "1";
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 47181c9dc2b1..0f79720972e0 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -82,7 +82,7 @@ End
 Directory gid_Dir_Basis_Sdk
 #if defined MACOSX
     ParentID = PREDEFINED_PROGDIR;
-    DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
+    DosName = "LibreOffice${OOOBASEVERSION}_SDK";
 #else
   #if defined WNT
     ParentID = gid_Dir_Sdkoo_Root;
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index dd2bbbdfb28f..9782db4c9b49 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -467,17 +467,17 @@ sub get_downloadname_productname
 {
     my ($allvariables) = @_;
 
-    my $start = "OOo";
+    my $start = "LO";
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start = "OOo"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LO"; }
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start = "OOo-Dev"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LO-dev" ) { $start = "LO-Dev"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-SDK"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LO-SDK"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-Dev-SDK"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LO-Dev-SDK"; }
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "OOo-URE"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LO-URE"; }
 
     if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; }
 
@@ -1887,7 +1887,7 @@ sub create_link_tree
 {
     my ($sourcedownloadfile, $destfilename, $versionstring) = @_;
 
-    if ( ! $installer::globals::ooouploaddir ) { installer::exiter::exit_program("ERROR: Directory for OOo upload not defined!", "create_link_tree"); }
+    if ( ! $installer::globals::ooouploaddir ) { installer::exiter::exit_program("ERROR: Directory for LO upload not defined!", "create_link_tree"); }
     my $versiondir = $installer::globals::ooouploaddir . $installer::globals::separator . $versionstring;
     my $infoline = "Directory for the link: $versiondir\n";
     push(@installer::globals::logfileinfo, $infoline);
@@ -1906,7 +1906,7 @@ sub create_link_tree
 }
 
 #######################################################
-# Setting supported platform for Sun OpenOffice.org
+# Setting supported platform for LibreOffice
 # builds
 #######################################################
 
@@ -2104,7 +2104,7 @@ sub create_download_sets
 }
 
 ####################################################
-# Creating OOo upload tree
+# Creating LO upload tree
 ####################################################
 
 sub create_download_link_tree
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 8b828b85335f..e6163c245790 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -330,11 +330,11 @@ sub create_epm_header
     my $line = "";
     my $infoline = "";
 
-    # %product OpenOffice.org Software
+    # %product LibreOffice Software
     # %version 2.0
     # %description A really great software
     # %copyright 1999-2003 by OOo
-    # %vendor OpenOffice.org
+    # %vendor LibreOffice
     # %license /test/replace/01/LICENSE01
     # %readme /test/replace/01/README01
     # %requires foo
@@ -560,11 +560,11 @@ sub create_epm_header
                 }
             }
 
-            if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice.org' )
+            if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'libreoffice' )
             {
-                $line = "%provides" . " openoffice.org-unbundled\n";
+                $line = "%provides" . " libreoffice-unbundled\n";
                 push(@epmheader, $line);
-                $line = "%incompat" . " openoffice.org-bundled\n";
+                $line = "%incompat" . " libreoffice-bundled\n";
                 push(@epmheader, $line);
             }
         }
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index a4996945de4d..0f79d6b3b261 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -697,7 +697,7 @@ sub change_patchmetadata_table
     if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
 
     my $manufacturerstring = "ManufacturerName";
-    my $manufacturervalue = "OpenOffice.org";
+    my $manufacturervalue = "LibreOffice";
     if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
 
     my $displaynamestring = "DisplayName";
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index ddc98c43bdb7..a0c47eb68542 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -643,7 +643,7 @@ sub set_manufacturer
 {
     my ($allvariables) = @_;
 
-    my $openofficeproductname = "OpenOffice.org";
+    my $openofficeproductname = "LibreOffice";
     my $sunname = "";
 
 
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 3e090272408d..af8d171aaacf 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -75,11 +75,11 @@ VS_VERSION_INFO versioninfo
 			block "040704E4"
 			{
 				// German StringTable
-				value "CompanyName",		"OpenOffice.org\0"
+                value "CompanyName",		"LibreOffice\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
+                value "LegalCopyright",		S_CRIGHT " The Document Foundation\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3
@@ -88,11 +88,11 @@ VS_VERSION_INFO versioninfo
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName",		"OpenOffice.org\0"
+                value "CompanyName",		"LibreOffice\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
+                value "LegalCopyright", 	S_CRIGHT " The Document Foundation\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3