diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg
index 02250f4566..12dc39b656 100644
--- a/infra/config/cq.cfg
+++ b/infra/config/cq.cfg
@@ -34,8 +34,8 @@ verifiers {
       builders { name: "android_compile_x86_dbg" }
       builders { name: "android_compile_x86_rel" }
       builders { name: "android_compile_x64_dbg" }
-      builders { name: "android_gn_dbg" }
-      builders { name: "android_gn_rel" }
+      builders { name: "android_gyp_dbg" }
+      builders { name: "android_gyp_rel" }
       builders { name: "ios_arm64_dbg" }
       builders { name: "ios_arm64_rel" }
       builders { name: "ios_dbg" }
@@ -49,8 +49,8 @@ verifiers {
       builders { name: "linux_asan" }
       builders { name: "linux_baremetal" }
       builders { name: "linux_compile_dbg" }
-      builders { name: "linux_gn_dbg" }
-      builders { name: "linux_gn_rel" }
+      builders { name: "linux_gyp_dbg" }
+      builders { name: "linux_gyp_rel" }
       builders { name: "linux_libfuzzer_rel" }
       builders { name: "linux_msan" }
       builders { name: "linux_rel" }
@@ -61,8 +61,8 @@ verifiers {
       builders { name: "mac_baremetal" }
       builders { name: "mac_compile_dbg" }
       builders { name: "mac_rel" }
-      builders { name: "mac_gn_dbg" }
-      builders { name: "mac_gn_rel" }
+      builders { name: "mac_gyp_dbg" }
+      builders { name: "mac_gyp_rel" }
       builders { name: "presubmit" }
       builders { name: "win_baremetal" }
       builders { name: "win_clang_dbg" }
@@ -73,8 +73,8 @@ verifiers {
       builders { name: "win_x64_clang_dbg" }
       builders { name: "win_x64_clang_rel" }
       builders { name: "win_x64_dbg" }
-      builders { name: "win_x64_gn_dbg" }
-      builders { name: "win_x64_gn_rel" }
+      builders { name: "win_x64_gyp_dbg" }
+      builders { name: "win_x64_gyp_rel" }
       builders { name: "win_x64_rel" }
     }
   }