Add O/S versions to all bot names, change "Webkit" to "WebKit" in all bot names.

masters/master.chromium.webkit/master_win_webkit_latest_cfg.py

Index: masters/master.chromium.webkit/master_win_webkit_latest_cfg.py
diff --git a/masters/master.chromium.webkit/master_win_webkit_latest_cfg.py b/masters/master.chromium.webkit/master_win_webkit_latest_cfg.py
index 6541f8a3b9726b141186a99be35c30a377622410..92d581c07c841c21e5f4a64f96994fa30c2be6e2 100644
--- a/masters/master.chromium.webkit/master_win_webkit_latest_cfg.py
+++ b/masters/master.chromium.webkit/master_win_webkit_latest_cfg.py
@@ -30,7 +30,7 @@ webkit_tests = [
 
 # Archive location
 rel_archive = master_config.GetArchiveUrl('ChromiumWebkit',
-                                          'Webkit Win Builder',
+                                          'WebKit Win Builder',
                                           'webkit-win-latest-rel', 'win32')
 #
 # Main release scheduler for webkit
@@ -45,7 +45,7 @@ T('s4_webkit_rel_trigger')
 #
 # Win Rel Builder
 #
-B('Webkit Win Builder', 'f_webkit_win_rel', scheduler='s4_webkit_rel',
+B('WebKit Win Builder', 'f_webkit_win_rel', scheduler='s4_webkit_rel',
   builddir='webkit-win-latest-rel', auto_reboot=False)
 F('f_webkit_win_rel', win().ChromiumWebkitLatestFactory(
     slave_type='Builder',
@@ -55,9 +55,9 @@ F('f_webkit_win_rel', win().ChromiumWebkitLatestFactory(
     }))
 
 #
-# Win Rel Webkit testers
+# Win Rel WebKit testers
 #
-B('Webkit Win', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
+B('WebKit XP', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
 F('f_webkit_rel_tests', win().ChromiumWebkitLatestFactory(
     slave_type='Tester',
     build_url=rel_archive,
@@ -66,7 +66,7 @@ F('f_webkit_rel_tests', win().ChromiumWebkitLatestFactory(
                         'generate_gtest_json': True,
                         'test_results_server': 'test-results.appspot.com'}))
 
-B('Webkit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
+B('WebKit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
 
 ################################################################################
 ## Debug
@@ -74,7 +74,7 @@ B('Webkit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger')
 
 # Archive location
 dbg_archive = master_config.GetArchiveUrl('ChromiumWebkit',
-                                          'Webkit Win Builder (dbg)',
+                                          'WebKit Win Builder (dbg)',
                                           'webkit-win-latest-dbg', 'win32')
 #
 # Main debug scheduler for webkit
@@ -89,7 +89,7 @@ T('s4_webkit_dbg_trigger')
 #
 # Win Dbg Builder
 #
-B('Webkit Win Builder (dbg)', 'f_webkit_win_dbg', scheduler='s4_webkit_dbg',
+B('WebKit Win Builder (dbg)', 'f_webkit_win_dbg', scheduler='s4_webkit_dbg',
   builddir='webkit-win-latest-dbg', auto_reboot=False)
 F('f_webkit_win_dbg', win().ChromiumWebkitLatestFactory(
     target='Debug',
@@ -100,10 +100,10 @@ F('f_webkit_win_dbg', win().ChromiumWebkitLatestFactory(
     }))
 
 #
-# Win Dbg Webkit testers
+# Win Dbg WebKit testers
 #
 
-B('Webkit Win (dbg)(1)', 'f_webkit_dbg_tests_1',
+B('WebKit Win7 (dbg)(1)', 'f_webkit_dbg_tests_1',
     scheduler='s4_webkit_dbg_trigger')
 F('f_webkit_dbg_tests_1', win().ChromiumWebkitLatestFactory(
     target='Debug',
@@ -115,7 +115,7 @@ F('f_webkit_dbg_tests_1', win().ChromiumWebkitLatestFactory(
                         'test_results_server': 'test-results.appspot.com',
                         'layout_part': '1:2'}))
 
-B('Webkit Win (dbg)(2)', 'f_webkit_dbg_tests_2',
+B('WebKit Win7 (dbg)(2)', 'f_webkit_dbg_tests_2',
     scheduler='s4_webkit_dbg_trigger')
 F('f_webkit_dbg_tests_2', win().ChromiumWebkitLatestFactory(
     target='Debug',