diff --git a/common_patches/assist_debug.yaml b/common_patches/assist_debug.yaml
new file mode 100644
index 0000000000..91ccb20b98
--- /dev/null
+++ b/common_patches/assist_debug.yaml
@@ -0,0 +1,11 @@
+_modify:
+  "C0RE_0_DEBUG_MODE":
+    name: "CORE_0_DEBUG_MODE"
+    description: "ASSIST_DEBUG_CORE_0_DEBUG_MODE"
+  "C0RE_0_LASTPC_BEFORE_EXCEPTION":
+    name: "CORE_0_LASTPC_BEFORE_EXCEPTION"
+    description: "ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION"
+  "CORE_0_MONTR_ENA":
+    description: "ASSIST_DEBUG_CORE_0_MONTR_ENA_REG"
+
+
diff --git a/esp32c3/src/assist_debug.rs b/esp32c3/src/assist_debug.rs
index 6edd0fd024..fae660975c 100644
--- a/esp32c3/src/assist_debug.rs
+++ b/esp32c3/src/assist_debug.rs
@@ -39,13 +39,13 @@ pub struct RegisterBlock {
     log_mem_end: LOG_MEM_END,
     log_mem_writing_addr: LOG_MEM_WRITING_ADDR,
     log_mem_full_flag: LOG_MEM_FULL_FLAG,
-    c0re_0_lastpc_before_exception: C0RE_0_LASTPC_BEFORE_EXCEPTION,
-    c0re_0_debug_mode: C0RE_0_DEBUG_MODE,
+    core_0_lastpc_before_exception: CORE_0_LASTPC_BEFORE_EXCEPTION,
+    core_0_debug_mode: CORE_0_DEBUG_MODE,
     _reserved39: [u8; 0x0160],
     date: DATE,
 }
 impl RegisterBlock {
-    #[doc = "0x00 - ASSIST_DEBUG_C0RE_0_MONTR_ENA_REG"]
+    #[doc = "0x00 - ASSIST_DEBUG_CORE_0_MONTR_ENA_REG"]
     #[inline(always)]
     pub const fn core_0_montr_ena(&self) -> &CORE_0_MONTR_ENA {
         &self.core_0_montr_ena
@@ -234,15 +234,15 @@ impl RegisterBlock {
     pub const fn log_mem_full_flag(&self) -> &LOG_MEM_FULL_FLAG {
         &self.log_mem_full_flag
     }
-    #[doc = "0x94 - ASSIST_DEBUG_C0RE_0_LASTPC_BEFORE_EXCEPTION"]
+    #[doc = "0x94 - ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION"]
     #[inline(always)]
-    pub const fn c0re_0_lastpc_before_exception(&self) -> &C0RE_0_LASTPC_BEFORE_EXCEPTION {
-        &self.c0re_0_lastpc_before_exception
+    pub const fn core_0_lastpc_before_exception(&self) -> &CORE_0_LASTPC_BEFORE_EXCEPTION {
+        &self.core_0_lastpc_before_exception
     }
-    #[doc = "0x98 - ASSIST_DEBUG_C0RE_0_DEBUG_MODE"]
+    #[doc = "0x98 - ASSIST_DEBUG_CORE_0_DEBUG_MODE"]
     #[inline(always)]
-    pub const fn c0re_0_debug_mode(&self) -> &C0RE_0_DEBUG_MODE {
-        &self.c0re_0_debug_mode
+    pub const fn core_0_debug_mode(&self) -> &CORE_0_DEBUG_MODE {
+        &self.core_0_debug_mode
     }
     #[doc = "0x1fc - ASSIST_DEBUG_DATE_REG"]
     #[inline(always)]
@@ -250,9 +250,9 @@ impl RegisterBlock {
         &self.date
     }
 }
-#[doc = "CORE_0_MONTR_ENA (rw) register accessor: ASSIST_DEBUG_C0RE_0_MONTR_ENA_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_montr_ena`] module"]
+#[doc = "CORE_0_MONTR_ENA (rw) register accessor: ASSIST_DEBUG_CORE_0_MONTR_ENA_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_montr_ena`] module"]
 pub type CORE_0_MONTR_ENA = crate::Reg<core_0_montr_ena::CORE_0_MONTR_ENA_SPEC>;
-#[doc = "ASSIST_DEBUG_C0RE_0_MONTR_ENA_REG"]
+#[doc = "ASSIST_DEBUG_CORE_0_MONTR_ENA_REG"]
 pub mod core_0_montr_ena;
 #[doc = "CORE_0_INTR_RAW (r) register accessor: ASSIST_DEBUG_CORE_0_INTR_RAW_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_intr_raw::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_intr_raw`] module"]
 pub type CORE_0_INTR_RAW = crate::Reg<core_0_intr_raw::CORE_0_INTR_RAW_SPEC>;
@@ -410,15 +410,15 @@ pub mod log_mem_writing_addr;
 pub type LOG_MEM_FULL_FLAG = crate::Reg<log_mem_full_flag::LOG_MEM_FULL_FLAG_SPEC>;
 #[doc = "ASSIST_DEBUG_LOG_MEM_FULL_FLAG_REG"]
 pub mod log_mem_full_flag;
-#[doc = "C0RE_0_LASTPC_BEFORE_EXCEPTION (r) register accessor: ASSIST_DEBUG_C0RE_0_LASTPC_BEFORE_EXCEPTION\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_lastpc_before_exception::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@c0re_0_lastpc_before_exception`] module"]
-pub type C0RE_0_LASTPC_BEFORE_EXCEPTION =
-    crate::Reg<c0re_0_lastpc_before_exception::C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
-#[doc = "ASSIST_DEBUG_C0RE_0_LASTPC_BEFORE_EXCEPTION"]
-pub mod c0re_0_lastpc_before_exception;
-#[doc = "C0RE_0_DEBUG_MODE (r) register accessor: ASSIST_DEBUG_C0RE_0_DEBUG_MODE\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_debug_mode::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@c0re_0_debug_mode`] module"]
-pub type C0RE_0_DEBUG_MODE = crate::Reg<c0re_0_debug_mode::C0RE_0_DEBUG_MODE_SPEC>;
-#[doc = "ASSIST_DEBUG_C0RE_0_DEBUG_MODE"]
-pub mod c0re_0_debug_mode;
+#[doc = "CORE_0_LASTPC_BEFORE_EXCEPTION (r) register accessor: ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_lastpc_before_exception::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_lastpc_before_exception`] module"]
+pub type CORE_0_LASTPC_BEFORE_EXCEPTION =
+    crate::Reg<core_0_lastpc_before_exception::CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
+#[doc = "ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION"]
+pub mod core_0_lastpc_before_exception;
+#[doc = "CORE_0_DEBUG_MODE (r) register accessor: ASSIST_DEBUG_CORE_0_DEBUG_MODE\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_debug_mode::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_debug_mode`] module"]
+pub type CORE_0_DEBUG_MODE = crate::Reg<core_0_debug_mode::CORE_0_DEBUG_MODE_SPEC>;
+#[doc = "ASSIST_DEBUG_CORE_0_DEBUG_MODE"]
+pub mod core_0_debug_mode;
 #[doc = "DATE (rw) register accessor: ASSIST_DEBUG_DATE_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`date::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`date::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@date`] module"]
 pub type DATE = crate::Reg<date::DATE_SPEC>;
 #[doc = "ASSIST_DEBUG_DATE_REG"]
diff --git a/esp32c3/src/assist_debug/c0re_0_debug_mode.rs b/esp32c3/src/assist_debug/core_0_debug_mode.rs
similarity index 67%
rename from esp32c3/src/assist_debug/c0re_0_debug_mode.rs
rename to esp32c3/src/assist_debug/core_0_debug_mode.rs
index 56204da31e..735a088456 100644
--- a/esp32c3/src/assist_debug/c0re_0_debug_mode.rs
+++ b/esp32c3/src/assist_debug/core_0_debug_mode.rs
@@ -1,5 +1,5 @@
-#[doc = "Register `C0RE_0_DEBUG_MODE` reader"]
-pub type R = crate::R<C0RE_0_DEBUG_MODE_SPEC>;
+#[doc = "Register `CORE_0_DEBUG_MODE` reader"]
+pub type R = crate::R<CORE_0_DEBUG_MODE_SPEC>;
 #[doc = "Field `CORE_0_DEBUG_MODE` reader - reg_core_0_debug_mode"]
 pub type CORE_0_DEBUG_MODE_R = crate::BitReader;
 #[doc = "Field `CORE_0_DEBUG_MODULE_ACTIVE` reader - reg_core_0_debug_module_active"]
@@ -19,7 +19,7 @@ impl R {
 #[cfg(feature = "impl-register-debug")]
 impl core::fmt::Debug for R {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_struct("C0RE_0_DEBUG_MODE")
+        f.debug_struct("CORE_0_DEBUG_MODE")
             .field("core_0_debug_mode", &self.core_0_debug_mode())
             .field(
                 "core_0_debug_module_active",
@@ -28,14 +28,14 @@ impl core::fmt::Debug for R {
             .finish()
     }
 }
-#[doc = "ASSIST_DEBUG_C0RE_0_DEBUG_MODE\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_debug_mode::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
-pub struct C0RE_0_DEBUG_MODE_SPEC;
-impl crate::RegisterSpec for C0RE_0_DEBUG_MODE_SPEC {
+#[doc = "ASSIST_DEBUG_CORE_0_DEBUG_MODE\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_debug_mode::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+pub struct CORE_0_DEBUG_MODE_SPEC;
+impl crate::RegisterSpec for CORE_0_DEBUG_MODE_SPEC {
     type Ux = u32;
 }
-#[doc = "`read()` method returns [`c0re_0_debug_mode::R`](R) reader structure"]
-impl crate::Readable for C0RE_0_DEBUG_MODE_SPEC {}
-#[doc = "`reset()` method sets C0RE_0_DEBUG_MODE to value 0"]
-impl crate::Resettable for C0RE_0_DEBUG_MODE_SPEC {
+#[doc = "`read()` method returns [`core_0_debug_mode::R`](R) reader structure"]
+impl crate::Readable for CORE_0_DEBUG_MODE_SPEC {}
+#[doc = "`reset()` method sets CORE_0_DEBUG_MODE to value 0"]
+impl crate::Resettable for CORE_0_DEBUG_MODE_SPEC {
     const RESET_VALUE: u32 = 0;
 }
diff --git a/esp32c3/src/assist_debug/c0re_0_lastpc_before_exception.rs b/esp32c3/src/assist_debug/core_0_lastpc_before_exception.rs
similarity index 54%
rename from esp32c3/src/assist_debug/c0re_0_lastpc_before_exception.rs
rename to esp32c3/src/assist_debug/core_0_lastpc_before_exception.rs
index 3493cf223b..1a1548faf1 100644
--- a/esp32c3/src/assist_debug/c0re_0_lastpc_before_exception.rs
+++ b/esp32c3/src/assist_debug/core_0_lastpc_before_exception.rs
@@ -1,5 +1,5 @@
-#[doc = "Register `C0RE_0_LASTPC_BEFORE_EXCEPTION` reader"]
-pub type R = crate::R<C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
+#[doc = "Register `CORE_0_LASTPC_BEFORE_EXCEPTION` reader"]
+pub type R = crate::R<CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
 #[doc = "Field `CORE_0_LASTPC_BEFORE_EXC` reader - reg_core_0_lastpc_before_exc"]
 pub type CORE_0_LASTPC_BEFORE_EXC_R = crate::FieldReader<u32>;
 impl R {
@@ -12,19 +12,19 @@ impl R {
 #[cfg(feature = "impl-register-debug")]
 impl core::fmt::Debug for R {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_struct("C0RE_0_LASTPC_BEFORE_EXCEPTION")
+        f.debug_struct("CORE_0_LASTPC_BEFORE_EXCEPTION")
             .field("core_0_lastpc_before_exc", &self.core_0_lastpc_before_exc())
             .finish()
     }
 }
-#[doc = "ASSIST_DEBUG_C0RE_0_LASTPC_BEFORE_EXCEPTION\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_lastpc_before_exception::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
-pub struct C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC;
-impl crate::RegisterSpec for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
+#[doc = "ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_lastpc_before_exception::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+pub struct CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC;
+impl crate::RegisterSpec for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
     type Ux = u32;
 }
-#[doc = "`read()` method returns [`c0re_0_lastpc_before_exception::R`](R) reader structure"]
-impl crate::Readable for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {}
-#[doc = "`reset()` method sets C0RE_0_LASTPC_BEFORE_EXCEPTION to value 0"]
-impl crate::Resettable for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
+#[doc = "`read()` method returns [`core_0_lastpc_before_exception::R`](R) reader structure"]
+impl crate::Readable for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {}
+#[doc = "`reset()` method sets CORE_0_LASTPC_BEFORE_EXCEPTION to value 0"]
+impl crate::Resettable for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
     const RESET_VALUE: u32 = 0;
 }
diff --git a/esp32c3/src/assist_debug/core_0_montr_ena.rs b/esp32c3/src/assist_debug/core_0_montr_ena.rs
index 220ebd1830..249f1e379a 100644
--- a/esp32c3/src/assist_debug/core_0_montr_ena.rs
+++ b/esp32c3/src/assist_debug/core_0_montr_ena.rs
@@ -243,7 +243,7 @@ impl W {
         CORE_0_DRAM0_EXCEPTION_MONITOR_ENA_W::new(self, 11)
     }
 }
-#[doc = "ASSIST_DEBUG_C0RE_0_MONTR_ENA_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`](R). You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`](W). You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+#[doc = "ASSIST_DEBUG_CORE_0_MONTR_ENA_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`](R). You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`](W). You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
 pub struct CORE_0_MONTR_ENA_SPEC;
 impl crate::RegisterSpec for CORE_0_MONTR_ENA_SPEC {
     type Ux = u32;
diff --git a/esp32c3/svd/patches/esp32c3.yaml b/esp32c3/svd/patches/esp32c3.yaml
index b30680d97d..8868c4e0da 100644
--- a/esp32c3/svd/patches/esp32c3.yaml
+++ b/esp32c3/svd/patches/esp32c3.yaml
@@ -337,3 +337,7 @@ DMA:
         name: OUT_PRI
       OUT_PERI_SEL_CH?:
         name: OUT_PERI_SEL
+
+ASSIST_DEBUG:
+  _include: ../../../common_patches/assist_debug.yaml
+  
\ No newline at end of file
diff --git a/esp32c6/src/assist_debug.rs b/esp32c6/src/assist_debug.rs
index 215a977904..895fb8dbd6 100644
--- a/esp32c6/src/assist_debug.rs
+++ b/esp32c6/src/assist_debug.rs
@@ -30,14 +30,14 @@ pub struct RegisterBlock {
     core_0_dram0_exception_monitor_3: CORE_0_DRAM0_EXCEPTION_MONITOR_3,
     core_x_iram0_dram0_exception_monitor_0: CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_0,
     core_x_iram0_dram0_exception_monitor_1: CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_1,
-    c0re_0_lastpc_before_exception: C0RE_0_LASTPC_BEFORE_EXCEPTION,
-    c0re_0_debug_mode: C0RE_0_DEBUG_MODE,
+    core_0_lastpc_before_exception: CORE_0_LASTPC_BEFORE_EXCEPTION,
+    core_0_debug_mode: CORE_0_DEBUG_MODE,
     clock_gate: CLOCK_GATE,
     _reserved31: [u8; 0x0380],
     date: DATE,
 }
 impl RegisterBlock {
-    #[doc = "0x00 - core0 monitor enable configuration register"]
+    #[doc = "0x00 - ASSIST_DEBUG_CORE_0_MONTR_ENA_REG"]
     #[inline(always)]
     pub const fn core_0_montr_ena(&self) -> &CORE_0_MONTR_ENA {
         &self.core_0_montr_ena
@@ -181,15 +181,15 @@ impl RegisterBlock {
     ) -> &CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_1 {
         &self.core_x_iram0_dram0_exception_monitor_1
     }
-    #[doc = "0x70 - cpu status register"]
+    #[doc = "0x70 - ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION"]
     #[inline(always)]
-    pub const fn c0re_0_lastpc_before_exception(&self) -> &C0RE_0_LASTPC_BEFORE_EXCEPTION {
-        &self.c0re_0_lastpc_before_exception
+    pub const fn core_0_lastpc_before_exception(&self) -> &CORE_0_LASTPC_BEFORE_EXCEPTION {
+        &self.core_0_lastpc_before_exception
     }
-    #[doc = "0x74 - cpu status register"]
+    #[doc = "0x74 - ASSIST_DEBUG_CORE_0_DEBUG_MODE"]
     #[inline(always)]
-    pub const fn c0re_0_debug_mode(&self) -> &C0RE_0_DEBUG_MODE {
-        &self.c0re_0_debug_mode
+    pub const fn core_0_debug_mode(&self) -> &CORE_0_DEBUG_MODE {
+        &self.core_0_debug_mode
     }
     #[doc = "0x78 - clock register"]
     #[inline(always)]
@@ -202,9 +202,9 @@ impl RegisterBlock {
         &self.date
     }
 }
-#[doc = "CORE_0_MONTR_ENA (rw) register accessor: core0 monitor enable configuration register\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_montr_ena`] module"]
+#[doc = "CORE_0_MONTR_ENA (rw) register accessor: ASSIST_DEBUG_CORE_0_MONTR_ENA_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_montr_ena`] module"]
 pub type CORE_0_MONTR_ENA = crate::Reg<core_0_montr_ena::CORE_0_MONTR_ENA_SPEC>;
-#[doc = "core0 monitor enable configuration register"]
+#[doc = "ASSIST_DEBUG_CORE_0_MONTR_ENA_REG"]
 pub mod core_0_montr_ena;
 #[doc = "CORE_0_INTR_RAW (r) register accessor: core0 monitor interrupt status register\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_intr_raw::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_intr_raw`] module"]
 pub type CORE_0_INTR_RAW = crate::Reg<core_0_intr_raw::CORE_0_INTR_RAW_SPEC>;
@@ -326,15 +326,15 @@ pub type CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_1 =
     crate::Reg<core_x_iram0_dram0_exception_monitor_1::CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_1_SPEC>;
 #[doc = "exception monitor status register7"]
 pub mod core_x_iram0_dram0_exception_monitor_1;
-#[doc = "C0RE_0_LASTPC_BEFORE_EXCEPTION (r) register accessor: cpu status register\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_lastpc_before_exception::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@c0re_0_lastpc_before_exception`] module"]
-pub type C0RE_0_LASTPC_BEFORE_EXCEPTION =
-    crate::Reg<c0re_0_lastpc_before_exception::C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
-#[doc = "cpu status register"]
-pub mod c0re_0_lastpc_before_exception;
-#[doc = "C0RE_0_DEBUG_MODE (r) register accessor: cpu status register\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_debug_mode::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@c0re_0_debug_mode`] module"]
-pub type C0RE_0_DEBUG_MODE = crate::Reg<c0re_0_debug_mode::C0RE_0_DEBUG_MODE_SPEC>;
-#[doc = "cpu status register"]
-pub mod c0re_0_debug_mode;
+#[doc = "CORE_0_LASTPC_BEFORE_EXCEPTION (r) register accessor: ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_lastpc_before_exception::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_lastpc_before_exception`] module"]
+pub type CORE_0_LASTPC_BEFORE_EXCEPTION =
+    crate::Reg<core_0_lastpc_before_exception::CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
+#[doc = "ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION"]
+pub mod core_0_lastpc_before_exception;
+#[doc = "CORE_0_DEBUG_MODE (r) register accessor: ASSIST_DEBUG_CORE_0_DEBUG_MODE\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_debug_mode::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_debug_mode`] module"]
+pub type CORE_0_DEBUG_MODE = crate::Reg<core_0_debug_mode::CORE_0_DEBUG_MODE_SPEC>;
+#[doc = "ASSIST_DEBUG_CORE_0_DEBUG_MODE"]
+pub mod core_0_debug_mode;
 #[doc = "CLOCK_GATE (rw) register accessor: clock register\n\nYou can [`read`](crate::Reg::read) this register and get [`clock_gate::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`clock_gate::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@clock_gate`] module"]
 pub type CLOCK_GATE = crate::Reg<clock_gate::CLOCK_GATE_SPEC>;
 #[doc = "clock register"]
diff --git a/esp32c6/src/assist_debug/c0re_0_lastpc_before_exception.rs b/esp32c6/src/assist_debug/c0re_0_lastpc_before_exception.rs
deleted file mode 100644
index 416f6bed2a..0000000000
--- a/esp32c6/src/assist_debug/c0re_0_lastpc_before_exception.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-#[doc = "Register `C0RE_0_LASTPC_BEFORE_EXCEPTION` reader"]
-pub type R = crate::R<C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
-#[doc = "Field `CORE_0_LASTPC_BEFORE_EXC` reader - cpu's lastpc before exception"]
-pub type CORE_0_LASTPC_BEFORE_EXC_R = crate::FieldReader<u32>;
-impl R {
-    #[doc = "Bits 0:31 - cpu's lastpc before exception"]
-    #[inline(always)]
-    pub fn core_0_lastpc_before_exc(&self) -> CORE_0_LASTPC_BEFORE_EXC_R {
-        CORE_0_LASTPC_BEFORE_EXC_R::new(self.bits)
-    }
-}
-#[cfg(feature = "impl-register-debug")]
-impl core::fmt::Debug for R {
-    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_struct("C0RE_0_LASTPC_BEFORE_EXCEPTION")
-            .field("core_0_lastpc_before_exc", &self.core_0_lastpc_before_exc())
-            .finish()
-    }
-}
-#[doc = "cpu status register\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_lastpc_before_exception::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
-pub struct C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC;
-impl crate::RegisterSpec for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
-    type Ux = u32;
-}
-#[doc = "`read()` method returns [`c0re_0_lastpc_before_exception::R`](R) reader structure"]
-impl crate::Readable for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {}
-#[doc = "`reset()` method sets C0RE_0_LASTPC_BEFORE_EXCEPTION to value 0"]
-impl crate::Resettable for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
-    const RESET_VALUE: u32 = 0;
-}
diff --git a/esp32h2/src/assist_debug/c0re_0_debug_mode.rs b/esp32c6/src/assist_debug/core_0_debug_mode.rs
similarity index 64%
rename from esp32h2/src/assist_debug/c0re_0_debug_mode.rs
rename to esp32c6/src/assist_debug/core_0_debug_mode.rs
index f9a4c33106..9d04a1c514 100644
--- a/esp32h2/src/assist_debug/c0re_0_debug_mode.rs
+++ b/esp32c6/src/assist_debug/core_0_debug_mode.rs
@@ -1,5 +1,5 @@
-#[doc = "Register `C0RE_0_DEBUG_MODE` reader"]
-pub type R = crate::R<C0RE_0_DEBUG_MODE_SPEC>;
+#[doc = "Register `CORE_0_DEBUG_MODE` reader"]
+pub type R = crate::R<CORE_0_DEBUG_MODE_SPEC>;
 #[doc = "Field `CORE_0_DEBUG_MODE` reader - cpu debug mode status, 1 means cpu enter debug mode."]
 pub type CORE_0_DEBUG_MODE_R = crate::BitReader;
 #[doc = "Field `CORE_0_DEBUG_MODULE_ACTIVE` reader - cpu debug_module active status"]
@@ -19,7 +19,7 @@ impl R {
 #[cfg(feature = "impl-register-debug")]
 impl core::fmt::Debug for R {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_struct("C0RE_0_DEBUG_MODE")
+        f.debug_struct("CORE_0_DEBUG_MODE")
             .field("core_0_debug_mode", &self.core_0_debug_mode())
             .field(
                 "core_0_debug_module_active",
@@ -28,14 +28,14 @@ impl core::fmt::Debug for R {
             .finish()
     }
 }
-#[doc = "cpu status register\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_debug_mode::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
-pub struct C0RE_0_DEBUG_MODE_SPEC;
-impl crate::RegisterSpec for C0RE_0_DEBUG_MODE_SPEC {
+#[doc = "ASSIST_DEBUG_CORE_0_DEBUG_MODE\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_debug_mode::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+pub struct CORE_0_DEBUG_MODE_SPEC;
+impl crate::RegisterSpec for CORE_0_DEBUG_MODE_SPEC {
     type Ux = u32;
 }
-#[doc = "`read()` method returns [`c0re_0_debug_mode::R`](R) reader structure"]
-impl crate::Readable for C0RE_0_DEBUG_MODE_SPEC {}
-#[doc = "`reset()` method sets C0RE_0_DEBUG_MODE to value 0"]
-impl crate::Resettable for C0RE_0_DEBUG_MODE_SPEC {
+#[doc = "`read()` method returns [`core_0_debug_mode::R`](R) reader structure"]
+impl crate::Readable for CORE_0_DEBUG_MODE_SPEC {}
+#[doc = "`reset()` method sets CORE_0_DEBUG_MODE to value 0"]
+impl crate::Resettable for CORE_0_DEBUG_MODE_SPEC {
     const RESET_VALUE: u32 = 0;
 }
diff --git a/esp32c6/src/assist_debug/core_0_lastpc_before_exception.rs b/esp32c6/src/assist_debug/core_0_lastpc_before_exception.rs
new file mode 100644
index 0000000000..a82faec8e4
--- /dev/null
+++ b/esp32c6/src/assist_debug/core_0_lastpc_before_exception.rs
@@ -0,0 +1,30 @@
+#[doc = "Register `CORE_0_LASTPC_BEFORE_EXCEPTION` reader"]
+pub type R = crate::R<CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
+#[doc = "Field `CORE_0_LASTPC_BEFORE_EXC` reader - cpu's lastpc before exception"]
+pub type CORE_0_LASTPC_BEFORE_EXC_R = crate::FieldReader<u32>;
+impl R {
+    #[doc = "Bits 0:31 - cpu's lastpc before exception"]
+    #[inline(always)]
+    pub fn core_0_lastpc_before_exc(&self) -> CORE_0_LASTPC_BEFORE_EXC_R {
+        CORE_0_LASTPC_BEFORE_EXC_R::new(self.bits)
+    }
+}
+#[cfg(feature = "impl-register-debug")]
+impl core::fmt::Debug for R {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+        f.debug_struct("CORE_0_LASTPC_BEFORE_EXCEPTION")
+            .field("core_0_lastpc_before_exc", &self.core_0_lastpc_before_exc())
+            .finish()
+    }
+}
+#[doc = "ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_lastpc_before_exception::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+pub struct CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC;
+impl crate::RegisterSpec for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
+    type Ux = u32;
+}
+#[doc = "`read()` method returns [`core_0_lastpc_before_exception::R`](R) reader structure"]
+impl crate::Readable for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {}
+#[doc = "`reset()` method sets CORE_0_LASTPC_BEFORE_EXCEPTION to value 0"]
+impl crate::Resettable for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
+    const RESET_VALUE: u32 = 0;
+}
diff --git a/esp32c6/src/assist_debug/core_0_montr_ena.rs b/esp32c6/src/assist_debug/core_0_montr_ena.rs
index b9f6ee4921..46ae3bf9ad 100644
--- a/esp32c6/src/assist_debug/core_0_montr_ena.rs
+++ b/esp32c6/src/assist_debug/core_0_montr_ena.rs
@@ -243,7 +243,7 @@ impl W {
         CORE_0_DRAM0_EXCEPTION_MONITOR_ENA_W::new(self, 11)
     }
 }
-#[doc = "core0 monitor enable configuration register\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`](R). You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`](W). You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+#[doc = "ASSIST_DEBUG_CORE_0_MONTR_ENA_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`](R). You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`](W). You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
 pub struct CORE_0_MONTR_ENA_SPEC;
 impl crate::RegisterSpec for CORE_0_MONTR_ENA_SPEC {
     type Ux = u32;
diff --git a/esp32c6/svd/patches/esp32c6.yaml b/esp32c6/svd/patches/esp32c6.yaml
index 5f8f29c4e3..5042cc78e0 100644
--- a/esp32c6/svd/patches/esp32c6.yaml
+++ b/esp32c6/svd/patches/esp32c6.yaml
@@ -460,3 +460,7 @@ DMA:
         name: OUT_PRI
       OUT_PERI_SEL_CH?:
         name: OUT_PERI_SEL
+
+ASSIST_DEBUG:
+  _include: ../../../common_patches/assist_debug.yaml
+  
\ No newline at end of file
diff --git a/esp32h2/src/assist_debug.rs b/esp32h2/src/assist_debug.rs
index 215a977904..895fb8dbd6 100644
--- a/esp32h2/src/assist_debug.rs
+++ b/esp32h2/src/assist_debug.rs
@@ -30,14 +30,14 @@ pub struct RegisterBlock {
     core_0_dram0_exception_monitor_3: CORE_0_DRAM0_EXCEPTION_MONITOR_3,
     core_x_iram0_dram0_exception_monitor_0: CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_0,
     core_x_iram0_dram0_exception_monitor_1: CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_1,
-    c0re_0_lastpc_before_exception: C0RE_0_LASTPC_BEFORE_EXCEPTION,
-    c0re_0_debug_mode: C0RE_0_DEBUG_MODE,
+    core_0_lastpc_before_exception: CORE_0_LASTPC_BEFORE_EXCEPTION,
+    core_0_debug_mode: CORE_0_DEBUG_MODE,
     clock_gate: CLOCK_GATE,
     _reserved31: [u8; 0x0380],
     date: DATE,
 }
 impl RegisterBlock {
-    #[doc = "0x00 - core0 monitor enable configuration register"]
+    #[doc = "0x00 - ASSIST_DEBUG_CORE_0_MONTR_ENA_REG"]
     #[inline(always)]
     pub const fn core_0_montr_ena(&self) -> &CORE_0_MONTR_ENA {
         &self.core_0_montr_ena
@@ -181,15 +181,15 @@ impl RegisterBlock {
     ) -> &CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_1 {
         &self.core_x_iram0_dram0_exception_monitor_1
     }
-    #[doc = "0x70 - cpu status register"]
+    #[doc = "0x70 - ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION"]
     #[inline(always)]
-    pub const fn c0re_0_lastpc_before_exception(&self) -> &C0RE_0_LASTPC_BEFORE_EXCEPTION {
-        &self.c0re_0_lastpc_before_exception
+    pub const fn core_0_lastpc_before_exception(&self) -> &CORE_0_LASTPC_BEFORE_EXCEPTION {
+        &self.core_0_lastpc_before_exception
     }
-    #[doc = "0x74 - cpu status register"]
+    #[doc = "0x74 - ASSIST_DEBUG_CORE_0_DEBUG_MODE"]
     #[inline(always)]
-    pub const fn c0re_0_debug_mode(&self) -> &C0RE_0_DEBUG_MODE {
-        &self.c0re_0_debug_mode
+    pub const fn core_0_debug_mode(&self) -> &CORE_0_DEBUG_MODE {
+        &self.core_0_debug_mode
     }
     #[doc = "0x78 - clock register"]
     #[inline(always)]
@@ -202,9 +202,9 @@ impl RegisterBlock {
         &self.date
     }
 }
-#[doc = "CORE_0_MONTR_ENA (rw) register accessor: core0 monitor enable configuration register\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_montr_ena`] module"]
+#[doc = "CORE_0_MONTR_ENA (rw) register accessor: ASSIST_DEBUG_CORE_0_MONTR_ENA_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_montr_ena`] module"]
 pub type CORE_0_MONTR_ENA = crate::Reg<core_0_montr_ena::CORE_0_MONTR_ENA_SPEC>;
-#[doc = "core0 monitor enable configuration register"]
+#[doc = "ASSIST_DEBUG_CORE_0_MONTR_ENA_REG"]
 pub mod core_0_montr_ena;
 #[doc = "CORE_0_INTR_RAW (r) register accessor: core0 monitor interrupt status register\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_intr_raw::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_intr_raw`] module"]
 pub type CORE_0_INTR_RAW = crate::Reg<core_0_intr_raw::CORE_0_INTR_RAW_SPEC>;
@@ -326,15 +326,15 @@ pub type CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_1 =
     crate::Reg<core_x_iram0_dram0_exception_monitor_1::CORE_X_IRAM0_DRAM0_EXCEPTION_MONITOR_1_SPEC>;
 #[doc = "exception monitor status register7"]
 pub mod core_x_iram0_dram0_exception_monitor_1;
-#[doc = "C0RE_0_LASTPC_BEFORE_EXCEPTION (r) register accessor: cpu status register\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_lastpc_before_exception::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@c0re_0_lastpc_before_exception`] module"]
-pub type C0RE_0_LASTPC_BEFORE_EXCEPTION =
-    crate::Reg<c0re_0_lastpc_before_exception::C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
-#[doc = "cpu status register"]
-pub mod c0re_0_lastpc_before_exception;
-#[doc = "C0RE_0_DEBUG_MODE (r) register accessor: cpu status register\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_debug_mode::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@c0re_0_debug_mode`] module"]
-pub type C0RE_0_DEBUG_MODE = crate::Reg<c0re_0_debug_mode::C0RE_0_DEBUG_MODE_SPEC>;
-#[doc = "cpu status register"]
-pub mod c0re_0_debug_mode;
+#[doc = "CORE_0_LASTPC_BEFORE_EXCEPTION (r) register accessor: ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_lastpc_before_exception::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_lastpc_before_exception`] module"]
+pub type CORE_0_LASTPC_BEFORE_EXCEPTION =
+    crate::Reg<core_0_lastpc_before_exception::CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
+#[doc = "ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION"]
+pub mod core_0_lastpc_before_exception;
+#[doc = "CORE_0_DEBUG_MODE (r) register accessor: ASSIST_DEBUG_CORE_0_DEBUG_MODE\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_debug_mode::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@core_0_debug_mode`] module"]
+pub type CORE_0_DEBUG_MODE = crate::Reg<core_0_debug_mode::CORE_0_DEBUG_MODE_SPEC>;
+#[doc = "ASSIST_DEBUG_CORE_0_DEBUG_MODE"]
+pub mod core_0_debug_mode;
 #[doc = "CLOCK_GATE (rw) register accessor: clock register\n\nYou can [`read`](crate::Reg::read) this register and get [`clock_gate::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`clock_gate::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@clock_gate`] module"]
 pub type CLOCK_GATE = crate::Reg<clock_gate::CLOCK_GATE_SPEC>;
 #[doc = "clock register"]
diff --git a/esp32h2/src/assist_debug/c0re_0_lastpc_before_exception.rs b/esp32h2/src/assist_debug/c0re_0_lastpc_before_exception.rs
deleted file mode 100644
index 416f6bed2a..0000000000
--- a/esp32h2/src/assist_debug/c0re_0_lastpc_before_exception.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-#[doc = "Register `C0RE_0_LASTPC_BEFORE_EXCEPTION` reader"]
-pub type R = crate::R<C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
-#[doc = "Field `CORE_0_LASTPC_BEFORE_EXC` reader - cpu's lastpc before exception"]
-pub type CORE_0_LASTPC_BEFORE_EXC_R = crate::FieldReader<u32>;
-impl R {
-    #[doc = "Bits 0:31 - cpu's lastpc before exception"]
-    #[inline(always)]
-    pub fn core_0_lastpc_before_exc(&self) -> CORE_0_LASTPC_BEFORE_EXC_R {
-        CORE_0_LASTPC_BEFORE_EXC_R::new(self.bits)
-    }
-}
-#[cfg(feature = "impl-register-debug")]
-impl core::fmt::Debug for R {
-    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_struct("C0RE_0_LASTPC_BEFORE_EXCEPTION")
-            .field("core_0_lastpc_before_exc", &self.core_0_lastpc_before_exc())
-            .finish()
-    }
-}
-#[doc = "cpu status register\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_lastpc_before_exception::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
-pub struct C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC;
-impl crate::RegisterSpec for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
-    type Ux = u32;
-}
-#[doc = "`read()` method returns [`c0re_0_lastpc_before_exception::R`](R) reader structure"]
-impl crate::Readable for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {}
-#[doc = "`reset()` method sets C0RE_0_LASTPC_BEFORE_EXCEPTION to value 0"]
-impl crate::Resettable for C0RE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
-    const RESET_VALUE: u32 = 0;
-}
diff --git a/esp32c6/src/assist_debug/c0re_0_debug_mode.rs b/esp32h2/src/assist_debug/core_0_debug_mode.rs
similarity index 64%
rename from esp32c6/src/assist_debug/c0re_0_debug_mode.rs
rename to esp32h2/src/assist_debug/core_0_debug_mode.rs
index f9a4c33106..9d04a1c514 100644
--- a/esp32c6/src/assist_debug/c0re_0_debug_mode.rs
+++ b/esp32h2/src/assist_debug/core_0_debug_mode.rs
@@ -1,5 +1,5 @@
-#[doc = "Register `C0RE_0_DEBUG_MODE` reader"]
-pub type R = crate::R<C0RE_0_DEBUG_MODE_SPEC>;
+#[doc = "Register `CORE_0_DEBUG_MODE` reader"]
+pub type R = crate::R<CORE_0_DEBUG_MODE_SPEC>;
 #[doc = "Field `CORE_0_DEBUG_MODE` reader - cpu debug mode status, 1 means cpu enter debug mode."]
 pub type CORE_0_DEBUG_MODE_R = crate::BitReader;
 #[doc = "Field `CORE_0_DEBUG_MODULE_ACTIVE` reader - cpu debug_module active status"]
@@ -19,7 +19,7 @@ impl R {
 #[cfg(feature = "impl-register-debug")]
 impl core::fmt::Debug for R {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_struct("C0RE_0_DEBUG_MODE")
+        f.debug_struct("CORE_0_DEBUG_MODE")
             .field("core_0_debug_mode", &self.core_0_debug_mode())
             .field(
                 "core_0_debug_module_active",
@@ -28,14 +28,14 @@ impl core::fmt::Debug for R {
             .finish()
     }
 }
-#[doc = "cpu status register\n\nYou can [`read`](crate::Reg::read) this register and get [`c0re_0_debug_mode::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
-pub struct C0RE_0_DEBUG_MODE_SPEC;
-impl crate::RegisterSpec for C0RE_0_DEBUG_MODE_SPEC {
+#[doc = "ASSIST_DEBUG_CORE_0_DEBUG_MODE\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_debug_mode::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+pub struct CORE_0_DEBUG_MODE_SPEC;
+impl crate::RegisterSpec for CORE_0_DEBUG_MODE_SPEC {
     type Ux = u32;
 }
-#[doc = "`read()` method returns [`c0re_0_debug_mode::R`](R) reader structure"]
-impl crate::Readable for C0RE_0_DEBUG_MODE_SPEC {}
-#[doc = "`reset()` method sets C0RE_0_DEBUG_MODE to value 0"]
-impl crate::Resettable for C0RE_0_DEBUG_MODE_SPEC {
+#[doc = "`read()` method returns [`core_0_debug_mode::R`](R) reader structure"]
+impl crate::Readable for CORE_0_DEBUG_MODE_SPEC {}
+#[doc = "`reset()` method sets CORE_0_DEBUG_MODE to value 0"]
+impl crate::Resettable for CORE_0_DEBUG_MODE_SPEC {
     const RESET_VALUE: u32 = 0;
 }
diff --git a/esp32h2/src/assist_debug/core_0_lastpc_before_exception.rs b/esp32h2/src/assist_debug/core_0_lastpc_before_exception.rs
new file mode 100644
index 0000000000..a82faec8e4
--- /dev/null
+++ b/esp32h2/src/assist_debug/core_0_lastpc_before_exception.rs
@@ -0,0 +1,30 @@
+#[doc = "Register `CORE_0_LASTPC_BEFORE_EXCEPTION` reader"]
+pub type R = crate::R<CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC>;
+#[doc = "Field `CORE_0_LASTPC_BEFORE_EXC` reader - cpu's lastpc before exception"]
+pub type CORE_0_LASTPC_BEFORE_EXC_R = crate::FieldReader<u32>;
+impl R {
+    #[doc = "Bits 0:31 - cpu's lastpc before exception"]
+    #[inline(always)]
+    pub fn core_0_lastpc_before_exc(&self) -> CORE_0_LASTPC_BEFORE_EXC_R {
+        CORE_0_LASTPC_BEFORE_EXC_R::new(self.bits)
+    }
+}
+#[cfg(feature = "impl-register-debug")]
+impl core::fmt::Debug for R {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+        f.debug_struct("CORE_0_LASTPC_BEFORE_EXCEPTION")
+            .field("core_0_lastpc_before_exc", &self.core_0_lastpc_before_exc())
+            .finish()
+    }
+}
+#[doc = "ASSIST_DEBUG_CORE_0_LASTPC_BEFORE_EXCEPTION\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_lastpc_before_exception::R`](R). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+pub struct CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC;
+impl crate::RegisterSpec for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
+    type Ux = u32;
+}
+#[doc = "`read()` method returns [`core_0_lastpc_before_exception::R`](R) reader structure"]
+impl crate::Readable for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {}
+#[doc = "`reset()` method sets CORE_0_LASTPC_BEFORE_EXCEPTION to value 0"]
+impl crate::Resettable for CORE_0_LASTPC_BEFORE_EXCEPTION_SPEC {
+    const RESET_VALUE: u32 = 0;
+}
diff --git a/esp32h2/src/assist_debug/core_0_montr_ena.rs b/esp32h2/src/assist_debug/core_0_montr_ena.rs
index b9f6ee4921..46ae3bf9ad 100644
--- a/esp32h2/src/assist_debug/core_0_montr_ena.rs
+++ b/esp32h2/src/assist_debug/core_0_montr_ena.rs
@@ -243,7 +243,7 @@ impl W {
         CORE_0_DRAM0_EXCEPTION_MONITOR_ENA_W::new(self, 11)
     }
 }
-#[doc = "core0 monitor enable configuration register\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`](R). You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`](W). You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+#[doc = "ASSIST_DEBUG_CORE_0_MONTR_ENA_REG\n\nYou can [`read`](crate::Reg::read) this register and get [`core_0_montr_ena::R`](R). You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`core_0_montr_ena::W`](W). You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
 pub struct CORE_0_MONTR_ENA_SPEC;
 impl crate::RegisterSpec for CORE_0_MONTR_ENA_SPEC {
     type Ux = u32;
diff --git a/esp32h2/svd/patches/esp32h2.yaml b/esp32h2/svd/patches/esp32h2.yaml
index f7c40f88f2..9c27112f61 100644
--- a/esp32h2/svd/patches/esp32h2.yaml
+++ b/esp32h2/svd/patches/esp32h2.yaml
@@ -483,3 +483,7 @@ TWAI0:
 _modify:
   IEEE802154:
     baseAddress: 0x600A3000
+
+ASSIST_DEBUG:
+  _include: ../../../common_patches/assist_debug.yaml
+  
\ No newline at end of file