diff --git a/src/interrupts/interrupts_cli.rs b/src/interrupts/interrupts_cli.rs
index b6e88130..35e64f0d 100644
--- a/src/interrupts/interrupts_cli.rs
+++ b/src/interrupts/interrupts_cli.rs
@@ -30,7 +30,7 @@ fn print_interrupts(interrupt_list: &[InterruptWithPeriph]) {
 
         // TODO replace this with str_utils::get_description once comparison
         // with python is done in order to remove duplicated whitespaces
-        let description = description.replace("\r\n", " ").replace("\n", " ");
+        let description = description.replace("\r\n", " ").replace('\n', " ");
 
         println!(
             "{} {}: {} (in {})",
diff --git a/src/patch/register.rs b/src/patch/register.rs
index 50fadefa..013b4968 100644
--- a/src/patch/register.rs
+++ b/src/patch/register.rs
@@ -596,7 +596,7 @@ impl RegisterExt for Register {
                 return Err(anyhow!("Could not find {}:{}.{}", pname, &self.name, fspec));
             }
             let (min_offset, name) = offsets.iter().min_by_key(|on| on.0).unwrap();
-            let name = make_ev_name(name, usage)?;
+            let name = make_ev_name(&name.replace("%s", ""), usage)?;
             for ftag in self.iter_fields(fspec) {
                 if ftag.bit_range.offset == *min_offset {
                     let evs = make_ev_array(fmod)?
diff --git a/src/patch/yaml_ext.rs b/src/patch/yaml_ext.rs
index 23b42ef2..53422b8b 100644
--- a/src/patch/yaml_ext.rs
+++ b/src/patch/yaml_ext.rs
@@ -72,7 +72,7 @@ pub fn parse_i64(val: &Yaml) -> Option<i64> {
     match val {
         Yaml::Integer(i) => Some(*i),
         Yaml::String(text) => {
-            let text = text.replace("_", "");
+            let text = text.replace('_', "");
             (if text.starts_with("0x") || text.starts_with("0X") {
                 i64::from_str_radix(&text["0x".len()..], 16)
             } else if text.starts_with('#') {
diff --git a/svdtools/patch.py b/svdtools/patch.py
index 66e232d4..88d2dfb3 100644
--- a/svdtools/patch.py
+++ b/svdtools/patch.py
@@ -1356,7 +1356,9 @@ def process_field_enum(self, pname, fspec, field, usage="read-write"):
 
             if derived is None:
                 if enum is None:
-                    enum = make_enumerated_values(name, field, usage=usage)
+                    enum = make_enumerated_values(
+                        name.replace("%s", ""), field, usage=usage
+                    )
                     enum_name = enum.find("name").text
                     enum_usage = enum.find("usage").text