diff --git a/data/registers/hrtim_v1.yaml b/data/registers/hrtim_v1.yaml
index c50f99e..b1aa9ac 100644
--- a/data/registers/hrtim_v1.yaml
+++ b/data/registers/hrtim_v1.yaml
@@ -32,175 +32,175 @@ block/HRTIM:
       description: "Master Timer Repetition Register"
       byte_offset: 24
       fieldset: MREP
-    - name: MCMPXR
+    - name: MCMP
       description: "Master Timer Compare X Register"
       byte_offset: 28
-      fieldset: MCMPXR
+      fieldset: MCMPX
       array:
         offsets:
           - 0
           - 8
           - 12
           - 16
-    - name: TIMX
-      description: "High Resolution Timer: TIMX"
+    - name: TIM
+      description: "High Resolution Timer: Timing Unit"
       array:
         len: 5
         stride: 128
       byte_offset: 128
       block: HRTIM_TIMX
 block/HRTIM_TIMX:
-  description: "High Resolution Timer: TIMA"
+  description: "High Resolution Timer: Timing Unit"
   items:
-    - name: TIMXCR
-      description: Timerx Control Register
+    - name: CR
+      description: Timer X Control Register
       byte_offset: 0
       fieldset: TIMXCR
-    - name: TIMXISR
-      description: "Timerx Interrupt Status Register"
+    - name: ISR
+      description: "Timer X Interrupt Status Register"
       byte_offset: 4
       access: Read
       fieldset: TIMXISR
-    - name: TIMXICR
-      description: "Timerx Interrupt Clear Register"
+    - name: ICR
+      description: "Timer X Interrupt Clear Register"
       byte_offset: 8
       access: Write
       fieldset: TIMXICR
-    - name: TIMXDIER
-      description: Timerx DMA / Interrupt Enable Register
+    - name: DIER
+      description: Timer X DMA / Interrupt Enable Register
       byte_offset: 12
       fieldset: TIMXDIER
-    - name: CNTXR
-      description: Timerx Counter Register
+    - name: CNT
+      description: Timer X Counter Register
       byte_offset: 16
-      fieldset: CNTXR
-    - name: PERXR
-      description: Timerx Period Register
+      fieldset: TIMXCNT
+    - name: PER
+      description: Timer X Period Register
       byte_offset: 20
-      fieldset: PERXR
-    - name: REPXR
-      description: Timerx Repetition Register
+      fieldset: TIMXPER
+    - name: REP
+      description: Timer X Repetition Register
       byte_offset: 24
-      fieldset: REPXR
-    - name: CMPXXR
-      description: Timerx Compare X Register
+      fieldset: TIMXREP
+    - name: CMP
+      description: Timer X Compare X Register
       byte_offset: 28
-      fieldset: CMPXXR
+      fieldset: TIMXCMP
       array:
         offsets:
           - 0
           - 8
           - 12
           - 16
-    - name: CMPXCXR
-      description: "Timerx Compare X Compound Register"
+    - name: CMPC
+      description: "Timer X Compare X Compound Register"
       byte_offset: 32
-      fieldset: CMPXCXR
+      fieldset: TIMXCMPC
       array:
         offsets:
           - 0
-    - name: CPTXXR
-      description: Timerx Capture X Register
+    - name: CPT
+      description: Timer X Capture X Register
       byte_offset: 48
       access: Read
-      fieldset: CPTXXR
+      fieldset: TIMXCPT
       array:
         len: 2
         stride: 4
-    - name: DTXR
-      description: Timerx Deadtime Register
+    - name: DT
+      description: Timer X Deadtime Register
       byte_offset: 56
-      fieldset: DTXR
-    - name: SETXXR
-      description: Timerx OutputX Set Register
+      fieldset: TIMXDT
+    - name: SETR
+      description: Timer X Output X Set Register
       byte_offset: 60
-      fieldset: SETXXR
+      fieldset: TIMXSETR
       array:
         offsets:
           - 0
           - 8
-    - name: RSTXXR
-      description: Timerx OutputX Reset Register
+    - name: RSTR
+      description: Timer X Output X Reset Register
       byte_offset: 64
-      fieldset: RSTXXR
+      fieldset: TIMXRSTR
       array:
         offsets:
           - 0
           - 8
-    - name: EEFXRX
-      description: "Timerx External Event Filtering Register 1"
+    - name: EEF
+      description: "Timer X External Event Filtering Register 1"
       byte_offset: 76
-      fieldset: EEFXRX
+      fieldset: TIMXEEF
       array:
         offsets:
           - 0
           - 4
-    - name: RSTXR
-      description: Timerx Reset Register
+    - name: RST
+      description: Timer X Reset Register
       byte_offset: 84
-      fieldset: RSTXR
-    - name: CHPXR
-      description: Timerx Chopper Register
+      fieldset: TIMXRST
+    - name: CHP
+      description: Timer X Chopper Register
       byte_offset: 88
-      fieldset: CHPXR
-    - name: CPTXCR
-      description: Timerx Capture X Control Register
+      fieldset: TIMXCHP
+    - name: CCR
+      description: Timer X Capture X Control Register
       byte_offset: 92
-      fieldset: CPTXXCR
+      fieldset: TIMXCCR
       array:
         offsets:
           - 0 
           - 4
-    - name: OUTXR
-      description: Timerx Output Register
+    - name: OUTR
+      description: Timer X Output Register
       byte_offset: 100
-      fieldset: OUTXR
-    - name: FLTXR
-      description: Timerx Fault Register
+      fieldset: TIMXOUTR
+    - name: FLT
+      description: Timer X Fault Register
       byte_offset: 104
-      fieldset: FLTXR
-fieldset/CHPXR:
+      fieldset: TIMXFLT
+fieldset/TIMXCHP:
   description: Timerx Chopper Register
   fields:
     - name: CARFRQ
-      description: "Timerx carrier frequency value"
+      description: Timerx carrier frequency value
       bit_offset: 0
       bit_size: 4
     - name: CARDTY
-      description: "Timerx chopper duty cycle value"
+      description: Timerx chopper duty cycle value
       bit_offset: 4
       bit_size: 3
     - name: STRTPW
-      description: STRTPW
+      description: Timerx start pulsewidth
       bit_offset: 7
       bit_size: 4
-fieldset/CMPXXR:
+fieldset/TIMXCMP:
   description: Timerx Compare X Register
   fields:
-    - name: CMPXx
+    - name: CMP
       description: Timerx Compare X value
       bit_offset: 0
       bit_size: 16
-fieldset/CMPXCXR:
+fieldset/TIMXCMPC:
   description: "Timerx Compare X Compound Register"
   fields:
-    - name: CMPXx
+    - name: CMP
       description: Timerx Compare X value
       bit_offset: 0
       bit_size: 16
-    - name: REPx
+    - name: REP
       description: "Timerx Repetition value (aliased from HRTIM_REPx register)"
       bit_offset: 16
       bit_size: 8
-fieldset/CNTXR:
+fieldset/TIMXCNT:
   description: Timerx Counter Register
   fields:
-    - name: CNTx
+    - name: CNT
       description: Timerx Counter value
       bit_offset: 0
       bit_size: 16
-fieldset/CPTXXCR:
-  description: "Timerx Capture 2 Control Register"
+fieldset/TIMXCCR:
+  description: Timerx Capture 2 Control Register
   fields:
     - name: SWCPT
       description: Software Capture
@@ -212,244 +212,177 @@ fieldset/CPTXXCR:
       bit_offset: 1
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: EXEV1CPT
-      description: External Event 1 Capture
+    - name: EXEVCPT
+      description: External Event X Capture
       bit_offset: 2
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: EXEV2CPT
-      description: External Event 2 Capture
-      bit_offset: 3
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: EXEV3CPT
-      description: External Event 3 Capture
-      bit_offset: 4
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: EXEV4CPT
-      description: External Event 4 Capture
-      bit_offset: 5
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: EXEV5CPT
-      description: External Event 5 Capture
-      bit_offset: 6
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: EXEV6CPT
-      description: External Event 6 Capture
-      bit_offset: 7
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: EXEV7CPT
-      description: External Event 7 Capture
-      bit_offset: 8
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: EXEV8CPT
-      description: External Event 8 Capture
-      bit_offset: 9
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: EXEV9CPT
-      description: External Event 9 Capture
-      bit_offset: 10
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: EXEV10CPT
-      description: External Event 10 Capture
-      bit_offset: 11
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: TB1SET
-      description: Timer B output 1 Set
+      array:
+        len: 10
+        stride: 1
+    - name: TXSET
+      description: Timer X output Set
       bit_offset: 16
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TB1RST
-      description: Timer B output 1 Reset
+    - name: TXRST
+      description: Timer X output Reset
       bit_offset: 17
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TBCMP1
-      description: Timer B Compare 1
+    - name: TXCMP
+      description: Timer X Compare X
       bit_offset: 18
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TBCMP2
-      description: Timer B Compare 2
-      bit_offset: 19
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: TC1SET
-      description: Timer C output 1 Set
+      array:
+        len: 2
+        stride: 1
+    - name: TYSET
+      description: Timer Y output Set
       bit_offset: 20
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TC1RST
-      description: Timer C output 1 Reset
+    - name: TYRST
+      description: Timer Y output Reset
       bit_offset: 21
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TCCMP1
-      description: Timer C Compare 1
+    - name: TYCMP
+      description: Timer Y Compare X
       bit_offset: 22
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TCCMP2
-      description: Timer C Compare 2
-      bit_offset: 23
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: TD1SET
-      description: Timer D output 1 Set
+      array:
+        len: 2
+        stride: 1
+    - name: TZSET
+      description: Timer Z output Set
       bit_offset: 24
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TD1RST
-      description: Timer D output 1 Reset
+    - name: TZRST
+      description: Timer Z output Reset
       bit_offset: 25
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TDCMP1
-      description: Timer D Compare 1
+    - name: TZCMP
+      description: Timer Z Compare X
       bit_offset: 26
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TDCMP2
-      description: Timer D Compare 2
-      bit_offset: 27
-      bit_size: 1
-      enum: CAPTUREEFFECT
-    - name: TE1SET
-      description: Timer E output 1 Set
+      array:
+        len: 2
+        stride: 1
+    - name: TTSET
+      description: Timer T output Set
       bit_offset: 28
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TE1RST
-      description: Timer E output 1 Reset
+    - name: TTRST
+      description: Timer T output Reset
       bit_offset: 29
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TECMP1
-      description: Timer E Compare 1
+    - name: TTCMP
+      description: Timer T Compare X
       bit_offset: 30
       bit_size: 1
       enum: CAPTUREEFFECT
-    - name: TECMP2
-      description: Timer E Compare 2
-      bit_offset: 31
-      bit_size: 1
-      enum: CAPTUREEFFECT
-fieldset/CPTXXR:
+      array:
+        len: 2
+        stride: 1
+fieldset/TIMXCPT:
   description: Timerx Capture X Register
   fields:
-    - name: CPTXx
+    - name: CPT
       description: Timerx Capture X value
       bit_offset: 0
       bit_size: 16
-fieldset/DTXR:
+fieldset/TIMXDT:
   description: Timerx Deadtime Register
   fields:
-    - name: DTRx
+    - name: DTR
       description: Deadtime Rising value
       bit_offset: 0
       bit_size: 9
-    - name: SDTRx
+    - name: SDTR
       description: Sign Deadtime Rising value
       bit_offset: 9
       bit_size: 1
-      enum: SDTRx
+      enum: SDTR
     - name: DTPRSC
       description: Deadtime Prescaler
       bit_offset: 10
       bit_size: 3
-    - name: DTRSLKx
+    - name: DTRSLK
       description: Deadtime Rising Sign Lock
       bit_offset: 14
       bit_size: 1
       enum: LOCKED
-    - name: DTRLKx
+    - name: DTRLK
       description: Deadtime Rising Lock
       bit_offset: 15
       bit_size: 1
       enum: LOCKED
-    - name: DTFx
+    - name: DTF
       description: Deadtime Falling value
       bit_offset: 16
       bit_size: 9
-    - name: SDTFx
-      description: "Sign Deadtime Falling value"
+    - name: SDTF
+      description: Sign Deadtime Falling value
       bit_offset: 25
       bit_size: 1
-      enum: SDTFx
-    - name: DTFSLKx
+      enum: SDTF
+    - name: DTFSLK
       description: Deadtime Falling Sign Lock
       bit_offset: 30
       bit_size: 1
       enum: LOCKED
-    - name: DTFLKx
+    - name: DTFLK
       description: Deadtime Falling Lock
       bit_offset: 31
       bit_size: 1
       enum: LOCKED
-fieldset/EEFXRX:
-  description: "Timerx External Event Filtering Register 1"
+fieldset/TIMXEEF:
+  description: Timer X External Event Filtering Register
   fields:
-    - name: EEXLTCH
+    - name: LTCH
       description: External Event X latch
       bit_offset: 0
       bit_size: 1
       array:
         len: 5
         stride: 6
-    - name: EEXFLTR
-      description: External Event 1 filter
+    - name: FLTR
+      description: External Event X filter
       bit_offset: 1
       bit_size: 4
-      enum: EEXFLTR
+      enum: EEFLTR
       array:
         len: 5
         stride: 6
-fieldset/FLTXR:
+fieldset/TIMXFLT:
   description: Timerx Fault Register
   fields:
-    - name: FLT1EN
-      description: Fault 1 enable
+    - name: FLTEN
+      description: Fault X enable
       bit_offset: 0
       bit_size: 1
-      enum: FLT1EN
-    - name: FLT2EN
-      description: Fault 2 enable
-      bit_offset: 1
-      bit_size: 1
-      enum: FLT1EN
-    - name: FLT3EN
-      description: Fault 3 enable
-      bit_offset: 2
-      bit_size: 1
-      enum: FLT1EN
-    - name: FLT4EN
-      description: Fault 4 enable
-      bit_offset: 3
-      bit_size: 1
-      enum: FLT1EN
-    - name: FLT5EN
-      description: Fault 5 enable
-      bit_offset: 4
-      bit_size: 1
-      enum: FLT1EN
+      enum: FLTEN
+      array:
+        len: 5
+        stride: 1
     - name: FLTLCK
       description: Fault sources Lock
       bit_offset: 31
       bit_size: 1
       enum: LOCKED
-fieldset/MCMPXR:
-  description: "Master Timer Compare 1 Register"
+fieldset/MCMPX:
+  description: Master Timer Compare X Register
   fields:
-    - name: MCMP1
-      description: "Master Timer Compare 1 value"
+    - name: MCMP
+      description: Master Timer Compare X value
       bit_offset: 0
       bit_size: 16
 fieldset/MCNTR:
@@ -463,7 +396,7 @@ fieldset/MCR:
   description: Master Timer Control Register
   fields:
     - name: CKPSC
-      description: "HRTIM Master Clock prescaler"
+      description: HRTIM Master Clock prescaler
       bit_offset: 0
       bit_size: 3
     - name: CONT
@@ -485,11 +418,11 @@ fieldset/MCR:
       bit_size: 2
       enum: SYNCIN
     - name: SYNCRSTM
-      description: "Synchronization Resets Master"
+      description: Synchronization Resets Master
       bit_offset: 10
       bit_size: 1
     - name: SYNCSTRTM
-      description: "Synchronization Starts Master"
+      description: Synchronization Starts Master
       bit_offset: 11
       bit_size: 1
     - name: SYNCOUT
@@ -506,7 +439,7 @@ fieldset/MCR:
       description: Master Counter enable
       bit_offset: 16
       bit_size: 1
-    - name: TXCEN
+    - name: TCEN
       description: Timer X counter enable
       bit_offset: 17
       bit_size: 1
@@ -523,7 +456,7 @@ fieldset/MCR:
       bit_offset: 27
       bit_size: 1
     - name: MREPU
-      description: "Master Timer Repetition update"
+      description: Master Timer Repetition update
       bit_offset: 29
       bit_size: 1
     - name: BRSTDMA
@@ -534,7 +467,7 @@ fieldset/MCR:
 fieldset/MDIER:
   description: Master Timer DMA / Interrupt Enable Register 
   fields:
-    - name: MCMPXIE
+    - name: MCMPIE
       description: Master Compare X Interrupt Enable
       bit_offset: 0
       bit_size: 1
@@ -553,7 +486,7 @@ fieldset/MDIER:
       description: Master Update Interrupt Enable
       bit_offset: 6
       bit_size: 1
-    - name: MCMPXDE
+    - name: MCMPDE
       description: Master Compare X DMA request Enable
       bit_offset: 16
       bit_size: 1
@@ -575,7 +508,7 @@ fieldset/MDIER:
 fieldset/MICR:
   description: "Master Timer Interrupt Clear Register"
   fields:
-    - name: MCMPXC
+    - name: MCMPC
       description: "Master Compare X Interrupt flag clear"
       bit_offset: 0
       bit_size: 1
@@ -601,7 +534,7 @@ fieldset/MICR:
 fieldset/MISR:
   description: "Master Timer Interrupt Status Register"
   fields:
-    - name: MCMPX
+    - name: MCMP
       description: "Master Compare X Interrupt Flag"
       bit_offset: 0
       bit_size: 1
@@ -638,10 +571,10 @@ fieldset/MREP:
       description: "Master Timer Repetition counter value"
       bit_offset: 0
       bit_size: 8
-fieldset/OUTXR:
+fieldset/TIMXOUTR:
   description: Timerx Output Register
   fields:
-    - name: POLX
+    - name: POL
       description: Output 1 polarity
       bit_offset: 1
       bit_size: 1
@@ -650,7 +583,7 @@ fieldset/OUTXR:
         offsets:
           - 0 
           - 16
-    - name: IDLEMX
+    - name: IDLEM
       description: Output X Idle mode
       bit_offset: 2
       bit_size: 1
@@ -659,7 +592,7 @@ fieldset/OUTXR:
         offsets:
           - 0
           - 16
-    - name: IDLESX
+    - name: IDLES
       description: Output 1 Idle State
       bit_offset: 3
       bit_size: 1
@@ -677,7 +610,7 @@ fieldset/OUTXR:
         offsets:
           - 0
           - 16
-    - name: CHPX
+    - name: CHP
       description: Output X Chopper enable
       bit_offset: 6
       bit_size: 1
@@ -685,7 +618,7 @@ fieldset/OUTXR:
         offsets:
           - 0
           - 16
-    - name: DIDLX
+    - name: DIDL
       description: "Output X Deadtime upon burst mode Idle entry"
       bit_offset: 7
       bit_size: 1
@@ -706,40 +639,40 @@ fieldset/OUTXR:
       bit_offset: 10
       bit_size: 3
       enum: DLYPRT
-fieldset/PERXR:
+fieldset/TIMXPER:
   description: Timerx Period Register
   fields:
-    - name: PERx
+    - name: PER
       description: Timerx Period value
       bit_offset: 0
       bit_size: 16
-fieldset/REPXR:
+fieldset/TIMXREP:
   description: Timerx Repetition Register
   fields:
-    - name: REPx
+    - name: REP
       description: "Timerx Repetition counter value"
       bit_offset: 0
       bit_size: 8
-fieldset/RSTXXR:
+fieldset/TIMXRSTR:
   description: Timerx OutputX Reset Register
   fields:
     - name: SRT
-      description: SRT
+      description: Software Reset trigger
       bit_offset: 0
       bit_size: 1
       enum: INACTIVEEFFECT
     - name: RESYNC
-      description: RESYNC
+      description: Timer X resynchronizaton
       bit_offset: 1
       bit_size: 1
       enum: INACTIVEEFFECT
     - name: PER
-      description: PER
+      description: Timer X Period
       bit_offset: 2
       bit_size: 1
       enum: INACTIVEEFFECT
-    - name: CMPX
-      description: CMPX
+    - name: CMP
+      description: Timer X compare X
       bit_offset: 3
       bit_size: 1
       enum: INACTIVEEFFECT
@@ -747,28 +680,28 @@ fieldset/RSTXXR:
         len: 4
         stride: 1
     - name: MSTPER
-      description: MSTPER
+      description: Master Period
       bit_offset: 7
       bit_size: 1
       enum: INACTIVEEFFECT
-    - name: MSTCMPX
-      description: MSTCMPX
+    - name: MSTCMP
+      description: Master Compare X
       bit_offset: 8
       bit_size: 1
       enum: INACTIVEEFFECT
       array:
         len: 4
         stride: 1
-    - name: TIMEVNTX
-      description: TIMEVNTX
+    - name: TIMEVNT
+      description: Timer Event X
       bit_offset: 12
       bit_size: 1
       enum: INACTIVEEFFECT
       array:
         len: 9
         stride: 1
-    - name: EXTEVNTX
-      description: EXTEVNTX
+    - name: EXTEVNT
+      description: External Event X
       bit_offset: 21
       bit_size: 1
       enum: INACTIVEEFFECT
@@ -776,11 +709,11 @@ fieldset/RSTXXR:
         len: 10
         stride: 1
     - name: UPDATE
-      description: UPDATE
+      description: Registers update (transfer preload to active)
       bit_offset: 31
       bit_size: 1
       enum: INACTIVEEFFECT
-fieldset/RSTXR:
+fieldset/TIMXRST:
   description: Timerx Reset Register
   fields:
     - name: UPDT
@@ -788,7 +721,7 @@ fieldset/RSTXR:
       bit_offset: 1
       bit_size: 1
       enum: RESETEFFECT
-    - name: CMPX
+    - name: CMP
       description: Timer X compare X reset
       bit_offset: 2
       bit_size: 1
@@ -801,7 +734,7 @@ fieldset/RSTXR:
       bit_offset: 4
       bit_size: 1
       enum: RESETEFFECT
-    - name: MSTCMPX
+    - name: MSTCMP
       description: Master compare X
       bit_offset: 5
       bit_size: 1
@@ -809,7 +742,7 @@ fieldset/RSTXR:
       array:
         len: 4
         stride: 1
-    - name: EXTEVNTX
+    - name: EXTEVNT
       description: External Event X
       bit_offset: 9
       bit_size: 1
@@ -817,7 +750,7 @@ fieldset/RSTXR:
       array:
         len: 10
         stride: 1
-    - name: TIMXCMPX
+    - name: TIMXCMP
       description: Timer X Compare [1, 2, 4]
       bit_offset: 19
       bit_size: 1
@@ -825,7 +758,7 @@ fieldset/RSTXR:
       array:
         len: 3
         stride: 1
-    - name: TIMYCMPX
+    - name: TIMYCMP
       description: Timer Y Compare [1, 2, 4]
       bit_offset: 22
       bit_size: 1
@@ -833,7 +766,7 @@ fieldset/RSTXR:
       array:
         len: 3
         stride: 1
-    - name: TIMZCMPX
+    - name: TIMZCMP
       description: Timer Compare [1, 2, 4]
       bit_offset: 25
       bit_size: 1
@@ -841,7 +774,7 @@ fieldset/RSTXR:
       array:
         len: 3
         stride: 1
-    - name: TIMTCMPX
+    - name: TIMTCMP
       description: Timer Compare [1, 2, 4]
       bit_offset: 28
       bit_size: 1
@@ -849,7 +782,7 @@ fieldset/RSTXR:
       array:
         len: 3
         stride: 1
-fieldset/SETXXR:
+fieldset/TIMXSETR:
   description: Timerx OutputX Set Register
   fields:
     - name: SST
@@ -867,7 +800,7 @@ fieldset/SETXXR:
       bit_offset: 2
       bit_size: 1
       enum: ACTIVEEFFECT
-    - name: CMPX
+    - name: CMP
       description: Timer X compare X
       bit_offset: 3
       bit_size: 1
@@ -888,7 +821,7 @@ fieldset/SETXXR:
       array:
         len: 4
         stride: 1
-    - name: TIMEVNTX
+    - name: TIMEVNT
       description: Timer Event X
       bit_offset: 12
       bit_size: 1
@@ -896,7 +829,7 @@ fieldset/SETXXR:
       array:  
         len: 9
         stride: 1
-    - name: EXTEVNTX
+    - name: EXTEVNT
       description: External Event X
       bit_offset: 21
       bit_size: 1
@@ -905,15 +838,15 @@ fieldset/SETXXR:
         len: 10
         stride: 1
     - name: UPDATE
-      description: "Registers update (transfer preload to active)"
+      description: Registers update (transfer preload to active)
       bit_offset: 31
       bit_size: 1
       enum: ACTIVEEFFECT
 fieldset/TIMXCR:
   description: Timerx Control Register
   fields:
-    - name: CKPSCx
-      description: "HRTIM Timer x Clock prescaler"
+    - name: CKPSC
+      description: HRTIM Timer x Clock prescaler
       bit_offset: 0
       bit_size: 3
     - name: CONT
@@ -933,16 +866,16 @@ fieldset/TIMXCR:
       description: Push-Pull mode enable
       bit_offset: 6
       bit_size: 1
-    - name: SYNCRSTx
-      description: "Synchronization Resets Timer x"
+    - name: SYNCRST
+      description: Synchronization Resets Timer X
       bit_offset: 10
       bit_size: 1
-      enum: SYNCRSTx
-    - name: SYNCSTRTx
-      description: "Synchronization Starts Timer x"
+      enum: SYNCRST
+    - name: SYNCSTRT
+      description: Synchronization Starts Timer X
       bit_offset: 11
       bit_size: 1
-      enum: SYNCSTRTx
+      enum: SYNCSTRT
     - name: DELCMP2
       description: Delayed CMP2 mode
       bit_offset: 12
@@ -953,28 +886,32 @@ fieldset/TIMXCR:
       bit_offset: 14
       bit_size: 2
       enum: DELCMP4
-    - name: TxREPU
-      description: Timer x Repetition update
+    - name: REPU
+      description: Timer X Repetition update
       bit_offset: 17
       bit_size: 1
-    - name: TxRSTU
-      description: Timerx reset update
+    - name: RSTU
+      description: Timer X reset update
       bit_offset: 18
       bit_size: 1
+    - name: TAU
+      description: Timer A update
+      bit_offset: 19
+      bit_size: 1
     - name: TBU
-      description: TBU
+      description: Timer B update
       bit_offset: 20
       bit_size: 1
     - name: TCU
-      description: TCU
+      description: Timer C update
       bit_offset: 21
       bit_size: 1
     - name: TDU
-      description: TDU
+      description: Timer D update
       bit_offset: 22
       bit_size: 1
     - name: TEU
-      description: TEU
+      description: Timer E update
       bit_offset: 23
       bit_size: 1
     - name: MSTU
@@ -998,7 +935,7 @@ fieldset/TIMXCR:
 fieldset/TIMXDIER:
   description: Timerx DMA / Interrupt Enable Register
   fields:
-    - name: CMPXIE
+    - name: CMPIE
       description: Compare X Interrupt Enable
       bit_offset: 0
       bit_size: 1
@@ -1013,14 +950,14 @@ fieldset/TIMXDIER:
       description: Update Interrupt Enable
       bit_offset: 6
       bit_size: 1
-    - name: CPTXIE
+    - name: CPTIE
       description: Capture Interrupt Enable
       bit_offset: 7
       bit_size: 1
       array:  
         len: 2
         stride: 1
-    - name: SETxXIE
+    - name: SETRIE
       description: Output X Set Interrupt Enable
       bit_offset: 9
       bit_size: 1
@@ -1028,7 +965,7 @@ fieldset/TIMXDIER:
         offsets:
           - 0 
           - 2
-    - name: RSTx1IE
+    - name: RSTRIE
       description:  Output X Reset Interrupt Enable
       bit_offset: 10
       bit_size: 1
@@ -1044,7 +981,7 @@ fieldset/TIMXDIER:
       description: Delayed Protection Interrupt Enable
       bit_offset: 14
       bit_size: 1
-    - name: CMPXDE
+    - name: CMPDE
       description: Compare X DMA request Enable
       bit_offset: 16
       bit_size: 1
@@ -1059,14 +996,14 @@ fieldset/TIMXDIER:
       description: Update DMA request Enable
       bit_offset: 22
       bit_size: 1
-    - name: CPTXDE
+    - name: CPTDE
       description: Capture X DMA request Enable
       bit_offset: 23
       bit_size: 1
       array:
         len: 2
         stride: 1
-    - name: SETxXDE
+    - name: SETRDE
       description: Output X Set DMA request Enable
       bit_offset: 25
       bit_size: 1
@@ -1074,7 +1011,7 @@ fieldset/TIMXDIER:
         offsets:
           - 0
           - 2
-    - name: RSTx1DE
+    - name: RSTRDE
       description: Output X Reset DMA request Enable
       bit_offset: 26
       bit_size: 1
@@ -1365,7 +1302,7 @@ enum/DELCMP4:
     - name: Capture_Compare3
       description: CMP4 is recomputed and is active following a capture event or a Compare 3 match
       value: 3
-enum/EEXFLTR:
+enum/EEFLTR:
   bit_size: 4
   variants:
     - name: Disabled
@@ -1440,7 +1377,7 @@ enum/FAULT:
     - name: SetHighZ
       description: Output goes to high-z state after a fault event
       value: 3
-enum/FLT1EN:
+enum/FLTEN:
   bit_size: 1
   variants:
     - name: Ignored
@@ -1554,7 +1491,7 @@ enum/RESETEFFECT:
     - name: ResetCounter
       description: Timer X counter is reset upon timer Y compare Z event
       value: 1
-enum/SDTFx:
+enum/SDTF:
   bit_size: 1
   variants:
     - name: Positive
@@ -1563,7 +1500,7 @@ enum/SDTFx:
     - name: Negative
       description: Negative deadtime on falling edge
       value: 1
-enum/SDTRx:
+enum/SDTR:
   bit_size: 1
   variants:
     - name: Positive
@@ -1596,7 +1533,7 @@ enum/SYNCOUT:
     - name: NegativePulse
       description: Negative pulse on SCOUT output (16x f_HRTIM clock cycles)
       value: 3
-enum/SYNCRSTx:
+enum/SYNCRST:
   bit_size: 1
   variants:
     - name: Disabled
@@ -1620,7 +1557,7 @@ enum/SYNCSRC:
     - name: TimerACompare1
       description: Timer A Compare 1 event
       value: 3
-enum/SYNCSTRTx:
+enum/SYNCSTRT:
   bit_size: 1
   variants:
     - name: Disabled