diff --git a/data/registers/crc_v2.yaml b/data/registers/crc_v2.yaml
index 8b6ef63..6616d3e 100644
--- a/data/registers/crc_v2.yaml
+++ b/data/registers/crc_v2.yaml
@@ -1,7 +1,7 @@
 block/CRC:
   description: Cyclic Redundancy Check calculation unit
   items:
-  - name: DR
+  - name: DR32
     description: Data register
     byte_offset: 0
   - name: DR16
diff --git a/data/registers/crc_v3.yaml b/data/registers/crc_v3.yaml
index 1686d66..9cb0a16 100644
--- a/data/registers/crc_v3.yaml
+++ b/data/registers/crc_v3.yaml
@@ -1,7 +1,7 @@
 block/CRC:
   description: Cyclic Redundancy Check calculation unit
   items:
-  - name: DR
+  - name: DR32
     description: Data register
     byte_offset: 0
   - name: DR16
diff --git a/data/registers/spi_v2.yaml b/data/registers/spi_v2.yaml
index 6ccf388..4a63940 100644
--- a/data/registers/spi_v2.yaml
+++ b/data/registers/spi_v2.yaml
@@ -13,10 +13,14 @@ block/SPI:
     description: status register
     byte_offset: 8
     fieldset: SR
-  - name: DR
-    description: data register
+  - name: DR16
+    description: data register - half-word sized
     byte_offset: 12
-    fieldset: DR
+    bit_size: 16
+  - name: DR8
+    description: data register - byte sized
+    byte_offset: 12
+    bit_size: 8
   - name: CRCPR
     description: CRC polynomial register
     byte_offset: 16
@@ -171,13 +175,6 @@ fieldset/CRCPR:
     description: CRC polynomial register
     bit_offset: 0
     bit_size: 16
-fieldset/DR:
-  description: data register
-  fields:
-  - name: DR
-    description: Data register
-    bit_offset: 0
-    bit_size: 16
 fieldset/I2SCFGR:
   description: I2S configuration register
   fields:
diff --git a/data/registers/spi_v3.yaml b/data/registers/spi_v3.yaml
index 6947ed4..4afed99 100644
--- a/data/registers/spi_v3.yaml
+++ b/data/registers/spi_v3.yaml
@@ -31,16 +31,34 @@ block/SPI:
     byte_offset: 24
     access: Write
     fieldset: IFCR
-  - name: TXDR
+  - name: TXDR32
     description: Transmit Data Register
     byte_offset: 32
     access: Write
-    fieldset: TXDR
-  - name: RXDR
+  - name: TXDR16
+    description: Transmit Data Register - half-word sized
+    byte_offset: 32
+    bit_size: 16
+    access: Write
+  - name: TXDR8
+    description: Transmit Data Register - byte sized
+    byte_offset: 32
+    bit_size: 8
+    access: Write
+  - name: RXDR32
     description: Receive Data Register
     byte_offset: 48
     access: Read
-    fieldset: RXDR
+  - name: RXDR16
+    description: Receive Data Register - half-word sized
+    byte_offset: 48
+    bit_size: 16
+    access: Read
+  - name: RXDR8
+    description: Receive Data Register - byte sized
+    byte_offset: 48
+    bit_size: 8
+    access: Read
   - name: CRCPOLY
     description: Polynomial Register
     byte_offset: 64
@@ -324,13 +342,6 @@ fieldset/RXCRC:
     description: CRC register for receiver
     bit_offset: 0
     bit_size: 32
-fieldset/RXDR:
-  description: Receive Data Register
-  fields:
-  - name: RXDR
-    description: Receive data register
-    bit_offset: 0
-    bit_size: 32
 fieldset/SR:
   description: Status Register
   fields:
@@ -407,13 +418,6 @@ fieldset/TXCRC:
     description: CRC register for transmitter
     bit_offset: 0
     bit_size: 32
-fieldset/TXDR:
-  description: Transmit Data Register
-  fields:
-  - name: TXDR
-    description: Transmit data register
-    bit_offset: 0
-    bit_size: 32
 fieldset/UDRDR:
   description: Underrun Data Register
   fields:
diff --git a/data/registers/spi_v4.yaml b/data/registers/spi_v4.yaml
index a2c2566..78a74eb 100644
--- a/data/registers/spi_v4.yaml
+++ b/data/registers/spi_v4.yaml
@@ -31,16 +31,34 @@ block/SPI:
     byte_offset: 24
     access: Write
     fieldset: IFCR
-  - name: TXDR
+  - name: TXDR32
     description: Transmit Data Register
     byte_offset: 32
     access: Write
-    fieldset: TXDR
-  - name: RXDR
+  - name: TXDR16
+    description: Transmit Data Register - half-word sized
+    byte_offset: 32
+    bit_size: 16
+    access: Write
+  - name: TXDR8
+    description: Transmit Data Register - byte sized
+    byte_offset: 32
+    bit_size: 8
+    access: Write
+  - name: RXDR32
     description: Receive Data Register
     byte_offset: 48
     access: Read
-    fieldset: RXDR
+  - name: RXDR16
+    description: Receive Data Register - half-word sized
+    byte_offset: 48
+    bit_size: 16
+    access: Read
+  - name: RXDR8
+    description: Receive Data Register - byte sized
+    byte_offset: 48
+    bit_size: 8
+    access: Read
   - name: CRCPOLY
     description: Polynomial Register
     byte_offset: 64
@@ -323,13 +341,6 @@ fieldset/RXCRC:
     description: CRC register for receiver
     bit_offset: 0
     bit_size: 32
-fieldset/RXDR:
-  description: Receive Data Register
-  fields:
-  - name: RXDR
-    description: Receive data register
-    bit_offset: 0
-    bit_size: 32
 fieldset/SR:
   description: Status Register
   fields:
@@ -402,13 +413,6 @@ fieldset/TXCRC:
     description: CRC register for transmitter
     bit_offset: 0
     bit_size: 32
-fieldset/TXDR:
-  description: Transmit Data Register
-  fields:
-  - name: TXDR
-    description: Transmit data register
-    bit_offset: 0
-    bit_size: 32
 fieldset/UDRDR:
   description: Underrun Data Register
   fields:
diff --git a/data/registers/spi_v5.yaml b/data/registers/spi_v5.yaml
index fce0632..8155eca 100644
--- a/data/registers/spi_v5.yaml
+++ b/data/registers/spi_v5.yaml
@@ -34,16 +34,34 @@ block/SPI:
   - name: AUTOCR
     byte_offset: 28
     fieldset: AUTOCR
-  - name: TXDR
+  - name: TXDR32
     description: Transmit Data Register
     byte_offset: 32
     access: Write
-    fieldset: TXDR
-  - name: RXDR
+  - name: TXDR16
+    description: Transmit Data Register - half-word sized
+    byte_offset: 32
+    bit_size: 16
+    access: Write
+  - name: TXDR8
+    description: Transmit Data Register - byte sized
+    byte_offset: 32
+    bit_size: 8
+    access: Write
+  - name: RXDR32
     description: Receive Data Register
     byte_offset: 48
     access: Read
-    fieldset: RXDR
+  - name: RXDR16
+    description: Receive Data Register - half-word sized
+    byte_offset: 48
+    bit_size: 16
+    access: Read
+  - name: RXDR8
+    description: Receive Data Register - byte sized
+    byte_offset: 48
+    bit_size: 8
+    access: Read
   - name: CRCPOLY
     description: Polynomial Register
     byte_offset: 64
@@ -348,13 +366,6 @@ fieldset/RXCRC:
     description: CRC register for receiver
     bit_offset: 0
     bit_size: 32
-fieldset/RXDR:
-  description: Receive Data Register
-  fields:
-  - name: RXDR
-    description: Receive data register
-    bit_offset: 0
-    bit_size: 32
 fieldset/SR:
   description: Status Register
   fields:
@@ -427,13 +438,6 @@ fieldset/TXCRC:
     description: CRC register for transmitter
     bit_offset: 0
     bit_size: 32
-fieldset/TXDR:
-  description: Transmit Data Register
-  fields:
-  - name: TXDR
-    description: Transmit data register
-    bit_offset: 0
-    bit_size: 32
 fieldset/UDRDR:
   description: Underrun Data Register
   fields: