diff --git a/data/svd/test16.svd b/data/svd/test16.svd
index d421028..647cf3d 100644
--- a/data/svd/test16.svd
+++ b/data/svd/test16.svd
@@ -6,6 +6,7 @@
     <description></description>
     <addressUnitBits>8</addressUnitBits>
     <width>16</width>
+    <size>16</size>
     <peripherals>
         <peripheral>
             <name>peripheral1</name>
@@ -61,7 +62,7 @@
             <registers>
                 <register>
                     <!-- This register is actually an array of registers. -->
-                    <name>register1</name>
+                    <name>register[%s]</name>
                     <addressOffset>0x0</addressOffset>
                     <dim>2</dim>
                     <dimIncrement>0x40</dimIncrement>
diff --git a/data/svd/test32.svd b/data/svd/test32.svd
index 1903ac9..ee1a3a6 100644
--- a/data/svd/test32.svd
+++ b/data/svd/test32.svd
@@ -6,6 +6,7 @@
     <description></description>
     <addressUnitBits>8</addressUnitBits>
     <width>32</width>
+    <size>32</size>
     <peripherals>
         <peripheral>
             <name>peripheral1</name>
@@ -61,7 +62,7 @@
             <registers>
                 <register>
                     <!-- This register is actually an array of registers. -->
-                    <name>register1</name>
+                    <name>register[%s]</name>
                     <addressOffset>0x0</addressOffset>
                     <dim>2</dim>
                     <dimIncrement>0x40</dimIncrement>
diff --git a/data/svd/test64.svd b/data/svd/test64.svd
index 3533a1e..d146e44 100644
--- a/data/svd/test64.svd
+++ b/data/svd/test64.svd
@@ -6,6 +6,7 @@
     <description></description>
     <addressUnitBits>8</addressUnitBits>
     <width>64</width>
+    <size>64</size>
     <peripherals>
         <peripheral>
             <name>peripheral1</name>
@@ -61,7 +62,7 @@
             <registers>
                 <register>
                     <!-- This register is actually an array of registers. -->
-                    <name>register1</name>
+                    <name>register[%s]</name>
                     <addressOffset>0x0</addressOffset>
                     <dim>2</dim>
                     <dimIncrement>0x40</dimIncrement>
diff --git a/data/svd/test8.svd b/data/svd/test8.svd
index 4b68ff6..e986408 100644
--- a/data/svd/test8.svd
+++ b/data/svd/test8.svd
@@ -6,6 +6,7 @@
     <description></description>
     <addressUnitBits>8</addressUnitBits>
     <width>8</width>
+    <size>8</size>
     <peripherals>
         <peripheral>
             <name>peripheral1</name>
@@ -54,7 +55,7 @@
             <registers>
                 <register>
                     <!-- This register is actually an array of registers. -->
-                    <name>register1</name>
+                    <name>register[%s]</name>
                     <addressOffset>0x0</addressOffset>
                     <dim>2</dim>
                     <dimIncrement>0x8</dimIncrement>
diff --git a/data/test.svd b/data/test.svd
index 3533a1e..d146e44 100644
--- a/data/test.svd
+++ b/data/test.svd
@@ -6,6 +6,7 @@
     <description></description>
     <addressUnitBits>8</addressUnitBits>
     <width>64</width>
+    <size>64</size>
     <peripherals>
         <peripheral>
             <name>peripheral1</name>
@@ -61,7 +62,7 @@
             <registers>
                 <register>
                     <!-- This register is actually an array of registers. -->
-                    <name>register1</name>
+                    <name>register[%s]</name>
                     <addressOffset>0x0</addressOffset>
                     <dim>2</dim>
                     <dimIncrement>0x40</dimIncrement>