diff --git a/mozilla/xpinstall/packager/StageUtils.pm b/mozilla/xpinstall/packager/StageUtils.pm
index 95349e0cbd3..c7b0ac621c7 100644
--- a/mozilla/xpinstall/packager/StageUtils.pm
+++ b/mozilla/xpinstall/packager/StageUtils.pm
@@ -444,8 +444,8 @@ sub GetProductMilestoneVersion
     print "   aDirConfigTopSrc: $aDirConfigTopSrc\n";
   }
 
-  chdir("$aDirMozTopSrc/config");
-  $versionMilestone = `perl milestone.pl --topsrcdir $aDirConfigTopSrc`;
+  #chdir("$aDirMozTopSrc/config");
+  $versionMilestone = `cat $aDirMozTopSrc/xpfe/bootstrap/version.txt`;
 
   if(defined($ENV{DEBUG_INSTALLER_BUILD}))
   {
diff --git a/mozilla/xpinstall/packager/packages-os2 b/mozilla/xpinstall/packager/packages-os2
index bb0ce1b613a..d54e6ef6eec 100644
--- a/mozilla/xpinstall/packager/packages-os2
+++ b/mozilla/xpinstall/packager/packages-os2
@@ -73,7 +73,7 @@ bin/components/wdgtos2.dll
 ;bin/jpeg3250.dll
 ;bin/jsj3250.dll
 bin/jsj.dll
-bin/mozilla.exe
+bin/seamonkey.exe
 bin/mozturbo.exe
 ;bin/mozctl.dll
 ;bin/mozctlx.dll
diff --git a/mozilla/xpinstall/packager/packages-static-unix b/mozilla/xpinstall/packager/packages-static-unix
index db5e7c0cbd5..3ab64cab80b 100644
--- a/mozilla/xpinstall/packager/packages-static-unix
+++ b/mozilla/xpinstall/packager/packages-static-unix
@@ -56,8 +56,8 @@ bin/libxpcom_compat.so
 bin/components/libxpcom_compat_c.so
 
 [browser]
-bin/mozilla
-bin/mozilla-bin
+bin/seamonkey
+bin/seamonkey-bin
 bin/icons/*
 bin/run-mozilla.sh
 bin/regExport
diff --git a/mozilla/xpinstall/packager/packages-static-win b/mozilla/xpinstall/packager/packages-static-win
index 828ef547bfe..78e5d8e2640 100644
--- a/mozilla/xpinstall/packager/packages-static-win
+++ b/mozilla/xpinstall/packager/packages-static-win
@@ -64,7 +64,7 @@ bin\components\xpcom_compat_c.dll
 [browser]
 bin\README.txt,bin\readme.txt
 bin\LICENSE,bin\license.txt
-bin\mozilla.exe
+bin\seamonkey.exe
 bin\plugins\npnul32.dll
 bin\res\cmessage.txt
 bin\regxpcom.exe
diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix
index ce5657e4916..4152ffd79ff 100644
--- a/mozilla/xpinstall/packager/packages-unix
+++ b/mozilla/xpinstall/packager/packages-unix
@@ -59,8 +59,8 @@ bin/libxpcom_compat.so
 bin/components/libxpcom_compat_c.so
 
 [browser]
-bin/mozilla
-bin/mozilla-bin
+bin/seamonkey
+bin/seamonkey-bin
 bin/init.d/README
 bin/init.d/S02solaris_patchchecker.sh
 bin/moz_patch_checker.dtksh
diff --git a/mozilla/xpinstall/packager/packages-win b/mozilla/xpinstall/packager/packages-win
index d808f295995..7134d8a543b 100644
--- a/mozilla/xpinstall/packager/packages-win
+++ b/mozilla/xpinstall/packager/packages-win
@@ -69,7 +69,7 @@ bin\defaults\messenger\SpamPal.sfd
 bin\README.txt,bin\readme.txt
 bin\LICENSE,bin\license.txt
 bin\jpeg3250.dll
-bin\mozilla.exe
+bin\seamonkey.exe
 bin\regxpcom.exe
 bin\xpicleanup.exe
 bin\components\AcctIdl.dll
diff --git a/mozilla/xpinstall/packager/win_gre/config.it b/mozilla/xpinstall/packager/win_gre/config.it
index 40fec9689c6..ce0595092ae 100644
--- a/mozilla/xpinstall/packager/win_gre/config.it
+++ b/mozilla/xpinstall/packager/win_gre/config.it
@@ -288,16 +288,16 @@ exe=
 exe_param=
 
 [Check Instance0]
-Class Name=MozillaMessageWindow
+Class Name=SeaMonkeyMessageWindow
 Window Name=
-Process Name=Mozilla.exe
-Pretty Name=Mozilla
+Process Name=seamonkey.exe
+Pretty Name=SeaMonkey
 ;*** LOCALIZE ME BABY ***
-Message=Download of $ProductName$ was successful. However, Mozilla must be closed to proceed with this installation. Click OK to exit Mozilla automatically and to begin installation.
+Message=Download of $ProductName$ was successful. However, SeaMonkey must be closed to proceed with this installation. Click OK to exit SeaMonkey automatically and to begin installation.
 ;*** LOCALIZE ME BABY ***
-Message Full Installer=Mozilla must be closed to proceed with this installation. Click OK to exit Mozilla automatically and to begin installation.
+Message Full Installer=SeaMonkey must be closed to proceed with this installation. Click OK to exit SeaMonkey automatically and to begin installation.
 ;*** LOCALIZE ME BABY ***
-Message wait=Shutting down Mozilla.  Please wait...
+Message wait=Shutting down SeaMonkey.  Please wait...
 
 ; This key indicates whether or not to close all the windows associated with
 ; the process id of this app instance window found.
@@ -306,7 +306,7 @@ Close All Process Windows=TRUE
 ; These keys are not normally necessary for checking instances.  They are
 ; set here because Mozilla requires a way to shut down it's turbo mode.
 Extra Cmd0 Reg Key Root=HKEY_LOCAL_MACHINE
-Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Mozilla.exe
+Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\seamonkey.exe
 Extra Cmd0 Reg Name=
 Extra Cmd0 Parameter=-kill
 
diff --git a/mozilla/xpinstall/packager/win_gre/uninstall.it b/mozilla/xpinstall/packager/win_gre/uninstall.it
index 98e4cf0a43e..3c4b68f072c 100644
--- a/mozilla/xpinstall/packager/win_gre/uninstall.it
+++ b/mozilla/xpinstall/packager/win_gre/uninstall.it
@@ -61,14 +61,14 @@ Uninstall Filename=$UninstallFile$
 Defaults Info Filename=defaults_info.ini
 
 [Check Instance0]
-Class Name=MozillaMessageWindow
+Class Name=SeaMonkeyMessageWindow
 Window Name=
-Process Name=Mozilla.exe
-Pretty Name=Mozilla
+Process Name=seamonkey.exe
+Pretty Name=SeaMonkey
 ;*** LOCALIZE ME BABY ***
-Message=Mozilla is detected to be currently running.  Please quit Mozilla before continuing.  Click OK to exit Mozilla automatically and proceed with uninstallation.
+Message=SeaMonkey is detected to be currently running.  Please quit SeaMonkey before continuing.  Click OK to exit SeaMonkey automatically and proceed with uninstallation.
 ;*** LOCALIZE ME BABY ***
-Message wait=Shutting down Mozilla.  Please wait...
+Message wait=Shutting down SeaMonkey.  Please wait...
 
 ; This key indicates whether or not to close all the windows associated with
 ; the process id of this app instance window found.
@@ -77,7 +77,7 @@ Close All Process Windows=TRUE
 ; These keys are not normally necessary for checking instances.  They are
 ; set here because Mozilla requires a way to shut down it's turbo mode.
 Extra Cmd0 Reg Key Root=HKEY_LOCAL_MACHINE
-Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Mozilla.exe
+Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\seamonkey.exe
 Extra Cmd0 Reg Name=
 Extra Cmd0 Parameter=-kill
 
diff --git a/mozilla/xpinstall/packager/windows/browser.jst b/mozilla/xpinstall/packager/windows/browser.jst
index 08957651fc3..ff7887b8156 100644
--- a/mozilla/xpinstall/packager/windows/browser.jst
+++ b/mozilla/xpinstall/packager/windows/browser.jst
@@ -195,7 +195,7 @@ function createShortcuts()
 
     /* log this so if the user turns on turbo mode in the browser the uninstaller will undo it */
 
-    logComment( "store registry value string: HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run [Mozilla Quick Launch]");
+    logComment( "store registry value string: HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run [SeaMonkey Quick Launch]");
     if (regvalue && regvalue != undefined && regvalue.length != 0) 
     {
         var value = new String(regvalue);
@@ -208,7 +208,7 @@ function createShortcuts()
                 turboarg = value.slice(index2 + 1, index2 + 2);
                 winreg.setRootKey(winreg.HKEY_CURRENT_USER);
                 subkey = "Software\\Microsoft\\Windows\\CurrentVersion\\Run";
-                valname = "Mozilla Quick Launch";
+                valname = "SeaMonkey Quick Launch";
                 if ( turboarg == "Y" || turboarg == "y") 
                 {
                     fTemp = fileExe;
diff --git a/mozilla/xpinstall/packager/windows/config.it b/mozilla/xpinstall/packager/windows/config.it
index 2fc9d8a9f4f..72b8e58e8b7 100644
--- a/mozilla/xpinstall/packager/windows/config.it
+++ b/mozilla/xpinstall/packager/windows/config.it
@@ -311,23 +311,23 @@ Message0=Select or clear the additional components you want to install.
 Show Dialog=FALSE
 Title=$ProductName$ Setup - Windows Integration
 Message0=Check the options you would like Setup to perform.
-Message1=These settings allow you to set default Internet preferences for browsing and searching.  They affect browsers installed on your machine, including Mozilla, Netscape and Microsoft Internet Explorer.
+Message1=These settings allow you to set default Internet preferences for browsing and searching.  They affect browsers installed on your machine, including SeaMonkey, Mozilla, Netscape and Microsoft Internet Explorer.
 
 ; Only a maximum of 4 "Windows Integration-Item"s are allowded.  Each Item
 ; shows up as a checkbox in the Windows Integration dialog.
 [Windows Integration-Item0]
 CheckBoxState=FALSE
-Description=Make Mozilla my default Internet browser
+Description=Make SeaMonkey my default Internet browser
 Archive=
 
 [Windows Integration-Item1]
 CheckBoxState=FALSE
-Description=Make Mozilla Netcenter my home page
+Description=Make SeaMonkey Netcenter my home page
 Archive=
 
 [Windows Integration-Item2]
 CheckBoxState=FALSE
-Description=Use Mozilla Netcenter to search the Web
+Description=Use SeaMonkey Netcenter to search the Web
 Archive=
 ;*** DO NOT LOCALIZE - END ***
 
@@ -381,7 +381,7 @@ Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
 Title=$ProductName$ Setup - Quick Launch
 ;*** LOCALIZE ME BABY ***
-Message0=Quick Launch starts Mozilla faster by keeping portions of the program in computer memory.
+Message0=Quick Launch starts SeaMonkey faster by keeping portions of the program in computer memory.
 ;*** LOCALIZE ME BABY ***
 Message1=You can access Quick Launch through the icon on the Windows taskbar tray.
 ;*** LOCALIZE ME BABY ***
@@ -425,7 +425,7 @@ Message Retry0=Some files have failed the CRC check and are being downloaded aga
 Show Dialog=AUTO
 
 [Check Instance0]
-Class Name=MozillaMessageWindow
+Class Name=SeaMonkeyMessageWindow
 Window Name=
 Process Name=$MainExeFile$
 Pretty Name=$ProductNameInternal$
@@ -441,7 +441,7 @@ Message wait=Shutting down $ProductNameInternal$.  Please wait...
 Close All Process Windows=TRUE
 
 ; These keys are not normally necessary for checking instances.  They are
-; set here because Mozilla requires a way to shut down it's turbo mode.
+; set here because SeaMonkey requires a way to shut down it's turbo mode.
 Extra Cmd0 Reg Key Root=HKEY_LOCAL_MACHINE
 Extra Cmd0 Reg Key=Software\Microsoft\Windows\CurrentVersion\App Paths\$MainExeFile$
 Extra Cmd0 Reg Name=
@@ -1135,13 +1135,13 @@ Timing=pre smartupdate
 
 [Cleanup Previous Product RegKeys]
 Reg Key Root0=HKEY_LOCAL_MACHINE
-Product Name0=Mozilla
-Product Reg Key0=Software\Mozilla.org\Mozilla
+Product Name0=SeaMonkey
+Product Reg Key0=Software\Mozilla.org\SeaMonkey
 Current Version0=$UserAgent$
 
 Reg Key Root1=HKEY_CURRENT_USER
-Product Name1=Mozilla
-Product Reg Key1=Software\Mozilla.org\Mozilla
+Product Name1=SeaMonkey
+Product Reg Key1=Software\Mozilla.org\SeaMonkey
 Current Version1=$UserAgent$
 
 
diff --git a/mozilla/xpinstall/packager/windows/editor.jst b/mozilla/xpinstall/packager/windows/editor.jst
index cc7fb19b383..101c33bb0b6 100644
--- a/mozilla/xpinstall/packager/windows/editor.jst
+++ b/mozilla/xpinstall/packager/windows/editor.jst
@@ -1,4 +1,4 @@
-var err = initInstall("Mozilla Editor", "Editor", "$Version$"); 
+var err = initInstall("SeaMonkey Editor", "Editor", "$Version$"); 
 logComment("initInstall: " + err);
 
 var communicatorFolder = getFolder("Communicator");
diff --git a/mozilla/xpinstall/packager/windows/mail.jst b/mozilla/xpinstall/packager/windows/mail.jst
index b1c15868a65..f640e1d5712 100644
--- a/mozilla/xpinstall/packager/windows/mail.jst
+++ b/mozilla/xpinstall/packager/windows/mail.jst
@@ -376,7 +376,7 @@ var err;
 var fProgram;
 
 srDest = $SpaceRequired$:bin;
-err    = initInstall("Mozilla Mail", "Mail", "$Version$"); 
+err    = initInstall("SeaMonkey Mail", "Mail", "$Version$"); 
 logComment("initInstall: " + err);
 
 fProgram = getFolder("Program");
diff --git a/mozilla/xpinstall/packager/windows/makeall.pl b/mozilla/xpinstall/packager/windows/makeall.pl
index 30f4863237a..54b661162fb 100644
--- a/mozilla/xpinstall/packager/windows/makeall.pl
+++ b/mozilla/xpinstall/packager/windows/makeall.pl
@@ -88,7 +88,7 @@ if(defined($ENV{DEBUG_INSTALLER_BUILD}))
 $gDefaultProductVersion   = StageUtils::GetProductY2KVersion($topobjdir, $topsrcdir, $topsrcdir);
 
 print "\n";
-print " Building Mozilla\n";
+print " Building SeaMonkey\n";
 print "  Raw version id   : $gDefaultProductVersion\n";
 
 # $gDefaultProductVersion has the form maj.min.release.bld where maj, min, release
@@ -162,9 +162,9 @@ copy("$gDirDistInstGre/$seiGreFileNameSpecific", "$gDirStageProduct/gre") ||
 
 $versionLanguage               = "en";
 $ENV{WIZ_nameCompany}          = "mozilla.org";
-$ENV{WIZ_nameProduct}          = "Mozilla";
-$ENV{WIZ_nameProductInternal}  = "Mozilla"; # product name without the version string
-$ENV{WIZ_fileMainExe}          = "Mozilla.exe";
+$ENV{WIZ_nameProduct}          = "SeaMonkey";
+$ENV{WIZ_nameProductInternal}  = "SeaMonkey"; # product name without the version string
+$ENV{WIZ_fileMainExe}          = "SeaMonkey.exe";
 $ENV{WIZ_fileUninstall}        = $seuFileNameSpecific;
 $ENV{WIZ_fileUninstallZip}     = $seuzFileNameSpecific;
 # The following variables are for displaying version info in the 
diff --git a/mozilla/xpinstall/packager/windows/mozilla-win32-stub-installer.jst b/mozilla/xpinstall/packager/windows/mozilla-win32-stub-installer.jst
index c459071b70a..981d7e2ffbe 100644
--- a/mozilla/xpinstall/packager/windows/mozilla-win32-stub-installer.jst
+++ b/mozilla/xpinstall/packager/windows/mozilla-win32-stub-installer.jst
@@ -5,7 +5,7 @@ var fDesktop;
 var szFolderDesktop;
 
 srDest = $SpaceRequired$;
-err    = initInstall("Mozilla Installer", "/mozilla.org/Mozilla Installer", "$Version$"); 
+err    = initInstall("SeaMonkey Installer", "/mozilla.org/SeaMonkey Installer", "$Version$"); 
 logComment("initInstall: " + err);
 
 // Find the current user's desktop
@@ -24,13 +24,13 @@ if(verifyDiskSpace(fDesktop, srDest))
 
   err =  addFile("",
                  "",
-                 "mozilla-win32-stub-installer.exe", // dir name in jar to extract 
+                 "seamonkey-win32-stub-installer.exe", // dir name in jar to extract 
                  fDesktop,             // Where to put this file (Returned from getFolder) 
                  "");                  // subdir name to create relative to fProgram
 
   logComment("addFile() returned: " + err);
 
-  err = execute("mozilla-win32-stub-installer.exe", "", false);
+  err = execute("SeaMonkey-win32-stub-installer.exe", "", false);
   logComment("execute() returned: " + err);
 
   // check return value
diff --git a/mozilla/xpinstall/packager/windows/spellcheck.jst b/mozilla/xpinstall/packager/windows/spellcheck.jst
index 223b5aaa97b..c6260597b5a 100644
--- a/mozilla/xpinstall/packager/windows/spellcheck.jst
+++ b/mozilla/xpinstall/packager/windows/spellcheck.jst
@@ -1,6 +1,6 @@
 var srDest = $SpaceRequired$;
 
-var err = initInstall("Mozilla Myspell Spellchecker", "Spellchecker", "$Version$"); 
+var err = initInstall("SeaMonkey Myspell Spellchecker", "Spellchecker", "$Version$"); 
 logComment("initInstall: " + err);
 
 fProgram  = getFolder("Program");