diff --git a/.gitignore b/.gitignore
index 6fd3e4443de..9a4c54f08ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ perf.data.old
 /regex
 /simple-raytracer
 /portable-simd
+/abi-cafe
 /abi-checker
diff --git a/build_system/abi_checker.rs b/build_system/abi_cafe.rs
similarity index 67%
rename from build_system/abi_checker.rs
rename to build_system/abi_cafe.rs
index 177b44d3141..c2944ce6262 100644
--- a/build_system/abi_checker.rs
+++ b/build_system/abi_cafe.rs
@@ -14,17 +14,17 @@ pub(crate) fn run(
     host_triple: &str,
     target_triple: &str,
 ) {
-    if !config::get_bool("testsuite.abi-checker") {
-        eprintln!("[SKIP] abi-checker");
+    if !config::get_bool("testsuite.abi-cafe") {
+        eprintln!("[SKIP] abi-cafe");
         return;
     }
 
     if host_triple != target_triple {
-        eprintln!("[SKIP] abi-checker (cross-compilation not supported)");
+        eprintln!("[SKIP] abi-cafe (cross-compilation not supported)");
         return;
     }
 
-    eprintln!("Building sysroot for abi-checker");
+    eprintln!("Building sysroot for abi-cafe");
     build_sysroot::build_sysroot(
         channel,
         sysroot_kind,
@@ -34,14 +34,14 @@ pub(crate) fn run(
         target_triple,
     );
 
-    eprintln!("Running abi-checker");
-    let mut abi_checker_path = env::current_dir().unwrap();
-    abi_checker_path.push("abi-checker");
-    env::set_current_dir(&abi_checker_path.clone()).unwrap();
+    eprintln!("Running abi-cafe");
+    let mut abi_cafe_path = env::current_dir().unwrap();
+    abi_cafe_path.push("abi-cafe");
+    env::set_current_dir(&abi_cafe_path.clone()).unwrap();
 
     let pairs = ["rustc_calls_cgclif", "cgclif_calls_rustc", "cgclif_calls_cc", "cc_calls_cgclif"];
 
-    let mut cmd = cargo_command("cargo", "run", Some(target_triple), &abi_checker_path);
+    let mut cmd = cargo_command("cargo", "run", Some(target_triple), &abi_cafe_path);
     cmd.arg("--");
     cmd.arg("--pairs");
     cmd.args(pairs);
diff --git a/build_system/mod.rs b/build_system/mod.rs
index c665d1ef71c..03c8f58c724 100644
--- a/build_system/mod.rs
+++ b/build_system/mod.rs
@@ -4,7 +4,7 @@ use std::process;
 
 use self::utils::is_ci;
 
-mod abi_checker;
+mod abi_cafe;
 mod build_backend;
 mod build_sysroot;
 mod config;
@@ -143,7 +143,7 @@ pub fn main() {
                 &target_triple,
             );
 
-            abi_checker::run(
+            abi_cafe::run(
                 channel,
                 sysroot_kind,
                 &target_dir,
diff --git a/build_system/prepare.rs b/build_system/prepare.rs
index 83a76d3591d..3ad9f87e318 100644
--- a/build_system/prepare.rs
+++ b/build_system/prepare.rs
@@ -14,12 +14,12 @@ pub(crate) fn prepare() {
     Command::new("cargo").arg("install").arg("hyperfine").spawn().unwrap().wait().unwrap();
 
     clone_repo_shallow_github(
-        "abi-checker",
+        "abi-cafe",
         "Gankra",
-        "abi-checker",
+        "abi-cafe",
         "4c6dc8c9c687e2b3a760ff2176ce236872b37212",
     );
-    apply_patches("abi-checker", Path::new("abi-checker"));
+    apply_patches("abi-cafe", Path::new("abi-cafe"));
 
     clone_repo_shallow_github(
         "rand",
diff --git a/clean_all.sh b/clean_all.sh
index 62e52bd1958..0fd9b9455a3 100755
--- a/clean_all.sh
+++ b/clean_all.sh
@@ -3,4 +3,4 @@ set -e
 
 rm -rf build_sysroot/{sysroot_src/,target/,compiler-builtins/,rustc_version}
 rm -rf target/ build/ perf.data{,.old} y.bin
-rm -rf rand/ regex/ simple-raytracer/ portable-simd/ abi-checker/
+rm -rf rand/ regex/ simple-raytracer/ portable-simd/ abi-checker/ abi-cafe/
diff --git a/config.txt b/config.txt
index 2264d301d59..0d539191b12 100644
--- a/config.txt
+++ b/config.txt
@@ -49,4 +49,4 @@ test.regex-shootout-regex-dna
 test.regex
 test.portable-simd
 
-testsuite.abi-checker
+testsuite.abi-cafe
diff --git a/patches/0001-abi-checker-Disable-failing-tests.patch b/patches/0001-abi-cafe-Disable-failing-tests.patch
similarity index 96%
rename from patches/0001-abi-checker-Disable-failing-tests.patch
rename to patches/0001-abi-cafe-Disable-failing-tests.patch
index 526366a7598..511d2f536fd 100644
--- a/patches/0001-abi-checker-Disable-failing-tests.patch
+++ b/patches/0001-abi-cafe-Disable-failing-tests.patch
@@ -1,7 +1,7 @@
 From 1a315ba225577dbbd1f449d9609f16f984f68708 Mon Sep 17 00:00:00 2001
 From: Afonso Bordado <afonso360@users.noreply.github.com>
 Date: Fri, 12 Aug 2022 22:51:58 +0000
-Subject: [PATCH] Disable abi-checker tests
+Subject: [PATCH] Disable abi-cafe tests
 
 ---
  src/report.rs | 14 ++++++++++++++