refactor: rename Firefox related references to their relevant counterparts

2022-09-16 15:41:24 +01:00
parent 8252e45d0f
commit e7824895ad
86 changed files with 785 additions and 783 deletions
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -31,7 +31,7 @@ ifeq ($(OS_ARCH),WINNT)
 # (this dependency should really be just for firefox.exe, not other targets)
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
-EXTRA_DEPS += $(srcdir)/firefox.exe.manifest
+EXTRA_DEPS += $(srcdir)/waterfox.exe.manifest
 endif

 PROGRAMS_DEST = $(DIST)/bin
@@ -102,7 +102,7 @@ tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) $(objdir)/macbuild/Contents/MacOS-
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(dist_dest)/Contents/Resources/document.icns'
 	$(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'
 ifdef MOZ_UPDATER
-	cp -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices'
+	cp -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/net.waterfox.updater' '$(dist_dest)/Contents/Library/LaunchServices'
 endif
 	$(MKDIR) -p '$(dist_dest)/Contents/Frameworks'
 	mv '$(dist_dest)/Contents/Resources/ChannelPrefs.framework' '$(dist_dest)/Contents/Frameworks'
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -201,7 +201,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>@APP_VERSION@</string>
 	<key>CFBundleSignature</key>
-	<string>MOZB</string>
+	<string>WFXB</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -262,7 +262,7 @@
  <string>GeckoNSApplication</string>
 	<key>SMPrivilegedExecutables</key>
 	<dict>
-		<key>org.mozilla.updater</key>
+		<key>net.waterfox.updater</key>
 		<string>@MOZ_SMPRIVILEGEDEXECUTABLES_REQUIREMENTS@</string>
 	</dict>
  <key>MozillaDeveloperRepoPath</key>
--- a/browser/app/module.ver
+++ b/browser/app/module.ver
@@ -1,8 +1,8 @@
-WIN32_MODULE_COMPANYNAME=Mozilla Corporation
-WIN32_MODULE_COPYRIGHT=<EFBFBD>Firefox and Mozilla Developers; available under the MPL 2 license.
+WIN32_MODULE_COMPANYNAME=BrowserWorks Ltd
+WIN32_MODULE_COPYRIGHT=© Waterfox; available under the MPL 2 license.
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
-WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation.
+WIN32_MODULE_TRADEMARKS=Waterfox is a Trademark of BrowserWorks Ltd
 WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
--- a/browser/app/nsBrowserApp.cpp
+++ b/browser/app/nsBrowserApp.cpp
@@ -131,7 +131,7 @@ static MOZ_FORMAT_PRINTF(1, 2) void Output(const char* fmt, ...) {
    decltype(MessageBoxW)* messageBoxW =
        (decltype(MessageBoxW)*)GetProcAddress(user32, "MessageBoxW");
    if (messageBoxW) {
-      messageBoxW(nullptr, wide_msg, L"Firefox",
+      messageBoxW(nullptr, wide_msg, L"Waterfox",
                  MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
    }
    FreeLibrary(user32);
--- a/browser/app/waterfox.exe.manifest
+++ b/browser/app/waterfox.exe.manifest
@@ -3,10 +3,10 @@
 <assemblyIdentity
        version="1.0.0.0"
        processorArchitecture="*"
-        name="Firefox"
+        name="Waterfox"
        type="win32"
 />
-<description>Firefox</description>
+<description>Waterfox</description>
 <dependency>
        <dependentAssembly>
                <assemblyIdentity
--- a/browser/app/winlauncher/ErrorHandler.cpp
+++ b/browser/app/winlauncher/ErrorHandler.cpp
@@ -49,7 +49,7 @@
 #define QUOTE_ME(x) QUOTE_ME2(x)

 #define TELEMETRY_BASE_URL L"https://incoming.telemetry.mozilla.org/submit"
-#define TELEMETRY_NAMESPACE L"/firefox-launcher-process"
+#define TELEMETRY_NAMESPACE L"/waterfox-launcher-process"
 #define TELEMETRY_LAUNCHER_PING_DOCTYPE L"/launcher-process-failure"
 #define TELEMETRY_LAUNCHER_PING_VERSION L"/1"

--- a/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
+++ b/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
@@ -55,7 +55,7 @@ add_task(async function testWritesEnabledOnPrefChange() {
  const firefoxPath = getFirefoxExecutableFile().path;
  let enabled = WindowsRegistry.readRegKey(
    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
    `${firefoxPath}|Enabled`
  );
  is(enabled, 1, "Pre-XUL skeleton UI is enabled in the Windows registry");
@@ -63,7 +63,7 @@ add_task(async function testWritesEnabledOnPrefChange() {
  Services.prefs.setBoolPref("browser.startup.preXulSkeletonUI", false);
  enabled = WindowsRegistry.readRegKey(
    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
    `${firefoxPath}|Enabled`
  );
  is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
@@ -72,7 +72,7 @@ add_task(async function testWritesEnabledOnPrefChange() {
  Services.prefs.setIntPref("browser.tabs.inTitlebar", 0);
  enabled = WindowsRegistry.readRegKey(
    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
    `${firefoxPath}|Enabled`
  );
  is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
@@ -105,7 +105,7 @@ add_task(async function testPersistsNecessaryValuesOnChange() {
  for (let key of regKeys) {
    WindowsRegistry.removeRegKey(
      Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+      "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
      key
    );
  }
@@ -115,7 +115,7 @@ add_task(async function testPersistsNecessaryValuesOnChange() {
  for (let key of regKeys) {
    let value = readRegKeyExtended(
      Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+      "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
      `${firefoxPath}|${key}`
    );
    isnot(
--- a/browser/components/BrowserContentHandler.sys.mjs
+++ b/browser/components/BrowserContentHandler.sys.mjs
@@ -1200,7 +1200,7 @@ nsBrowserContentHandler.prototype = {
      var urlParam = cmdLine.getArgument(urlFlagIdx + 1);
      if (
        cmdLine.length != urlFlagIdx + 2 ||
-        /firefoxurl(-[a-f0-9]+)?:/i.test(urlParam)
+        /waterfoxurl(-[a-f0-9]+)?:/i.test(urlParam)
      ) {
        throw Components.Exception("", Cr.NS_ERROR_ABORT);
      }
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
@@ -876,12 +876,12 @@ BrowserGlue.prototype = {
      if (updateChannel) {
        let uninstalledValue = lazy.WindowsRegistry.readRegKey(
          Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-          "Software\\Mozilla\\Firefox",
+          "Software\\BrowserWorks\\Waterfox",
          `Uninstalled-${updateChannel}`
        );
        let removalSuccessful = lazy.WindowsRegistry.removeRegKey(
          Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-          "Software\\Mozilla\\Firefox",
+          "Software\\BrowserWorks\\Waterfox",
          `Uninstalled-${updateChannel}`
        );
        if (removalSuccessful && uninstalledValue == "True") {
--- a/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js
@@ -1,300 +1,298 @@
-"use strict";
-
 ChromeUtils.defineESModuleGetters(this, {
-  MockRegistry: "resource://testing-common/MockRegistry.sys.mjs",
-  ctypes: "resource://gre/modules/ctypes.sys.mjs",
+	MockRegistry: "resource://testing-common/MockRegistry.sys.mjs",
+	ctypes: "resource://gre/modules/ctypes.sys.mjs",
 });

 do_get_profile();

 let tmpDir;
 let baseDir;
-let slug =
-  AppConstants.platform === "linux" ? "pkcs11-modules" : "PKCS11Modules";
+const slug =
+	AppConstants.platform === "linux" ? "pkcs11-modules" : "PKCS11Modules";

 add_task(async function setupTest() {
-  tmpDir = await IOUtils.createUniqueDirectory(
-    Services.dirsvc.get("TmpD", Ci.nsIFile).path,
-    "PKCS11"
-  );
+	tmpDir = await IOUtils.createUniqueDirectory(
+		Services.dirsvc.get("TmpD", Ci.nsIFile).path,
+		"PKCS11",
+	);

-  baseDir = PathUtils.join(tmpDir, slug);
-  await IOUtils.makeDirectory(baseDir);
+	baseDir = PathUtils.join(tmpDir, slug);
+	await IOUtils.makeDirectory(baseDir);
 });

 registerCleanupFunction(async () => {
-  await IOUtils.remove(tmpDir, { recursive: true });
+	await IOUtils.remove(tmpDir, { recursive: true });
 });

 const testmodule = PathUtils.join(
-  PathUtils.parent(Services.dirsvc.get("CurWorkD", Ci.nsIFile).path, 5),
-  "security",
-  "manager",
-  "ssl",
-  "tests",
-  "unit",
-  "pkcs11testmodule",
-  ctypes.libraryName("pkcs11testmodule")
+	PathUtils.parent(Services.dirsvc.get("CurWorkD", Ci.nsIFile).path, 5),
+	"security",
+	"manager",
+	"ssl",
+	"tests",
+	"unit",
+	"pkcs11testmodule",
+	ctypes.libraryName("pkcs11testmodule"),
 );

 // This function was inspired by the native messaging test under
 // toolkit/components/extensions

 async function setupManifests(modules) {
-  async function writeManifest(module) {
-    let manifest = {
-      name: module.name,
-      description: module.description,
-      path: module.path,
-      type: "pkcs11",
-      allowed_extensions: [module.id],
-    };
+	async function writeManifest(module) {
+		const manifest = {
+			name: module.name,
+			description: module.description,
+			path: module.path,
+			type: "pkcs11",
+			allowed_extensions: [module.id],
+		};

-    let manifestPath = PathUtils.join(baseDir, `${module.name}.json`);
-    await IOUtils.writeJSON(manifestPath, manifest);
+		const manifestPath = PathUtils.join(baseDir, `${module.name}.json`);
+		await IOUtils.writeJSON(manifestPath, manifest);

-    return manifestPath;
-  }
+		return manifestPath;
+	}

-  switch (AppConstants.platform) {
-    case "macosx":
-    case "linux":
-      let dirProvider = {
-        getFile(property) {
-          if (
-            property == "XREUserNativeManifests" ||
-            property == "XRESysNativeManifests"
-          ) {
-            return new FileUtils.File(tmpDir);
-          }
-          return null;
-        },
-      };
+	switch (AppConstants.platform) {
+		case "macosx":
+		case "linux":
+			const dirProvider = {
+				getFile(property) {
+					if (
+						property == "XREUserNativeManifests" ||
+						property == "XRESysNativeManifests"
+					) {
+						return new FileUtils.File(tmpDir);
+					}
+					return null;
+				},
+			};

-      Services.dirsvc.registerProvider(dirProvider);
-      registerCleanupFunction(() => {
-        Services.dirsvc.unregisterProvider(dirProvider);
-      });
+			Services.dirsvc.registerProvider(dirProvider);
+			registerCleanupFunction(() => {
+				Services.dirsvc.unregisterProvider(dirProvider);
+			});

-      for (let module of modules) {
-        await writeManifest(module);
-      }
-      break;
+			for (const module of modules) {
+				await writeManifest(module);
+			}
+			break;

-    case "win":
-      const REGKEY = String.raw`Software\Mozilla\PKCS11Modules`;
+		case "win":
+			const REGKEY = String.raw`Software\BrowserWorks\PKCS11Modules`;

-      let registry = new MockRegistry();
-      registerCleanupFunction(() => {
-        registry.shutdown();
-      });
+			const registry = new MockRegistry();
+			registerCleanupFunction(() => {
+				registry.shutdown();
+			});

-      for (let module of modules) {
-        let manifestPath = await writeManifest(module);
-        registry.setValue(
-          Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-          `${REGKEY}\\${module.name}`,
-          "",
-          manifestPath
-        );
-      }
-      break;
+			for (const module of modules) {
+				const manifestPath = await writeManifest(module);
+				registry.setValue(
+					Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
+					`${REGKEY}\\${module.name}`,
+					"",
+					manifestPath,
+				);
+			}
+			break;

-    default:
-      ok(
-        false,
-        `Loading of PKCS#11 modules is not supported on ${AppConstants.platform}`
-      );
-  }
+		default:
+			ok(
+				false,
+				`Loading of PKCS#11 modules is not supported on ${AppConstants.platform}`,
+			);
+	}
 }

 add_task(async function test_pkcs11() {
-  async function background() {
-    try {
-      const { os } = await browser.runtime.getPlatformInfo();
-      if (os !== "win") {
-        // Expect this call to not throw (explicitly cover regression fixed in Bug 1759162).
-        let isInstalledNonAbsolute = await browser.pkcs11.isModuleInstalled(
-          "testmoduleNonAbsolutePath"
-        );
-        browser.test.assertFalse(
-          isInstalledNonAbsolute,
-          "PKCS#11 module with non absolute path expected to not be installed"
-        );
-      }
-      let isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
-      browser.test.assertFalse(
-        isInstalled,
-        "PKCS#11 module is not installed before we install it"
-      );
-      await browser.pkcs11.installModule("testmodule", 0);
-      isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
-      browser.test.assertTrue(
-        isInstalled,
-        "PKCS#11 module is installed after we install it"
-      );
-      let slots = await browser.pkcs11.getModuleSlots("testmodule");
-      browser.test.assertEq(
-        "Test PKCS11 Slot",
-        slots[0].name,
-        "The first slot name matches the expected name"
-      );
-      browser.test.assertEq(
-        "Test PKCS11 Slot 二",
-        slots[1].name,
-        "The second slot name matches the expected name"
-      );
-      browser.test.assertTrue(slots[1].token, "The second slot has a token");
-      browser.test.assertFalse(slots[2].token, "The third slot has no token");
-      browser.test.assertEq(
-        "Test PKCS11 Tokeñ 2 Label",
-        slots[1].token.name,
-        "The token name matches the expected name"
-      );
-      browser.test.assertEq(
-        "Test PKCS11 Manufacturer ID",
-        slots[1].token.manufacturer,
-        "The token manufacturer matches the expected manufacturer"
-      );
-      browser.test.assertEq(
-        "0.0",
-        slots[1].token.HWVersion,
-        "The token hardware version matches the expected version"
-      );
-      browser.test.assertEq(
-        "0.0",
-        slots[1].token.FWVersion,
-        "The token firmware version matches the expected version"
-      );
-      browser.test.assertEq(
-        "",
-        slots[1].token.serial,
-        "The token has no serial number"
-      );
-      browser.test.assertFalse(
-        slots[1].token.isLoggedIn,
-        "The token is not logged in"
-      );
-      await browser.pkcs11.uninstallModule("testmodule");
-      isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
-      browser.test.assertFalse(
-        isInstalled,
-        "PKCS#11 module is no longer installed after we uninstall it"
-      );
-      await browser.pkcs11.installModule("testmodule");
-      isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
-      browser.test.assertTrue(
-        isInstalled,
-        "Installing the PKCS#11 module without flags parameter succeeds"
-      );
-      await browser.pkcs11.uninstallModule("testmodule");
-      await browser.test.assertRejects(
-        browser.pkcs11.isModuleInstalled("nonexistingmodule"),
-        /No such PKCS#11 module nonexistingmodule/,
-        "We cannot access modules if no JSON file exists"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.isModuleInstalled("othermodule"),
-        /No such PKCS#11 module othermodule/,
-        "We cannot access modules if we're not listed in the module's manifest file's allowed_extensions key"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.uninstallModule("internalmodule"),
-        /No such PKCS#11 module internalmodule/,
-        "We cannot uninstall the NSS Builtin Roots Module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.installModule("osclientcerts", 0),
-        /No such PKCS#11 module osclientcerts/,
-        "installModule should not work on the built-in osclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.uninstallModule("osclientcerts"),
-        /No such PKCS#11 module osclientcerts/,
-        "uninstallModule should not work on the built-in osclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.isModuleInstalled("osclientcerts"),
-        /No such PKCS#11 module osclientcerts/,
-        "isModuleLoaded should not work on the built-in osclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.getModuleSlots("osclientcerts"),
-        /No such PKCS#11 module osclientcerts/,
-        "getModuleSlots should not work on the built-in osclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.installModule("ipcclientcerts", 0),
-        /No such PKCS#11 module ipcclientcerts/,
-        "installModule should not work on the built-in ipcclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.uninstallModule("ipcclientcerts"),
-        /No such PKCS#11 module ipcclientcerts/,
-        "uninstallModule should not work on the built-in ipcclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.isModuleInstalled("ipcclientcerts"),
-        /No such PKCS#11 module ipcclientcerts/,
-        "isModuleLoaded should not work on the built-in ipcclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.getModuleSlots("ipcclientcerts"),
-        /No such PKCS#11 module ipcclientcerts/,
-        "getModuleSlots should not work on the built-in ipcclientcerts module"
-      );
-      browser.test.notifyPass("pkcs11");
-    } catch (e) {
-      browser.test.fail(`Error: ${String(e)} :: ${e.stack}`);
-      browser.test.notifyFail("pkcs11 failed");
-    }
-  }
+	async function background() {
+		try {
+			const { os } = await browser.runtime.getPlatformInfo();
+			if (os !== "win") {
+				// Expect this call to not throw (explicitly cover regression fixed in Bug 1759162).
+				const isInstalledNonAbsolute = await browser.pkcs11.isModuleInstalled(
+					"testmoduleNonAbsolutePath",
+				);
+				browser.test.assertFalse(
+					isInstalledNonAbsolute,
+					"PKCS#11 module with non absolute path expected to not be installed",
+				);
+			}
+			let isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
+			browser.test.assertFalse(
+				isInstalled,
+				"PKCS#11 module is not installed before we install it",
+			);
+			await browser.pkcs11.installModule("testmodule", 0);
+			isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
+			browser.test.assertTrue(
+				isInstalled,
+				"PKCS#11 module is installed after we install it",
+			);
+			const slots = await browser.pkcs11.getModuleSlots("testmodule");
+			browser.test.assertEq(
+				"Test PKCS11 Slot",
+				slots[0].name,
+				"The first slot name matches the expected name",
+			);
+			browser.test.assertEq(
+				"Test PKCS11 Slot 二",
+				slots[1].name,
+				"The second slot name matches the expected name",
+			);
+			browser.test.assertTrue(slots[1].token, "The second slot has a token");
+			browser.test.assertFalse(slots[2].token, "The third slot has no token");
+			browser.test.assertEq(
+				"Test PKCS11 Tokeñ 2 Label",
+				slots[1].token.name,
+				"The token name matches the expected name",
+			);
+			browser.test.assertEq(
+				"Test PKCS11 Manufacturer ID",
+				slots[1].token.manufacturer,
+				"The token manufacturer matches the expected manufacturer",
+			);
+			browser.test.assertEq(
+				"0.0",
+				slots[1].token.HWVersion,
+				"The token hardware version matches the expected version",
+			);
+			browser.test.assertEq(
+				"0.0",
+				slots[1].token.FWVersion,
+				"The token firmware version matches the expected version",
+			);
+			browser.test.assertEq(
+				"",
+				slots[1].token.serial,
+				"The token has no serial number",
+			);
+			browser.test.assertFalse(
+				slots[1].token.isLoggedIn,
+				"The token is not logged in",
+			);
+			await browser.pkcs11.uninstallModule("testmodule");
+			isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
+			browser.test.assertFalse(
+				isInstalled,
+				"PKCS#11 module is no longer installed after we uninstall it",
+			);
+			await browser.pkcs11.installModule("testmodule");
+			isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
+			browser.test.assertTrue(
+				isInstalled,
+				"Installing the PKCS#11 module without flags parameter succeeds",
+			);
+			await browser.pkcs11.uninstallModule("testmodule");
+			await browser.test.assertRejects(
+				browser.pkcs11.isModuleInstalled("nonexistingmodule"),
+				/No such PKCS#11 module nonexistingmodule/,
+				"We cannot access modules if no JSON file exists",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.isModuleInstalled("othermodule"),
+				/No such PKCS#11 module othermodule/,
+				"We cannot access modules if we're not listed in the module's manifest file's allowed_extensions key",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.uninstallModule("internalmodule"),
+				/No such PKCS#11 module internalmodule/,
+				"We cannot uninstall the NSS Builtin Roots Module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.installModule("osclientcerts", 0),
+				/No such PKCS#11 module osclientcerts/,
+				"installModule should not work on the built-in osclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.uninstallModule("osclientcerts"),
+				/No such PKCS#11 module osclientcerts/,
+				"uninstallModule should not work on the built-in osclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.isModuleInstalled("osclientcerts"),
+				/No such PKCS#11 module osclientcerts/,
+				"isModuleLoaded should not work on the built-in osclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.getModuleSlots("osclientcerts"),
+				/No such PKCS#11 module osclientcerts/,
+				"getModuleSlots should not work on the built-in osclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.installModule("ipcclientcerts", 0),
+				/No such PKCS#11 module ipcclientcerts/,
+				"installModule should not work on the built-in ipcclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.uninstallModule("ipcclientcerts"),
+				/No such PKCS#11 module ipcclientcerts/,
+				"uninstallModule should not work on the built-in ipcclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.isModuleInstalled("ipcclientcerts"),
+				/No such PKCS#11 module ipcclientcerts/,
+				"isModuleLoaded should not work on the built-in ipcclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.getModuleSlots("ipcclientcerts"),
+				/No such PKCS#11 module ipcclientcerts/,
+				"getModuleSlots should not work on the built-in ipcclientcerts module",
+			);
+			browser.test.notifyPass("pkcs11");
+		} catch (e) {
+			browser.test.fail(`Error: ${String(e)} :: ${e.stack}`);
+			browser.test.notifyFail("pkcs11 failed");
+		}
+	}

-  let libDir = FileUtils.getDir("GreBinD", []);
-  await setupManifests([
-    {
-      name: "testmodule",
-      description: "PKCS#11 Test Module",
-      path: testmodule,
-      id: "pkcs11@tests.mozilla.org",
-    },
-    {
-      name: "testmoduleNonAbsolutePath",
-      description: "PKCS#11 Test Module",
-      path: ctypes.libraryName("pkcs11testmodule"),
-      id: "pkcs11@tests.mozilla.org",
-    },
-    {
-      name: "othermodule",
-      description: "PKCS#11 Test Module",
-      path: testmodule,
-      id: "other@tests.mozilla.org",
-    },
-    {
-      name: "internalmodule",
-      description: "Builtin Roots Module",
-      path: PathUtils.join(
-        Services.dirsvc.get("CurWorkD", Ci.nsIFile).path,
-        ctypes.libraryName("nssckbi")
-      ),
-      id: "pkcs11@tests.mozilla.org",
-    },
-    {
-      name: "osclientcerts",
-      description: "OS Client Cert Module",
-      path: PathUtils.join(libDir.path, ctypes.libraryName("osclientcerts")),
-      id: "pkcs11@tests.mozilla.org",
-    },
-  ]);
+	const libDir = FileUtils.getDir("GreBinD", []);
+	await setupManifests([
+		{
+			name: "testmodule",
+			description: "PKCS#11 Test Module",
+			path: testmodule,
+			id: "pkcs11@tests.mozilla.org",
+		},
+		{
+			name: "testmoduleNonAbsolutePath",
+			description: "PKCS#11 Test Module",
+			path: ctypes.libraryName("pkcs11testmodule"),
+			id: "pkcs11@tests.mozilla.org",
+		},
+		{
+			name: "othermodule",
+			description: "PKCS#11 Test Module",
+			path: testmodule,
+			id: "other@tests.mozilla.org",
+		},
+		{
+			name: "internalmodule",
+			description: "Builtin Roots Module",
+			path: PathUtils.join(
+				Services.dirsvc.get("CurWorkD", Ci.nsIFile).path,
+				ctypes.libraryName("nssckbi"),
+			),
+			id: "pkcs11@tests.mozilla.org",
+		},
+		{
+			name: "osclientcerts",
+			description: "OS Client Cert Module",
+			path: PathUtils.join(libDir.path, ctypes.libraryName("osclientcerts")),
+			id: "pkcs11@tests.mozilla.org",
+		},
+	]);

-  let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      permissions: ["pkcs11"],
-      browser_specific_settings: { gecko: { id: "pkcs11@tests.mozilla.org" } },
-    },
-    background: background,
-  });
-  await extension.startup();
-  await extension.awaitFinish("pkcs11");
-  await extension.unload();
+	const extension = ExtensionTestUtils.loadExtension({
+		manifest: {
+			permissions: ["pkcs11"],
+			browser_specific_settings: { gecko: { id: "pkcs11@tests.mozilla.org" } },
+		},
+		background: background,
+	});
+	await extension.startup();
+	await extension.awaitFinish("pkcs11");
+	await extension.unload();
 });
--- a/browser/components/installerprefs/InstallerPrefs.sys.mjs
+++ b/browser/components/installerprefs/InstallerPrefs.sys.mjs
@@ -45,7 +45,7 @@ export function InstallerPrefs(prefsList) {
  // "Software\Mozilla\Firefox\Installer\71AE18FE3142402B\".
  ChromeUtils.defineLazyGetter(this, "_registryKeyPath", function () {
    const app = AppConstants.MOZ_APP_NAME;
-    const vendor = Services.appinfo.vendor || "Mozilla";
+    const vendor = Services.appinfo.vendor || "BrowserWorks";
    const xreDirProvider = Cc[
      "@mozilla.org/xre/directory-provider;1"
    ].getService(Ci.nsIXREDirProvider);
--- a/browser/components/shell/ShellService.sys.mjs
+++ b/browser/components/shell/ShellService.sys.mjs
@@ -261,10 +261,10 @@ let ShellServiceInternal = {
        lazy.NimbusFeatures.shellService.getVariable("setDefaultPDFHandler")
      ) {
        if (this._shouldSetDefaultPDFHandler()) {
-          lazy.log.info("Setting Firefox as default PDF handler");
-          extraFileExtensions.push(".pdf", "FirefoxPDF");
+          lazy.log.info("Setting Waterfox as default PDF handler");
+          extraFileExtensions.push(".pdf", "WaterfoxPDF");
        } else {
-          lazy.log.info("Not setting Firefox as default PDF handler");
+          lazy.log.info("Not setting Waterfox as default PDF handler");
        }
      }
      try {
@@ -300,7 +300,7 @@ let ShellServiceInternal = {
      try {
        this.defaultAgent.setDefaultExtensionHandlersUserChoice(aumi, [
          ".pdf",
-          "FirefoxPDF",
+          "WaterfoxPDF",
        ]);
      } catch (err) {
        telemetryResult = "ErrOther";
--- a/browser/components/shell/WindowsDefaultBrowser.cpp
+++ b/browser/components/shell/WindowsDefaultBrowser.cpp
@@ -25,7 +25,7 @@
 #include <wchar.h>
 #include <windows.h>

-#define APP_REG_NAME_BASE L"Firefox-"
+#define APP_REG_NAME_BASE L"Waterfox-"

 static bool IsWindowsLogonConnected() {
  WCHAR userName[UNLEN + 1];
--- a/browser/components/shell/WindowsUserChoice.h
+++ b/browser/components/shell/WindowsUserChoice.h
@@ -96,7 +96,7 @@ mozilla::UniquePtr<wchar_t[]> GenerateUserChoiceHash(const wchar_t* aExt,
 /*
 * Build a ProgID from a base and AUMI
 *
- * @param aProgIDBase   A base, such as FirefoxHTML or FirefoxURL
+ * @param aProgIDBase   A base, such as WaterfoxHTML or WaterfoxURL
 * @param aAumi         The AUMI of the installation
 *
 * @return Formatted ProgID.
--- a/browser/components/shell/nsWindowsShellService.cpp
+++ b/browser/components/shell/nsWindowsShellService.cpp
@@ -339,21 +339,21 @@ nsWindowsShellService::CheckAllProgIDsExist(bool* aResult) {
    nsresult rv;
    bool result = true;

-    // "FirefoxURL".
+    // "WaterfoxURL".
    rv = GetMsixProgId(L"https", extraProgID);
    if (NS_WARN_IF(NS_FAILED(rv))) {
      return rv;
    }
    result = result && CheckProgIDExists(extraProgID.get());

-    // "FirefoxHTML".
+    // "WaterfoxHTML".
    rv = GetMsixProgId(L".htm", extraProgID);
    if (NS_WARN_IF(NS_FAILED(rv))) {
      return rv;
    }
    result = result && CheckProgIDExists(extraProgID.get());

-    // "FirefoxPDF".
+    // "WaterfoxPDF".
    rv = GetMsixProgId(L".pdf", extraProgID);
    if (NS_WARN_IF(NS_FAILED(rv))) {
      return rv;
@@ -363,9 +363,9 @@ nsWindowsShellService::CheckAllProgIDsExist(bool* aResult) {
    *aResult = result;
  } else {
    *aResult =
-        CheckProgIDExists(FormatProgID(L"FirefoxURL", aumid.get()).get()) &&
-        CheckProgIDExists(FormatProgID(L"FirefoxHTML", aumid.get()).get()) &&
-        CheckProgIDExists(FormatProgID(L"FirefoxPDF", aumid.get()).get());
+        CheckProgIDExists(FormatProgID(L"WaterfoxURL", aumid.get()).get()) &&
+        CheckProgIDExists(FormatProgID(L"WaterfoxHTML", aumid.get()).get()) &&
+        CheckProgIDExists(FormatProgID(L"WaterfoxPDF", aumid.get()).get());
  }

  return NS_OK;
@@ -712,7 +712,7 @@ nsWindowsShellService::SetDesktopBackground(dom::Element* aElement,
                              getter_AddRefs(file));
  NS_ENSURE_SUCCESS(rv, rv);

-  // eventually, the path is "%APPDATA%\Mozilla\Firefox\Desktop Background.bmp"
+  // eventually, the path is "%APPDATA%\BrowserWorks\Waterfox\Desktop Background.bmp"
  rv = file->Append(fileLeafName);
  NS_ENSURE_SUCCESS(rv, rv);

--- a/browser/components/shell/test/browser_setDefaultPDFHandler.js
+++ b/browser/components/shell/test/browser_setDefaultPDFHandler.js
@@ -82,7 +82,7 @@ add_task(async function remoteEnableWithPDF() {
  Assert.ok(setDefaultBrowserUserChoiceStub.called);
  Assert.deepEqual(setDefaultBrowserUserChoiceStub.firstCall.args, [
    aumi,
-    [".pdf", "FirefoxPDF"],
+    [".pdf", "WaterfoxPDF"],
  ]);

  await doCleanup();
@@ -129,7 +129,7 @@ add_task(async function remoteEnableWithPDF_testOnlyReplaceBrowsers() {
    Assert.ok(setDefaultBrowserUserChoiceStub.called);
    Assert.deepEqual(
      setDefaultBrowserUserChoiceStub.firstCall.args,
-      [aumi, [".pdf", "FirefoxPDF"]],
+      [aumi, [".pdf", "WaterfoxPDF"]],
      `Will take default from missing association or known browser with ProgID '${progId}'`
    );
  }
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -6,8 +6,8 @@
 #

 # updater on osx is bug 1311194
-LaunchServices/org.mozilla.updater
-updater.app/Contents/MacOS/org.mozilla.updater
+LaunchServices/net.waterfox.updater
+updater.app/Contents/MacOS/net.waterfox.updater

 plugin-container.app/Contents/PkgInfo
 updater.app/Contents/PkgInfo
--- a/browser/installer/windows/app.tag
+++ b/browser/installer/windows/app.tag
@@ -1,4 +1,4 @@
 ;!@Install@!UTF-8!
-Title="Mozilla Firefox"
+Title="Waterfox"
 RunProgram="setup.exe"
 ;!@InstallEnd@!
--- a/browser/installer/windows/moz.build
+++ b/browser/installer/windows/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DEFINES["APP_VERSION"] = CONFIG["MOZ_APP_VERSION"]
+DEFINES["APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]

 DEFINES["MOZ_APP_NAME"] = CONFIG["MOZ_APP_NAME"]
 DEFINES["MOZ_APP_DISPLAYNAME"] = CONFIG["MOZ_APP_DISPLAYNAME"]
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/browser/installer/windows/nsis/defines.nsi.in
@@ -23,21 +23,22 @@
 !endif

 # These defines should match application.ini settings
-!define AppName               "Firefox"
+!define AppName               "Waterfox"
 !define AppVersion            "@APP_VERSION@"
+!define AppVersionDisplay     "@APP_VERSION_DISPLAY@"
 !define GREVersion            @MOZILLA_VERSION@
 !define AB_CD                 "@AB_CD@"
 !define MOZ_BUILDID           "@MOZ_BUILDID@"

 !define FileMainEXE           "@MOZ_APP_NAME@.exe"
 !define PrivateBrowsingEXE    "private_browsing.exe"
-!define MainWindowClass       "MozillaWindowClass"
-!define DialogWindowClass     "MozillaDialogClass"
-!define DDEApplication        "Firefox"
-!define AppRegName            "Firefox"
+!define MainWindowClass       "WaterfoxWindowClass"
+!define DialogWindowClass     "WaterfoxDialogClass"
+!define DDEApplication        "Waterfox"
+!define AppRegName            "Waterfox"
 !define ToastAumidPrefix      "@MOZ_TOAST_APP_NAME@Toast-"

-!define BrandProductName      "Firefox"
+!define BrandProductName      "Waterfox"
 !ifndef DEV_EDITION
 !define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
 !endif
@@ -56,12 +57,12 @@
 ; private_browsing.exe (as opposed to @MOZ_APP_NAME@.exe)
 !define IDI_PBICON_PB_EXE_ZERO_BASED "0"

-!define CERTIFICATE_NAME            "Mozilla Corporation"
-!define CERTIFICATE_ISSUER          "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1"
+!define CERTIFICATE_NAME            "WATERFOX LIMITED"
+!define CERTIFICATE_ISSUER          "GlobalSign GCC R45 EV CodeSigning CA 2020"
 ; Changing the name or issuer requires us to have both the old and the new
 ;  in the registry at the same time, temporarily.
-!define CERTIFICATE_NAME_PREVIOUS   "Mozilla Corporation"
-!define CERTIFICATE_ISSUER_PREVIOUS "DigiCert SHA2 Assured ID Code Signing CA"
+!define CERTIFICATE_NAME_PREVIOUS   "WATERFOX LIMITED"
+!define CERTIFICATE_ISSUER_PREVIOUS "GlobalSign GCC R45 EV CodeSigning CA 2020"

 # LSP_CATEGORIES is the permitted LSP categories for the application. Each LSP
 # category value is ANDed together to set multiple permitted categories.
@@ -77,7 +78,7 @@

 #ifdef MOZ_LAUNCHER_PROCESS
 !define MOZ_LAUNCHER_PROCESS
-!define MOZ_LAUNCHER_SUBKEY "Software\Mozilla\${AppName}\Launcher"
+!define MOZ_LAUNCHER_SUBKEY "Software\BrowserWorks\${AppName}\Launcher"
 #endif

 #ifdef RELEASE_OR_BETA
@@ -90,7 +91,7 @@
 !define BETA_UPDATE_CHANNEL
 !endif

-!define BaseURLStubPing "http://download-stats.mozilla.org/stub"
+!define BaseURLStubPing ""

 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
@@ -148,7 +149,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
 !define APPROXIMATE_REQUIRED_SPACE_MB "145"

 # Constants for parts of the telemetry submission URL
-!define TELEMETRY_BASE_URL https://incoming.telemetry.mozilla.org/submit
+!define TELEMETRY_BASE_URL
 !define TELEMETRY_NAMESPACE firefox-installer
 !define TELEMETRY_INSTALL_PING_VERSION 1
 !define TELEMETRY_INSTALL_PING_DOCTYPE install
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -76,7 +76,7 @@ Var PostSigningData
 ; are a member of the Administrators group.
 !define NONADMIN_ELEVATE

-!define AbortSurveyURL "http://www.kampyle.com/feedback_form/ff-feedback-form.php?site_code=8166124&form_id=12116&url="
+!define AbortSurveyURL "https://survey.waterfox.net/Desktop-Abort?channel=${UpdateChannel}&version=${AppVersion}&step="

 ; Other included files may depend upon these includes!
 ; The following includes are provided by NSIS.
@@ -310,10 +310,10 @@ Section "-InstallStartCleanup"
  ${EndIf}

  ; setup the application model id registration value
-  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+  ${InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"

  ; Clean up old maintenance service logs
-  ${CleanMaintenanceServiceLogs} "Mozilla\Firefox"
+  ${CleanMaintenanceServiceLogs} "BrowserWorks\Waterfox"

  ${RemoveDeprecatedFiles}
  ${RemovePrecompleteEntries} "false"
@@ -421,25 +421,25 @@ Section "-Application" APP_IDX

  ${LogHeader} "Adding Registry Entries"
  SetShellVarContext current  ; Set SHCTX to HKCU
-  ${RegCleanMain} "Software\Mozilla"
+  ${RegCleanMain} "Software\BrowserWorks"
  ${RegCleanUninstall}
  ${UpdateProtocolHandlers}

  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" "Write Test"
  ${If} ${Errors}
    StrCpy $RegHive "HKCU"
  ${Else}
    SetShellVarContext all  ; Set SHCTX to HKLM
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
    StrCpy $RegHive "HKLM"
-    ${RegCleanMain} "Software\Mozilla"
+    ${RegCleanMain} "Software\BrowserWorks"
    ${RegCleanUninstall}
    ${UpdateProtocolHandlers}

-    ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
+    ReadRegStr $0 HKLM "Software\waterfox.net\Waterfox" "CurrentVersion"
    ${If} "$0" != "${GREVersion}"
-      WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
+      WriteRegStr HKLM "Software\waterfox.net\Waterfox" "CurrentVersion" "${GREVersion}"
    ${EndIf}
  ${EndIf}

@@ -470,11 +470,11 @@ Section "-Application" APP_IDX

  ; In Win8, the delegate execute handler picks up the value in FirefoxURL- and
  ; FirefoxHTML- to launch the desktop browser when it needs to.
-  ${AddDisabledDDEHandlerValues} "FirefoxHTML-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxHTML-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                 "${AppRegName} HTML Document" ""
-  ${AddDisabledDDEHandlerValues} "FirefoxPDF-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxPDF-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
                                 "${AppRegName} PDF Document" ""
-  ${AddDisabledDDEHandlerValues} "FirefoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                 "${AppRegName} URL" "true"

  ; The keys below can be set in HKCU if needed.
@@ -738,7 +738,7 @@ Section "-Application" APP_IDX
  ${EndIf}
  ; Remember whether we were told to skip registering the agent, so that updates
  ; won't try to create a registration when they don't find an existing one.
-  WriteRegDWORD HKCU "Software\Mozilla\${AppName}\Installer\$AppUserModelID" \
+  WriteRegDWORD HKCU "Software\BrowserWorks\${AppName}\Installer\$AppUserModelID" \
                     "DidRegisterDefaultBrowserAgent" $RegisterDefaultAgent
 !endif

@@ -837,7 +837,7 @@ Section "-InstallEndCleanup"
  ; When we're using the GUI, .onGUIEnd sends the ping, but of course that isn't
  ; invoked when we're running silently.
  ${If} ${Silent}
-    Call SendPing
+    ; Call SendPing
  ${EndIf}
 SectionEnd

@@ -1071,12 +1071,12 @@ Function SendPing
  ${EndIf}

  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" \
                   "Write Test"
  ${If} ${Errors}
    nsJSON::Set /tree ping "Data" "admin_user" /value false
  ${Else}
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
    nsJSON::Set /tree ping "Data" "admin_user" /value true
  ${EndIf}

@@ -1101,7 +1101,7 @@ Function SendPing
    ${If} $1 == $INSTDIR
      nsJSON::Set /tree ping "Data" "new_default" /value true
    ${Else}
-      StrCpy $0 "$0" "" -11 # 11 == length of "firefox.exe"
+      StrCpy $0 "$0" "" -12 # 11 == length of "waterfox.exe"
      ${If} "$0" == "${FileMainEXE}"
        nsJSON::Set /tree ping "Data" "old_default" /value true
      ${EndIf}
@@ -1209,12 +1209,12 @@ Function WriteInstallationTelemetryData
  ; Check for write access to HKLM, if successful then report this user
  ; as an (elevated) admin.
  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" \
                   "Write Test"
  ${If} ${Errors}
    StrCpy $1 "false"
  ${Else}
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
    StrCpy $1 "true"
  ${EndIf}
  ${JSONSet} "admin_user" /value $1
@@ -1229,7 +1229,7 @@ Function WriteInstallationTelemetryData
  ; Check for top-level profile directory
  ; Note: This is the same check used to set $ExistingProfile in stub.nsi
  ${GetLocalAppDataFolder} $0
-  ${If} ${FileExists} "$0\Mozilla\Firefox"
+  ${If} ${FileExists} "$0\BrowserWorks\Waterfox"
    StrCpy $1 "true"
  ${Else}
    StrCpy $1 "false"
@@ -1430,7 +1430,7 @@ FunctionEnd
 !ifdef MOZ_MAINTENANCE_SERVICE
 Function preComponents
  ; If the service already exists, don't show this page
-  ServicesHelper::IsInstalled "MozillaMaintenance"
+  ServicesHelper::IsInstalled "WaterfoxMaintenance"
  Pop $R9
  ${If} $R9 == 1
    ; The service already exists so don't show this page.
@@ -1447,13 +1447,13 @@ Function preComponents

  ; Only show the maintenance service page if we have write access to HKLM
  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" \
+  WriteRegStr HKLM "Software\BrowserWorks" \
              "${BrandShortName}InstallerTest" "Write Test"
  ${If} ${Errors}
    ClearErrors
    Abort
  ${Else}
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
  ${EndIf}

  StrCpy $PageName "Components"
@@ -1766,10 +1766,10 @@ Function .onInit
 !endif

  SetShellVarContext all
-  ${GetFirstInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $0
+  ${GetFirstInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $0
  ${If} "$0" == "false"
    SetShellVarContext current
-    ${GetFirstInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $0
+    ${GetFirstInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $0
    ${If} "$0" == "false"
      StrCpy $HadOldInstall false
    ${Else}
@@ -1965,5 +1965,5 @@ FunctionEnd

 Function .onGUIEnd
  ${OnEndCommon}
-  Call SendPing
+  ; Call SendPing
 FunctionEnd
--- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi
+++ b/browser/installer/windows/nsis/maintenanceservice_installer.nsi
@@ -41,16 +41,16 @@ Var BrandFullName
 ; And anyone that wants to run tests themselves should already have 
 ; this installed.
 !define FallbackKey \
-  "SOFTWARE\Mozilla\MaintenanceService\3932ecacee736d366d6436db0f55bce4"
+  "Software\BrowserWorks\MaintenanceService\3932ecacee736d366d6436db0f55bce4"

-!define CompanyName "Mozilla Corporation"
+!define CompanyName "BrowserWorks"
 !define BrandFullNameInternal ""

 ; The following includes are custom.
 !include defines.nsi
 ; We keep defines.nsi defined so that we get other things like
 ; the version number, but we redefine BrandFullName
-!define MaintFullName "Mozilla Maintenance Service"
+!define MaintFullName "Waterfox Maintenance Service"
 !ifdef BrandFullName
 !undef BrandFullName
 !endif
@@ -66,14 +66,14 @@ Name "${MaintFullName}"
 OutFile "maintenanceservice_installer.exe"

 ; Get installation folder from registry if available
-InstallDirRegKey HKLM "Software\Mozilla\MaintenanceService" ""
+InstallDirRegKey HKLM "Software\BrowserWorks\MaintenanceService" ""

 SetOverwrite on

 ; serviceinstall.cpp also uses this key, in case the path is changed, update
 ; there too.
 !define MaintUninstallKey \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService"
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\WaterfoxMaintenanceService"

 ; Always install into the 32-bit location even if we have a 64-bit build.
 ; This is because we use only 1 service for all Firefox channels.
@@ -198,7 +198,7 @@ Section "MaintenanceService"
  WriteRegStr HKLM "${MaintUninstallKey}" "DisplayIcon" \
                   "$INSTDIR\Uninstall.exe,0"
  WriteRegStr HKLM "${MaintUninstallKey}" "DisplayVersion" "${AppVersion}"
-  WriteRegStr HKLM "${MaintUninstallKey}" "Publisher" "Mozilla"
+  WriteRegStr HKLM "${MaintUninstallKey}" "Publisher" "BrowserWorks"
  WriteRegStr HKLM "${MaintUninstallKey}" "Comments" "${BrandFullName}"
  WriteRegDWORD HKLM "${MaintUninstallKey}" "NoModify" 1
  ${GetSize} "$INSTDIR" "/S=0K" $R2 $R3 $R4
@@ -209,9 +209,9 @@ Section "MaintenanceService"
  ; want to install once on the first upgrade to maintenance service.
  ; Also write out that we are currently installed, preferences will check
  ; this value to determine if we should show the service update pref.
-  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
-  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Installed" 1
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "FFPrefetchDisabled"
+  WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Attempted" 1
+  WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Installed" 1
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "FFPrefetchDisabled"

  ; Included here for debug purposes only.  
  ; These keys are used to bypass the installation dir is a valid installation
@@ -295,34 +295,34 @@ Section "Uninstall"
  Push "$INSTDIR\logs\maintenanceservice-uninstall.log"
  Call un.RenameDelete
  SetShellVarContext all
-  Push "$APPDATA\Mozilla\logs\maintenanceservice.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-1.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-1.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-2.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-2.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-3.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-3.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-4.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-4.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-5.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-5.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-6.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-6.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-7.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-7.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-8.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-8.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-9.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-9.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-10.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-10.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-install.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-install.log"
  Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-uninstall.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-uninstall.log"
  Call un.RenameDelete
-  RMDir /REBOOTOK "$APPDATA\Mozilla\logs"
-  RMDir /REBOOTOK "$APPDATA\Mozilla"
+  RMDir /REBOOTOK "$APPDATA\BrowserWorks\logs"
+  RMDir /REBOOTOK "$APPDATA\BrowserWorks"
  RMDir /REBOOTOK "$INSTDIR\logs"
  RMDir /REBOOTOK "$INSTDIR\update"
  RMDir /REBOOTOK "$INSTDIR\UpdateLogs"
@@ -333,8 +333,8 @@ Section "Uninstall"
    SetRegView 64
  ${EndIf}
  DeleteRegKey HKLM "${MaintUninstallKey}"
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "Installed"
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "FFPrefetchDisabled"
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "Installed"
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "FFPrefetchDisabled"
  DeleteRegKey HKLM "${FallbackKey}\"
  ${If} ${RunningX64}
  ${OrIf} ${IsNativeARM64}
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -2,32 +2,32 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-; Generated by DeriveCapabilitySidsFromName with the name "lpacFirefoxInstallFiles"
+; Generated by DeriveCapabilitySidsFromName with the name "H"
 !define LpacFirefoxInstallFilesSid "S-1-15-3-1024-1238444810-1356253261-2257478630-1143196962-1563090664-2414759320-1282101916-4218287853"

 !macro PostUpdate
  ${CreateShortcutsLog}

  ; Remove registry entries for non-existent apps and for apps that point to our
-  ; install location in the Software\Mozilla key and uninstall registry entries
+  ; install location in the Software\BrowserWorks key and uninstall registry entries
  ; that point to our install location for both HKCU and HKLM.
  SetShellVarContext current  ; Set SHCTX to the current user (e.g. HKCU)
-  ${RegCleanMain} "Software\Mozilla"
+  ${RegCleanMain} "Software\BrowserWorks"
  ${RegCleanUninstall}
  ${UpdateProtocolHandlers}

  ; setup the application model id registration value
-  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+  ${InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"

  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" "Write Test"
  ${If} ${Errors}
    StrCpy $RegHive "HKCU"
  ${Else}
    SetShellVarContext all    ; Set SHCTX to all users (e.g. HKLM)
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
    StrCpy $RegHive "HKLM"
-    ${RegCleanMain} "Software\Mozilla"
+    ${RegCleanMain} "Software\BrowserWorks"
    ${RegCleanUninstall}
    ${UpdateProtocolHandlers}
    ${FixShellIconHandler} "HKLM"
@@ -36,9 +36,9 @@
    ; Add the Firewall entries after an update
    Call AddFirewallEntries

-    ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
+    ReadRegStr $0 HKLM "Software\waterfox.net\Waterfox" "CurrentVersion"
    ${If} "$0" != "${GREVersion}"
-      WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
+      WriteRegStr HKLM "Software\waterfox.net\Waterfox" "CurrentVersion" "${GREVersion}"
    ${EndIf}
  ${EndIf}

@@ -88,10 +88,10 @@
    ; If it already exists, just delete the appdata one.
    ; It's possible this was for a different install, but it's impossible to
    ; know for sure, so we may as well just get rid of it.
-    Delete /REBOOTOK "$0\Mozilla\Firefox\postSigningData"
+    Delete /REBOOTOK "$0\Waterfox\postSigningData"
  ${Else}
-    ${If} ${FileExists} "$0\Mozilla\Firefox\postSigningData"
-      Rename "$0\Mozilla\Firefox\postSigningData" "$INSTDIR\postSigningData"
+    ${If} ${FileExists} "$0\Waterfox\postSigningData"
+      Rename "$0\Waterfox\postSigningData" "$INSTDIR\postSigningData"
    ${EndIf}
  ${EndIf}

@@ -125,7 +125,7 @@
    ${OrIf} ${IsNativeARM64}
      SetRegView 64
    ${EndIf}
-    ReadRegDWORD $5 HKLM "Software\Mozilla\MaintenanceService" "Attempted"
+    ReadRegDWORD $5 HKLM "Software\BrowserWorks\MaintenanceService" "Attempted"
    ClearErrors
    ${If} ${RunningX64}
    ${OrIf} ${IsNativeARM64}
@@ -173,7 +173,7 @@
 !ifdef MOZ_DEFAULT_BROWSER_AGENT
 ${If} $RegHive == "HKCU"
  ClearErrors
-  ReadRegDWORD $0 HKCU "Software\Mozilla\${AppName}\Installer\$AppUserModelID" \
+  ReadRegDWORD $0 HKCU "Software\BrowserWorks\${AppName}\Installer\$AppUserModelID" \
                    "DidRegisterDefaultBrowserAgent"
  ${If} $0 != 0
  ${OrIf} ${Errors}
@@ -470,35 +470,35 @@ ${RemoveDefaultBrowserAgentShortcut}
  StrCpy $0 "SOFTWARE\Classes"
  StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""

-  ; Associate the file handlers with FirefoxHTML, if they aren't already.
+  ; Associate the file handlers with WaterfoxHTML, if they aren't already.
  ReadRegStr $6 SHCTX "$0\.htm" ""
  ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.htm"   "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.htm"   "" "WaterfoxHTML$5"
  ${EndIf}

  ReadRegStr $6 SHCTX "$0\.html" ""
  ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.html"  "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.html"  "" "WaterfoxHTML$5"
  ${EndIf}

  ReadRegStr $6 SHCTX "$0\.shtml" ""
  ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.shtml" "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.shtml" "" "WaterfoxHTML$5"
  ${EndIf}

  ReadRegStr $6 SHCTX "$0\.xht" ""
  ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.xht"   "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.xht"   "" "WaterfoxHTML$5"
  ${EndIf}

  ReadRegStr $6 SHCTX "$0\.xhtml" ""
  ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.xhtml" "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.xhtml" "" "WaterfoxHTML$5"
  ${EndIf}


@@ -506,25 +506,25 @@ ${RemoveDefaultBrowserAgentShortcut}
  ; https://searchfox.org/mozilla-central/source/browser/installer/windows/msix/AppxManifest.xml.in.
  ; and `os.environment.launched_to_handle` and `os.environment.invoked_to_handle` telemetry in
  ; https://searchfox.org/mozilla-central/source/browser/components/BrowserContentHandler.sys.mjs.
-  ${AddAssociationIfNoneExist} ".oga" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".ogg" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".ogv" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".webm" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".svg" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".webp"  "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".avif" "FirefoxHTML$5"
+  ${AddAssociationIfNoneExist} ".oga" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".ogg" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".ogv" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".webm" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".svg" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".webp"  "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".avif" "WaterfoxHTML$5"

-  ${AddAssociationIfNoneExist} ".pdf" "FirefoxPDF$5"
+  ${AddAssociationIfNoneExist} ".pdf" "WaterfoxPDF$5"

-  ; An empty string is used for the 5th param because FirefoxHTML- is not a
-  ; protocol handler.  Ditto for FirefoxPDF-.
-  ${AddDisabledDDEHandlerValues} "FirefoxHTML$5" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+  ; An empty string is used for the 5th param because WaterfoxHTML- is not a
+  ; protocol handler.  Ditto for WaterfoxPDF-.
+  ${AddDisabledDDEHandlerValues} "WaterfoxHTML$5" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                 "${AppRegName} HTML Document" ""

-  ${AddDisabledDDEHandlerValues} "FirefoxPDF$5" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxPDF$5" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
                                 "${AppRegName} PDF Document" ""

-  ${AddDisabledDDEHandlerValues} "FirefoxURL$5" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" "${AppRegName} URL" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxURL$5" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" "${AppRegName} URL" \
                                 "true"
  ; An empty string is used for the 4th & 5th params because the following
  ; protocol handlers already have a display name and the additional keys
@@ -562,7 +562,7 @@ ${RemoveDefaultBrowserAgentShortcut}
  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
  ${GetLongPath} "$INSTDIR\uninstall\helper.exe" $7

-  ; If we already have keys at the old FIREFOX.EXE path, then just update those.
+  ; If we already have keys at the old WATERFOX.EXE path, then just update those.
  ; We have to be careful to update the existing keys in place so that we don't
  ; create duplicate keys for the same installation, or cause Windows to think
  ; something "suspicious" has happened and it should reset the default browser.
@@ -601,16 +601,16 @@ ${RemoveDefaultBrowserAgentShortcut}
  WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,${IDI_APPICON_ZERO_BASED}"
  WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}"

-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm"   "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html"  "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht"   "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".svg"   "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".webp"  "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".avif"  "FirefoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm"   "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html"  "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht"   "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".svg"   "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".webp"  "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".avif"  "WaterfoxHTML$2"

-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".pdf"   "FirefoxPDF$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".pdf"   "WaterfoxPDF$2"

  WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$1"

@@ -618,9 +618,9 @@ ${RemoveDefaultBrowserAgentShortcut}
  ; entire key, we need to remove any existing registration.
  DeleteRegValue ${RegKey} "$0\Capabilities\URLAssociations" "ftp"

-  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http"   "FirefoxURL$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https"  "FirefoxURL$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "mailto" "FirefoxURL$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http"   "WaterfoxURL$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https"  "WaterfoxURL$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "mailto" "WaterfoxURL$2"

  WriteRegStr ${RegKey} "Software\RegisteredApplications" "$1" "$0\Capabilities"

@@ -703,31 +703,31 @@ ${RemoveDefaultBrowserAgentShortcut}

  ; Running Firefox 64 bit on Windows 64 bit
  ClearErrors
-  ReadRegDWORD $2 HKLM "Software\Mozilla\${AppName}\32to64DidMigrate" "$1"
+  ReadRegDWORD $2 HKLM "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1"
  ; If there were no errors then the system was updated from Firefox 32 bit to
  ; Firefox 64 bit and if the value is already 1 then the registry value has
  ; already been updated in the HKLM registry.
  ${IfNot} ${Errors}
  ${AndIf} $2 != 1
    ClearErrors
-    WriteRegDWORD HKLM "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 1
+    WriteRegDWORD HKLM "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 1
    ${If} ${Errors}
      ; There was an error writing to HKLM so just write it to HKCU
-      WriteRegDWORD HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 1
+      WriteRegDWORD HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 1
    ${Else}
      ; This will delete the value from HKCU if it exists
-      DeleteRegValue HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1"
+      DeleteRegValue HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1"
    ${EndIf}
  ${EndIf}

  ClearErrors
-  ReadRegDWORD $2 HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1"
+  ReadRegDWORD $2 HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1"
  ; If there were no errors then the system was updated from Firefox 32 bit to
  ; Firefox 64 bit and if the value is already 1 then the registry value has
  ; already been updated in the HKCU registry.
  ${IfNot} ${Errors}
  ${AndIf} $2 != 1
-    WriteRegDWORD HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 1
+    WriteRegDWORD HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 1
  ${EndIf}

 !else
@@ -737,14 +737,14 @@ ${RemoveDefaultBrowserAgentShortcut}
  ${OrIf} ${IsNativeARM64}
    ; Running Firefox 32 bit on a Windows 64 bit system
    ClearErrors
-    ReadRegDWORD $2 HKLM "Software\Mozilla\${AppName}\32to64DidMigrate" "$1"
+    ReadRegDWORD $2 HKLM "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1"
    ; If there were errors the value doesn't exist yet.
    ${If} ${Errors}
      ClearErrors
-      WriteRegDWORD HKLM "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 0
+      WriteRegDWORD HKLM "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 0
      ; If there were errors write the value in HKCU.
      ${If} ${Errors}
-        WriteRegDWORD HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 0
+        WriteRegDWORD HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 0
      ${EndIf}
    ${EndIf}
  ${EndIf}
@@ -756,17 +756,17 @@ ${RemoveDefaultBrowserAgentShortcut}
 !macroend
 !define Set32to64DidMigrateReg "!insertmacro Set32to64DidMigrateReg"

-; The IconHandler reference for FirefoxHTML can end up in an inconsistent state
+; The IconHandler reference for WaterfoxHTML can end up in an inconsistent state
 ; due to changes not being detected by the IconHandler for side by side
 ; installs (see bug 268512). The symptoms can be either an incorrect icon or no
 ; icon being displayed for files associated with Firefox (does not use SHCTX).
 !macro FixShellIconHandler RegKey
-  ; Find the correct key to update, either FirefoxHTML or FirefoxHTML-[PathHash]
-  StrCpy $3 "FirefoxHTML-$AppUserModelID"
+  ; Find the correct key to update, either WaterfoxHTML or WaterfoxHTML-[PathHash]
+  StrCpy $3 "WaterfoxHTML-$AppUserModelID"
  ClearErrors
  ReadRegStr $0 ${RegKey} "Software\Classes\$3\DefaultIcon" ""
  ${If} ${Errors}
-    StrCpy $3 "FirefoxHTML"
+    StrCpy $3 "WaterfoxHTML"
  ${EndIf}

  ClearErrors
@@ -781,7 +781,7 @@ ${RemoveDefaultBrowserAgentShortcut}
 !macroend
 !define FixShellIconHandler "!insertmacro FixShellIconHandler"

-; Add Software\Mozilla\ registry entries (uses SHCTX).
+; Add Software\BrowserWorks\ registry entries (uses SHCTX).
 ; This expects $RegHive to already have been set correctly.
 !macro SetAppKeys
  ; Check if this is an ESR release and if so add registry values so it is
@@ -795,14 +795,14 @@ ${RemoveDefaultBrowserAgentShortcut}
  ${EndIf}

  ${GetLongPath} "$INSTDIR" $8
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Main"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Main"
  ${WriteRegStr2} $RegHive "$0" "Install Directory" "$8" 0
  ${WriteRegStr2} $RegHive "$0" "PathToExe" "$8\${FileMainEXE}" 0

-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Uninstall"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Uninstall"
  ${WriteRegStr2} $RegHive "$0" "Description" "${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" 0

-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})"
  ${WriteRegStr2} $RegHive  "$0" "" "${AppVersion}$3 (${ARCH} ${AB_CD})" 0
  ${If} "$3" == ""
    DeleteRegValue SHCTX "$0" "ESR"
@@ -810,14 +810,14 @@ ${RemoveDefaultBrowserAgentShortcut}
    ${WriteRegDWORD2} $RegHive "$0" "ESR" 1 0
  ${EndIf}

-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3\bin"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal} ${AppVersion}$3\bin"
  ${WriteRegStr2} $RegHive "$0" "PathToExe" "$8\${FileMainEXE}" 0

-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3\extensions"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal} ${AppVersion}$3\extensions"
  ${WriteRegStr2} $RegHive "$0" "Components" "$8\components" 0
  ${WriteRegStr2} $RegHive "$0" "Plugins" "$8\plugins" 0

-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal} ${AppVersion}$3"
  ${WriteRegStr2} $RegHive "$0" "GeckoVer" "${GREVersion}" 0
  ${If} "$3" == ""
    DeleteRegValue SHCTX "$0" "ESR"
@@ -825,7 +825,7 @@ ${RemoveDefaultBrowserAgentShortcut}
    ${WriteRegDWORD2} $RegHive "$0" "ESR" 1 0
  ${EndIf}

-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}$3"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal}$3"
  ${WriteRegStr2} $RegHive "$0" "" "${GREVersion}" 0
  ${WriteRegStr2} $RegHive "$0" "CurrentVersion" "${AppVersion}$3 (${ARCH} ${AB_CD})" 0
 !macroend
@@ -875,10 +875,10 @@ ${RemoveDefaultBrowserAgentShortcut}
    ${WriteRegStr2} $1 "$0" "Comments" "${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" 0
    ${WriteRegStr2} $1 "$0" "DisplayIcon" "$8\${FileMainEXE},${IDI_APPICON_ZERO_BASED}" 0
    ${WriteRegStr2} $1 "$0" "DisplayName" "${BrandFullNameInternal}$3 (${ARCH} ${AB_CD})" 0
-    ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0
+    ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersionDisplay}" 0
    ${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0
    ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0
-    ${WriteRegStr2} $1 "$0" "Publisher" "Mozilla" 0
+    ${WriteRegStr2} $1 "$0" "Publisher" "BrowserWorks" 0
    ${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0
    DeleteRegValue SHCTX "$0" "URLInfoAbout"
 ; Don't add URLUpdateInfo which is the release notes url except for the release
@@ -912,7 +912,7 @@ ${RemoveDefaultBrowserAgentShortcut}
 ; HKCU Software\Classes keys when associating handlers. The fix uses the merged
 ; view in HKCR to check for existance of an existing association. This macro
 ; cleans affected installations by removing the HKLM and HKCU value if it is set
-; to FirefoxHTML when there is a value for PersistentHandler or by removing the
+; to WaterfoxHTML when there is a value for PersistentHandler or by removing the
 ; HKCU value when the HKLM value has a value other than an empty string.
 !macro FixBadFileAssociation FILE_TYPE
  ; Only delete the default value in case the key has values for OpenWithList,
@@ -923,16 +923,16 @@ ${RemoveDefaultBrowserAgentShortcut}
  ${WordFind} "$1" "-" "+1{" $1
  ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" ""
  ${If} "$2" != ""
-    ; Since there is a persistent handler remove FirefoxHTML as the default
-    ; value from both HKCU and HKLM if it set to FirefoxHTML.
-    ${If} "$0" == "FirefoxHTML"
+    ; Since there is a persistent handler remove WaterfoxHTML as the default
+    ; value from both HKCU and HKLM if it set to WaterfoxHTML.
+    ${If} "$0" == "WaterfoxHTML"
      DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
    ${EndIf}
-    ${If} "$1" == "FirefoxHTML"
+    ${If} "$1" == "WaterfoxHTML"
      DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
    ${EndIf}
-  ${ElseIf} "$0" == "FirefoxHTML"
-    ; Since HKCU is set to FirefoxHTML remove FirefoxHTML as the default value
+  ${ElseIf} "$0" == "WaterfoxHTML"
+    ; Since HKCU is set to WaterfoxHTML remove WaterfoxHTML as the default value
    ; from HKCU if HKLM is set to a value other than an empty string.
    ${If} "$1" != ""
      DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
@@ -989,36 +989,36 @@ ${RemoveDefaultBrowserAgentShortcut}
  ; Only set the file and protocol handlers if the existing one under HKCR is
  ; for this install location.

-  ${IsHandlerForInstallDir} "FirefoxHTML-$AppUserModelID" $R9
+  ${IsHandlerForInstallDir} "WaterfoxHTML-$AppUserModelID" $R9
  ${If} "$R9" == "true"
-    ; An empty string is used for the 5th param because FirefoxHTML is not a
+    ; An empty string is used for the 5th param because WaterfoxHTML is not a
    ; protocol handler.
-    ${AddDisabledDDEHandlerValues} "FirefoxHTML-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+    ${AddDisabledDDEHandlerValues} "WaterfoxHTML-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                   "${AppRegName} HTML Document" ""
  ${Else}
-    ${IsHandlerForInstallDir} "FirefoxHTML" $R9
+    ${IsHandlerForInstallDir} "WaterfoxHTML" $R9
    ${If} "$R9" == "true"
-      ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+      ${AddDisabledDDEHandlerValues} "WaterfoxHTML" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                     "${AppRegName} HTML Document" ""
    ${EndIf}
  ${EndIf}

-  ; FirefoxPDF-* was added after FirefoxHTML and FirefoxURL, so we've never
-  ; supported bare "FirefoxPDF".  But we won't have it from the installer, so we
+  ; WaterfoxPDF-* was added after WaterfoxHTML and WaterfoxURL, so we've never
+  ; supported bare "WaterfoxPDF".  But we won't have it from the installer, so we
  ; add/update it unconditionally.  `PostUpdate` is gated on `uninstall.log`
  ; being present, so the invocation here will only happen for installed
  ; directories, not unpackaged directories.
-  ${AddDisabledDDEHandlerValues} "FirefoxPDF-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxPDF-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
                                 "${AppRegName} PDF Document" ""

-  ${IsHandlerForInstallDir} "FirefoxURL-$AppUserModelID" $R9
+  ${IsHandlerForInstallDir} "WaterfoxURL-$AppUserModelID" $R9
  ${If} "$R9" == "true"
-    ${AddDisabledDDEHandlerValues} "FirefoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+    ${AddDisabledDDEHandlerValues} "WaterfoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                   "${AppRegName} URL" "true"
  ${Else}
-    ${IsHandlerForInstallDir} "FirefoxURL" $R9
+    ${IsHandlerForInstallDir} "WaterfoxURL" $R9
    ${If} "$R9" == "true"
-      ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+      ${AddDisabledDDEHandlerValues} "WaterfoxURL" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                     "${AppRegName} URL" "true"
    ${EndIf}
  ${EndIf}
@@ -1077,7 +1077,7 @@ ${RemoveDefaultBrowserAgentShortcut}
    ; Setting the Attempted value will ensure that a new Maintenance Service
    ; install will never be attempted again after this from updates.  The value
    ; is used only to see if updates should attempt new service installs.
-    WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
+    WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Attempted" 1

    ; These values associate the allowed certificates for the current
    ; installation.
@@ -1113,8 +1113,8 @@ ${RemoveDefaultBrowserAgentShortcut}
  ${RegCleanAppHandler} "chrome"

  ; Remove protocol handler registry keys added by the MS shim
-  DeleteRegKey HKLM "Software\Classes\Firefox.URL"
-  DeleteRegKey HKCU "Software\Classes\Firefox.URL"
+  DeleteRegKey HKLM "Software\Classes\Waterfox.URL"
+  DeleteRegKey HKCU "Software\Classes\Waterfox.URL"

  ; Unregister deprecated AccessibleHandler.dll.
  ${If} ${FileExists} "$INSTDIR\AccessibleHandler.dll"
@@ -1264,7 +1264,7 @@ ${RemoveDefaultBrowserAgentShortcut}
      ClearErrors
      WriteIniStr "$0" "TASKBAR" "Migrated" "true"
      WriteRegDWORD HKCU \
-        "Software\Mozilla\${AppName}\Installer\$AppUserModelID" \
+        "Software\BrowserWorks\${AppName}\Installer\$AppUserModelID" \
        "WasPinnedToTaskbar" 1
      ${If} "${SHOULD_PIN}" == "1"
        ${PinToTaskBar}
@@ -1669,7 +1669,7 @@ Function SetAsDefaultAppUserHKCU
  StrCpy $0 $0 -2
  ${If} $0 != $8
    ${If} $AppUserModelID == ""
-      ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+      ${InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"
    ${EndIf}
    StrCpy $R9 "${AppRegName}-$AppUserModelID"
  ${EndIf}
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -41,7 +41,7 @@ ManifestDPIAware true
 !define NO_LOG

 !define MaintUninstallKey \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService"
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\WaterfoxMaintenanceService"

 Var TmpVal
 Var MaintCertKey
@@ -154,10 +154,10 @@ OutFile "helper.exe"
 !endif
 ShowUnInstDetails nevershow

-!define URLUninstallSurvey "https://qsurvey.mozilla.com/s3/FF-Desktop-Post-Uninstall?channel=${UpdateChannel}&version=${AppVersion}&osversion="
+!define URLUninstallSurvey "https://survey.waterfox.net/Desktop-Post-Uninstall?channel=${UpdateChannel}&version=${AppVersion}&osversion="

 ; Support for the profile refresh feature
-!define URLProfileRefreshHelp "https://support.mozilla.org/kb/refresh-firefox-reset-add-ons-and-settings"
+!define URLProfileRefreshHelp "https://www.waterfox.net/support/WINNT/refresh-waterfox-reset-add-ons-and-settings/"

 ; Arguments to add to the command line when launching FileMainEXE for profile refresh
 !define ArgsProfileRefresh "-reset-profile -migration -uninstaller-profile-refresh"
@@ -245,7 +245,7 @@ Function un.UninstallServiceIfNotUsed
  ; Figure out the number of subkeys
  StrCpy $0 0
  ${Do}
-    EnumRegKey $1 HKLM "Software\Mozilla\MaintenanceService" $0
+    EnumRegKey $1 HKLM "Software\BrowserWorks\MaintenanceService" $0
    ${If} "$1" == ""
      ${ExitDo}
    ${EndIf}
@@ -450,8 +450,8 @@ Section "Uninstall"
  ${EndIf}

  SetShellVarContext current  ; Set SHCTX to HKCU
-  ${un.RegCleanMain} "Software\Mozilla"
-  ${un.RegCleanPrefs} "Software\Mozilla\${AppName}"
+  ${un.RegCleanMain} "Software\BrowserWorks"
+  ${un.RegCleanPrefs} "Software\BrowserWorks\${AppName}"
  ${un.RegCleanUninstall}
  ${un.DeleteShortcuts}

@@ -469,52 +469,51 @@ Section "Uninstall"
  ${EndIf}

  ; Clean up old maintenance service logs
-  ${un.CleanMaintenanceServiceLogs} "Mozilla\Firefox"
+  ${un.CleanMaintenanceServiceLogs} "BrowserWorks\Waterfox"

  ; Remove any app model id's stored in the registry for this install path
-  DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
-  DeleteRegValue HKLM "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
+  DeleteRegValue HKCU "Software\BrowserWorks\${AppName}\TaskBarIDs" "$INSTDIR"
+  DeleteRegValue HKLM "Software\BrowserWorks\${AppName}\TaskBarIDs" "$INSTDIR"

  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" "Write Test"
  ${If} ${Errors}
    StrCpy $RegHive "HKCU"
  ${Else}
    SetShellVarContext all  ; Set SHCTX to HKLM
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
    StrCpy $RegHive "HKLM"
-    ${un.RegCleanMain} "Software\Mozilla"
+    ${un.RegCleanMain} "Software\BrowserWorks"
    ${un.RegCleanUninstall}
    ${un.DeleteShortcuts}
    ${un.SetAppLSPCategories}
  ${EndIf}

-  ${un.RegCleanAppHandler} "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanAppHandler} "FirefoxPDF-$AppUserModelID"
-  ${un.RegCleanAppHandler} "FirefoxURL-$AppUserModelID"
+  ${un.RegCleanAppHandler} "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanAppHandler} "WaterfoxPDF-$AppUserModelID"
+  ${un.RegCleanAppHandler} "WaterfoxURL-$AppUserModelID"
  ${un.RegCleanProtocolHandler} "http"
  ${un.RegCleanProtocolHandler} "https"
  ${un.RegCleanProtocolHandler} "mailto"
-  ${un.RegCleanFileHandler}  ".htm"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".html"  "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".shtml" "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".xht"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".xhtml" "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".oga"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".ogg"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".ogv"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".webm"  "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".svg"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".webp"  "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".avif"  "FirefoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".htm"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".html"  "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".shtml" "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".xht"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".xhtml" "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".oga"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".ogg"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".ogv"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".webm"  "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".svg"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".avif"  "WaterfoxHTML-$AppUserModelID"

-  ${un.RegCleanFileHandler}  ".pdf"   "FirefoxPDF-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".pdf"   "WaterfoxPDF-$AppUserModelID"

  SetShellVarContext all  ; Set SHCTX to HKLM
-  ${un.GetSecondInstallPath} "Software\Mozilla" $R9
+  ${un.GetSecondInstallPath} "Software\BrowserWorks" $R9
  ${If} $R9 == "false"
    SetShellVarContext current  ; Set SHCTX to HKCU
-    ${un.GetSecondInstallPath} "Software\Mozilla" $R9
+    ${un.GetSecondInstallPath} "Software\BrowserWorks" $R9
  ${EndIf}

  DeleteRegKey HKLM "Software\Clients\StartMenuInternet\${AppRegName}-$AppUserModelID"
@@ -535,22 +534,22 @@ Section "Uninstall"

  ; Remove old protocol handler and StartMenuInternet keys without install path
  ; hashes, but only if they're for this installation.  We've never supported
-  ; bare FirefoxPDF.
-  ReadRegStr $0 HKLM "Software\Classes\FirefoxHTML\DefaultIcon" ""
+  ; bare WaterfoxPDF.
+  ReadRegStr $0 HKLM "Software\Classes\WaterfoxHTML\DefaultIcon" ""
  StrCpy $0 $0 -2
  ${If} $0 == "$INSTDIR\${FileMainEXE}"
-    DeleteRegKey HKLM "Software\Classes\FirefoxHTML"
-    DeleteRegKey HKLM "Software\Classes\FirefoxURL"
+    DeleteRegKey HKLM "Software\Classes\WaterfoxHTML"
+    DeleteRegKey HKLM "Software\Classes\WaterfoxURL"
    ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
    DeleteRegKey HKLM "Software\Clients\StartMenuInternet\$R9"
    DeleteRegValue HKLM "Software\RegisteredApplications" "$R9"
    DeleteRegValue HKLM "Software\RegisteredApplications" "${AppRegName}"
  ${EndIf}
-  ReadRegStr $0 HKCU "Software\Classes\FirefoxHTML\DefaultIcon" ""
+  ReadRegStr $0 HKCU "Software\Classes\WaterfoxHTML\DefaultIcon" ""
  StrCpy $0 $0 -2
  ${If} $0 == "$INSTDIR\${FileMainEXE}"
-    DeleteRegKey HKCU "Software\Classes\FirefoxHTML"
-    DeleteRegKey HKCU "Software\Classes\FirefoxURL"
+    DeleteRegKey HKCU "Software\Classes\WaterfoxHTML"
+    DeleteRegKey HKCU "Software\Classes\WaterfoxURL"
    ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
    DeleteRegKey HKCU "Software\Clients\StartMenuInternet\$R9"
    DeleteRegValue HKCU "Software\RegisteredApplications" "$R9"
@@ -567,7 +566,7 @@ Section "Uninstall"
    StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
    DeleteRegKey HKLM "$0"
    DeleteRegKey HKCU "$0"
-    StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=firefox"
+    StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=waterfox"
    DeleteRegKey HKLM "$0"
    DeleteRegKey HKCU "$0"
  ${Else}
@@ -726,7 +725,7 @@ Section "Uninstall"
  ; subsequently deleted after checking. If the value is found during startup
  ; the browser will offer to Reset Firefox. We use the UpdateChannel to match
  ; uninstalls of Firefox-release with reinstalls of Firefox-release, for example.
-  WriteRegStr HKCU "Software\Mozilla\Firefox" "Uninstalled-${UpdateChannel}" "True"
+  WriteRegStr HKCU "Software\BrowserWorks\Waterfox" "Uninstalled-${UpdateChannel}" "True"

 !ifdef MOZ_MAINTENANCE_SERVICE
  ; Get the path the allowed cert is at and remove it
@@ -749,7 +748,7 @@ Section "Uninstall"
 !endif

 !ifdef MOZ_BITS_DOWNLOAD
-  BitsUtils::CancelBitsJobsByName "MozillaUpdate $AppUserModelID"
+  BitsUtils::CancelBitsJobsByName "WaterfoxUpdate $AppUserModelID"
  Pop $0
 !endif

@@ -1054,7 +1053,7 @@ Function un.onInit
  ${un.UninstallUnOnInitCommon}

  ; setup the application model id registration value
-  ${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+  ${un.InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"

  ; Find a default profile for this install.
  SetShellVarContext current
--- a/browser/installer/windows/stub.tag
+++ b/browser/installer/windows/stub.tag
@@ -1,4 +1,4 @@
 ;!@Install@!UTF-8!
-Title="Mozilla Firefox"
+Title="Waterfox"
 RunProgram="setup-stub.exe"
 ;!@InstallEnd@!
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -8,7 +8,7 @@
 # .data-title-default and .data-title-private are used when the web content
 # opened has no title:
 #
-# default - "Mozilla Firefox"
+# default - "Waterfox"
 # private - "Mozilla Firefox (Private Browsing)"
 #
 # .data-content-title-default and .data-content-title-private are for use when
@@ -37,7 +37,7 @@ browser-main-window-titles =
 # opened has no title:
 #
 #
-# "default" - "Mozilla Firefox"
+# "default" - "Waterfox"
 # "private" - "Mozilla Firefox — (Private Browsing)"
 #
 # .data-content-title-default and .data-content-title-private are for use when
--- a/browser/locales/en-US/browser/migration.ftl
+++ b/browser/locales/en-US/browser/migration.ftl
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -703,7 +703,7 @@ choose-bookmark =
    .label = Use Bookmark…
    .accesskey = B

-## Home Section - Firefox Home Content Customization
+## Home Section - Waterfox Home Content Customization

 home-prefs-content-header2 = { -firefox-home-brand-name } Content
 home-prefs-content-description2 = Choose what content you want on your { -firefox-home-brand-name } screen.
@@ -877,7 +877,7 @@ sync-signedout-account-signin3 =
 #
 # They can be moved within the sentence as needed to adapt
 # to your language, but should not be changed or translated.
-sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.
+sync-mobile-promo = Download Waterfox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.

 ## Firefox account - Signed in

@@ -994,7 +994,7 @@ sync-engine-payment-methods2 =

 sync-engine-addons =
    .label = Add-ons
-    .tooltiptext = Extensions and themes for Firefox desktop
+    .tooltiptext = Extensions and themes for Waterfox desktop
    .accesskey = A

 sync-engine-settings =
@@ -1134,8 +1134,8 @@ history-header = History
 # "Firefox will" + "Remember history".
 #
 # If this doesn't work for your language, you can translate this message:
-#   - Simply as "Firefox", moving the verb into each option.
-#     This will result in "Firefox" + "Will remember history", etc.
+#   - Simply as "Waterfox", moving the verb into each option.
+#     This will result in "Waterfox" + "Will remember history", etc.
 #   - As a stand-alone message, for example "Firefox history settings:".
 history-remember-label = { -brand-short-name } will
    .accesskey = w
--- a/browser/locales/en-US/chrome/overrides/appstrings.properties
+++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
@@ -3,29 +3,29 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 malformedURI2=Please check that the URL is correct and try again.
-fileNotFound=Firefox can’t find the file at %S.
+fileNotFound=Waterfox can’t find the file at %S.
 fileAccessDenied=The file at %S is not readable.
 # %S is replaced by the uri host
 httpErrorPage=%S sent back an error.
 serverError=%S might have a temporary problem or it could have moved.
 dnsNotFound2=We can’t connect to the server at %S.
 basicHttpAuthDisabled=Someone pretending to be the site could try to steal things like your username, password, or email.
-unknownProtocolFound=Firefox doesn’t know how to open this address, because one of the following protocols (%S) isn’t associated with any program or is not allowed in this context.
-connectionFailure=Firefox can’t establish a connection to the server at %S.
+unknownProtocolFound=Waterfox doesn’t know how to open this address, because one of the following protocols (%S) isn’t associated with any program or is not allowed in this context.
+connectionFailure=Waterfox can’t establish a connection to the server at %S.
 netInterrupt=The connection to %S was interrupted while the page was loading.
 netTimeout=The server at %S is taking too long to respond.
-redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete.
+redirectLoop=Waterfox has detected that the server is redirecting the request for this address in a way that will never complete.
 ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don’t translate "%S"
 confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
 resendButton.label=Resend
-unknownSocketType=Firefox doesn’t know how to communicate with the server.
+unknownSocketType=Waterfox doesn’t know how to communicate with the server.
 netReset=The connection to the server was reset while the page was loading.
 notCached=This document is no longer available.
-netOffline=Firefox is currently in offline mode and can’t browse the Web.
+netOffline=Waterfox is currently in offline mode and can’t browse the Web.
 isprinting=The document cannot change while Printing or in Print Preview.
-deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection.
-proxyResolveFailure=Firefox is configured to use a proxy server that can’t be found.
-proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections.
+deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Waterfox has canceled the request for your protection.
+proxyResolveFailure=Waterfox is configured to use a proxy server that can’t be found.
+proxyConnectFailure=Waterfox is configured to use a proxy server that is refusing connections.
 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
 unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
 externalProtocolTitle=External Protocol Request
@@ -42,9 +42,9 @@ cspBlocked=This page has a content security policy that prevents it from being l
 xfoBlocked=This page has an X-Frame-Options policy that prevents it from being loaded in this context.
 corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
 ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
-sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
+sslv3Used=Waterfox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
 inadequateSecurityError=The website tried to negotiate an inadequate level of security.
 blockedByPolicy=Your organization has blocked access to this page or website.
-blockedByCORP=Firefox didn’t load this page because it looks like the security configuration doesn’t match the previous page.
+blockedByCORP=Waterfox didn’t load this page because it looks like the security configuration doesn’t match the previous page.
 invalidHeaderValue=%S sent back a header with empty characters not allowed by web security standards.
-networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired.
+networkProtocolError=Waterfox has experienced a network protocol violation that cannot be repaired.
--- a/browser/locales/en-US/installer/custom.properties
+++ b/browser/locales/en-US/installer/custom.properties
@@ -73,7 +73,7 @@ STATUS_INSTALL_APP=Installing $BrandShortName…
 STATUS_UNINSTALL_MAIN=Uninstalling $BrandShortName…
 STATUS_CLEANUP=A Little Housekeeping…

-UN_SURVEY_CHECKBOX_LABEL=Tell Mozilla why you uninstalled $BrandShortName
+UN_SURVEY_CHECKBOX_LABEL=Tell Waterfox why you uninstalled

 # _DESC strings support approximately 65 characters per line.
 # One line
--- a/browser/locales/en-US/updater/updater.ini
+++ b/browser/locales/en-US/updater/updater.ini
@@ -6,4 +6,4 @@
 [Strings]
 TitleText=%MOZ_APP_DISPLAYNAME% Update
 InfoText=%MOZ_APP_DISPLAYNAME% is installing your updates and will start in a few moments…
-MozillaMaintenanceDescription=The Mozilla Maintenance Service ensures that you have the latest and most secure version of Mozilla Firefox on your computer. Keeping Firefox up to date is very important for your online security, and Mozilla strongly recommends that you keep this service enabled.
+WaterfoxMaintenanceDescription=The Mozilla Maintenance Service ensures that you have the latest and most secure version of Mozilla Firefox on your computer. Keeping Firefox up to date is very important for your online security, and Mozilla strongly recommends that you keep this service enabled.
--- a/ipc/app/module.ver
+++ b/ipc/app/module.ver
@@ -1,4 +1,4 @@
-WIN32_MODULE_COMPANYNAME=Mozilla Corporation
+WIN32_MODULE_COMPANYNAME=Waterfox Limited
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
 WIN32_MODULE_DESCRIPTION=Plugin Container for @MOZ_APP_DISPLAYNAME@
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -11262,12 +11262,12 @@ bool PresShell::VerifyIncrementalReflow() {
  if (!ok) {
    nsString stra;
    static int num = 0;
-    stra.AppendLiteral("C:\\mozilla\\mozilla\\debug\\filea");
+    stra.AppendLiteral("C:\\BrowserWorks\\mozilla\\debug\\filea");
    stra.AppendInt(num);
    stra.AppendLiteral(".png");
    gfxUtils::WriteAsPNG(presShell, stra);
    nsString strb;
-    strb.AppendLiteral("C:\\mozilla\\mozilla\\debug\\fileb");
+    strb.AppendLiteral("C:\\BrowserWorks\\mozilla\\debug\\fileb");
    strb.AppendInt(num);
    strb.AppendLiteral(".png");
    gfxUtils::WriteAsPNG(presShell, strb);
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -700,7 +700,7 @@ class MacArtifactJob(ArtifactJob):
                "nmhproxy",
                "pingsender",
                "plugin-container.app/Contents/MacOS/plugin-container",
-                "updater.app/Contents/MacOS/org.mozilla.updater",
+                "updater.app/Contents/MacOS/net.waterfox.updater",
                # 'xpcshell',
                "XUL",
            ],
--- a/security/sandbox/mac/SandboxPolicyContent.h
+++ b/security/sandbox/mac/SandboxPolicyContent.h
@@ -275,7 +275,7 @@ static const char SandboxPolicyContent[] = R"SANDBOX_LITERAL(
          (subpath debugWriteDir)
          (vnode-type REGULAR-FILE)))))

-  (allow-shared-list "org.mozilla.plugincontainer")
+  (allow-shared-list "net.waterfox.plugincontainer")

 ; Per-user and system-wide Extensions dir
  (allow file-read*
--- a/services/fxaccounts/tests/xpcshell/test_web_channel.js
+++ b/services/fxaccounts/tests/xpcshell/test_web_channel.js
@@ -168,7 +168,7 @@ add_test(function test_error_message_remove_profile_path() {
    windows: {
      err: new Error(
        "Win error 183 during operation rename on file C:\\Users\\Some Computer\\AppData\\Roaming\\" +
-          "Mozilla\\Firefox\\Profiles\\dbzjmzxa.default\\signedInUser.json (Cannot create a file)"
+          "Mozilla\\BrowserWorks\\Profiles\\dbzjmzxa.default\\signedInUser.json (Cannot create a file)"
      ),
      expected:
        "Error: Win error 183 during operation rename on file C:[REDACTED]signedInUser.json (Cannot create a file)",
@@ -183,7 +183,7 @@ add_test(function test_error_message_remove_profile_path() {
    },
    netpath: {
      err: new Error(
-        "Win error 32 during operation rename on file \\\\SVC.LOC\\HOMEDIRS$\\USERNAME\\Mozilla\\" +
+        "Win error 32 during operation rename on file \\\\SVC.LOC\\HOMEDIRS$\\USERNAME\\BrowserWorks\\" +
          "Firefox\\Profiles\\dbzjmzxa.default-release-7\\signedInUser.json (No space left on device)"
      ),
      expected:
@@ -192,7 +192,7 @@ add_test(function test_error_message_remove_profile_path() {
    mount: {
      err: new Error(
        "Win error 649 during operation rename on file C:\\SnapVolumes\\MountPoints\\" +
-          "{9e399ec5-0000-0000-0000-100000000000}\\SVROOT\\Users\\username\\AppData\\Roaming\\Mozilla\\Firefox\\" +
+          "{9e399ec5-0000-0000-0000-100000000000}\\SVROOT\\Users\\username\\AppData\\Roaming\\BrowserWorks\\Waterfox\\" +
          "Profiles\\dbzjmzxa.default-release\\signedInUser.json (The create operation failed)"
      ),
      expected:
--- a/testing/mozbase/mozcrash/mozcrash/mozcrash.py
+++ b/testing/mozbase/mozcrash/mozcrash/mozcrash.py
@@ -814,7 +814,7 @@ def cleanup_pending_crash_reports():
    """
    if mozinfo.isWin:
        location = os.path.expanduser(
-            "~\\AppData\\Roaming\\Mozilla\\Firefox\\Crash Reports"
+            "~\\AppData\\Roaming\\BrowserWorks\\Waterfox\\Crash Reports"
        )
    elif mozinfo.isMac:
        location = os.path.expanduser(
--- a/testing/mozharness/configs/raptor/windows_config.py
+++ b/testing/mozharness/configs/raptor/windows_config.py
@@ -46,7 +46,7 @@ config = {
    },
    "env": {
        # python3 requires C runtime, found in firefox installation; see bug 1361732
-        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\firefox;"
+        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\Waterfox;"
    },
    "run_cmd_checks_enabled": True,
    "preflight_run_cmd_suites": [
--- a/testing/mozharness/configs/raptor/windows_vm_config.py
+++ b/testing/mozharness/configs/raptor/windows_vm_config.py
@@ -41,6 +41,6 @@ config = {
    },
    "env": {
        # python3 requires C runtime, found in firefox installation; see bug 1361732
-        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\firefox;"
+        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\Waterfox;"
    },
 }
--- a/toolkit/components/enterprisepolicies/tests/browser/browser_policies_gpo.js
+++ b/toolkit/components/enterprisepolicies/tests/browser/browser_policies_gpo.js
@@ -6,7 +6,7 @@
 add_task(async function setup_preferences() {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["browser.policies.alternateGPO", "SOFTWARE\\Mozilla\\PolicyTesting"],
+      ["browser.policies.alternateGPO", "SOFTWARE\\BrowserWorks\\PolicyTesting"],
    ],
  });
 });
@@ -29,7 +29,7 @@ add_task(async function test_gpo_policies() {
    Ci.nsIWindowsRegKey
  );
  let regLocation =
-    "SOFTWARE\\Mozilla\\PolicyTesting\\Mozilla\\" + Services.appinfo.name;
+    "SOFTWARE\\BrowserWorks\\PolicyTesting\\BrowserWorks\\" + Services.appinfo.name;
  wrk.create(wrk.ROOT_KEY_CURRENT_USER, regLocation, wrk.ACCESS_WRITE);
  wrk.writeIntValue("gpo_policy", 1);
  wrk.close();
@@ -60,8 +60,8 @@ add_task(async function test_gpo_policies() {

  delete Policies.gpo_policy;

-  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "SOFTWARE\\Mozilla", wrk.ACCESS_WRITE);
-  wrk.removeChild("PolicyTesting\\Mozilla\\" + Services.appinfo.name);
+  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "Software\\Waterfox", wrk.ACCESS_WRITE);
+  wrk.removeChild("PolicyTesting\\BrowserWorks\\" + Services.appinfo.name);
  wrk.removeChild("PolicyTesting\\Mozilla");
  wrk.removeChild("PolicyTesting");
  wrk.close();
@@ -99,7 +99,7 @@ add_task(async function test_gpo_json_policies() {
    Ci.nsIWindowsRegKey
  );
  let regLocation =
-    "SOFTWARE\\Mozilla\\PolicyTesting\\Mozilla\\" + Services.appinfo.name;
+    "SOFTWARE\\BrowserWorks\\PolicyTesting\\BrowserWorks\\" + Services.appinfo.name;
  wrk.create(wrk.ROOT_KEY_CURRENT_USER, regLocation, wrk.ACCESS_WRITE);
  wrk.writeIntValue("gpo_policy", 1);
  wrk.writeIntValue("coexist_policy", 0);
@@ -146,8 +146,8 @@ add_task(async function test_gpo_json_policies() {
  delete Policies.json_policy;
  delete Policies.coexist_policy;

-  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "SOFTWARE\\Mozilla", wrk.ACCESS_WRITE);
-  wrk.removeChild("PolicyTesting\\Mozilla\\" + Services.appinfo.name);
+  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "Software\\Waterfox", wrk.ACCESS_WRITE);
+  wrk.removeChild("PolicyTesting\\BrowserWorks\\" + Services.appinfo.name);
  wrk.removeChild("PolicyTesting\\Mozilla");
  wrk.removeChild("PolicyTesting");
  wrk.close();
@@ -171,7 +171,7 @@ add_task(async function test_gpo_broken_json_policies() {
    Ci.nsIWindowsRegKey
  );
  let regLocation =
-    "SOFTWARE\\Mozilla\\PolicyTesting\\Mozilla\\" + Services.appinfo.name;
+    "SOFTWARE\\BrowserWorks\\PolicyTesting\\BrowserWorks\\" + Services.appinfo.name;
  wrk.create(wrk.ROOT_KEY_CURRENT_USER, regLocation, wrk.ACCESS_WRITE);
  wrk.writeIntValue("gpo_policy", 1);
  wrk.close();
@@ -198,8 +198,8 @@ add_task(async function test_gpo_broken_json_policies() {

  delete Policies.gpo_policy;

-  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "SOFTWARE\\Mozilla", wrk.ACCESS_WRITE);
-  wrk.removeChild("PolicyTesting\\Mozilla\\" + Services.appinfo.name);
+  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "Software\\Waterfox", wrk.ACCESS_WRITE);
+  wrk.removeChild("PolicyTesting\\BrowserWorks\\" + Services.appinfo.name);
  wrk.removeChild("PolicyTesting\\Mozilla");
  wrk.removeChild("PolicyTesting");
  wrk.close();
--- a/toolkit/components/extensions/NativeManifests.sys.mjs
+++ b/toolkit/components/extensions/NativeManifests.sys.mjs
@@ -25,6 +25,10 @@ const TYPES = {
 const NATIVE_MANIFEST_SCHEMA =
  "chrome://extensions/content/schemas/native_manifest.json";

+// WATERFOX
+// Future rebase take note: leave this so extensions
+// can communicate with software without being
+// made specifically for Waterfox.
 const REGPATH = "Software\\Mozilla";

 export var NativeManifests = {
--- a/toolkit/components/extensions/test/xpcshell/head_native_messaging.js
+++ b/toolkit/components/extensions/test/xpcshell/head_native_messaging.js
@@ -99,7 +99,7 @@ async function setupHosts(scripts) {
      break;

    case "win":
-      const REGKEY = String.raw`Software\Mozilla\NativeMessagingHosts`;
+      const REGKEY = String.raw`Software\BrowserWorks\NativeMessagingHosts`;

      let registry = new MockRegistry();
      registerCleanupFunction(() => {
--- a/toolkit/components/extensions/test/xpcshell/test_ext_storage_managed.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_storage_managed.js
@@ -50,7 +50,7 @@ add_task(async function setup() {
    registry = new MockRegistry();
    registry.setValue(
      Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      `Software\\\Mozilla\\\ManagedStorage\\${MANIFEST.name}`,
+      `Software\\\BrowserWorks\\\ManagedStorage\\${MANIFEST.name}`,
      "",
      path
    );
--- a/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
+++ b/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
@@ -37,7 +37,7 @@ if (AppConstants.platform == "win") {
  });
 }

-const REGPATH = "Software\\Mozilla\\NativeMessagingHosts";
+const REGPATH = "Software\\BrowserWorks\\NativeMessagingHosts";

 const BASE_SCHEMA = "chrome://extensions/content/schemas/manifest.json";

--- a/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
+++ b/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
@@ -41,9 +41,9 @@ Var BrandFullName
 ; And anyone that wants to run tests themselves should already have
 ; this installed.
 !define FallbackKey \
-  "SOFTWARE\Mozilla\MaintenanceService\3932ecacee736d366d6436db0f55bce4"
+  "SOFTWARE\BrowserWorks\MaintenanceService\3932ecacee736d366d6436db0f55bce4"

-!define CompanyName "Mozilla Corporation"
+!define CompanyName "BrowserWorks"
 !define BrandFullNameInternal ""

 ; The following includes are custom.
@@ -66,12 +66,12 @@ Name "${MaintFullName}"
 OutFile "maintenanceservice_installer.exe"

 ; Get installation folder from registry if available
-InstallDirRegKey HKLM "Software\Mozilla\MaintenanceService" ""
+InstallDirRegKey HKLM "Software\BrowserWorks\MaintenanceService" ""

 SetOverwrite on

 !define MaintUninstallKey \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService"
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\WaterfoxMaintenanceService"

 ; Always install into the 32-bit location even if we have a 64-bit build.
 ; This is because we use only 1 service for all Firefox channels.
@@ -180,7 +180,7 @@ Section "MaintenanceService"
  WriteRegStr HKLM "${MaintUninstallKey}" "DisplayIcon" \
                   "$INSTDIR\Uninstall.exe,0"
  WriteRegStr HKLM "${MaintUninstallKey}" "DisplayVersion" "${AppVersion}"
-  WriteRegStr HKLM "${MaintUninstallKey}" "Publisher" "Mozilla"
+  WriteRegStr HKLM "${MaintUninstallKey}" "Publisher" "BrowserWorks"
  WriteRegStr HKLM "${MaintUninstallKey}" "Comments" "${BrandFullName}"
  WriteRegDWORD HKLM "${MaintUninstallKey}" "NoModify" 1
  ${GetSize} "$INSTDIR" "/S=0K" $R2 $R3 $R4
@@ -197,15 +197,15 @@ Section "MaintenanceService"
  ${OrIf} ${IsNativeARM64}
    SetRegView 64
  ${EndIf}
-  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
-  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Installed" 1
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "FFPrefetchDisabled"
+  WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Attempted" 1
+  WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Installed" 1
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "FFPrefetchDisabled"

  ; Included here for debug purposes only.
  ; These keys are used to bypass the installation dir is a valid installation
  ; check from the service so that tests can be run.
-  WriteRegStr HKLM "${FallbackKey}\0" "name" "Mozilla Corporation"
-  WriteRegStr HKLM "${FallbackKey}\0" "issuer" "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1"
+  WriteRegStr HKLM "${FallbackKey}\0" "name" "WATERFOX LIMITED"
+  WriteRegStr HKLM "${FallbackKey}\0" "issuer" "GlobalSign GCC R45 EV CodeSigning CA 2020"
  WriteRegStr HKLM "${FallbackKey}\1" "name" "Mozilla Fake SPC"
  WriteRegStr HKLM "${FallbackKey}\1" "issuer" "Mozilla Fake CA"
  ${If} ${RunningX64}
@@ -258,12 +258,11 @@ Section "Uninstall"
  ${OrIf} ${IsNativeARM64}
    SetRegView 64
  ${EndIf}
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "Installed"
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "FFPrefetchDisabled"
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "Installed"
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "FFPrefetchDisabled"
  DeleteRegKey HKLM "${FallbackKey}\"
  ${If} ${RunningX64}
  ${OrIf} ${IsNativeARM64}
    SetRegView lastused
  ${EndIf}
 SectionEnd
-
--- a/toolkit/components/maintenanceservice/serviceinstall.cpp
+++ b/toolkit/components/maintenanceservice/serviceinstall.cpp
@@ -25,7 +25,7 @@

 // This uninstall key is defined originally in maintenanceservice_installer.nsi
 #define MAINT_UNINSTALL_KEY                                                    \
-  L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MozillaMaintenan" \
+  L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\WaterfoxMaintenan" \
  L"ceService"

 static BOOL UpdateUninstallerVersionString(LPWSTR versionString) {
@@ -54,7 +54,7 @@ static int ReadMaintenanceServiceStrings(
    LPCWSTR path, MaintenanceServiceStringTable* results) {
  // Read in the maintenance service description string if specified.
  const unsigned int kNumStrings = 1;
-  const char* kServiceKeys = "MozillaMaintenanceDescription\0";
+  const char* kServiceKeys = "WaterfoxMaintenanceDescription\0";
  mozilla::UniquePtr<char[]> serviceString;
  int result = ReadStrings(path, kServiceKeys, kNumStrings, &serviceString);
  if (result != OK) {
@@ -206,12 +206,12 @@ BOOL FixServicePath(SC_HANDLE service, LPCWSTR currentServicePath,
      currentServicePath[currentServicePathLen - 1] == L'\"';

  if (doesServiceHaveCorrectPath) {
-    LOG(("The MozillaMaintenance service path is correct."));
+    LOG(("The WaterfoxMaintenance service path is correct."));
    servicePathWasWrong = FALSE;
    return TRUE;
  }
  // This is a recoverable situation so not logging as a warning
-  LOG(("The MozillaMaintenance path is NOT correct. It was: %ls",
+  LOG(("The WaterfoxMaintenance path is NOT correct. It was: %ls",
       currentServicePath));

  servicePathWasWrong = TRUE;
--- a/toolkit/components/maintenanceservice/tests/gtest/ServiceStartInteractiveOnly.cpp
+++ b/toolkit/components/maintenanceservice/tests/gtest/ServiceStartInteractiveOnly.cpp
@@ -44,7 +44,7 @@ TEST(MaintenanceServiceTest, ServiceStartInteractiveOnly)
  ASSERT_TRUE(scmHandle);

  SC_HANDLE serviceHandle =
-      OpenServiceW(scmHandle, L"MozillaMaintenance", SERVICE_START);
+      OpenServiceW(scmHandle, L"WaterfoxMaintenance", SERVICE_START);
  // Automatically close the SCM when we are done with it.
  nsAutoServiceHandle uniqueServiceHandle(serviceHandle);
  ASSERT_FALSE(serviceHandle);
--- a/toolkit/components/utils/WindowsInstallsInfo.sys.mjs
+++ b/toolkit/components/utils/WindowsInstallsInfo.sys.mjs
@@ -53,7 +53,7 @@ export var WindowsInstallsInfo = {
      }
    }

-    const subKeyName = `Software\\Mozilla\\${Services.appinfo.name}\\TaskBarIDs`;
+    const subKeyName = `Software\\Waterfox\\${Services.appinfo.name}\\TaskBarIDs`;

    const paths = new Set();

--- a/toolkit/crashreporter/client/crashreporter_win.cpp
+++ b/toolkit/crashreporter/client/crashreporter_win.cpp
--- a/toolkit/crashreporter/google-breakpad/src/tools/windows/converter_exe/converter.cc
+++ b/toolkit/crashreporter/google-breakpad/src/tools/windows/converter_exe/converter.cc
@@ -378,7 +378,7 @@ static void ConvertMissingSymbolFile(const MissingSymbolInfo &missing_info,
    // symbol server when crashes occur in Google extension code hosted by a
    // Firefox process.
    if (_stricmp(code_extension.c_str(), ".exe") == 0 &&
-        _stricmp(missing_info.code_file.c_str(), "firefox.exe") != 0) {
+        _stricmp(missing_info.code_file.c_str(), "waterfox.exe") != 0) {
      is_exe = true;
    }
  }
--- a/toolkit/locales/en-US/toolkit/branding/accounts.ftl
+++ b/toolkit/locales/en-US/toolkit/branding/accounts.ftl
--- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl
+++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
@@ -15,17 +15,17 @@
 ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark

 -facebook-container-brand-name = Facebook Container
-monitor-brand-name = Firefox Monitor
+-monitor-brand-name = Monitor
 -monitor-brand-short-name = Monitor
 -mozmonitor-brand-name = Mozilla Monitor
 -pocket-brand-name = Pocket
-send-brand-name = Firefox Send
-screenshots-brand-name = Firefox Screenshots
+-send-brand-name = Send
+-screenshots-brand-name = Screenshots
 -mozilla-vpn-brand-name = Mozilla VPN
-profiler-brand-name = Firefox Profiler
-translations-brand-name = Firefox Translations
-focus-brand-name = Firefox Focus
-relay-brand-name = Firefox Relay
+-profiler-brand-name = Waterfox Profiler
+-translations-brand-name = Waterfox Translations
+-focus-brand-name = Focus
+-relay-brand-name = Relay
 -relay-brand-short-name = Relay
 -fakespot-brand-name = Fakespot
 -solo-ai-brand-name = Solo
@@ -38,18 +38,18 @@

 # “Suggest” can be localized, “Firefox” must be treated as a brand
 # and kept in English.
-firefox-suggest-brand-name = Firefox Suggest
+-firefox-suggest-brand-name = Waterfox Suggest

 # ”Home" can be localized, “Firefox” must be treated as a brand
 # and kept in English.
-firefox-home-brand-name = Firefox Home
+-firefox-home-brand-name = Waterfox Home

 # View" can be localized, “Firefox” must be treated as a brand
 # and kept in English.
-firefoxview-brand-name = Firefox View
+-firefoxview-brand-name = Waterfox View

 # Firefox Labs is the name for a page in Settings to allow users to learn about
 # experimental and in-development features, and turn those features on and off.
 # The "Labs" portion can be localized, “Firefox” must be treated as a brand
 # and kept in English.
-firefoxlabs-brand-name = Firefox Labs
+-firefoxlabs-brand-name = Labs
--- a/toolkit/mozapps/defaultagent/Policy.cpp
+++ b/toolkit/mozapps/defaultagent/Policy.cpp
@@ -30,7 +30,7 @@
 // The Firefox policy engine hardcodes the string "Mozilla" in its registry
 // key accesses rather than using the configured vendor name, so we should do
 // the same here to be sure we're compatible with it.
-#define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\Mozilla\\" MOZ_APP_BASENAME
+#define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\BrowserWorks\\" MOZ_APP_BASENAME

 namespace mozilla::default_agent {

--- a/toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp
+++ b/toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp
@@ -446,8 +446,8 @@ nsresult SetDefaultBrowserUserChoice(
  }

  nsTArray<nsString> browserDefaults = {
-      u"https"_ns, u"FirefoxURL"_ns,  u"http"_ns, u"FirefoxURL"_ns,
-      u".html"_ns, u"FirefoxHTML"_ns, u".htm"_ns, u"FirefoxHTML"_ns};
+      u"https"_ns, u"WaterfoxURL"_ns,  u"http"_ns, u"WaterfoxURL"_ns,
+      u".html"_ns, u"WaterfoxHTML"_ns, u".htm"_ns, u"WaterfoxHTML"_ns};

  browserDefaults.AppendElements(aExtraFileExtensions);

--- a/toolkit/mozapps/defaultagent/tests/gtest/SetDefaultBrowserTest.cpp
+++ b/toolkit/mozapps/defaultagent/tests/gtest/SetDefaultBrowserTest.cpp
@@ -20,14 +20,14 @@ TEST(SetDefaultBrowserUserChoice, Hash)

  // length mod 8 = 0
  EXPECT_STREQ(
-      GenerateUserChoiceHash(L"https", sid, L"FirefoxURL-308046B0AF4A39CB",
+      GenerateUserChoiceHash(L"https", sid, L"WaterfoxURL-308046B0AF4A39CB",
                             (SYSTEMTIME){2021, 4, 1, 19, 23, 7, 56, 506})
          .get(),
      L"uzpIsMVyZ1g=");

  // length mod 8 = 2 (confirm that the incomplete last block is dropped)
  EXPECT_STREQ(
-      GenerateUserChoiceHash(L".html", sid, L"FirefoxHTML-308046B0AF4A39CB",
+      GenerateUserChoiceHash(L".html", sid, L"WaterfoxHTML-308046B0AF4A39CB",
                             (SYSTEMTIME){2021, 4, 1, 19, 23, 7, 56, 519})
          .get(),
      L"7fjRtUPASlc=");
@@ -48,7 +48,7 @@ TEST(SetDefaultBrowserUserChoice, Hash)

  // non-ASCII
  EXPECT_STREQ(
-      GenerateUserChoiceHash(L".html", sid, L"FirefoxHTML-ÀBÇDË😀†",
+      GenerateUserChoiceHash(L".html", sid, L"WaterfoxHTML-ÀBÇDË😀†",
                             (SYSTEMTIME){2021, 4, 2, 20, 0, 38, 55, 101})
          .get(),
      L"F3NsK3uNv5E=");
--- a/toolkit/mozapps/extensions/test/xpcshell/test_registry.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_registry.js
@@ -40,13 +40,13 @@ add_task(async function setup() {
 add_task(async function test_1() {
  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID1,
    xpi1.path
  );
  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID2,
    xpi2.path
  );
@@ -69,13 +69,13 @@ add_task(async function test_1() {
 add_task(async function test_2() {
  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID1,
    null
  );
  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID2,
    null
  );
@@ -91,13 +91,13 @@ add_task(async function test_2() {
 add_task(async function test_3() {
  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID1,
    xpi2.path
  );
  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID2,
    xpi1.path
  );
@@ -116,13 +116,13 @@ add_task(async function test_4() {

  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID1,
    null
  );
  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID2,
    null
  );
@@ -131,7 +131,7 @@ add_task(async function test_4() {

  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID1,
    xpi1.path
  );
@@ -140,13 +140,13 @@ add_task(async function test_4() {

  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID1,
    null
  );
  registry.setValue(
    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
    ID2,
    xpi1.path
  );
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -538,7 +538,7 @@

      ; Add our subdirectory, this is hardcoded as grandparent of the update directory in
      ; several other places.
-      StrCpy $0 "$0\Mozilla-1de4eec8-1241-4177-a864-e594e8d1fb38"
+      StrCpy $0 "$0\Waterfox-1de4eec8-1241-4177-a864-e594e8d1fb38"

      Exch $0   ; Restore original $0 and put our $0 on the stack.
    FunctionEnd
@@ -1205,7 +1205,7 @@
 *
 * @param   _KEY ($R1)
 *          Sub key containing all the installer prefs
- *          Usually "Software\Mozilla\${AppName}"
+ *          Usually "Software\BrowserWorks\${AppName}"
 * @param   _PREF ($R2)
 *          Name of the pref to look up
 * @return  _RESULT ($R3)
@@ -1670,7 +1670,7 @@
 * registry hive so you must call SetShellVarContext first.
 *
 * @param   _KEY
- *          The registry subkey (typically this will be Software\Mozilla).
+ *          The registry subkey (typically this will be Software\BrowserWorks).
 * @return  _RESULT
 *          false if a second install isn't found, path to the main exe if a
 *          second install is found.
@@ -1788,7 +1788,7 @@
 * first.
 *
 * @param   _KEY
- *          The registry subkey (typically this will be Software\Mozilla\App Name).
+ *          The registry subkey (typically this will be Software\BrowserWorks\App Name).
 * @return  _RESULT
 *          false if a single install location for this app name isn't found,
 *          path to the install directory if a single install location is found.
@@ -1904,7 +1904,7 @@
 * The shell context and the registry view should already have been set.
 *
 * @param   _KEY
- *          The registry subkey (typically Software\Mozilla\App Name).
+ *          The registry subkey (typically Software\BrowserWorks\App Name).
 * @return  _RESULT
 *          path to the install directory of the first location found, or
 *          the string "false" if no existing installation was found.
@@ -2606,7 +2606,7 @@
 * call SetShellVarContext first.
 *
 * @param   _KEY
- *          The registry subkey (typically this will be Software\Mozilla).
+ *          The registry subkey (typically this will be Software\BrowserWorks).
 *
 * $0  = loop counter
 * $1  = temporary value used for string searches
@@ -2853,7 +2853,7 @@
 *
 * @param   _KEY ($R1)
 *          The registry subkey
- *          (typically this will be Software\Mozilla\${AppName}).
+ *          (typically this will be Software\BrowserWorks\${AppName}).
 */
 !macro RegCleanPrefs
  !ifndef ${_MOZFUNC_UN}RegCleanPrefs
@@ -5657,7 +5657,7 @@
 !ifmacrodef InitHashAppModelId
      ; setup the application model id registration value
      !ifdef AppName
-      ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+      ${InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"
      !endif
 !endif

@@ -5880,12 +5880,12 @@
        ; And verify that if we need to, we're going to clean up the registry
        ; correctly.
        ${If} "$R4" == "mms"
-          WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
+          WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" "Write Test"
          ${If} ${Errors}
            ; Nothing initialized so no need to call OnEndCommon
            Quit
          ${Endif}
-          DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+          DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
        ${EndIf}
      !endif

@@ -5994,20 +5994,20 @@
      ${If} ${IsNativeAMD64}
      ${OrIf} ${IsNativeARM64}
        SetRegView 64
-        ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
+        ${GetSingleInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $R9
        SetRegView lastused
      ${EndIf}

      StrCmp "$R9" "false" +1 finish_get_install_dir

      SetRegView 32
-      ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
+      ${GetSingleInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $R9
      SetRegView lastused

      StrCmp "$R9" "false" +1 finish_get_install_dir

      SetShellVarContext current  ; Set SHCTX to HKCU
-      ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
+      ${GetSingleInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $R9

      finish_get_install_dir:
      StrCmp "$R9" "false" +2 +1
@@ -7782,11 +7782,11 @@
  StrCpy $R0 ""
  ; Look for an install-specific profile, which might be listed as
  ; either a relative or an absolute path (installs.ini doesn't say which).
-  ${If} ${FileExists} "$APPDATA\Mozilla\Firefox\installs.ini"
+  ${If} ${FileExists} "$APPDATA\Waterfox\installs.ini"
    ClearErrors
-    ReadINIStr $1 "$APPDATA\Mozilla\Firefox\installs.ini" "$AppUserModelID" "Default"
+    ReadINIStr $1 "$APPDATA\Waterfox\installs.ini" "$AppUserModelID" "Default"
    ${IfNot} ${Errors}
-      ${${_MOZFUNC_UN}GetLongPath} "$APPDATA\Mozilla\Firefox\$1" $2
+      ${${_MOZFUNC_UN}GetLongPath} "$APPDATA\Waterfox\$1" $2
      ${If} ${FileExists} $2
        StrCpy $R0 $2
      ${Else}
--- a/toolkit/mozapps/update/UpdateService.sys.mjs
+++ b/toolkit/mozapps/update/UpdateService.sys.mjs
@@ -1137,7 +1137,7 @@ function isServiceInstalled() {
    );
    wrk.open(
      wrk.ROOT_KEY_LOCAL_MACHINE,
-      "SOFTWARE\\Mozilla\\MaintenanceService",
+      "Software\\Waterfox\\MaintenanceService",
      wrk.ACCESS_READ | wrk.WOW64_64
    );
    installed = wrk.readIntValue("Installed");
@@ -5233,7 +5233,7 @@ export class CheckerService {
    );

    let regPath =
-      "SOFTWARE\\Mozilla\\" + Services.appinfo.name + "\\32to64DidMigrate";
+      "SOFTWARE\\BrowserWorks\\" + Services.appinfo.name + "\\32to64DidMigrate";
    let regValHKCU = lazy.WindowsRegistry.readRegKey(
      wrk.ROOT_KEY_CURRENT_USER,
      regPath,
--- a/toolkit/mozapps/update/UpdateTelemetry.sys.mjs
+++ b/toolkit/mozapps/update/UpdateTelemetry.sys.mjs
@@ -465,7 +465,7 @@ export var AUSTLMY = {
      );
      wrk.open(
        wrk.ROOT_KEY_LOCAL_MACHINE,
-        "SOFTWARE\\Mozilla\\MaintenanceService",
+        "SOFTWARE\\BrowserWorks\\MaintenanceService",
        wrk.ACCESS_READ | wrk.WOW64_64
      );
      // Was the service at some point installed, but is now uninstalled?
--- a/toolkit/mozapps/update/common/commonupdatedir.cpp
+++ b/toolkit/mozapps/update/common/commonupdatedir.cpp
@@ -33,7 +33,7 @@
 #ifdef XP_WIN
 // This is the name of the old update directory
 // (i.e. C:\ProgramData\<OLD_ROOT_UPDATE_DIR_NAME>)
-#  define OLD_ROOT_UPDATE_DIR_NAME "Mozilla"
+#  define OLD_ROOT_UPDATE_DIR_NAME "Waterfox"
 // This is the name of the current update directory
 // (i.e. C:\ProgramData\<ROOT_UPDATE_DIR_NAME>)
 // It is really important that we properly set the permissions on this
@@ -43,7 +43,7 @@
 // this problem in the future, we are including a UUID in the root update
 // directory name to attempt to ensure that it will be created by this code and
 // won't already exist with the wrong permissions.
-#  define ROOT_UPDATE_DIR_NAME "Mozilla-1de4eec8-1241-4177-a864-e594e8d1fb38"
+#  define ROOT_UPDATE_DIR_NAME "Waterfox-1de4eec8-1241-4177-a864-e594e8d1fb38"
 // This describes the directory between the "Mozilla" directory and the install
 // path hash (i.e. C:\ProgramData\Mozilla\<UPDATE_PATH_MID_DIR_NAME>\<hash>)
 #  define UPDATE_PATH_MID_DIR_NAME "updates"
@@ -576,7 +576,7 @@ static HRESULT GetUpdateDirectory(const wchar_t* installPath,
  // The Windows installer caches this hash value in the registry
  bool gotHash = false;
  SimpleAutoString regPath;
-  regPath.AutoAllocAndAssignSprintf(L"SOFTWARE\\Mozilla\\%S\\TaskBarIDs",
+  regPath.AutoAllocAndAssignSprintf(L"Software\\Waterfox\\%S\\TaskBarIDs",
                                    MOZ_APP_BASENAME);
  if (regPath.Length() != 0) {
    gotHash = GetCachedHash(reinterpret_cast<const char16_t*>(installPath),
--- a/toolkit/mozapps/update/common/pathhash.cpp
+++ b/toolkit/mozapps/update/common/pathhash.cpp
@@ -119,7 +119,7 @@ BOOL CalculateRegistryPathFromFilePath(const LPCWSTR filePath,
  delete[] lowercasePath;

  LPCWSTR baseRegPath =
-      L"SOFTWARE\\Mozilla\\"
+      L"SOFTWARE\\BrowserWorks\\"
      L"MaintenanceService\\";
  wcsncpy(registryPath, baseRegPath, MAX_PATH);
  BinaryDataToHexString(hash, hashSize, registryPath + wcslen(baseRegPath));
--- a/toolkit/mozapps/update/common/updatehelper.cpp
+++ b/toolkit/mozapps/update/common/updatehelper.cpp
@@ -443,7 +443,7 @@ LaunchServiceSoftwareUpdateCommand(int argc, LPCWSTR* argv) {
  // 2) The command being executed, which is "software-update"
  // 3) The path to updater.exe (from argv[0])
  LPCWSTR* updaterServiceArgv = new LPCWSTR[argc + 2];
-  updaterServiceArgv[0] = L"MozillaMaintenance";
+  updaterServiceArgv[0] = L"WaterfoxMaintenance";
  updaterServiceArgv[1] = L"software-update";

  for (int i = 0; i < argc; ++i) {
--- a/toolkit/mozapps/update/common/updatehelper.h
+++ b/toolkit/mozapps/update/common/updatehelper.h
@@ -24,9 +24,9 @@ void RemoveSecureOutputFiles(LPCWSTR patchDirPath);
 #define PATCH_DIR_PATH L"\\updates\\0"

 #ifdef MOZ_MAINTENANCE_SERVICE
-#  define SVC_NAME L"MozillaMaintenance"
+#  define SVC_NAME L"WaterfoxMaintenance"

-#  define BASE_SERVICE_REG_KEY L"SOFTWARE\\Mozilla\\MaintenanceService"
+#  define BASE_SERVICE_REG_KEY L"SOFTWARE\\BrowserWorks\\MaintenanceService"

 // The test only fallback key, as its name implies, is only present on machines
 // that will use automated tests.  Since automated tests always run from a
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -2034,7 +2034,7 @@ function copyTestUpdaterToBinDir() {
    stripQuarantineBitFromPath(updater.path);
    updater.append("Contents");
    updater.append("MacOS");
-    updater.append("org.mozilla.updater");
+    updater.append("net.waterfox.updater");
  }
  return updater;
 }
@@ -2546,7 +2546,7 @@ function shouldRunServiceTest() {
  let isBinSigned = isBinarySigned(updaterBinPath);

  const REG_PATH =
-    "SOFTWARE\\Mozilla\\MaintenanceService\\" +
+    "SOFTWARE\\BrowserWorks\\MaintenanceService\\" +
    "3932ecacee736d366d6436db0f55bce4";
  let key = Cc["@mozilla.org/windows-registry-key;1"].createInstance(
    Ci.nsIWindowsRegKey
@@ -2577,7 +2577,7 @@ function shouldRunServiceTest() {
  }

  // Check to make sure the service is installed
-  let args = ["wait-for-service-stop", "MozillaMaintenance", "10"];
+  let args = ["wait-for-service-stop", "WaterfoxMaintenance", "10"];
  let exitValue = runTestHelperSync(args);
  Assert.notEqual(
    exitValue,
@@ -2949,7 +2949,7 @@ function waitForServiceStop(aFailTest) {
  debugDump("waiting for the maintenance service to stop if necessary");
  // Use the helper bin to ensure the service is stopped. If not stopped, then
  // wait for the service to stop (at most 120 seconds).
-  let args = ["wait-for-service-stop", "MozillaMaintenance", "120"];
+  let args = ["wait-for-service-stop", "WaterfoxMaintenance", "120"];
  let exitValue = runTestHelperSync(args);
  Assert.notEqual(exitValue, 0xee, "the maintenance service should exist");
  if (exitValue != 0) {
--- a/toolkit/mozapps/update/updater/Launchd.plist
+++ b/toolkit/mozapps/update/updater/Launchd.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
  <key>Label</key>
-  <string>org.mozilla.updater</string>
+  <string>net.waterfox.updater</string>
  <key>RunAtLoad</key>
  <true/>
 </dict>
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@@ -30,7 +30,7 @@ libs::
 	rsync -a -C $(DIST)/bin/Info.plist $(DIST)/bin/updater.app/Contents
 	$(call py_action,preprocessor updater.app/Contents/Resources/English.lproj/InfoPlist.strings,-Fsubstitution --output-encoding utf-16 -DAPP_NAME='$(MOZ_APP_DISPLAYNAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o $(DIST)/bin/updater.app/Contents/Resources/English.lproj/InfoPlist.strings)
 	$(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/MacOS
-	$(NSINSTALL) $(DIST)/bin/org.mozilla.updater $(DIST)/bin/updater.app/Contents/MacOS
+	$(NSINSTALL) $(DIST)/bin/net.waterfox.updater $(DIST)/bin/updater.app/Contents/MacOS
 	$(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/Frameworks
 ifneq (,$(COMPILE_ENVIRONMENT))
 	$(NSINSTALL) $(DIST)/bin/UpdateSettings $(DIST)/bin/updater.app/Contents/Frameworks/UpdateSettings.framework
--- a/toolkit/mozapps/update/updater/launchchild_osx.mm
+++ b/toolkit/mozapps/update/updater/launchchild_osx.mm
@@ -193,7 +193,7 @@ id ConnectToUpdateServer() {
  while (!isConnected && currTry < numRetries) {
    @try {
      updateServer = (id)[NSConnection
-          rootProxyForConnectionWithRegisteredName:@"org.mozilla.updater.server"
+          rootProxyForConnectionWithRegisteredName:@"net.waterfox.updater.server"
                                              host:nil
                                   usingNameServer:[NSSocketPortNameServer
                                                       sharedInstance]];
@@ -237,14 +237,14 @@ void CleanupElevatedMacUpdate(bool aFailureOccurred) {

  NSFileManager* manager = [NSFileManager defaultManager];
  [manager
-      removeItemAtPath:@"/Library/PrivilegedHelperTools/org.mozilla.updater"
+      removeItemAtPath:@"/Library/PrivilegedHelperTools/net.waterfox.updater"
                 error:nil];
-  [manager removeItemAtPath:@"/Library/LaunchDaemons/org.mozilla.updater.plist"
+  [manager removeItemAtPath:@"/Library/LaunchDaemons/net.waterfox.updater.plist"
                      error:nil];

  // The following call will terminate the current process due to the "remove"
  // argument.
-  LaunchTask(@"/bin/launchctl", @[ @"remove", @"org.mozilla.updater" ]);
+  LaunchTask(@"/bin/launchctl", @[ @"remove", @"net.waterfox.updater" ]);
 }

 // Note: Caller is responsible for freeing aArgv.
@@ -327,7 +327,7 @@ bool ObtainUpdaterArguments(int* aArgc, char*** aArgv,
  NSConnection* server = [NSConnection connectionWithReceivePort:serverPort
                                                        sendPort:serverPort];
  [server setRootObject:self];
-  if ([server registerName:@"org.mozilla.updater.server"
+  if ([server registerName:@"net.waterfox.updater.server"
            withNameServer:[NSSocketPortNameServer sharedInstance]] == NO) {
    NSLog(@"Unable to register as DirectoryServer.");
    NSLog(@"Is another copy running?");
--- a/toolkit/mozapps/update/updater/macbuild/Contents/Info.plist.in
+++ b/toolkit/mozapps/update/updater/macbuild/Contents/Info.plist.in
@@ -7,11 +7,11 @@
 	<key>CFBundleDisplayName</key>
 	<string>updater</string>
 	<key>CFBundleExecutable</key>
-	<string>org.mozilla.updater</string>
+	<string>net.waterfox.updater</string>
 	<key>CFBundleIconFile</key>
 	<string>updater.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.mozilla.updater</string>
+	<string>net.waterfox.updater</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
-    Program("org.mozilla.updater")
+    Program("net.waterfox.updater")
 else:
    Program("updater")

--- a/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
+++ b/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
@@ -37,7 +37,7 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(NSINSTALL) $(srcdir)/../macos-frameworks/UpdateSettings/Info.plist  $(XPCSHELLTESTDIR)/data/updater-xpcshell.app/Contents/Frameworks/UpdateSettings.framework/Resources
 	rm -Rf $(XPCSHELLTESTDIR)/data/updater.app
 	mv $(XPCSHELLTESTDIR)/data/updater-xpcshell.app $(XPCSHELLTESTDIR)/data/updater.app
-	mv $(XPCSHELLTESTDIR)/data/updater.app/Contents/MacOS/updater-xpcshell $(XPCSHELLTESTDIR)/data/updater.app/Contents/MacOS/org.mozilla.updater
+	mv $(XPCSHELLTESTDIR)/data/updater.app/Contents/MacOS/updater-xpcshell $(XPCSHELLTESTDIR)/data/updater.app/Contents/MacOS/net.waterfox.updater

 ifdef MOCHITESTBROWSERDIR
 	rsync -a -C $(XPCSHELLTESTDIR)/data/updater.app $(MOCHITESTBROWSERDIR)/
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -3157,7 +3157,7 @@ int NS_main(int argc, NS_tchar** argv) {
      // proceed with an install to `Program Files` or `Program Files(x86)`.
      isAdmin.unwrap() || isLocalSystem.unwrap();
 #elif defined(XP_MACOSX)
-        strstr(argv[0], "/Library/PrivilegedHelperTools/org.mozilla.updater") !=
+        strstr(argv[0], "/Library/PrivilegedHelperTools/net.waterfox.updater") !=
        0;
 #else
      false;
--- a/toolkit/system/gnome/nsAlertsIconListener.cpp
+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
@@ -334,10 +334,10 @@ nsresult nsAlertsIconListener::InitAlertAsync(nsIAlertNotification* aAlert,
      } else {
        NS_WARNING(
            "brand.properties not present, using default application name");
-        appShortName.AssignLiteral("Mozilla");
+        appShortName.AssignLiteral("Waterfox");
      }
    } else {
-      appShortName.AssignLiteral("Mozilla");
+      appShortName.AssignLiteral("Waterfox");
    }

    if (!notify_init(appShortName.get())) return NS_ERROR_FAILURE;
--- a/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
+++ b/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
@@ -104,7 +104,7 @@ nsresult nsOSXSystemProxySettings::Init() {
  // Register for notification of proxy setting changes
  // See:
  // http://developer.apple.com/documentation/Networking/Conceptual/CFNetwork/CFStreamTasks/chapter_4_section_5.html
-  mSystemDynamicStore = SCDynamicStoreCreate(NULL, CFSTR("Mozilla"),
+  mSystemDynamicStore = SCDynamicStoreCreate(NULL, CFSTR("BrowserWorks"),
                                             ProxyHasChangedWrapper, &mContext);
  if (!mSystemDynamicStore) return NS_ERROR_FAILURE;

--- a/toolkit/xre/MacLaunchHelper.mm
+++ b/toolkit/xre/MacLaunchHelper.mm
@@ -164,7 +164,7 @@ bool InstallPrivilegedHelper() {
    // then loaded. The executable is placed in
    // /Library/PrivilegedHelperTools.
    result = (BOOL)SMJobBless(kSMDomainSystemLaunchd,
-                              (CFStringRef) @"org.mozilla.updater", authRef,
+                              (CFStringRef) @"net.waterfox.updater", authRef,
                              &cfError);
    if (!result) {
      NSLog(@"Unable to install helper!");
@@ -185,7 +185,7 @@ void AbortElevatedUpdate() {
  while (currTry < numRetries) {
    @try {
      updateServer = (id)[NSConnection
-          rootProxyForConnectionWithRegisteredName:@"org.mozilla.updater.server"
+          rootProxyForConnectionWithRegisteredName:@"net.waterfox.updater.server"
                                              host:nil
                                   usingNameServer:[NSSocketPortNameServer
                                                       sharedInstance]];
--- a/toolkit/xre/PolicyChecks.h
+++ b/toolkit/xre/PolicyChecks.h
@@ -12,7 +12,7 @@
 #  include <windows.h>
 #  include "mozilla/Maybe.h"

-#  define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\Mozilla\\" MOZ_APP_BASENAME
+#  define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\BrowserWorks\\" MOZ_APP_BASENAME

 // NB: This code must be able to run apart from XPCOM

--- a/toolkit/xre/nsUpdateDriver.h
+++ b/toolkit/xre/nsUpdateDriver.h
@@ -29,11 +29,11 @@ typedef PRProcess* ProcessType;

 #ifdef XP_WIN
 #  define UPDATER_BIN "updater.exe"
-#  define MAINTENANCE_SVC_NAME L"MozillaMaintenance"
+#  define MAINTENANCE_SVC_NAME L"WaterfoxMaintenance"
 #  define MAYBE_WAIT_TIMEOUT_MS (60U * 1000U)
 #elif XP_MACOSX
 #  define UPDATER_APP "updater.app"
-#  define UPDATER_BIN "org.mozilla.updater"
+#  define UPDATER_BIN "net.waterfox.updater"
 #else
 #  define UPDATER_BIN "updater"
 #endif
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -285,16 +285,16 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
  rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType,
                        getter_AddRefs(localDir));
  if (NS_SUCCEEDED(rv)) {
-    rv = localDir->AppendNative("Mozilla"_ns);
+    rv = localDir->AppendNative("Waterfox"_ns);
  }
 #  else
  constexpr auto dirname =
 #    ifdef HAVE_USR_LIB64_DIR
-      "/usr/lib64/mozilla"_ns
+      "/usr/lib64/waterfox"_ns
 #    elif defined(__OpenBSD__) || defined(__FreeBSD__)
-      "/usr/local/lib/mozilla"_ns
+      "/usr/local/lib/waterfox"_ns
 #    else
-      "/usr/lib/mozilla"_ns
+      "/usr/lib/waterfox"_ns
 #    endif
      ;
  rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir));
@@ -366,9 +366,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
    rv = GetUserDataDirectoryHome(getter_AddRefs(file), false);
    NS_ENSURE_SUCCESS(rv, rv);
 #  if defined(XP_MACOSX)
-    rv = file->AppendNative("Mozilla"_ns);
+    rv = file->AppendNative("Waterfox"_ns);
 #  else   // defined(XP_MACOSX)
-    rv = file->AppendNative(".mozilla"_ns);
+    rv = file->AppendNative(".waterfox"_ns);
 #  endif  // defined(XP_MACOSX)
  }
 #endif  // defined(XP_UNIX) || defined(XP_MACOSX)
@@ -398,9 +398,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
  else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) {
 #  ifdef ENABLE_SYSTEM_EXTENSION_DIRS
 #    if defined(__OpenBSD__) || defined(__FreeBSD__)
-    static const char* const sysLExtDir = "/usr/local/share/mozilla/extensions";
+    static const char* const sysLExtDir = "/usr/local/share/waterfox/extensions";
 #    else
-    static const char* const sysLExtDir = "/usr/share/mozilla/extensions";
+    static const char* const sysLExtDir = "/usr/share/waterfox/extensions";
 #    endif
    rv = NS_NewNativeLocalFile(nsDependentCString(sysLExtDir),
                               getter_AddRefs(file));
@@ -932,7 +932,7 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
            nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) {
      return NS_ERROR_FAILURE;
    }
-  } else if (NS_FAILED(localDir->AppendNative("Mozilla"_ns))) {
+  } else if (NS_FAILED(localDir->AppendNative("Waterfox"_ns))) {
    return NS_ERROR_FAILURE;
  }

@@ -1192,7 +1192,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {

 #if defined(XP_MACOSX) || defined(XP_WIN)

-  static const char* const sXR = "Mozilla";
+  static const char* const sXR = "Waterfox";
  rv = aFile->AppendNative(nsDependentCString(sXR));
  NS_ENSURE_SUCCESS(rv, rv);

@@ -1202,7 +1202,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {

 #elif defined(XP_UNIX)

-  static const char* const sXR = ".mozilla";
+  static const char* const sXR = ".waterfox";
  rv = aFile->AppendNative(nsDependentCString(sXR));
  NS_ENSURE_SUCCESS(rv, rv);

@@ -1266,7 +1266,7 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
  // The parent of this directory is set in GetUserDataDirectoryHome
  // XXX: handle gAppData->profile properly
  // XXXsmaug ...and the rest of the profile creation!
-  rv = aFile->AppendNative(nsDependentCString("mozilla"));
+  rv = aFile->AppendNative(nsDependentCString("waterfox"));
  NS_ENSURE_SUCCESS(rv, rv);
 #elif defined(XP_UNIX)
  nsAutoCString folder;
--- a/tools/update-verify/release/updates/verify.sh
+++ b/tools/update-verify/release/updates/verify.sh
@@ -164,7 +164,7 @@ do
        case $updater_package_filename in
          *dmg)
            platform_dirname="*.app"
-            updater_bins="Contents/MacOS/updater.app/Contents/MacOS/updater Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater"
+            updater_bins="Contents/MacOS/updater.app/Contents/MacOS/updater Contents/MacOS/updater.app/Contents/MacOS/net.waterfox.updater"
            updater_platform="mac"
            mac_update_settings_dir_override=""
            ;;
--- a/waterfox/browser/branding/configure.sh
+++ b/waterfox/browser/branding/configure.sh
@@ -5,7 +5,7 @@
 MOZ_APP_DISPLAYNAME=Waterfox
 MOZ_APP_NAME=Waterfox
 MOZ_APP_PROFILE=Waterfox
-MOZ_APP_VENDOR="WaterfoxLimited"
+MOZ_APP_VENDOR="BrowserWorks"
 MOZ_DISTRIBUTION_ID=net.waterfox
 MOZ_INCLUDE_SOURCE_INFO=1
 MOZ_REQUIRE_SIGNING=
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -3604,7 +3604,7 @@ void nsWindow::SetIcon(const nsAString& aIconSpec) {
    nsAutoString brandName;
    WidgetUtils::GetBrandShortName(brandName);
    if (brandName.IsEmpty()) {
-      brandName.AssignLiteral(u"Mozilla");
+      brandName.AssignLiteral(u"Waterfox");
    }
    AppendUTF16toUTF8(brandName, iconName);
    ToLowerCase(iconName);
--- a/widget/windows/WinTaskbar.cpp
+++ b/widget/windows/WinTaskbar.cpp
@@ -238,7 +238,7 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId,
  nsCString appName;
  if (appInfo && NS_SUCCEEDED(appInfo->GetName(appName))) {
    nsAutoString regKey;
-    regKey.AssignLiteral("Software\\Mozilla\\");
+    regKey.AssignLiteral("Software\\BrowserWorks\\");
    AppendASCIItoUTF16(appName, regKey);
    regKey.AppendLiteral("\\TaskBarIDs");

--- a/widget/windows/tests/TestUrisToValidate.h
+++ b/widget/windows/tests/TestUrisToValidate.h
@@ -26,9 +26,9 @@ const wchar_t* kTestUris[] = {
    L"firefox.url:%.txt",
    L"firefox.url:%00.txt",
    L"firefox.url:%41%2D%31%5Ftest&quot;ing?%41%31%00.txt",
-    L"firefoxurl:%.txt",
-    L"firefoxurl:%00.txt",
-    L"firefoxurl:%41%2D%31%5Ftest&quot;ing?%41%31%00.txt",
+    L"WaterfoxURL:%.txt",
+    L"WaterfoxURL:%00.txt",
+    L"WaterfoxURL:%41%2D%31%5Ftest&quot;ing?%41%31%00.txt",
    L"ftp:%.txt",
    L"ftp:%00.txt",
    L"ftp:%41%2D%31%5Ftest&quot;ing?%41%31%00.txt",
--- a/xpcom/build/nsXPCOMPrivate.h
+++ b/xpcom/build/nsXPCOMPrivate.h
@@ -56,7 +56,7 @@ void LogTerm();

 #  define XPCOM_SEARCH_KEY "PATH"
 #  define GRE_CONF_NAME "gre.config"
-#  define GRE_WIN_REG_LOC L"Software\\mozilla.org\\GRE"
+#  define GRE_WIN_REG_LOC L"Software\\waterfox.net\\GRE"
 #  define XPCOM_DLL XUL_DLL
 #  define LXPCOM_DLL LXUL_DLL
 #  define XUL_DLL "xul.dll"
--- a/xpcom/tests/TestWinReg.js
+++ b/xpcom/tests/TestWinReg.js
@@ -7,7 +7,7 @@
 */

 const nsIWindowsRegKey = Ci.nsIWindowsRegKey;
-const BASE_PATH = "SOFTWARE\\Mozilla\\Firefox";
+const BASE_PATH = "SOFTWARE\\BrowserWorks\\Waterfox";

 function idump(indent, str) {
  for (var j = 0; j < indent; ++j) {
--- a/xpcom/windbgdlg/windbgdlg.cpp
+++ b/xpcom/windbgdlg/windbgdlg.cpp
@@ -76,9 +76,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
  DWORD regValue = -1;
  DWORD regLength = sizeof regValue;
  HKEY hkeyCU, hkeyLM;
-  RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\mozilla.org\\windbgdlg", 0,
+  RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\waterfox.org\\windbgdlg", 0,
                KEY_READ, &hkeyCU);
-  RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\mozilla.org\\windbgdlg", 0,
+  RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\waterfox.org\\windbgdlg", 0,
                KEY_READ, &hkeyLM);
  for (int i = __argc - 1; regValue == (DWORD)-1 && i; --i) {
    bool ok = false;