diff --git a/contrib/codegen/tests/ui-fail-nightly/database-syntax.stderr b/contrib/codegen/tests/ui-fail-nightly/database-syntax.stderr
index a7e7d5f6..0f331e31 100644
--- a/contrib/codegen/tests/ui-fail-nightly/database-syntax.stderr
+++ b/contrib/codegen/tests/ui-fail-nightly/database-syntax.stderr
@@ -4,7 +4,7 @@ error: unexpected end of input, expected string literal
 6 | #[database]
   | ^^^^^^^^^^^
   |
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the attribute macro `database` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected string literal
  --> $DIR/database-syntax.rs:9:12
diff --git a/core/codegen/tests/ui-fail-nightly/async-entry.stderr b/core/codegen/tests/ui-fail-nightly/async-entry.stderr
index eddf7871..60447483 100644
--- a/core/codegen/tests/ui-fail-nightly/async-entry.stderr
+++ b/core/codegen/tests/ui-fail-nightly/async-entry.stderr
@@ -9,7 +9,7 @@ note: this function must be `async`
   |
 5 |     fn foo() { }
   |     ^^^^^^^^
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the attribute macro `rocket::main` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: attribute is typically applied to `main` function
   --> $DIR/async-entry.rs:10:5
@@ -22,7 +22,7 @@ note: this function is not `main`
    |
 11 |     async fn foo() { }
    |              ^^^
-   = note: this warning originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this warning originates in the attribute macro `rocket::main` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: attribute can only be applied to `async` functions
   --> $DIR/async-entry.rs:16:5
@@ -35,7 +35,7 @@ note: this function must be `async`
    |
 17 |     fn main() {
    |     ^^^^^^^^^
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `rocket::main` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: attribute cannot be applied to `main` function
   --> $DIR/async-entry.rs:49:5
@@ -49,7 +49,7 @@ note: this function cannot be `main`
    |
 50 |     fn main() -> rocekt::Rocket<rocket::Build> {
    |        ^^^^
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `rocket::launch` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: attribute can only be applied to functions that return a value
   --> $DIR/async-entry.rs:56:5
@@ -62,7 +62,7 @@ note: this function must return a value
    |
 57 |     async fn rocket() {
    |     ^^^^^^^^^^^^^^^^^
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `rocket::launch` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: attribute can only be applied to functions that return a value
   --> $DIR/async-entry.rs:64:5
@@ -75,7 +75,7 @@ note: this function must return a value
    |
 65 |     fn rocket() {
    |     ^^^^^^^^^^^
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `rocket::launch` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: attribute cannot be applied to `main` function
   --> $DIR/async-entry.rs:79:5
@@ -89,7 +89,7 @@ note: this function cannot be `main`
    |
 80 |     fn main() -> &'static str {
    |        ^^^^
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `rocket::launch` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: attribute cannot be applied to `main` function
   --> $DIR/async-entry.rs:87:5
@@ -103,7 +103,7 @@ note: this function cannot be `main`
    |
 88 |     async fn main() -> _ {
    |              ^^^^
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `rocket::launch` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0728]: `await` is only allowed inside `async` functions and blocks
   --> $DIR/async-entry.rs:73:17
diff --git a/core/codegen/tests/ui-fail-nightly/catchers.stderr b/core/codegen/tests/ui-fail-nightly/catchers.stderr
index ca261acd..59f164bb 100644
--- a/core/codegen/tests/ui-fail-nightly/catchers.stderr
+++ b/core/codegen/tests/ui-fail-nightly/catchers.stderr
@@ -16,4 +16,4 @@ error: unexpected end of input, expected identifier
 7 |     let _ = catchers![a::];
   |             ^^^^^^^^^^^^^^
   |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `catchers` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/core/codegen/tests/ui-fail-nightly/from_form.stderr b/core/codegen/tests/ui-fail-nightly/from_form.stderr
index bba2bc71..0d2c058e 100644
--- a/core/codegen/tests/ui-fail-nightly/from_form.stderr
+++ b/core/codegen/tests/ui-fail-nightly/from_form.stderr
@@ -9,7 +9,7 @@ note: error occurred while deriving `FromForm`
   |
 3 | #[derive(FromForm)]
   |          ^^^^^^^^
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: tuple structs are not supported
  --> $DIR/from_form.rs:7:1
@@ -22,7 +22,7 @@ note: error occurred while deriving `FromForm`
   |
 6 | #[derive(FromForm)]
   |          ^^^^^^^^
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: at least one field is required
   --> $DIR/from_form.rs:10:13
@@ -35,7 +35,7 @@ note: error occurred while deriving `FromForm`
    |
 9  | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: tuple structs are not supported
   --> $DIR/from_form.rs:13:1
@@ -48,7 +48,7 @@ note: error occurred while deriving `FromForm`
    |
 12 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: only one lifetime is supported
   --> $DIR/from_form.rs:16:25
@@ -61,7 +61,7 @@ note: error occurred while deriving `FromForm`
    |
 15 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
   --> $DIR/from_form.rs:25:20
@@ -75,7 +75,7 @@ note: error occurred while deriving `FromForm`
    |
 23 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field name conflicts with previous name
   --> $DIR/from_form.rs:33:5
@@ -99,7 +99,7 @@ note: error occurred while deriving `FromForm`
    |
 29 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field name conflicts with previous name
   --> $DIR/from_form.rs:40:20
@@ -124,7 +124,7 @@ note: error occurred while deriving `FromForm`
    |
 36 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field name conflicts with previous name
   --> $DIR/from_form.rs:47:20
@@ -148,7 +148,7 @@ note: error occurred while deriving `FromForm`
    |
 44 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unexpected attribute parameter: `field`
   --> $DIR/from_form.rs:53:28
@@ -161,7 +161,7 @@ note: error occurred while deriving `FromForm`
    |
 51 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected list `#[field(..)]`, found bare path "field"
   --> $DIR/from_form.rs:59:7
@@ -174,7 +174,7 @@ note: error occurred while deriving `FromForm`
    |
 57 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected key/value `key = value`
   --> $DIR/from_form.rs:65:13
@@ -187,7 +187,7 @@ note: error occurred while deriving `FromForm`
    |
 63 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected key/value `key = value`
   --> $DIR/from_form.rs:71:13
@@ -200,7 +200,7 @@ note: error occurred while deriving `FromForm`
    |
 69 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unexpected attribute parameter: `beep`
   --> $DIR/from_form.rs:77:13
@@ -213,7 +213,7 @@ note: error occurred while deriving `FromForm`
    |
 75 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field has conflicting names
   --> $DIR/from_form.rs:83:5
@@ -238,7 +238,7 @@ note: error occurred while deriving `FromForm`
    |
 81 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected list `#[attr(..)]`, found bare boolean literal
   --> $DIR/from_form.rs:90:20
@@ -251,7 +251,7 @@ note: error occurred while deriving `FromForm`
    |
 88 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected expression, found bare path "name"
   --> $DIR/from_form.rs:96:13
@@ -264,7 +264,7 @@ note: error occurred while deriving `FromForm`
    |
 94 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected list `#[attr(..)]`, found bare integer literal
    --> $DIR/from_form.rs:102:20
@@ -277,7 +277,7 @@ note: error occurred while deriving `FromForm`
     |
 100 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
    --> $DIR/from_form.rs:108:20
@@ -291,7 +291,7 @@ note: error occurred while deriving `FromForm`
     |
 106 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
    --> $DIR/from_form.rs:114:20
@@ -305,7 +305,7 @@ note: error occurred while deriving `FromForm`
     |
 112 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
    --> $DIR/from_form.rs:120:20
@@ -319,7 +319,7 @@ note: error occurred while deriving `FromForm`
     |
 118 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
    --> $DIR/from_form.rs:126:20
@@ -333,7 +333,7 @@ note: error occurred while deriving `FromForm`
     |
 124 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
    --> $DIR/from_form.rs:132:20
@@ -347,7 +347,7 @@ note: error occurred while deriving `FromForm`
     |
 130 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
    --> $DIR/from_form.rs:138:20
@@ -361,7 +361,7 @@ note: error occurred while deriving `FromForm`
     |
 136 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find function `unknown` in this scope
    --> $DIR/from_form.rs:150:24
diff --git a/core/codegen/tests/ui-fail-nightly/from_form_field.stderr b/core/codegen/tests/ui-fail-nightly/from_form_field.stderr
index e3b4f7dc..270f8e14 100644
--- a/core/codegen/tests/ui-fail-nightly/from_form_field.stderr
+++ b/core/codegen/tests/ui-fail-nightly/from_form_field.stderr
@@ -9,7 +9,7 @@ note: error occurred while deriving `FromFormField`
   |
 3 | #[derive(FromFormField)]
   |          ^^^^^^^^^^^^^
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: tuple structs are not supported
  --> $DIR/from_form_field.rs:7:1
@@ -22,7 +22,7 @@ note: error occurred while deriving `FromFormField`
   |
 6 | #[derive(FromFormField)]
   |          ^^^^^^^^^^^^^
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: named structs are not supported
   --> $DIR/from_form_field.rs:10:1
@@ -37,7 +37,7 @@ note: error occurred while deriving `FromFormField`
    |
 9  | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: variants cannot have fields
   --> $DIR/from_form_field.rs:16:6
@@ -50,7 +50,7 @@ note: error occurred while deriving `FromFormField`
    |
 14 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: enum must have at least one variant
   --> $DIR/from_form_field.rs:20:1
@@ -63,7 +63,7 @@ note: error occurred while deriving `FromFormField`
    |
 19 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type generics are not supported
   --> $DIR/from_form_field.rs:23:11
@@ -76,7 +76,7 @@ note: error occurred while deriving `FromFormField`
    |
 22 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid value: expected string literal
   --> $DIR/from_form_field.rs:29:21
@@ -89,7 +89,7 @@ note: error occurred while deriving `FromFormField`
    |
 27 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected literal, found bare path "value"
   --> $DIR/from_form_field.rs:35:13
@@ -102,7 +102,7 @@ note: error occurred while deriving `FromFormField`
    |
 33 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: variant has conflicting values
   --> $DIR/from_form_field.rs:41:5
@@ -127,7 +127,7 @@ note: error occurred while deriving `FromFormField`
    |
 39 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field value conflicts with previous value
   --> $DIR/from_form_field.rs:50:21
@@ -152,7 +152,7 @@ note: error occurred while deriving `FromFormField`
    |
 46 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field value conflicts with previous value
   --> $DIR/from_form_field.rs:57:21
@@ -176,7 +176,7 @@ note: error occurred while deriving `FromFormField`
    |
 54 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: variant has conflicting values
   --> $DIR/from_form_field.rs:80:5
@@ -201,7 +201,7 @@ note: error occurred while deriving `FromFormField`
    |
 78 | #[derive(FromFormField)]
    |          ^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromFormField` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field has conflicting names
   --> $DIR/from_form_field.rs:87:5
@@ -226,7 +226,7 @@ note: error occurred while deriving `FromForm`
    |
 85 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field name conflicts with previous name
   --> $DIR/from_form_field.rs:96:20
@@ -251,7 +251,7 @@ note: error occurred while deriving `FromForm`
    |
 92 | #[derive(FromForm)]
    |          ^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field name conflicts with previous name
    --> $DIR/from_form_field.rs:104:5
@@ -275,7 +275,7 @@ note: error occurred while deriving `FromForm`
     |
 100 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: field name conflicts with previous name
    --> $DIR/from_form_field.rs:111:5
@@ -299,4 +299,4 @@ note: error occurred while deriving `FromForm`
     |
 107 | #[derive(FromForm)]
     |          ^^^^^^^^
-    = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/core/codegen/tests/ui-fail-nightly/route-attribute-general-syntax.stderr b/core/codegen/tests/ui-fail-nightly/route-attribute-general-syntax.stderr
index f843abcf..b545a0cd 100644
--- a/core/codegen/tests/ui-fail-nightly/route-attribute-general-syntax.stderr
+++ b/core/codegen/tests/ui-fail-nightly/route-attribute-general-syntax.stderr
@@ -4,7 +4,7 @@ error: missing expected parameter: `uri`
 4 | #[get()]
   | ^^^^^^^^
   |
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the attribute macro `get` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected `fn`
  --> $DIR/route-attribute-general-syntax.rs:9:1
diff --git a/core/codegen/tests/ui-fail-nightly/route-warnings.stderr b/core/codegen/tests/ui-fail-nightly/route-warnings.stderr
index 5201fb4d..cb36048f 100644
--- a/core/codegen/tests/ui-fail-nightly/route-warnings.stderr
+++ b/core/codegen/tests/ui-fail-nightly/route-warnings.stderr
@@ -27,7 +27,7 @@ note: 'GET' does not typically support payloads
    |
 18 | #[get("/", data = "<_foo>")]
    |   ^^^
-   = note: this warning originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this warning originates in the attribute macro `get` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: `data` used with non-payload-supporting method
   --> $DIR/route-warnings.rs:21:13
@@ -40,7 +40,7 @@ note: 'HEAD' does not typically support payloads
    |
 21 | #[head("/", data = "<_foo>")]
    |   ^^^^
-   = note: this warning originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this warning originates in the attribute macro `head` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: checking for warnings!
   --> $DIR/route-warnings.rs:25:5
diff --git a/core/codegen/tests/ui-fail-nightly/routes.stderr b/core/codegen/tests/ui-fail-nightly/routes.stderr
index 4da81dbb..1ec99110 100644
--- a/core/codegen/tests/ui-fail-nightly/routes.stderr
+++ b/core/codegen/tests/ui-fail-nightly/routes.stderr
@@ -16,4 +16,4 @@ error: unexpected end of input, expected identifier
 7 |     let _ = routes![a::];
   |             ^^^^^^^^^^^^
   |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `routes` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/core/codegen/tests/ui-fail-nightly/typed-uris-invalid-syntax.stderr b/core/codegen/tests/ui-fail-nightly/typed-uris-invalid-syntax.stderr
index 62acf634..27eb8aa0 100644
--- a/core/codegen/tests/ui-fail-nightly/typed-uris-invalid-syntax.stderr
+++ b/core/codegen/tests/ui-fail-nightly/typed-uris-invalid-syntax.stderr
@@ -34,7 +34,7 @@ error: unexpected end of input, expected identifier
 12 |     uri!("/mount",);
    |     ^^^^^^^^^^^^^^^^
    |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `uri` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid mount point; mount points must be static, absolute URIs: `/example`
   --> $DIR/typed-uris-invalid-syntax.rs:13:10
@@ -54,7 +54,7 @@ error: unexpected end of input, call to `uri!` cannot be empty
 15 |     uri!();
    |     ^^^^^^^
    |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `uri` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unexpected end of input, expected expression
   --> $DIR/typed-uris-invalid-syntax.rs:16:5
@@ -62,4 +62,4 @@ error: unexpected end of input, expected expression
 16 |     uri!(simple: id = );
    |     ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `uri` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/core/codegen/tests/ui-fail-nightly/uri_display.stderr b/core/codegen/tests/ui-fail-nightly/uri_display.stderr
index 6e7dd2a7..6caf4379 100644
--- a/core/codegen/tests/ui-fail-nightly/uri_display.stderr
+++ b/core/codegen/tests/ui-fail-nightly/uri_display.stderr
@@ -9,7 +9,7 @@ note: error occurred while deriving `UriDisplay`
   |
 3 | #[derive(UriDisplayQuery)]
   |          ^^^^^^^^^^^^^^^
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the derive macro `UriDisplayQuery` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: fieldless structs are not supported
  --> $DIR/uri_display.rs:7:1
@@ -22,7 +22,7 @@ note: error occurred while deriving `UriDisplay`
   |
 6 | #[derive(UriDisplayQuery)]
   |          ^^^^^^^^^^^^^^^
-  = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the derive macro `UriDisplayQuery` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: empty enums are not supported
   --> $DIR/uri_display.rs:10:11
@@ -35,7 +35,7 @@ note: error occurred while deriving `UriDisplay`
    |
 9  | #[derive(UriDisplayQuery)]
    |          ^^^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `UriDisplayQuery` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: tuple structs or variants must have exactly one field
   --> $DIR/uri_display.rs:18:12
@@ -48,7 +48,7 @@ note: error occurred while deriving `UriDisplay`
    |
 17 | #[derive(UriDisplayQuery)]
    |          ^^^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `UriDisplayQuery` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected list `#[attr(..)]`, found bare integer literal
   --> $DIR/uri_display.rs:22:20
@@ -61,7 +61,7 @@ note: error occurred while deriving `UriDisplay`
    |
 20 | #[derive(UriDisplayQuery)]
    |          ^^^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `UriDisplayQuery` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: struct must have exactly one field
   --> $DIR/uri_display.rs:27:12
@@ -74,7 +74,7 @@ note: error occurred while deriving `UriDisplay`
    |
 26 | #[derive(UriDisplayPath)]
    |          ^^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `UriDisplayPath` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: struct must have exactly one field
   --> $DIR/uri_display.rs:30:1
@@ -87,7 +87,7 @@ note: error occurred while deriving `UriDisplay`
    |
 29 | #[derive(UriDisplayPath)]
    |          ^^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `UriDisplayPath` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: enums are not supported
   --> $DIR/uri_display.rs:33:1
@@ -100,7 +100,7 @@ note: error occurred while deriving `UriDisplay`
    |
 32 | #[derive(UriDisplayPath)]
    |          ^^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `UriDisplayPath` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: named structs are not supported
   --> $DIR/uri_display.rs:36:1
@@ -115,4 +115,4 @@ note: error occurred while deriving `UriDisplay`
    |
 35 | #[derive(UriDisplayPath)]
    |          ^^^^^^^^^^^^^^
-   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the derive macro `UriDisplayPath` (in Nightly builds, run with -Z macro-backtrace for more info)