diff --git a/Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.Parse_WebPKI_Roots_from_DER.p90.json b/Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.Parse_WebPKI_Roots_from_DER.p90.json
similarity index 100%
rename from Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.Parse_WebPKI_Roots_from_DER.p90.json
rename to Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.Parse_WebPKI_Roots_from_DER.p90.json
diff --git a/Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.Parse_WebPKI_Roots_from_PEM_files.p90.json b/Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.Parse_WebPKI_Roots_from_PEM_files.p90.json
similarity index 100%
rename from Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.Parse_WebPKI_Roots_from_PEM_files.p90.json
rename to Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.Parse_WebPKI_Roots_from_PEM_files.p90.json
diff --git a/Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.Parse_WebPKI_Roots_from_multi_PEM_file.p90.json b/Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.Parse_WebPKI_Roots_from_multi_PEM_file.p90.json
similarity index 100%
rename from Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.Parse_WebPKI_Roots_from_multi_PEM_file.p90.json
rename to Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.Parse_WebPKI_Roots_from_multi_PEM_file.p90.json
diff --git a/Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.TinyArray.append.p90.json b/Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.TinyArray.append.p90.json
similarity index 100%
rename from Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.TinyArray.append.p90.json
rename to Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.TinyArray.append.p90.json
diff --git a/Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.TinyArray_non-allocating_functions.p90.json b/Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.TinyArray_non-allocating_functions.p90.json
similarity index 100%
rename from Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.TinyArray_non-allocating_functions.p90.json
rename to Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.TinyArray_non-allocating_functions.p90.json
diff --git a/Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.Verifier.p90.json b/Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.Verifier.p90.json
similarity index 100%
rename from Benchmarks/Thresholds/nightly-6.0/CertificatesBenchmark.Verifier.p90.json
rename to Benchmarks/Thresholds/nightly-6.1/CertificatesBenchmark.Verifier.p90.json
diff --git a/cmake/modules/SwiftSupport.cmake b/cmake/modules/SwiftSupport.cmake
index 1935dde..7d7663e 100644
--- a/cmake/modules/SwiftSupport.cmake
+++ b/cmake/modules/SwiftSupport.cmake
@@ -40,7 +40,7 @@ function(get_swift_host_arch result_var_name)
     set("${result_var_name}" "armv7" PARENT_SCOPE)
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a")
     set("${result_var_name}" "armv7" PARENT_SCOPE)
-  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AMD64|amd64")
     set("${result_var_name}" "x86_64" PARENT_SCOPE)
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")
     set("${result_var_name}" "itanium" PARENT_SCOPE)