diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs
index 1fc705c03bb5..be4a607961f3 100644
--- a/src/stacked_borrows.rs
+++ b/src/stacked_borrows.rs
@@ -221,7 +221,7 @@ impl<'tcx> Stack {
             }
         }
         // If we got here, we did not find our item.  We have to error to satisfy U3.
-        Err(format!("Borrow being dereferenced ({:?}) does not exist on the stack", bor))
+        Err(format!("Borrow being dereferenced ({:?}) does not exist on the borrow stack", bor))
     }
 
     /// Perform an actual memory access using `bor`.  We do not know any types here
@@ -294,7 +294,7 @@ impl<'tcx> Stack {
         }
         // If we got here, we did not find our item.
         err!(MachineError(format!(
-            "Borrow being accessed ({:?}) does not exist on the stack",
+            "Borrow being accessed ({:?}) does not exist on the borrow stack",
             bor
         )))
     }
diff --git a/tests/compile-fail/stacked_borrows/alias_through_mutation.rs b/tests/compile-fail/stacked_borrows/alias_through_mutation.rs
index db9ac93279f1..30f5921202c3 100644
--- a/tests/compile-fail/stacked_borrows/alias_through_mutation.rs
+++ b/tests/compile-fail/stacked_borrows/alias_through_mutation.rs
@@ -9,5 +9,5 @@ fn main() {
     retarget(&mut target_alias, target);
     // now `target_alias` points to the same thing as `target`
     *target = 13;
-    let _val = *target_alias; //~ ERROR does not exist on the stack
+    let _val = *target_alias; //~ ERROR does not exist on the borrow stack
 }
diff --git a/tests/compile-fail/stacked_borrows/aliasing_mut3.rs b/tests/compile-fail/stacked_borrows/aliasing_mut3.rs
index e564e878ddb1..e3c59d156614 100644
--- a/tests/compile-fail/stacked_borrows/aliasing_mut3.rs
+++ b/tests/compile-fail/stacked_borrows/aliasing_mut3.rs
@@ -1,6 +1,6 @@
 use std::mem;
 
-pub fn safe(_x: &mut i32, _y: &i32) {} //~ ERROR does not exist on the stack
+pub fn safe(_x: &mut i32, _y: &i32) {} //~ ERROR does not exist on the borrow stack
 
 fn main() {
     let mut x = 0;
diff --git a/tests/compile-fail/stacked_borrows/box_exclusive_violation1.rs b/tests/compile-fail/stacked_borrows/box_exclusive_violation1.rs
index bd0fec859d8f..481915faed04 100644
--- a/tests/compile-fail/stacked_borrows/box_exclusive_violation1.rs
+++ b/tests/compile-fail/stacked_borrows/box_exclusive_violation1.rs
@@ -8,7 +8,7 @@ fn demo_mut_advanced_unique(mut our: Box<i32>) -> i32 {
   unknown_code_2();
 
   // We know this will return 5
-  *our //~ ERROR does not exist on the stack
+  *our //~ ERROR does not exist on the borrow stack
 }
 
 // Now comes the evil context
diff --git a/tests/compile-fail/stacked_borrows/buggy_as_mut_slice.rs b/tests/compile-fail/stacked_borrows/buggy_as_mut_slice.rs
index e08e3bba6840..98d4e6f22965 100644
--- a/tests/compile-fail/stacked_borrows/buggy_as_mut_slice.rs
+++ b/tests/compile-fail/stacked_borrows/buggy_as_mut_slice.rs
@@ -13,5 +13,5 @@ fn main() {
     let v1 = safe::as_mut_slice(&v);
     let _v2 = safe::as_mut_slice(&v);
     v1[1] = 5;
-    //~^ ERROR does not exist on the stack
+    //~^ ERROR does not exist on the borrow stack
 }
diff --git a/tests/compile-fail/stacked_borrows/buggy_split_at_mut.rs b/tests/compile-fail/stacked_borrows/buggy_split_at_mut.rs
index 959c6314690d..42f345f55144 100644
--- a/tests/compile-fail/stacked_borrows/buggy_split_at_mut.rs
+++ b/tests/compile-fail/stacked_borrows/buggy_split_at_mut.rs
@@ -9,7 +9,7 @@ mod safe {
             assert!(mid <= len);
 
             (from_raw_parts_mut(ptr, len - mid), // BUG: should be "mid" instead of "len - mid"
-            //~^ ERROR does not exist on the stack
+            //~^ ERROR does not exist on the borrow stack
             from_raw_parts_mut(ptr.offset(mid as isize), len - mid))
         }
     }
diff --git a/tests/compile-fail/stacked_borrows/illegal_read1.rs b/tests/compile-fail/stacked_borrows/illegal_read1.rs
index dbaccae88272..0181f739a899 100644
--- a/tests/compile-fail/stacked_borrows/illegal_read1.rs
+++ b/tests/compile-fail/stacked_borrows/illegal_read1.rs
@@ -7,7 +7,7 @@ fn main() {
     let xref = unsafe { &mut *xraw }; // derived from raw, so using raw is still okay...
     callee(xraw);
     let _val = *xref; // ...but any use of raw will invalidate our ref.
-    //~^ ERROR: does not exist on the stack
+    //~^ ERROR: does not exist on the borrow stack
 }
 
 fn callee(xraw: *mut i32) {
diff --git a/tests/compile-fail/stacked_borrows/illegal_read2.rs b/tests/compile-fail/stacked_borrows/illegal_read2.rs
index 2da755d9aabc..b55fe1c6c88a 100644
--- a/tests/compile-fail/stacked_borrows/illegal_read2.rs
+++ b/tests/compile-fail/stacked_borrows/illegal_read2.rs
@@ -7,7 +7,7 @@ fn main() {
     let xref = unsafe { &mut *xraw }; // derived from raw, so using raw is still okay...
     callee(xraw);
     let _val = *xref; // ...but any use of raw will invalidate our ref.
-    //~^ ERROR: does not exist on the stack
+    //~^ ERROR: does not exist on the borrow stack
 }
 
 fn callee(xraw: *mut i32) {
diff --git a/tests/compile-fail/stacked_borrows/illegal_read3.rs b/tests/compile-fail/stacked_borrows/illegal_read3.rs
index b0da0511dee3..9da4ca09606e 100644
--- a/tests/compile-fail/stacked_borrows/illegal_read3.rs
+++ b/tests/compile-fail/stacked_borrows/illegal_read3.rs
@@ -13,7 +13,7 @@ fn main() {
     let xref2 = &mut *xref1; // derived from xref1, so using raw is still okay...
     callee(xref1_sneaky);
     let _val = *xref2; // ...but any use of it will invalidate our ref.
-    //~^ ERROR: does not exist on the stack
+    //~^ ERROR: does not exist on the borrow stack
 }
 
 fn callee(xref1: usize) {
diff --git a/tests/compile-fail/stacked_borrows/illegal_read4.rs b/tests/compile-fail/stacked_borrows/illegal_read4.rs
index c86ec1286daa..bb889de8f839 100644
--- a/tests/compile-fail/stacked_borrows/illegal_read4.rs
+++ b/tests/compile-fail/stacked_borrows/illegal_read4.rs
@@ -5,5 +5,5 @@ fn main() {
     let xraw = xref1 as *mut _;
     let xref2 = unsafe { &mut *xraw };
     let _val = unsafe { *xraw }; // use the raw again, this invalidates xref2 *even* with the special read except for uniq refs
-    let _illegal = *xref2; //~ ERROR does not exist on the stack
+    let _illegal = *xref2; //~ ERROR does not exist on the borrow stack
 }
diff --git a/tests/compile-fail/stacked_borrows/illegal_read5.rs b/tests/compile-fail/stacked_borrows/illegal_read5.rs
index 863649a47b5e..5f800e754a5d 100644
--- a/tests/compile-fail/stacked_borrows/illegal_read5.rs
+++ b/tests/compile-fail/stacked_borrows/illegal_read5.rs
@@ -12,5 +12,5 @@ fn main() {
     let _val = *xref; // we can even still use our mutable reference
     mem::forget(unsafe { ptr::read(xshr) }); // but after reading through the shared ref
     let _val = *xref; // the mutable one is dead and gone
-    //~^ ERROR does not exist on the stack
+    //~^ ERROR does not exist on the borrow stack
 }
diff --git a/tests/compile-fail/stacked_borrows/illegal_write2.rs b/tests/compile-fail/stacked_borrows/illegal_write2.rs
index ba3b6686b84c..affa21c7625e 100644
--- a/tests/compile-fail/stacked_borrows/illegal_write2.rs
+++ b/tests/compile-fail/stacked_borrows/illegal_write2.rs
@@ -3,6 +3,6 @@ fn main() {
     let target2 = target as *mut _;
     drop(&mut *target); // reborrow
     // Now make sure our ref is still the only one.
-    unsafe { *target2 = 13; } //~ ERROR does not exist on the stack
+    unsafe { *target2 = 13; } //~ ERROR does not exist on the borrow stack
     let _val = *target;
 }
diff --git a/tests/compile-fail/stacked_borrows/illegal_write3.rs b/tests/compile-fail/stacked_borrows/illegal_write3.rs
index a653aa5003f6..dc4edcc3a5b4 100644
--- a/tests/compile-fail/stacked_borrows/illegal_write3.rs
+++ b/tests/compile-fail/stacked_borrows/illegal_write3.rs
@@ -3,6 +3,6 @@ fn main() {
     // Make sure raw ptr with raw tag cannot mutate frozen location without breaking the shared ref.
     let r#ref = &target; // freeze
     let ptr = r#ref as *const _ as *mut _; // raw ptr, with raw tag
-    unsafe { *ptr = 42; } //~ ERROR does not exist on the stack
+    unsafe { *ptr = 42; } //~ ERROR does not exist on the borrow stack
     let _val = *r#ref;
 }
diff --git a/tests/compile-fail/stacked_borrows/illegal_write5.rs b/tests/compile-fail/stacked_borrows/illegal_write5.rs
index 57b2ca87d810..af57221260ce 100644
--- a/tests/compile-fail/stacked_borrows/illegal_write5.rs
+++ b/tests/compile-fail/stacked_borrows/illegal_write5.rs
@@ -7,7 +7,7 @@ fn main() {
     let xref = unsafe { &mut *xraw }; // derived from raw, so using raw is still okay...
     callee(xraw);
     let _val = *xref; // ...but any use of raw will invalidate our ref.
-    //~^ ERROR: does not exist on the stack
+    //~^ ERROR: does not exist on the borrow stack
 }
 
 fn callee(xraw: *mut i32) {
diff --git a/tests/compile-fail/stacked_borrows/load_invalid_mut.rs b/tests/compile-fail/stacked_borrows/load_invalid_mut.rs
index 98b9451eda87..f2e4b36f85cc 100644
--- a/tests/compile-fail/stacked_borrows/load_invalid_mut.rs
+++ b/tests/compile-fail/stacked_borrows/load_invalid_mut.rs
@@ -5,5 +5,5 @@ fn main() {
     let xref = unsafe { &mut *xraw };
     let xref_in_mem = Box::new(xref);
     let _val = unsafe { *xraw }; // invalidate xref
-    let _val = *xref_in_mem; //~ ERROR does not exist on the stack
+    let _val = *xref_in_mem; //~ ERROR does not exist on the borrow stack
 }
diff --git a/tests/compile-fail/stacked_borrows/outdated_local.rs b/tests/compile-fail/stacked_borrows/outdated_local.rs
index 64a8ff69108e..ba36e43e0c5d 100644
--- a/tests/compile-fail/stacked_borrows/outdated_local.rs
+++ b/tests/compile-fail/stacked_borrows/outdated_local.rs
@@ -3,7 +3,7 @@ fn main() {
     let y: *const i32 = &x;
     x = 1; // this invalidates y by reactivating the lowermost uniq borrow for this local
 
-    assert_eq!(unsafe { *y }, 1); //~ ERROR does not exist on the stack
+    assert_eq!(unsafe { *y }, 1); //~ ERROR does not exist on the borrow stack
 
     assert_eq!(x, 1);
 }
diff --git a/tests/compile-fail/stacked_borrows/pass_invalid_mut.rs b/tests/compile-fail/stacked_borrows/pass_invalid_mut.rs
index 28288c6c6362..b239237f0199 100644
--- a/tests/compile-fail/stacked_borrows/pass_invalid_mut.rs
+++ b/tests/compile-fail/stacked_borrows/pass_invalid_mut.rs
@@ -6,5 +6,5 @@ fn main() {
     let xraw = x as *mut _;
     let xref = unsafe { &mut *xraw };
     let _val = unsafe { *xraw }; // invalidate xref
-    foo(xref); //~ ERROR does not exist on the stack
+    foo(xref); //~ ERROR does not exist on the borrow stack
 }
diff --git a/tests/compile-fail/stacked_borrows/pointer_smuggling.rs b/tests/compile-fail/stacked_borrows/pointer_smuggling.rs
index bd5e28b47e86..a8207d58e99b 100644
--- a/tests/compile-fail/stacked_borrows/pointer_smuggling.rs
+++ b/tests/compile-fail/stacked_borrows/pointer_smuggling.rs
@@ -8,7 +8,7 @@ fn fun1(x: &mut u8) {
 
 fn fun2() {
     // Now we use a pointer we are not allowed to use
-    let _x = unsafe { *PTR }; //~ ERROR does not exist on the stack
+    let _x = unsafe { *PTR }; //~ ERROR does not exist on the borrow stack
 }
 
 fn main() {
diff --git a/tests/compile-fail/stacked_borrows/return_invalid_mut.rs b/tests/compile-fail/stacked_borrows/return_invalid_mut.rs
index e7f0b9bc9ddd..31f8a4e33afd 100644
--- a/tests/compile-fail/stacked_borrows/return_invalid_mut.rs
+++ b/tests/compile-fail/stacked_borrows/return_invalid_mut.rs
@@ -3,7 +3,7 @@ fn foo(x: &mut (i32, i32)) -> &mut i32 {
     let xraw = x as *mut (i32, i32);
     let ret = unsafe { &mut (*xraw).1 };
     let _val = unsafe { *xraw }; // invalidate xref
-    ret //~ ERROR does not exist on the stack
+    ret //~ ERROR does not exist on the borrow stack
 }
 
 fn main() {
diff --git a/tests/compile-fail/stacked_borrows/return_invalid_mut_option.rs b/tests/compile-fail/stacked_borrows/return_invalid_mut_option.rs
index 28a1f74c6ac2..750d507d6f66 100644
--- a/tests/compile-fail/stacked_borrows/return_invalid_mut_option.rs
+++ b/tests/compile-fail/stacked_borrows/return_invalid_mut_option.rs
@@ -3,7 +3,7 @@ fn foo(x: &mut (i32, i32)) -> Option<&mut i32> {
     let xraw = x as *mut (i32, i32);
     let ret = Some(unsafe { &mut (*xraw).1 });
     let _val = unsafe { *xraw }; // invalidate xref
-    ret //~ ERROR does not exist on the stack
+    ret //~ ERROR does not exist on the borrow stack
 }
 
 fn main() {
diff --git a/tests/compile-fail/stacked_borrows/return_invalid_mut_tuple.rs b/tests/compile-fail/stacked_borrows/return_invalid_mut_tuple.rs
index 3357af68a841..bb712e9e486c 100644
--- a/tests/compile-fail/stacked_borrows/return_invalid_mut_tuple.rs
+++ b/tests/compile-fail/stacked_borrows/return_invalid_mut_tuple.rs
@@ -3,7 +3,7 @@ fn foo(x: &mut (i32, i32)) -> (&mut i32,) {
     let xraw = x as *mut (i32, i32);
     let ret = (unsafe { &mut (*xraw).1 },);
     let _val = unsafe { *xraw }; // invalidate xref
-    ret //~ ERROR does not exist on the stack
+    ret //~ ERROR does not exist on the borrow stack
 }
 
 fn main() {
diff --git a/tests/compile-fail/stacked_borrows/transmute-is-no-escape.rs b/tests/compile-fail/stacked_borrows/transmute-is-no-escape.rs
index 197c11197efa..45ada8897778 100644
--- a/tests/compile-fail/stacked_borrows/transmute-is-no-escape.rs
+++ b/tests/compile-fail/stacked_borrows/transmute-is-no-escape.rs
@@ -10,5 +10,5 @@ fn main() {
     let _raw: *mut i32 = unsafe { mem::transmute(&mut x[0]) };
     // `raw` still carries a tag, so we get another pointer to the same location that does not carry a tag
     let raw = (&mut x[1] as *mut i32).wrapping_offset(-1);
-    unsafe { *raw = 13; } //~ ERROR does not exist on the stack
+    unsafe { *raw = 13; } //~ ERROR does not exist on the borrow stack
 }
diff --git a/tests/compile-fail/stacked_borrows/unescaped_local.rs b/tests/compile-fail/stacked_borrows/unescaped_local.rs
index 054697b04a09..1db14ea7eda5 100644
--- a/tests/compile-fail/stacked_borrows/unescaped_local.rs
+++ b/tests/compile-fail/stacked_borrows/unescaped_local.rs
@@ -4,5 +4,5 @@ fn main() {
     let mut x = 42;
     let raw = &mut x as *mut i32 as usize as *mut i32;
     let _ptr = &mut x;
-    unsafe { *raw = 13; } //~ ERROR does not exist on the stack
+    unsafe { *raw = 13; } //~ ERROR does not exist on the borrow stack
 }