Bug 582939: Decouple the buildslave names from the machines that they run on (r+cpeyer)
authorBrent Baker <brbaker@adobe.com>
Wed, 04 Aug 2010 09:33:11 -0400
changeset 4970 7804cb4738e560a59a0e451e18ed679022ea0024
parent 4969 29ce9e194231683d1df89e9e70c9d828489e66b2
child 4971 b153bd2ad55b174f68b9b38b0e3d76d608f2d6a4
push id2646
push userbrbaker@adobe.com
push dateWed, 04 Aug 2010 13:33:29 +0000
bugs582939
Bug 582939: Decouple the buildslave names from the machines that they run on (r+cpeyer)
build/buildbot/master/argo.py
build/buildbot/master/master.cfg
build/buildbot/master/sandbox.py
build/buildbot/master/tamarinredux.py
build/buildbot/slaves/android-performance/buildbot.tac
build/buildbot/slaves/linux-arm-deep/buildbot.tac
build/buildbot/slaves/linux-arm/buildbot.tac
build/buildbot/slaves/linux-deep/buildbot.tac
build/buildbot/slaves/linux-mips-deep/buildbot.tac
build/buildbot/slaves/linux-mips/buildbot.tac
build/buildbot/slaves/linux-performance/buildbot.tac
build/buildbot/slaves/linux/buildbot.tac
build/buildbot/slaves/linux64/buildbot.tac
build/buildbot/slaves/mac-deep/buildbot.tac
build/buildbot/slaves/mac-intel-10_4/buildbot.tac
build/buildbot/slaves/mac-intel-10_5/buildbot.tac
build/buildbot/slaves/mac-intel-server/buildbot.tac
build/buildbot/slaves/mac-performance/buildbot.tac
build/buildbot/slaves/mac-ppc-10_4/buildbot.tac
build/buildbot/slaves/mac-ppc-10_5/buildbot.tac
build/buildbot/slaves/mac-ppc-deep/buildbot.tac
build/buildbot/slaves/mac-ppc-performance/buildbot.tac
build/buildbot/slaves/mac64-intel/buildbot.tac
build/buildbot/slaves/mac64-performance/buildbot.tac
build/buildbot/slaves/mac64-ppc/buildbot.tac
build/buildbot/slaves/solaris-sparc-deep/buildbot.tac
build/buildbot/slaves/solaris-sparc/buildbot.tac
build/buildbot/slaves/windows-deep/buildbot.tac
build/buildbot/slaves/windows-p3-deep/buildbot.tac
build/buildbot/slaves/windows-performance/buildbot.tac
build/buildbot/slaves/windows/buildbot.tac
build/buildbot/slaves/windows64-deep/buildbot.tac
build/buildbot/slaves/windows64/buildbot.tac
build/buildbot/slaves/winmobile-arm-deep/buildbot.tac
build/buildbot/slaves/winmobile-arm/buildbot.tac
build/buildbot/slaves/winmobile-performance/buildbot.tac
--- a/build/buildbot/master/argo.py
+++ b/build/buildbot/master/argo.py
@@ -219,17 +219,17 @@ class argo:
                 description='starting win release-sizereport build...',
                 descriptionDone='finished win release-sizereport build.',
                 name='Build_Release_sizereport',
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
 
     windows_compile_builder = {
                 'name': "windows-compile-argo",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': windows_compile_factory,
                 'builddir': './argo-windows-compile',
     }
 
 
 
 
     #######################################
@@ -238,17 +238,17 @@ class argo:
     windows_64_compile_factory = factory.BuildFactory()
     windows_64_compile_factory.addStep(sync_clean)
     windows_64_compile_factory.addStep(sync_clone(url=HG_URL))
     windows_64_compile_factory.addStep(sync_update)
     windows_64_compile_factory.addStep(bb_slaveupdate(slave="windows64"))
 
     windows_64_compile_builder = {
                 'name': "windows64-compile-argo",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': windows_64_compile_factory,
                 'builddir': './argo-windows64-compile',
     }
 
 
     ############################################
     #### builder for mac-intel-10_4-compile ####
     ############################################
@@ -268,17 +268,17 @@ class argo:
     mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_104_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_104_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_104_compile_builder = {
                 'name': "mac-intel-10.4-compile-argo",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': mac_intel_104_compile_factory,
                 'builddir': './argo-mac-intel-10_4-compile',
     }
 
 
 
     ############################################
     #### builder for mac-intel-10_5-compile ####
@@ -299,17 +299,17 @@ class argo:
     mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile-argo",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': mac_intel_105_compile_factory,
                 'builddir': './argo-mac-intel-10_5-compile',
     }
 
 
     ##########################################
     #### builder for mac-intel-64-compile ####
     ##########################################
@@ -329,51 +329,51 @@ class argo:
     mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin --mac-sdk=105", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile-argo",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': mac_intel_64_compile_factory,
                 'builddir': './argo-mac64-intel-compile',
     }
 
 
     ############################################
     #### builder for mac-ppc-10_4a-compile ####
     ############################################
     mac_ppc_104a_compile_factory = factory.BuildFactory()
     mac_ppc_104a_compile_factory.addStep(sync_clean)
     mac_ppc_104a_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_104a_compile_factory.addStep(sync_update)
     mac_ppc_104a_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_4"))
 
     mac_ppc_104a_compile_builder = {
                 'name': "mac-ppc-10.4a-compile-argo",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': mac_ppc_104a_compile_factory,
                 'builddir': './argo-mac-ppc-10_4a-compile',
     }
 
 
     ###########################################
     #### builder for mac-ppc-10_4b-compile ####
     ###########################################
     mac_ppc_104b_compile_factory = factory.BuildFactory()
     mac_ppc_104b_compile_factory.addStep(sync_clean)
     mac_ppc_104b_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_104b_compile_factory.addStep(sync_update)
     mac_ppc_104b_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_4"))
 
     mac_ppc_104b_compile_builder = {
                 'name': "mac-ppc-10.4b-compile-argo",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': mac_ppc_104b_compile_factory,
                 'builddir': './argo-mac-ppc-10_4b-compile',
     }
 
 
 
     ###########################################
     #### builder for mac-ppc-10_5a-compile ####
@@ -381,67 +381,67 @@ class argo:
     mac_ppc_105a_compile_factory = factory.BuildFactory()
     mac_ppc_105a_compile_factory.addStep(sync_clean)
     mac_ppc_105a_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_105a_compile_factory.addStep(sync_update)
     mac_ppc_105a_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_5"))
 
     mac_ppc_105a_compile_builder = {
                 'name': "mac-ppc-10.5a-compile-argo",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': mac_ppc_105a_compile_factory,
                 'builddir': './argo-mac-ppc-10_5a-compile',
     }
 
     ###########################################
     #### builder for mac-ppc-10_5b-compile ####
     ###########################################
     mac_ppc_105b_compile_factory = factory.BuildFactory()
     mac_ppc_105b_compile_factory.addStep(sync_clean)
     mac_ppc_105b_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_105b_compile_factory.addStep(sync_update)
     mac_ppc_105b_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_5"))
 
     mac_ppc_105b_compile_builder = {
                 'name': "mac-ppc-10.5b-compile-argo",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': mac_ppc_105b_compile_factory,
                 'builddir': './argo-mac-ppc-10_5b-compile',
     }
 
 
     ########################################
     #### builder for mac-ppc-64-compile ####
     ########################################
     mac_ppc_64_compile_factory = factory.BuildFactory()
     mac_ppc_64_compile_factory.addStep(sync_clean)
     mac_ppc_64_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_64_compile_factory.addStep(sync_update)
     mac_ppc_64_compile_factory.addStep(bb_slaveupdate(slave="mac64-ppc"))
 
     mac_ppc_64_compile_builder = {
                 'name': "mac64-ppc-compile-argo",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': mac_ppc_64_compile_factory,
                 'builddir': './argo-mac64-ppc-compile',
     }
     
 
     #########################################
     #### builder for mac-ppc-64b-compile ####
     #########################################
     mac_ppc_64b_compile_factory = factory.BuildFactory()
     mac_ppc_64b_compile_factory.addStep(sync_clean)
     mac_ppc_64b_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_64b_compile_factory.addStep(sync_update)
     mac_ppc_64b_compile_factory.addStep(bb_slaveupdate(slave="mac64-ppc"))
 
     mac_ppc_64b_compile_builder = {
                 'name': "mac64b-ppc-compile-argo",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': mac_ppc_64b_compile_factory,
                 'builddir': './argo-mac64b-ppc-compile',
     }
 
 
     ###################################
     #### builder for linux-compile ####
     ###################################
@@ -484,17 +484,17 @@ class argo:
                 name="Debug_arm-linux",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     linux_compile_factory.addStep(compile_buildcheck_local)
     linux_compile_factory.addStep(util_upload_asteam_local)
 
     linux_compile_builder = {
                 'name': "linux-compile-argo",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': linux_compile_factory,
                 'builddir': './argo-linux-compile',
     }
 
 
     #####################################
     #### builder for linux64-compile ####
     #####################################
@@ -510,17 +510,17 @@ class argo:
     linux_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger", upload="false"))
     linux_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
     linux_64_compile_factory.addStep(compile_testmedia)
     linux_64_compile_factory.addStep(compile_buildcheck_local)
     linux_64_compile_factory.addStep(util_upload_asteam_local)
 
     linux_64_compile_builder = {
                 'name': "linux64-compile-argo",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': linux_64_compile_factory,
                 'builddir': './argo-linux64-compile',
     }
 
 
 
     ################################################
     #### builder for winmobile-emulator-compile ####
@@ -599,17 +599,17 @@ class argo:
                 description='starting to run sizereport...',
                 descriptionDone='finished sizereport.',
                 name="Build_Release_sizereport",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
 
     winmobile_emulator_compile_builder = {
                 'name': "winmobile-emulator-compile-argo",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': winmobile_emulator_compile_factory,
                 'builddir': './argo-winmobile-emulator-compile',
     }
 
 
     ###########################################
     #### builder for solaris-sparc-compile ####
     ###########################################
@@ -624,34 +624,34 @@ class argo:
     solaris_sparc_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug", upload="false"))
     solaris_sparc_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger", upload="false"))
     solaris_sparc_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
     solaris_sparc_compile_factory.addStep(compile_buildcheck_local)
     solaris_sparc_compile_factory.addStep(util_upload_asteam)
 
     solaris_sparc_compile_builder = {
                 'name': "solaris-sparc-compile-argo",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': solaris_sparc_compile_factory,
                 'builddir': './argo-solaris-sparc-compile',
     }
     
     
     ############################################
     #### builder for solaris-sparc2-compile ####
     ############################################
     solaris_sparc2_compile_factory = factory.BuildFactory()
     solaris_sparc2_compile_factory.addStep(sync_clean)
     solaris_sparc2_compile_factory.addStep(sync_clone(url=HG_URL))
     solaris_sparc2_compile_factory.addStep(sync_update)
     solaris_sparc2_compile_factory.addStep(bb_slaveupdate(slave="solaris-sparc"))
     
     solaris_sparc2_compile_builder = {
                 'name': "solaris-sparc2-compile-argo",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': solaris_sparc2_compile_factory,
                 'builddir': './argo-solaris-sparc2-compile',
     }
 
     ###########################################
     #### builder for android on mac        ####
     ###########################################
 
@@ -695,51 +695,51 @@ class argo:
                 descriptionDone='finished upload to asteam.',
                 name="Upload_ASTEAM",
                 workdir="../repo/build/buildbot/slaves/scripts",
                 timeout=3600)
     )
 
     android_compile_builder = {
                 'name': "android-compile-argo",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': android_compile_factory,
                 'builddir': './argo-android-compile',
     }
 
 
     ###############################
     #### builder for linux-arm ####
     ###############################
     linux_arm_compile_factory = factory.BuildFactory()
     linux_arm_compile_factory.addStep(sync_clean)
     linux_arm_compile_factory.addStep(sync_clone(url=HG_URL))
     linux_arm_compile_factory.addStep(sync_update)
     linux_arm_compile_factory.addStep(bb_slaveupdate(slave="linux-arm"))
 
     linux_arm_compile_builder = {
                 'name': "linux-arm-compile-argo",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': linux_arm_compile_factory,
                 'builddir': './argo-linux-arm-compile',
     }
     
     
     ################################
     #### builder for linux-arm2 ####
     ################################
     linux_arm2_compile_factory = factory.BuildFactory()
     linux_arm2_compile_factory.addStep(sync_clean)
     linux_arm2_compile_factory.addStep(sync_clone(url=HG_URL))
     linux_arm2_compile_factory.addStep(sync_update)
     linux_arm2_compile_factory.addStep(bb_slaveupdate(slave="linux-arm"))
 
     linux_arm2_compile_builder = {
                 'name': "linux-arm2-compile-argo",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': linux_arm2_compile_factory,
                 'builddir': './argo-linux-arm2-compile',
     }
 
     ################################################################################
     ################################################################################
     ####                                                                        ####
     ####                            SMOKE BUILDERS                              ####
@@ -755,270 +755,270 @@ class argo:
     ###################################
     windows_smoke_factory = factory.BuildFactory()
     windows_smoke_factory.addStep(download_testmedia)
     windows_smoke_factory.addStep(test_smoke)
     windows_smoke_factory.addStep(util_process_clean)
 
     windows_smoke_builder = {
                 'name': "windows-smoke-argo",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': windows_smoke_factory,
                 'builddir': './argo-windows-smoke',
     }
 
 
     #####################################
     #### builder for windows64-smoke ####
     #####################################
     windows_64_smoke_factory = factory.BuildFactory()
     windows_64_smoke_factory.addStep(download_testmedia)
     windows_64_smoke_factory.addStep(test_smoke)
     windows_64_smoke_factory.addStep(util_process_clean)
 
     windows_64_smoke_builder = {
                 'name': "windows64-smoke-argo",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': windows_64_smoke_factory,
                 'builddir': './argo-windows64-smoke',
     }
 
 
     ##########################################
     #### builder for mac-intel-10_4-smoke ####
     ##########################################
     mac_intel_104_smoke_factory = factory.BuildFactory()
     mac_intel_104_smoke_factory.addStep(download_testmedia)
     mac_intel_104_smoke_factory.addStep(test_smoke)
     mac_intel_104_smoke_factory.addStep(util_process_clean)
 
     mac_intel_104_smoke_builder = {
                 'name': "mac-intel-10.4-smoke-argo",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': mac_intel_104_smoke_factory,
                 'builddir': './argo-mac-intel-10_4-smoke',
     }
 
 
     ##########################################
     #### builder for mac-intel-10_5-smoke ####
     ##########################################
     mac_intel_105_smoke_factory = factory.BuildFactory()
     mac_intel_105_smoke_factory.addStep(download_testmedia)
     mac_intel_105_smoke_factory.addStep(test_smoke)
     mac_intel_105_smoke_factory.addStep(util_process_clean)
 
     mac_intel_105_smoke_builder = {
                 'name': "mac-intel-10.5-smoke-argo",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': mac_intel_105_smoke_factory,
                 'builddir': './argo-mac-intel-10_5-smoke',
     }
 
 
     #######################################
     #### builder for mac64-intel-smoke ####
     #######################################
     mac_intel_64_smoke_factory = factory.BuildFactory()
     mac_intel_64_smoke_factory.addStep(download_testmedia)
     mac_intel_64_smoke_factory.addStep(test_smoke)
     mac_intel_64_smoke_factory.addStep(util_process_clean)
 
     mac_intel_64_smoke_builder = {
                 'name': "mac64-intel-smoke-argo",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': mac_intel_64_smoke_factory,
                 'builddir': './argo-mac64-intel-smoke',
     }
 
     #########################################
     #### builder for mac-ppc-10_4a-smoke ####
     #########################################
     mac_ppc_104a_smoke_factory = factory.BuildFactory()
     mac_ppc_104a_smoke_factory.addStep(download_testmedia)
     mac_ppc_104a_smoke_factory.addStep(test_smoke)
     mac_ppc_104a_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_104a_smoke_builder = {
                 'name': "mac-ppc-10.4a-smoke-argo",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': mac_ppc_104a_smoke_factory,
                 'builddir': './argo-mac-ppc-10_4a-smoke',
     }
 
 
     #########################################
     #### builder for mac-ppc-10_4b-smoke ####
     #########################################
     mac_ppc_104b_smoke_factory = factory.BuildFactory()
     mac_ppc_104b_smoke_factory.addStep(download_testmedia)
     mac_ppc_104b_smoke_factory.addStep(test_smoke)
     mac_ppc_104b_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_104b_smoke_builder = {
                 'name': "mac-ppc-10.4b-smoke-argo",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': mac_ppc_104b_smoke_factory,
                 'builddir': './argo-mac-ppc-10_4b-smoke',
     }
 
 
     #########################################
     #### builder for mac-ppc-10_5a-smoke ####
     #########################################
     mac_ppc_105a_smoke_factory = factory.BuildFactory()
     mac_ppc_105a_smoke_factory.addStep(download_testmedia)
     mac_ppc_105a_smoke_factory.addStep(test_smoke)
     mac_ppc_105a_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_105a_smoke_builder = {
                 'name': "mac-ppc-10.5a-smoke-argo",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': mac_ppc_105a_smoke_factory,
                 'builddir': './argo-mac-ppc-10_5a-smoke',
     }
 
     #########################################
     #### builder for mac-ppc-10_5b-smoke ####
     #########################################
     mac_ppc_105b_smoke_factory = factory.BuildFactory()
     mac_ppc_105b_smoke_factory.addStep(download_testmedia)
     mac_ppc_105b_smoke_factory.addStep(test_smoke)
     mac_ppc_105b_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_105b_smoke_builder = {
                 'name': "mac-ppc-10.5b-smoke-argo",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': mac_ppc_105b_smoke_factory,
                 'builddir': './argo-mac-ppc-10_5b-smoke',
     }
 
 
     #####################################
     #### builder for mac64-ppc-smoke ####
     #####################################
     mac_ppc_64_smoke_factory = factory.BuildFactory()
     mac_ppc_64_smoke_factory.addStep(download_testmedia)
     mac_ppc_64_smoke_factory.addStep(test_smoke)
     mac_ppc_64_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_64_smoke_builder = {
                 'name': "mac64-ppc-smoke-argo",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': mac_ppc_64_smoke_factory,
                 'builddir': './argo-mac64-ppc-smoke',
     }
 
 
     ######################################
     #### builder for mac64b-ppc-smoke ####
     ######################################
     mac_ppc_64b_smoke_factory = factory.BuildFactory()
     mac_ppc_64b_smoke_factory.addStep(download_testmedia)
     mac_ppc_64b_smoke_factory.addStep(test_smoke)
     mac_ppc_64b_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_64b_smoke_builder = {
                 'name': "mac64b-ppc-smoke-argo",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': mac_ppc_64b_smoke_factory,
                 'builddir': './argo-mac64b-ppc-smoke',
     }
 
     #################################
     #### builder for linux-smoke ####
     #################################
     linux_smoke_factory = factory.BuildFactory()
     linux_smoke_factory.addStep(download_testmedia)
     linux_smoke_factory.addStep(test_smoke)
     linux_smoke_factory.addStep(util_process_clean)
 
     linux_smoke_builder = {
                 'name': "linux-smoke-argo",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': linux_smoke_factory,
                 'builddir': './argo-linux-smoke',
     }
 
 
     ###################################
     #### builder for linux64-smoke ####
     ###################################
     linux_64_smoke_factory = factory.BuildFactory()
     linux_64_smoke_factory.addStep(download_testmedia)
     linux_64_smoke_factory.addStep(test_smoke)
     linux_64_smoke_factory.addStep(util_process_clean)
 
     linux_64_smoke_builder = {
                 'name': "linux64-smoke-argo",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': linux_64_smoke_factory,
                 'builddir': './argo-linux64-smoke',
     }
 
 
     ##############################################
     #### builder for winmobile-emulator-smoke ####
     ##############################################
     winmobile_emulator_smoke_factory = factory.BuildFactory()
     winmobile_emulator_smoke_factory.addStep(download_testmedia)
     winmobile_emulator_smoke_factory.addStep(test_emulator_smoke_mobile)
     winmobile_emulator_smoke_factory.addStep(util_process_clean)
 
     winmobile_emulator_smoke_builder = {
                 'name': "winmobile-emulator-smoke-argo",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': winmobile_emulator_smoke_factory,
                 'builddir': './argo-winmobile-emulator-smoke',
     }
 
 
     #########################################
     #### builder for solaris-sparc-smoke ####
     #########################################
     solaris_sparc_smoke_factory = factory.BuildFactory()
     solaris_sparc_smoke_factory.addStep(download_testmedia)
     solaris_sparc_smoke_factory.addStep(test_smoke)
     solaris_sparc_smoke_factory.addStep(util_process_clean)
 
     solaris_sparc_smoke_builder = {
                 'name': "solaris-sparc-smoke-argo",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': solaris_sparc_smoke_factory,
                 'builddir': './argo-solaris-sparc-smoke',
     }
     
     
     ##########################################
     #### builder for solaris-sparc2-smoke ####
     ##########################################
     solaris_sparc2_smoke_factory = factory.BuildFactory()
     solaris_sparc2_smoke_factory.addStep(download_testmedia)
     solaris_sparc2_smoke_factory.addStep(test_smoke)
     solaris_sparc2_smoke_factory.addStep(util_process_clean)
 
     solaris_sparc2_smoke_builder = {
                 'name': "solaris-sparc2-smoke-argo",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': solaris_sparc2_smoke_factory,
                 'builddir': './argo-solaris-sparc2-smoke',
     }
 
 
     #########################################
     #### builder for android-smoke       ####
     #########################################
     android_smoke_factory = factory.BuildFactory()
     android_smoke_factory.addStep(download_testmedia)
     android_smoke_factory.addStep(test_smoke_local)
     android_smoke_factory.addStep(util_process_clean)
 
     android_smoke_builder = {
                 'name': "android-smoke-argo",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': android_smoke_factory,
                 'builddir': './argo-android-smoke',
     }
 
 
     ###########################################
     #### builder for linxu-arm-smoke       ####
     ###########################################
@@ -1031,17 +1031,17 @@ class argo:
                 descriptionDone='finished smoke tests.',
                 name="SmokeTest",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     linux_arm_smoke_factory.addStep(util_process_clean)
 
     linux_arm_smoke_builder = {
                 'name': "linux-arm-smoke-argo",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': linux_arm_smoke_factory,
                 'builddir': './argo-linux-arm-smoke',
     }
     
     
     ###########################################
     #### builder for linxu-arm2-smoke      ####
     ###########################################
@@ -1054,17 +1054,17 @@ class argo:
                 descriptionDone='finished smoke tests.',
                 name="SmokeTest",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     linux_arm2_smoke_factory.addStep(util_process_clean)
 
     linux_arm2_smoke_builder = {
                 'name': "linux-arm2-smoke-argo",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': linux_arm2_smoke_factory,
                 'builddir': './argo-linux-arm2-smoke',
     }
 
 
     ################################################################################
     ################################################################################
     ####                                                                        ####
@@ -1090,17 +1090,17 @@ class argo:
     windows_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     windows_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     windows_test_factory.addStep(test_differential)
     windows_test_factory.addStep(util_process_clean)
     windows_test_factory.addStep(util_clean_buildsdir)
 
     windows_test_builder = {
                 'name': "windows-test-argo",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': windows_test_factory,
                 'builddir': './argo-windows-test',
     }
 
 
     ####################################
     #### builder for windows64-test ####
     ####################################
@@ -1114,17 +1114,17 @@ class argo:
     windows_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     windows_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     windows_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     windows_64_test_factory.addStep(util_process_clean)
     windows_64_test_factory.addStep(util_clean_buildsdir)
 
     windows_64_test_builder = {
                 'name': "windows64-test-argo",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': windows_64_test_factory,
                 'builddir': './argo-windows64-test',
     }
 
 
     #########################################
     #### builder for mac-intel-10_4-test ####
     #########################################
@@ -1139,17 +1139,17 @@ class argo:
     mac_intel_104_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_104", vmargs="", config="", scriptargs=""))
     mac_intel_104_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_104", vmargs="", config="", scriptargs=""))
     mac_intel_104_test_factory.addStep(test_differential)
     mac_intel_104_test_factory.addStep(util_process_clean)
     mac_intel_104_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_104_test_builder = {
                 'name': "mac-intel-10.4-test-argo",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': mac_intel_104_test_factory,
                 'builddir': './argo-mac-intel-10_4-test',
     }
 
 
     #########################################
     #### builder for mac-intel-10_5-test ####
     #########################################
@@ -1164,17 +1164,17 @@ class argo:
     mac_intel_105_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     mac_intel_105_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     mac_intel_105_test_factory.addStep(test_differential)
     mac_intel_105_test_factory.addStep(util_process_clean)
     mac_intel_105_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_105_test_builder = {
                 'name': "mac-intel-10.5-test-argo",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': mac_intel_105_test_factory,
                 'builddir': './argo-mac-intel-10_5-test',
     }
 
 
     ######################################
     #### builder for mac64-intel-test ####
     ######################################
@@ -1188,17 +1188,17 @@ class argo:
     mac_intel_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(util_process_clean)
     mac_intel_64_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_64_test_builder = {
                 'name': "mac64-intel-test-argo",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': mac_intel_64_test_factory,
                 'builddir': './argo-mac64-intel-test',
     }
 
     ########################################
     #### builder for mac-ppc-10_4a-test ####
     ########################################
     mac_ppc_104a_test_factory = factory.BuildFactory()
@@ -1209,34 +1209,34 @@ class argo:
     mac_ppc_104a_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_104_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     mac_ppc_104a_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_104_ppc", vmargs="-Ojit", config="", scriptargs=""))
     mac_ppc_104a_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_104_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_104a_test_factory.addStep(util_process_clean)
     mac_ppc_104a_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_104a_test_builder = {
                 'name': "mac-ppc-10.4a-test-argo",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': mac_ppc_104a_test_factory,
                 'builddir': './argo-mac-ppc-10_4a-test',
     }
 
 
     ########################################
     #### builder for mac-ppc-10_4b-test ####
     ########################################
     mac_ppc_104b_test_factory = factory.BuildFactory()
     mac_ppc_104b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_104_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_104b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_104_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_104b_test_factory.addStep(util_process_clean)
     mac_ppc_104b_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_104b_test_builder = {
                 'name': "mac-ppc-10.4b-test-argo",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': mac_ppc_104b_test_factory,
                 'builddir': './argo-mac-ppc-10_4b-test',
     }
 
 
     ########################################
     #### builder for mac-ppc-10_5a-test ####
     ########################################
@@ -1248,34 +1248,34 @@ class argo:
     mac_ppc_105a_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     mac_ppc_105a_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_ppc", vmargs="-Ojit", config="", scriptargs=""))
     mac_ppc_105a_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_105a_test_factory.addStep(util_process_clean)
     mac_ppc_105a_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_105a_test_builder = {
                 'name': "mac-ppc-10.5a-test-argo",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': mac_ppc_105a_test_factory,
                 'builddir': './argo-mac-ppc-10_5a-test',
     }
 
 
     ########################################
     #### builder for mac-ppc-10_5b-test ####
     ########################################
     mac_ppc_105b_test_factory = factory.BuildFactory()
     mac_ppc_105b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_105b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_105b_test_factory.addStep(util_process_clean)
     mac_ppc_105b_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_105b_test_builder = {
                 'name': "mac-ppc-10.5b-test-argo",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': mac_ppc_105b_test_factory,
                 'builddir': './argo-mac-ppc-10_5b-test',
     }
 
 
     ####################################
     #### builder for mac64-ppc-test ####
     ####################################
@@ -1286,17 +1286,17 @@ class argo:
     mac_ppc_64_test_factory.addStep(test_generic(name="Release-interp", shellname="avmshell_64_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     mac_ppc_64_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_64_ppc", vmargs="-Ojit", config="", scriptargs=""))
     mac_ppc_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_64_test_factory.addStep(util_process_clean)
     mac_ppc_64_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_64_test_builder = {
                 'name': "mac64-ppc-test-argo",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': mac_ppc_64_test_factory,
                 'builddir': './argo-mac64-ppc-test',
     }
 
 
     #####################################
     #### builder for mac64b-ppc-test ####
     #####################################
@@ -1304,17 +1304,17 @@ class argo:
     mac_ppc_64b_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_64_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     mac_ppc_64b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_64b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_64b_test_factory.addStep(util_process_clean)
     mac_ppc_64b_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_64b_test_builder = {
                 'name': "mac64b-ppc-test-argo",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': mac_ppc_64b_test_factory,
                 'builddir': './argo-mac64b-ppc-test',
     }
 
 
     ################################
     #### builder for linux-test ####
     ################################
@@ -1329,17 +1329,17 @@ class argo:
     linux_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     linux_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     linux_test_factory.addStep(test_differential)
     linux_test_factory.addStep(util_process_clean)
     linux_test_factory.addStep(util_clean_buildsdir)
 
     linux_test_builder = {
                 'name': "linux-test-argo",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': linux_test_factory,
                 'builddir': './argo-linux-test',
     }
 
 
     ##################################
     #### builder for linux64-test ####
     ##################################
@@ -1353,17 +1353,17 @@ class argo:
     linux_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     linux_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     linux_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     linux_64_test_factory.addStep(util_process_clean)
     linux_64_test_factory.addStep(util_clean_buildsdir)
 
     linux_64_test_builder = {
                 'name': "linux64-test-argo",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': linux_64_test_factory,
                 'builddir': './argo-linux64-test',
     }
 
 
     #############################################
     #### builder for winmobile-emulator-test ####
     #############################################
@@ -1372,17 +1372,17 @@ class argo:
     winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-interp", shellname="avmshell_arm", vmargs="-Dinterp", config="", scriptargs=""))
     winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_arm", vmargs="-Dinterp", config="", scriptargs=""))
     winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-jit", shellname="avmshell_arm", vmargs="-Ojit", config="", scriptargs=""))
     winmobile_emulator_test_factory.addStep(util_process_clean)
     winmobile_emulator_test_factory.addStep(util_clean_buildsdir)
 
     winmobile_emulator_test_builder = {
                 'name': "winmobile-emulator-test-argo",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': winmobile_emulator_test_factory,
                 'builddir': './argo-winmobile-emulator-test',
     }
 
 
     ########################################
     #### builder for solaris-sparc-test ####
     ########################################
@@ -1391,17 +1391,17 @@ class argo:
     solaris_sparc_test_factory.addStep(test_selftest(name="Release", shellname="avmshell"))
     solaris_sparc_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     solaris_sparc_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     solaris_sparc_test_factory.addStep(util_process_clean)
     solaris_sparc_test_factory.addStep(util_clean_buildsdir)
 
     solaris_sparc_test_builder = {
                 'name': "solaris-sparc-test-argo",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': solaris_sparc_test_factory,
                 'builddir': './argo-solaris-sparc-test',
     }
     
     
     #########################################
     #### builder for solaris-sparc2-test ####
     #########################################
@@ -1411,17 +1411,17 @@ class argo:
     solaris_sparc2_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode", vmargs="-Dinterp", config="", scriptargs=""))
     solaris_sparc2_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell", vmargs="-Ojit", config="", scriptargs=""))
     solaris_sparc2_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s", vmargs="", config="", scriptargs=""))
     solaris_sparc2_test_factory.addStep(util_process_clean)
     solaris_sparc2_test_factory.addStep(util_clean_buildsdir)
 
     solaris_sparc2_test_builder = {
                 'name': "solaris-sparc2-test-argo",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': solaris_sparc2_test_factory,
                 'builddir': './argo-solaris-sparc2-test',
     }
     
     ########################################
     #### builder for android-test       ####
     ########################################
     android_test_factory = factory.BuildFactory()
@@ -1429,17 +1429,17 @@ class argo:
     android_test_factory.addStep(test_generic_adb(name="Release-interp", shellname="avmshell", vmargs="-Dinterp", config="", scriptargs=""))
     android_test_factory.addStep(test_generic_adb(name="Release-jit", shellname="avmshell", vmargs="-Ojit", config="", scriptargs=""))
     android_test_factory.addStep(test_generic_adb(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     android_test_factory.addStep(util_process_clean)
     android_test_factory.addStep(util_clean_buildsdir)
 
     android_test_builder = {
                 'name': "android-test-argo",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': android_test_factory,
                 'builddir': './argo-android-test',
     }
     
     
     ##########################################
     #### builder for linux-arm-test       ####
     ##########################################
@@ -1448,34 +1448,34 @@ class argo:
     linux_arm_test_factory.addStep(test_generic(name="Release-softfloat", shellname="avmshell_neon_arm", vmargs="", config="", scriptargs=""))
     linux_arm_test_factory.addStep(test_generic(name="Release-vfp", shellname="avmshell_neon_arm", vmargs="-Darm_arch 7 -Darm_vfp", config="", scriptargs=""))
     linux_arm_test_factory.addStep(test_generic(name="Release-jit-vfp", shellname="avmshell_neon_arm", vmargs="-Darm_arch 7 -Darm_vfp -Ojit", config="", scriptargs=""))
     linux_arm_test_factory.addStep(util_process_clean)
     linux_arm_test_factory.addStep(util_clean_buildsdir)
 
     linux_arm_test_builder = {
                 'name': "linux-arm-test-argo",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': linux_arm_test_factory,
                 'builddir': './argo-linux-arm-test',
     }
     
     
     ##########################################
     #### builder for linux-arm2-test      ####
     ##########################################
     linux_arm2_test_factory = factory.BuildFactory()
     linux_arm2_test_factory.addStep(test_generic(name="Release-interp", shellname="avmshell_neon_arm", vmargs="-Dinterp", config="", scriptargs=""))
     linux_arm2_test_factory.addStep(test_generic(name="Debug-vfp", shellname="avmshell_neon_arm_d", vmargs="-Darm_arch 7 -Darm_vfp", config="", scriptargs=""))
     linux_arm2_test_factory.addStep(util_process_clean)
     linux_arm2_test_factory.addStep(util_clean_buildsdir)
 
     linux_arm2_test_builder = {
                 'name': "linux-arm2-test-argo",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': linux_arm2_test_factory,
                 'builddir': './argo-linux-arm2-test',
     }
 
 
 
     ################################################################################
     ################################################################################
@@ -1500,17 +1500,17 @@ class argo:
     windows_performance_factory.addStep(perf_release_interp)
     windows_performance_factory.addStep(perf_release_jit)
     windows_performance_factory.addStep(util_process_clean)
     windows_performance_factory.addStep(util_clean_buildsdir)
     windows_performance_factory.addStep(bb_lockrelease)
 
     windows_performance_builder = {
                 'name': "windows-performance-argo",
-                'slavename': "asteamwin1",
+                'slavename': "windows-performance",
                 'factory': windows_performance_factory,
                 'builddir': './argo-windows-performance',
     }
 
 
     #####################################
     #### builder for mac-performance ####
     #####################################
@@ -1525,17 +1525,17 @@ class argo:
     mac_performance_factory.addStep(perf_release_interp)
     mac_performance_factory.addStep(perf_release_jit)
     mac_performance_factory.addStep(util_process_clean)
     mac_performance_factory.addStep(util_clean_buildsdir)
     mac_performance_factory.addStep(bb_lockrelease)
 
     mac_performance_builder = {
                 'name': "mac-performance-argo",
-                'slavename': "asteammac2",
+                'slavename': "mac-performance",
                 'factory': mac_performance_factory,
                 'builddir': './argo-mac-performance',
     }
 
 
     #######################################
     #### builder for mac64-performance ####
     #######################################
@@ -1550,17 +1550,17 @@ class argo:
     mac_64_performance_factory.addStep(perf_release_interp)
     mac_64_performance_factory.addStep(perf_release_jit)
     mac_64_performance_factory.addStep(util_process_clean)
     mac_64_performance_factory.addStep(util_clean_buildsdir)
     mac_64_performance_factory.addStep(bb_lockrelease)
 
     mac_64_performance_builder = {
                 'name': "mac64-performance-argo",
-                'slavename': "asteammac7",
+                'slavename': "mac64-performance",
                 'factory': mac_64_performance_factory,
                 'builddir': './argo-mac64-performance',
     }
 
 
     #########################################
     #### builder for mac-ppc-performance ####
     #########################################
@@ -1575,17 +1575,17 @@ class argo:
     mac_ppc_performance_factory.addStep(perf_release_interp)
     mac_ppc_performance_factory.addStep(perf_release_jit)
     mac_ppc_performance_factory.addStep(util_process_clean)
     mac_ppc_performance_factory.addStep(util_clean_buildsdir)
     mac_ppc_performance_factory.addStep(bb_lockrelease)
 
     mac_ppc_performance_builder = {
                 'name': "mac-ppc-performance-argo",
-                'slavename': "asteammac3",
+                'slavename': "mac-ppc-performance",
                 'factory': mac_ppc_performance_factory,
                 'builddir': './argo-mac-ppc-performance',
     }
 
 
     #######################################
     #### builder for linux-performance ####
     #######################################
@@ -1600,17 +1600,17 @@ class argo:
     linux_performance_factory.addStep(perf_release_interp)
     linux_performance_factory.addStep(perf_release_jit)
     linux_performance_factory.addStep(util_process_clean)
     linux_performance_factory.addStep(util_clean_buildsdir)
     linux_performance_factory.addStep(bb_lockrelease)
 
     linux_performance_builder = {
                 'name': "linux-performance-argo",
-                'slavename': "asteamlin4",
+                'slavename': "linux-performance",
                 'factory': linux_performance_factory,
                 'builddir': './argo-linux-performance',
     }
 
 
     ###########################################
     #### builder for android-performance ######
     ###########################################
@@ -1646,17 +1646,17 @@ class argo:
                 name="ReleaseJIT",
                 workdir="../repo/build/buildbot/slaves/scripts",
                 timeout=3600)
     )
     android_performance_factory.addStep(util_clean_buildsdir)
 
     android_performance_builder = {
                 'name': "android-performance-argo",
-                'slavename': "asteammac1-android",
+                'slavename': "android-performance",
                 'factory': android_performance_factory,
                 'builddir': './argo-android-performance',
     }
 
     ###########################################
     #### builder for winmobile-performance ####
     ###########################################
     winmobile_performance_factory = factory.BuildFactory()
@@ -1669,17 +1669,17 @@ class argo:
     winmobile_performance_factory.addStep(perf_release_arm)
     winmobile_performance_factory.addStep(perf_release_arm_interp)
     winmobile_performance_factory.addStep(perf_release_arm_jit)
     winmobile_performance_factory.addStep(util_clean_buildsdir)
     winmobile_performance_factory.addStep(bb_lockrelease)
 
     winmobile_performance_builder = {
                 'name': "winmobile-performance-argo",
-                'slavename': "asteamwin5",
+                'slavename': "winmobile-performance",
                 'factory': winmobile_performance_factory,
                 'builddir': './argo-winmobile-performance',
     }
 
     ################################################################################
     ################################################################################
     ####                                                                        ####
     ####                       DEEP TEST BUILDERS                               ####
@@ -1704,17 +1704,17 @@ class argo:
     windows_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     windows_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     windows_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     windows_deep_factory.addStep(util_process_clean)
     windows_deep_factory.addStep(util_clean_buildsdir)
 
     windows_deep_builder = {
                 'name': "windows-deep-argo",
-                'slavename': "asteamwin10",
+                'slavename': "windows-deep",
                 'factory': windows_deep_factory,
                 'builddir': './argo-windows-deep',
     }
 
     ##################################
     #### builder for windows-p3-deep ####
     ##################################
     windows_p3_deep_factory = factory.BuildFactory()
@@ -1734,17 +1734,17 @@ class argo:
     windows_p3_deep_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     windows_p3_deep_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     #windows_p3_deep_factory.addStep(test_differential)
     windows_p3_deep_factory.addStep(util_process_clean)
     windows_p3_deep_factory.addStep(util_clean_buildsdir)
 
     windows_p3_deep_builder = {
                 'name': "windows-p3-deep-argo",
-                'slavename': "asteamwin13",
+                'slavename': "windows-p3-deep",
                 'factory': windows_p3_deep_factory,
                 'builddir': './argo-windows-p3-deep',
     }
 
 
     ##################################
     #### builder for windows-frr ####
     ##################################
@@ -1765,17 +1765,17 @@ class argo:
                 descriptionDone='finished running frunit.',
                 name="RunFrunit",
                 workdir="../scripts",
                 timeout=3600)
     )
 
     windows_frr_builder = {
                 'name': "windows-frr-argo",
-                'slavename': "asteamwin12",
+                'slavename': "windows-frr",
                 'factory': windows_frr_factory,
                 'builddir': './argo-windows-frr',
     }
 
     ##################################
     #### builder for mac-ppc-deep ####
     ##################################
     mac_ppc_deep_factory = factory.BuildFactory()
@@ -1794,17 +1794,17 @@ class argo:
     mac_ppc_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_ppc", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     mac_ppc_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     mac_ppc_deep_factory.addStep(util_process_clean)
     mac_ppc_deep_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_deep_builder = {
                 'name': "mac-ppc-deep-argo",
-                'slavename': "asteammac10",
+                'slavename': "mac-ppc-deep",
                 'factory': mac_ppc_deep_factory,
                 'builddir': './argo-mac-ppc-deep',
     }
 
     ########################################
     #### builder for solaris-sparc-deep ####
     ########################################
     solaris_sparc_deep_factory = factory.BuildFactory()
@@ -1819,17 +1819,17 @@ class argo:
     solaris_sparc_deep_factory.addStep(test_misc)
     solaris_sparc_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     solaris_sparc_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     solaris_sparc_deep_factory.addStep(util_process_clean)
     solaris_sparc_deep_factory.addStep(util_clean_buildsdir)
 
     solaris_sparc_deep_builder = {
                 'name': "solaris-sparc-deep-argo",
-                'slavename': "asteamsol1",
+                'slavename': "solaris-sparc",
                 'factory': solaris_sparc_deep_factory,
                 'builddir': './argo-solaris-sparc-deep',
     }
 
     ##################################
     #### builder for windows64-deep ####
     ##################################
     windows_64_deep_factory = factory.BuildFactory()
@@ -1857,17 +1857,17 @@ class argo:
     windows_64_deep_factory.addStep(test_misc)
     windows_64_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_64", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     windows_64_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd_64", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     windows_64_deep_factory.addStep(util_process_clean)
     windows_64_deep_factory.addStep(util_clean_buildsdir)
 
     windows_64_deep_builder = {
                 'name': "windows64-deep-argo",
-                'slavename': "asteamwin11",
+                'slavename': "windows64-deep",
                 'factory': windows_64_deep_factory,
                 'builddir': './argo-windows64-deep',
     }
 
     ##################################
     #### builder for winmobile-emulator-deep ####
     ##################################
     winmobile_emulator_deep_factory = factory.BuildFactory()
@@ -1880,17 +1880,17 @@ class argo:
     winmobile_emulator_deep_factory.addStep(test_emulator_generic(name="Release-interp", shellname="avmshell_arm", vmargs="-Dinterp", config="arm-winmobile-emulator-tvm-release-Dinterp-deep", scriptargs=""))
     winmobile_emulator_deep_factory.addStep(test_emulator_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_arm", vmargs="-Dinterp", config="arm-winmobile-emulator-tvm-release-Dinterp-deep", scriptargs=""))
     winmobile_emulator_deep_factory.addStep(test_emulator_generic(name="Release-jit", shellname="avmshell_arm", vmargs="-Ojit", config="arm-winmobile-emulator-tvm-release-Ojit-deep", scriptargs=""))
     winmobile_emulator_deep_factory.addStep(util_process_clean)
     winmobile_emulator_deep_factory.addStep(util_clean_buildsdir)
 
     winmobile_emulator_deep_builder = {
                 'name': "winmobile-emulator-deep-argo",
-                'slavename': "asteamwin20",
+                'slavename': "winmobile-emulator-deep",
                 'factory': winmobile_emulator_deep_factory,
                 'builddir': './argo-winmobile-emulator-deep',
     }
 
     ##################################
     #### builder for linux-deep   ####
     ##################################
     linux_deep_factory = factory.BuildFactory()
@@ -1912,17 +1912,17 @@ class argo:
     linux_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     linux_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     linux_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     linux_deep_factory.addStep(util_process_clean)
     linux_deep_factory.addStep(util_clean_buildsdir)
 
     linux_deep_builder = {
                 'name': "linux-deep-argo",
-                'slavename': "asteamlin9",
+                'slavename': "linux-deep",
                 'factory': linux_deep_factory,
                 'builddir': './argo-linux-deep',
     }
     
     
     ######################################
     #### builder for linux-arm-deep   ####
     ######################################
@@ -1936,17 +1936,17 @@ class argo:
     linux_arm_deep_factory.addStep(test_generic(name="Release-softfloat-deep", shellname="avmshell_neon_arm", vmargs="", config="arm-lnx-tvm-release-deep", scriptargs=""))
     linux_arm_deep_factory.addStep(test_generic(name="Release-deep", shellname="avmshell_neon_arm", vmargs="-Darm_arch 7 -Darm_vfp", config="arm-lnx-tvm-release-deep", scriptargs=""))
     linux_arm_deep_factory.addStep(test_generic(name="Release-Dinterp-deep", shellname="avmshell_neon_arm", vmargs="-Dinterp", config="arm-lnx-tvm-release-Dinterp-deep", scriptargs=""))
     linux_arm_deep_factory.addStep(util_process_clean)
     linux_arm_deep_factory.addStep(util_clean_buildsdir)
 
     linux_arm_deep_builder = {
                 'name': "linux-arm-deep-argo",
-                'slavename': "asteambeagleboard3",
+                'slavename': "linux-arm-deep",
                 'factory': linux_arm_deep_factory,
                 'builddir': './argo-linux-arm-deep',
     }
 
     
     builders = [
                 windows_compile_builder,
                 windows_64_compile_builder,
--- a/build/buildbot/master/master.cfg
+++ b/build/buildbot/master/master.cfg
@@ -50,63 +50,61 @@ SLAVEPORT   = 9750
 WEBPORT_PUB = 8750
 WEBPORT_INT = 8760
 PBLISTENER  = 8755
 
 c = BuildmasterConfig = {}
 
 ####### BUILDSLAVES
 from buildbot.buildslave import BuildSlave
-c['slaves'] = [BuildSlave("asteamwin2", "asteam"),
-               BuildSlave("asteamwin3", "asteam"),
-               BuildSlave("asteamwin11", "asteam"),
-               BuildSlave("asteamwin11-sb", "asteam"),
-
-               BuildSlave("asteammac1", "asteam"),
-               BuildSlave("asteammac1-android", "asteam"),
-               BuildSlave("asteammac4", "asteam"),
-               BuildSlave("asteammac6", "asteam"),
-               BuildSlave("asteammac10", "asteam"),
-               BuildSlave("asteammac12", "asteam"),
-               BuildSlave("asteammac12-10_5", "asteam"),
-               BuildSlave("asteammac12-64bit", "asteam"),
-               BuildSlave("asteammac15", "asteam"),
-               BuildSlave("asteammac17", "asteam"),
-               BuildSlave("tamarin-xserve", "asteam"),
-               BuildSlave("tamarin-xserve2", "asteam"),
-            
-               BuildSlave("asteammac5-64bit", "asteam"),
+c['slaves'] = [
+    # Phase One builders (compile, smoke, test)
+    BuildSlave("windows", "asteam"),
+    BuildSlave("windows64", "asteam"),
+    BuildSlave("mac-intel-10_4", "asteam"),
+    BuildSlave("mac-intel-10_5", "asteam"),
+    BuildSlave("mac64-intel", "asteam"),
+    BuildSlave("mac-ppc-10_4a", "asteam"),
+    BuildSlave("mac-ppc-10_4b", "asteam"),
+    BuildSlave("mac-ppc-10_5a", "asteam"),
+    BuildSlave("mac-ppc-10_5b", "asteam"),
+    BuildSlave("mac64a-ppc", "asteam"),
+    BuildSlave("mac64b-ppc", "asteam"),
+    BuildSlave("linux", "asteam"),
+    BuildSlave("linux64", "asteam"),
+    BuildSlave("winmobile-emulator", "asteam"),
+    BuildSlave("solaris-sparc", "asteam"),
+    BuildSlave("solaris-sparc2", "asteam"),
+    BuildSlave("android", "asteam"),
+    BuildSlave("linux-arm", "asteam"),
+    BuildSlave("linux-arm2", "asteam"),
+    BuildSlave("linux-mips", "asteam"),
+               
+    # Phase Two builders (deep)
+    BuildSlave("windows-deep", "asteam"),
+    BuildSlave("windows-p3-deep", "asteam"),
+    BuildSlave("mac-deep", "asteam"),
+    BuildSlave("mac-ppc-deep", "asteam"),
+    BuildSlave("windows64-deep", "asteam"),
+    BuildSlave("solaris-sparc-deep", "asteam"),
+    BuildSlave("winmobile-emulator-deep", "asteam"),
+    BuildSlave("linux-deep", "asteam"),
+    BuildSlave("linux-arm-deep", "asteam"),
+    BuildSlave("linux-mips-deep", "asteam"),
+    BuildSlave("windows-frr", "asteam"),
 
-               BuildSlave("asteamlin1", "asteam"),
-               BuildSlave("asteamlin5", "asteam"),
-               BuildSlave("asteambeagleboard2", "asteam"),
-               BuildSlave("asteambeagle4", "asteam"),
-               BuildSlave("asteambeagleboard3", "asteam"),
-               BuildSlave("asteamlin1-mips", "asteam"),
-               BuildSlave("asteamlin1-mips-deep", "asteam"),
-
-               BuildSlave("asteamsol3", "asteam"),
-               BuildSlave("asteamsol4", "asteam"),
-               BuildSlave("asteamsol1", "asteam"),
-
-               BuildSlave("asteamwin1", "asteam"),
-               BuildSlave("asteammac2", "asteam"),
-               BuildSlave("asteammac7", "asteam"),
-               BuildSlave("asteammac3", "asteam"),
-               BuildSlave("asteamlin4", "asteam"),
-               BuildSlave("asteamwin5", "asteam"),
-               BuildSlave("asteamlin9", "asteam"),
-
-               BuildSlave("asteamwin10", "asteam"),
-               BuildSlave("asteamwin12", "asteam"),
-               BuildSlave("asteamwin13", "asteam"),
-
-               BuildSlave("asteamwin19", "asteam"),
-               BuildSlave("asteamwin20", "asteam"),
-              ]
+    # Phase Two builders (performance)
+    BuildSlave("windows-performance", "asteam"),
+    BuildSlave("mac-performance", "asteam"),
+    BuildSlave("mac64-performance", "asteam"),           
+    BuildSlave("mac-ppc-performance", "asteam"),
+    BuildSlave("linux-performance", "asteam"),
+    BuildSlave("winmobile-performance", "asteam"),
+    BuildSlave("android-performance", "asteam"),
+    ]
 
 c['slavePortnum'] = SLAVEPORT
 
 
 ####### CHANGESOURCES
 from buildbot.changes.pb import PBChangeSource
 c['change_source'] = PBChangeSource()
 
--- a/build/buildbot/master/sandbox.py
+++ b/build/buildbot/master/sandbox.py
@@ -173,34 +173,34 @@ class sandbox:
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     sb_windows_compile_factory.addStep(compile_buildcheck)
     sb_windows_compile_factory.addStep(util_upload_asteam)
 
 
     sb_windows_compile_builder = {
                 'name': "windows-compile-sandbox",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': sb_windows_compile_factory,
                 'builddir': './sandbox-windows-compile',
     }
 
 
     ###############################################
     #### builder for windows64-compile-sandbox ####
     ###############################################
     sb_windows_64_compile_factory = factory.BuildFactory()
     sb_windows_64_compile_factory.addStep(sync_clean)
     sb_windows_64_compile_factory.addStep(sync_clone_sandbox)
     sb_windows_64_compile_factory.addStep(sync_update)
     sb_windows_64_compile_factory.addStep(bb_slaveupdate(slave="windows64"))
 
     sb_windows_64_compile_builder = {
                 'name': "windows64-compile-sandbox",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': sb_windows_64_compile_factory,
                 'builddir': './sandbox-windows64-compile',
     }
 
 
     ####################################################
     #### builder for mac-intel-10_4-compile-sandbox ####
     ####################################################
@@ -220,17 +220,17 @@ class sandbox:
     sb_mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
     sb_mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     sb_mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     sb_mac_intel_104_compile_factory.addStep(compile_buildcheck_local)
     sb_mac_intel_104_compile_factory.addStep(util_upload_asteam_local)
 
     sb_mac_intel_104_compile_builder = {
                 'name': "mac-intel-10.4-compile-sandbox",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': sb_mac_intel_104_compile_factory,
                 'builddir': './sandbox-mac-intel-10_4-compile',
     }
 
 
     ####################################################
     #### builder for mac-intel-10_5-compile-sandbox ####
     ####################################################
@@ -250,17 +250,17 @@ class sandbox:
     sb_mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
     sb_mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     sb_mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     sb_mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     sb_mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     sb_mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile-sandbox",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': sb_mac_intel_105_compile_factory,
                 'builddir': './sandbox-mac-intel-10_5-compile',
     }
 
 
     ##################################################
     #### builder for mac-intel-64-compile-sandbox ####
     ##################################################
@@ -280,51 +280,51 @@ class sandbox:
     sb_mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin --mac-sdk=105", upload="false"))
     sb_mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     sb_mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     sb_mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     sb_mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     sb_mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile-sandbox",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': sb_mac_intel_64_compile_factory,
                 'builddir': './sandbox-mac64-intel-compile',
     }
 
 
     ###################################################
     #### builder for mac-ppc-10_4a-compile-sandbox ####
     ###################################################
     sb_mac_ppc_104a_compile_factory = factory.BuildFactory()
     sb_mac_ppc_104a_compile_factory.addStep(sync_clean)
     sb_mac_ppc_104a_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_ppc_104a_compile_factory.addStep(sync_update)
     sb_mac_ppc_104a_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_4"))
 
     sb_mac_ppc_104a_compile_builder = {
                 'name': "mac-ppc-10.4a-compile-sandbox",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': sb_mac_ppc_104a_compile_factory,
                 'builddir': './sandbox-mac-ppc-10_4a-compile',
     }
 
 
     ###################################################
     #### builder for mac-ppc-10_4b-compile-sandbox ####
     ###################################################
     sb_mac_ppc_104b_compile_factory = factory.BuildFactory()
     sb_mac_ppc_104b_compile_factory.addStep(sync_clean)
     sb_mac_ppc_104b_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_ppc_104b_compile_factory.addStep(sync_update)
     sb_mac_ppc_104b_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_4"))
 
     sb_mac_ppc_104b_compile_builder = {
                 'name': "mac-ppc-10.4b-compile-sandbox",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': sb_mac_ppc_104b_compile_factory,
                 'builddir': './sandbox-mac-ppc-10_4b-compile',
     }
 
 
 
     ###################################################
     #### builder for mac-ppc-10_5a-compile-sandbox ####
@@ -332,68 +332,68 @@ class sandbox:
     sb_mac_ppc_105a_compile_factory = factory.BuildFactory()
     sb_mac_ppc_105a_compile_factory.addStep(sync_clean)
     sb_mac_ppc_105a_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_ppc_105a_compile_factory.addStep(sync_update)
     sb_mac_ppc_105a_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_5"))
 
     sb_mac_ppc_105a_compile_builder = {
                 'name': "mac-ppc-10.5a-compile-sandbox",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': sb_mac_ppc_105a_compile_factory,
                 'builddir': './sandbox-mac-ppc-10_5a-compile',
     }
 
 
     ###################################################
     #### builder for mac-ppc-10_5b-compile-sandbox ####
     ###################################################
     sb_mac_ppc_105b_compile_factory = factory.BuildFactory()
     sb_mac_ppc_105b_compile_factory.addStep(sync_clean)
     sb_mac_ppc_105b_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_ppc_105b_compile_factory.addStep(sync_update)
     sb_mac_ppc_105b_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_5"))
 
     sb_mac_ppc_105b_compile_builder = {
                 'name': "mac-ppc-10.5b-compile-sandbox",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': sb_mac_ppc_105b_compile_factory,
                 'builddir': './sandbox-mac-ppc-10_5b-compile',
     }
 
 
     ################################################
     #### builder for mac-ppc-64-compile-sandbox ####
     ################################################
     sb_mac_ppc_64_compile_factory = factory.BuildFactory()
     sb_mac_ppc_64_compile_factory.addStep(sync_clean)
     sb_mac_ppc_64_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_ppc_64_compile_factory.addStep(sync_update)
     sb_mac_ppc_64_compile_factory.addStep(bb_slaveupdate(slave="mac64-ppc"))
 
     sb_mac_ppc_64_compile_builder = {
                 'name': "mac64-ppc-compile-sandbox",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': sb_mac_ppc_64_compile_factory,
                 'builddir': './sandbox-mac64-ppc-compile',
     }
     
 
     #################################################
     #### builder for mac-ppc-64b-compile-sandbox ####
     #################################################
     sb_mac_ppc_64b_compile_factory = factory.BuildFactory()
     sb_mac_ppc_64b_compile_factory.addStep(sync_clean)
     sb_mac_ppc_64b_compile_factory.addStep(sync_clone_sandbox)
     sb_mac_ppc_64b_compile_factory.addStep(sync_update)
     sb_mac_ppc_64b_compile_factory.addStep(bb_slaveupdate(slave="mac64-ppc"))
 
     sb_mac_ppc_64b_compile_builder = {
                 'name': "mac64b-ppc-compile-sandbox",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': sb_mac_ppc_64b_compile_factory,
                 'builddir': './sandbox-mac64b-ppc-compile',
     }
 
 
     ###########################################
     #### builder for linux-compile-sandbox ####
     ###########################################
@@ -438,17 +438,17 @@ class sandbox:
                 name="Debug_arm-linux",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     sb_linux_compile_factory.addStep(compile_buildcheck_local)
     sb_linux_compile_factory.addStep(util_upload_asteam_local)
 
     sb_linux_compile_builder = {
                 'name': "linux-compile-sandbox",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': sb_linux_compile_factory,
                 'builddir': './sandbox-linux-compile',
     }
 
 
     #############################################
     #### builder for linux64-compile-sandbox ####
     #############################################
@@ -464,17 +464,17 @@ class sandbox:
     sb_linux_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger", upload="false"))
     sb_linux_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
     sb_linux_64_compile_factory.addStep(compile_testmedia)
     sb_linux_64_compile_factory.addStep(compile_buildcheck_local)
     sb_linux_64_compile_factory.addStep(util_upload_asteam_local)
 
     sb_linux_64_compile_builder = {
                 'name': "linux64-compile-sandbox",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': sb_linux_64_compile_factory,
                 'builddir': './sandbox-linux64-compile',
     }
 
 
     ########################################################
     #### builder for winmobile-emulator-compile-sandbox ####
     ########################################################
@@ -549,17 +549,17 @@ class sandbox:
                 name="DebugDebugger64",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     sb_winmobile_emulator_compile_factory.addStep(compile_buildcheck_local)
     sb_winmobile_emulator_compile_factory.addStep(util_upload_asteam_local)
 
     sb_winmobile_emulator_compile_builder = {
                 'name': "winmobile-emulator-compile-sandbox",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': sb_winmobile_emulator_compile_factory,
                 'builddir': './sandbox-winmobile-emulator-compile',
     }
 
 
     ###################################################
     #### builder for solaris-sparc-compile-sandbox ####
     ###################################################
@@ -574,34 +574,34 @@ class sandbox:
     sb_solaris_sparc_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug", upload="false"))
     sb_solaris_sparc_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger", upload="false"))
     sb_solaris_sparc_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
     sb_solaris_sparc_compile_factory.addStep(compile_buildcheck_local)
     sb_solaris_sparc_compile_factory.addStep(util_upload_asteam)
 
     sb_solaris_sparc_compile_builder = {
                 'name': "solaris-sparc-compile-sandbox",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': sb_solaris_sparc_compile_factory,
                 'builddir': './sandbox-solaris-sparc-compile',
     }
     
     
     ############################################
     #### builder for solaris-sparc2-compile ####
     ############################################
     sb_solaris_sparc2_compile_factory = factory.BuildFactory()
     sb_solaris_sparc2_compile_factory.addStep(sync_clean)
     sb_solaris_sparc2_compile_factory.addStep(sync_clone_sandbox)
     sb_solaris_sparc2_compile_factory.addStep(sync_update)
     sb_solaris_sparc2_compile_factory.addStep(bb_slaveupdate(slave="solaris-sparc"))
     
     sb_solaris_sparc2_compile_builder = {
                 'name': "solaris-sparc2-compile-sandbox",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': sb_solaris_sparc2_compile_factory,
                 'builddir': './sandbox-solaris-sparc2-compile',
     }
 
     ###########################################
     #### builder for android on mac        ####
     ###########################################
 
@@ -645,50 +645,50 @@ class sandbox:
                 descriptionDone='finished upload to asteam.',
                 name="Upload_ASTEAM",
                 workdir="../repo/build/buildbot/slaves/scripts",
                 timeout=3600)
     )
 
     sb_android_compile_builder = {
                 'name': "android-compile-sandbox",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': sb_android_compile_factory,
                 'builddir': './sandbox-android-compile',
     }
     
     ###############################
     #### builder for linux-arm ####
     ###############################
     sb_linux_arm_compile_factory = factory.BuildFactory()
     sb_linux_arm_compile_factory.addStep(sync_clean)
     sb_linux_arm_compile_factory.addStep(sync_clone_sandbox)
     sb_linux_arm_compile_factory.addStep(sync_update)
     sb_linux_arm_compile_factory.addStep(bb_slaveupdate(slave="linux-arm"))
 
     sb_linux_arm_compile_builder = {
                 'name': "linux-arm-compile-sandbox",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': sb_linux_arm_compile_factory,
                 'builddir': './sandbox-linux-arm-compile',
     }
     
     
     ################################
     #### builder for linux-arm2 ####
     ################################
     sb_linux_arm2_compile_factory = factory.BuildFactory()
     sb_linux_arm2_compile_factory.addStep(sync_clean)
     sb_linux_arm2_compile_factory.addStep(sync_clone_sandbox)
     sb_linux_arm2_compile_factory.addStep(sync_update)
     sb_linux_arm2_compile_factory.addStep(bb_slaveupdate(slave="linux-arm"))
 
     sb_linux_arm2_compile_builder = {
                 'name': "linux-arm2-compile-sandbox",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': sb_linux_arm2_compile_factory,
                 'builddir': './sandbox-linux-arm2-compile',
     }
     
     
     ################################
     #### builder for linux-mips ####
     ################################
@@ -697,46 +697,48 @@ class sandbox:
     sb_linux_mips_compile_factory.addStep(sync_clone_sandbox)
     sb_linux_mips_compile_factory.addStep(sync_update)
     sb_linux_mips_compile_factory.addStep(bb_slaveupdate(slave="linux-mips"))
     sb_linux_mips_compile_factory.addStep(compile_builtin)
     sb_linux_mips_compile_factory.addStep(BuildShellCommand(
                 command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --target=mips-linux', 'avmshell_mips', 'false'],
                 env={
                     'branch': WithProperties('%s','branch'),
+                    'silent':WithProperties('%s','silent'),
                     'CXX': 'mipsel-linux-uclibc-g++ -static',
                     'CC' : 'mipsel-linux-uclibc-gcc -static',
                     'LD' : 'mipsel-linux-uclibc-ld',
                     'AR' : 'mipsel-linux-uclibc-ar',
                 },
                 description='starting Release-mips-linux build...',
                 descriptionDone='finished Release-mips-linux build.',
                 name="Release_mips-linux",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     sb_linux_mips_compile_factory.addStep(BuildShellCommand(
                 command=['../all/compile-generic.sh', WithProperties('%s','revision'), '--enable-shell --enable-debug --target=mips-linux', 'avmshell_mips_d', 'false'],
                 env={
                     'branch': WithProperties('%s','branch'),
+                    'silent':WithProperties('%s','silent'),
                     'CXX': 'mipsel-linux-uclibc-g++ -static',
                     'CC' : 'mipsel-linux-uclibc-gcc -static',
                     'LD' : 'mipsel-linux-uclibc-ld',
                     'AR' : 'mipsel-linux-uclibc-ar',
                 },
                 description='starting Debug-mips-linux build...',
                 descriptionDone='finished Debug-mips-linux build.',
                 name="Debug_mips-linux",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     sb_linux_mips_compile_factory.addStep(compile_buildcheck_local)
     sb_linux_mips_compile_factory.addStep(util_upload_asteam_local)
     
     sb_linux_mips_compile_builder = {
                 'name': "linux-mips-compile-sandbox",
-                'slavename': "asteamlin1-mips",
+                'slavename': "linux-mips",
                 'factory': sb_linux_mips_compile_factory,
                 'builddir': './sandbox-linux-mips-compile',
     }
 
 
 
     ################################################################################
     ################################################################################
@@ -754,268 +756,268 @@ class sandbox:
     ###########################################
     sb_windows_smoke_factory = factory.BuildFactory()
     sb_windows_smoke_factory.addStep(download_testmedia)
     sb_windows_smoke_factory.addStep(test_smoke)
     sb_windows_smoke_factory.addStep(util_process_clean)
 
     sb_windows_smoke_builder = {
                 'name': "windows-smoke-sandbox",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': sb_windows_smoke_factory,
                 'builddir': './sandbox-windows-smoke',
     }
 
 
     #############################################
     #### builder for windows64-smoke-sandbox ####
     #############################################
     sb_windows_64_smoke_factory = factory.BuildFactory()
     sb_windows_64_smoke_factory.addStep(download_testmedia)
     sb_windows_64_smoke_factory.addStep(test_smoke)
     sb_windows_64_smoke_factory.addStep(util_process_clean)
 
     sb_windows_64_smoke_builder = {
                 'name': "windows64-smoke-sandbox",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': sb_windows_64_smoke_factory,
                 'builddir': './sandbox-windows64-smoke',
     }
 
 
     ##################################################
     #### builder for mac-intel-10_4-smoke-sandbox ####
     ##################################################
     sb_mac_intel_104_smoke_factory = factory.BuildFactory()
     sb_mac_intel_104_smoke_factory.addStep(download_testmedia)
     sb_mac_intel_104_smoke_factory.addStep(test_smoke)
     sb_mac_intel_104_smoke_factory.addStep(util_process_clean)
 
     sb_mac_intel_104_smoke_builder = {
                 'name': "mac-intel-10.4-smoke-sandbox",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': sb_mac_intel_104_smoke_factory,
                 'builddir': './sandbox-mac-intel-10_4-smoke',
     }
 
 
     ##################################################
     #### builder for mac-intel-10_5-smoke-sandbox ####
     ##################################################
     sb_mac_intel_105_smoke_factory = factory.BuildFactory()
     sb_mac_intel_105_smoke_factory.addStep(download_testmedia)
     sb_mac_intel_105_smoke_factory.addStep(test_smoke)
     sb_mac_intel_105_smoke_factory.addStep(util_process_clean)
 
     sb_mac_intel_105_smoke_builder = {
                 'name': "mac-intel-10.5-smoke-sandbox",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': sb_mac_intel_105_smoke_factory,
                 'builddir': './sandbox-mac-intel-10_5-smoke',
     }
 
 
     ###############################################
     #### builder for mac64-intel-smoke-sandbox ####
     ###############################################
     sb_mac_intel_64_smoke_factory = factory.BuildFactory()
     sb_mac_intel_64_smoke_factory.addStep(download_testmedia)
     sb_mac_intel_64_smoke_factory.addStep(test_smoke)
     sb_mac_intel_64_smoke_factory.addStep(util_process_clean)
 
     sb_mac_intel_64_smoke_builder = {
                 'name': "mac64-intel-smoke-sandbox",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': sb_mac_intel_64_smoke_factory,
                 'builddir': './sandbox-mac64-intel-smoke',
     }
 
     #################################################
     #### builder for mac-ppc-10_4a-smoke-sandbox ####
     #################################################
     sb_mac_ppc_104a_smoke_factory = factory.BuildFactory()
     sb_mac_ppc_104a_smoke_factory.addStep(download_testmedia)
     sb_mac_ppc_104a_smoke_factory.addStep(test_smoke)
     sb_mac_ppc_104a_smoke_factory.addStep(util_process_clean)
 
     sb_mac_ppc_104a_smoke_builder = {
                 'name': "mac-ppc-10.4a-smoke-sandbox",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': sb_mac_ppc_104a_smoke_factory,
                 'builddir': './sandbox-mac-ppc-10_4a-smoke',
     }
 
 
     #################################################
     #### builder for mac-ppc-10_4b-smoke-sandbox ####
     #################################################
     sb_mac_ppc_104b_smoke_factory = factory.BuildFactory()
     sb_mac_ppc_104b_smoke_factory.addStep(download_testmedia)
     sb_mac_ppc_104b_smoke_factory.addStep(test_smoke)
     sb_mac_ppc_104b_smoke_factory.addStep(util_process_clean)
 
     sb_mac_ppc_104b_smoke_builder = {
                 'name': "mac-ppc-10.4b-smoke-sandbox",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': sb_mac_ppc_104b_smoke_factory,
                 'builddir': './sandbox-mac-ppc-10_4b-smoke',
     }
 
 
     #################################################
     #### builder for mac-ppc-10_5a-smoke-sandbox ####
     #################################################
     sb_mac_ppc_105a_smoke_factory = factory.BuildFactory()
     sb_mac_ppc_105a_smoke_factory.addStep(download_testmedia)
     sb_mac_ppc_105a_smoke_factory.addStep(test_smoke)
     sb_mac_ppc_105a_smoke_factory.addStep(util_process_clean)
 
     sb_mac_ppc_105a_smoke_builder = {
                 'name': "mac-ppc-10.5a-smoke-sandbox",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': sb_mac_ppc_105a_smoke_factory,
                 'builddir': './sandbox-mac-ppc-10_5a-smoke',
     }
 
     #################################################
     #### builder for mac-ppc-10_5b-smoke-sandbox ####
     #################################################
     sb_mac_ppc_105b_smoke_factory = factory.BuildFactory()
     sb_mac_ppc_105b_smoke_factory.addStep(download_testmedia)
     sb_mac_ppc_105b_smoke_factory.addStep(test_smoke)
     sb_mac_ppc_105b_smoke_factory.addStep(util_process_clean)
 
     sb_mac_ppc_105b_smoke_builder = {
                 'name': "mac-ppc-10.5b-smoke-sandbox",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': sb_mac_ppc_105b_smoke_factory,
                 'builddir': './sandbox-mac-ppc-10_5b-smoke',
     }
 
 
     #############################################
     #### builder for mac64-ppc-smoke-sandbox ####
     #############################################
     sb_mac_ppc_64_smoke_factory = factory.BuildFactory()
     sb_mac_ppc_64_smoke_factory.addStep(download_testmedia)
     sb_mac_ppc_64_smoke_factory.addStep(test_smoke)
     sb_mac_ppc_64_smoke_factory.addStep(util_process_clean)
 
     sb_mac_ppc_64_smoke_builder = {
                 'name': "mac64-ppc-smoke-sandbox",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': sb_mac_ppc_64_smoke_factory,
                 'builddir': './sandbox-mac64-ppc-smoke',
     }
 
 
 
     ##############################################
     #### builder for mac64b-ppc-smoke-sandbox ####
     ##############################################
     sb_mac_ppc_64b_smoke_factory = factory.BuildFactory()
     sb_mac_ppc_64b_smoke_factory.addStep(download_testmedia)
     sb_mac_ppc_64b_smoke_factory.addStep(test_smoke)
     sb_mac_ppc_64b_smoke_factory.addStep(util_process_clean)
 
     sb_mac_ppc_64b_smoke_builder = {
                 'name': "mac64b-ppc-smoke-sandbox",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': sb_mac_ppc_64b_smoke_factory,
                 'builddir': './sandbox-mac64b-ppc-smoke',
     }
 
     #########################################
     #### builder for linux-smoke-sandbox ####
     #########################################
     sb_linux_smoke_factory = factory.BuildFactory()
     sb_linux_smoke_factory.addStep(download_testmedia)
     sb_linux_smoke_factory.addStep(test_smoke)
     sb_linux_smoke_factory.addStep(util_process_clean)
 
     sb_linux_smoke_builder = {
                 'name': "linux-smoke-sandbox",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': sb_linux_smoke_factory,
                 'builddir': './sandbox-linux-smoke',
     }
 
 
     ###########################################
     #### builder for linux64-smoke-sandbox ####
     ###########################################
     sb_linux_64_smoke_factory = factory.BuildFactory()
     sb_linux_64_smoke_factory.addStep(download_testmedia)
     sb_linux_64_smoke_factory.addStep(test_smoke)
     sb_linux_64_smoke_factory.addStep(util_process_clean)
 
     sb_linux_64_smoke_builder = {
                 'name': "linux64-smoke-sandbox",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': sb_linux_64_smoke_factory,
                 'builddir': './sandbox-linux64-smoke',
     }
 
 
     ######################################################
     #### builder for winmobile-emulator-smoke-sandbox ####
     ######################################################
     sb_winmobile_emulator_smoke_factory = factory.BuildFactory()
     sb_winmobile_emulator_smoke_factory.addStep(download_testmedia)
     sb_winmobile_emulator_smoke_factory.addStep(test_emulator_smoke_mobile)
     sb_winmobile_emulator_smoke_factory.addStep(util_process_clean)
 
     sb_winmobile_emulator_smoke_builder = {
                 'name': "winmobile-emulator-smoke-sandbox",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': sb_winmobile_emulator_smoke_factory,
                 'builddir': './sandbox-winmobile-emulator-smoke',
     }
 
     #################################################
     #### builder for solaris-sparc-smoke-sandbox ####
     #################################################
     sb_solaris_sparc_smoke_factory = factory.BuildFactory()
     sb_solaris_sparc_smoke_factory.addStep(download_testmedia)
     sb_solaris_sparc_smoke_factory.addStep(test_smoke)
     sb_solaris_sparc_smoke_factory.addStep(util_process_clean)
 
     sb_solaris_sparc_smoke_builder = {
                 'name': "solaris-sparc-smoke-sandbox",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': sb_solaris_sparc_smoke_factory,
                 'builddir': './sandbox-solaris-sparc-smoke',
     }
     
     ##########################################
     #### builder for solaris-sparc2-smoke ####
     ##########################################
     sb_solaris_sparc2_smoke_factory = factory.BuildFactory()
     sb_solaris_sparc2_smoke_factory.addStep(download_testmedia)
     sb_solaris_sparc2_smoke_factory.addStep(test_smoke)
     sb_solaris_sparc2_smoke_factory.addStep(util_process_clean)
 
     sb_solaris_sparc2_smoke_builder = {
                 'name': "solaris-sparc2-smoke-sandbox",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': sb_solaris_sparc2_smoke_factory,
                 'builddir': './sandbox-solaris-sparc2-smoke',
     }
     
     #########################################
     #### builder for android-smoke       ####
     #########################################
     sb_android_smoke_factory = factory.BuildFactory()
     sb_android_smoke_factory.addStep(download_testmedia)
     sb_android_smoke_factory.addStep(test_smoke_local)
     sb_android_smoke_factory.addStep(util_process_clean)
 
     sb_android_smoke_builder = {
                 'name': "android-smoke-sandbox",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': sb_android_smoke_factory,
                 'builddir': './sanbox-android-smoke',
     }
     
     ###########################################
     #### builder for linxu-arm-smoke       ####
     ###########################################
     sb_linux_arm_smoke_factory = factory.BuildFactory()
@@ -1027,17 +1029,17 @@ class sandbox:
                 descriptionDone='finished smoke tests.',
                 name="SmokeTest",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     sb_linux_arm_smoke_factory.addStep(util_process_clean)
 
     sb_linux_arm_smoke_builder = {
                 'name': "linux-arm-smoke-sandbox",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': sb_linux_arm_smoke_factory,
                 'builddir': './sandbox-linux-arm-smoke',
     }
     
     
     ###########################################
     #### builder for linxu-arm2-smoke      ####
     ###########################################
@@ -1050,32 +1052,32 @@ class sandbox:
                 descriptionDone='finished smoke tests.',
                 name="SmokeTest",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     sb_linux_arm2_smoke_factory.addStep(util_process_clean)
 
     sb_linux_arm2_smoke_builder = {
                 'name': "linux-arm2-smoke-sandbox",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': sb_linux_arm2_smoke_factory,
                 'builddir': './sandbox-linux-arm2-smoke',
     }
     
     #########################################
     #### builder for linux-mips-smoke    ####
     #########################################
     sb_linux_mips_smoke_factory = factory.BuildFactory()
     sb_linux_mips_smoke_factory.addStep(download_testmedia)
     sb_linux_mips_smoke_factory.addStep(test_smoke_local)
     sb_linux_mips_smoke_factory.addStep(util_process_clean)
 
     sb_linux_mips_smoke_builder = {
                 'name': "linux-mips-smoke-sandbox",
-                'slavename': "asteamlin1-mips",
+                'slavename': "linux-mips",
                 'factory': sb_linux_mips_smoke_factory,
                 'builddir': './sandbox-linux-mips-smoke',
     }
 
 
     ################################################################################
     ################################################################################
     ####                                                                        ####
@@ -1101,17 +1103,17 @@ class sandbox:
     sb_windows_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     sb_windows_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     sb_windows_test_factory.addStep(test_differential)
     sb_windows_test_factory.addStep(util_process_clean)
     sb_windows_test_factory.addStep(util_clean_buildsdir)
 
     sb_windows_test_builder = {
                 'name': "windows-test-sandbox",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': sb_windows_test_factory,
                 'builddir': './sandbox-windows-test',
     }
 
     ############################################
     #### builder for windows64-test-sandbox ####
     ############################################
     sb_windows_64_test_factory = factory.BuildFactory()
@@ -1124,17 +1126,17 @@ class sandbox:
     sb_windows_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     sb_windows_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     sb_windows_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     sb_windows_64_test_factory.addStep(util_process_clean)
     sb_windows_64_test_factory.addStep(util_clean_buildsdir)
 
     sb_windows_64_test_builder = {
                 'name': "windows64-test-sandbox",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': sb_windows_64_test_factory,
                 'builddir': './sandbox-windows64-test',
     }
 
 
     #################################################
     #### builder for mac-intel-10_4-test-sandbox ####
     #################################################
@@ -1149,17 +1151,17 @@ class sandbox:
     sb_mac_intel_104_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_104", vmargs="", config="", scriptargs=""))
     sb_mac_intel_104_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_104", vmargs="", config="", scriptargs=""))
     sb_mac_intel_104_test_factory.addStep(test_differential)
     sb_mac_intel_104_test_factory.addStep(util_process_clean)
     sb_mac_intel_104_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_intel_104_test_builder = {
                 'name': "mac-intel-10.4-test-sandbox",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': sb_mac_intel_104_test_factory,
                 'builddir': './sandbox-mac-intel-10_4-test',
     }
 
 
 
     #################################################
     #### builder for mac-intel-10_5-test-sandbox ####
@@ -1175,17 +1177,17 @@ class sandbox:
     sb_mac_intel_105_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     sb_mac_intel_105_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     sb_mac_intel_105_test_factory.addStep(test_differential)
     sb_mac_intel_105_test_factory.addStep(util_process_clean)
     sb_mac_intel_105_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_intel_105_test_builder = {
                 'name': "mac-intel-10.5-test-sandbox",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': sb_mac_intel_105_test_factory,
                 'builddir': './sandbox-mac-intel-10_5-test',
     }
 
     ##############################################
     #### builder for mac64-intel-test-sandbox ####
     ##############################################
     sb_mac_intel_64_test_factory = factory.BuildFactory()
@@ -1198,17 +1200,17 @@ class sandbox:
     sb_mac_intel_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     sb_mac_intel_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     sb_mac_intel_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     sb_mac_intel_64_test_factory.addStep(util_process_clean)
     sb_mac_intel_64_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_intel_64_test_builder = {
                 'name': "mac64-intel-test-sandbox",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': sb_mac_intel_64_test_factory,
                 'builddir': './sandbox-mac64-intel-test',
     }
 
 
     ################################################
     #### builder for mac-ppc-10_4a-test-sandbox ####
     ################################################
@@ -1220,34 +1222,34 @@ class sandbox:
     sb_mac_ppc_104a_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_104_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     sb_mac_ppc_104a_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_104_ppc", vmargs="-Ojit", config="", scriptargs=""))
     sb_mac_ppc_104a_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_104_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_104a_test_factory.addStep(util_process_clean)
     sb_mac_ppc_104a_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_ppc_104a_test_builder = {
                 'name': "mac-ppc-10.4a-test-sandbox",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': sb_mac_ppc_104a_test_factory,
                 'builddir': './sandbox-mac-ppc-10_4a-test',
     }
 
 
     ################################################
     #### builder for mac-ppc-10_4b-test-sandbox ####
     ################################################
     sb_mac_ppc_104b_test_factory = factory.BuildFactory()
     sb_mac_ppc_104b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_104_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_104b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_104_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_104b_test_factory.addStep(util_process_clean)
     sb_mac_ppc_104b_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_ppc_104b_test_builder = {
                 'name': "mac-ppc-10.4b-test-sandbox",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': sb_mac_ppc_104b_test_factory,
                 'builddir': './sandbox-mac-ppc-10_4b-test',
     }
 
 
     ################################################
     #### builder for mac-ppc-10_5a-test-sandbox ####
     ################################################
@@ -1259,33 +1261,33 @@ class sandbox:
     sb_mac_ppc_105a_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     sb_mac_ppc_105a_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_ppc", vmargs="-Ojit", config="", scriptargs=""))
     sb_mac_ppc_105a_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_105a_test_factory.addStep(util_process_clean)
     sb_mac_ppc_105a_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_ppc_105a_test_builder = {
                 'name': "mac-ppc-10.5a-test-sandbox",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': sb_mac_ppc_105a_test_factory,
                 'builddir': './sandbox-mac-ppc-10_5a-test',
     }
 
     ################################################
     #### builder for mac-ppc-10_5b-test-sandbox ####
     ################################################
     sb_mac_ppc_105b_test_factory = factory.BuildFactory()
     sb_mac_ppc_105b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_105b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_105b_test_factory.addStep(util_process_clean)
     sb_mac_ppc_105b_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_ppc_105b_test_builder = {
                 'name': "mac-ppc-10.5b-test-sandbox",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': sb_mac_ppc_105b_test_factory,
                 'builddir': './sandbox-mac-ppc-10_5b-test',
     }
 
 
     ############################################
     #### builder for mac64-ppc-test-sandbox ####
     ############################################
@@ -1296,17 +1298,17 @@ class sandbox:
     sb_mac_ppc_64_test_factory.addStep(test_generic(name="Release-interp", shellname="avmshell_64_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     sb_mac_ppc_64_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_64_ppc", vmargs="-Ojit", config="", scriptargs=""))
     sb_mac_ppc_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_64_test_factory.addStep(util_process_clean)
     sb_mac_ppc_64_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_ppc_64_test_builder = {
                 'name': "mac64-ppc-test-sandbox",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': sb_mac_ppc_64_test_factory,
                 'builddir': './sandbox-mac64-ppc-test',
     }
 
 
     #############################################
     #### builder for mac64b-ppc-test-sandbox ####
     #############################################
@@ -1314,17 +1316,17 @@ class sandbox:
     sb_mac_ppc_64b_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_64_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     sb_mac_ppc_64b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_64b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64_ppc", vmargs="", config="", scriptargs=""))
     sb_mac_ppc_64b_test_factory.addStep(util_process_clean)
     sb_mac_ppc_64b_test_factory.addStep(util_clean_buildsdir)
 
     sb_mac_ppc_64b_test_builder = {
                 'name': "mac64b-ppc-test-sandbox",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': sb_mac_ppc_64b_test_factory,
                 'builddir': './sandbox-mac64b-ppc-test',
     }
 
 
     ########################################
     #### builder for linux-test-sandbox ####
     ########################################
@@ -1339,17 +1341,17 @@ class sandbox:
     sb_linux_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     sb_linux_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     sb_linux_test_factory.addStep(test_differential)
     sb_linux_test_factory.addStep(util_process_clean)
     sb_linux_test_factory.addStep(util_clean_buildsdir)
 
     sb_linux_test_builder = {
                 'name': "linux-test-sandbox",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': sb_linux_test_factory,
                 'builddir': './sandbox-linux-test',
     }
 
 
     ##########################################
     #### builder for linux64-test-sandbox ####
     ##########################################
@@ -1363,17 +1365,17 @@ class sandbox:
     sb_linux_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     sb_linux_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     sb_linux_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     sb_linux_64_test_factory.addStep(util_process_clean)
     sb_linux_64_test_factory.addStep(util_clean_buildsdir)
 
     sb_linux_64_test_builder = {
                 'name': "linux64-test-sandbox",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': sb_linux_64_test_factory,
                 'builddir': './sandbox-linux64-test',
     }
 
     #####################################################
     #### builder for winmobile-emulator-test-sandbox ####
     #####################################################
     sb_winmobile_emulator_test_factory = factory.BuildFactory()
@@ -1381,17 +1383,17 @@ class sandbox:
     sb_winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-interp", shellname="avmshell_arm", vmargs="-Dinterp", config="", scriptargs=""))
     sb_winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_arm", vmargs="-Dinterp", config="", scriptargs=""))
     sb_winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-jit", shellname="avmshell_arm", vmargs="-Ojit", config="", scriptargs=""))
     sb_winmobile_emulator_test_factory.addStep(util_process_clean)
     sb_winmobile_emulator_test_factory.addStep(util_clean_buildsdir)
 
     sb_winmobile_emulator_test_builder = {
                 'name': "winmobile-emulator-test-sandbox",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': sb_winmobile_emulator_test_factory,
                 'builddir': './sandbox-winmobile-emulator-test',
     }
 
 
     ########################################
     #### builder for solaris-sparc-test ####
     ########################################
@@ -1400,17 +1402,17 @@ class sandbox:
     sb_solaris_sparc_test_factory.addStep(test_selftest(name="Release", shellname="avmshell"))
     sb_solaris_sparc_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     sb_solaris_sparc_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     sb_solaris_sparc_test_factory.addStep(util_process_clean)
     sb_solaris_sparc_test_factory.addStep(util_clean_buildsdir)
 
     sb_solaris_sparc_test_builder = {
                 'name': "solaris-sparc-test-sandbox",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': sb_solaris_sparc_test_factory,
                 'builddir': './sandbox-solaris-sparc-test',
     }
     
     
     #########################################
     #### builder for solaris-sparc2-test ####
     #########################################
@@ -1420,17 +1422,17 @@ class sandbox:
     sb_solaris_sparc2_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode", vmargs="-Dinterp", config="", scriptargs=""))
     sb_solaris_sparc2_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell", vmargs="-Ojit", config="", scriptargs=""))
     sb_solaris_sparc2_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s", vmargs="", config="", scriptargs=""))
     sb_solaris_sparc2_test_factory.addStep(util_process_clean)
     sb_solaris_sparc2_test_factory.addStep(util_clean_buildsdir)
 
     sb_solaris_sparc2_test_builder = {
                 'name': "solaris-sparc2-test-sandbox",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': sb_solaris_sparc2_test_factory,
                 'builddir': './sandbox-solaris-sparc2-test',
     }
     
     ########################################
     #### builder for android-test       ####
     ########################################
     sb_android_test_factory = factory.BuildFactory()
@@ -1438,65 +1440,65 @@ class sandbox:
     sb_android_test_factory.addStep(test_generic_adb(name="Release-interp", shellname="avmshell", vmargs="-Dinterp", config="", scriptargs=""))
     sb_android_test_factory.addStep(test_generic_adb(name="Release-jit", shellname="avmshell", vmargs="-Ojit", config="", scriptargs=""))
     sb_android_test_factory.addStep(test_generic_adb(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     sb_android_test_factory.addStep(util_process_clean)
     sb_android_test_factory.addStep(util_clean_buildsdir)
 
     sb_android_test_builder = {
                 'name': "android-test-sandbox",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': sb_android_test_factory,
                 'builddir': './sandbox-android-test',
     }
     
     ##########################################
     #### builder for linux-arm-test       ####
     ##########################################
     sb_linux_arm_test_factory = factory.BuildFactory()
     sb_linux_arm_test_factory.addStep(test_selftest(name="Release", shellname="avmshell_neon_arm"))
     sb_linux_arm_test_factory.addStep(test_generic(name="Release-vfp", shellname="avmshell_neon_arm", vmargs="-Darm_arch 7 -Darm_vfp", config="", scriptargs=""))
     sb_linux_arm_test_factory.addStep(test_generic(name="Release-jit-vfp", shellname="avmshell_neon_arm", vmargs="-Darm_arch 7 -Darm_vfp -Ojit", config="", scriptargs=""))
     sb_linux_arm_test_factory.addStep(util_process_clean)
     sb_linux_arm_test_factory.addStep(util_clean_buildsdir)
 
     sb_linux_arm_test_builder = {
                 'name': "linux-arm-test-sandbox",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': sb_linux_arm_test_factory,
                 'builddir': './sandbox-linux-arm-test',
     }
     
     
     ##########################################
     #### builder for linux-arm2-test      ####
     ##########################################
     sb_linux_arm2_test_factory = factory.BuildFactory()
     sb_linux_arm2_test_factory.addStep(test_generic(name="Release-softfloat", shellname="avmshell_neon_arm", vmargs="", config="", scriptargs=""))
     sb_linux_arm2_test_factory.addStep(test_generic(name="Release-interp", shellname="avmshell_neon_arm", vmargs="-Dinterp", config="", scriptargs=""))
     sb_linux_arm2_test_factory.addStep(util_process_clean)
     sb_linux_arm2_test_factory.addStep(util_clean_buildsdir)
 
     sb_linux_arm2_test_builder = {
                 'name': "linux-arm2-test-sandbox",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': sb_linux_arm2_test_factory,
                 'builddir': './sandbox-linux-arm2-test',
     }
     
     ##########################################
     #### builder for linux-mips-test      ####
     ##########################################
     sb_linux_mips_test_factory = factory.BuildFactory()
     sb_linux_mips_test_factory.addStep(util_process_clean)
     sb_linux_mips_test_factory.addStep(util_clean_buildsdir)
 
     sb_linux_mips_test_builder = {
                 'name': "linux-mips-test-sandbox",
-                'slavename': "asteamlin1-mips",
+                'slavename': "linux-mips",
                 'factory': sb_linux_mips_test_factory,
                 'builddir': './sandbox-linux-mips-test',
     }
     
     
     
     builders = [
                 sb_windows_compile_builder,
--- a/build/buildbot/master/tamarinredux.py
+++ b/build/buildbot/master/tamarinredux.py
@@ -230,17 +230,17 @@ class tamarinredux:
                 description='starting win release-sizereport build...',
                 descriptionDone='finished win release-sizereport build.',
                 name='Build_Release_sizereport',
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
 
     windows_compile_builder = {
                 'name': "windows-compile",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': windows_compile_factory,
                 'builddir': './windows-compile',
     }
 
 
 
 
     #######################################
@@ -249,17 +249,17 @@ class tamarinredux:
     windows_64_compile_factory = factory.BuildFactory()
     windows_64_compile_factory.addStep(sync_clean)
     windows_64_compile_factory.addStep(sync_clone(url=HG_URL))
     windows_64_compile_factory.addStep(sync_update)
     windows_64_compile_factory.addStep(bb_slaveupdate(slave="windows64"))
 
     windows_64_compile_builder = {
                 'name': "windows64-compile",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': windows_64_compile_factory,
                 'builddir': './windows64-compile',
     }
 
 
     ############################################
     #### builder for mac-intel-10_4-compile ####
     ############################################
@@ -279,17 +279,17 @@ class tamarinredux:
     mac_intel_104_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_104_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_104_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_104_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_104_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_104_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_104_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_104_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_104_compile_builder = {
                 'name': "mac-intel-10.4-compile",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': mac_intel_104_compile_factory,
                 'builddir': './mac-intel-10_4-compile',
     }
 
 
 
     ############################################
     #### builder for mac-intel-10_5-compile ####
@@ -310,17 +310,17 @@ class tamarinredux:
     mac_intel_105_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_ppc", args="--enable-shell --enable-debug --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_ppc", args="--enable-shell --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc-darwin --mac-sdk=104u", upload="false"))
     mac_intel_105_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_105_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_105_compile_builder = {
                 'name': "mac-intel-10.5-compile",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': mac_intel_105_compile_factory,
                 'builddir': './mac-intel-10_5-compile',
     }
 
 
     ##########################################
     #### builder for mac-intel-64-compile ####
     ##########################################
@@ -340,51 +340,51 @@ class tamarinredux:
     mac_intel_64_compile_factory.addStep(compile_generic(name="Debug_PPC", shellname="avmshell_d_64_ppc", args="--enable-shell --enable-debug --target=ppc64-darwin --mac-sdk=105", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger_PPC", shellname="avmshell_s_64_ppc", args="--enable-shell --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_generic(name="DebugDebugger_PPC", shellname="avmshell_sd_64_ppc", args="--enable-shell --enable-debug --enable-debugger --target=ppc64-darwin --mac-sdk=105", upload="false"))
     mac_intel_64_compile_factory.addStep(compile_buildcheck_local)
     mac_intel_64_compile_factory.addStep(util_upload_asteam_local)
 
     mac_intel_64_compile_builder = {
                 'name': "mac64-intel-compile",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': mac_intel_64_compile_factory,
                 'builddir': './mac64-intel-compile',
     }
 
 
     ############################################
     #### builder for mac-ppc-10_4a-compile ####
     ############################################
     mac_ppc_104a_compile_factory = factory.BuildFactory()
     mac_ppc_104a_compile_factory.addStep(sync_clean)
     mac_ppc_104a_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_104a_compile_factory.addStep(sync_update)
     mac_ppc_104a_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_4"))
 
     mac_ppc_104a_compile_builder = {
                 'name': "mac-ppc-10.4a-compile",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': mac_ppc_104a_compile_factory,
                 'builddir': './mac-ppc-10_4a-compile',
     }
 
 
     ###########################################
     #### builder for mac-ppc-10_4b-compile ####
     ###########################################
     mac_ppc_104b_compile_factory = factory.BuildFactory()
     mac_ppc_104b_compile_factory.addStep(sync_clean)
     mac_ppc_104b_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_104b_compile_factory.addStep(sync_update)
     mac_ppc_104b_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_4"))
 
     mac_ppc_104b_compile_builder = {
                 'name': "mac-ppc-10.4b-compile",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': mac_ppc_104b_compile_factory,
                 'builddir': './mac-ppc-10_4b-compile',
     }
 
 
 
     ###########################################
     #### builder for mac-ppc-10_5a-compile ####
@@ -392,67 +392,67 @@ class tamarinredux:
     mac_ppc_105a_compile_factory = factory.BuildFactory()
     mac_ppc_105a_compile_factory.addStep(sync_clean)
     mac_ppc_105a_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_105a_compile_factory.addStep(sync_update)
     mac_ppc_105a_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_5"))
 
     mac_ppc_105a_compile_builder = {
                 'name': "mac-ppc-10.5a-compile",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': mac_ppc_105a_compile_factory,
                 'builddir': './mac-ppc-10_5a-compile',
     }
 
     ###########################################
     #### builder for mac-ppc-10_5b-compile ####
     ###########################################
     mac_ppc_105b_compile_factory = factory.BuildFactory()
     mac_ppc_105b_compile_factory.addStep(sync_clean)
     mac_ppc_105b_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_105b_compile_factory.addStep(sync_update)
     mac_ppc_105b_compile_factory.addStep(bb_slaveupdate(slave="mac-ppc-10_5"))
 
     mac_ppc_105b_compile_builder = {
                 'name': "mac-ppc-10.5b-compile",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': mac_ppc_105b_compile_factory,
                 'builddir': './mac-ppc-10_5b-compile',
     }
 
 
     ########################################
     #### builder for mac-ppc-64-compile ####
     ########################################
     mac_ppc_64_compile_factory = factory.BuildFactory()
     mac_ppc_64_compile_factory.addStep(sync_clean)
     mac_ppc_64_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_64_compile_factory.addStep(sync_update)
     mac_ppc_64_compile_factory.addStep(bb_slaveupdate(slave="mac64-ppc"))
 
     mac_ppc_64_compile_builder = {
                 'name': "mac64-ppc-compile",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': mac_ppc_64_compile_factory,
                 'builddir': './mac64-ppc-compile',
     }
 
 
     #########################################
     #### builder for mac-ppc-64b-compile ####
     #########################################
     mac_ppc_64b_compile_factory = factory.BuildFactory()
     mac_ppc_64b_compile_factory.addStep(sync_clean)
     mac_ppc_64b_compile_factory.addStep(sync_clone(url=HG_URL))
     mac_ppc_64b_compile_factory.addStep(sync_update)
     mac_ppc_64b_compile_factory.addStep(bb_slaveupdate(slave="mac64-ppc"))
 
     mac_ppc_64b_compile_builder = {
                 'name': "mac64b-ppc-compile",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': mac_ppc_64b_compile_factory,
                 'builddir': './mac64b-ppc-compile',
     }
 
 
 
     ###################################
     #### builder for linux-compile ####
@@ -496,17 +496,17 @@ class tamarinredux:
                 name="Debug_arm-linux",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     linux_compile_factory.addStep(compile_buildcheck_local)
     linux_compile_factory.addStep(util_upload_asteam_local)
 
     linux_compile_builder = {
                 'name': "linux-compile",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': linux_compile_factory,
                 'builddir': './linux-compile',
     }
 
 
     #####################################
     #### builder for linux64-compile ####
     #####################################
@@ -522,17 +522,17 @@ class tamarinredux:
     linux_64_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s_64", args="--enable-shell --enable-debugger", upload="false"))
     linux_64_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd_64", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
     linux_64_compile_factory.addStep(compile_testmedia)
     linux_64_compile_factory.addStep(compile_buildcheck_local)
     linux_64_compile_factory.addStep(util_upload_asteam_local)
 
     linux_64_compile_builder = {
                 'name': "linux64-compile",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': linux_64_compile_factory,
                 'builddir': './linux64-compile',
     }
 
 
 
     ################################################
     #### builder for winmobile-emulator-compile ####
@@ -611,17 +611,17 @@ class tamarinredux:
                 description='starting to run sizereport...',
                 descriptionDone='finished sizereport.',
                 name="Build_Release_sizereport",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
 
     winmobile_emulator_compile_builder = {
                 'name': "winmobile-emulator-compile",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': winmobile_emulator_compile_factory,
                 'builddir': './winmobile-emulator-compile',
     }
 
 
     ###########################################
     #### builder for solaris-sparc-compile ####
     ###########################################
@@ -636,34 +636,34 @@ class tamarinredux:
     solaris_sparc_compile_factory.addStep(compile_generic(name="Debug", shellname="avmshell_d", args="--enable-shell --enable-debug", upload="false"))
     solaris_sparc_compile_factory.addStep(compile_generic(name="ReleaseDebugger", shellname="avmshell_s", args="--enable-shell --enable-debugger", upload="false"))
     solaris_sparc_compile_factory.addStep(compile_generic(name="DebugDebugger", shellname="avmshell_sd", args="--enable-shell --enable-debug --enable-debugger", upload="false"))
     solaris_sparc_compile_factory.addStep(compile_buildcheck_local)
     solaris_sparc_compile_factory.addStep(util_upload_asteam)
 
     solaris_sparc_compile_builder = {
                 'name': "solaris-sparc-compile",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': solaris_sparc_compile_factory,
                 'builddir': './solaris-sparc-compile',
     }
     
     
     ############################################
     #### builder for solaris-sparc2-compile ####
     ############################################
     solaris_sparc2_compile_factory = factory.BuildFactory()
     solaris_sparc2_compile_factory.addStep(sync_clean)
     solaris_sparc2_compile_factory.addStep(sync_clone(url=HG_URL))
     solaris_sparc2_compile_factory.addStep(sync_update)
     solaris_sparc2_compile_factory.addStep(bb_slaveupdate(slave="solaris-sparc"))
     
     solaris_sparc2_compile_builder = {
                 'name': "solaris-sparc2-compile",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': solaris_sparc2_compile_factory,
                 'builddir': './solaris-sparc2-compile',
     }
 
     ###########################################
     #### builder for android on mac        ####
     ###########################################
 
@@ -707,50 +707,50 @@ class tamarinredux:
                 descriptionDone='finished upload to asteam.',
                 name="Upload_ASTEAM",
                 workdir="../repo/build/buildbot/slaves/scripts",
                 timeout=3600)
     )
 
     android_compile_builder = {
                 'name': "android-compile",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': android_compile_factory,
                 'builddir': './android-compile',
     }
     
     ###############################
     #### builder for linux-arm ####
     ###############################
     linux_arm_compile_factory = factory.BuildFactory()
     linux_arm_compile_factory.addStep(sync_clean)
     linux_arm_compile_factory.addStep(sync_clone(url=HG_URL))
     linux_arm_compile_factory.addStep(sync_update)
     linux_arm_compile_factory.addStep(bb_slaveupdate(slave="linux-arm"))
 
     linux_arm_compile_builder = {
                 'name': "linux-arm-compile",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': linux_arm_compile_factory,
                 'builddir': './linux-arm-compile',
     }
     
     
     ################################
     #### builder for linux-arm2 ####
     ################################
     linux_arm2_compile_factory = factory.BuildFactory()
     linux_arm2_compile_factory.addStep(sync_clean)
     linux_arm2_compile_factory.addStep(sync_clone(url=HG_URL))
     linux_arm2_compile_factory.addStep(sync_update)
     linux_arm2_compile_factory.addStep(bb_slaveupdate(slave="linux-arm"))
 
     linux_arm2_compile_builder = {
                 'name': "linux-arm2-compile",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': linux_arm2_compile_factory,
                 'builddir': './linux-arm2-compile',
     }
     
     
     ################################
     #### builder for linux-mips ####
     ################################
@@ -788,17 +788,17 @@ class tamarinredux:
                 name="Debug_mips-linux",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     linux_mips_compile_factory.addStep(compile_buildcheck_local)
     linux_mips_compile_factory.addStep(util_upload_asteam_local)
     
     linux_mips_compile_builder = {
                 'name': "linux-mips-compile",
-                'slavename': "asteamlin1-mips",
+                'slavename': "linux-mips",
                 'factory': linux_mips_compile_factory,
                 'builddir': './linux-mips-compile',
     }
 
     
 
     ################################################################################
     ################################################################################
@@ -816,270 +816,270 @@ class tamarinredux:
     ###################################
     windows_smoke_factory = factory.BuildFactory()
     windows_smoke_factory.addStep(download_testmedia)
     windows_smoke_factory.addStep(test_smoke)
     windows_smoke_factory.addStep(util_process_clean)
 
     windows_smoke_builder = {
                 'name': "windows-smoke",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': windows_smoke_factory,
                 'builddir': './windows-smoke',
     }
 
 
     #####################################
     #### builder for windows64-smoke ####
     #####################################
     windows_64_smoke_factory = factory.BuildFactory()
     windows_64_smoke_factory.addStep(download_testmedia)
     windows_64_smoke_factory.addStep(test_smoke)
     windows_64_smoke_factory.addStep(util_process_clean)
 
     windows_64_smoke_builder = {
                 'name': "windows64-smoke",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': windows_64_smoke_factory,
                 'builddir': './windows64-smoke',
     }
 
 
     ##########################################
     #### builder for mac-intel-10_4-smoke ####
     ##########################################
     mac_intel_104_smoke_factory = factory.BuildFactory()
     mac_intel_104_smoke_factory.addStep(download_testmedia)
     mac_intel_104_smoke_factory.addStep(test_smoke)
     mac_intel_104_smoke_factory.addStep(util_process_clean)
 
     mac_intel_104_smoke_builder = {
                 'name': "mac-intel-10.4-smoke",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': mac_intel_104_smoke_factory,
                 'builddir': './mac-intel-10_4-smoke',
     }
 
 
     ##########################################
     #### builder for mac-intel-10_5-smoke ####
     ##########################################
     mac_intel_105_smoke_factory = factory.BuildFactory()
     mac_intel_105_smoke_factory.addStep(download_testmedia)
     mac_intel_105_smoke_factory.addStep(test_smoke)
     mac_intel_105_smoke_factory.addStep(util_process_clean)
 
     mac_intel_105_smoke_builder = {
                 'name': "mac-intel-10.5-smoke",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': mac_intel_105_smoke_factory,
                 'builddir': './mac-intel-10_5-smoke',
     }
 
 
     #######################################
     #### builder for mac64-intel-smoke ####
     #######################################
     mac_intel_64_smoke_factory = factory.BuildFactory()
     mac_intel_64_smoke_factory.addStep(download_testmedia)
     mac_intel_64_smoke_factory.addStep(test_smoke)
     mac_intel_64_smoke_factory.addStep(util_process_clean)
 
     mac_intel_64_smoke_builder = {
                 'name': "mac64-intel-smoke",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': mac_intel_64_smoke_factory,
                 'builddir': './mac64-intel-smoke',
     }
 
     #########################################
     #### builder for mac-ppc-10_4a-smoke ####
     #########################################
     mac_ppc_104a_smoke_factory = factory.BuildFactory()
     mac_ppc_104a_smoke_factory.addStep(download_testmedia)
     mac_ppc_104a_smoke_factory.addStep(test_smoke)
     mac_ppc_104a_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_104a_smoke_builder = {
                 'name': "mac-ppc-10.4a-smoke",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': mac_ppc_104a_smoke_factory,
                 'builddir': './mac-ppc-10_4a-smoke',
     }
 
 
     #########################################
     #### builder for mac-ppc-10_4b-smoke ####
     #########################################
     mac_ppc_104b_smoke_factory = factory.BuildFactory()
     mac_ppc_104b_smoke_factory.addStep(download_testmedia)
     mac_ppc_104b_smoke_factory.addStep(test_smoke)
     mac_ppc_104b_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_104b_smoke_builder = {
                 'name': "mac-ppc-10.4b-smoke",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': mac_ppc_104b_smoke_factory,
                 'builddir': './mac-ppc-10_4b-smoke',
     }
 
 
     #########################################
     #### builder for mac-ppc-10_5a-smoke ####
     #########################################
     mac_ppc_105a_smoke_factory = factory.BuildFactory()
     mac_ppc_105a_smoke_factory.addStep(download_testmedia)
     mac_ppc_105a_smoke_factory.addStep(test_smoke)
     mac_ppc_105a_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_105a_smoke_builder = {
                 'name': "mac-ppc-10.5a-smoke",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': mac_ppc_105a_smoke_factory,
                 'builddir': './mac-ppc-10_5a-smoke',
     }
 
     #########################################
     #### builder for mac-ppc-10_5b-smoke ####
     #########################################
     mac_ppc_105b_smoke_factory = factory.BuildFactory()
     mac_ppc_105b_smoke_factory.addStep(download_testmedia)
     mac_ppc_105b_smoke_factory.addStep(test_smoke)
     mac_ppc_105b_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_105b_smoke_builder = {
                 'name': "mac-ppc-10.5b-smoke",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': mac_ppc_105b_smoke_factory,
                 'builddir': './mac-ppc-10_5b-smoke',
     }
 
 
     #####################################
     #### builder for mac64-ppc-smoke ####
     #####################################
     mac_ppc_64_smoke_factory = factory.BuildFactory()
     mac_ppc_64_smoke_factory.addStep(download_testmedia)
     mac_ppc_64_smoke_factory.addStep(test_smoke)
     mac_ppc_64_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_64_smoke_builder = {
                 'name': "mac64-ppc-smoke",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': mac_ppc_64_smoke_factory,
                 'builddir': './mac64-ppc-smoke',
     }
 
 
     ######################################
     #### builder for mac64b-ppc-smoke ####
     ######################################
     mac_ppc_64b_smoke_factory = factory.BuildFactory()
     mac_ppc_64b_smoke_factory.addStep(download_testmedia)
     mac_ppc_64b_smoke_factory.addStep(test_smoke)
     mac_ppc_64b_smoke_factory.addStep(util_process_clean)
 
     mac_ppc_64b_smoke_builder = {
                 'name': "mac64b-ppc-smoke",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': mac_ppc_64b_smoke_factory,
                 'builddir': './mac64b-ppc-smoke',
     }
 
 
     #################################
     #### builder for linux-smoke ####
     #################################
     linux_smoke_factory = factory.BuildFactory()
     linux_smoke_factory.addStep(download_testmedia)
     linux_smoke_factory.addStep(test_smoke)
     linux_smoke_factory.addStep(util_process_clean)
 
     linux_smoke_builder = {
                 'name': "linux-smoke",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': linux_smoke_factory,
                 'builddir': './linux-smoke',
     }
 
 
     ###################################
     #### builder for linux64-smoke ####
     ###################################
     linux_64_smoke_factory = factory.BuildFactory()
     linux_64_smoke_factory.addStep(download_testmedia)
     linux_64_smoke_factory.addStep(test_smoke)
     linux_64_smoke_factory.addStep(util_process_clean)
 
     linux_64_smoke_builder = {
                 'name': "linux64-smoke",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': linux_64_smoke_factory,
                 'builddir': './linux64-smoke',
     }
 
 
     ##############################################
     #### builder for winmobile-emulator-smoke ####
     ##############################################
     winmobile_emulator_smoke_factory = factory.BuildFactory()
     winmobile_emulator_smoke_factory.addStep(download_testmedia)
     winmobile_emulator_smoke_factory.addStep(test_emulator_smoke_mobile)
     winmobile_emulator_smoke_factory.addStep(util_process_clean)
 
     winmobile_emulator_smoke_builder = {
                 'name': "winmobile-emulator-smoke",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': winmobile_emulator_smoke_factory,
                 'builddir': './winmobile-emulator-smoke',
     }
 
 
     #########################################
     #### builder for solaris-sparc-smoke ####
     #########################################
     solaris_sparc_smoke_factory = factory.BuildFactory()
     solaris_sparc_smoke_factory.addStep(download_testmedia)
     solaris_sparc_smoke_factory.addStep(test_smoke)
     solaris_sparc_smoke_factory.addStep(util_process_clean)
 
     solaris_sparc_smoke_builder = {
                 'name': "solaris-sparc-smoke",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': solaris_sparc_smoke_factory,
                 'builddir': './solaris-sparc-smoke',
     }
     
     
     ##########################################
     #### builder for solaris-sparc2-smoke ####
     ##########################################
     solaris_sparc2_smoke_factory = factory.BuildFactory()
     solaris_sparc2_smoke_factory.addStep(download_testmedia)
     solaris_sparc2_smoke_factory.addStep(test_smoke)
     solaris_sparc2_smoke_factory.addStep(util_process_clean)
 
     solaris_sparc2_smoke_builder = {
                 'name': "solaris-sparc2-smoke",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': solaris_sparc2_smoke_factory,
                 'builddir': './solaris-sparc2-smoke',
     }
 
     #########################################
     #### builder for android-smoke       ####
     #########################################
     android_smoke_factory = factory.BuildFactory()
     android_smoke_factory.addStep(download_testmedia)
     android_smoke_factory.addStep(test_smoke_local)
     android_smoke_factory.addStep(util_process_clean)
 
     android_smoke_builder = {
                 'name': "android-smoke",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': android_smoke_factory,
                 'builddir': './android-smoke',
     }
 
     ###########################################
     #### builder for linxu-arm-smoke       ####
     ###########################################
     linux_arm_smoke_factory = factory.BuildFactory()
@@ -1091,17 +1091,17 @@ class tamarinredux:
                 descriptionDone='finished smoke tests.',
                 name="SmokeTest",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     linux_arm_smoke_factory.addStep(util_process_clean)
 
     linux_arm_smoke_builder = {
                 'name': "linux-arm-smoke",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': linux_arm_smoke_factory,
                 'builddir': './linux-arm-smoke',
     }
     
     
     ###########################################
     #### builder for linxu-arm2smoke      ####
     ###########################################
@@ -1114,33 +1114,33 @@ class tamarinredux:
                 descriptionDone='finished smoke tests.',
                 name="SmokeTest",
                 workdir="../repo/build/buildbot/slaves/scripts")
     )
     linux_arm2_smoke_factory.addStep(util_process_clean)
 
     linux_arm2_smoke_builder = {
                 'name': "linux-arm2-smoke",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': linux_arm2_smoke_factory,
                 'builddir': './linux-arm2-smoke',
     }
     
     
     #########################################
     #### builder for linux-mips-smoke    ####
     #########################################
     linux_mips_smoke_factory = factory.BuildFactory()
     linux_mips_smoke_factory.addStep(download_testmedia)
     linux_mips_smoke_factory.addStep(test_smoke_local)
     linux_mips_smoke_factory.addStep(util_process_clean)
 
     linux_mips_smoke_builder = {
                 'name': "linux-mips-smoke",
-                'slavename': "asteamlin1-mips",
+                'slavename': "linux-mips",
                 'factory': linux_mips_smoke_factory,
                 'builddir': './linux-mips-smoke',
     }
 
 
     ################################################################################
     ################################################################################
     ####                                                                        ####
@@ -1166,17 +1166,17 @@ class tamarinredux:
     windows_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     windows_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     windows_test_factory.addStep(test_differential)
     windows_test_factory.addStep(util_process_clean)
     windows_test_factory.addStep(util_clean_buildsdir)
     
     windows_test_builder = {
                 'name': "windows-test",
-                'slavename': "asteamwin2",
+                'slavename': "windows",
                 'factory': windows_test_factory,
                 'builddir': './windows-test',
     }
 
 
     ####################################
     #### builder for windows64-test ####
     ####################################
@@ -1190,17 +1190,17 @@ class tamarinredux:
     windows_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     windows_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     windows_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     windows_64_test_factory.addStep(util_process_clean)
     windows_64_test_factory.addStep(util_clean_buildsdir)
 
     windows_64_test_builder = {
                 'name': "windows64-test",
-                'slavename': "asteamwin3",
+                'slavename': "windows64",
                 'factory': windows_64_test_factory,
                 'builddir': './windows64-test',
     }
 
 
     #########################################
     #### builder for mac-intel-10_4-test ####
     #########################################
@@ -1215,17 +1215,17 @@ class tamarinredux:
     mac_intel_104_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_104", vmargs="", config="", scriptargs=""))
     mac_intel_104_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_104", vmargs="", config="", scriptargs=""))
     mac_intel_104_test_factory.addStep(test_differential)
     mac_intel_104_test_factory.addStep(util_process_clean)
     mac_intel_104_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_104_test_builder = {
                 'name': "mac-intel-10.4-test",
-                'slavename': "asteammac4",
+                'slavename': "mac-intel-10_4",
                 'factory': mac_intel_104_test_factory,
                 'builddir': './mac-intel-10_4-test',
     }
 
 
     #########################################
     #### builder for mac-intel-10_5-test ####
     #########################################
@@ -1240,17 +1240,17 @@ class tamarinredux:
     mac_intel_105_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     mac_intel_105_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     mac_intel_105_test_factory.addStep(test_differential)
     mac_intel_105_test_factory.addStep(util_process_clean)
     mac_intel_105_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_105_test_builder = {
                 'name': "mac-intel-10.5-test",
-                'slavename': "asteammac12-10_5",
+                'slavename': "mac-intel-10_5",
                 'factory': mac_intel_105_test_factory,
                 'builddir': './mac-intel-10_5-test',
     }
 
 
     ######################################
     #### builder for mac64-intel-test ####
     ######################################
@@ -1264,17 +1264,17 @@ class tamarinredux:
     mac_intel_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     mac_intel_64_test_factory.addStep(util_process_clean)
     mac_intel_64_test_factory.addStep(util_clean_buildsdir)
 
     mac_intel_64_test_builder = {
                 'name': "mac64-intel-test",
-                'slavename': "asteammac12-64bit",
+                'slavename': "mac64-intel",
                 'factory': mac_intel_64_test_factory,
                 'builddir': './mac64-intel-test',
     }
 
     ########################################
     #### builder for mac-ppc-10_4a-test ####
     ########################################
     mac_ppc_104a_test_factory = factory.BuildFactory()
@@ -1285,34 +1285,34 @@ class tamarinredux:
     mac_ppc_104a_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_104_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     mac_ppc_104a_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_104_ppc", vmargs="-Ojit", config="", scriptargs=""))
     mac_ppc_104a_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_104_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_104a_test_factory.addStep(util_process_clean)
     mac_ppc_104a_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_104a_test_builder = {
                 'name': "mac-ppc-10.4a-test",
-                'slavename': "asteammac6",
+                'slavename': "mac-ppc-10_4a",
                 'factory': mac_ppc_104a_test_factory,
                 'builddir': './mac-ppc-10_4a-test',
     }
 
 
     ########################################
     #### builder for mac-ppc-10_4b-test ####
     ########################################
     mac_ppc_104b_test_factory = factory.BuildFactory()
     mac_ppc_104b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_104_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_104b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_104_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_104b_test_factory.addStep(util_process_clean)
     mac_ppc_104b_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_104b_test_builder = {
                 'name': "mac-ppc-10.4b-test",
-                'slavename': "asteammac17",
+                'slavename': "mac-ppc-10_4b",
                 'factory': mac_ppc_104b_test_factory,
                 'builddir': './mac-ppc-10_4b-test',
     }
 
 
     ########################################
     #### builder for mac-ppc-10_5a-test ####
     ########################################
@@ -1324,34 +1324,34 @@ class tamarinredux:
     mac_ppc_105a_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     mac_ppc_105a_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_ppc", vmargs="-Ojit", config="", scriptargs=""))
     mac_ppc_105a_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_105a_test_factory.addStep(util_process_clean)
     mac_ppc_105a_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_105a_test_builder = {
                 'name': "mac-ppc-10.5a-test",
-                'slavename': "tamarin-xserve",
+                'slavename': "mac-ppc-10_5a",
                 'factory': mac_ppc_105a_test_factory,
                 'builddir': './mac-ppc-10_5a-test',
     }
 
 
     ########################################
     #### builder for mac-ppc-10_5b-test ####
     ########################################
     mac_ppc_105b_test_factory = factory.BuildFactory()
     mac_ppc_105b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_105b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_105b_test_factory.addStep(util_process_clean)
     mac_ppc_105b_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_105b_test_builder = {
                 'name': "mac-ppc-10.5b-test",
-                'slavename': "tamarin-xserve2",
+                'slavename': "mac-ppc-10_5b",
                 'factory': mac_ppc_105b_test_factory,
                 'builddir': './mac-ppc-10_5b-test',
     }
 
 
     ####################################
     #### builder for mac64-ppc-test ####
     ####################################
@@ -1362,17 +1362,17 @@ class tamarinredux:
     mac_ppc_64_test_factory.addStep(test_generic(name="Release-interp", shellname="avmshell_64_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     mac_ppc_64_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell_64_ppc", vmargs="-Ojit", config="", scriptargs=""))
     mac_ppc_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_64_test_factory.addStep(util_process_clean)
     mac_ppc_64_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_64_test_builder = {
                 'name': "mac64-ppc-test",
-                'slavename': "asteammac5-64bit",
+                'slavename': "mac64a-ppc",
                 'factory': mac_ppc_64_test_factory,
                 'builddir': './mac64-ppc-test',
     }
 
 
     #####################################
     #### builder for mac64b-ppc-test ####
     #####################################
@@ -1380,17 +1380,17 @@ class tamarinredux:
     mac_ppc_64b_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_64_ppc", vmargs="-Dinterp", config="", scriptargs=""))
     mac_ppc_64b_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_64b_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_64b_test_factory.addStep(util_process_clean)
     mac_ppc_64b_test_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_64b_test_builder = {
                 'name': "mac64b-ppc-test",
-                'slavename': "asteammac15",
+                'slavename': "mac64b-ppc",
                 'factory': mac_ppc_64b_test_factory,
                 'builddir': './mac64b-ppc-test',
     }
 
 
     ################################
     #### builder for linux-test ####
     ################################
@@ -1405,17 +1405,17 @@ class tamarinredux:
     linux_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     linux_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     linux_test_factory.addStep(test_differential)
     linux_test_factory.addStep(util_process_clean)
     linux_test_factory.addStep(util_clean_buildsdir)
 
     linux_test_builder = {
                 'name': "linux-test",
-                'slavename': "asteamlin1",
+                'slavename': "linux",
                 'factory': linux_test_factory,
                 'builddir': './linux-test',
     }
 
 
     ##################################
     #### builder for linux64-test ####
     ##################################
@@ -1429,17 +1429,17 @@ class tamarinredux:
     linux_64_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s_64", vmargs="", config="", scriptargs=""))
     linux_64_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d_64", vmargs="", config="", scriptargs=""))
     linux_64_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd_64", vmargs="", config="", scriptargs=""))
     linux_64_test_factory.addStep(util_process_clean)
     linux_64_test_factory.addStep(util_clean_buildsdir)
 
     linux_64_test_builder = {
                 'name': "linux64-test",
-                'slavename': "asteamlin5",
+                'slavename': "linux64",
                 'factory': linux_64_test_factory,
                 'builddir': './linux64-test',
     }
 
 
     #############################################
     #### builder for winmobile-emulator-test ####
     #############################################
@@ -1448,17 +1448,17 @@ class tamarinredux:
     winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-interp", shellname="avmshell_arm", vmargs="-Dinterp", config="", scriptargs=""))
     winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_arm", vmargs="-Dinterp", config="", scriptargs=""))
     winmobile_emulator_test_factory.addStep(test_emulator_generic(name="Release-jit", shellname="avmshell_arm", vmargs="-Ojit", config="", scriptargs=""))
     winmobile_emulator_test_factory.addStep(util_process_clean)
     winmobile_emulator_test_factory.addStep(util_clean_buildsdir)
 
     winmobile_emulator_test_builder = {
                 'name': "winmobile-emulator-test",
-                'slavename': "asteamwin19",
+                'slavename': "winmobile-emulator",
                 'factory': winmobile_emulator_test_factory,
                 'builddir': './winmobile-emulator-test',
     }
 
 
     ########################################
     #### builder for solaris-sparc-test ####
     ########################################
@@ -1467,17 +1467,17 @@ class tamarinredux:
     solaris_sparc_test_factory.addStep(test_selftest(name="Release", shellname="avmshell"))
     solaris_sparc_test_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     solaris_sparc_test_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     solaris_sparc_test_factory.addStep(util_process_clean)
     solaris_sparc_test_factory.addStep(util_clean_buildsdir)
 
     solaris_sparc_test_builder = {
                 'name': "solaris-sparc-test",
-                'slavename': "asteamsol4",
+                'slavename': "solaris-sparc",
                 'factory': solaris_sparc_test_factory,
                 'builddir': './solaris-sparc-test',
     }
     
     
     #########################################
     #### builder for solaris-sparc2-test ####
     #########################################
@@ -1487,17 +1487,17 @@ class tamarinredux:
     solaris_sparc2_test_factory.addStep(test_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode", vmargs="-Dinterp", config="", scriptargs=""))
     solaris_sparc2_test_factory.addStep(test_generic(name="Release-jit", shellname="avmshell", vmargs="-Ojit", config="", scriptargs=""))
     solaris_sparc2_test_factory.addStep(test_generic(name="ReleaseDebugger", shellname="avmshell_s", vmargs="", config="", scriptargs=""))
     solaris_sparc2_test_factory.addStep(util_process_clean)
     solaris_sparc2_test_factory.addStep(util_clean_buildsdir)
 
     solaris_sparc2_test_builder = {
                 'name': "solaris-sparc2-test",
-                'slavename': "asteamsol3",
+                'slavename': "solaris-sparc2",
                 'factory': solaris_sparc2_test_factory,
                 'builddir': './solaris-sparc2-test',
     }
 
     ########################################
     #### builder for android-test       ####
     ########################################
     android_test_factory = factory.BuildFactory()
@@ -1505,17 +1505,17 @@ class tamarinredux:
     android_test_factory.addStep(test_generic_adb(name="Release-interp", shellname="avmshell", vmargs="-Dinterp", config="", scriptargs=""))
     android_test_factory.addStep(test_generic_adb(name="Release-jit", shellname="avmshell", vmargs="-Ojit", config="", scriptargs=""))
     android_test_factory.addStep(test_generic_adb(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     android_test_factory.addStep(util_process_clean)
     android_test_factory.addStep(util_clean_buildsdir)
 
     android_test_builder = {
                 'name': "android-test",
-                'slavename': "asteammac12",
+                'slavename': "android",
                 'factory': android_test_factory,
                 'builddir': './android-test',
     }
     
     
     ##########################################
     #### builder for linux-arm-test       ####
     ##########################################
@@ -1523,49 +1523,49 @@ class tamarinredux:
     linux_arm_test_factory.addStep(test_selftest(name="Release", shellname="avmshell_neon_arm"))
     linux_arm_test_factory.addStep(test_generic(name="Release-vfp", shellname="avmshell_neon_arm", vmargs="-Darm_arch 7 -Darm_vfp", config="", scriptargs=""))
     linux_arm_test_factory.addStep(test_generic(name="Release-jit-vfp", shellname="avmshell_neon_arm", vmargs="-Darm_arch 7 -Darm_vfp -Ojit", config="", scriptargs=""))
     linux_arm_test_factory.addStep(util_process_clean)
     linux_arm_test_factory.addStep(util_clean_buildsdir)
 
     linux_arm_test_builder = {
                 'name': "linux-arm-test",
-                'slavename': "asteambeagleboard2",
+                'slavename': "linux-arm",
                 'factory': linux_arm_test_factory,
                 'builddir': './linux-arm-test',
     }
     
     
     ##########################################
     #### builder for linux-arm2-test      ####
     ##########################################
     linux_arm2_test_factory = factory.BuildFactory()
     linux_arm2_test_factory.addStep(test_generic(name="Release-softfloat", shellname="avmshell_neon_arm", vmargs="", config="", scriptargs=""))
     linux_arm2_test_factory.addStep(test_generic(name="Release-interp", shellname="avmshell_neon_arm", vmargs="-Dinterp", config="", scriptargs=""))
     linux_arm2_test_factory.addStep(util_process_clean)
     linux_arm2_test_factory.addStep(util_clean_buildsdir)
 
     linux_arm2_test_builder = {
                 'name': "linux-arm2-test",
-                'slavename': "asteambeagle4",
+                'slavename': "linux-arm2",
                 'factory': linux_arm2_test_factory,
                 'builddir': './linux-arm2-test',
     }
     
     
     ##########################################
     #### builder for linux-mips-test      ####
     ##########################################
     linux_mips_test_factory = factory.BuildFactory()
     linux_mips_test_factory.addStep(util_process_clean)
     linux_mips_test_factory.addStep(util_clean_buildsdir)
 
     linux_mips_test_builder = {
                 'name': "linux-mips-test",
-                'slavename': "asteamlin1-mips",
+                'slavename': "linux-mips",
                 'factory': linux_mips_test_factory,
                 'builddir': './linux-mips-test',
     }
 
 
     ################################################################################
     ################################################################################
     ####                                                                        ####
@@ -1589,17 +1589,17 @@ class tamarinredux:
     windows_performance_factory.addStep(perf_release_interp)
     windows_performance_factory.addStep(perf_release_jit)
     windows_performance_factory.addStep(util_process_clean)
     windows_performance_factory.addStep(util_clean_buildsdir)
     windows_performance_factory.addStep(bb_lockrelease)
 
     windows_performance_builder = {
                 'name': "windows-performance",
-                'slavename': "asteamwin1",
+                'slavename': "windows-performance",
                 'factory': windows_performance_factory,
                 'builddir': './windows-performance',
     }
 
 
     #####################################
     #### builder for mac-performance ####
     #####################################
@@ -1614,17 +1614,17 @@ class tamarinredux:
     mac_performance_factory.addStep(perf_release_interp)
     mac_performance_factory.addStep(perf_release_jit)
     mac_performance_factory.addStep(util_process_clean)
     mac_performance_factory.addStep(util_clean_buildsdir)    
     mac_performance_factory.addStep(bb_lockrelease)
 
     mac_performance_builder = {
                 'name': "mac-performance",
-                'slavename': "asteammac2",
+                'slavename': "mac-performance",
                 'factory': mac_performance_factory,
                 'builddir': './mac-performance',
     }
 
 
     #######################################
     #### builder for mac64-performance ####
     #######################################
@@ -1639,17 +1639,17 @@ class tamarinredux:
     mac_64_performance_factory.addStep(perf_release_interp)
     mac_64_performance_factory.addStep(perf_release_jit)
     mac_64_performance_factory.addStep(util_process_clean)
     mac_64_performance_factory.addStep(util_clean_buildsdir)
     mac_64_performance_factory.addStep(bb_lockrelease)
 
     mac_64_performance_builder = {
                 'name': "mac64-performance",
-                'slavename': "asteammac7",
+                'slavename': "mac64-performance",
                 'factory': mac_64_performance_factory,
                 'builddir': './mac64-performance',
     }
 
 
     #########################################
     #### builder for mac-ppc-performance ####
     #########################################
@@ -1664,17 +1664,17 @@ class tamarinredux:
     mac_ppc_performance_factory.addStep(perf_release_interp)
     mac_ppc_performance_factory.addStep(perf_release_jit)
     mac_ppc_performance_factory.addStep(util_process_clean)
     mac_ppc_performance_factory.addStep(util_clean_buildsdir)
     mac_ppc_performance_factory.addStep(bb_lockrelease)
 
     mac_ppc_performance_builder = {
                 'name': "mac-ppc-performance",
-                'slavename': "asteammac3",
+                'slavename': "mac-ppc-performance",
                 'factory': mac_ppc_performance_factory,
                 'builddir': './mac-ppc-performance',
     }
 
 
     #######################################
     #### builder for linux-performance ####
     #######################################
@@ -1689,17 +1689,17 @@ class tamarinredux:
     linux_performance_factory.addStep(perf_release_interp)
     linux_performance_factory.addStep(perf_release_jit)
     linux_performance_factory.addStep(util_process_clean)
     linux_performance_factory.addStep(util_clean_buildsdir)
     linux_performance_factory.addStep(bb_lockrelease)
 
     linux_performance_builder = {
                 'name': "linux-performance",
-                'slavename': "asteamlin4",
+                'slavename': "linux-performance",
                 'factory': linux_performance_factory,
                 'builddir': './linux-performance',
     }
 
 
     ###########################################
     #### builder for android-performance ######
     ###########################################
@@ -1735,17 +1735,17 @@ class tamarinredux:
                 name="ReleaseJIT",
                 workdir="../repo/build/buildbot/slaves/scripts",
                 timeout=3600)
     )
     android_performance_factory.addStep(util_clean_buildsdir)
 
     android_performance_builder = {
                 'name': "android-performance",
-                'slavename': "asteammac1-android",
+                'slavename': "android-performance",
                 'factory': android_performance_factory,
                 'builddir': './android-performance',
     }
 
     ###########################################
     #### builder for winmobile-performance ####
     ###########################################
     winmobile_performance_factory = factory.BuildFactory()
@@ -1758,17 +1758,17 @@ class tamarinredux:
     winmobile_performance_factory.addStep(perf_release_arm)
     winmobile_performance_factory.addStep(perf_release_arm_interp)
     winmobile_performance_factory.addStep(perf_release_arm_jit)
     winmobile_performance_factory.addStep(util_clean_buildsdir)
     winmobile_performance_factory.addStep(bb_lockrelease)
 
     winmobile_performance_builder = {
                 'name': "winmobile-performance",
-                'slavename': "asteamwin5",
+                'slavename': "winmobile-performance",
                 'factory': winmobile_performance_factory,
                 'builddir': './winmobile-performance',
     }
 
     ################################################################################
     ################################################################################
     ####                                                                        ####
     ####                       DEEP TEST BUILDERS                               ####
@@ -1796,17 +1796,17 @@ class tamarinredux:
     windows_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     windows_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     windows_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     windows_deep_factory.addStep(util_process_clean)
     windows_deep_factory.addStep(util_clean_buildsdir)
 
     windows_deep_builder = {
                 'name': "windows-deep",
-                'slavename': "asteamwin10",
+                'slavename': "windows-deep",
                 'factory': windows_deep_factory,
                 'builddir': './windows-deep',
     }
 
     ##################################
     #### builder for mac-deep ####
     ##################################
     mac_deep_factory = factory.BuildFactory()
@@ -1841,17 +1841,17 @@ class tamarinredux:
                      timeout=3600)
     )
     mac_deep_factory.addStep(deep_codecoverage)
     mac_deep_factory.addStep(util_process_clean)
     mac_deep_factory.addStep(util_clean_buildsdir)
 
     mac_deep_builder = {
                 'name': "mac-deep",
-                'slavename': "asteammac1",
+                'slavename': "mac-deep",
                 'factory': mac_deep_factory,
                 'builddir': './mac-deep',
     }
 
     ##################################
     #### builder for windows-p3-deep ####
     ##################################
     windows_p3_deep_factory = factory.BuildFactory()
@@ -1874,17 +1874,17 @@ class tamarinredux:
     windows_p3_deep_factory.addStep(test_generic(name="Debug", shellname="avmshell_d", vmargs="", config="", scriptargs=""))
     windows_p3_deep_factory.addStep(test_generic(name="DebugDebugger", shellname="avmshell_sd", vmargs="", config="", scriptargs=""))
     #windows_p3_deep_factory.addStep(test_differential)
     windows_p3_deep_factory.addStep(util_process_clean)
     windows_p3_deep_factory.addStep(util_clean_buildsdir)
 
     windows_p3_deep_builder = {
                 'name': "windows-p3-deep",
-                'slavename': "asteamwin13",
+                'slavename': "windows-p3-deep",
                 'factory': windows_p3_deep_factory,
                 'builddir': './windows-p3-deep',
     }
 
 
     ##################################
     #### builder for windows-frr ####
     ##################################
@@ -1905,17 +1905,17 @@ class tamarinredux:
                 descriptionDone='finished running frunit.',
                 name="RunFrunit",
                 workdir="../scripts",
                 timeout=3600)
     )
 
     windows_frr_builder = {
                 'name': "windows-frr",
-                'slavename': "asteamwin12",
+                'slavename': "windows-frr",
                 'factory': windows_frr_factory,
                 'builddir': './windows-frr',
     }
 
     ##################################
     #### builder for mac-ppc-deep ####
     ##################################
     mac_ppc_deep_factory = factory.BuildFactory()
@@ -1940,17 +1940,17 @@ class tamarinredux:
     mac_ppc_deep_factory.addStep(test_generic(name="ReleasDebugger-air", shellname="avmshell_air_ppc", vmargs="", config="", scriptargs=""))
     mac_ppc_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_ppc", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     mac_ppc_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd_ppc", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     mac_ppc_deep_factory.addStep(util_process_clean)
     mac_ppc_deep_factory.addStep(util_clean_buildsdir)
 
     mac_ppc_deep_builder = {
                 'name': "mac-ppc-deep",
-                'slavename': "asteammac10",
+                'slavename': "mac-ppc-deep",
                 'factory': mac_ppc_deep_factory,
                 'builddir': './mac-ppc-deep',
     }
 
     ########################################
     #### builder for solaris-sparc-deep ####
     ########################################
     solaris_sparc_deep_factory = factory.BuildFactory()
@@ -1968,17 +1968,17 @@ class tamarinredux:
     solaris_sparc_deep_factory.addStep(test_misc)
     solaris_sparc_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     solaris_sparc_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     solaris_sparc_deep_factory.addStep(util_process_clean)
     solaris_sparc_deep_factory.addStep(util_clean_buildsdir)
 
     solaris_sparc_deep_builder = {
                 'name': "solaris-sparc-deep",
-                'slavename': "asteamsol1",
+                'slavename': "solaris-sparc-deep",
                 'factory': solaris_sparc_deep_factory,
                 'builddir': './solaris-sparc-deep',
     }
 
     ##################################
     #### builder for windows64-deep ####
     ##################################
     windows_64_deep_factory = factory.BuildFactory()
@@ -2009,17 +2009,17 @@ class tamarinredux:
     windows_64_deep_factory.addStep(test_misc)
     windows_64_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_64", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     windows_64_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd_64", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     windows_64_deep_factory.addStep(util_process_clean)
     windows_64_deep_factory.addStep(util_clean_buildsdir)
 
     windows_64_deep_builder = {
                 'name': "windows64-deep",
-                'slavename': "asteamwin11",
+                'slavename': "windows64-deep",
                 'factory': windows_64_deep_factory,
                 'builddir': './windows64-deep',
     }
 
     ##################################
     #### builder for winmobile-emulator-deep ####
     ##################################
     winmobile_emulator_deep_factory = factory.BuildFactory()
@@ -2032,17 +2032,17 @@ class tamarinredux:
     winmobile_emulator_deep_factory.addStep(test_emulator_generic(name="Release-interp", shellname="avmshell_arm", vmargs="-Dinterp", config="arm-winmobile-emulator-tvm-release-Dinterp-deep", scriptargs=""))
     winmobile_emulator_deep_factory.addStep(test_emulator_generic(name="Release-wordcode-interp", shellname="avmshell_wordcode_arm", vmargs="-Dinterp", config="arm-winmobile-emulator-tvm-release-Dinterp-deep", scriptargs=""))
     winmobile_emulator_deep_factory.addStep(test_emulator_generic(name="Release-jit", shellname="avmshell_arm", vmargs="-Ojit", config="arm-winmobile-emulator-tvm-release-Ojit-deep", scriptargs=""))
     winmobile_emulator_deep_factory.addStep(util_process_clean)
     winmobile_emulator_deep_factory.addStep(util_clean_buildsdir)
 
     winmobile_emulator_deep_builder = {
                 'name': "winmobile-emulator-deep",
-                'slavename': "asteamwin20",
+                'slavename': "winmobile-emulator-deep",
                 'factory': winmobile_emulator_deep_factory,
                 'builddir': './winmobile-emulator-deep',
     }
 
     ##################################
     #### builder for linux-deep   ####
     ##################################
     linux_deep_factory = factory.BuildFactory()
@@ -2067,17 +2067,17 @@ class tamarinredux:
     linux_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     linux_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     linux_deep_factory.addStep(test_generic(name="Release_Verify", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     linux_deep_factory.addStep(util_process_clean)
     linux_deep_factory.addStep(util_clean_buildsdir)
 
     linux_deep_builder = {
                 'name': "linux-deep",
-                'slavename': "asteamlin9",
+                'slavename': "linux-deep",
                 'factory': linux_deep_factory,
                 'builddir': './linux-deep',
     }
     
     
     ######################################
     #### builder for linux-arm-deep   ####
     ######################################
@@ -2093,17 +2093,17 @@ class tamarinredux:
     linux_arm_deep_factory.addStep(test_generic(name="Release-softfloat-deep", shellname="avmshell_neon_arm", vmargs="", config="arm-lnx-tvm-release-deep", scriptargs=""))
     linux_arm_deep_factory.addStep(test_generic(name="Release-deep", shellname="avmshell_neon_arm", vmargs="-Darm_arch 7 -Darm_vfp", config="arm-lnx-tvm-release-deep", scriptargs=""))
     linux_arm_deep_factory.addStep(test_generic(name="Release-Dinterp-deep", shellname="avmshell_neon_arm", vmargs="-Dinterp", config="arm-lnx-tvm-release-Dinterp-deep", scriptargs=""))
     linux_arm_deep_factory.addStep(util_process_clean)
     linux_arm_deep_factory.addStep(util_clean_buildsdir)
 
     linux_arm_deep_builder = {
                 'name': "linux-arm-deep",
-                'slavename': "asteambeagleboard3",
+                'slavename': "linux-arm-deep",
                 'factory': linux_arm_deep_factory,
                 'builddir': './linux-arm-deep',
     }
 
 
     #######################################
     #### builder for linux-mips-deep   ####
     #######################################
@@ -2115,17 +2115,17 @@ class tamarinredux:
     linux_mips_deep_factory.addStep(download_testmedia)
     linux_mips_deep_factory.addStep(test_generic_ssh(name="Release", shellname="avmshell_mips", vmargs="", config="mips-lnx-tvm-release", scriptargs="--threads=1"))
     linux_mips_deep_factory.addStep(test_generic_ssh(name="Debug", shellname="avmshell_mips_d", vmargs="", config="mips-lnx-tvm-debug", scriptargs="--threads=1"))
     linux_mips_deep_factory.addStep(util_process_clean)
     linux_mips_deep_factory.addStep(util_clean_buildsdir)
 
     linux_mips_deep_builder = {
                 'name': "linux-mips-deep",
-                'slavename': "asteamlin1-mips-deep",
+                'slavename': "linux-mips-deep",
                 'factory': linux_mips_deep_factory,
                 'builddir': './linux-mips-deep',
     }
     
     builders = [
                 windows_compile_builder,
                 windows_64_compile_builder,
                 mac_intel_104_compile_builder,
--- a/build/buildbot/slaves/android-performance/buildbot.tac
+++ b/build/buildbot/slaves/android-performance/buildbot.tac
@@ -1,16 +1,52 @@
+#  ***** BEGIN LICENSE BLOCK *****
+#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+#  The contents of this file are subject to the Mozilla Public License Version
+#  1.1 (the "License"); you may not use this file except in compliance with
+#  the License. You may obtain a copy of the License at
+#  http://www.mozilla.org/MPL/
+# 
+#  Software distributed under the License is distributed on an "AS IS" basis,
+#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+#  for the specific language governing rights and limitations under the
+#  License.
+# 
+#  The Original Code is [Open Source Virtual Machine.].
+# 
+#  The Initial Developer of the Original Code is
+#  Adobe System Incorporated.
+#  Portions created by the Initial Developer are Copyright (C) 2010
+#  the Initial Developer. All Rights Reserved.
+# 
+#  Contributor(s):
+#    Adobe AS3 Team
+# 
+#  Alternatively, the contents of this file may be used under the terms of
+#  either the GNU General Public License Version 2 or later (the "GPL"), or
+#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+#  in which case the provisions of the GPL or the LGPL are applicable instead
+#  of those above. If you wish to allow use of your version of this file only
+#  under the terms of either the GPL or the LGPL, and not to allow others to
+#  use your version of this file under the terms of the MPL, indicate your
+#  decision by deleting the provisions above and replace them with the notice
+#  and other provisions required by the GPL or the LGPL. If you do not delete
+#  the provisions above, a recipient may use your version of this file under
+#  the terms of any one of the MPL, the GPL or the LGPL.
+# 
+#  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/android-performance'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac1-android'
+slavename = 'android-performance'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/linux-arm-deep/buildbot.tac
+++ b/build/buildbot/slaves/linux-arm-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/home/build/buildbot/tamarin-redux/linux-arm-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteambeagleboard3'
+slavename = 'linux-arm-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/linux-arm/buildbot.tac
+++ b/build/buildbot/slaves/linux-arm/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/home/build/buildbot/tamarin-redux/linux-arm'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamlinarm1'
+slavename = 'linux-arm'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/linux-deep/buildbot.tac
+++ b/build/buildbot/slaves/linux-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/home/build/buildbot/tamarin-redux/linux-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamlin9'
+slavename = 'linux-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 0
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/linux-mips-deep/buildbot.tac
+++ b/build/buildbot/slaves/linux-mips-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/home/build/buildbot/tamarin-redux/linux-mips-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamlin1-mips-deep'
+slavename = 'linux-mips-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/linux-mips/buildbot.tac
+++ b/build/buildbot/slaves/linux-mips/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/home/build/buildbot/tamarin-redux/linux-mips'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamlin1-mips'
+slavename = 'linux-mips'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/linux-performance/buildbot.tac
+++ b/build/buildbot/slaves/linux-performance/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/home/build/buildbot/tamarin-redux/linux-performance'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamlin4'
+slavename = 'linux-performance'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/linux/buildbot.tac
+++ b/build/buildbot/slaves/linux/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/home/build/buildbot/tamarin-redux/linux'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamlin1'
+slavename = 'linux'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/linux64/buildbot.tac
+++ b/build/buildbot/slaves/linux64/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/home/build/buildbot/tamarin-redux/linux64'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamlin5'
+slavename = 'linux64'
 passwd = 'asteam'
 keepalive = 600
 usepty = 0
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-deep/buildbot.tac
+++ b/build/buildbot/slaves/mac-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac1'
+slavename = 'mac-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-intel-10_4/buildbot.tac
+++ b/build/buildbot/slaves/mac-intel-10_4/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-intel-10_4'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac4'
+slavename = 'mac-intel-10_4'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-intel-10_5/buildbot.tac
+++ b/build/buildbot/slaves/mac-intel-10_5/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-intel-10_5'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac12-10_5'
+slavename = 'mac-intel-10_5'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-intel-server/buildbot.tac
+++ b/build/buildbot/slaves/mac-intel-server/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-intel-server'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac12'
+slavename = 'android'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-performance/buildbot.tac
+++ b/build/buildbot/slaves/mac-performance/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-performance'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac2'
+slavename = 'mac-performance'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-ppc-10_4/buildbot.tac
+++ b/build/buildbot/slaves/mac-ppc-10_4/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-ppc-10_4'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac6'
+slavename = 'mac-ppc-10_4'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-ppc-10_5/buildbot.tac
+++ b/build/buildbot/slaves/mac-ppc-10_5/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-ppc-10_5'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac5'
+slavename = 'mac-ppc-10_5'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-ppc-deep/buildbot.tac
+++ b/build/buildbot/slaves/mac-ppc-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-ppc-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac10'
+slavename = 'mac-ppc-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac-ppc-performance/buildbot.tac
+++ b/build/buildbot/slaves/mac-ppc-performance/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac-ppc-performance'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac3'
+slavename = 'mac-ppc-performance'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac64-intel/buildbot.tac
+++ b/build/buildbot/slaves/mac64-intel/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac64-intel'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac12-64bit'
+slavename = 'mac64-intel'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac64-performance/buildbot.tac
+++ b/build/buildbot/slaves/mac64-performance/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac64-performance'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac7'
+slavename = 'mac64-performance'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/mac64-ppc/buildbot.tac
+++ b/build/buildbot/slaves/mac64-ppc/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/Users/build/buildbot/tamarin-redux/mac64-ppc'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteammac5-64bit'
+slavename = 'mac64-ppc'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/solaris-sparc-deep/buildbot.tac
+++ b/build/buildbot/slaves/solaris-sparc-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/export/home/build/buildbot/tamarin-redux/solaris-sparc-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamsol1'
+slavename = 'solaris-sparc-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/solaris-sparc/buildbot.tac
+++ b/build/buildbot/slaves/solaris-sparc/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/export/home/build/buildbot/tamarin-redux/solaris-sparc'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamsol4'
+slavename = 'solaris-sparc'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/windows-deep/buildbot.tac
+++ b/build/buildbot/slaves/windows-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/c/buildbot/tamarin-redux/windows-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin10'
+slavename = 'windows-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/windows-p3-deep/buildbot.tac
+++ b/build/buildbot/slaves/windows-p3-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/c/buildbot/tamarin-redux/windows-p3-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin13'
+slavename = 'windows-p3-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/windows-performance/buildbot.tac
+++ b/build/buildbot/slaves/windows-performance/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/c/buildbot/tamarin-redux/windows-performance'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin1'
+slavename = 'windows-performance'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/windows/buildbot.tac
+++ b/build/buildbot/slaves/windows/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/c/buildbot/tamarin-redux/windows'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin2'
+slavename = 'windows'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/windows64-deep/buildbot.tac
+++ b/build/buildbot/slaves/windows64-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'c:/buildbot/tamarin-redux/windows64-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin11'
+slavename = 'windows64-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/windows64/buildbot.tac
+++ b/build/buildbot/slaves/windows64/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/c/buildbot/tamarin-redux/windows64'
 buildmaster_host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin3'
+slavename = 'windows64'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/winmobile-arm-deep/buildbot.tac
+++ b/build/buildbot/slaves/winmobile-arm-deep/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/c/buildbot/tamarin-redux/winmobile-arm-deep'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin20'
+slavename = 'winmobile-arm-deep'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/winmobile-arm/buildbot.tac
+++ b/build/buildbot/slaves/winmobile-arm/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/c/buildbot/tamarin-redux/winmobile-arm'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin11'
+slavename = 'winmobile-arm'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)
--- a/build/buildbot/slaves/winmobile-performance/buildbot.tac
+++ b/build/buildbot/slaves/winmobile-performance/buildbot.tac
@@ -36,17 +36,17 @@
 #  ***** END LICENSE BLOCK ****
 
 from twisted.application import service
 from buildbot.slave.bot import BuildSlave
 
 basedir = r'/c/buildbot/tamarin-redux/winmobile-performance'
 host = '10.171.22.12'
 port = 9750
-slavename = 'asteamwin5'
+slavename = 'winmobile-performance'
 passwd = 'asteam'
 keepalive = 600
 usepty = 1
 umask = None
 
 application = service.Application('buildslave')
 s = BuildSlave(host, port, slavename, passwd, basedir, keepalive, usepty,
                umask=umask)