diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 3d2d077..8ec7f532 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1614,22 +1614,22 @@
       'linux_gtk': standard_tests,
       'linux_chromeos_asan': ['compile'],
       'linux_chromium_chromeos_clang_dbg': ['defaulttests'],
-      'linux_chromium_chromeos_rel_swarming': ['defaulttests'],
+      'linux_chromium_chromeos_rel': ['defaulttests'],
       'linux_chromium_compile_dbg': ['defaulttests'],
       'linux_chromium_gn_dbg': ['compile'],
       'linux_chromium_gn_rel': ['defaulttests'],
-      'linux_chromium_rel_swarming': ['defaulttests'],
+      'linux_chromium_rel': ['defaulttests'],
       'linux_chromium_clang_dbg': ['defaulttests'],
       'linux_gpu': ['defaulttests'],
       'linux_nacl_sdk_build': ['compile'],
       'mac_chromium_compile_dbg': ['defaulttests'],
-      'mac_chromium_rel_swarming': ['defaulttests'],
+      'mac_chromium_rel': ['defaulttests'],
       'mac_gpu': ['defaulttests'],
       'mac_nacl_sdk_build': ['compile'],
       'win_chromium_compile_dbg': ['defaulttests'],
       'win_chromium_dbg': ['defaulttests'],
-      'win_chromium_rel_swarming': ['defaulttests'],
-      'win_chromium_x64_rel_swarming': ['defaulttests'],
+      'win_chromium_rel': ['defaulttests'],
+      'win_chromium_x64_rel': ['defaulttests'],
       'win_gpu': ['defaulttests'],
       'win_nacl_sdk_build': ['compile'],
       'win8_chromium_rel': ['defaulttests'],
@@ -1679,12 +1679,12 @@
   if all(re.search(r'\.(m|mm)$|(^|[\\\/_])mac[\\\/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'mac_chromium_compile_dbg',
-        'mac_chromium_rel_swarming',
+        'mac_chromium_rel',
     ])
   if all(re.search('(^|[/_])win[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'win_chromium_dbg',
-        'win_chromium_rel_swarming',
+        'win_chromium_rel',
         'win8_chromium_rel',
     ])
   if all(re.search(r'(^|[\\\/_])android[\\\/_.]', f) for f in files):
@@ -1706,18 +1706,18 @@
       'ios_dbg_simulator',
       'ios_rel_device',
       'ios_rel_device_ninja',
-      'linux_chromium_chromeos_rel_swarming',
+      'linux_chromium_chromeos_rel',
       'linux_chromium_clang_dbg',
       'linux_chromium_gn_dbg',
       'linux_chromium_gn_rel',
-      'linux_chromium_rel_swarming',
+      'linux_chromium_rel',
       'linux_gpu',
       'mac_chromium_compile_dbg',
-      'mac_chromium_rel_swarming',
+      'mac_chromium_rel',
       'mac_gpu',
       'win_chromium_compile_dbg',
-      'win_chromium_rel_swarming',
-      'win_chromium_x64_rel_swarming',
+      'win_chromium_rel',
+      'win_chromium_x64_rel',
       'win_gpu',
       'win8_chromium_rel',
   ]