diff --git a/mozilla/other-licenses/branding/firefox/branding.nsi b/mozilla/other-licenses/branding/firefox/branding.nsi
index 00a839e0f01..07af954363a 100755
--- a/mozilla/other-licenses/branding/firefox/branding.nsi
+++ b/mozilla/other-licenses/branding/firefox/branding.nsi
@@ -36,12 +36,12 @@
 
 # NSIS defines for release builds.
 # The nightly build branding.nsi is located in browser/installer/windows/nsis/
-!define BrandShortName        "MooseCat"
-!define BrandFullName         "BorisSoft MooseCat"
+!define BrandShortName        "Firefox"
+!define BrandFullName         "Mozilla Firefox"
 # BrandFullNameInternal is used for some registry and file system values that
 # should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.)
-!define BrandFullNameInternal "BorisSoft MooseCat"
-!define CompanyName           "BorisSoft Narf"
+!define BrandFullNameInternal "Mozilla Firefox"
+!define CompanyName           "Mozilla Corporation"
 !define URLInfoAbout          "http://${AB_CD}.www.mozilla.com/${AB_CD}/"
 !define URLUpdateInfo         "http://${AB_CD}.www.mozilla.com/${AB_CD}/firefox/"
 !define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html"
diff --git a/mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd b/mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd
index a01cda2f363..d99b714b287 100644
--- a/mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd
+++ b/mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd
@@ -1,3 +1,3 @@
-<!ENTITY  brandShortName        "MooseCat">
-<!ENTITY  brandFullName         "BorisSoft MooseCat">
-<!ENTITY  vendorShortName       "BorisSoft">
+<!ENTITY  brandShortName        "Firefox">
+<!ENTITY  brandFullName         "Mozilla Firefox">
+<!ENTITY  vendorShortName       "Mozilla">
diff --git a/mozilla/other-licenses/branding/firefox/locales/en-US/brand.properties b/mozilla/other-licenses/branding/firefox/locales/en-US/brand.properties
index 0bdf5c38302..5be8ec40f39 100644
--- a/mozilla/other-licenses/branding/firefox/locales/en-US/brand.properties
+++ b/mozilla/other-licenses/branding/firefox/locales/en-US/brand.properties
@@ -1,8 +1,8 @@
-brandShortName=MooseCat
-brandFullName=BorisSoft MooseCat
-vendorShortName=MooseCat
+brandShortName=Firefox
+brandFullName=Mozilla Firefox
+vendorShortName=Mozilla
 
-homePageSingleStartMain=MooseCat Start, a fast home page with built-in search
+homePageSingleStartMain=Firefox Start, a fast home page with built-in search
 homePageImport=Import your home page from %S
 
 homePageMigrationPageTitle=Home Page Selection