diff --git a/data/registers/timadv_v2.yaml b/data/registers/timadv_v2.yaml
index e37f4c0..c6a860b 100644
--- a/data/registers/timadv_v2.yaml
+++ b/data/registers/timadv_v2.yaml
@@ -142,8 +142,8 @@ fieldset/AF1:
     bit_offset: 1
     bit_size: 1
     array:
-      len: 1
-      stride: 8
+      len: 8
+      stride: 1
   - name: BKINP
     description: TIMx_BKIN input polarity
     bit_offset: 9
@@ -154,8 +154,8 @@ fieldset/AF1:
     bit_offset: 10
     bit_size: 1
     array:
-      len: 1
-      stride: 4
+      len: 4
+      stride: 1
     enum: BKINP
   - name: ETRSEL
     description: etr_in source selection
@@ -264,7 +264,7 @@ fieldset/BDTR:
       stride: 4
     enum: FilterValue
   - name: BKDSRM
-    description: Break Disarm
+    description: Break x (x=1,2) Disarm
     bit_offset: 26
     bit_size: 1
     array:
@@ -272,7 +272,7 @@ fieldset/BDTR:
       stride: 1
     enum: BKDSRM
   - name: BKBID
-    description: Break bidirectional
+    description: Break x (x=1,2) bidirectional
     bit_offset: 28
     bit_size: 1
     array:
@@ -535,20 +535,19 @@ fieldset/CR2:
     bit_size: 1
     enum: TI1S
   - name: OIS
-    description: Output Idle state 1(N)-4(N)
+    description: Output Idle state x (x=1-6)
     bit_offset: 8
     bit_size: 1
+    array:
+      len: 6
+      stride: 2
+  - name: OISN
+    description: Output Idle state x N x (x=1-4)
+    bit_offset: 9
+    bit_size: 1
     array:
       len: 4
       stride: 2
-  - name: OIS5
-    description: Output Idle state 5
-    bit_offset: 16
-    bit_size: 1
-  - name: OIS6
-    description: Output Idle state 6
-    bit_offset: 18
-    bit_size: 1
   - name: MMS2
     description: Master mode selection 2
     bit_offset: 20
@@ -578,7 +577,7 @@ fieldset/DIER:
     bit_offset: 0
     bit_size: 1
   - name: CCIE
-    description: Capture/Compare 1 interrupt enable
+    description: Capture/Compare x (x=1-4) interrupt enable
     bit_offset: 1
     bit_size: 1
     array:
@@ -824,7 +823,7 @@ fieldset/SR:
     bit_size: 1
   - name: CCIF6
     description: Capture/compare 6 interrupt flag
-    bit_offset: 16
+    bit_offset: 17
     bit_size: 1
   - name: IDXIF
     description: Index interrupt flag
diff --git a/data/registers/timgp16_v2.yaml b/data/registers/timgp16_v2.yaml
index 1b4c8d7..e0b19ff 100644
--- a/data/registers/timgp16_v2.yaml
+++ b/data/registers/timgp16_v2.yaml
@@ -342,7 +342,7 @@ fieldset/DIER:
     bit_offset: 0
     bit_size: 1
   - name: CCIE
-    description: Capture/Compare 1 interrupt enable
+    description: Capture/Compare x (x=1-4) interrupt enable
     bit_offset: 1
     bit_size: 1
     array:
diff --git a/data/registers/timgp32_v2.yaml b/data/registers/timgp32_v2.yaml
index 000538d..eff0ec6 100644
--- a/data/registers/timgp32_v2.yaml
+++ b/data/registers/timgp32_v2.yaml
@@ -353,7 +353,7 @@ fieldset/DIER:
     bit_offset: 0
     bit_size: 1
   - name: CCIE
-    description: Capture/Compare 1 interrupt enable
+    description: Capture/Compare x (x=1-4) interrupt enable
     bit_offset: 1
     bit_size: 1
     array: