diff --git a/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql b/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
index a20c5035b6a..9b04fca82f4 100644
--- a/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
+++ b/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
@@ -8,5 +8,5 @@
 import rust
 
 from MacroCall mc
-where not mc.hasExpanded()
+where not mc.hasMacroCallExpansion()
 select mc, "Macro call was not resolved to a target."
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index 87d976b5580..8ce0126e4fd 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -136,9 +136,9 @@ predicate extractionStats(string key, int value) {
   or
   key = "Macro calls - total" and value = count(MacroCall mc)
   or
-  key = "Macro calls - resolved" and value = count(MacroCall mc | mc.hasExpanded())
+  key = "Macro calls - resolved" and value = count(MacroCall mc | mc.hasMacroCallExpansion())
   or
-  key = "Macro calls - unresolved" and value = count(MacroCall mc | not mc.hasExpanded())
+  key = "Macro calls - unresolved" and value = count(MacroCall mc | not mc.hasMacroCallExpansion())
 }
 
 /**
diff --git a/rust/ql/src/queries/telemetry/DatabaseQuality.qll b/rust/ql/src/queries/telemetry/DatabaseQuality.qll
index 8a9898efc40..15826fec4c4 100644
--- a/rust/ql/src/queries/telemetry/DatabaseQuality.qll
+++ b/rust/ql/src/queries/telemetry/DatabaseQuality.qll
@@ -30,9 +30,9 @@ module CallTargetStats implements StatsSig {
 }
 
 module MacroCallTargetStats implements StatsSig {
-  int getNumberOfOk() { result = count(MacroCall c | c.hasExpanded()) }
+  int getNumberOfOk() { result = count(MacroCall c | c.hasMacroCallExpansion()) }
 
-  additional predicate isNotOkCall(MacroCall c) { not c.hasExpanded() }
+  additional predicate isNotOkCall(MacroCall c) { not c.hasMacroCallExpansion() }
 
   int getNumberOfNotOk() { result = count(MacroCall c | isNotOkCall(c)) }
 
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.qll b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
index 2750ca1c42a..ad75415634c 100644
--- a/rust/ql/src/queries/unusedentities/UnusedVariable.qll
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
@@ -25,7 +25,7 @@ class IncompleteCallable extends Callable {
   IncompleteCallable() {
     exists(MacroExpr me |
       me.getEnclosingCallable() = this and
-      not me.getMacroCall().hasExpanded()
+      not me.getMacroCall().hasMacroCallExpansion()
     )
   }
 }