Give the clang upload bots shorter names.

masters/master.tryserver.chromium.mac/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import os
@@ skipping 123 matching lines @@
     'factory': m_annotator.BaseFactory(
         'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
     'slavebuilddir': 'mac_gn',
   }, {
     'name': 'mac_chromium_gn_upload',
     'factory': m_annotator.BaseFactory('chromium_gn_upload'),
     'slavebuilddir': 'mac_gn',
 }])
 
 chromium_builders.append({
-  'name': 'mac_chromium_clang_upload',
-  'factory': m_annotator.BaseFactory('chromium_clang_upload'),
-  'slavebuilddir': 'build_and_upload_clang',
+  'name': 'mac_upload_clang',
+  'factory': m_annotator.BaseFactory('chromium_upload_clang'),
+  'slavebuilddir': 'mac_upload_clang',
 })
 
 chromium_builders.append({
   'name': 'mac_chromium_asan_rel_ng',
   'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
 })
 
 # Optional GPU tryserver
 chromium_builders.append({
   'name': 'mac_optional_gpu_tests_rel',
@@ skipping 196 matching lines @@
 #  base.make_stop_form = hack_stop(base.make_stop_form)
 
 
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # vi: set ts=4 sts=2 sw=2 et: