diff --git a/data/registers/timer_v2.yaml b/data/registers/timer_v2.yaml
index db6d39c..6f1eac8 100644
--- a/data/registers/timer_v2.yaml
+++ b/data/registers/timer_v2.yaml
@@ -58,14 +58,14 @@ block/TIM_1CH:
       len: 1
       stride: 4
     byte_offset: 52
-    fieldset: CCR_1CH
+    fieldset: CCR_GP16
   - name: CCR_DITHER
     description: capture/compare register x (x=1) (Dither mode enabled)
     array:
       len: 1
       stride: 4
     byte_offset: 52
-    fieldset: CCR_DITHER_1CH
+    fieldset: CCR_DITHER_GP16
   - name: TISEL
     description: input selection register
     byte_offset: 92
@@ -172,14 +172,14 @@ block/TIM_2CH:
       len: 2
       stride: 4
     byte_offset: 52
-    fieldset: CCR_2CH
+    fieldset: CCR_GP16
   - name: CCR_DITHER
     description: capture/compare register x (x=1-2) (Dither mode enabled)
     array:
       len: 2
       stride: 4
     byte_offset: 52
-    fieldset: CCR_DITHER_2CH
+    fieldset: CCR_DITHER_GP16
   - name: TISEL
     description: input selection register
     byte_offset: 92
@@ -560,8 +560,8 @@ fieldset/AF2_ADV:
     bit_offset: 10
     bit_size: 1
     array:
-      len: 1
-      stride: 4
+      len: 4
+      stride: 1
     enum: BKINP
 fieldset/AF2_GP16:
   description: alternate function register 2
@@ -1106,42 +1106,6 @@ fieldset/CCR5_DITHER_ADV:
       len: 3
       stride: 1
     enum: GC5C
-fieldset/CCR_1CH:
-  description: capture/compare register x (x=1) (Dither mode disabled)
-  fields:
-  - name: CCR
-    description: capture/compare x (x=1) value
-    bit_offset: 0
-    bit_size: 16
-fieldset/CCR_2CH:
-  description: capture/compare register x (x=1,2) (Dither mode disabled)
-  fields:
-  - name: CCR
-    description: capture/compare x (x=1,2) value
-    bit_offset: 0
-    bit_size: 16
-fieldset/CCR_DITHER_1CH:
-  description: capture/compare register x (x=1) (Dither mode enabled)
-  fields:
-  - name: DITHER
-    description: Dither value
-    bit_offset: 0
-    bit_size: 4
-  - name: CCR
-    description: capture/compare x (x=1) value
-    bit_offset: 4
-    bit_size: 16
-fieldset/CCR_DITHER_2CH:
-  description: capture/compare register x (x=1,2) (Dither mode enabled)
-  fields:
-  - name: DITHER
-    description: Dither value
-    bit_offset: 0
-    bit_size: 4
-  - name: CCR
-    description: capture/compare x (x=1-2) value
-    bit_offset: 4
-    bit_size: 16
 fieldset/CCR_DITHER_GP16:
   description: capture/compare register x (x=1-4,6) (Dither mode enabled)
   fields: