diff --git a/tools/tinderbox-configs/lightning/linux/tinder-config.pl b/tools/tinderbox-configs/lightning/linux/tinder-config.pl
index c88769c8c3c..1b192781bb2 100644
--- a/tools/tinderbox-configs/lightning/linux/tinder-config.pl
+++ b/tools/tinderbox-configs/lightning/linux/tinder-config.pl
@@ -28,7 +28,7 @@ $ENV{'PATH'} = "/opt/gcc-3.3.2rh/bin:$ENV{'PATH'}";
 
 #- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
 #$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+#$BuildAdministrator = ($ENV{USER} || "calbld") . "\@" . ($ENV{HOST} || "dhcp");
 
 #- You'll need to change these to suit your machine's needs
 #$DisplayServer = ':0.0';
@@ -136,7 +136,7 @@ $ProductName              = "Thunderbird";
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
 #$moz_cvsroot   = $ENV{CVSROOT};
-$moz_cvsroot   = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ':ext:calbld@cvs.mozilla.org:/cvsroot';
 #$moz_cvsroot   = ":pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot";
 
 #- Set these proper values for your tinderbox server
@@ -198,7 +198,7 @@ $build_hour    = "3";
 #$package_creation_path = "/xpinstall/packager";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-#$ssh_user      = "cltbld";
+$ssh_user      = "calbld";
 #$ssh_server    = "stage.mozilla.org";
 $ftp_path      = "/home/ftp/pub/calendar/lightning/nightly";
 $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly";
diff --git a/tools/tinderbox-configs/lightning/win32/tinder-config.pl b/tools/tinderbox-configs/lightning/win32/tinder-config.pl
index c8bbb2cfc15..422fb7f8f14 100644
--- a/tools/tinderbox-configs/lightning/win32/tinder-config.pl
+++ b/tools/tinderbox-configs/lightning/win32/tinder-config.pl
@@ -26,7 +26,7 @@
 
 #- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
 #$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
+#$BuildAdministrator = ($ENV{USER} || "calbld") . "\@" . ($ENV{HOST} || "dhcp");
 
 #- You'll need to change these to suit your machine's needs
 #$DisplayServer = ':0.0';
@@ -134,7 +134,7 @@ $blat           = 'blat';
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
 #$moz_cvsroot   = $ENV{CVSROOT};
-$moz_cvsroot   = ":ext:cltbld\@cvs.mozilla.org:/cvsroot";
+$moz_cvsroot   = ":ext:calbld\@cvs.mozilla.org:/cvsroot";
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
@@ -194,7 +194,7 @@ $build_hour    = "3";
 #$package_creation_path = "/xpinstall/packager";
 # needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "2";
-#$ssh_user      = "cltbld";
+$ssh_user      = "calbld";
 #$ssh_server    = "stage.mozilla.org";
 $ftp_path      = "/home/ftp/pub/calendar/lightning/nightly";
 $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly";