diff --git a/tests/derive-tests/smoke/pass/enum/smoke.out.rs b/tests/derive-tests/smoke/pass/enum/smoke.out.rs
index 78cd52d..cb50e6d 100644
--- a/tests/derive-tests/smoke/pass/enum/smoke.out.rs
+++ b/tests/derive-tests/smoke/pass/enum/smoke.out.rs
@@ -290,9 +290,9 @@ impl ::core::clone::Clone for CustomDiscriminant {
 impl ::core::cmp::Ord for CustomDiscriminant {
     #[inline]
     fn cmp(&self, other: &CustomDiscriminant) -> ::core::cmp::Ordering {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -302,9 +302,9 @@ impl ::core::cmp::PartialOrd for CustomDiscriminant {
         &self,
         other: &CustomDiscriminant,
     ) -> ::core::option::Option<::core::cmp::Ordering> {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -320,17 +320,17 @@ impl ::core::marker::StructuralPartialEq for CustomDiscriminant {}
 impl ::core::cmp::PartialEq for CustomDiscriminant {
     #[inline]
     fn eq(&self, other: &CustomDiscriminant) -> bool {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        __self_tag == __arg1_tag
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        __self_discr == __arg1_discr
     }
 }
 #[automatically_derived]
 impl ::core::hash::Hash for CustomDiscriminant {
     #[inline]
     fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        ::core::hash::Hash::hash(&__self_tag, state)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        ::core::hash::Hash::hash(&__self_discr, state)
     }
 }
 #[automatically_derived]
diff --git a/tests/derive-tests/variant_discriminant/fail/nested_with_value.out.rs b/tests/derive-tests/variant_discriminant/fail/nested_with_value.out.rs
index 34c93af..8c33be4 100644
--- a/tests/derive-tests/variant_discriminant/fail/nested_with_value.out.rs
+++ b/tests/derive-tests/variant_discriminant/fail/nested_with_value.out.rs
@@ -20,9 +20,9 @@ impl ::core::clone::Clone for VariantADiscriminant {
 impl ::core::cmp::Ord for VariantADiscriminant {
     #[inline]
     fn cmp(&self, other: &VariantADiscriminant) -> ::core::cmp::Ordering {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -32,9 +32,9 @@ impl ::core::cmp::PartialOrd for VariantADiscriminant {
         &self,
         other: &VariantADiscriminant,
     ) -> ::core::option::Option<::core::cmp::Ordering> {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -50,17 +50,17 @@ impl ::core::marker::StructuralPartialEq for VariantADiscriminant {}
 impl ::core::cmp::PartialEq for VariantADiscriminant {
     #[inline]
     fn eq(&self, other: &VariantADiscriminant) -> bool {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        __self_tag == __arg1_tag
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        __self_discr == __arg1_discr
     }
 }
 #[automatically_derived]
 impl ::core::hash::Hash for VariantADiscriminant {
     #[inline]
     fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        ::core::hash::Hash::hash(&__self_tag, state)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        ::core::hash::Hash::hash(&__self_discr, state)
     }
 }
 #[automatically_derived]
diff --git a/tests/derive-tests/variant_discriminant/pass/enum/mixed_variants.out.rs b/tests/derive-tests/variant_discriminant/pass/enum/mixed_variants.out.rs
index c60a3a5..1cf8965 100644
--- a/tests/derive-tests/variant_discriminant/pass/enum/mixed_variants.out.rs
+++ b/tests/derive-tests/variant_discriminant/pass/enum/mixed_variants.out.rs
@@ -34,9 +34,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
 impl ::core::cmp::Ord for EnumDiscriminant {
     #[inline]
     fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -46,9 +46,9 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
         &self,
         other: &EnumDiscriminant,
     ) -> ::core::option::Option<::core::cmp::Ordering> {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -64,17 +64,17 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
 impl ::core::cmp::PartialEq for EnumDiscriminant {
     #[inline]
     fn eq(&self, other: &EnumDiscriminant) -> bool {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        __self_tag == __arg1_tag
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        __self_discr == __arg1_discr
     }
 }
 #[automatically_derived]
 impl ::core::hash::Hash for EnumDiscriminant {
     #[inline]
     fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        ::core::hash::Hash::hash(&__self_tag, state)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        ::core::hash::Hash::hash(&__self_discr, state)
     }
 }
 #[automatically_derived]
diff --git a/tests/derive-tests/variant_discriminant/pass/enum/name.out.rs b/tests/derive-tests/variant_discriminant/pass/enum/name.out.rs
index 1a83e54..7636412 100644
--- a/tests/derive-tests/variant_discriminant/pass/enum/name.out.rs
+++ b/tests/derive-tests/variant_discriminant/pass/enum/name.out.rs
@@ -26,9 +26,9 @@ impl ::core::clone::Clone for RenamedDiscriminant {
 impl ::core::cmp::Ord for RenamedDiscriminant {
     #[inline]
     fn cmp(&self, other: &RenamedDiscriminant) -> ::core::cmp::Ordering {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -38,9 +38,9 @@ impl ::core::cmp::PartialOrd for RenamedDiscriminant {
         &self,
         other: &RenamedDiscriminant,
     ) -> ::core::option::Option<::core::cmp::Ordering> {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -56,17 +56,17 @@ impl ::core::marker::StructuralPartialEq for RenamedDiscriminant {}
 impl ::core::cmp::PartialEq for RenamedDiscriminant {
     #[inline]
     fn eq(&self, other: &RenamedDiscriminant) -> bool {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        __self_tag == __arg1_tag
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        __self_discr == __arg1_discr
     }
 }
 #[automatically_derived]
 impl ::core::hash::Hash for RenamedDiscriminant {
     #[inline]
     fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        ::core::hash::Hash::hash(&__self_tag, state)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        ::core::hash::Hash::hash(&__self_discr, state)
     }
 }
 #[automatically_derived]
diff --git a/tests/derive-tests/variant_discriminant/pass/enum/nested.out.rs b/tests/derive-tests/variant_discriminant/pass/enum/nested.out.rs
index 8c28cb3..8c04951 100644
--- a/tests/derive-tests/variant_discriminant/pass/enum/nested.out.rs
+++ b/tests/derive-tests/variant_discriminant/pass/enum/nested.out.rs
@@ -246,9 +246,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
 impl ::core::cmp::Ord for EnumDiscriminant {
     #[inline]
     fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        match ::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag) {
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        match ::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr) {
             ::core::cmp::Ordering::Equal => {
                 match (self, other) {
                     (
@@ -277,8 +277,8 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
         &self,
         other: &EnumDiscriminant,
     ) -> ::core::option::Option<::core::cmp::Ordering> {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
         match (self, other) {
             (
                 EnumDiscriminant::VariantC(__self_0),
@@ -292,7 +292,7 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
                 EnumDiscriminant::VariantE(__self_0),
                 EnumDiscriminant::VariantE(__arg1_0),
             ) => ::core::cmp::PartialOrd::partial_cmp(__self_0, __arg1_0),
-            _ => ::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag),
+            _ => ::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr),
         }
     }
 }
@@ -317,22 +317,22 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
 impl ::core::cmp::PartialEq for EnumDiscriminant {
     #[inline]
     fn eq(&self, other: &EnumDiscriminant) -> bool {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        __self_tag == __arg1_tag
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        __self_discr == __arg1_discr
             && match (self, other) {
                 (
                     EnumDiscriminant::VariantC(__self_0),
                     EnumDiscriminant::VariantC(__arg1_0),
-                ) => *__self_0 == *__arg1_0,
+                ) => __self_0 == __arg1_0,
                 (
                     EnumDiscriminant::RenamedVariant(__self_0),
                     EnumDiscriminant::RenamedVariant(__arg1_0),
-                ) => *__self_0 == *__arg1_0,
+                ) => __self_0 == __arg1_0,
                 (
                     EnumDiscriminant::VariantE(__self_0),
                     EnumDiscriminant::VariantE(__arg1_0),
-                ) => *__self_0 == *__arg1_0,
+                ) => __self_0 == __arg1_0,
                 _ => true,
             }
     }
@@ -341,8 +341,8 @@ impl ::core::cmp::PartialEq for EnumDiscriminant {
 impl ::core::hash::Hash for EnumDiscriminant {
     #[inline]
     fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        ::core::hash::Hash::hash(&__self_tag, state);
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        ::core::hash::Hash::hash(&__self_discr, state);
         match self {
             EnumDiscriminant::VariantC(__self_0) => {
                 ::core::hash::Hash::hash(__self_0, state)
diff --git a/tests/derive-tests/variant_discriminant/pass/enum/repr.out.rs b/tests/derive-tests/variant_discriminant/pass/enum/repr.out.rs
index 426a0de..4a3be22 100644
--- a/tests/derive-tests/variant_discriminant/pass/enum/repr.out.rs
+++ b/tests/derive-tests/variant_discriminant/pass/enum/repr.out.rs
@@ -27,9 +27,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
 impl ::core::cmp::Ord for EnumDiscriminant {
     #[inline]
     fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -39,9 +39,9 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
         &self,
         other: &EnumDiscriminant,
     ) -> ::core::option::Option<::core::cmp::Ordering> {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        ::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        ::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
     }
 }
 #[automatically_derived]
@@ -57,17 +57,17 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
 impl ::core::cmp::PartialEq for EnumDiscriminant {
     #[inline]
     fn eq(&self, other: &EnumDiscriminant) -> bool {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        let __arg1_tag = ::core::intrinsics::discriminant_value(other);
-        __self_tag == __arg1_tag
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        let __arg1_discr = ::core::intrinsics::discriminant_value(other);
+        __self_discr == __arg1_discr
     }
 }
 #[automatically_derived]
 impl ::core::hash::Hash for EnumDiscriminant {
     #[inline]
     fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
-        let __self_tag = ::core::intrinsics::discriminant_value(self);
-        ::core::hash::Hash::hash(&__self_tag, state)
+        let __self_discr = ::core::intrinsics::discriminant_value(self);
+        ::core::hash::Hash::hash(&__self_discr, state)
     }
 }
 #[automatically_derived]