diff --git a/src/inner/interrupt.rs b/src/inner/interrupt.rs
index 9cbb112..7542f34 100644
--- a/src/inner/interrupt.rs
+++ b/src/inner/interrupt.rs
@@ -91,17 +91,17 @@ pub enum Interrupt {
     #[doc = "45 - POWMAN_IRQ_TIMER"]
     POWMAN_IRQ_TIMER = 45,
     #[doc = "46 - Spare IRQ 0"]
-    SPAREIRQ_IRQ_0 = 46,
+    SW0_IRQ = 46,
     #[doc = "47 - Spare IRQ 1"]
-    SPAREIRQ_IRQ_1 = 47,
+    SW1_IRQ = 47,
     #[doc = "48 - Spare IRQ 2"]
-    SPAREIRQ_IRQ_2 = 48,
+    SW2_IRQ = 48,
     #[doc = "49 - Spare IRQ 3"]
-    SPAREIRQ_IRQ_3 = 49,
+    SW3_IRQ = 49,
     #[doc = "50 - Spare IRQ 4"]
-    SPAREIRQ_IRQ_4 = 50,
+    SW4_IRQ = 50,
     #[doc = "51 - Spare IRQ 5"]
-    SPAREIRQ_IRQ_5 = 51,
+    SW5_IRQ = 51,
 }
 #[doc = r" TryFromInterruptError"]
 #[derive(Debug, Copy, Clone)]
@@ -155,12 +155,12 @@ impl Interrupt {
             43 => Ok(Interrupt::PLL_USB_IRQ),
             44 => Ok(Interrupt::POWMAN_IRQ_POW),
             45 => Ok(Interrupt::POWMAN_IRQ_TIMER),
-            46 => Ok(Interrupt::SPAREIRQ_IRQ_0),
-            47 => Ok(Interrupt::SPAREIRQ_IRQ_1),
-            48 => Ok(Interrupt::SPAREIRQ_IRQ_2),
-            49 => Ok(Interrupt::SPAREIRQ_IRQ_3),
-            50 => Ok(Interrupt::SPAREIRQ_IRQ_4),
-            51 => Ok(Interrupt::SPAREIRQ_IRQ_5),
+            46 => Ok(Interrupt::SW0_IRQ),
+            47 => Ok(Interrupt::SW1_IRQ),
+            48 => Ok(Interrupt::SW2_IRQ),
+            49 => Ok(Interrupt::SW3_IRQ),
+            50 => Ok(Interrupt::SW4_IRQ),
+            51 => Ok(Interrupt::SW5_IRQ),
             _ => Err(TryFromInterruptError(())),
         }
     }
diff --git a/src/inner/mod_cortex_m.rs b/src/inner/mod_cortex_m.rs
index 0ef452d..6c9a299 100644
--- a/src/inner/mod_cortex_m.rs
+++ b/src/inner/mod_cortex_m.rs
@@ -66,12 +66,12 @@ extern "C" {
     fn PLL_USB_IRQ();
     fn POWMAN_IRQ_POW();
     fn POWMAN_IRQ_TIMER();
-    fn SPAREIRQ_IRQ_0();
-    fn SPAREIRQ_IRQ_1();
-    fn SPAREIRQ_IRQ_2();
-    fn SPAREIRQ_IRQ_3();
-    fn SPAREIRQ_IRQ_4();
-    fn SPAREIRQ_IRQ_5();
+    fn SW0_IRQ();
+    fn SW1_IRQ();
+    fn SW2_IRQ();
+    fn SW3_IRQ();
+    fn SW4_IRQ();
+    fn SW5_IRQ();
 }
 #[doc(hidden)]
 #[repr(C)]
@@ -206,24 +206,12 @@ pub static __INTERRUPTS: [Vector; 52] = [
     Vector {
         _handler: POWMAN_IRQ_TIMER,
     },
-    Vector {
-        _handler: SPAREIRQ_IRQ_0,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_1,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_2,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_3,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_4,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_5,
-    },
+    Vector { _handler: SW0_IRQ },
+    Vector { _handler: SW1_IRQ },
+    Vector { _handler: SW2_IRQ },
+    Vector { _handler: SW3_IRQ },
+    Vector { _handler: SW4_IRQ },
+    Vector { _handler: SW5_IRQ },
 ];
 #[doc = r"Enumeration of all the interrupts."]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -318,17 +306,17 @@ pub enum Interrupt {
     #[doc = "45 - POWMAN_IRQ_TIMER"]
     POWMAN_IRQ_TIMER = 45,
     #[doc = "46 - Spare IRQ 0"]
-    SPAREIRQ_IRQ_0 = 46,
+    SW0_IRQ = 46,
     #[doc = "47 - Spare IRQ 1"]
-    SPAREIRQ_IRQ_1 = 47,
+    SW1_IRQ = 47,
     #[doc = "48 - Spare IRQ 2"]
-    SPAREIRQ_IRQ_2 = 48,
+    SW2_IRQ = 48,
     #[doc = "49 - Spare IRQ 3"]
-    SPAREIRQ_IRQ_3 = 49,
+    SW3_IRQ = 49,
     #[doc = "50 - Spare IRQ 4"]
-    SPAREIRQ_IRQ_4 = 50,
+    SW4_IRQ = 50,
     #[doc = "51 - Spare IRQ 5"]
-    SPAREIRQ_IRQ_5 = 51,
+    SW5_IRQ = 51,
 }
 unsafe impl cortex_m::interrupt::InterruptNumber for Interrupt {
     #[inline(always)]
diff --git a/src/inner/mod_risc_v.rs b/src/inner/mod_risc_v.rs
index 1bf4478..635b1f7 100644
--- a/src/inner/mod_risc_v.rs
+++ b/src/inner/mod_risc_v.rs
@@ -62,12 +62,12 @@ extern "C" {
     fn PLL_USB_IRQ();
     fn POWMAN_IRQ_POW();
     fn POWMAN_IRQ_TIMER();
-    fn SPAREIRQ_IRQ_0();
-    fn SPAREIRQ_IRQ_1();
-    fn SPAREIRQ_IRQ_2();
-    fn SPAREIRQ_IRQ_3();
-    fn SPAREIRQ_IRQ_4();
-    fn SPAREIRQ_IRQ_5();
+    fn SW0_IRQ();
+    fn SW1_IRQ();
+    fn SW2_IRQ();
+    fn SW3_IRQ();
+    fn SW4_IRQ();
+    fn SW5_IRQ();
 }
 #[doc(hidden)]
 #[repr(C)]
@@ -201,24 +201,12 @@ pub static __EXTERNAL_INTERRUPTS: [Vector; 52] = [
     Vector {
         _handler: POWMAN_IRQ_TIMER,
     },
-    Vector {
-        _handler: SPAREIRQ_IRQ_0,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_1,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_2,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_3,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_4,
-    },
-    Vector {
-        _handler: SPAREIRQ_IRQ_5,
-    },
+    Vector { _handler: SW0_IRQ },
+    Vector { _handler: SW1_IRQ },
+    Vector { _handler: SW2_IRQ },
+    Vector { _handler: SW3_IRQ },
+    Vector { _handler: SW4_IRQ },
+    Vector { _handler: SW5_IRQ },
 ];
 #[doc(hidden)]
 pub mod interrupt;
diff --git a/svd/RP2350.svd.patched b/svd/RP2350.svd.patched
index 0e40d1a..cc7c887 100644
--- a/svd/RP2350.svd.patched
+++ b/svd/RP2350.svd.patched
@@ -64617,36 +64617,36 @@
       </registers>
     </peripheral>
     <peripheral>
-      <name>SWP_IRQ</name>
+      <name>SW_IRQ</name>
       <description>Virtual Peripheral to access unused NVIC software interrupts</description>
       <baseAddress>0x00000000</baseAddress>
       <interrupt>
-        <name>spareirq_irq_0</name>
+        <name>sw0_irq</name>
         <description>Spare IRQ 0</description>
         <value>46</value>
       </interrupt>
       <interrupt>
-        <name>spareirq_irq_1</name>
+        <name>sw1_irq</name>
         <description>Spare IRQ 1</description>
         <value>47</value>
       </interrupt>
       <interrupt>
-        <name>spareirq_irq_2</name>
+        <name>sw2_irq</name>
         <description>Spare IRQ 2</description>
         <value>48</value>
       </interrupt>
       <interrupt>
-        <name>spareirq_irq_3</name>
+        <name>sw3_irq</name>
         <description>Spare IRQ 3</description>
         <value>49</value>
       </interrupt>
       <interrupt>
-        <name>spareirq_irq_4</name>
+        <name>sw4_irq</name>
         <description>Spare IRQ 4</description>
         <value>50</value>
       </interrupt>
       <interrupt>
-        <name>spareirq_irq_5</name>
+        <name>sw5_irq</name>
         <description>Spare IRQ 5</description>
         <value>51</value>
       </interrupt>