diff --git a/LPC43xx_43Sxx.svd b/LPC43xx_43Sxx.svd
index aeaabd7af863fa75109b47c4d512c9e0d1f526d7..fbac125cbd3037d271a396112236035063174c82 100644
--- a/LPC43xx_43Sxx.svd
+++ b/LPC43xx_43Sxx.svd
@@ -147,77 +147,77 @@
 						<value>0x0</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>FALLING_EDGES_ON_INP</name>										
+						<name>FALLING_EDGES_ON_INPUT_0</name>										
 						<description>Falling edges on input 0.</description>										
 						<value>0x1</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>RISING_EDGES_ON_INPU</name>										
+						<name>RISING_EDGES_ON_INPUT_1</name>										
 						<description>Rising edges on input 1.</description>										
 						<value>0x2</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>FALLING_EDGES_ON_INP</name>										
+						<name>FALLING_EDGES_ON_INPUT_1</name>										
 						<description>Falling edges on input 1.</description>										
 						<value>0x3</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>RISING_EDGES_ON_INPU</name>										
+						<name>RISING_EDGES_ON_INPUT_2</name>										
 						<description>Rising edges on input 2.</description>										
 						<value>0x4</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>FALLING_EDGES_ON_INP</name>										
+						<name>FALLING_EDGES_ON_INPUT_2</name>										
 						<description>Falling edges on input 2.</description>										
 						<value>0x5</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>RISING_EDGES_ON_INPU</name>										
+						<name>RISING_EDGES_ON_INPUT_3</name>										
 						<description>Rising edges on input 3.</description>										
 						<value>0x6</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>FALLING_EDGES_ON_INP</name>										
+						<name>FALLING_EDGES_ON_INPUT_3</name>										
 						<description>Falling edges on input 3.</description>										
 						<value>0x7</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>RISING_EDGES_ON_INPU</name>										
+						<name>RISING_EDGES_ON_INPUT_4</name>										
 						<description>Rising edges on input 4.</description>										
 						<value>0x8</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>FALLING_EDGES_ON_INP</name>										
+						<name>FALLING_EDGES_ON_INPUT_4</name>										
 						<description>Falling edges on input 4.</description>										
 						<value>0x9</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>RISING_EDGES_ON_INPU</name>										
+						<name>RISING_EDGES_ON_INPUT_5</name>										
 						<description>Rising edges on input 5.</description>										
 						<value>0xA</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>FALLING_EDGES_ON_INP</name>										
+						<name>FALLING_EDGES_ON_INPUT_5</name>										
 						<description>Falling edges on input 5.</description>										
 						<value>0xB</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>RISING_EDGES_ON_INPU</name>										
+						<name>RISING_EDGES_ON_INPUT_6</name>										
 						<description>Rising edges on input 6.</description>										
 						<value>0xC</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>FALLING_EDGES_ON_INP</name>										
+						<name>FALLING_EDGES_ON_INPUT_6</name>										
 						<description>Falling edges on input 6.</description>										
 						<value>0xD</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>RISING_EDGES_ON_INPU</name>										
+						<name>RISING_EDGES_ON_INPUT_7</name>										
 						<description>Rising edges on input 7.</description>										
 						<value>0xE</value>										
 					</enumeratedValue>											
 					<enumeratedValue>											
-						<name>FALLING_EDGES_ON_INP</name>										
+						<name>FALLING_EDGES_ON_INPUT_7</name>										
 						<description>Falling edges on input 7.</description>										
 						<value>0xF</value>										
 					</enumeratedValue>											
@@ -4157,12 +4157,12 @@
 							<enumeratedValues>
 								<name>ENUM</name>
 								<enumeratedValue>
-									<name>THE_DESTINATION_ADDR</name>
+									<name>disabled</name>
 									<description>The destination address is not incremented after each transfer.</description>
 									<value>0</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>THE_DESTINATION_ADDR</name>
+									<name>enabled</name>
 									<description>The destination address is incremented after each transfer.</description>
 									<value>1</value>
 								</enumeratedValue>
@@ -4229,12 +4229,12 @@
 							<enumeratedValues>
 								<name>ENUM</name>
 								<enumeratedValue>
-									<name>THE_TERMINAL_COUNT_I</name>
+									<name>disabled</name>
 									<description>The terminal count interrupt is disabled.</description>
 									<value>0</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>THE_TERMINAL_COUNT_I</name>
+									<name>enabled</name>
 									<description>The terminal count interrupt is enabled.</description>
 									<value>1</value>
 								</enumeratedValue>
@@ -4283,42 +4283,42 @@
 									<value>0x0</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>SOURCE_EQ_TIMER_0_MAT</name>
+									<name>SOURCE_EQ_TIMER_0_MAT0_UART0_T</name>
 									<description>Source = Timer 0 match 0/UART0 transmit</description>
 									<value>0x1</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>SOURCE_EQ_TIMER_0_MAT</name>
+									<name>SOURCE_EQ_TIMER_0_MAT1_UART0_R</name>
 									<description>Source = Timer 0 match 1/UART0 receive</description>
 									<value>0x2</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>SOURCE_EQ_TIMER_1_MAT</name>
+									<name>SOURCE_EQ_TIMER_1_MAT0_UART1_T</name>
 									<description>Source = Timer 1 match 0/UART1 transmit</description>
 									<value>0x3</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>SOURCE_EQ_TIMER_1_MAT</name>
+									<name>SOURCE_EQ_TIMER_1_MAT1_UART1_R</name>
 									<description>Source = Timer 1 match 1/UART 1 receive</description>
 									<value>0x4</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>SOURCE_EQ_TIMER_2_MAT</name>
+									<name>SOURCE_EQ_TIMER_2_MAT0_UART2_T</name>
 									<description>Source = Timer 2 match 0/UART 2 transmit</description>
 									<value>0x5</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>SOURCE_EQ_TIMER_2_MAT</name>
+									<name>SOURCE_EQ_TIMER_2_MAT1_UART2R</name>
 									<description>Source = Timer 2 match 1/UART 2 receive</description>
 									<value>0x6</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>SOURCE_EQ_TIMER_3_MAT</name>
+									<name>SOURCE_EQ_TIMER_3_MAT0_DMA_R0</name>
 									<description>Source = Timer 3 match 0/UART3 transmit/SCT DMA request 0</description>
 									<value>0x7</value>
 								</enumeratedValue>
 								<enumeratedValue>
-									<name>SOURCE_EQ_TIMER_3_MAT</name>
+									<name>SOURCE_EQ_TIMER_3_MAT1_DMA_R1</name>
 									<description>Source = Timer 3 match 1/UART3 receive/SCT DMA request 1</description>
 									<value>0x8</value>
 								</enumeratedValue>
@@ -17687,7 +17687,7 @@
 				<enumeratedValues>							
 				<name>ENUM</name>							
 					<enumeratedValue>						
-						<name>INPUT_TO_THE_EVENT_R</name>					
+						<name>INPUT_TO_THE_EVENT_R0</name>					
 						<description>Input to the event router.</description>					
 						<value>0x0</value>					
 					</enumeratedValue>						
@@ -17702,7 +17702,7 @@
 						<value>0x2</value>					
 					</enumeratedValue>						
 					<enumeratedValue>						
-						<name>INPUT_TO_THE_EVENT_R</name>					
+						<name>INPUT_TO_THE_EVENT_R3</name>					
 						<description>Input to the event router.</description>					
 						<value>0x3</value>					
 					</enumeratedValue>						
diff --git a/src/lib.rs b/src/lib.rs
index 37f9868f8632e8f0f00347bf1b5c2775c193633a..297e1f5c261be448f7f75f1de83f2d8eafaf995a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -602,21 +602,21 @@ pub mod sct {
         #[derive(Clone, Copy, Debug, PartialEq)]
         pub enum CKSELR {
             #[doc = "Rising edges on input 0."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 0."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 1."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 1."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 2."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 2."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 3."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 3."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 4."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 4."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 5."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 5."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 6."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 6."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 7."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 7."] FALLING_EDGES_ON_INP,
+            #[doc = "Falling edges on input 0."] FALLING_EDGES_ON_INPUT_0,
+            #[doc = "Rising edges on input 1."] RISING_EDGES_ON_INPUT_1,
+            #[doc = "Falling edges on input 1."] FALLING_EDGES_ON_INPUT_1,
+            #[doc = "Rising edges on input 2."] RISING_EDGES_ON_INPUT_2,
+            #[doc = "Falling edges on input 2."] FALLING_EDGES_ON_INPUT_2,
+            #[doc = "Rising edges on input 3."] RISING_EDGES_ON_INPUT_3,
+            #[doc = "Falling edges on input 3."] FALLING_EDGES_ON_INPUT_3,
+            #[doc = "Rising edges on input 4."] RISING_EDGES_ON_INPUT_4,
+            #[doc = "Falling edges on input 4."] FALLING_EDGES_ON_INPUT_4,
+            #[doc = "Rising edges on input 5."] RISING_EDGES_ON_INPUT_5,
+            #[doc = "Falling edges on input 5."] FALLING_EDGES_ON_INPUT_5,
+            #[doc = "Rising edges on input 6."] RISING_EDGES_ON_INPUT_6,
+            #[doc = "Falling edges on input 6."] FALLING_EDGES_ON_INPUT_6,
+            #[doc = "Rising edges on input 7."] RISING_EDGES_ON_INPUT_7,
+            #[doc = "Falling edges on input 7."] FALLING_EDGES_ON_INPUT_7,
         }
         impl CKSELR {
             #[doc = r" Value of the field as raw bits"]
@@ -624,21 +624,21 @@ pub mod sct {
             pub fn bits(&self) -> u8 {
                 match *self {
                     CKSELR::RISING_EDGES_ON_INPU => 0,
-                    CKSELR::FALLING_EDGES_ON_INP => 1,
-                    CKSELR::RISING_EDGES_ON_INPU => 2,
-                    CKSELR::FALLING_EDGES_ON_INP => 3,
-                    CKSELR::RISING_EDGES_ON_INPU => 4,
-                    CKSELR::FALLING_EDGES_ON_INP => 5,
-                    CKSELR::RISING_EDGES_ON_INPU => 6,
-                    CKSELR::FALLING_EDGES_ON_INP => 7,
-                    CKSELR::RISING_EDGES_ON_INPU => 8,
-                    CKSELR::FALLING_EDGES_ON_INP => 9,
-                    CKSELR::RISING_EDGES_ON_INPU => 10,
-                    CKSELR::FALLING_EDGES_ON_INP => 11,
-                    CKSELR::RISING_EDGES_ON_INPU => 12,
-                    CKSELR::FALLING_EDGES_ON_INP => 13,
-                    CKSELR::RISING_EDGES_ON_INPU => 14,
-                    CKSELR::FALLING_EDGES_ON_INP => 15,
+                    CKSELR::FALLING_EDGES_ON_INPUT_0 => 1,
+                    CKSELR::RISING_EDGES_ON_INPUT_1 => 2,
+                    CKSELR::FALLING_EDGES_ON_INPUT_1 => 3,
+                    CKSELR::RISING_EDGES_ON_INPUT_2 => 4,
+                    CKSELR::FALLING_EDGES_ON_INPUT_2 => 5,
+                    CKSELR::RISING_EDGES_ON_INPUT_3 => 6,
+                    CKSELR::FALLING_EDGES_ON_INPUT_3 => 7,
+                    CKSELR::RISING_EDGES_ON_INPUT_4 => 8,
+                    CKSELR::FALLING_EDGES_ON_INPUT_4 => 9,
+                    CKSELR::RISING_EDGES_ON_INPUT_5 => 10,
+                    CKSELR::FALLING_EDGES_ON_INPUT_5 => 11,
+                    CKSELR::RISING_EDGES_ON_INPUT_6 => 12,
+                    CKSELR::FALLING_EDGES_ON_INPUT_6 => 13,
+                    CKSELR::RISING_EDGES_ON_INPUT_7 => 14,
+                    CKSELR::FALLING_EDGES_ON_INPUT_7 => 15,
                 }
             }
             #[allow(missing_docs)]
@@ -647,21 +647,21 @@ pub mod sct {
             pub fn _from(value: u8) -> CKSELR {
                 match value {
                     0 => CKSELR::RISING_EDGES_ON_INPU,
-                    1 => CKSELR::FALLING_EDGES_ON_INP,
-                    2 => CKSELR::RISING_EDGES_ON_INPU,
-                    3 => CKSELR::FALLING_EDGES_ON_INP,
-                    4 => CKSELR::RISING_EDGES_ON_INPU,
-                    5 => CKSELR::FALLING_EDGES_ON_INP,
-                    6 => CKSELR::RISING_EDGES_ON_INPU,
-                    7 => CKSELR::FALLING_EDGES_ON_INP,
-                    8 => CKSELR::RISING_EDGES_ON_INPU,
-                    9 => CKSELR::FALLING_EDGES_ON_INP,
-                    10 => CKSELR::RISING_EDGES_ON_INPU,
-                    11 => CKSELR::FALLING_EDGES_ON_INP,
-                    12 => CKSELR::RISING_EDGES_ON_INPU,
-                    13 => CKSELR::FALLING_EDGES_ON_INP,
-                    14 => CKSELR::RISING_EDGES_ON_INPU,
-                    15 => CKSELR::FALLING_EDGES_ON_INP,
+                    1 => CKSELR::FALLING_EDGES_ON_INPUT_0,
+                    2 => CKSELR::RISING_EDGES_ON_INPUT_1,
+                    3 => CKSELR::FALLING_EDGES_ON_INPUT_1,
+                    4 => CKSELR::RISING_EDGES_ON_INPUT_2,
+                    5 => CKSELR::FALLING_EDGES_ON_INPUT_2,
+                    6 => CKSELR::RISING_EDGES_ON_INPUT_3,
+                    7 => CKSELR::FALLING_EDGES_ON_INPUT_3,
+                    8 => CKSELR::RISING_EDGES_ON_INPUT_4,
+                    9 => CKSELR::FALLING_EDGES_ON_INPUT_4,
+                    10 => CKSELR::RISING_EDGES_ON_INPUT_5,
+                    11 => CKSELR::FALLING_EDGES_ON_INPUT_5,
+                    12 => CKSELR::RISING_EDGES_ON_INPUT_6,
+                    13 => CKSELR::FALLING_EDGES_ON_INPUT_6,
+                    14 => CKSELR::RISING_EDGES_ON_INPUT_7,
+                    15 => CKSELR::FALLING_EDGES_ON_INPUT_7,
                     _ => unreachable!(),
                 }
             }
@@ -670,80 +670,80 @@ pub mod sct {
             pub fn is_rising_edges_on_inpu(&self) -> bool {
                 *self == CKSELR::RISING_EDGES_ON_INPU
             }
-            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INP`"]
+            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INPUT_0`"]
             #[inline(always)]
-            pub fn is_falling_edges_on_inp(&self) -> bool {
-                *self == CKSELR::FALLING_EDGES_ON_INP
+            pub fn is_falling_edges_on_input_0(&self) -> bool {
+                *self == CKSELR::FALLING_EDGES_ON_INPUT_0
             }
-            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPU`"]
+            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPUT_1`"]
             #[inline(always)]
-            pub fn is_rising_edges_on_inpu(&self) -> bool {
-                *self == CKSELR::RISING_EDGES_ON_INPU
+            pub fn is_rising_edges_on_input_1(&self) -> bool {
+                *self == CKSELR::RISING_EDGES_ON_INPUT_1
             }
-            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INP`"]
+            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INPUT_1`"]
             #[inline(always)]
-            pub fn is_falling_edges_on_inp(&self) -> bool {
-                *self == CKSELR::FALLING_EDGES_ON_INP
+            pub fn is_falling_edges_on_input_1(&self) -> bool {
+                *self == CKSELR::FALLING_EDGES_ON_INPUT_1
             }
-            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPU`"]
+            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPUT_2`"]
             #[inline(always)]
-            pub fn is_rising_edges_on_inpu(&self) -> bool {
-                *self == CKSELR::RISING_EDGES_ON_INPU
+            pub fn is_rising_edges_on_input_2(&self) -> bool {
+                *self == CKSELR::RISING_EDGES_ON_INPUT_2
             }
-            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INP`"]
+            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INPUT_2`"]
             #[inline(always)]
-            pub fn is_falling_edges_on_inp(&self) -> bool {
-                *self == CKSELR::FALLING_EDGES_ON_INP
+            pub fn is_falling_edges_on_input_2(&self) -> bool {
+                *self == CKSELR::FALLING_EDGES_ON_INPUT_2
             }
-            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPU`"]
+            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPUT_3`"]
             #[inline(always)]
-            pub fn is_rising_edges_on_inpu(&self) -> bool {
-                *self == CKSELR::RISING_EDGES_ON_INPU
+            pub fn is_rising_edges_on_input_3(&self) -> bool {
+                *self == CKSELR::RISING_EDGES_ON_INPUT_3
             }
-            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INP`"]
+            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INPUT_3`"]
             #[inline(always)]
-            pub fn is_falling_edges_on_inp(&self) -> bool {
-                *self == CKSELR::FALLING_EDGES_ON_INP
+            pub fn is_falling_edges_on_input_3(&self) -> bool {
+                *self == CKSELR::FALLING_EDGES_ON_INPUT_3
             }
-            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPU`"]
+            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPUT_4`"]
             #[inline(always)]
-            pub fn is_rising_edges_on_inpu(&self) -> bool {
-                *self == CKSELR::RISING_EDGES_ON_INPU
+            pub fn is_rising_edges_on_input_4(&self) -> bool {
+                *self == CKSELR::RISING_EDGES_ON_INPUT_4
             }
-            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INP`"]
+            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INPUT_4`"]
             #[inline(always)]
-            pub fn is_falling_edges_on_inp(&self) -> bool {
-                *self == CKSELR::FALLING_EDGES_ON_INP
+            pub fn is_falling_edges_on_input_4(&self) -> bool {
+                *self == CKSELR::FALLING_EDGES_ON_INPUT_4
             }
-            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPU`"]
+            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPUT_5`"]
             #[inline(always)]
-            pub fn is_rising_edges_on_inpu(&self) -> bool {
-                *self == CKSELR::RISING_EDGES_ON_INPU
+            pub fn is_rising_edges_on_input_5(&self) -> bool {
+                *self == CKSELR::RISING_EDGES_ON_INPUT_5
             }
-            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INP`"]
+            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INPUT_5`"]
             #[inline(always)]
-            pub fn is_falling_edges_on_inp(&self) -> bool {
-                *self == CKSELR::FALLING_EDGES_ON_INP
+            pub fn is_falling_edges_on_input_5(&self) -> bool {
+                *self == CKSELR::FALLING_EDGES_ON_INPUT_5
             }
-            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPU`"]
+            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPUT_6`"]
             #[inline(always)]
-            pub fn is_rising_edges_on_inpu(&self) -> bool {
-                *self == CKSELR::RISING_EDGES_ON_INPU
+            pub fn is_rising_edges_on_input_6(&self) -> bool {
+                *self == CKSELR::RISING_EDGES_ON_INPUT_6
             }
-            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INP`"]
+            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INPUT_6`"]
             #[inline(always)]
-            pub fn is_falling_edges_on_inp(&self) -> bool {
-                *self == CKSELR::FALLING_EDGES_ON_INP
+            pub fn is_falling_edges_on_input_6(&self) -> bool {
+                *self == CKSELR::FALLING_EDGES_ON_INPUT_6
             }
-            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPU`"]
+            #[doc = "Checks if the value of the field is `RISING_EDGES_ON_INPUT_7`"]
             #[inline(always)]
-            pub fn is_rising_edges_on_inpu(&self) -> bool {
-                *self == CKSELR::RISING_EDGES_ON_INPU
+            pub fn is_rising_edges_on_input_7(&self) -> bool {
+                *self == CKSELR::RISING_EDGES_ON_INPUT_7
             }
-            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INP`"]
+            #[doc = "Checks if the value of the field is `FALLING_EDGES_ON_INPUT_7`"]
             #[inline(always)]
-            pub fn is_falling_edges_on_inp(&self) -> bool {
-                *self == CKSELR::FALLING_EDGES_ON_INP
+            pub fn is_falling_edges_on_input_7(&self) -> bool {
+                *self == CKSELR::FALLING_EDGES_ON_INPUT_7
             }
         }
         #[doc = r" Value of the field"]
@@ -958,21 +958,21 @@ pub mod sct {
         #[doc = "Values that can be written to the field `CKSEL`"]
         pub enum CKSELW {
             #[doc = "Rising edges on input 0."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 0."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 1."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 1."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 2."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 2."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 3."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 3."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 4."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 4."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 5."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 5."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 6."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 6."] FALLING_EDGES_ON_INP,
-            #[doc = "Rising edges on input 7."] RISING_EDGES_ON_INPU,
-            #[doc = "Falling edges on input 7."] FALLING_EDGES_ON_INP,
+            #[doc = "Falling edges on input 0."] FALLING_EDGES_ON_INPUT_0,
+            #[doc = "Rising edges on input 1."] RISING_EDGES_ON_INPUT_1,
+            #[doc = "Falling edges on input 1."] FALLING_EDGES_ON_INPUT_1,
+            #[doc = "Rising edges on input 2."] RISING_EDGES_ON_INPUT_2,
+            #[doc = "Falling edges on input 2."] FALLING_EDGES_ON_INPUT_2,
+            #[doc = "Rising edges on input 3."] RISING_EDGES_ON_INPUT_3,
+            #[doc = "Falling edges on input 3."] FALLING_EDGES_ON_INPUT_3,
+            #[doc = "Rising edges on input 4."] RISING_EDGES_ON_INPUT_4,
+            #[doc = "Falling edges on input 4."] FALLING_EDGES_ON_INPUT_4,
+            #[doc = "Rising edges on input 5."] RISING_EDGES_ON_INPUT_5,
+            #[doc = "Falling edges on input 5."] FALLING_EDGES_ON_INPUT_5,
+            #[doc = "Rising edges on input 6."] RISING_EDGES_ON_INPUT_6,
+            #[doc = "Falling edges on input 6."] FALLING_EDGES_ON_INPUT_6,
+            #[doc = "Rising edges on input 7."] RISING_EDGES_ON_INPUT_7,
+            #[doc = "Falling edges on input 7."] FALLING_EDGES_ON_INPUT_7,
         }
         impl CKSELW {
             #[allow(missing_docs)]
@@ -981,21 +981,21 @@ pub mod sct {
             pub fn _bits(&self) -> u8 {
                 match *self {
                     CKSELW::RISING_EDGES_ON_INPU => 0,
-                    CKSELW::FALLING_EDGES_ON_INP => 1,
-                    CKSELW::RISING_EDGES_ON_INPU => 2,
-                    CKSELW::FALLING_EDGES_ON_INP => 3,
-                    CKSELW::RISING_EDGES_ON_INPU => 4,
-                    CKSELW::FALLING_EDGES_ON_INP => 5,
-                    CKSELW::RISING_EDGES_ON_INPU => 6,
-                    CKSELW::FALLING_EDGES_ON_INP => 7,
-                    CKSELW::RISING_EDGES_ON_INPU => 8,
-                    CKSELW::FALLING_EDGES_ON_INP => 9,
-                    CKSELW::RISING_EDGES_ON_INPU => 10,
-                    CKSELW::FALLING_EDGES_ON_INP => 11,
-                    CKSELW::RISING_EDGES_ON_INPU => 12,
-                    CKSELW::FALLING_EDGES_ON_INP => 13,
-                    CKSELW::RISING_EDGES_ON_INPU => 14,
-                    CKSELW::FALLING_EDGES_ON_INP => 15,
+                    CKSELW::FALLING_EDGES_ON_INPUT_0 => 1,
+                    CKSELW::RISING_EDGES_ON_INPUT_1 => 2,
+                    CKSELW::FALLING_EDGES_ON_INPUT_1 => 3,
+                    CKSELW::RISING_EDGES_ON_INPUT_2 => 4,
+                    CKSELW::FALLING_EDGES_ON_INPUT_2 => 5,
+                    CKSELW::RISING_EDGES_ON_INPUT_3 => 6,
+                    CKSELW::FALLING_EDGES_ON_INPUT_3 => 7,
+                    CKSELW::RISING_EDGES_ON_INPUT_4 => 8,
+                    CKSELW::FALLING_EDGES_ON_INPUT_4 => 9,
+                    CKSELW::RISING_EDGES_ON_INPUT_5 => 10,
+                    CKSELW::FALLING_EDGES_ON_INPUT_5 => 11,
+                    CKSELW::RISING_EDGES_ON_INPUT_6 => 12,
+                    CKSELW::FALLING_EDGES_ON_INPUT_6 => 13,
+                    CKSELW::RISING_EDGES_ON_INPUT_7 => 14,
+                    CKSELW::FALLING_EDGES_ON_INPUT_7 => 15,
                 }
             }
         }
@@ -1018,78 +1018,78 @@ pub mod sct {
             }
             #[doc = "Falling edges on input 0."]
             #[inline(always)]
-            pub fn falling_edges_on_inp(self) -> &'a mut W {
-                self.variant(CKSELW::FALLING_EDGES_ON_INP)
+            pub fn falling_edges_on_input_0(self) -> &'a mut W {
+                self.variant(CKSELW::FALLING_EDGES_ON_INPUT_0)
             }
             #[doc = "Rising edges on input 1."]
             #[inline(always)]
-            pub fn rising_edges_on_inpu(self) -> &'a mut W {
-                self.variant(CKSELW::RISING_EDGES_ON_INPU)
+            pub fn rising_edges_on_input_1(self) -> &'a mut W {
+                self.variant(CKSELW::RISING_EDGES_ON_INPUT_1)
             }
             #[doc = "Falling edges on input 1."]
             #[inline(always)]
-            pub fn falling_edges_on_inp(self) -> &'a mut W {
-                self.variant(CKSELW::FALLING_EDGES_ON_INP)
+            pub fn falling_edges_on_input_1(self) -> &'a mut W {
+                self.variant(CKSELW::FALLING_EDGES_ON_INPUT_1)
             }
             #[doc = "Rising edges on input 2."]
             #[inline(always)]
-            pub fn rising_edges_on_inpu(self) -> &'a mut W {
-                self.variant(CKSELW::RISING_EDGES_ON_INPU)
+            pub fn rising_edges_on_input_2(self) -> &'a mut W {
+                self.variant(CKSELW::RISING_EDGES_ON_INPUT_2)
             }
             #[doc = "Falling edges on input 2."]
             #[inline(always)]
-            pub fn falling_edges_on_inp(self) -> &'a mut W {
-                self.variant(CKSELW::FALLING_EDGES_ON_INP)
+            pub fn falling_edges_on_input_2(self) -> &'a mut W {
+                self.variant(CKSELW::FALLING_EDGES_ON_INPUT_2)
             }
             #[doc = "Rising edges on input 3."]
             #[inline(always)]
-            pub fn rising_edges_on_inpu(self) -> &'a mut W {
-                self.variant(CKSELW::RISING_EDGES_ON_INPU)
+            pub fn rising_edges_on_input_3(self) -> &'a mut W {
+                self.variant(CKSELW::RISING_EDGES_ON_INPUT_3)
             }
             #[doc = "Falling edges on input 3."]
             #[inline(always)]
-            pub fn falling_edges_on_inp(self) -> &'a mut W {
-                self.variant(CKSELW::FALLING_EDGES_ON_INP)
+            pub fn falling_edges_on_input_3(self) -> &'a mut W {
+                self.variant(CKSELW::FALLING_EDGES_ON_INPUT_3)
             }
             #[doc = "Rising edges on input 4."]
             #[inline(always)]
-            pub fn rising_edges_on_inpu(self) -> &'a mut W {
-                self.variant(CKSELW::RISING_EDGES_ON_INPU)
+            pub fn rising_edges_on_input_4(self) -> &'a mut W {
+                self.variant(CKSELW::RISING_EDGES_ON_INPUT_4)
             }
             #[doc = "Falling edges on input 4."]
             #[inline(always)]
-            pub fn falling_edges_on_inp(self) -> &'a mut W {
-                self.variant(CKSELW::FALLING_EDGES_ON_INP)
+            pub fn falling_edges_on_input_4(self) -> &'a mut W {
+                self.variant(CKSELW::FALLING_EDGES_ON_INPUT_4)
             }
             #[doc = "Rising edges on input 5."]
             #[inline(always)]
-            pub fn rising_edges_on_inpu(self) -> &'a mut W {
-                self.variant(CKSELW::RISING_EDGES_ON_INPU)
+            pub fn rising_edges_on_input_5(self) -> &'a mut W {
+                self.variant(CKSELW::RISING_EDGES_ON_INPUT_5)
             }
             #[doc = "Falling edges on input 5."]
             #[inline(always)]
-            pub fn falling_edges_on_inp(self) -> &'a mut W {
-                self.variant(CKSELW::FALLING_EDGES_ON_INP)
+            pub fn falling_edges_on_input_5(self) -> &'a mut W {
+                self.variant(CKSELW::FALLING_EDGES_ON_INPUT_5)
             }
             #[doc = "Rising edges on input 6."]
             #[inline(always)]
-            pub fn rising_edges_on_inpu(self) -> &'a mut W {
-                self.variant(CKSELW::RISING_EDGES_ON_INPU)
+            pub fn rising_edges_on_input_6(self) -> &'a mut W {
+                self.variant(CKSELW::RISING_EDGES_ON_INPUT_6)
             }
             #[doc = "Falling edges on input 6."]
             #[inline(always)]
-            pub fn falling_edges_on_inp(self) -> &'a mut W {
-                self.variant(CKSELW::FALLING_EDGES_ON_INP)
+            pub fn falling_edges_on_input_6(self) -> &'a mut W {
+                self.variant(CKSELW::FALLING_EDGES_ON_INPUT_6)
             }
             #[doc = "Rising edges on input 7."]
             #[inline(always)]
-            pub fn rising_edges_on_inpu(self) -> &'a mut W {
-                self.variant(CKSELW::RISING_EDGES_ON_INPU)
+            pub fn rising_edges_on_input_7(self) -> &'a mut W {
+                self.variant(CKSELW::RISING_EDGES_ON_INPUT_7)
             }
             #[doc = "Falling edges on input 7."]
             #[inline(always)]
-            pub fn falling_edges_on_inp(self) -> &'a mut W {
-                self.variant(CKSELW::FALLING_EDGES_ON_INP)
+            pub fn falling_edges_on_input_7(self) -> &'a mut W {
+                self.variant(CKSELW::FALLING_EDGES_ON_INPUT_7)
             }
             #[doc = r" Writes raw bits to the field"]
             #[inline(always)]
@@ -29323,9 +29323,9 @@ pub mod gpdma {
         #[derive(Clone, Copy, Debug, PartialEq)]
         pub enum DIR {
             #[doc = "The destination address is not incremented after each transfer."]
-            THE_DESTINATION_ADDR,
+            DISABLED,
             #[doc = "The destination address is incremented after each transfer."]
-            THE_DESTINATION_ADDR,
+            ENABLED,
         }
         impl DIR {
             #[doc = r" Returns `true` if the bit is clear (0)"]
@@ -29342,8 +29342,8 @@ pub mod gpdma {
             #[inline(always)]
             pub fn bit(&self) -> bool {
                 match *self {
-                    DIR::THE_DESTINATION_ADDR => false,
-                    DIR::THE_DESTINATION_ADDR => true,
+                    DIR::DISABLED => false,
+                    DIR::ENABLED => true,
                 }
             }
             #[allow(missing_docs)]
@@ -29351,19 +29351,19 @@ pub mod gpdma {
             #[inline(always)]
             pub fn _from(value: bool) -> DIR {
                 match value {
-                    false => DIR::THE_DESTINATION_ADDR,
-                    true => DIR::THE_DESTINATION_ADDR,
+                    false => DIR::DISABLED,
+                    true => DIR::ENABLED,
                 }
             }
-            #[doc = "Checks if the value of the field is `THE_DESTINATION_ADDR`"]
+            #[doc = "Checks if the value of the field is `DISABLED`"]
             #[inline(always)]
-            pub fn is_the_destination_addr(&self) -> bool {
-                *self == DIR::THE_DESTINATION_ADDR
+            pub fn is_disabled(&self) -> bool {
+                *self == DIR::DISABLED
             }
-            #[doc = "Checks if the value of the field is `THE_DESTINATION_ADDR`"]
+            #[doc = "Checks if the value of the field is `ENABLED`"]
             #[inline(always)]
-            pub fn is_the_destination_addr(&self) -> bool {
-                *self == DIR::THE_DESTINATION_ADDR
+            pub fn is_enabled(&self) -> bool {
+                *self == DIR::ENABLED
             }
         }
         #[doc = "Possible values of the field `PROT1`"]
@@ -29504,10 +29504,8 @@ pub mod gpdma {
         #[doc = "Possible values of the field `I`"]
         #[derive(Clone, Copy, Debug, PartialEq)]
         pub enum IR {
-            #[doc = "The terminal count interrupt is disabled."]
-            THE_TERMINAL_COUNT_I,
-            #[doc = "The terminal count interrupt is enabled."]
-            THE_TERMINAL_COUNT_I,
+            #[doc = "The terminal count interrupt is disabled."] DISABLED,
+            #[doc = "The terminal count interrupt is enabled."] ENABLED,
         }
         impl IR {
             #[doc = r" Returns `true` if the bit is clear (0)"]
@@ -29524,8 +29522,8 @@ pub mod gpdma {
             #[inline(always)]
             pub fn bit(&self) -> bool {
                 match *self {
-                    IR::THE_TERMINAL_COUNT_I => false,
-                    IR::THE_TERMINAL_COUNT_I => true,
+                    IR::DISABLED => false,
+                    IR::ENABLED => true,
                 }
             }
             #[allow(missing_docs)]
@@ -29533,19 +29531,19 @@ pub mod gpdma {
             #[inline(always)]
             pub fn _from(value: bool) -> IR {
                 match value {
-                    false => IR::THE_TERMINAL_COUNT_I,
-                    true => IR::THE_TERMINAL_COUNT_I,
+                    false => IR::DISABLED,
+                    true => IR::ENABLED,
                 }
             }
-            #[doc = "Checks if the value of the field is `THE_TERMINAL_COUNT_I`"]
+            #[doc = "Checks if the value of the field is `DISABLED`"]
             #[inline(always)]
-            pub fn is_the_terminal_count_i(&self) -> bool {
-                *self == IR::THE_TERMINAL_COUNT_I
+            pub fn is_disabled(&self) -> bool {
+                *self == IR::DISABLED
             }
-            #[doc = "Checks if the value of the field is `THE_TERMINAL_COUNT_I`"]
+            #[doc = "Checks if the value of the field is `ENABLED`"]
             #[inline(always)]
-            pub fn is_the_terminal_count_i(&self) -> bool {
-                *self == IR::THE_TERMINAL_COUNT_I
+            pub fn is_enabled(&self) -> bool {
+                *self == IR::ENABLED
             }
         }
         #[doc = r" Proxy"]
@@ -30026,9 +30024,9 @@ pub mod gpdma {
         #[doc = "Values that can be written to the field `DI`"]
         pub enum DIW {
             #[doc = "The destination address is not incremented after each transfer."]
-            THE_DESTINATION_ADDR,
+            DISABLED,
             #[doc = "The destination address is incremented after each transfer."]
-            THE_DESTINATION_ADDR,
+            ENABLED,
         }
         impl DIW {
             #[allow(missing_docs)]
@@ -30036,8 +30034,8 @@ pub mod gpdma {
             #[inline(always)]
             pub fn _bits(&self) -> bool {
                 match *self {
-                    DIW::THE_DESTINATION_ADDR => false,
-                    DIW::THE_DESTINATION_ADDR => true,
+                    DIW::DISABLED => false,
+                    DIW::ENABLED => true,
                 }
             }
         }
@@ -30055,13 +30053,13 @@ pub mod gpdma {
             }
             #[doc = "The destination address is not incremented after each transfer."]
             #[inline(always)]
-            pub fn the_destination_addr(self) -> &'a mut W {
-                self.variant(DIW::THE_DESTINATION_ADDR)
+            pub fn disabled(self) -> &'a mut W {
+                self.variant(DIW::DISABLED)
             }
             #[doc = "The destination address is incremented after each transfer."]
             #[inline(always)]
-            pub fn the_destination_addr(self) -> &'a mut W {
-                self.variant(DIW::THE_DESTINATION_ADDR)
+            pub fn enabled(self) -> &'a mut W {
+                self.variant(DIW::ENABLED)
             }
             #[doc = r" Sets the field bit"]
             pub fn set_bit(self) -> &'a mut W {
@@ -30251,10 +30249,8 @@ pub mod gpdma {
         }
         #[doc = "Values that can be written to the field `I`"]
         pub enum IW {
-            #[doc = "The terminal count interrupt is disabled."]
-            THE_TERMINAL_COUNT_I,
-            #[doc = "The terminal count interrupt is enabled."]
-            THE_TERMINAL_COUNT_I,
+            #[doc = "The terminal count interrupt is disabled."] DISABLED,
+            #[doc = "The terminal count interrupt is enabled."] ENABLED,
         }
         impl IW {
             #[allow(missing_docs)]
@@ -30262,8 +30258,8 @@ pub mod gpdma {
             #[inline(always)]
             pub fn _bits(&self) -> bool {
                 match *self {
-                    IW::THE_TERMINAL_COUNT_I => false,
-                    IW::THE_TERMINAL_COUNT_I => true,
+                    IW::DISABLED => false,
+                    IW::ENABLED => true,
                 }
             }
         }
@@ -30281,13 +30277,13 @@ pub mod gpdma {
             }
             #[doc = "The terminal count interrupt is disabled."]
             #[inline(always)]
-            pub fn the_terminal_count_i(self) -> &'a mut W {
-                self.variant(IW::THE_TERMINAL_COUNT_I)
+            pub fn disabled(self) -> &'a mut W {
+                self.variant(IW::DISABLED)
             }
             #[doc = "The terminal count interrupt is enabled."]
             #[inline(always)]
-            pub fn the_terminal_count_i(self) -> &'a mut W {
-                self.variant(IW::THE_TERMINAL_COUNT_I)
+            pub fn enabled(self) -> &'a mut W {
+                self.variant(IW::ENABLED)
             }
             #[doc = r" Sets the field bit"]
             pub fn set_bit(self) -> &'a mut W {
@@ -30611,21 +30607,21 @@ pub mod gpdma {
         pub enum SRCPERIPHERALR {
             #[doc = "Source = SPIFI"] SOURCE_EQ_SPIFI,
             #[doc = "Source = Timer 0 match 0/UART0 transmit"]
-            SOURCE_EQ_TIMER_0_MAT,
+            SOURCE_EQ_TIMER_0_MAT0_UART0_T,
             #[doc = "Source = Timer 0 match 1/UART0 receive"]
-            SOURCE_EQ_TIMER_0_MAT,
+            SOURCE_EQ_TIMER_0_MAT1_UART0_R,
             #[doc = "Source = Timer 1 match 0/UART1 transmit"]
-            SOURCE_EQ_TIMER_1_MAT,
+            SOURCE_EQ_TIMER_1_MAT0_UART1_T,
             #[doc = "Source = Timer 1 match 1/UART 1 receive"]
-            SOURCE_EQ_TIMER_1_MAT,
+            SOURCE_EQ_TIMER_1_MAT1_UART1_R,
             #[doc = "Source = Timer 2 match 0/UART 2 transmit"]
-            SOURCE_EQ_TIMER_2_MAT,
+            SOURCE_EQ_TIMER_2_MAT0_UART2_T,
             #[doc = "Source = Timer 2 match 1/UART 2 receive"]
-            SOURCE_EQ_TIMER_2_MAT,
+            SOURCE_EQ_TIMER_2_MAT1_UART2R,
             #[doc = "Source = Timer 3 match 0/UART3 transmit/SCT DMA request 0"]
-            SOURCE_EQ_TIMER_3_MAT,
+            SOURCE_EQ_TIMER_3_MAT0_DMA_R0,
             #[doc = "Source = Timer 3 match 1/UART3 receive/SCT DMA request 1"]
-            SOURCE_EQ_TIMER_3_MAT,
+            SOURCE_EQ_TIMER_3_MAT1_DMA_R1,
             #[doc = "Source = SSP0 receive/I2S channel 0"] SOURCE_EQ_SSP0_RECEIV,
             #[doc = "Source = SSP0 transmit/I2S channel 1"]
             SOURCE_EQ_SSP0_TRANSM,
@@ -30642,14 +30638,14 @@ pub mod gpdma {
             pub fn bits(&self) -> u8 {
                 match *self {
                     SRCPERIPHERALR::SOURCE_EQ_SPIFI => 0,
-                    SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT => 1,
-                    SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT => 2,
-                    SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT => 3,
-                    SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT => 4,
-                    SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT => 5,
-                    SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT => 6,
-                    SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT => 7,
-                    SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT => 8,
+                    SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT0_UART0_T => 1,
+                    SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT1_UART0_R => 2,
+                    SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT0_UART1_T => 3,
+                    SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT1_UART1_R => 4,
+                    SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT0_UART2_T => 5,
+                    SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT1_UART2R => 6,
+                    SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT0_DMA_R0 => 7,
+                    SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT1_DMA_R1 => 8,
                     SRCPERIPHERALR::SOURCE_EQ_SSP0_RECEIV => 9,
                     SRCPERIPHERALR::SOURCE_EQ_SSP0_TRANSM => 10,
                     SRCPERIPHERALR::SOURCE_EQ_SSP1_RECEIV => 11,
@@ -30666,14 +30662,14 @@ pub mod gpdma {
             pub fn _from(value: u8) -> SRCPERIPHERALR {
                 match value {
                     0 => SRCPERIPHERALR::SOURCE_EQ_SPIFI,
-                    1 => SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT,
-                    2 => SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT,
-                    3 => SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT,
-                    4 => SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT,
-                    5 => SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT,
-                    6 => SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT,
-                    7 => SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT,
-                    8 => SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT,
+                    1 => SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT0_UART0_T,
+                    2 => SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT1_UART0_R,
+                    3 => SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT0_UART1_T,
+                    4 => SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT1_UART1_R,
+                    5 => SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT0_UART2_T,
+                    6 => SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT1_UART2R,
+                    7 => SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT0_DMA_R0,
+                    8 => SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT1_DMA_R1,
                     9 => SRCPERIPHERALR::SOURCE_EQ_SSP0_RECEIV,
                     10 => SRCPERIPHERALR::SOURCE_EQ_SSP0_TRANSM,
                     11 => SRCPERIPHERALR::SOURCE_EQ_SSP1_RECEIV,
@@ -30689,45 +30685,45 @@ pub mod gpdma {
             pub fn is_source_eq_spifi(&self) -> bool {
                 *self == SRCPERIPHERALR::SOURCE_EQ_SPIFI
             }
-            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_0_MAT`"]
+            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_0_MAT0_UART0_T`"]
             #[inline(always)]
-            pub fn is_source_eq_timer_0_mat(&self) -> bool {
-                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT
+            pub fn is_source_eq_timer_0_mat0_uart0_t(&self) -> bool {
+                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT0_UART0_T
             }
-            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_0_MAT`"]
+            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_0_MAT1_UART0_R`"]
             #[inline(always)]
-            pub fn is_source_eq_timer_0_mat(&self) -> bool {
-                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT
+            pub fn is_source_eq_timer_0_mat1_uart0_r(&self) -> bool {
+                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_0_MAT1_UART0_R
             }
-            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_1_MAT`"]
+            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_1_MAT0_UART1_T`"]
             #[inline(always)]
-            pub fn is_source_eq_timer_1_mat(&self) -> bool {
-                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT
+            pub fn is_source_eq_timer_1_mat0_uart1_t(&self) -> bool {
+                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT0_UART1_T
             }
-            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_1_MAT`"]
+            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_1_MAT1_UART1_R`"]
             #[inline(always)]
-            pub fn is_source_eq_timer_1_mat(&self) -> bool {
-                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT
+            pub fn is_source_eq_timer_1_mat1_uart1_r(&self) -> bool {
+                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_1_MAT1_UART1_R
             }
-            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_2_MAT`"]
+            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_2_MAT0_UART2_T`"]
             #[inline(always)]
-            pub fn is_source_eq_timer_2_mat(&self) -> bool {
-                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT
+            pub fn is_source_eq_timer_2_mat0_uart2_t(&self) -> bool {
+                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT0_UART2_T
             }
-            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_2_MAT`"]
+            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_2_MAT1_UART2R`"]
             #[inline(always)]
-            pub fn is_source_eq_timer_2_mat(&self) -> bool {
-                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT
+            pub fn is_source_eq_timer_2_mat1_uart2r(&self) -> bool {
+                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_2_MAT1_UART2R
             }
-            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_3_MAT`"]
+            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_3_MAT0_DMA_R0`"]
             #[inline(always)]
-            pub fn is_source_eq_timer_3_mat(&self) -> bool {
-                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT
+            pub fn is_source_eq_timer_3_mat0_dma_r0(&self) -> bool {
+                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT0_DMA_R0
             }
-            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_3_MAT`"]
+            #[doc = "Checks if the value of the field is `SOURCE_EQ_TIMER_3_MAT1_DMA_R1`"]
             #[inline(always)]
-            pub fn is_source_eq_timer_3_mat(&self) -> bool {
-                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT
+            pub fn is_source_eq_timer_3_mat1_dma_r1(&self) -> bool {
+                *self == SRCPERIPHERALR::SOURCE_EQ_TIMER_3_MAT1_DMA_R1
             }
             #[doc = "Checks if the value of the field is `SOURCE_EQ_SSP0_RECEIV`"]
             #[inline(always)]
@@ -31174,21 +31170,21 @@ pub mod gpdma {
         pub enum SRCPERIPHERALW {
             #[doc = "Source = SPIFI"] SOURCE_EQ_SPIFI,
             #[doc = "Source = Timer 0 match 0/UART0 transmit"]
-            SOURCE_EQ_TIMER_0_MAT,
+            SOURCE_EQ_TIMER_0_MAT0_UART0_T,
             #[doc = "Source = Timer 0 match 1/UART0 receive"]
-            SOURCE_EQ_TIMER_0_MAT,
+            SOURCE_EQ_TIMER_0_MAT1_UART0_R,
             #[doc = "Source = Timer 1 match 0/UART1 transmit"]
-            SOURCE_EQ_TIMER_1_MAT,
+            SOURCE_EQ_TIMER_1_MAT0_UART1_T,
             #[doc = "Source = Timer 1 match 1/UART 1 receive"]
-            SOURCE_EQ_TIMER_1_MAT,
+            SOURCE_EQ_TIMER_1_MAT1_UART1_R,
             #[doc = "Source = Timer 2 match 0/UART 2 transmit"]
-            SOURCE_EQ_TIMER_2_MAT,
+            SOURCE_EQ_TIMER_2_MAT0_UART2_T,
             #[doc = "Source = Timer 2 match 1/UART 2 receive"]
-            SOURCE_EQ_TIMER_2_MAT,
+            SOURCE_EQ_TIMER_2_MAT1_UART2R,
             #[doc = "Source = Timer 3 match 0/UART3 transmit/SCT DMA request 0"]
-            SOURCE_EQ_TIMER_3_MAT,
+            SOURCE_EQ_TIMER_3_MAT0_DMA_R0,
             #[doc = "Source = Timer 3 match 1/UART3 receive/SCT DMA request 1"]
-            SOURCE_EQ_TIMER_3_MAT,
+            SOURCE_EQ_TIMER_3_MAT1_DMA_R1,
             #[doc = "Source = SSP0 receive/I2S channel 0"] SOURCE_EQ_SSP0_RECEIV,
             #[doc = "Source = SSP0 transmit/I2S channel 1"]
             SOURCE_EQ_SSP0_TRANSM,
@@ -31205,14 +31201,14 @@ pub mod gpdma {
             pub fn _bits(&self) -> u8 {
                 match *self {
                     SRCPERIPHERALW::SOURCE_EQ_SPIFI => 0,
-                    SRCPERIPHERALW::SOURCE_EQ_TIMER_0_MAT => 1,
-                    SRCPERIPHERALW::SOURCE_EQ_TIMER_0_MAT => 2,
-                    SRCPERIPHERALW::SOURCE_EQ_TIMER_1_MAT => 3,
-                    SRCPERIPHERALW::SOURCE_EQ_TIMER_1_MAT => 4,
-                    SRCPERIPHERALW::SOURCE_EQ_TIMER_2_MAT => 5,
-                    SRCPERIPHERALW::SOURCE_EQ_TIMER_2_MAT => 6,
-                    SRCPERIPHERALW::SOURCE_EQ_TIMER_3_MAT => 7,
-                    SRCPERIPHERALW::SOURCE_EQ_TIMER_3_MAT => 8,
+                    SRCPERIPHERALW::SOURCE_EQ_TIMER_0_MAT0_UART0_T => 1,
+                    SRCPERIPHERALW::SOURCE_EQ_TIMER_0_MAT1_UART0_R => 2,
+                    SRCPERIPHERALW::SOURCE_EQ_TIMER_1_MAT0_UART1_T => 3,
+                    SRCPERIPHERALW::SOURCE_EQ_TIMER_1_MAT1_UART1_R => 4,
+                    SRCPERIPHERALW::SOURCE_EQ_TIMER_2_MAT0_UART2_T => 5,
+                    SRCPERIPHERALW::SOURCE_EQ_TIMER_2_MAT1_UART2R => 6,
+                    SRCPERIPHERALW::SOURCE_EQ_TIMER_3_MAT0_DMA_R0 => 7,
+                    SRCPERIPHERALW::SOURCE_EQ_TIMER_3_MAT1_DMA_R1 => 8,
                     SRCPERIPHERALW::SOURCE_EQ_SSP0_RECEIV => 9,
                     SRCPERIPHERALW::SOURCE_EQ_SSP0_TRANSM => 10,
                     SRCPERIPHERALW::SOURCE_EQ_SSP1_RECEIV => 11,
@@ -31240,43 +31236,43 @@ pub mod gpdma {
             }
             #[doc = "Source = Timer 0 match 0/UART0 transmit"]
             #[inline(always)]
-            pub fn source_eq_timer_0_mat(self) -> &'a mut W {
-                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_0_MAT)
+            pub fn source_eq_timer_0_mat0_uart0_t(self) -> &'a mut W {
+                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_0_MAT0_UART0_T)
             }
             #[doc = "Source = Timer 0 match 1/UART0 receive"]
             #[inline(always)]
-            pub fn source_eq_timer_0_mat(self) -> &'a mut W {
-                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_0_MAT)
+            pub fn source_eq_timer_0_mat1_uart0_r(self) -> &'a mut W {
+                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_0_MAT1_UART0_R)
             }
             #[doc = "Source = Timer 1 match 0/UART1 transmit"]
             #[inline(always)]
-            pub fn source_eq_timer_1_mat(self) -> &'a mut W {
-                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_1_MAT)
+            pub fn source_eq_timer_1_mat0_uart1_t(self) -> &'a mut W {
+                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_1_MAT0_UART1_T)
             }
             #[doc = "Source = Timer 1 match 1/UART 1 receive"]
             #[inline(always)]
-            pub fn source_eq_timer_1_mat(self) -> &'a mut W {
-                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_1_MAT)
+            pub fn source_eq_timer_1_mat1_uart1_r(self) -> &'a mut W {
+                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_1_MAT1_UART1_R)
             }
             #[doc = "Source = Timer 2 match 0/UART 2 transmit"]
             #[inline(always)]
-            pub fn source_eq_timer_2_mat(self) -> &'a mut W {
-                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_2_MAT)
+            pub fn source_eq_timer_2_mat0_uart2_t(self) -> &'a mut W {
+                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_2_MAT0_UART2_T)
             }
             #[doc = "Source = Timer 2 match 1/UART 2 receive"]
             #[inline(always)]
-            pub fn source_eq_timer_2_mat(self) -> &'a mut W {
-                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_2_MAT)
+            pub fn source_eq_timer_2_mat1_uart2r(self) -> &'a mut W {
+                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_2_MAT1_UART2R)
             }
             #[doc = "Source = Timer 3 match 0/UART3 transmit/SCT DMA request 0"]
             #[inline(always)]
-            pub fn source_eq_timer_3_mat(self) -> &'a mut W {
-                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_3_MAT)
+            pub fn source_eq_timer_3_mat0_dma_r0(self) -> &'a mut W {
+                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_3_MAT0_DMA_R0)
             }
             #[doc = "Source = Timer 3 match 1/UART3 receive/SCT DMA request 1"]
             #[inline(always)]
-            pub fn source_eq_timer_3_mat(self) -> &'a mut W {
-                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_3_MAT)
+            pub fn source_eq_timer_3_mat1_dma_r1(self) -> &'a mut W {
+                self.variant(SRCPERIPHERALW::SOURCE_EQ_TIMER_3_MAT1_DMA_R1)
             }
             #[doc = "Source = SSP0 receive/I2S channel 0"]
             #[inline(always)]
@@ -108638,18 +108634,18 @@ pub mod creg {
         #[doc = "Possible values of the field `WAKEUP0CTRL`"]
         #[derive(Clone, Copy, Debug, PartialEq)]
         pub enum WAKEUP0CTRLR {
-            #[doc = "Input to the event router."] INPUT_TO_THE_EVENT_R,
+            #[doc = "Input to the event router."] INPUT_TO_THE_EVENT_R0,
             #[doc = "Output from the event router."] OUTPUT_FROM_THE_EVEN,
-            #[doc = "Input to the event router."] INPUT_TO_THE_EVENT_R,
+            #[doc = "Input to the event router."] INPUT_TO_THE_EVENT_R3,
         }
         impl WAKEUP0CTRLR {
             #[doc = r" Value of the field as raw bits"]
             #[inline(always)]
             pub fn bits(&self) -> u8 {
                 match *self {
-                    WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R => 0,
+                    WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R0 => 0,
                     WAKEUP0CTRLR::OUTPUT_FROM_THE_EVEN => 1,
-                    WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R => 3,
+                    WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R3 => 3,
                 }
             }
             #[allow(missing_docs)]
@@ -108657,26 +108653,26 @@ pub mod creg {
             #[inline(always)]
             pub fn _from(value: u8) -> WAKEUP0CTRLR {
                 match value {
-                    0 => WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R,
+                    0 => WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R0,
                     1 => WAKEUP0CTRLR::OUTPUT_FROM_THE_EVEN,
-                    3 => WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R,
+                    3 => WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R3,
                     _ => unreachable!(),
                 }
             }
-            #[doc = "Checks if the value of the field is `INPUT_TO_THE_EVENT_R`"]
+            #[doc = "Checks if the value of the field is `INPUT_TO_THE_EVENT_R0`"]
             #[inline(always)]
-            pub fn is_input_to_the_event_r(&self) -> bool {
-                *self == WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R
+            pub fn is_input_to_the_event_r0(&self) -> bool {
+                *self == WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R0
             }
             #[doc = "Checks if the value of the field is `OUTPUT_FROM_THE_EVEN`"]
             #[inline(always)]
             pub fn is_output_from_the_even(&self) -> bool {
                 *self == WAKEUP0CTRLR::OUTPUT_FROM_THE_EVEN
             }
-            #[doc = "Checks if the value of the field is `INPUT_TO_THE_EVENT_R`"]
+            #[doc = "Checks if the value of the field is `INPUT_TO_THE_EVENT_R3`"]
             #[inline(always)]
-            pub fn is_input_to_the_event_r(&self) -> bool {
-                *self == WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R
+            pub fn is_input_to_the_event_r3(&self) -> bool {
+                *self == WAKEUP0CTRLR::INPUT_TO_THE_EVENT_R3
             }
         }
         #[doc = "Possible values of the field `WAKEUP1CTRL`"]
@@ -109229,9 +109225,9 @@ pub mod creg {
         }
         #[doc = "Values that can be written to the field `WAKEUP0CTRL`"]
         pub enum WAKEUP0CTRLW {
-            #[doc = "Input to the event router."] INPUT_TO_THE_EVENT_R,
+            #[doc = "Input to the event router."] INPUT_TO_THE_EVENT_R0,
             #[doc = "Output from the event router."] OUTPUT_FROM_THE_EVEN,
-            #[doc = "Input to the event router."] INPUT_TO_THE_EVENT_R,
+            #[doc = "Input to the event router."] INPUT_TO_THE_EVENT_R3,
         }
         impl WAKEUP0CTRLW {
             #[allow(missing_docs)]
@@ -109239,9 +109235,9 @@ pub mod creg {
             #[inline(always)]
             pub fn _bits(&self) -> u8 {
                 match *self {
-                    WAKEUP0CTRLW::INPUT_TO_THE_EVENT_R => 0,
+                    WAKEUP0CTRLW::INPUT_TO_THE_EVENT_R0 => 0,
                     WAKEUP0CTRLW::OUTPUT_FROM_THE_EVEN => 1,
-                    WAKEUP0CTRLW::INPUT_TO_THE_EVENT_R => 3,
+                    WAKEUP0CTRLW::INPUT_TO_THE_EVENT_R3 => 3,
                 }
             }
         }
@@ -109257,8 +109253,8 @@ pub mod creg {
             }
             #[doc = "Input to the event router."]
             #[inline(always)]
-            pub fn input_to_the_event_r(self) -> &'a mut W {
-                self.variant(WAKEUP0CTRLW::INPUT_TO_THE_EVENT_R)
+            pub fn input_to_the_event_r0(self) -> &'a mut W {
+                self.variant(WAKEUP0CTRLW::INPUT_TO_THE_EVENT_R0)
             }
             #[doc = "Output from the event router."]
             #[inline(always)]
@@ -109267,8 +109263,8 @@ pub mod creg {
             }
             #[doc = "Input to the event router."]
             #[inline(always)]
-            pub fn input_to_the_event_r(self) -> &'a mut W {
-                self.variant(WAKEUP0CTRLW::INPUT_TO_THE_EVENT_R)
+            pub fn input_to_the_event_r3(self) -> &'a mut W {
+                self.variant(WAKEUP0CTRLW::INPUT_TO_THE_EVENT_R3)
             }
             #[doc = r" Writes raw bits to the field"]
             #[inline(always)]