diff --git a/strum_macros/Cargo.toml b/strum_macros/Cargo.toml
index 5eb2308a..fb9e72c7 100644
--- a/strum_macros/Cargo.toml
+++ b/strum_macros/Cargo.toml
@@ -26,17 +26,3 @@ syn = { version = "1.0", features = ["parsing", "extra-traits"] }
 
 [dev-dependencies]
 strum = "0.20"
-
-[features]
-verbose-enumstring-name = []
-verbose-asrefstr-name = []
-verbose-variant-names = []
-verbose-asstaticstr-name = []
-verbose-intostaticstr-name = []
-verbose-tostring-name = []
-verbose-display-name = []
-verbose-enumiter-name = []
-verbose-enummessage-name = []
-verbose-enumproperty-name = []
-verbose-enumdiscriminants-name = []
-verbose-enumcount-name = []
diff --git a/strum_macros/src/lib.rs b/strum_macros/src/lib.rs
index 2c94a214..63830678 100644
--- a/strum_macros/src/lib.rs
+++ b/strum_macros/src/lib.rs
@@ -96,14 +96,7 @@ fn debug_print_generated(ast: &DeriveInput, toks: &TokenStream) {
 /// // however the variant is still normally usable
 /// println!("{:?}", Color::Yellow);
 /// ```
-#[cfg_attr(
-    not(feature = "verbose-enumstring-name"),
-    proc_macro_derive(EnumString, attributes(strum))
-)]
-#[cfg_attr(
-    feature = "verbose-enumstring-name",
-    proc_macro_derive(StrumEnumString, attributes(strum))
-)]
+#[proc_macro_derive(EnumString, attributes(strum))]
 pub fn from_string(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -148,14 +141,7 @@ pub fn from_string(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 ///     Color::Green { range: 42 }.as_ref()
 /// );
 /// ```
-#[cfg_attr(
-    not(feature = "verbose-asrefstr-name"),
-    proc_macro_derive(AsRefStr, attributes(strum))
-)]
-#[cfg_attr(
-    feature = "verbose-asrefstr-name",
-    proc_macro_derive(StrumAsRefStr, attributes(strum))
-)]
+#[proc_macro_derive(AsRefStr, attributes(strum))]
 pub fn as_ref_str(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -186,14 +172,7 @@ pub fn as_ref_str(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 /// }
 /// assert_eq!(["red", "blue", "yellow", "rebecca-purple"], Color::VARIANTS);
 /// ```
-#[cfg_attr(
-    not(feature = "verbose-variant-names"),
-    proc_macro_derive(EnumVariantNames, attributes(strum))
-)]
-#[cfg_attr(
-    feature = "verbose-variant-names",
-    proc_macro_derive(StrumEnumVariantNames, attributes(strum))
-)]
+#[proc_macro_derive(EnumVariantNames, attributes(strum))]
 pub fn variant_names(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -203,14 +182,7 @@ pub fn variant_names(input: proc_macro::TokenStream) -> proc_macro::TokenStream
     toks.into()
 }
 
-#[cfg_attr(
-    feature = "verbose-asstaticstr-name",
-    proc_macro_derive(StrumAsStaticStr, attributes(strum))
-)]
-#[cfg_attr(
-    not(feature = "verbose-asstaticstr-name"),
-    proc_macro_derive(AsStaticStr, attributes(strum))
-)]
+#[proc_macro_derive(AsStaticStr, attributes(strum))]
 pub fn as_static_str(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -252,14 +224,7 @@ pub fn as_static_str(input: proc_macro::TokenStream) -> proc_macro::TokenStream
 ///
 /// verify_state(&"hello world".to_string());
 /// ```
-#[cfg_attr(
-    feature = "verbose-intostaticstr-name",
-    proc_macro_derive(StrumIntoStaticStr, attributes(strum))
-)]
-#[cfg_attr(
-    not(feature = "verbose-intostaticstr-name"),
-    proc_macro_derive(IntoStaticStr, attributes(strum))
-)]
+#[proc_macro_derive(IntoStaticStr, attributes(strum))]
 pub fn into_static_str(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -297,14 +262,7 @@ pub fn into_static_str(input: proc_macro::TokenStream) -> proc_macro::TokenStrea
 /// let yellow = Color::Yellow;
 /// assert_eq!(String::from("Yellow"), yellow.to_string());
 /// ```
-#[cfg_attr(
-    feature = "verbose-tostring-name",
-    proc_macro_derive(StrumToString, attributes(strum))
-)]
-#[cfg_attr(
-    not(feature = "verbose-tostring-name"),
-    proc_macro_derive(ToString, attributes(strum))
-)]
+#[proc_macro_derive(ToString, attributes(strum))]
 pub fn to_string(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -354,14 +312,7 @@ pub fn to_string(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 ///     Color::Green { range: 42 }
 /// );
 /// ```
-#[cfg_attr(
-    feature = "verbose-display-name",
-    proc_macro_derive(StrumDisplay, attributes(strum))
-)]
-#[cfg_attr(
-    not(feature = "verbose-display-name"),
-    proc_macro_derive(Display, attributes(strum))
-)]
+#[proc_macro_derive(Display, attributes(strum))]
 pub fn display(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -403,14 +354,7 @@ pub fn display(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 /// assert_eq!(Some(Color::Yellow), ci.next());
 /// assert_eq!(None, ci.next());
 /// ```
-#[cfg_attr(
-    feature = "verbose-enumiter-name",
-    proc_macro_derive(StrumEnumIter, attributes(strum))
-)]
-#[cfg_attr(
-    not(feature = "verbose-enumiter-name"),
-    proc_macro_derive(EnumIter, attributes(strum))
-)]
+#[proc_macro_derive(EnumIter, attributes(strum))]
 pub fn enum_iter(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -484,14 +428,7 @@ pub fn enum_iter(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 /// assert_eq!("This is very red", c.get_detailed_message().unwrap());
 /// assert_eq!(["Red"], c.get_serializations());
 /// ```
-#[cfg_attr(
-    feature = "verbose-enummessage-name",
-    proc_macro_derive(StrumEnumMessage, attributes(strum))
-)]
-#[cfg_attr(
-    not(feature = "verbose-enummessage-name"),
-    proc_macro_derive(EnumMessage, attributes(strum))
-)]
+#[proc_macro_derive(EnumMessage, attributes(strum))]
 pub fn enum_messages(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -543,14 +480,7 @@ pub fn enum_messages(input: proc_macro::TokenStream) -> proc_macro::TokenStream
 /// assert_eq!("My color is Red. It\'s RGB is 255,0,0", &display);
 /// ```
 
-#[cfg_attr(
-    feature = "verbose-enumproperty-name",
-    proc_macro_derive(StrumEnumProperty, attributes(strum))
-)]
-#[cfg_attr(
-    not(feature = "verbose-enumproperty-name"),
-    proc_macro_derive(EnumProperty, attributes(strum))
-)]
+#[proc_macro_derive(EnumProperty, attributes(strum))]
 pub fn enum_properties(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -650,14 +580,7 @@ pub fn enum_properties(input: proc_macro::TokenStream) -> proc_macro::TokenStrea
 ///     inner::PubDiscriminants::Variant1,
 /// );
 /// ```
-#[cfg_attr(
-    feature = "verbose-enumdiscriminants-name",
-    proc_macro_derive(StrumEnumDiscriminants, attributes(strum, strum_discriminants))
-)]
-#[cfg_attr(
-    not(feature = "verbose-enumdiscriminants-name"),
-    proc_macro_derive(EnumDiscriminants, attributes(strum, strum_discriminants))
-)]
+#[proc_macro_derive(EnumDiscriminants, attributes(strum, strum_discriminants))]
 pub fn enum_discriminants(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
 
@@ -691,14 +614,7 @@ pub fn enum_discriminants(input: proc_macro::TokenStream) -> proc_macro::TokenSt
 /// assert_eq!(Week::iter().count(), Week::COUNT);
 ///
 /// ```
-#[cfg_attr(
-    feature = "verbose-enumcount-name",
-    proc_macro_derive(StrumEnumCount, attributes(strum))
-)]
-#[cfg_attr(
-    not(feature = "verbose-enumcount-name"),
-    proc_macro_derive(EnumCount, attributes(strum))
-)]
+#[proc_macro_derive(EnumCount, attributes(strum))]
 pub fn enum_count(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(input as DeriveInput);
     let toks =
diff --git a/strum_macros/src/macros/enum_discriminants.rs b/strum_macros/src/macros/enum_discriminants.rs
index 129c1428..7733455d 100644
--- a/strum_macros/src/macros/enum_discriminants.rs
+++ b/strum_macros/src/macros/enum_discriminants.rs
@@ -36,7 +36,9 @@ pub fn enum_discriminants_inner(ast: &DeriveInput) -> syn::Result<TokenStream> {
     );
 
     let discriminants_name = type_properties.discriminant_name.unwrap_or(default_name);
-    let discriminants_vis = type_properties.discriminant_vis.unwrap_or_else(|| vis.clone());
+    let discriminants_vis = type_properties
+        .discriminant_vis
+        .unwrap_or_else(|| vis.clone());
 
     // Pass through all other attributes
     let pass_though_attributes = type_properties.discriminant_others;
diff --git a/strum_tests_rename/Cargo.toml b/strum_tests_rename/Cargo.toml
deleted file mode 100644
index 5d47794e..00000000
--- a/strum_tests_rename/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "strum_tests_rename"
-version = "0.20.0"
-edition = "2018"
-authors = ["Peter Glotfelty <peglotfe@microsoft.com>"]
-
-[dependencies]
-strum = { path = "../strum", features = ["derive"] }
-
-[dependencies.strum_macros]
-path = "../strum_macros"
-features = [
-    "verbose-enumcount-name",
-    "verbose-enumstring-name",
-    "verbose-asrefstr-name",
-    "verbose-asstaticstr-name",
-    "verbose-intostaticstr-name",
-    "verbose-tostring-name",
-    "verbose-display-name",
-    "verbose-enumiter-name",
-    "verbose-enummessage-name",
-    "verbose-enumproperty-name",
-    "verbose-enumdiscriminants-name"
-]
diff --git a/strum_tests_rename/src/main.rs b/strum_tests_rename/src/main.rs
deleted file mode 100644
index e7a11a96..00000000
--- a/strum_tests_rename/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    println!("Hello, world!");
-}
diff --git a/strum_tests_rename/tests/color.rs b/strum_tests_rename/tests/color.rs
deleted file mode 100644
index 0db926c3..00000000
--- a/strum_tests_rename/tests/color.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use strum::*;
-
-#[derive(
-    StrumEnumString,
-    StrumAsRefStr,
-    StrumAsStaticStr,
-    StrumIntoStaticStr,
-    StrumDisplay,
-    StrumEnumIter,
-    StrumEnumMessage,
-    StrumEnumProperty,
-    StrumEnumDiscriminants,
-    StrumEnumCount,
-)]
-pub enum Color {
-    Red,
-    Blue,
-    Green,
-}
-
-// You can't have ToString and Display on the same type.
-#[derive(StrumToString)]
-pub enum Color2 {
-    Red,
-    Blue,
-    Green,
-}