diff --git a/libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake b/libcxx/cmake/caches/Armv7Thumb-no-exceptions.cmake
rename from libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake
rename to libcxx/cmake/caches/Armv7Thumb-no-exceptions.cmake
diff --git a/libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake b/libcxx/cmake/caches/Armv8Thumb-no-exceptions.cmake
rename from libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake
rename to libcxx/cmake/caches/Armv8Thumb-no-exceptions.cmake
diff --git a/libcxx/cmake/caches/Generic-noexceptions.cmake b/libcxx/cmake/caches/Generic-no-exceptions.cmake
rename from libcxx/cmake/caches/Generic-noexceptions.cmake
rename to libcxx/cmake/caches/Generic-no-exceptions.cmake
diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -646,7 +646,7 @@
       timeout_in_minutes: 120
 
     - label: "No exceptions"
-      command: "libcxx/utils/ci/run-buildbot generic-noexceptions"
+      command: "libcxx/utils/ci/run-buildbot generic-no-exceptions"
       artifact_paths:
         - "**/test-results.xml"
         - "**/*.abilist"
@@ -919,7 +919,7 @@
       timeout_in_minutes: 120
 
     - label: "AArch64 -fno-exceptions"
-      command: "libcxx/utils/ci/run-buildbot aarch64-noexceptions"
+      command: "libcxx/utils/ci/run-buildbot aarch64-no-exceptions"
       artifact_paths:
         - "**/test-results.xml"
         - "**/*.abilist"
@@ -947,7 +947,7 @@
       timeout_in_minutes: 120
 
     - label: "Armv8 -fno-exceptions"
-      command: "libcxx/utils/ci/run-buildbot armv8-noexceptions"
+      command: "libcxx/utils/ci/run-buildbot armv8-no-exceptions"
       artifact_paths:
         - "**/test-results.xml"
         - "**/*.abilist"
@@ -975,7 +975,7 @@
       timeout_in_minutes: 120
 
     - label: "Armv7 -fno-exceptions"
-      command: "libcxx/utils/ci/run-buildbot armv7-noexceptions"
+      command: "libcxx/utils/ci/run-buildbot armv7-no-exceptions"
       artifact_paths:
         - "**/test-results.xml"
         - "**/*.abilist"
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -434,9 +434,9 @@
     check-runtimes
     check-abi-list
 ;;
-generic-noexceptions)
+generic-no-exceptions)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-noexceptions.cmake"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-exceptions.cmake"
     check-runtimes
     check-abi-list
 ;;
@@ -556,7 +556,7 @@
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake"
     check-runtimes
 ;;
-aarch64-noexceptions)
+aarch64-no-exceptions)
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake" \
                    -DLIBCXX_ENABLE_EXCEPTIONS=OFF \
@@ -569,9 +569,9 @@
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Arm.cmake"
     check-runtimes
 ;;
-armv8-noexceptions)
+armv8-no-exceptions)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Thumb-no-exceptions.cmake"
     check-runtimes
 ;;
 # Armv7 32 bit. One building Arm only one Thumb only code.
@@ -580,9 +580,9 @@
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Arm.cmake"
     check-runtimes
 ;;
-armv7-noexceptions)
+armv7-no-exceptions)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-no-exceptions.cmake"
     check-runtimes
 ;;
 clang-cl-dll)