diff --git a/msi/build-on-hudson.sh b/msi/build-on-hudson.sh
index 90f85fca40c3d3d7f2be3f44b94c4b271927032d..b936f50efe0cfd83bf0ec13d41cc3b9b3f078d0a 100755
--- a/msi/build-on-hudson.sh
+++ b/msi/build-on-hudson.sh
@@ -1,15 +1,15 @@
 #!/bin/bash -ex
 if [ ! -e "$1" ]; then
-  echo "Usage: build-on-hudson path/to/war"
+  echo "Usage: build-on-jenkins path/to/war"
   exit 1
 fi
 if [ "$HUDSON_URL" == "" ]; then
   export HUDSON_URL=http://hudson.sfbay/
 fi
-tar cvzf bundle.tgz FindJava.java build.sh hudson.wxs
-java -jar hudson-cli.jar dist-fork -z bundle.tgz -f hudson.war="$1" -l windows -Z result.tgz bash -ex build.sh hudson.war
+tar cvzf bundle.tgz FindJava.java build.sh jenkins.wxs
+java -jar jenkins-cli.jar dist-fork -z bundle.tgz -f jenkins.war="$1" -l windows -Z result.tgz bash -ex build.sh jenkins.war
 
 # hack until we fix distfork to avoid pointless intermediate directory
 rm -rf distfork*
 tar xvzf result.tgz
-mv distfork*/hudson-*.msi .
+mv distfork*/jenkins-*.msi .
diff --git a/msi/build.sh b/msi/build.sh
index d6984510133d5bb6277193fbc2470780b9b78579..39459ddf85cf33ab53a0b4313f6bed8d59fba055 100755
--- a/msi/build.sh
+++ b/msi/build.sh
@@ -3,17 +3,17 @@ export PATH=~/tools/native/wix:$PATH
 
 war="$1"
 if [ ! -e "$war" ]; then
-  echo "build.sh path/to/hudson.war"
+  echo "build.sh path/to/jenkins.war"
   exit 1
 fi
 
 rm -rf tmp || true
 mkdir tmp || true
-unzip -p "$war" 'WEB-INF/lib/hudson-core-*.jar' > tmp/core.jar
-unzip -p tmp/core.jar windows-service/hudson.exe > tmp/hudson.exe
-unzip -p tmp/core.jar windows-service/hudson.xml > tmp/hudson.xm_
+unzip -p "$war" 'WEB-INF/lib/jenkins-core-*.jar' > tmp/core.jar
+unzip -p tmp/core.jar windows-service/jenkins.exe > tmp/jenkins.exe
+unzip -p tmp/core.jar windows-service/jenkins.xml > tmp/jenkins.xm_
 # replace executable name to the bundled JRE
-sed -e 's|executable.*|executable>%BASE%\\jre\\bin\\java</executable>|' < tmp/hudson.xm_ > tmp/hudson.xml
+sed -e 's|executable.*|executable>%BASE%\\jre\\bin\\java</executable>|' < tmp/jenkins.xm_ > tmp/jenkins.xml
 
 # capture JRE
 javac FindJava.java
@@ -25,9 +25,9 @@ heat dir "$JREDIR" -o jre.wxs -sfrag -sreg -nologo -srd -gg -cg JreComponents -d
 v=$(unzip -p "$war" META-INF/MANIFEST.MF | grep Implementation-Version | cut -d ' ' -f2 | tr -d '\r')
 echo version=$v
 
-candle -dVERSION=$v -dJreDir="$JREDIR" -dWAR="$war" -nologo -ext WixUIExtension -ext WixUtilExtension hudson.wxs jre.wxs
+candle -dVERSION=$v -dJreDir="$JREDIR" -dWAR="$war" -nologo -ext WixUIExtension -ext WixUtilExtension jenkins.wxs jre.wxs
 # '-sval' skips validation. without this, light somehow doesn't work on automated build environment
-light -o hudson-$v.msi -sval -nologo -dcl:high -ext WixUIExtension -ext WixUtilExtension hudson.wixobj jre.wixobj
+light -o jenkins-$v.msi -sval -nologo -dcl:high -ext WixUIExtension -ext WixUtilExtension jenkins.wixobj jre.wixobj
 
 # avoid bringing back files that we don't care
 rm -rf tmp *.class *.wixpdb *.wixobj
diff --git a/msi/hudson.wxs b/msi/hudson.wxs
index 28b26bd0ee810c6341a4264b8fd0f0b7495edd85..641eb8c91d5626e48b4cc7aaf42884d8aeda3da7 100644
--- a/msi/hudson.wxs
+++ b/msi/hudson.wxs
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Name='Hudson $(var.VERSION)' Id='*' UpgradeCode='ca304bcd-a9a4-4178-8fac-e0505b1e05f3'
-    Language='1033' Codepage='1252' Version='0.$(var.VERSION).0' Manufacturer='Hudson project'>
+  <Product Name='Jenkins $(var.VERSION)' Id='*' UpgradeCode='ca304bcd-a9a4-4178-8fac-e0505b1e05f3'
+    Language='1033' Codepage='1252' Version='0.$(var.VERSION).0' Manufacturer='Jenkins project'>
 
-    <Package Id='*' Keywords='Installer' Description="Hudson"
+    <Package Id='*' Keywords='Installer' Description="Jenkins"
       Comments='Continuous Integration Server'
       InstallerVersion='100' Compressed='yes' SummaryCodepage='1252' />
-      <Media Id='1' Cabinet='hudson.cab' EmbedCab='yes'/>
+      <Media Id='1' Cabinet='jenkins.cab' EmbedCab='yes'/>
       <Directory Id='TARGETDIR' Name='SourceDir'>
         <Directory Id='ProgramFilesFolder' Name='PFiles'>
-          <Directory Id='HudsonDir' Name='Hudson' FileSource=".">
+          <Directory Id='JenkinsDir' Name='Jenkins' FileSource=".">
               <Directory Id='JreDir' Name='jre'/>
               <Component Id='Main' Guid='8fd00c9c-e018-46d6-9135-67696ea0bcbf'>
-                <File Name="hudson.exe" Source='tmp/hudson.exe' KeyPath='yes'/>
-                <File Name="hudson.xml" Source='tmp/hudson.xml' DiskId='1' />
-                <File Name="hudson.war" Source='$(var.WAR)' DiskId='1' />
-                <ServiceInstall Id="HudsonService"
-                     Name="Hudson"
-                     DisplayName="Hudson"
+                <File Name="jenkins.exe" Source='tmp/jenkins.exe' KeyPath='yes'/>
+                <File Name="jenkins.xml" Source='tmp/jenkins.xml' DiskId='1' />
+                <File Name="jenkins.war" Source='$(var.WAR)' DiskId='1' />
+                <ServiceInstall Id="JenkinsService"
+                     Name="Jenkins"
+                     DisplayName="Jenkins"
                      Type="ownProcess"
                      Start="auto"
                      ErrorControl="normal"
-                     Description="Hudson Continuous Integration Server"
+                     Description="Jenkins Continuous Integration Server"
                      Account="[SERVICEACCOUNT]"
                      Password="[SERVICEPASSWORD]" />
-                 <ServiceControl Id="ControlHudsonService" Name="Hudson" Start="install" Stop="both" Wait="yes" Remove="uninstall"/>
+                 <ServiceControl Id="ControlJenkinsService" Name="Jenkins" Start="install" Stop="both" Wait="yes" Remove="uninstall"/>
               </Component>
           </Directory>
         </Directory>
diff --git a/msi/remote-execute.sh b/msi/remote-execute.sh
index 68d9c0be4d136e2432984f703c0174ad86958afc..95ee766b1722ab94656df50eb0a0d877cb6b9e15 100644
--- a/msi/remote-execute.sh
+++ b/msi/remote-execute.sh
@@ -1,3 +1,3 @@
 #!/bin/bash -ex
-tar cvzf send.tgz FindJava.java build.sh hudson.wxs
-java -jar hudson-cli.jar dist-fork -z send.tgz -l windows -f hudson.war="$1" -Z result.tgz bash build.sh hudson.war
+tar cvzf send.tgz FindJava.java build.sh jenkins.wxs
+java -jar jenkins-cli.jar dist-fork -z send.tgz -l windows -f jenkins.war="$1" -Z result.tgz bash build.sh jenkins.war
diff --git a/msi/sign.js b/msi/sign.js
index ca6ff781cb13d3be508335bc723d628e0b004ef6..5220832cb2aa971fdaf91de2df0670ed8cc3860e 100644
--- a/msi/sign.js
+++ b/msi/sign.js
@@ -8,5 +8,5 @@ var args = WScript.Arguments;
 signer.Load(args(1));
 sc.FileName = args(0);
 sc.Description = args(2);
-sc.DescriptionURL = "http://hudson-ci.org/";
+sc.DescriptionURL = "http://jenkins-ci.org/";
 sc.Sign(signer);